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 16ee0ab7b..e839084da 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 @@ -7,6 +7,7 @@ - "Wizard's Wrath" now correctly exerts Saruman. - "Orthanc Pinnacle" should now allow to exert a companion, even if the companion skirmishing Saruman dies in the skirmish. - "Southron Packmaster" is strength 10 (per card text). +- "Clan of the Hills" is now an optional trigger, not an action. 20 Mar. 2013 - "Uruk Mender" has now 8 strength (per card text). diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java index 1c0e749a8..357cfadee 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java @@ -13,7 +13,7 @@ import com.gempukku.lotro.common.Race; 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.ActivateCardAction; +import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.timing.EffectResult; @@ -44,10 +44,10 @@ public class Card20_014 extends AbstractMinion { } @Override - public List getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.winsSkirmish(game, effectResult, self) && PlayConditions.canDiscardFromPlay(self, game, Filters.not(self), Culture.DUNLAND, Race.MAN)) { - final ActivateCardAction action = new ActivateCardAction(self); + final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.not(self), Culture.DUNLAND, Race.MAN)); action.appendEffect(