diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/LiberateASiteEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/LiberateASiteEffect.java index 4a8e17079..957c6c1a2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/LiberateASiteEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/LiberateASiteEffect.java @@ -81,7 +81,7 @@ public class LiberateASiteEffect extends AbstractEffect { game.getGameState().loseControlOfCard(siteToLiberate, Zone.ADVENTURE_PATH); for (PhysicalCard discardedCard : discardedCards) - game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, discardedCard)); liberatedSiteCallback(siteToLiberate); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnBottomOfDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnBottomOfDeckEffect.java index aab3f7d86..202c54e50 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnBottomOfDeckEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnBottomOfDeckEffect.java @@ -42,8 +42,7 @@ public class PutCardFromPlayOnBottomOfDeckEffect extends AbstractEffect { gameState.putCardOnBottomOfDeck(_physicalCard); for (PhysicalCard discardedCard : discardedCards) { - game.getActionsEnvironment().emitEffectResult( - new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, discardedCard)); } for (PhysicalCard toGoToDiscardCard : toGoToDiscardCards) gameState.addCardToZone(game, toGoToDiscardCard, Zone.DISCARD); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnTopOfDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnTopOfDeckEffect.java index 82b025bc3..b538bc92d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnTopOfDeckEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PutCardFromPlayOnTopOfDeckEffect.java @@ -42,8 +42,7 @@ public class PutCardFromPlayOnTopOfDeckEffect extends AbstractEffect { gameState.putCardOnTopOfDeck(_physicalCard); for (PhysicalCard discardedCard : discardedCards) { - game.getActionsEnvironment().emitEffectResult( - new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, discardedCard)); } for (PhysicalCard toGoToDiscardCard : toGoToDiscardCards) gameState.addCardToZone(game, toGoToDiscardCard, Zone.DISCARD); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReturnCardsToHandEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReturnCardsToHandEffect.java index 10f3468f7..5934bb784 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReturnCardsToHandEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReturnCardsToHandEffect.java @@ -79,7 +79,7 @@ public class ReturnCardsToHandEffect extends AbstractEffect { gameState.sendMessage(GameUtils.getCardLink(_source) + " returns " + getAppendedNames(cardsToReturnToHand) + " to hand"); for (PhysicalCard discardedCard : discardedFromPlay) - game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, discardedCard)); for (PhysicalCard cardReturned : cardsToReturnToHand) game.getActionsEnvironment().emitEffectResult(new ReturnCardsToHandResult(cardReturned)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleCardsFromPlayIntoDeckEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleCardsFromPlayIntoDeckEffect.java index 933885b47..26f08f50e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleCardsFromPlayIntoDeckEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ShuffleCardsFromPlayIntoDeckEffect.java @@ -69,7 +69,7 @@ public class ShuffleCardsFromPlayIntoDeckEffect extends AbstractEffect { game.getGameState().addCardToZone(game, physicalCard, Zone.DISCARD); for (PhysicalCard physicalCard : discardedFromPlay) - game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(physicalCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, physicalCard)); game.getGameState().sendMessage(getAppendedNames(toShuffleIn) + " " + GameUtils.be(toShuffleIn) + " shuffled into " + _playerDeck + " deck"); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/StackCardFromPlayEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/StackCardFromPlayEffect.java index 7f3d94f9f..5a6dbc2ce 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/StackCardFromPlayEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/StackCardFromPlayEffect.java @@ -62,7 +62,7 @@ public class StackCardFromPlayEffect extends AbstractEffect { // Send the result (attached cards get discarded) for (PhysicalCard discardedCard : discardedFromPlayCards) - game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, discardedCard)); return new FullEffectResult(true); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/men/Card12_071.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/men/Card12_071.java index 2db3bed91..b9c2d364a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/men/Card12_071.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/men/Card12_071.java @@ -12,6 +12,7 @@ import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult; import java.util.Collections; import java.util.List; @@ -36,6 +37,7 @@ public class Card12_071 extends AbstractPermanent { && !PlayConditions.isPhase(game, Phase.REGROUP) && PlayConditions.canPlayFromHand(playerId, game, -2, Culture.MEN, CardType.MINION)) { final OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId()+"-"+((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId()); action.appendEffect( new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Culture.MEN, CardType.MINION) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_036.java index 1ee143d5c..71c2d37d6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gondor/Card17_036.java @@ -14,6 +14,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult; import java.util.Collections; import java.util.List; @@ -45,6 +46,7 @@ public class Card17_036 extends AbstractPermanent { if (PlayConditions.isPhase(game, Phase.SKIRMISH) && TriggerConditions.forEachDiscardedFromPlay(game, effectResult, CardType.MINION)) { OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId()+"-"+((DiscardCardsFromPlayResult) effectResult).getDiscardedCard()); action.appendEffect( new ReinforceTokenEffect(self, playerId, Token.GONDOR)); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_041.java index da3c7b81c..3fbcf6f45 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_041.java @@ -43,6 +43,7 @@ public class Card17_041 extends AbstractPermanent { && PlayConditions.isPhase(game, Phase.MANEUVER)) { DiscardCardsFromPlayResult discardResult = (DiscardCardsFromPlayResult) effectResult; OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId()+"-"+discardResult.getDiscardedCard()); action.setText("Stack " + GameUtils.getCardLink(discardResult.getDiscardedCard())); action.appendEffect( new StackCardFromDiscardEffect(discardResult.getDiscardedCard(), self)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_066.java index a9cd30550..b4ef58787 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_066.java @@ -39,6 +39,7 @@ public class Card17_066 extends AbstractPermanent { && PlayConditions.isPhase(game, Phase.MANEUVER)) { OptionalTriggerAction action = new OptionalTriggerAction(self); PhysicalCard discardedCard = ((DiscardCardsFromPlayResult) effectResult).getDiscardedCard(); + action.setTriggerIdentifier(self.getCardId() + "-" + discardedCard.getCardId()); action.setText("Stack " + GameUtils.getCardLink(discardedCard)); action.appendEffect( new StackCardFromDiscardEffect(discardedCard, self)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java index c9df2d016..da282ae8c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_063.java @@ -14,13 +14,11 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -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.EffectResult; +import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult; -import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; /** @@ -38,22 +36,18 @@ public class Card6_063 extends AbstractPermanent { } @Override - public List getOptionalBeforeTriggers(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - if (TriggerConditions.isGettingDiscarded(effect, game, Culture.ISENGARD, Race.ORC)) { - DiscardCardsFromPlayEffect discardEffect = (DiscardCardsFromPlayEffect) effect; + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Culture.ISENGARD, Race.ORC)) { + DiscardCardsFromPlayResult discardResult = (DiscardCardsFromPlayResult) effectResult; if (game.getGameState().getCurrentPhase() == Phase.REGROUP - && discardEffect.getSource() != null) { - List actions = new LinkedList(); - final Collection discardedOrcs = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Culture.ISENGARD, Race.ORC); - for (final PhysicalCard discardedOrc : discardedOrcs) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); - action.appendEffect( - new StackCardFromPlayEffect(discardedOrc, self)); - actions.add(action); - } - - return actions; + && discardResult.getSource() != null) { + PhysicalCard discardedOrc = discardResult.getDiscardedCard(); + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId()+"-"+discardedOrc.getCardId()); + action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); + action.appendEffect( + new StackCardFromPlayEffect(discardedOrc, self)); + return Collections.singletonList(action); } } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java index a5a69b0d3..c945ccc79 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_064.java @@ -14,13 +14,11 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -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.EffectResult; +import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult; -import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; /** @@ -38,22 +36,18 @@ public class Card6_064 extends AbstractPermanent { } @Override - public List getOptionalBeforeTriggers(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - if (TriggerConditions.isGettingDiscarded(effect, game, Culture.ISENGARD, Race.ORC)) { - DiscardCardsFromPlayEffect discardEffect = (DiscardCardsFromPlayEffect) effect; + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Culture.ISENGARD, Race.ORC)) { + DiscardCardsFromPlayResult discardResult = (DiscardCardsFromPlayResult) effectResult; if (game.getGameState().getCurrentPhase() == Phase.REGROUP - && discardEffect.getSource() != null) { - List actions = new LinkedList(); - final Collection discardedOrcs = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Culture.ISENGARD, Race.ORC); - for (final PhysicalCard discardedOrc : discardedOrcs) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); - action.appendEffect( - new StackCardFromPlayEffect(discardedOrc, self)); - actions.add(action); - } - - return actions; + && discardResult.getSource() != null) { + PhysicalCard discardedOrc = discardResult.getDiscardedCard(); + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId()+"-"+discardedOrc.getCardId()); + action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); + action.appendEffect( + new StackCardFromPlayEffect(discardedOrc, self)); + return Collections.singletonList(action); } } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java index 666d5d3bc..8447e0ec1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/isengard/Card6_073.java @@ -13,13 +13,12 @@ import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; -import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; import com.gempukku.lotro.logic.timing.Effect; +import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult; -import java.util.Collection; import java.util.Collections; -import java.util.LinkedList; import java.util.List; /** @@ -38,28 +37,23 @@ public class Card6_073 extends AbstractPermanent { } @Override - public List getOptionalBeforeTriggers(String playerId, LotroGame game, Effect effect, PhysicalCard self) { - if (TriggerConditions.isGettingDiscarded(effect, game, Culture.ISENGARD, Race.ORC)) { - DiscardCardsFromPlayEffect discardEffect = (DiscardCardsFromPlayEffect) effect; + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Culture.ISENGARD, Race.ORC)) { + DiscardCardsFromPlayResult discardResult = (DiscardCardsFromPlayResult) effectResult; if (game.getGameState().getCurrentPhase() == Phase.REGROUP - && discardEffect.getSource() != null) { - List actions = new LinkedList(); - final Collection discardedOrcs = Filters.filter(discardEffect.getAffectedCardsMinusPrevented(game), game.getGameState(), game.getModifiersQuerying(), Culture.ISENGARD, Race.ORC); - for (final PhysicalCard discardedOrc : discardedOrcs) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); - action.appendEffect( - new StackCardFromPlayEffect(discardedOrc, self)); - actions.add(action); - } - - return actions; + && discardResult.getSource() != null) { + PhysicalCard discardedOrc = discardResult.getDiscardedCard(); + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId()+"-"+discardedOrc.getCardId()); + action.setText("Stack " + GameUtils.getCardLink(discardedOrc)); + action.appendEffect( + new StackCardFromPlayEffect(discardedOrc, self)); + return Collections.singletonList(action); } } return null; } - @Override public List getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) { if (TriggerConditions.isGettingWounded(effect, game, Culture.ISENGARD, Race.ORC) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java index 66ab10150..8edf6a765 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java @@ -91,6 +91,6 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect { game.getGameState().sendMessage(_source.getOwner() + " discards " + getAppendedNames(discardedCards) + " from play using " + GameUtils.getCardLink(_source)); for (PhysicalCard discardedCard : discardedCards) - game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(_source, discardedCard)); } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java index 0d012510d..03dcf44d3 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java @@ -103,7 +103,7 @@ public class KillEffect extends AbstractSuccessfulEffect { for (PhysicalCard killedCard : killedCards) game.getActionsEnvironment().emitEffectResult(new ForEachKilledResult(killedCard, _cause)); for (PhysicalCard discardedCard : discardedCards) - game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(discardedCard)); + game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(null, discardedCard)); } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/DiscardCardsFromPlayResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/DiscardCardsFromPlayResult.java index e1ba47b20..eb2d25877 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/DiscardCardsFromPlayResult.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/DiscardCardsFromPlayResult.java @@ -4,14 +4,20 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.logic.timing.EffectResult; public class DiscardCardsFromPlayResult extends EffectResult { + private PhysicalCard _source; private PhysicalCard _card; - public DiscardCardsFromPlayResult(PhysicalCard card) { + public DiscardCardsFromPlayResult(PhysicalCard source, PhysicalCard card) { super(EffectResult.Type.FOR_EACH_DISCARDED_FROM_PLAY); + _source = source; _card = card; } public PhysicalCard getDiscardedCard() { return _card; } + + public PhysicalCard getSource() { + return _source; + } } 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 39eacaa86..e36e8ed15 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 @@ -7,6 +7,8 @@ response.setDateHeader ("Expires", -1); 
 04 Jan. 2013
 - If FP player uses Muster, shadow player is now also able to use it.
+- "Gnawing, Biting, Hacking, Burning" and similar cards should now allow to stack multiple minions if they are discarded
+at the same time.
 
 03 Jan. 2013
 - "Legolas, Elven Comrade" now should automatically allow to choose a minion skirmishing an unbound companion.