From 3508f45e5f1c5a741025324211d735428caca503 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 14 Mar 2013 10:59:04 +0000 Subject: [PATCH] - "Gandalf's Pipe" is now a Fellowship activated ability, not a trigger (per card text). --- .../src/main/web/includes/changeLog.html | 1 + .../lotro/cards/set20/gandalf/Card20_158.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) 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 741976afc..fbe9d935b 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 @@ -5,6 +5,7 @@ - "Build Me an Army" now correctly adds Fierce (and Damage +1) modifiers. - "Retribution" now gives a strength bonus to Dwarf only. - "Peering Forward" now adds the strength penalty till Regroup, rather than end of phase. +- "Gandalf's Pipe" is now a Fellowship activated ability, not a trigger (per card text). 13 Mar. 2013 - "Waylayed" now wounds 1 companion 4 times, instead of 4 companions once. diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_158.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_158.java index d8faf1d10..c377916e7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_158.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_158.java @@ -2,14 +2,14 @@ package com.gempukku.lotro.cards.set20.gandalf; import com.gempukku.lotro.cards.AbstractAttachableFPPossession; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.TriggerConditions; +import com.gempukku.lotro.cards.effects.CheckTurnLimitEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.OptionalTriggerAction; -import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.actions.ActivateCardAction; +import com.gempukku.lotro.logic.timing.Action; import java.util.Collections; import java.util.List; @@ -32,15 +32,16 @@ public class Card20_158 extends AbstractAttachableFPPossession { } @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.startOfPhase(game, effectResult, Phase.FELLOWSHIP) + protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) && PlayConditions.canDiscardFromPlay(self, game, CardType.POSSESSION, Keyword.PIPEWEED) && PlayConditions.canSpot(game, 2, PossessionClass.PIPE)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); + ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION, Keyword.PIPEWEED)); action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 0, 2, Side.SHADOW, CardType.CONDITION)); + new CheckTurnLimitEffect(action, self, 1, + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 0, 2, Side.SHADOW, CardType.CONDITION))); return Collections.singletonList(action); } return null;