diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index e6818fa1e..54495b61a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -33,6 +33,7 @@ - "Gwaihir" no longer crashed the game, when it is not attached to anything and has its Skirmish action activated. - "Bolg, Servant of Sauron" can now only be used in Maneuver phase. - "Burglar's Contract" can now be used in Skirmish. +- "Crazy Cob" can now also play minions when Orcs are killed. 17 Dec. 2015 - "Armor of Khazad" no longer allows to return itself from discard and can now be transferred. diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java index 4c1f48c34..fbe9fd320 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java @@ -40,24 +40,40 @@ public class Card31_057 extends AbstractMinion { addKeyword(Keyword.FIERCE); } - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { - if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Race.ORC) - && !PlayConditions.isPhase(game, Phase.REGROUP) - && PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) { - final OptionalTriggerAction action = new OptionalTriggerAction(self); - action.setTriggerIdentifier(self.getCardId()+"-"+((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId()); - action.appendEffect( - new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Race.SPIDER) { - @Override - protected void afterCardPlayed(PhysicalCard cardPlayed) { - action.appendEffect( - new AddUntilStartOfPhaseModifierEffect( - new StrengthModifier(self, cardPlayed, 2), Phase.REGROUP)); - } - }); - return Collections.singletonList(action); + @Override + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, Race.ORC) + && !PlayConditions.isPhase(game, Phase.REGROUP) + && PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) { + final OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId() + "-" + ((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId()); + action.appendEffect( + new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Race.SPIDER) { + @Override + protected void afterCardPlayed(PhysicalCard cardPlayed) { + action.appendEffect( + new AddUntilStartOfPhaseModifierEffect( + new StrengthModifier(self, cardPlayed, 2), Phase.REGROUP)); + } + }); + return Collections.singletonList(action); + } + if (TriggerConditions.forEachKilled(game, effectResult, Race.ORC) + && !PlayConditions.isPhase(game, Phase.REGROUP) + && PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) { + final OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setTriggerIdentifier(self.getCardId() + "-" + ((DiscardCardsFromPlayResult) effectResult).getDiscardedCard().getCardId()); + action.appendEffect( + new ChooseAndPlayCardFromHandEffect(playerId, game, -2, Race.SPIDER) { + @Override + protected void afterCardPlayed(PhysicalCard cardPlayed) { + action.appendEffect( + new AddUntilStartOfPhaseModifierEffect( + new StrengthModifier(self, cardPlayed, 2), Phase.REGROUP)); + } + }); + return Collections.singletonList(action); + } + return null; } - return null; - } }