From 69d136fe302b0ff3ab8d729348ab2e50f0517b27 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 24 Oct 2011 14:39:38 +0000 Subject: [PATCH] Simlifying some modifiers. --- .../cards/modifiers/CancelStrengthBonusModifier.java | 2 +- .../lotro/cards/modifiers/VitalityModifier.java | 4 ++-- .../lotro/logic/modifiers/AbstractModifier.java | 8 ++++---- .../com/gempukku/lotro/logic/modifiers/Modifier.java | 4 ++-- .../gempukku/lotro/logic/modifiers/ModifiersLogic.java | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelStrengthBonusModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelStrengthBonusModifier.java index 2b541b941..f45fb86c8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelStrengthBonusModifier.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelStrengthBonusModifier.java @@ -13,7 +13,7 @@ public class CancelStrengthBonusModifier extends AbstractModifier { } @Override - public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result) { + public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource) { return false; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java index 931e78536..1efcdb235 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java @@ -16,7 +16,7 @@ public class VitalityModifier extends AbstractModifier { } @Override - public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { - return result + _modifier; + public int getVitalityModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { + return _modifier; } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java index c5bb06933..ada5fba96 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java @@ -78,13 +78,13 @@ public abstract class AbstractModifier implements Modifier { } @Override - public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result) { - return result; + public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource) { + return true; } @Override - public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { - return result; + public int getVitalityModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { + return 0; } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java index bd0aa761f..d15150d5a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java @@ -30,9 +30,9 @@ public interface Modifier { public int getStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard); - public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource, boolean result); + public boolean appliesStrengthModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard modifierSource); - public int getVitality(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result); + public int getVitalityModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard); public int getResistance(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java index 8d9a661af..553b08603 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java @@ -233,7 +233,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { for (Modifier modifier : getModifiers(ModifierEffect.STRENGTH_MODIFIER)) { if (affectsCardWithSkipSet(gameState, physicalCard, modifier) && appliesStrengthModifier(gameState, modifier.getSource())) - result = modifier.getStrengthModifier(gameState, this, physicalCard); + result += modifier.getStrengthModifier(gameState, this, physicalCard); } return Math.max(0, result); } @@ -241,12 +241,12 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { private boolean appliesStrengthModifier(GameState gameState, PhysicalCard modifierSource) { if (modifierSource == null) return true; - boolean result = true; for (Modifier modifier : getModifiers(ModifierEffect.STRENGTH_MODIFIER)) { if (affectsCardWithSkipSet(gameState, modifierSource, modifier)) - result = modifier.appliesStrengthModifier(gameState, this, modifierSource, result); + if (!modifier.appliesStrengthModifier(gameState, this, modifierSource)) + return false; } - return result; + return true; } @Override @@ -254,7 +254,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { int result = physicalCard.getBlueprint().getVitality() - gameState.getWounds(physicalCard); for (Modifier modifier : getModifiers(ModifierEffect.VITALITY_MODIFIER)) { if (affectsCardWithSkipSet(gameState, physicalCard, modifier)) - result = modifier.getVitality(gameState, this, physicalCard, result); + result += modifier.getVitalityModifier(gameState, this, physicalCard); } return Math.max(0, result); }