From cb17625d92934f0142024d4ee7df45b8427cc227 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 30 Aug 2011 21:22:51 +0000 Subject: [PATCH] Another bunch of fixes. --- .../java/com/gempukku/lotro/cards/set1/elven/Card1_057.java | 2 +- .../java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java | 3 ++- .../src/main/java/com/gempukku/lotro/filters/Filters.java | 3 +++ .../com/gempukku/lotro/logic/modifiers/ModifiersLogic.java | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java index 272c710ba..cb23b2262 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java @@ -31,7 +31,7 @@ import java.util.List; */ public class Card1_057 extends AbstractAlly { public Card1_057() { - super(2, 6, 3, 3, Culture.ELVEN, "Rúmil", "1_56", true); + super(2, 6, 3, 3, Culture.ELVEN, "Rúmil", "1_57", true); addKeyword(Keyword.ELF); addKeyword(Keyword.ARCHER); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java index a5f2ce528..7baf252e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set1.isengard; import com.gempukku.lotro.cards.AbstractMinion; +import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; @@ -40,7 +41,7 @@ public class Card1_146 extends AbstractMinion { appendPlayMinionAction(actions, lotroGame, self); - if (lotroGame.getGameState().getCurrentPhase() == Phase.MANEUVER + if (PlayConditions.canUseShadowCardDuringPhase(lotroGame.getGameState(), Phase.MANEUVER, self, 0) && Filters.countActive(lotroGame.getGameState(), lotroGame.getModifiersQuerying(), Filters.type(CardType.COMPANION)) >= 5) { CostToEffectAction action = new CostToEffectAction(self, "Spot 5 companions to make this minion fierce until the regroup phase"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java index eae315d02..8b2ecbb41 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java @@ -158,6 +158,9 @@ public class Filters { return new Filter() { @Override public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { + if (physicalCard == null) { + System.out.println("Blah!"); + } return (physicalCard.getBlueprint().getCardType() == cardType); } }; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java index 42a567ec0..69cb328fd 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java @@ -142,6 +142,8 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying { } private boolean appliesStrengthModifier(GameState gameState, PhysicalCard modifierSource) { + if (modifierSource == null) + return true; boolean result = true; for (Modifier modifier : _modifiers) { if (affectsCardWithSkipSet(gameState, modifierSource, modifier))