From ea68584dabdca9688ec4ee0d22ec443d27849619 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 12 Dec 2012 02:42:51 +0000 Subject: [PATCH] - "Strength of Spirit" no longer cancels an effect if the exertion was a cost. --- .../lotro/cards/effects/ExertCharactersEffect.java | 10 +++++++++- .../gempukku/lotro/cards/set1/gandalf/Card1_085.java | 4 +--- .../src/main/webapp/includes/changeLog.html | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java index dc2ddeb7c..fe3d0df83 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ExertCharactersEffect.java @@ -13,10 +13,13 @@ import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.results.ExertResult; import java.util.Collection; +import java.util.HashSet; +import java.util.Set; public class ExertCharactersEffect extends AbstractPreventableCardEffect { private Action _action; private PhysicalCard _source; + private Set _placeNoWound = new HashSet(); public ExertCharactersEffect(Action action, PhysicalCard source, Filterable... filter) { super(filter); @@ -58,8 +61,13 @@ public class ExertCharactersEffect extends AbstractPreventableCardEffect { game.getGameState().sendMessage(getAppendedNames(cards) + " exert" + GameUtils.s(cards) + " due to " + GameUtils.getCardLink(_source)); for (PhysicalCard woundedCard : cards) { - game.getGameState().addWound(woundedCard); + if (!_placeNoWound.contains(woundedCard)) + game.getGameState().addWound(woundedCard); game.getActionsEnvironment().emitEffectResult(new ExertResult(_action, woundedCard)); } } + + public void placeNoWoundOn(PhysicalCard physicalCard) { + _placeNoWound.add(physicalCard); + } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_085.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_085.java index 2f52a1860..4bb5526bc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_085.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_085.java @@ -4,7 +4,6 @@ import com.gempukku.lotro.cards.AbstractResponseOldEvent; import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.effects.ExertCharactersEffect; -import com.gempukku.lotro.cards.effects.PreventCardEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; @@ -50,8 +49,7 @@ public class Card1_085 extends AbstractResponseOldEvent { new ChooseActiveCardEffect(self, playerId, "Choose character", CardType.COMPANION, Filters.in(exertedCharacters)) { @Override protected void cardSelected(LotroGame game, PhysicalCard card) { - action.appendEffect( - new PreventCardEffect(exertEffect, card)); + exertEffect.placeNoWoundOn(card); } }); return Collections.singletonList(action); 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 dc8c7157e..45799ad6f 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,4 +1,7 @@
+12 Dec. 2012
+- "Strength of Spirit" no longer cancels an effect if the exertion was a cost.
+
 27 Nov. 2012
 - "Cliffs of Emyn Muil" should have a default value of 2 for removing burdens.