From 8a095b51759988313f2ef7c0f29c8a05d7b81fb1 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 13 May 2012 17:02:59 +0000 Subject: [PATCH] - "Isengard Ruined" should now correctly allow to exert companion twice. - "Ulaire Otsea, Ringwraith in Twilight" and "Morgul Blade" no longer allow to attach Blade Tip to a character that already carries one. - "Assault Commander" now gives -1 resistance, rather than +1. - "Shingle in a Storm" now correctly discards itself upon use. --- .../com/gempukku/lotro/cards/set1/wraith/Card1_216.java | 2 +- .../gempukku/lotro/cards/set12/uruk_hai/Card12_145.java | 2 ++ .../gempukku/lotro/cards/set13/uruk_hai/Card13_158.java | 3 ++- .../com/gempukku/lotro/cards/set15/site/Card15_192.java | 2 +- .../com/gempukku/lotro/cards/set3/wraith/Card3_086.java | 2 +- .../gemp-lotr-web/src/main/webapp/includes/changeLog.html | 7 +++++++ 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java index b599e5713..97604698c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java @@ -65,7 +65,7 @@ public class Card1_216 extends AbstractAttachable { List possibleEffects = new LinkedList(); if (bladeTipInSupport != null) { possibleEffects.add( - new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.inSkirmishAgainst(self.getAttachedTo())) { + new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.inSkirmishAgainst(self.getAttachedTo()), Filters.not(Filters.hasAttached(Filters.name("Blade Tip")))) { @Override protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_145.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_145.java index 0c1024a76..67f50e17d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_145.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_145.java @@ -2,6 +2,7 @@ package com.gempukku.lotro.cards.set12.uruk_hai; import com.gempukku.lotro.cards.AbstractPermanent; import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.effects.SelfDiscardEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndDoAssignmentEffect; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; @@ -40,6 +41,7 @@ public class Card12_145 extends AbstractPermanent { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, self, 0) && PlayConditions.canSelfDiscard(self, game)) { final ActivateCardAction action = new ActivateCardAction(self); + action.appendCost(new SelfDiscardEffect(self)); action.appendEffect( new ChooseAndDoAssignmentEffect(action, playerId, Culture.URUK_HAI, Filters.and(CardType.COMPANION, Filters.maxResistance(2)))); return Collections.singletonList(action); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_158.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_158.java index 80fb415ce..8ec190585 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_158.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_158.java @@ -6,6 +6,7 @@ import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; import com.gempukku.lotro.cards.effects.SelfExertEffect; import com.gempukku.lotro.cards.modifiers.ResistanceModifier; import com.gempukku.lotro.cards.modifiers.evaluator.CountActiveEvaluator; +import com.gempukku.lotro.cards.modifiers.evaluator.MultiplyEvaluator; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -54,7 +55,7 @@ public class Card13_158 extends AbstractMinion { action.appendEffect( new AddUntilEndOfPhaseModifierEffect( new ResistanceModifier(self, companion, null, - new CountActiveEvaluator(Filters.name(condition.getBlueprint().getName()))), + new MultiplyEvaluator(-1, new CountActiveEvaluator(Filters.name(condition.getBlueprint().getName())))), Phase.SHADOW)); } }); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/site/Card15_192.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/site/Card15_192.java index b767e0e3d..0db9389c3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/site/Card15_192.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/site/Card15_192.java @@ -30,7 +30,7 @@ public class Card15_192 extends AbstractNewSite { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - final PlayOrder playOrder = game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(playerId, false); + final PlayOrder playOrder = game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(game.getGameState().getCurrentPlayerId(), false); playOrder.getNextPlayer(); final String firstShadowPlayer = playOrder.getNextPlayer(); if (TriggerConditions.transferredCard(game, effectResult, CardType.FOLLOWER, null, Filters.character) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java index 08bee8d70..6e919d634 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java @@ -46,7 +46,7 @@ public class Card3_086 extends AbstractMinion { @Override protected void cardSelected(LotroGame game, PhysicalCard card) { action.insertEffect( - new TransferPermanentEffect(card, Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer))); + new TransferPermanentEffect(card, Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.not(Filters.hasAttached(Filters.name("Blade Tip")))))); } }); return Collections.singletonList(action); 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 f0f2e20ea..42a879245 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,11 @@ 
+13 May 2012
+- "Isengard Ruined" should now correctly allow to exert companion twice.
+- "Ulaire Otsea, Ringwraith in Twilight" and "Morgul Blade" no longer allow to attach Blade Tip to a character that
+already carries one.
+- "Assault Commander" now gives -1 resistance, rather than +1.
+- "Shingle in a Storm" now correctly discards itself upon use.
+
 09 May 2012
 - "Wrath of Harad" should now no longer freeze the game.