MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

new application of zerg multiplier

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-19 19:37:32 -06:00
parent 517e64d613
commit f7ab5347ab
17 changed files with 116 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/powers/effectmodifiers/HealthEffectModifier.java
+10 -4
View File
@@ -9,6 +9,7 @@
package engine.powers.effectmodifiers;
import engine.Enum;
import engine.Enum.DamageType;
import engine.Enum.GameObjectType;
import engine.Enum.ModType;
@@ -126,8 +127,8 @@ public class HealthEffectModifier extends AbstractEffectModifier {
min = HealthEffectModifier.getMinDamage(min, intt, spi, focus);
max = HealthEffectModifier.getMaxDamage(max, intt, spi, focus);
min *= pc.ZergMultiplier;
max *= pc.ZergMultiplier;
//min *= pc.ZergMultiplier;
//max *= pc.ZergMultiplier;
//debug for spell damage and atr
if (pc.getDebug(16)) {
@@ -169,8 +170,13 @@ public class HealthEffectModifier extends AbstractEffectModifier {
PlayerBonuses bonus = source.getBonuses();
// Apply any power effect modifiers (such as stances)
if (bonus != null)
modAmount *= (1 + (bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None)));
if (bonus != null){
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, (PlayerCharacter) source));
}else{
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, null));
}
}
}
if (modAmount == 0f)
return;
src/engine/powers/effectmodifiers/ManaEffectModifier.java
+8 -2
View File
@@ -129,8 +129,14 @@ public class ManaEffectModifier extends AbstractEffectModifier {
PlayerBonuses bonus = source.getBonuses();
// Apply any power effect modifiers (such as stances)
if (bonus != null)
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
if (bonus != null){
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, (PlayerCharacter) source));
}else{
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, null));
}
}
}
if (modAmount == 0f)
return;
src/engine/powers/effectmodifiers/StaminaEffectModifier.java
+7 -2
View File
@@ -125,8 +125,13 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
PlayerBonuses bonus = source.getBonuses();
// Apply any power effect modifiers (such as stances)
if (bonus != null)
modAmount *= (1 + (bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None)));
if (bonus != null){
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, (PlayerCharacter) source));
}else{
modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, null));
}
}
}
if (modAmount == 0f)
return;
src/engine/powers/poweractions/TransferStatPowerAction.java
+7 -2
View File
@@ -217,8 +217,13 @@ public class TransferStatPowerAction extends AbstractPowerAction {
// Apply any power effect modifiers (such as stances)
PlayerBonuses bonus = source.getBonuses();
if (bonus != null)
damage *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
if (bonus != null){
if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
damage *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, (PlayerCharacter) source));
}else{
damage *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None, null));
}
}
//get amount to transfer
fromAmount = damage;