ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simlifying some modifiers.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-24 14:39:38 +00:00
parent b8ee8e8247
commit 69d136fe30
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CancelStrengthBonusModifier.java
View File

@@ -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;
}
}

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/VitalityModifier.java
View File

@@ -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;
}
}

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/AbstractModifier.java
View File

@@ -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

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/Modifier.java
View File

@@ -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);

10
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
View File

@@ -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);
}