From bc644258ff678e0dbf5e29de7fdd547e753c46cf Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 4 Oct 2011 21:13:02 +0000 Subject: [PATCH] Merging SHADOW_SUPPORT and FREE_SUPPORT into one SUPPORT zone. --- .../java/com/gempukku/lotro/cards/AbstractAlly.java | 2 +- .../com/gempukku/lotro/cards/PlayConditions.java | 8 ++++---- .../gempukku/lotro/cards/set1/dwarven/Card1_016.java | 2 +- .../gempukku/lotro/cards/set1/dwarven/Card1_020.java | 2 +- .../gempukku/lotro/cards/set1/dwarven/Card1_021.java | 2 +- .../gempukku/lotro/cards/set1/dwarven/Card1_024.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_043.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_046.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_054.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_055.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_059.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_061.java | 2 +- .../gempukku/lotro/cards/set1/gandalf/Card1_073.java | 2 +- .../gempukku/lotro/cards/set1/gandalf/Card1_079.java | 2 +- .../gempukku/lotro/cards/set1/gondor/Card1_100.java | 2 +- .../gempukku/lotro/cards/set1/gondor/Card1_105.java | 2 +- .../lotro/cards/set1/isengard/Card1_120.java | 2 +- .../lotro/cards/set1/isengard/Card1_125.java | 2 +- .../lotro/cards/set1/isengard/Card1_129.java | 2 +- .../lotro/cards/set1/isengard/Card1_130.java | 2 +- .../lotro/cards/set1/isengard/Card1_133.java | 2 +- .../lotro/cards/set1/isengard/Card1_141.java | 2 +- .../lotro/cards/set1/isengard/Card1_142.java | 2 +- .../lotro/cards/set1/isengard/Card1_144.java | 2 +- .../lotro/cards/set1/isengard/Card1_157.java | 2 +- .../lotro/cards/set1/isengard/Card1_159.java | 2 +- .../lotro/cards/set1/isengard/Card1_162.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_173.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_175.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_183.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_188.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_192.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_193.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_195.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_196.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_198.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_200.java | 2 +- .../gempukku/lotro/cards/set1/moria/Card1_202.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_242.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_249.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_252.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_253.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_260.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_263.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_264.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_274.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_275.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_276.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_278.java | 2 +- .../gempukku/lotro/cards/set1/sauron/Card1_281.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_300.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_305.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_316.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_318.java | 2 +- .../gempukku/lotro/cards/set1/wraith/Card1_206.java | 2 +- .../gempukku/lotro/cards/set1/wraith/Card1_207.java | 4 ++-- .../gempukku/lotro/cards/set1/wraith/Card1_209.java | 4 ++-- .../gempukku/lotro/cards/set1/wraith/Card1_211.java | 2 +- .../gempukku/lotro/cards/set1/wraith/Card1_216.java | 4 ++-- .../gempukku/lotro/cards/set1/wraith/Card1_219.java | 2 +- .../gempukku/lotro/cards/set1/wraith/Card1_220.java | 2 +- .../gempukku/lotro/cards/set1/wraith/Card1_222.java | 2 +- .../gempukku/lotro/cards/set1/wraith/Card1_238.java | 2 +- .../gempukku/lotro/cards/set2/dwarven/Card2_001.java | 2 +- .../gempukku/lotro/cards/set2/dwarven/Card2_008.java | 2 +- .../gempukku/lotro/cards/set2/dwarven/Card2_009.java | 2 +- .../gempukku/lotro/cards/set2/dwarven/Card2_011.java | 2 +- .../gempukku/lotro/cards/set2/dwarven/Card2_012.java | 2 +- .../gempukku/lotro/cards/set2/dwarven/Card2_014.java | 2 +- .../gempukku/lotro/cards/set2/elven/Card2_016.java | 2 +- .../gempukku/lotro/cards/set2/elven/Card2_018.java | 2 +- .../gempukku/lotro/cards/set2/gandalf/Card2_023.java | 2 +- .../gempukku/lotro/cards/set2/gondor/Card2_031.java | 2 +- .../gempukku/lotro/cards/set2/gondor/Card2_035.java | 2 +- .../lotro/cards/set2/isengard/Card2_040.java | 2 +- .../lotro/cards/set2/isengard/Card2_044.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_055.java | 2 +- .../gempukku/lotro/cards/set2/moria/Card2_056.java | 2 +- .../gempukku/lotro/cards/set2/sauron/Card2_092.java | 2 +- .../gempukku/lotro/cards/set2/shire/Card2_096.java | 2 +- .../gempukku/lotro/cards/set2/shire/Card2_100.java | 2 +- .../gempukku/lotro/cards/set2/shire/Card2_106.java | 2 +- .../gempukku/lotro/cards/set2/shire/Card2_107.java | 2 +- .../gempukku/lotro/cards/set2/shire/Card2_112.java | 2 +- .../gempukku/lotro/cards/set2/shire/Card2_113.java | 2 +- .../gempukku/lotro/cards/set2/wraith/Card2_077.java | 2 +- .../gempukku/lotro/cards/set3/dwarven/Card3_003.java | 2 +- .../gempukku/lotro/cards/set3/dwarven/Card3_004.java | 2 +- .../gempukku/lotro/cards/set3/dwarven/Card3_005.java | 2 +- .../gempukku/lotro/cards/set3/elven/Card3_009.java | 2 +- .../gempukku/lotro/cards/set3/elven/Card3_015.java | 2 +- .../gempukku/lotro/cards/set3/gandalf/Card3_029.java | 2 +- .../gempukku/lotro/cards/set3/gandalf/Card3_035.java | 2 +- .../gempukku/lotro/cards/set3/gandalf/Card3_036.java | 2 +- .../gempukku/lotro/cards/set3/gondor/Card3_037.java | 2 +- .../gempukku/lotro/cards/set3/gondor/Card3_040.java | 2 +- .../gempukku/lotro/cards/set3/gondor/Card3_041.java | 2 +- .../gempukku/lotro/cards/set3/gondor/Card3_044.java | 2 +- .../lotro/cards/set3/isengard/Card3_052.java | 2 +- .../lotro/cards/set3/isengard/Card3_054.java | 2 +- .../lotro/cards/set3/isengard/Card3_067.java | 2 +- .../lotro/cards/set3/isengard/Card3_071.java | 2 +- .../lotro/cards/set3/isengard/Card3_072.java | 2 +- .../gempukku/lotro/cards/set3/moria/Card3_077.java | 2 +- .../gempukku/lotro/cards/set3/sauron/Card3_091.java | 2 +- .../gempukku/lotro/cards/set3/sauron/Card3_102.java | 2 +- .../gempukku/lotro/cards/set3/sauron/Card3_104.java | 2 +- .../gempukku/lotro/cards/set3/shire/Card3_113.java | 2 +- .../gempukku/lotro/cards/set3/shire/Card3_114.java | 2 +- .../gempukku/lotro/cards/set3/wraith/Card3_081.java | 2 +- .../gempukku/lotro/cards/set3/wraith/Card3_083.java | 2 +- .../gempukku/lotro/cards/set3/wraith/Card3_086.java | 2 +- .../main/java/com/gempukku/lotro/common/Zone.java | 2 +- .../com/gempukku/lotro/game/state/GameState.java | 2 +- .../main/java/com/gempukku/lotro/game/GameEvent.java | 12 +++++++++++- gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js | 6 +++--- 116 files changed, 134 insertions(+), 124 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java index 166bd76e3..508d6eaa2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java @@ -23,7 +23,7 @@ public class AbstractAlly extends AbstractPermanent { } public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Race race, Culture culture, String name, boolean unique) { - super(Side.FREE_PEOPLE, twilight, CardType.ALLY, culture, Zone.FREE_SUPPORT, name, unique); + super(Side.FREE_PEOPLE, twilight, CardType.ALLY, culture, Zone.SUPPORT, name, unique); _siteNumber = siteNumber; _strength = strength; _vitality = vitality; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 2bb481275..2cfd8a0cb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -23,8 +23,8 @@ import java.util.List; public class PlayConditions { public static boolean nonPlayZone(Zone zone) { - return zone != Zone.SHADOW_CHARACTERS && zone != Zone.SHADOW_SUPPORT - && zone != Zone.FREE_SUPPORT && zone != Zone.FREE_CHARACTERS + return zone != Zone.SHADOW_CHARACTERS && zone != Zone.SUPPORT + && zone != Zone.SUPPORT && zone != Zone.FREE_CHARACTERS && zone != Zone.ATTACHED && zone != Zone.ADVENTURE_PATH; } @@ -53,11 +53,11 @@ public class PlayConditions { } public static boolean canUseFPCardDuringPhase(GameState gameState, Phase phase, PhysicalCard self) { - return (phase == null || gameState.getCurrentPhase() == phase) && (self.getZone() == Zone.FREE_SUPPORT || self.getZone() == Zone.FREE_CHARACTERS || self.getZone() == Zone.ATTACHED); + return (phase == null || gameState.getCurrentPhase() == phase) && (self.getZone() == Zone.SUPPORT || self.getZone() == Zone.FREE_CHARACTERS || self.getZone() == Zone.ATTACHED); } public static boolean canUseShadowCardDuringPhase(GameState gameState, Phase phase, PhysicalCard self, int twilightCost) { - return (phase == null || gameState.getCurrentPhase() == phase) && (self.getZone() == Zone.SHADOW_SUPPORT || self.getZone() == Zone.SHADOW_CHARACTERS || self.getZone() == Zone.ATTACHED) + return (phase == null || gameState.getCurrentPhase() == phase) && (self.getZone() == Zone.SUPPORT || self.getZone() == Zone.SHADOW_CHARACTERS || self.getZone() == Zone.ATTACHED) && twilightCost <= gameState.getTwilightPool(); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java index 902bf65aa..eec5f6b2a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_016.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card1_016 extends AbstractPermanent { public Card1_016() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Greatest Kingdom of My People", true); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Greatest Kingdom of My People", true); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java index 569a6e6fb..e5d050135 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_020.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_020 extends AbstractPermanent { public Card1_020() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Let Them Come!"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Let Them Come!"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java index 216de1e0f..2393a9373 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java @@ -17,7 +17,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_021 extends AbstractPermanent { public Card1_021() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Lord of Moria"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Lord of Moria"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java index 74a502912..d9b387810 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java @@ -20,7 +20,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_024 extends AbstractPermanent { public Card1_024() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Stairs of Khazad-dum"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Stairs of Khazad-dum"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java index 11ec3ab4d..1004e0528 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_043.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card1_043 extends AbstractPermanent { public Card1_043() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Far-seeing Eyes", true); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Far-seeing Eyes", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java index 139d8f314..a03dc04ea 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card1_046 extends AbstractPermanent { public Card1_046() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Gift of Boats", true); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Gift of Boats", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java index 4b9654388..0666c6a39 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_054.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_054 extends AbstractPermanent { public Card1_054() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Mallorn-trees"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Mallorn-trees"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java index a57a4ff89..ce3c71cbc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_055.java @@ -32,7 +32,7 @@ import java.util.List; */ public class Card1_055 extends AbstractPermanent { public Card1_055() { - super(Side.FREE_PEOPLE, 2, CardType.POSSESSION, Culture.ELVEN, Zone.FREE_SUPPORT, "The Mirror of Galadriel", true); + super(Side.FREE_PEOPLE, 2, CardType.POSSESSION, Culture.ELVEN, Zone.SUPPORT, "The Mirror of Galadriel", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java index 51c61d00d..7d7d1d9ba 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_059.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card1_059 extends AbstractPermanent { public Card1_059() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Shoulder to Shoulder"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Shoulder to Shoulder"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java index 71107e61d..8c79fbe7d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_061.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card1_061 extends AbstractPermanent { public Card1_061() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Songs of the Blessed Realm"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Songs of the Blessed Realm"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_073.java index ec6c9a66c..5bd28f3f4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_073.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_073.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card1_073 extends AbstractPermanent { public Card1_073() { - super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.GANDALF, Zone.FREE_SUPPORT, "Gandalf's Cart", true); + super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.GANDALF, Zone.SUPPORT, "Gandalf's Cart", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_079.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_079.java index cb3913655..f5dd6681f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_079.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_079.java @@ -26,7 +26,7 @@ import com.gempukku.lotro.logic.modifiers.TwilightCostModifier; */ public class Card1_079 extends AbstractPermanent { public Card1_079() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GANDALF, Zone.FREE_SUPPORT, "The Nine Walkers"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GANDALF, Zone.SUPPORT, "The Nine Walkers"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_100.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_100.java index d8aa02dbf..91f2170e6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_100.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_100.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_100 extends AbstractPermanent { public Card1_100() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "The Choice of Luthien", true); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "The Choice of Luthien", true); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_105.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_105.java index f445312da..e9e231d2d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_105.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_105.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card1_105 extends AbstractPermanent { public Card1_105() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "Foes of Mordor"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "Foes of Mordor"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_120.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_120.java index 82752bf39..01ba1f165 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_120.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_120.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card1_120 extends AbstractPermanent { public Card1_120() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Alive and Unspoiled"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Alive and Unspoiled"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_125.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_125.java index cba5f5b55..019112454 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_125.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_125.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_125 extends AbstractPermanent { public Card1_125() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Greed"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Greed"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_129.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_129.java index fe2636d5b..9c3c41350 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_129.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_129.java @@ -24,7 +24,7 @@ import com.gempukku.lotro.logic.modifiers.TwilightCostModifier; */ public class Card1_129 extends AbstractPermanent { public Card1_129() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "The Misadventure of Mr. Underhill"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "The Misadventure of Mr. Underhill"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java index 000903a72..36c2c72bf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_130.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card1_130 extends AbstractPermanent { public Card1_130() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "No Ordinary Storm"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "No Ordinary Storm"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_133.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_133.java index cfc27993d..c867f42fe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_133.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_133.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card1_133 extends AbstractPermanent { public Card1_133() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Saruman's Ambition"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Saruman's Ambition"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_141.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_141.java index 7cf7e4271..ee65006d1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_141.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_141.java @@ -19,7 +19,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_141 extends AbstractPermanent { public Card1_141() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Their Arrows Enrage"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Their Arrows Enrage"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_142.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_142.java index b7b7633c1..e105310aa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_142.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_142.java @@ -22,7 +22,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_142 extends AbstractPermanent { public Card1_142() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Traitor's Voice"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Traitor's Voice"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java index 0bad7957b..8b489ef62 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_144.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_144 extends AbstractPermanent { public Card1_144() { - super(Side.SHADOW, 3, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Uruk Bloodlust"); + super(Side.SHADOW, 3, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Uruk Bloodlust"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_157.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_157.java index 91840d4b4..995a12780 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_157.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_157.java @@ -20,7 +20,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_157 extends AbstractPermanent { public Card1_157() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Uruk-hai Armory"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Uruk-hai Armory"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java index f3b0e5098..6ecfd397d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_159.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card1_159 extends AbstractPermanent { public Card1_159() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Uruk-hai Rampage"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Uruk-hai Rampage"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java index deb1a46f7..74b982df8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_162.java @@ -31,7 +31,7 @@ import java.util.List; */ public class Card1_162 extends AbstractPermanent { public Card1_162() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Worry", true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Worry", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java index 875afbe4c..600dcf994 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_173.java @@ -32,7 +32,7 @@ import java.util.List; */ public class Card1_173 extends AbstractPermanent { public Card1_173() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Goblin Armory"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Goblin Armory"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_175.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_175.java index 5dcf9cf1b..0973319ad 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_175.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_175.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_175 extends AbstractPermanent { public Card1_175() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Goblin Domain"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Goblin Domain"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java index e94872ff5..beaaa8375 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_183.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card1_183 extends AbstractPermanent { public Card1_183() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Goblin Swarms"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Goblin Swarms"); } @Override 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 256e31d4f..dbff32999 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 @@ -30,7 +30,7 @@ import java.util.List; */ public class Card1_188 extends AbstractPermanent { public Card1_188() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "The Long Dark", true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "The Long Dark", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_192.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_192.java index 3a7021063..fe6d779e4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_192.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_192.java @@ -20,7 +20,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_192 extends AbstractPermanent { public Card1_192() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Pinned Down"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Pinned Down"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java index fd05deba3..bbcc94c75 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_193.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_193 extends AbstractPermanent { public Card1_193() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Plundered Armories"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Plundered Armories"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_195.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_195.java index 0ca1a32fd..573b3efdd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_195.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_195.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card1_195 extends AbstractPermanent { public Card1_195() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Relics of Moria"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Relics of Moria"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_196.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_196.java index d8fd6969c..3f474126b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_196.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_196.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_196 extends AbstractPermanent { public Card1_196() { - super(Side.SHADOW, 3, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "They Are Coming"); + super(Side.SHADOW, 3, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "They Are Coming"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_198.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_198.java index ea5d977eb..29264269c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_198.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_198.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_198 extends AbstractPermanent { public Card1_198() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Through the Misty Mountains"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Through the Misty Mountains"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_200.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_200.java index c563f5a0a..a24517a0e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_200.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_200.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_200 extends AbstractPermanent { public Card1_200() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "The Underdeeps of Moria"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "The Underdeeps of Moria"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_202.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_202.java index 5a8d96113..c9f99bcca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_202.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_202.java @@ -25,7 +25,7 @@ import com.gempukku.lotro.logic.modifiers.TwilightCostModifier; */ public class Card1_202 extends AbstractPermanent { public Card1_202() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "What Is This New Devilry?"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "What Is This New Devilry?"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_242.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_242.java index 99f95d5e2..b92741ae3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_242.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_242.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_242 extends AbstractPermanent { public Card1_242() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "The Dark Lord's Summons"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "The Dark Lord's Summons"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_249.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_249.java index 5daeaaa58..e173a2cac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_249.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_249.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card1_249 extends AbstractPermanent { public Card1_249() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Gleaming Spires Will Crumble"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Gleaming Spires Will Crumble"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_252.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_252.java index 534ec4877..6de5d2968 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_252.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_252.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_252 extends AbstractPermanent { public Card1_252() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "The Irresistible Shadow"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "The Irresistible Shadow"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_253.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_253.java index 904a21d6c..8c2946fe3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_253.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_253.java @@ -25,7 +25,7 @@ import com.gempukku.lotro.logic.modifiers.TwilightCostModifier; */ public class Card1_253 extends AbstractPermanent { public Card1_253() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Journey Into Danger"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Journey Into Danger"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_260.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_260.java index 33cc69911..7c8f86bd0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_260.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_260.java @@ -21,7 +21,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_260 extends AbstractPermanent { public Card1_260() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "The Number Must Be Few"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "The Number Must Be Few"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_263.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_263.java index 954181921..6fafda338 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_263.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_263.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_263 extends AbstractPermanent { public Card1_263() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Orc Banner"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Orc Banner"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_264.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_264.java index b1d9df1b1..4477928d3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_264.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_264.java @@ -20,7 +20,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_264 extends AbstractPermanent { public Card1_264() { - super(Side.SHADOW, 3, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Orc Bowmen"); + super(Side.SHADOW, 3, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Orc Bowmen"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_274.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_274.java index adc75db76..ecbe20893 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_274.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_274.java @@ -25,7 +25,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_274 extends AbstractPermanent { public Card1_274() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Sauron's Defenses"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Sauron's Defenses"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java index 96793bc7a..07732d365 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_275.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card1_275 extends AbstractPermanent { public Card1_275() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Seeking It Always"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Seeking It Always"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_276.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_276.java index 1d5c2dd84..1387e6f85 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_276.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_276.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_276 extends AbstractPermanent { public Card1_276() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Seeking Its Master"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Seeking Its Master"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java index 7b00a6725..465214678 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_278.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_278 extends AbstractPermanent { public Card1_278() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Strength Born of Fear"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Strength Born of Fear"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_281.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_281.java index 2b94c89b6..f87b04d46 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_281.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_281.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_281 extends AbstractPermanent { public Card1_281() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Under the Watching Eye"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Under the Watching Eye"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java index d396e020d..94e6b8598 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_300.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_300 extends AbstractPermanent { public Card1_300() { - super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.SHIRE, Zone.FREE_SUPPORT, "Longbottom Leaf"); + super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.SHIRE, Zone.SUPPORT, "Longbottom Leaf"); addKeyword(Keyword.PIPEWEED); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java index 0badbaa37..5a3bb2e1f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_305.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card1_305 extends AbstractPermanent { public Card1_305() { - super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.SHIRE, Zone.FREE_SUPPORT, "Old Tobby"); + super(Side.FREE_PEOPLE, 1, CardType.POSSESSION, Culture.SHIRE, Zone.SUPPORT, "Old Tobby"); addKeyword(Keyword.PIPEWEED); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_316.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_316.java index f44621b3f..61f94fcca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_316.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_316.java @@ -26,7 +26,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_316 extends AbstractPermanent { public Card1_316() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "A Talent for Not Being Seen", true); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "A Talent for Not Being Seen", true); addKeyword(Keyword.STEALTH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_318.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_318.java index af3f91260..72a7db63e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_318.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_318.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_318 extends AbstractPermanent { public Card1_318() { - super(Side.FREE_PEOPLE, 0, CardType.POSSESSION, Culture.SHIRE, Zone.FREE_SUPPORT, "Thror's Map", true); + super(Side.FREE_PEOPLE, 0, CardType.POSSESSION, Culture.SHIRE, Zone.SUPPORT, "Thror's Map", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_206.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_206.java index 050a067ec..2c7a3f569 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_206.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_206.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card1_206 extends AbstractPermanent { public Card1_206() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Bent on Discovery"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Bent on Discovery"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java index e033c81c1..9e4eaa03e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_207.java @@ -34,13 +34,13 @@ import java.util.List; */ public class Card1_207 extends AbstractPermanent { public Card1_207() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Black Breath"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Black Breath"); } @Override public List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), Phase.SKIRMISH, self, 0) - && self.getZone() == Zone.SHADOW_SUPPORT + && self.getZone() == Zone.SUPPORT && Filters.filter(game.getGameState().getSkirmish().getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.NAZGUL)).size() > 0 && game.getGameState().getSkirmish().getFellowshipCharacter() != null) { ActivateCardAction action = new ActivateCardAction(self, Keyword.SKIRMISH); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java index 1e6e84dc5..60133e717 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_209.java @@ -29,13 +29,13 @@ import java.util.List; */ public class Card1_209 extends AbstractPermanent { public Card1_209() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Blade Tip"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Blade Tip"); } @Override public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (PlayConditions.winsSkirmish(game.getGameState(), game.getModifiersQuerying(), effectResult, Filters.and(Filters.owner(self.getOwner()), Filters.race(Race.NAZGUL))) - && self.getZone() == Zone.SHADOW_SUPPORT + && self.getZone() == Zone.SUPPORT && game.getGameState().getSkirmish() != null && game.getGameState().getSkirmish().getFellowshipCharacter() != null && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.sameCard(game.getGameState().getSkirmish().getFellowshipCharacter()), Filters.not(Filters.hasAttached(Filters.name("Blade Tip"))))) { ActivateCardAction action = new ActivateCardAction(self, null); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java index 65bf8bead..4f9bcb902 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card1_211 extends AbstractPermanent { public Card1_211() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Drawn to Its Power"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Drawn to Its Power"); } @Override 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 322c2a54e..48f4b6f56 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 @@ -51,7 +51,7 @@ public class Card1_216 extends AbstractAttachable { @Override protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game.getGameState(), Phase.SKIRMISH, self, 0) - && self.getZone() == Zone.SHADOW_SUPPORT) { + && self.getZone() == Zone.SUPPORT) { ActivateCardAction action = new ActivateCardAction(self, null); action.appendCost( new DiscardCardsFromPlayEffect(self, self)); @@ -59,7 +59,7 @@ public class Card1_216 extends AbstractAttachable { if (skirmish != null && skirmish.getShadowCharacters().contains(self.getAttachedTo())) { final PhysicalCard fpChar = skirmish.getFellowshipCharacter(); if (fpChar != null) { - final PhysicalCard bladeTip = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name("Blade Tip"), Filters.owner(playerId), Filters.zone(Zone.SHADOW_SUPPORT)); + final PhysicalCard bladeTip = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name("Blade Tip"), Filters.owner(playerId), Filters.zone(Zone.SUPPORT)); if (bladeTip != null) { action.appendEffect( new TransferPermanentEffect(bladeTip, fpChar)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java index 2484c232c..d558d608b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_219.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card1_219 extends AbstractPermanent { public Card1_219() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "The Nine Servants of Sauron"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "The Nine Servants of Sauron"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_220.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_220.java index 0bffc0032..b4f68e627 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_220.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_220.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card1_220 extends AbstractPermanent { public Card1_220() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Not Easily Destroyed"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Not Easily Destroyed"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_222.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_222.java index a468ec4e2..8e84621e2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_222.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_222.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card1_222 extends AbstractPermanent { public Card1_222() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Paths Seldom Trodden"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Paths Seldom Trodden"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java index 47633ed65..59ab3e663 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_238.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card1_238 extends AbstractPermanent { public Card1_238() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Wreathed in Shadow"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Wreathed in Shadow"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_001.java index 7349c5ecc..1db9d7e93 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_001.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card2_001 extends AbstractPermanent { public Card2_001() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Beneath the Mountains"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Beneath the Mountains"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_008.java index e9fa7d6cd..94486fdda 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_008.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_008.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card2_008 extends AbstractPermanent { public Card2_008() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Golden Light on the Land"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Golden Light on the Land"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_009.java index 7830c7452..034418f73 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_009.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card2_009 extends AbstractPermanent { public Card2_009() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Great Works Begun There"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Great Works Begun There"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_011.java index 9abe3846e..e40a84cde 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_011.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_011.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card2_011 extends AbstractPermanent { public Card2_011() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Make Light of Burdens"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Make Light of Burdens"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_012.java index a1bb975a6..5b5f8baa4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_012.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card2_012 extends AbstractPermanent { public Card2_012() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Realm of Dwarrowdelf", true); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Realm of Dwarrowdelf", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java index 89dbd4e89..5470dd20b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/dwarven/Card2_014.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card2_014 extends AbstractPermanent { public Card2_014() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Till Durin Wakes Again"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Till Durin Wakes Again"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java index 7e75c04a5..b9b6a7423 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card2_016 extends AbstractPermanent { public Card2_016() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "A Blended Race"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "A Blended Race"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java index 2bdd90963..22242a1f6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_018.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card2_018 extends AbstractPermanent { public Card2_018() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Hosts of the Last Alliance"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Hosts of the Last Alliance"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java index 2a95a0b7f..c57ba5810 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java @@ -21,7 +21,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card2_023 extends AbstractPermanent { public Card2_023() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.GANDALF, Zone.FREE_SUPPORT, "Gandalf's Wisdom"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.GANDALF, Zone.SUPPORT, "Gandalf's Wisdom"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java index a7660e1f4..0b267811c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_031.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card2_031 extends AbstractPermanent { public Card2_031() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "Blood of Numenor"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "Blood of Numenor"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_035.java index 0c0b51ec7..bd3d2f368 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_035.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gondor/Card2_035.java @@ -22,7 +22,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card2_035 extends AbstractPermanent { public Card2_035() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "Natural Cover"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "Natural Cover"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_040.java index 8e54f0bc4..fc5a1e902 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_040.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card2_040 extends AbstractPermanent { public Card2_040() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Demands of the Sackville-Bagginses"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Demands of the Sackville-Bagginses"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java index ffeb1d3e5..59e6cd032 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card2_044 extends AbstractPermanent { public Card2_044() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "No Business of Ours"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "No Business of Ours"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_055.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_055.java index 52d1ae9ae..00ba0f6ef 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_055.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_055.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card2_055 extends AbstractPermanent { public Card2_055() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Dark Places"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Dark Places"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_056.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_056.java index ffe7ce68c..4e43c2296 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_056.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_056.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card2_056 extends AbstractPermanent { public Card2_056() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Fill With Fear"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Fill With Fear"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_092.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_092.java index 3b9da972e..7ca397d89 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_092.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/sauron/Card2_092.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card2_092 extends AbstractPermanent { public Card2_092() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Spies of Mordor"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Spies of Mordor"); addKeyword(Keyword.SEARCH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_096.java index 5daaa1250..34f1dbdff 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_096.java @@ -41,7 +41,7 @@ public class Card2_096 extends AbstractAlly { action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.keyword(Keyword.TALE))); action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.side(Side.SHADOW), Filters.type(CardType.CONDITION), Filters.zone(Zone.SHADOW_SUPPORT))); + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.side(Side.SHADOW), Filters.type(CardType.CONDITION), Filters.zone(Zone.SUPPORT))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_100.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_100.java index 447a4fa4b..03dff6f17 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_100.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_100.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card2_100 extends AbstractPermanent { public Card2_100() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "Fearing the Worst"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "Fearing the Worst"); addKeyword(Keyword.STEALTH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java index 1d05661f2..2b33a7f49 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_106.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card2_106 extends AbstractPermanent { public Card2_106() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "Nice Imitation"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "Nice Imitation"); addKeyword(Keyword.STEALTH); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_107.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_107.java index 9c1633166..6b284afdb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_107.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_107.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card2_107 extends AbstractPermanent { public Card2_107() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "Not Feared in Sunlight"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "Not Feared in Sunlight"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_112.java index 3f7dc761c..9f258db82 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_112.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card2_112 extends AbstractPermanent { public Card2_112() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "A Promise"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "A Promise"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_113.java index 69f4f6049..8dff7812c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_113.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card2_113 extends AbstractPermanent { public Card2_113() { - super(Side.FREE_PEOPLE, 2, CardType.POSSESSION, Culture.SHIRE, Zone.FREE_SUPPORT, "Red Book of Westmarch", true); + super(Side.FREE_PEOPLE, 2, CardType.POSSESSION, Culture.SHIRE, Zone.SUPPORT, "Red Book of Westmarch", true); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java index e610db53b..d6b6a5b3c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/wraith/Card2_077.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card2_077 extends AbstractPermanent { public Card2_077() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "His Terrible Servants"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "His Terrible Servants"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java index 5974125bc..cb03151a3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_003.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card3_003 extends AbstractPermanent { public Card3_003() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Mines of Khazad-Dum"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Mines of Khazad-Dum"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_004.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_004.java index 417ee1f85..dc7ec4485 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_004.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_004.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card3_004 extends AbstractPermanent { public Card3_004() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "A Royal Welcome"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "A Royal Welcome"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_005.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_005.java index 38d036939..040951207 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_005.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/dwarven/Card3_005.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card3_005 extends AbstractPermanent { public Card3_005() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.FREE_SUPPORT, "Song of Durin"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Song of Durin"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_009.java index d543044e5..e304bb84a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_009.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card3_009 extends AbstractPermanent { public Card3_009() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Beren and Luthien"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Beren and Luthien"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_015.java index 4b770b467..86e9c0b84 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/elven/Card3_015.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card3_015 extends AbstractPermanent { public Card3_015() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.FREE_SUPPORT, "Forests of Lothlorien"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.ELVEN, Zone.SUPPORT, "Forests of Lothlorien"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_029.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_029.java index 9f7b9d52a..bc521b822 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_029.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_029.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card3_029 extends AbstractPermanent { public Card3_029() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GANDALF, Zone.FREE_SUPPORT, "Betrayal of Isengard"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GANDALF, Zone.SUPPORT, "Betrayal of Isengard"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_035.java index 786a775eb..e47458696 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_035.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_035.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card3_035 extends AbstractPermanent { public Card3_035() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.GANDALF, Zone.FREE_SUPPORT, "Trust Me as You Once Did"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.GANDALF, Zone.SUPPORT, "Trust Me as You Once Did"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java index 207ee0001..9112abfc4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gandalf/Card3_036.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card3_036 extends AbstractPermanent { public Card3_036() { - super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.GANDALF, Zone.FREE_SUPPORT, "Unknown Perils"); + super(Side.FREE_PEOPLE, 2, CardType.CONDITION, Culture.GANDALF, Zone.SUPPORT, "Unknown Perils"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_037.java index 626a0e3df..f0075a7a4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_037.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_037.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card3_037 extends AbstractPermanent { public Card3_037() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "Answering the Cries"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "Answering the Cries"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_040.java index dad6809e4..f88e28c01 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_040.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card3_040 extends AbstractPermanent { public Card3_040() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "Citadel of Minas Tirith"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "Citadel of Minas Tirith"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_041.java index 91b9a3680..15d3194b4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_041.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card3_041 extends AbstractPermanent { public Card3_041() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.GONDOR, Zone.FREE_SUPPORT, "Gondor Bowmen"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.GONDOR, Zone.SUPPORT, "Gondor Bowmen"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java index 21a7b5f21..ef580da90 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/gondor/Card3_044.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card3_044 extends AbstractPermanent { public Card3_044() { - super(Side.FREE_PEOPLE, 1, CardType.ARTIFACT, Culture.GONDOR, Zone.FREE_SUPPORT, "The Shards of Narsil", true); + super(Side.FREE_PEOPLE, 1, CardType.ARTIFACT, Culture.GONDOR, Zone.SUPPORT, "The Shards of Narsil", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_052.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_052.java index 214459d68..94e515b1c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_052.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_052.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card3_052 extends AbstractPermanent { public Card3_052() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "A Fell Voice on the Air"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "A Fell Voice on the Air"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_054.java index 4b0c9b0f7..57e548acc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_054.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_054.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card3_054 extends AbstractPermanent { public Card3_054() { - super(Side.SHADOW, 4, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Hollowing of Isengard"); + super(Side.SHADOW, 4, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Hollowing of Isengard"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_067.java index 5eae6c18c..9e8e72576 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_067.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card3_067 extends AbstractPermanent { public Card3_067() { - super(Side.SHADOW, 0, CardType.ARTIFACT, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "The Palanthir of Orthanc", true); + super(Side.SHADOW, 0, CardType.ARTIFACT, Culture.ISENGARD, Zone.SUPPORT, "The Palanthir of Orthanc", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_071.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_071.java index ec39bf0e5..21f3984d3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_071.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_071.java @@ -26,7 +26,7 @@ import java.util.List; */ public class Card3_071 extends AbstractPermanent { public Card3_071() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Tower of Orthanc"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Tower of Orthanc"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_072.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_072.java index d99cd5014..2d18dbc50 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_072.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/isengard/Card3_072.java @@ -21,7 +21,7 @@ import java.util.List; */ public class Card3_072 extends AbstractPermanent { public Card3_072() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "Trapped and Alone"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.ISENGARD, Zone.SUPPORT, "Trapped and Alone"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/moria/Card3_077.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/moria/Card3_077.java index 33f0e312f..2e3578654 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/moria/Card3_077.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/moria/Card3_077.java @@ -23,7 +23,7 @@ import java.util.List; */ public class Card3_077 extends AbstractPermanent { public Card3_077() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SHADOW_SUPPORT, "Dephts of Moria"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.MORIA, Zone.SUPPORT, "Dephts of Moria"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_091.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_091.java index b5b3e1caf..b88fec906 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_091.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_091.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card3_091 extends AbstractPermanent { public Card3_091() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "His Cruelty and Malice"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "His Cruelty and Malice"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_102.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_102.java index 262467f1f..52d43ec3c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_102.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_102.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card3_102 extends AbstractPermanent { public Card3_102() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Our List of Allies Grows Thin", true); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Our List of Allies Grows Thin", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_104.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_104.java index d09d61864..518fdfc2d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_104.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_104.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card3_104 extends AbstractPermanent { public Card3_104() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SHADOW_SUPPORT, "Tower of Barad-dur"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.SAURON, Zone.SUPPORT, "Tower of Barad-dur"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java index e72dae286..8560806fa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_113.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card3_113 extends AbstractPermanent { public Card3_113() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "The Shire Countryside"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "The Shire Countryside"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java index 0d1d86607..3d87ebb8b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/shire/Card3_114.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card3_114 extends AbstractPermanent { public Card3_114() { - super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.FREE_SUPPORT, "Three Monstrous Trolls"); + super(Side.FREE_PEOPLE, 0, CardType.CONDITION, Culture.SHIRE, Zone.SUPPORT, "Three Monstrous Trolls"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_081.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_081.java index e2d5ed71b..884802990 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_081.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_081.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card3_081 extends AbstractPermanent { public Card3_081() { - super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "Gates of the Dead City"); + super(Side.SHADOW, 1, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "Gates of the Dead City"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_083.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_083.java index 6c2a08bf4..d6d4eddd7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_083.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_083.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card3_083 extends AbstractPermanent { public Card3_083() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.WRAITH, Zone.SHADOW_SUPPORT, "The Ring Draws Them", true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.WRAITH, Zone.SUPPORT, "The Ring Draws Them", true); } @Override 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 49b064286..c145dd96a 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 @@ -44,7 +44,7 @@ public class Card3_086 extends AbstractMinion { action.appendCost( new ExertCharactersEffect(self, self)); action.appendEffect( - new ChooseActiveCardEffect(self, playerId, "Choose Blade Tip", Filters.name("Blade Tip"), Filters.zone(Zone.SHADOW_SUPPORT), Filters.owner(playerId)) { + new ChooseActiveCardEffect(self, playerId, "Choose Blade Tip", Filters.name("Blade Tip"), Filters.zone(Zone.SUPPORT), Filters.owner(playerId)) { @Override protected void cardSelected(PhysicalCard card) { action.insertEffect( diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java index 50e0758b5..b0560f512 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java @@ -1,7 +1,7 @@ package com.gempukku.lotro.common; public enum Zone { - FREE_CHARACTERS("play"), FREE_SUPPORT("play"), SHADOW_CHARACTERS("play"), SHADOW_SUPPORT("play"), + FREE_CHARACTERS("play"), SUPPORT("play"), SHADOW_CHARACTERS("play"), ADVENTURE_PATH("play"), HAND("hand"), DECK("deck"), ATTACHED("play"), STACKED("stacked"), DISCARD("discard"), DEAD("dead pile"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 525e372c0..8d84f3acd 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -194,7 +194,7 @@ public class GameState { } private boolean isZonePublic(Zone zone) { - return zone == Zone.FREE_CHARACTERS || zone == Zone.FREE_SUPPORT || zone == Zone.SHADOW_CHARACTERS || zone == Zone.SHADOW_SUPPORT + return zone == Zone.FREE_CHARACTERS || zone == Zone.SUPPORT || zone == Zone.SHADOW_CHARACTERS || zone == Zone.SUPPORT || zone == Zone.ADVENTURE_PATH || zone == Zone.ATTACHED || zone == Zone.STACKED || zone == Zone.DEAD; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameEvent.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameEvent.java index 1f124a8f2..a4c4eccb0 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameEvent.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameEvent.java @@ -20,6 +20,7 @@ public class GameEvent { } private String _message; + private String _side; private Type _type; private Zone _zone; private String _participantId; @@ -113,8 +114,17 @@ public class GameEvent { return this; } + public String getSide() { + return _side; + } + + public GameEvent side(String side) { + _side = side; + return this; + } + public GameEvent card(PhysicalCard physicalCard) { - GameEvent gameEvent = cardId(physicalCard.getCardId()).blueprintId(physicalCard.getBlueprintId()).participantId(physicalCard.getOwner()).zone(physicalCard.getZone()); + GameEvent gameEvent = cardId(physicalCard.getCardId()).blueprintId(physicalCard.getBlueprintId()).participantId(physicalCard.getOwner()).zone(physicalCard.getZone()).side(physicalCard.getBlueprint().getSide().name()); PhysicalCard attachedTo = physicalCard.getAttachedTo(); if (attachedTo != null) gameEvent = gameEvent.targetCardId(attachedTo.getCardId()); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js index bb566300c..2683e4066 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js @@ -87,7 +87,7 @@ var GempLotrGameUI = Class.extend({ return card.zone == "SHADOW_CHARACTERS" && card.skirmish == true; }, false); this.skirmishFellowshipGroup = new NormalCardGroup($("#main"), function (card) { - return (card.zone == "FREE_SUPPORT" || card.zone == "FREE_CHARACTERS") && card.skirmish == true; + return (card.zone == "SUPPORT" || card.zone == "FREE_CHARACTERS") && card.skirmish == true; }, false); this.initializeDialogs(); @@ -101,7 +101,7 @@ var GempLotrGameUI = Class.extend({ var that = this; this.supportOpponent = new NormalCardGroup($("#main"), function(card) { - return ((card.zone == "FREE_SUPPORT" || card.zone == "SHADOW_SUPPORT") && card.owner != that.bottomPlayerId && that.shadowAssignGroups[card.cardId] == null && card.skirmish == null); + return (card.zone == "SUPPORT" && card.owner != that.bottomPlayerId && that.shadowAssignGroups[card.cardId] == null && card.skirmish == null); }); this.charactersOpponent = new NormalCardGroup($("#main"), function(card) { return (card.zone == "FREE_CHARACTERS" && card.owner != that.bottomPlayerId && that.shadowAssignGroups[card.cardId] == null && card.skirmish == null); @@ -113,7 +113,7 @@ var GempLotrGameUI = Class.extend({ return (card.zone == "FREE_CHARACTERS" && card.owner == that.bottomPlayerId && that.shadowAssignGroups[card.cardId] == null && card.skirmish == null); }); this.supportPlayer = new NormalCardGroup($("#main"), function(card) { - return ((card.zone == "FREE_SUPPORT" || card.zone == "SHADOW_SUPPORT") && card.owner == that.bottomPlayerId && that.shadowAssignGroups[card.cardId] == null && card.skirmish == null); + return (card.zone == "SUPPORT" && card.owner == that.bottomPlayerId && that.shadowAssignGroups[card.cardId] == null && card.skirmish == null); }); if (!this.spectatorMode) { this.hand = new NormalCardGroup($("#main"), function(card) {