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

Fixing how Vitality is calculated. Wounds on a character affect the vitality of that character (lowering it), rather than being treated like damage in Magic.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-21 10:44:54 +00:00
parent 2df7d2f261
commit 0b48bda665
5 changed files with 5 additions and 5 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/PlayConditions.java
View File

@@ -94,7 +94,7 @@ public class PlayConditions {
}
public static boolean canExert(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard card) {
return (gameState.getWounds(card) < modifiersQuerying.getVitality(gameState, card) - 1);
return (modifiersQuerying.getVitality(gameState, card) > 1);
}
public static boolean winsSkirmish(EffectResult effectResult, PhysicalCard character) {

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java
View File

@@ -38,7 +38,7 @@ public class Card1_302 extends AbstractCompanion {
@Override
protected List<? extends Action> getExtraInPlayPhaseActions(String playerId, final LotroGame game, final PhysicalCard self) {
if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.SKIRMISH, self)
&& game.getModifiersQuerying().getVitality(game.getGameState(), self) > 2 + game.getGameState().getWounds(self)
&& game.getModifiersQuerying().getVitality(game.getGameState(), self) > 2
&& !isAssigned(game, self)) {
final DefaultCostToEffectAction action = new DefaultCostToEffectAction(self, Keyword.SKIRMISH, "Exert Merry twice to add his strength to another companion.");
action.addCost(

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -167,7 +167,7 @@ public class Filters {
return new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return (gameState.getWounds(physicalCard) < modifiersQuerying.getVitality(gameState, physicalCard) - 1);
return (modifiersQuerying.getVitality(gameState, physicalCard) > 1);
}
};
}

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

@@ -236,7 +236,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
@Override
public int getVitality(GameState gameState, PhysicalCard physicalCard) {
int result = physicalCard.getBlueprint().getVitality();
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);

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java
View File

@@ -35,7 +35,7 @@ public class CharacterDeathRule {
List<PhysicalCard> characters = Filters.filterActive(gameState, game.getModifiersQuerying(),
Filters.or(Filters.type(CardType.ALLY), Filters.type(CardType.COMPANION), Filters.type(CardType.MINION)));
for (PhysicalCard character : characters)
if (gameState.getWounds(character) >= game.getModifiersQuerying().getVitality(gameState, character))
if (game.getModifiersQuerying().getVitality(gameState, character) <= 0)
deadCharacters.add(character);
if (deadCharacters.size() > 0) {