From cbdb4579bf90328e9dd8918503c83fd91c0aa7e7 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 28 Nov 2011 17:59:12 +0000 Subject: [PATCH] Splitting WoundResult for each card taking wound. --- .../main/java/com/gempukku/lotro/cards/TriggerConditions.java | 4 ++-- .../java/com/gempukku/lotro/cards/set1/moria/Card1_189.java | 2 +- .../com/gempukku/lotro/cards/set10/sauron/Card10_096.java | 2 +- .../java/com/gempukku/lotro/cards/set2/moria/Card2_053.java | 2 +- .../java/com/gempukku/lotro/cards/set8/gollum/Card8_024.java | 2 +- .../java/com/gempukku/lotro/logic/timing/EffectResult.java | 2 +- .../com/gempukku/lotro/logic/timing/results/WoundResult.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java index 7bc6d1245..8730c8f92 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java @@ -136,8 +136,8 @@ public class TriggerConditions { return false; } - public static boolean isWounded(LotroGame game, EffectResult effectResult, Filterable... filters) { - if (effectResult.getType() == EffectResult.Type.WOUND) + public static boolean forEachWounded(LotroGame game, EffectResult effectResult, Filterable... filters) { + if (effectResult.getType() == EffectResult.Type.FOR_EACH_WOUNDED) return Filters.and(filters).accepts(game.getGameState(), game.getModifiersQuerying(), ((WoundResult) effectResult).getWoundedCard()); return false; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_189.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_189.java index c0f0d1651..227585cba 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_189.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_189.java @@ -45,7 +45,7 @@ public class Card1_189 extends AbstractResponseOldEvent { if ((( effectResult.getType() == EffectResult.Type.EXERT && Filters.filter(((ExertResult) effectResult).getExertedCards(), game.getGameState(), game.getModifiersQuerying(), Keyword.RING_BEARER).size() > 0) - || TriggerConditions.isWounded(game, effectResult, Keyword.RING_BEARER)) + || TriggerConditions.forEachWounded(game, effectResult, Keyword.RING_BEARER)) && checkPlayRequirements(playerId, game, self, 0, false, false)) { final PlayEventAction action = new PlayEventAction(self); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_096.java index 0295de8a5..05d8eb43e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set10/sauron/Card10_096.java @@ -39,7 +39,7 @@ public class Card10_096 extends AbstractPermanent { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.isWounded(game, effectResult, Culture.SAURON, CardType.MINION, Keyword.ROAMING)) { + if (TriggerConditions.forEachWounded(game, effectResult, Culture.SAURON, CardType.MINION, Keyword.ROAMING)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new AddTokenEffect(self, self, Token.SAURON)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_053.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_053.java index cb997e7b3..cbcd0f751 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_053.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_053.java @@ -71,7 +71,7 @@ public class Card2_053 extends AbstractAttachable { @Override public List getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.isWounded(game, effectResult, Filters.hasAttached(self)) + if (TriggerConditions.forEachWounded(game, effectResult, Filters.hasAttached(self)) && game.getGameState().getCurrentPhase() == Phase.ARCHERY) { final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_024.java index 6a229127f..4c6b73ac6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/gollum/Card8_024.java @@ -32,7 +32,7 @@ public class Card8_024 extends AbstractPermanent { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.isWounded(game, effectResult, CardType.COMPANION) + if (TriggerConditions.forEachWounded(game, effectResult, CardType.COMPANION) && PlayConditions.canSpot(game, Culture.GOLLUM, CardType.MINION, Filters.inSkirmish)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java index 6545af0a1..fbece8fb7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java @@ -4,7 +4,7 @@ public abstract class EffectResult { public enum Type { ANY_NUMBER_KILLED, FOR_EACH_KILLED, - WOUND, HEAL, EXERT, DISCARD_FROM_PLAY, DISCARD_FROM_HAND, + FOR_EACH_WOUNDED, HEAL, EXERT, DISCARD_FROM_PLAY, DISCARD_FROM_HAND, FREE_PEOPLE_PLAYER_STARTS_ASSIGNING, diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java index d5c263473..5541f0b26 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/WoundResult.java @@ -7,7 +7,7 @@ public class WoundResult extends EffectResult { private PhysicalCard _card; public WoundResult(PhysicalCard card) { - super(EffectResult.Type.WOUND); + super(EffectResult.Type.FOR_EACH_WOUNDED); _card = card; }