diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java index e73640189..413096094 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gandalf/Card4_103.java @@ -16,6 +16,7 @@ import com.gempukku.lotro.logic.effects.ChooseArbitraryCardsEffect; import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; +import com.gempukku.lotro.logic.timing.UnrespondableEffect; import java.util.Collection; import java.util.Collections; @@ -42,7 +43,7 @@ public class Card4_103 extends AbstractAlly { @Override public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, final PhysicalCard self) { if (TriggerConditions.isGettingDiscarded(effect, game, Race.HOBBIT, Filters.unboundCompanion)) { - DiscardCardsFromPlayEffect discardEffect = (DiscardCardsFromPlayEffect) effect; + final DiscardCardsFromPlayEffect discardEffect = (DiscardCardsFromPlayEffect) effect; Collection discardedHobbits = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Filters.unboundCompanion, Race.HOBBIT); final ActivateCardAction action = new ActivateCardAction(self); action.appendEffect( @@ -51,6 +52,13 @@ public class Card4_103 extends AbstractAlly { protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( new StackCardFromPlayEffect(card, self)); + action.appendEffect( + new UnrespondableEffect() { + @Override + protected void doPlayEffect(LotroGame game) { + discardEffect.incrementInstead(); + } + }); } }); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java index a8c83d7fe..23457c661 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/AbstractPreventableCardEffect.java @@ -13,6 +13,7 @@ public abstract class AbstractPreventableCardEffect extends AbstractEffect { private Filter _filter; private Set _preventedTargets = new HashSet(); private int _requiredTargets; + private int _insteadCount; public AbstractPreventableCardEffect(PhysicalCard... cards) { List affectedCards = Arrays.asList(cards); @@ -48,10 +49,14 @@ public abstract class AbstractPreventableCardEffect extends AbstractEffect { Collection affectedCards = getAffectedCards(game); Collection affectedMinusPreventedCards = getAffectedCardsMinusPrevented(game); playoutEffectOn(game, affectedMinusPreventedCards); - return new FullEffectResult(affectedCards.size() >= _requiredTargets, affectedMinusPreventedCards.size() >= _requiredTargets); + return new FullEffectResult(affectedCards.size() + _insteadCount >= _requiredTargets, affectedMinusPreventedCards.size() >= _requiredTargets); } public void preventEffect(LotroGame game, PhysicalCard card) { _preventedTargets.add(card); } + + public void incrementInstead() { + _insteadCount++; + } } 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 a608f68ee..8bd6e2a13 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 @@
 5 Mar. 2012
 - "Discard to heal" actions now shows the card to the opponent, the same way, as in case of played events.
+- Stacking discarded Hobbits on Treebeard should no longer cancel their action, for which the cost was discarding them.
 
 3 Mar. 2012
 - "The Palantir of Orthanc, Recovered Seeing Stone" should no longer discard itself.