ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- "Clan of the Hills" is now an optional trigger, not an action.

Browse Source
This commit is contained in:
marcins78
2013-03-25 11:34:27 +00:00
parent b7f812e541
commit 626feade2c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -7,6 +7,7 @@
- "Wizard's Wrath" now correctly exerts Saruman. - "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. - "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). - "Southron Packmaster" is strength 10 (per card text).
- "Clan of the Hills" is now an optional trigger, not an action.
<b>20 Mar. 2013</b> <b>20 Mar. 2013</b>
- "Uruk Mender" has now 8 strength (per card text). - "Uruk Mender" has now 8 strength (per card text).

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_014.java
View File

@@ -13,7 +13,7 @@ import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame; 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.modifiers.Modifier;
import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.EffectResult;
@@ -44,10 +44,10 @@ public class Card20_014 extends AbstractMinion {
} }
@Override @Override
public List<? extends ActivateCardAction> getOptionalInPlayAfterActions(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
if (TriggerConditions.winsSkirmish(game, effectResult, self) if (TriggerConditions.winsSkirmish(game, effectResult, self)
&& PlayConditions.canDiscardFromPlay(self, game, Filters.not(self), Culture.DUNLAND, Race.MAN)) { && 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( action.appendCost(
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.not(self), Culture.DUNLAND, Race.MAN)); new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.not(self), Culture.DUNLAND, Race.MAN));
action.appendEffect( action.appendEffect(