From f0e0792c920ef0ac3a3db3de71f5a55329d404ee Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sat, 3 Sep 2011 14:49:15 +0000 Subject: [PATCH] "Goblin Runner", fixing "The One Ring" and choice actions. --- .../lotro/cards/effects/ChoiceEffect.java | 2 +- .../gempukku/lotro/cards/set1/Card1_001.java | 2 +- .../lotro/cards/set1/moria/Card1_178.java | 44 +++++++++++++++++++ .../lotro/game/LotroCardBlueprintLibrary.java | 2 +- .../java/com/gempukku/lotro/LotroServer.java | 3 ++ 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java index 9ace1d13b..dd8b9c3a2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ChoiceEffect.java @@ -41,7 +41,7 @@ public class ChoiceEffect extends UnrespondableEffect { possibleEffects.add(effect); } - if (possibleEffects.size() > 1) { + if (possibleEffects.size() == 1) { if (_addedAsCost) _action.addCost(possibleEffects.get(0)); else diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java index cbc13c8d3..a0b1390ae 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java @@ -61,7 +61,7 @@ public class Card1_001 extends AbstractLotroCardBlueprint { action.addEffect(new AddBurdenEffect(playerId)); action.addEffect(new AddBurdenEffect(playerId)); action.addEffect(new PutOnTheOneRingEffect()); - action.addEffect(new AddUntilEndOfPhaseActionProxyEffect( + action.addEffect(new AddUntilStartOfPhaseActionProxyEffect( new AbstractActionProxy() { @Override public List getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java new file mode 100644 index 000000000..e7f9b1dbc --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java @@ -0,0 +1,44 @@ +package com.gempukku.lotro.cards.set1.moria; + +import com.gempukku.lotro.cards.AbstractMinion; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.AddTwilightEffect; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Keyword; +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.CostToEffectAction; +import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.timing.EffectResult; + +import java.util.Collections; +import java.util.List; + +/** + * Set: The Fellowship of the Ring + * Side: Shadow + * Culture: Moria + * Twilight Cost: 1 + * Type: Minion • Orc + * Strength: 5 + * Vitality: 1 + * Site: 4 + * Game Text: When you play this minion, you may add (2). + */ +public class Card1_178 extends AbstractMinion { + public Card1_178() { + super(1, 5, 1, 4, Culture.MORIA, "Goblin Runner"); + addKeyword(Keyword.ORC); + } + + @Override + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (PlayConditions.played(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.sameCard(self))) { + CostToEffectAction action = new CostToEffectAction(self, null, "You mad add (2)"); + action.addEffect(new AddTwilightEffect(2)); + return Collections.singletonList(action); + } + return null; + } +} diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java index 6146623e6..153d7bdc3 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java @@ -6,7 +6,7 @@ import java.util.Map; public class LotroCardBlueprintLibrary { private String[] _packageNames = new String[]{ - "", ".dwarven", ".elven", ".isengard", ".shire", ".site" + "", ".dwarven", ".elven", ".isengard", ".moria", ".shire", ".site" }; private Map _blueprintMap = new HashMap(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroServer.java index e7da6cf33..3a15cfdfc 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/LotroServer.java @@ -56,6 +56,9 @@ public class LotroServer { for (int i = 3; i <= 68; i++) lotroDeck.addCard("1_" + i); + for (int i = 0; i < 30; i++) + lotroDeck.addCard("1_178"); + // Sites lotroDeck.addSite("1_326"); lotroDeck.addSite("1_331");