From dd2da6ebc80b2331eeb2202926f96f2c4f662187 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 14 Oct 2011 16:46:33 +0000 Subject: [PATCH] Simplifying strength bonus effects. --- .../lotro/cards/set1/moria/Card1_188.java | 13 ++-------- .../lotro/cards/set1/moria/Card1_201.java | 24 ++++--------------- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_188.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_188.java index e67e42335..f675a149c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_188.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_188.java @@ -2,8 +2,7 @@ package com.gempukku.lotro.cards.set1.moria; import com.gempukku.lotro.cards.AbstractPermanent; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.cards.modifiers.StrengthModifier; +import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -11,7 +10,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; -import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; @@ -40,14 +38,7 @@ public class Card1_188 extends AbstractPermanent { action.appendCost( new DiscardCardsFromPlayEffect(self, self)); action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose your MORIA Orc", Filters.owner(self.getOwner()), Filters.culture(Culture.MORIA), Filters.race(Race.ORC)) { - @Override - protected void cardSelected(LotroGame game, PhysicalCard moriaOrc) { - action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(moriaOrc), 2), Phase.SKIRMISH)); - } - }); + new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, 2, Filters.owner(playerId), Filters.culture(Culture.MORIA), Filters.race(Race.ORC))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_201.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_201.java index 58dcaff70..b2d7fd45e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_201.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_201.java @@ -2,14 +2,12 @@ package com.gempukku.lotro.cards.set1.moria; import com.gempukku.lotro.cards.AbstractEvent; import com.gempukku.lotro.cards.actions.PlayEventAction; -import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.cards.modifiers.StrengthModifier; +import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; +import com.gempukku.lotro.cards.modifiers.evaluator.CardMatchesEvaluator; 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.game.state.Skirmish; -import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; /** * Set: The Fellowship of the Ring @@ -28,21 +26,9 @@ public class Card1_201 extends AbstractEvent { public PlayEventAction getPlayCardAction(String playerId, final LotroGame game, final PhysicalCard self, int twilightModifier) { final PlayEventAction action = new PlayEventAction(self); action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose a MORIA Orc", Filters.culture(Culture.MORIA), Filters.race(Race.ORC)) { - @Override - protected void cardSelected(LotroGame game, PhysicalCard moriaOrc) { - int bonus = 2; - Skirmish skirmish = game.getGameState().getSkirmish(); - if (skirmish != null && skirmish.getFellowshipCharacter() != null - && game.getModifiersQuerying().hasKeyword(game.getGameState(), skirmish.getFellowshipCharacter(), Keyword.ARCHER) - && skirmish.getShadowCharacters().contains(moriaOrc)) { - bonus = 4; - } - action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new StrengthModifier(self, Filters.sameCard(moriaOrc), bonus), Phase.SKIRMISH)); - } - }); + new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId, + new CardMatchesEvaluator(2, 4, Filters.inSkirmishAgainst(Filters.keyword(Keyword.ARCHER))), + Filters.culture(Culture.MORIA), Filters.race(Race.ORC))); return action; }