From ba3fd7215b73d7c23a6afe00eb67eed34cb3e9bb Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Fri, 16 Feb 2024 22:55:50 -0600 Subject: [PATCH] zerg mechanic work --- src/engine/powers/effectmodifiers/HealthEffectModifier.java | 4 ++-- src/engine/powers/effectmodifiers/ManaEffectModifier.java | 4 ++-- src/engine/powers/effectmodifiers/StaminaEffectModifier.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java index 61e6652f..efedabec 100644 --- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java @@ -176,8 +176,8 @@ public class HealthEffectModifier extends AbstractEffectModifier { if (!ac.isAlive()) return; - if(awo.getObjectType().equals(GameObjectType.PlayerCharacter)){ - modAmount *= ((PlayerCharacter)ac).ZergMultiplier; + if(source.getObjectType().equals(GameObjectType.PlayerCharacter)){ + modAmount *= ((PlayerCharacter)source).ZergMultiplier; } int powerID = 0, effectID = 0; diff --git a/src/engine/powers/effectmodifiers/ManaEffectModifier.java b/src/engine/powers/effectmodifiers/ManaEffectModifier.java index 8167fc0f..10686659 100644 --- a/src/engine/powers/effectmodifiers/ManaEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ManaEffectModifier.java @@ -157,8 +157,8 @@ public class ManaEffectModifier extends AbstractEffectModifier { skipImmune = true; } } - if(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){ - modAmount *= ((PlayerCharacter)ac).ZergMultiplier; + if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){ + modAmount *= ((PlayerCharacter)source).ZergMultiplier; } PlayerBonuses bonus = ac.getBonuses(); if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) { diff --git a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java index cd433e44..e7a89ce6 100644 --- a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java +++ b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java @@ -153,8 +153,8 @@ public class StaminaEffectModifier extends AbstractEffectModifier { skipImmune = true; } } - if(awo.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){ - modAmount *= ((PlayerCharacter)ac).ZergMultiplier; + if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){ + modAmount *= ((PlayerCharacter)source).ZergMultiplier; } PlayerBonuses bonus = ac.getBonuses(); if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {