From 52eba78ab6bff11984ebf993d6994983ee4edf02 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 12 Oct 2011 23:28:43 +0000 Subject: [PATCH] "Verily I Come" and "Desperate Defense of the Ring" now correctly exert the SAURON Orcs "The Bridge of Khazad-Dum" now allows to play "The Balrog" "Eregion Hills" now correctly adds Burden "Vilya" now does not freeze the game --- .../gempukku/lotro/cards/set1/sauron/Card1_244.java | 13 ++++++++++++- .../gempukku/lotro/cards/set1/site/Card1_349.java | 4 ++-- .../gempukku/lotro/cards/set2/sauron/Card2_094.java | 10 ++++++++++ .../gempukku/lotro/cards/set3/elven/Card3_027.java | 2 +- .../gempukku/lotro/cards/set3/site/Card3_116.java | 2 +- .../src/main/webapp/includes/changeLog.html | 6 ++++++ 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_244.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_244.java index c91af04d2..d9997974f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_244.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_244.java @@ -1,9 +1,12 @@ package com.gempukku.lotro.cards.set1.sauron; import com.gempukku.lotro.cards.AbstractAttachable; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.actions.AttachPermanentAction; import com.gempukku.lotro.cards.effects.AddBurdenEffect; import com.gempukku.lotro.cards.effects.ChoiceEffect; import com.gempukku.lotro.cards.effects.ChooseAndDiscardCardsFromHandEffect; +import com.gempukku.lotro.cards.effects.ChooseAndExertCharactersEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Race; @@ -43,7 +46,15 @@ public class Card1_244 extends AbstractAttachable { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, Filter additionalAttachmentFilter, int twilightModifier) { return super.checkPlayRequirements(playerId, game, self, additionalAttachmentFilter, twilightModifier) - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.SAURON), Filters.race(Race.ORC)); + && PlayConditions.canExert(self, game, Filters.culture(Culture.SAURON), Filters.race(Race.ORC)); + } + + @Override + public AttachPermanentAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, Filter additionalAttachmentFilter, int twilightModifier) { + AttachPermanentAction permanentAction = super.getPlayCardAction(playerId, game, self, additionalAttachmentFilter, twilightModifier); + permanentAction.appendCost( + new ChooseAndExertCharactersEffect(permanentAction, playerId, 1, 1, Filters.culture(Culture.SAURON), Filters.race(Race.ORC))); + return permanentAction; } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java index 5bf7069d4..07a02a55c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_349.java @@ -38,10 +38,10 @@ public class Card1_349 extends AbstractSite { ActivateCardAction action = new ActivateCardAction(self); List possibleEffects = new LinkedList(); - if (Filters.filter(game.getGameState().getHand(playerId), game.getGameState(), game.getModifiersQuerying(), Filters.name("Balrog"), Filters.playable(game, -6)).size() > 0) { + if (Filters.filter(game.getGameState().getHand(playerId), game.getGameState(), game.getModifiersQuerying(), Filters.name("The Balrog"), Filters.playable(game, -6)).size() > 0) { // Play from hand possibleEffects.add( - new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), Filters.name("Balrog"), -6)); + new ChooseAndPlayCardFromHandEffect(playerId, game.getGameState().getHand(playerId), Filters.name("The Balrog"), -6)); } // Play from deck diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_094.java index 6e14cef34..8cecfcc29 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_094.java @@ -2,7 +2,9 @@ package com.gempukku.lotro.cards.set2.sauron; import com.gempukku.lotro.cards.AbstractAttachable; import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.actions.AttachPermanentAction; import com.gempukku.lotro.cards.effects.AddBurdenEffect; +import com.gempukku.lotro.cards.effects.ChooseAndExertCharactersEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; @@ -35,6 +37,14 @@ public class Card2_094 extends AbstractAttachable { && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.SAURON), Filters.race(Race.ORC)); } + @Override + public AttachPermanentAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, Filter additionalAttachmentFilter, int twilightModifier) { + AttachPermanentAction action = super.getPlayCardAction(playerId, game, self, additionalAttachmentFilter, twilightModifier); + action.appendCost( + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.culture(Culture.SAURON), Filters.race(Race.ORC))); + return action; + } + @Override protected Filter getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { return Filters.keyword(Keyword.RING_BEARER); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java index bd04afeb6..c4e831f27 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_027.java @@ -38,7 +38,7 @@ public class Card3_027 extends AbstractAttachableFPPossession { @Override protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseFPCardDuringPhase(game.getGameState(), Phase.MANEUVER, self) - && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), 2, Filters.sameCard(self)) + && PlayConditions.canExert(self, game.getGameState(), game.getModifiersQuerying(), 2, Filters.hasAttached(self)) && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.side(Side.SHADOW), Filters.type(CardType.CONDITION))) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_116.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_116.java index 970f8d1bf..3e6812f94 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_116.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/site/Card3_116.java @@ -26,7 +26,7 @@ public class Card3_116 extends AbstractSite { @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_TO - && game.getGameState().getCurrentSite() == this) { + && game.getGameState().getCurrentSite() == self) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddBurdenEffect(self, 1)); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index b2a42edb5..0a8f8fe7e 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,10 @@ 
+13 Oct. 2011
+- "Verily I Come" and "Desperate Defense of the Ring" now correctly exert the SAURON Orcs
+- "The Bridge of Khazad-Dum" now allows to play "The Balrog"
+- "Eregion Hills" now correctly adds Burden
+- "Vilya" now does not freeze the game
+
 6 Oct. 2011
 - "Hollowing of Isengard" now correctly discards itself upon use.
 - Playing attached permanents now can have twilight cost modified (as for example per "Fell Voice on the Air").