diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java index 826c2fb84..ee06780d4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java @@ -79,13 +79,10 @@ public class Card1_001 extends AbstractAttachable { if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self)) && game.getGameState().isWearingRing() && !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) { - WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; - if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo())); - action.appendEffect(new AddBurdenEffect(self, 2)); - return Collections.singletonList(action); - } + RequiredTriggerAction action = new RequiredTriggerAction(self); + action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo())); + action.appendEffect(new AddBurdenEffect(self, 2)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java index 368e6a614..ce6b8396c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java @@ -59,18 +59,11 @@ public class Card1_002 extends AbstractAttachable { if (game.getGameState().getCurrentPhase() == Phase.SKIRMISH && TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self)) && !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) { - WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; - if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) { - List actions = new LinkedList(); - - ActivateCardAction action = new ActivateCardAction(self); - action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo())); - action.appendEffect(new AddBurdenEffect(self, 1)); - action.appendEffect(new PutOnTheOneRingEffect()); - - actions.add(action); - return actions; - } + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo())); + action.appendEffect(new AddBurdenEffect(self, 1)); + action.appendEffect(new PutOnTheOneRingEffect()); + return Collections.singletonList(action); } return null; } @@ -80,13 +73,10 @@ public class Card1_002 extends AbstractAttachable { if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self)) && game.getGameState().isWearingRing() && !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) { - WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; - if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo())); - action.appendEffect(new AddBurdenEffect(self, 1)); - return Collections.singletonList(action); - } + RequiredTriggerAction action = new RequiredTriggerAction(self); + action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo())); + action.appendEffect(new AddBurdenEffect(self, 1)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/Card11_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/Card11_001.java index ae9cd090a..3ad1cc205 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/Card11_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/Card11_001.java @@ -58,18 +58,12 @@ public class Card11_001 extends AbstractAttachable { public List getOptionalInPlayBeforeActions(final String playerId, LotroGame game, Effect effect, final PhysicalCard self) { if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self)) && !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) { - WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; - if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) { - List actions = new LinkedList(); + ActivateCardAction action = new ActivateCardAction(self); + action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo())); + action.appendEffect(new AddBurdenEffect(self, 1)); + action.appendEffect(new PutOnTheOneRingEffect()); - ActivateCardAction action = new ActivateCardAction(self); - action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo())); - action.appendEffect(new AddBurdenEffect(self, 1)); - action.appendEffect(new PutOnTheOneRingEffect()); - - actions.add(action); - return actions; - } + return Collections.singletonList(action); } return null; } @@ -79,14 +73,10 @@ public class Card11_001 extends AbstractAttachable { if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self)) && game.getGameState().isWearingRing() && !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) { - WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; - if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) { - List actions = new LinkedList(); - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo())); - action.appendEffect(new AddBurdenEffect(self, 1)); - return actions; - } + RequiredTriggerAction action = new RequiredTriggerAction(self); + action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo())); + action.appendEffect(new AddBurdenEffect(self, 1)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/Card9_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/Card9_001.java index 329d9ca97..38a7aea15 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/Card9_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set9/Card9_001.java @@ -88,13 +88,10 @@ public class Card9_001 extends AbstractAttachable { if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self)) && game.getGameState().isWearingRing() && !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.RING_TEXT_INACTIVE)) { - WoundCharactersEffect woundEffect = (WoundCharactersEffect) effect; - if (woundEffect.getAffectedCardsMinusPrevented(game).contains(self.getAttachedTo())) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect(new NegateWoundEffect(woundEffect, self.getAttachedTo())); - action.appendEffect(new AddBurdenEffect(self, 1)); - return Collections.singletonList(action); - } + RequiredTriggerAction action = new RequiredTriggerAction(self); + action.appendEffect(new NegateWoundEffect((WoundCharactersEffect) effect, self.getAttachedTo())); + action.appendEffect(new AddBurdenEffect(self, 1)); + return Collections.singletonList(action); } return null; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index da87da4f7..7952eacd8 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,6 +1,7 @@
 29 Jan. 2012
 - "Whip of Many Thongs" now discards only Free People cards from hand.
+- "The One Rings" should now correctly add burdens instead of wounds if The One Ring is on.
 
 28 Jan. 2012
 - "Watch-tower of Cirith Ungol" now allows to exert only YOUR minion.