From 43f68b50446a3532c2f788cfea9352624f1ebe1a Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:15:02 -0400 Subject: [PATCH 01/17] Temporarily removing new shadow cultures --- .../gempukku/lotro/cards/set30/gundabad/Card30_032.java | 2 +- .../gempukku/lotro/cards/set30/gundabad/Card30_033.java | 3 ++- .../gempukku/lotro/cards/set30/gundabad/Card30_034.java | 2 +- .../gempukku/lotro/cards/set30/gundabad/Card30_035.java | 2 +- .../gempukku/lotro/cards/set30/gundabad/Card30_036.java | 3 ++- .../gempukku/lotro/cards/set30/gundabad/Card30_037.java | 2 +- .../gempukku/lotro/cards/set30/gundabad/Card30_038.java | 7 ++++--- .../gempukku/lotro/cards/set30/gundabad/Card30_039.java | 3 ++- .../gempukku/lotro/cards/set30/gundabad/Card30_040.java | 3 ++- .../gempukku/lotro/cards/set30/gundabad/Card30_041.java | 3 ++- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java index 75c6ae0d3..7bfa531b3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java @@ -21,7 +21,7 @@ import com.gempukku.lotro.logic.modifiers.StrengthModifier; public class Card30_032 extends AbstractEvent { public Card30_032() { - super(Side.SHADOW, 1, Culture.GUNDABAD, "Anger", Phase.SKIRMISH); + super(Side.SHADOW, 1, Culture.SMAUG, "Anger", Phase.SKIRMISH); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java index 7d9befbd6..da14a16a6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java @@ -28,8 +28,9 @@ import java.util.List; */ public class Card30_033 extends AbstractMinion { public Card30_033() { - super(3, 7, 2, 3, Race.ORC, Culture.GUNDABAD, "Fimbul", "Orkish Assassin", true); + super(3, 7, 2, 3, Race.ORC, Culture.SMAUG, "Fimbul", "Orkish Assassin", true); addKeyword(Keyword.DAMAGE, 1); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java index f53a70fa3..ff092e69a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card30_034 extends AbstractPermanent { public Card30_034() { - super(Side.SHADOW, 3, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Hatred Rekindled"); + super(Side.SHADOW, 3, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Hatred Rekindled"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java index 05fc7d8c8..3b3a2e5b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java @@ -22,7 +22,7 @@ import com.gempukku.lotro.game.state.LotroGame; */ public class Card30_035 extends AbstractEvent { public Card30_035() { - super(Side.SHADOW, 0, Culture.GUNDABAD, "Host of Thousands", Phase.SHADOW); + super(Side.SHADOW, 0, Culture.SMAUG, "Host of Thousands", Phase.SHADOW); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java index 6f8355068..3ac4347ff 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java @@ -28,8 +28,9 @@ import java.util.List; */ public class Card30_036 extends AbstractMinion { public Card30_036() { - super(2, 6, 2, 3, Race.ORC, Culture.GUNDABAD, "Narzug", "Orkish Assassin", true); + super(2, 6, 2, 3, Race.ORC, Culture.SMAUG, "Narzug", "Orkish Assassin", true); addKeyword(Keyword.ARCHER); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java index bc45a5188..a8238cfe7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card30_037 extends AbstractPermanent { public Card30_037() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Not at Home", null, true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Not at Home", null, true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java index 322b99b2f..2a107c3d1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java @@ -33,14 +33,15 @@ import java.util.List; */ public class Card30_038 extends AbstractMinion { public Card30_038() { - super(3, 8, 2, 3, Race.ORC, Culture.GUNDABAD, "Orkish Marauder"); + super(3, 8, 2, 3, Race.ORC, Culture.SMAUG, "Orkish Marauder"); + addKeyword(Keyword.WARG_RIDER); } @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self) && PlayConditions.canSpot(game, 4, Culture.DWARVEN, CardType.FOLLOWER)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); + final OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose a companion (except Bilbo)", CardType.COMPANION, Culture.DWARVEN) { @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java index 01424db0d..503a5b734 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java @@ -39,7 +39,8 @@ import java.util.List; */ public class Card30_039 extends AbstractMinion { public Card30_039() { - super(2, 6, 2, 3, Race.ORC, Culture.GUNDABAD, "Orkish Aggressor"); + super(2, 6, 2, 3, Race.ORC, Culture.SMAUG, "Orkish Aggressor"); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java index 9eb5b9c43..dfac59cef 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java @@ -36,7 +36,8 @@ import java.util.List; */ public class Card30_040 extends AbstractMinion { public Card30_040() { - super(4, 8, 3, 3, Race.ORC, Culture.GUNDABAD, "Watchful Orc"); + super(4, 8, 3, 3, Race.ORC, Culture.SMAUG, "Watchful Orc"); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java index a55b4e8c2..2f636e527 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java @@ -28,7 +28,8 @@ import java.util.List; */ public class Card30_041 extends AbstractMinion { public Card30_041() { - super(1, 5, 2, 3, Race.ORC, Culture.GUNDABAD, "Yazneg", "Orkish Assassin", true); + super(1, 5, 2, 3, Race.ORC, Culture.SMAUG, "Yazneg", "Orkish Assassin", true); + addKeyword(Keyword.WARG_RIDER); } @Override From 30bb3e34536489be26383ead3b3029a551a38ad9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:18:20 -0400 Subject: [PATCH 02/17] Removed new shadow culture --- .../com/gempukku/lotro/cards/set31/gundabad/Card31_023.java | 3 ++- .../com/gempukku/lotro/cards/set31/gundabad/Card31_024.java | 3 ++- .../com/gempukku/lotro/cards/set31/gundabad/Card31_025.java | 4 ++-- .../com/gempukku/lotro/cards/set31/gundabad/Card31_026.java | 4 ++-- .../com/gempukku/lotro/cards/set31/gundabad/Card31_027.java | 4 ++-- .../com/gempukku/lotro/cards/set31/gundabad/Card31_028.java | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java index d33e09c49..59de8a366 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java @@ -28,8 +28,9 @@ import java.util.List; */ public class Card31_023 extends AbstractMinion { public Card31_023() { - super(4, 9, 3, 3, Race.ORC, Culture.GUNDABAD, "Azog", "The Defiler", true); + super(4, 9, 3, 3, Race.ORC, Culture.SMAUG, "Azog", "The Defiler", true); addKeyword(Keyword.DAMAGE, 1); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java index 8d9be2ecd..c839f9183 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java @@ -30,8 +30,9 @@ import java.util.List; */ public class Card31_024 extends AbstractMinion { public Card31_024() { - super(4, 9, 3, 3, null, Culture.GUNDABAD, "Bolg", "Son of Azog", true); + super(4, 9, 3, 3, null, Culture.SMAUG, "Bolg", "Son of Azog", true); addKeyword(Keyword.DAMAGE, 1); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java index d5e9064e6..d5f5010c1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_025 extends AbstractAttachable { public Card31_025() { - super(Side.SHADOW, CardType.POSSESSION, 3, Culture.GUNDABAD, PossessionClass.MOUNT, "Savage Warg"); + super(Side.SHADOW, CardType.POSSESSION, 3, Culture.SMAUG, PossessionClass.MOUNT, "Savage Warg"); } @Override @@ -53,7 +53,7 @@ public class Card31_025 extends AbstractAttachable { @Override protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Filters.and(Culture.GUNDABAD,Race.ORC); + return Race.ORC; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java index ad889bf26..bdef60a4a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java @@ -40,7 +40,7 @@ import java.util.List; */ public class Card31_026 extends AbstractAttachable { public Card31_026() { - super(Side.SHADOW, CardType.POSSESSION, 4, Culture.GUNDABAD, PossessionClass.MOUNT, "Threatening Warg"); + super(Side.SHADOW, CardType.POSSESSION, 4, Culture.SMAUG, PossessionClass.MOUNT, "Threatening Warg"); } @Override @@ -57,7 +57,7 @@ public class Card31_026 extends AbstractAttachable { @Override protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Filters.and(Culture.GUNDABAD,Race.ORC); + return Keyword.WARG_RIDER; } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java index cf57fe66d..f5104a9c9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_027 extends AbstractAttachable { public Card31_027() { - super(Side.SHADOW, CardType.POSSESSION, 2, Culture.GUNDABAD, PossessionClass.MOUNT, "Warg"); + super(Side.SHADOW, CardType.POSSESSION, 2, Culture.SMAUG, PossessionClass.MOUNT, "Warg"); } @Override @@ -53,7 +53,7 @@ public class Card31_027 extends AbstractAttachable { @Override protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Filters.and(Culture.GUNDABAD,Race.ORC); + return Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java index e675adc21..a8410abb1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_028 extends AbstractAttachable { public Card31_028() { - super(Side.SHADOW, CardType.POSSESSION, 3, Culture.ISENGARD, PossessionClass.MOUNT, "War-warg"); + super(Side.SHADOW, CardType.POSSESSION, 3, Culture.SMAUG, PossessionClass.MOUNT, "War-warg"); } @Override @@ -53,7 +53,7 @@ public class Card31_028 extends AbstractAttachable { @Override protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Filters.and(Culture.GUNDABAD,Race.ORC); + return Keyword.WARG_RIDER; } @Override From 6e76b067dabcde0d697d140a350eeeb20de27789 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:19:20 -0400 Subject: [PATCH 03/17] Removed new shadow culture --- .../com/gempukku/lotro/cards/set31/spider/Card31_057.java | 4 ++-- .../com/gempukku/lotro/cards/set31/spider/Card31_058.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_059.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_060.java | 6 +++--- .../com/gempukku/lotro/cards/set31/spider/Card31_061.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_062.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_063.java | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java index c5dbe7074..c6829dd38 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java @@ -36,12 +36,12 @@ import java.util.List; */ public class Card31_057 extends AbstractMinion { public Card31_057() { - super(3, 9, 3, 5, Race.SPIDER, Culture.SPIDER, "Crazy Cob", null, true); + super(3, 9, 3, 5, Race.SPIDER, Culture.SMAUG, "Crazy Cob", null, true); addKeyword(Keyword.FIERCE); } @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, CardType.MINION, Culture.MEN) && !PlayConditions.isPhase(game, Phase.REGROUP) && PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java index a2704c45f..4856c9a5b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card31_058 extends AbstractPermanent { public Card31_058() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SPIDER, Zone.SUPPORT, "Enchanted River", null, true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Enchanted River", null, true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java index 17d87974b..1b2036226 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java @@ -32,7 +32,7 @@ import java.util.List; */ public class Card31_059 extends AbstractMinion { public Card31_059() { - super(3, 8, 2, 5, Race.SPIDER, Culture.SPIDER, "Fat Spider"); + super(3, 8, 2, 5, Race.SPIDER, Culture.SMAUG, "Fat Spider"); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java index d746cb2d7..73944fce7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_060 extends AbstractMinion { public Card31_060() { - super(4, 9, 2, 5, Race.SPIDER, Culture.SPIDER, "Lazy Lob", null, true); + super(4, 9, 2, 5, Race.SPIDER, Culture.SMAUG, "Lazy Lob", null, true); addKeyword(Keyword.FIERCE); } @@ -44,10 +44,10 @@ public class Card31_060 extends AbstractMinion { } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && PlayConditions.canDiscardFromPlay(self, game, Race.ORC)) { - ActivateCardAction action = new ActivateCardAction(self); + final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Race.ORC)); action.appendEffect( diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java index fa0a7f4c3..33f9add26 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card31_061 extends AbstractMinion { public Card31_061() { - super(4, 8, 3, 5, Race.SPIDER, Culture.SPIDER, "Old Tomnoddy"); + super(4, 8, 3, 5, Race.SPIDER, Culture.SMAUG, "Old Tomnoddy"); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java index 56eed23a3..fdfbf8278 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_062 extends AbstractPermanent { public Card31_062() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SPIDER, Zone.SUPPORT, "Spider Nest"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Spider Nest"); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java index a00ba1140..a64fc1b86 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java @@ -30,15 +30,15 @@ import java.util.List; */ public class Card31_063 extends AbstractMinion { public Card31_063() { - super(2, 7, 2, 5, Race.SPIDER, Culture.SPIDER, "Wicked Spider"); + super(2, 7, 2, 5, Race.SPIDER, Culture.SMAUG, "Wicked Spider"); addKeyword(Keyword.FIERCE); } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && PlayConditions.canDiscardFromPlay(self, game, Race.ORC)) { - ActivateCardAction action = new ActivateCardAction(self); + final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Race.ORC)); action.appendEffect( From b5f688f97c35a6962a9787122e54e854dbb637a3 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:20:11 -0400 Subject: [PATCH 04/17] Removed new shadow culture --- .../java/com/gempukku/lotro/cards/set31/troll/Card31_064.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_065.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_066.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_067.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_068.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_069.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java index 5b36089ef..c33f14763 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card31_064 extends AbstractMinion { public Card31_064() { - super(5, 11, 4, 2, Race.TROLL, Culture.TROLL, "Bert", "Troll of Ettenmoors", true); + super(5, 11, 4, 2, Race.TROLL, Culture.SMAUG, "Bert", "Troll of Ettenmoors", true); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java index 6dcf04e75..72fd7b89b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_065 extends AbstractPermanent { public Card31_065() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.TROLL, Zone.SUPPORT, "Caught in a Sack"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Caught in a Sack"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java index 4c0d1a2bf..56962e4b7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_066 extends AbstractMinion { public Card31_066() { - super(5, 11, 4, 2, Race.TROLL, Culture.TROLL, "Tom", "Troll of Ettenmoors", true); + super(5, 11, 4, 2, Race.TROLL, Culture.SMAUG, "Tom", "Troll of Ettenmoors", true); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java index 8e0e707e3..d5e1c566c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card31_067 extends AbstractPermanent { public Card31_067() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.TROLL, Zone.SUPPORT, "Troll Campfire", null, true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Troll Campfire", null, true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java index 22c85572f..6420a8340 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card31_068 extends AbstractAttachable { public Card31_068() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.TROLL, PossessionClass.HAND_WEAPON, "Troll Knife"); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.SMAUG, PossessionClass.HAND_WEAPON, "Troll Knife"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java index 682883c56..8eca02d8d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java @@ -35,7 +35,7 @@ import java.util.List; */ public class Card31_069 extends AbstractMinion { public Card31_069() { - super(5, 11, 4, 2, Race.TROLL, Culture.TROLL, "William", "Troll of Ettenmoors", true); + super(5, 11, 4, 2, Race.TROLL, Culture.SMAUG, "William", "Troll of Ettenmoors", true); addKeyword(Keyword.FIERCE); } From 64bb865cf00da6f8e56f87d54db45321f181597d Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:21:39 -0400 Subject: [PATCH 05/17] Create Card30_038.java --- .../com/gempukku/lotro/cards/set30/gundabad/Card30_038.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java index 2a107c3d1..5b9316be3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java @@ -38,10 +38,10 @@ public class Card30_038 extends AbstractMinion { } @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self) && PlayConditions.canSpot(game, 4, Culture.DWARVEN, CardType.FOLLOWER)) { - final OptionalTriggerAction action = new OptionalTriggerAction(self); + OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseActiveCardEffect(self, playerId, "Choose a companion (except Bilbo)", CardType.COMPANION, Culture.DWARVEN) { @Override @@ -68,4 +68,4 @@ public class Card30_038 extends AbstractMinion { } return null; } -} \ No newline at end of file +} From 2ce63824e76e0a7577301f362f9063a0088868ee Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:22:14 -0400 Subject: [PATCH 06/17] Create Card31_023.java --- .../com/gempukku/lotro/cards/set31/gundabad/Card31_023.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java index 59de8a366..6145ac673 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java @@ -29,7 +29,7 @@ import java.util.List; public class Card31_023 extends AbstractMinion { public Card31_023() { super(4, 9, 3, 3, Race.ORC, Culture.SMAUG, "Azog", "The Defiler", true); - addKeyword(Keyword.DAMAGE, 1); + addKeyword(Keyword.DAMAGE, 1); addKeyword(Keyword.WARG_RIDER); } From 837f7b6fb1e01acc9fb16ce56a596b71bdaf358b Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:23:55 -0400 Subject: [PATCH 07/17] Create Card31_063.java --- .../com/gempukku/lotro/cards/set31/spider/Card31_063.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java index a64fc1b86..7b385b1c4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java @@ -38,7 +38,7 @@ public class Card31_063 extends AbstractMinion { protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && PlayConditions.canDiscardFromPlay(self, game, Race.ORC)) { - final ActivateCardAction action = new ActivateCardAction(self); + ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Race.ORC)); action.appendEffect( @@ -60,4 +60,4 @@ public class Card31_063 extends AbstractMinion { } return null; } -} \ No newline at end of file +} From b77516c341706fd928cdb63544cf89a6eb46cfe7 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:24:14 -0400 Subject: [PATCH 08/17] Create Card31_063.java --- .../java/com/gempukku/lotro/cards/set31/spider/Card31_063.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java index 7b385b1c4..bcfff2008 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java @@ -35,7 +35,7 @@ public class Card31_063 extends AbstractMinion { } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { + protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && PlayConditions.canDiscardFromPlay(self, game, Race.ORC)) { ActivateCardAction action = new ActivateCardAction(self); From 54476dc240bda7f2dc768781f29bedcfdfb14eb8 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:24:47 -0400 Subject: [PATCH 09/17] Create Card31_060.java --- .../com/gempukku/lotro/cards/set31/spider/Card31_060.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java index 73944fce7..843528aa1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java @@ -44,10 +44,10 @@ public class Card31_060 extends AbstractMinion { } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { + protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) && PlayConditions.canDiscardFromPlay(self, game, Race.ORC)) { - final ActivateCardAction action = new ActivateCardAction(self); + ActivateCardAction action = new ActivateCardAction(self); action.appendCost( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Race.ORC)); action.appendEffect( @@ -63,4 +63,4 @@ public class Card31_060 extends AbstractMinion { } return null; } -} \ No newline at end of file +} From 6cbd5f8b61830908a67b4f679254e00133535d8f Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:44:52 -0400 Subject: [PATCH 10/17] Substituted culture differences with keyword --- .../com/gempukku/lotro/cards/set30/gundabad/Card30_032.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_033.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_034.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_035.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_036.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_037.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_038.java | 4 ++-- .../com/gempukku/lotro/cards/set30/gundabad/Card30_039.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_040.java | 2 +- .../com/gempukku/lotro/cards/set30/gundabad/Card30_041.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java index 7bfa531b3..75c6ae0d3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_032.java @@ -21,7 +21,7 @@ import com.gempukku.lotro.logic.modifiers.StrengthModifier; public class Card30_032 extends AbstractEvent { public Card30_032() { - super(Side.SHADOW, 1, Culture.SMAUG, "Anger", Phase.SKIRMISH); + super(Side.SHADOW, 1, Culture.GUNDABAD, "Anger", Phase.SKIRMISH); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java index da14a16a6..52b27f211 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_033.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card30_033 extends AbstractMinion { public Card30_033() { - super(3, 7, 2, 3, Race.ORC, Culture.SMAUG, "Fimbul", "Orkish Assassin", true); + super(3, 7, 2, 3, Race.ORC, Culture.GUNDABAD, "Fimbul", "Orkish Assassin", true); addKeyword(Keyword.DAMAGE, 1); addKeyword(Keyword.WARG_RIDER); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java index ff092e69a..f53a70fa3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_034.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card30_034 extends AbstractPermanent { public Card30_034() { - super(Side.SHADOW, 3, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Hatred Rekindled"); + super(Side.SHADOW, 3, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Hatred Rekindled"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java index 3b3a2e5b2..05fc7d8c8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_035.java @@ -22,7 +22,7 @@ import com.gempukku.lotro.game.state.LotroGame; */ public class Card30_035 extends AbstractEvent { public Card30_035() { - super(Side.SHADOW, 0, Culture.SMAUG, "Host of Thousands", Phase.SHADOW); + super(Side.SHADOW, 0, Culture.GUNDABAD, "Host of Thousands", Phase.SHADOW); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java index 3ac4347ff..adb6460f3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_036.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card30_036 extends AbstractMinion { public Card30_036() { - super(2, 6, 2, 3, Race.ORC, Culture.SMAUG, "Narzug", "Orkish Assassin", true); + super(2, 6, 2, 3, Race.ORC, Culture.GUNDABAD, "Narzug", "Orkish Assassin", true); addKeyword(Keyword.ARCHER); addKeyword(Keyword.WARG_RIDER); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java index a8238cfe7..bc45a5188 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_037.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card30_037 extends AbstractPermanent { public Card30_037() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Not at Home", null, true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Not at Home", null, true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java index 5b9316be3..d9a70c20b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_038.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card30_038 extends AbstractMinion { public Card30_038() { - super(3, 8, 2, 3, Race.ORC, Culture.SMAUG, "Orkish Marauder"); + super(3, 8, 2, 3, Race.ORC, Culture.GUNDABAD, "Orkish Marauder"); addKeyword(Keyword.WARG_RIDER); } @@ -68,4 +68,4 @@ public class Card30_038 extends AbstractMinion { } return null; } -} +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java index 503a5b734..f80c95e8d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java @@ -40,7 +40,7 @@ import java.util.List; public class Card30_039 extends AbstractMinion { public Card30_039() { super(2, 6, 2, 3, Race.ORC, Culture.SMAUG, "Orkish Aggressor"); - addKeyword(Keyword.WARG_RIDER); + addKeyword(Keyword.WARG_RIDERGUNDABAD } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java index dfac59cef..4ddd3eaa5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_040.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card30_040 extends AbstractMinion { public Card30_040() { - super(4, 8, 3, 3, Race.ORC, Culture.SMAUG, "Watchful Orc"); + super(4, 8, 3, 3, Race.ORC, Culture.GUNDABAD, "Watchful Orc"); addKeyword(Keyword.WARG_RIDER); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java index 2f636e527..67b3e22ce 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_041.java @@ -28,7 +28,7 @@ import java.util.List; */ public class Card30_041 extends AbstractMinion { public Card30_041() { - super(1, 5, 2, 3, Race.ORC, Culture.SMAUG, "Yazneg", "Orkish Assassin", true); + super(1, 5, 2, 3, Race.ORC, Culture.GUNDABAD, "Yazneg", "Orkish Assassin", true); addKeyword(Keyword.WARG_RIDER); } From 74f1006f87f442a51f78195823799b2fee4dd7ab Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:46:08 -0400 Subject: [PATCH 11/17] Removed new shadow culture --- .../java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java index bebc305c8..84d12309a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/smaug/Card30_058.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card30_058 extends AbstractMinion { public Card30_058() { - super(16, 17, 5, 7, Race.DRAGON, Culture.SMAUG, "Smaug", "The Golden", true); + super(16, 17, 5, 7, Race.DRAGON, Culture.GUNDABAD, "Smaug", "The Golden", true); addKeyword(Keyword.DAMAGE, 2); addKeyword(Keyword.FIERCE); } From 9a28b9d3ee142b14b0d310aa6bf02e923e0326e3 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:50:06 -0400 Subject: [PATCH 12/17] Substituted culture differences with keyword --- .../com/gempukku/lotro/cards/set31/gundabad/Card31_023.java | 6 +++--- .../com/gempukku/lotro/cards/set31/gundabad/Card31_024.java | 6 +++--- .../com/gempukku/lotro/cards/set31/gundabad/Card31_025.java | 2 +- .../com/gempukku/lotro/cards/set31/gundabad/Card31_026.java | 2 +- .../com/gempukku/lotro/cards/set31/gundabad/Card31_027.java | 2 +- .../com/gempukku/lotro/cards/set31/gundabad/Card31_028.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java index 6145ac673..10e902544 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_023.java @@ -28,9 +28,9 @@ import java.util.List; */ public class Card31_023 extends AbstractMinion { public Card31_023() { - super(4, 9, 3, 3, Race.ORC, Culture.SMAUG, "Azog", "The Defiler", true); - addKeyword(Keyword.DAMAGE, 1); - addKeyword(Keyword.WARG_RIDER); + super(4, 9, 3, 3, Race.ORC, Culture.GUNDABAD, "Azog", "The Defiler", true); + addKeyword(Keyword.DAMAGE, 1); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java index c839f9183..bcc2a1812 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_024.java @@ -30,9 +30,9 @@ import java.util.List; */ public class Card31_024 extends AbstractMinion { public Card31_024() { - super(4, 9, 3, 3, null, Culture.SMAUG, "Bolg", "Son of Azog", true); - addKeyword(Keyword.DAMAGE, 1); - addKeyword(Keyword.WARG_RIDER); + super(4, 9, 3, 3, Race.ORC, Culture.GUNDABAD, "Bolg", "Son of Azog", true); + addKeyword(Keyword.DAMAGE, 1); + addKeyword(Keyword.WARG_RIDER); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java index d5f5010c1..18f667415 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_025.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_025 extends AbstractAttachable { public Card31_025() { - super(Side.SHADOW, CardType.POSSESSION, 3, Culture.SMAUG, PossessionClass.MOUNT, "Savage Warg"); + super(Side.SHADOW, CardType.POSSESSION, 3, Culture.GUNDABAD, PossessionClass.MOUNT, "Savage Warg"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java index bdef60a4a..1f6b656ba 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_026.java @@ -40,7 +40,7 @@ import java.util.List; */ public class Card31_026 extends AbstractAttachable { public Card31_026() { - super(Side.SHADOW, CardType.POSSESSION, 4, Culture.SMAUG, PossessionClass.MOUNT, "Threatening Warg"); + super(Side.SHADOW, CardType.POSSESSION, 4, Culture.GUNDABAD, PossessionClass.MOUNT, "Threatening Warg"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java index f5104a9c9..3a626a513 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_027 extends AbstractAttachable { public Card31_027() { - super(Side.SHADOW, CardType.POSSESSION, 2, Culture.SMAUG, PossessionClass.MOUNT, "Warg"); + super(Side.SHADOW, CardType.POSSESSION, 2, Culture.GUNDABAD, PossessionClass.MOUNT, "Warg"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java index a8410abb1..bc0bf4712 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_028.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_028 extends AbstractAttachable { public Card31_028() { - super(Side.SHADOW, CardType.POSSESSION, 3, Culture.SMAUG, PossessionClass.MOUNT, "War-warg"); + super(Side.SHADOW, CardType.POSSESSION, 3, Culture.GUNDABAD, PossessionClass.MOUNT, "War-warg"); } @Override From cf881a7fe91c4e75c7067374bd552b63affa1bb0 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:50:49 -0400 Subject: [PATCH 13/17] Removed new shadow culture --- .../com/gempukku/lotro/cards/set31/spider/Card31_057.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_058.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_059.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_060.java | 4 ++-- .../com/gempukku/lotro/cards/set31/spider/Card31_061.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_062.java | 2 +- .../com/gempukku/lotro/cards/set31/spider/Card31_063.java | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java index c6829dd38..15bae4f94 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_057 extends AbstractMinion { public Card31_057() { - super(3, 9, 3, 5, Race.SPIDER, Culture.SMAUG, "Crazy Cob", null, true); + super(3, 9, 3, 5, Race.SPIDER, Culture.GUNDABAD, "Crazy Cob", null, true); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java index 4856c9a5b..ec95c50d9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_058.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card31_058 extends AbstractPermanent { public Card31_058() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Enchanted River", null, true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Enchanted River", null, true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java index 1b2036226..9eccb02db 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_059.java @@ -32,7 +32,7 @@ import java.util.List; */ public class Card31_059 extends AbstractMinion { public Card31_059() { - super(3, 8, 2, 5, Race.SPIDER, Culture.SMAUG, "Fat Spider"); + super(3, 8, 2, 5, Race.SPIDER, Culture.GUNDABAD, "Fat Spider"); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java index 843528aa1..1b815fd34 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_060.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_060 extends AbstractMinion { public Card31_060() { - super(4, 9, 2, 5, Race.SPIDER, Culture.SMAUG, "Lazy Lob", null, true); + super(4, 9, 2, 5, Race.SPIDER, Culture.GUNDABAD, "Lazy Lob", null, true); addKeyword(Keyword.FIERCE); } @@ -63,4 +63,4 @@ public class Card31_060 extends AbstractMinion { } return null; } -} +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java index 33f9add26..21c4ab0ad 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_061.java @@ -29,7 +29,7 @@ import java.util.List; */ public class Card31_061 extends AbstractMinion { public Card31_061() { - super(4, 8, 3, 5, Race.SPIDER, Culture.SMAUG, "Old Tomnoddy"); + super(4, 8, 3, 5, Race.SPIDER, Culture.GUNDABAD, "Old Tomnoddy"); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java index fdfbf8278..f70997525 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_062.java @@ -34,7 +34,7 @@ import java.util.List; */ public class Card31_062 extends AbstractPermanent { public Card31_062() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Spider Nest"); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Spider Nest"); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java index bcfff2008..0965960a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_063.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card31_063 extends AbstractMinion { public Card31_063() { - super(2, 7, 2, 5, Race.SPIDER, Culture.SMAUG, "Wicked Spider"); + super(2, 7, 2, 5, Race.SPIDER, Culture.GUNDABAD, "Wicked Spider"); addKeyword(Keyword.FIERCE); } @@ -60,4 +60,4 @@ public class Card31_063 extends AbstractMinion { } return null; } -} +} \ No newline at end of file From 1da906c95a637c32f0e10f35600fb7151d98a474 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:51:21 -0400 Subject: [PATCH 14/17] Removed new shadow culture --- .../java/com/gempukku/lotro/cards/set31/troll/Card31_064.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_065.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_066.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_067.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_068.java | 2 +- .../java/com/gempukku/lotro/cards/set31/troll/Card31_069.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java index c33f14763..b2268bd56 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_064.java @@ -33,7 +33,7 @@ import java.util.List; */ public class Card31_064 extends AbstractMinion { public Card31_064() { - super(5, 11, 4, 2, Race.TROLL, Culture.SMAUG, "Bert", "Troll of Ettenmoors", true); + super(5, 11, 4, 2, Race.TROLL, Culture.GUNDABAD, "Bert", "Troll of Ettenmoors", true); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java index 72fd7b89b..a88e52305 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_065.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_065 extends AbstractPermanent { public Card31_065() { - super(Side.SHADOW, 0, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Caught in a Sack"); + super(Side.SHADOW, 0, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Caught in a Sack"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java index 56962e4b7..9b2e65e55 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_066.java @@ -36,7 +36,7 @@ import java.util.List; */ public class Card31_066 extends AbstractMinion { public Card31_066() { - super(5, 11, 4, 2, Race.TROLL, Culture.SMAUG, "Tom", "Troll of Ettenmoors", true); + super(5, 11, 4, 2, Race.TROLL, Culture.GUNDABAD, "Tom", "Troll of Ettenmoors", true); addKeyword(Keyword.FIERCE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java index d5e1c566c..2848f3891 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_067.java @@ -25,7 +25,7 @@ import java.util.List; */ public class Card31_067 extends AbstractPermanent { public Card31_067() { - super(Side.SHADOW, 2, CardType.CONDITION, Culture.SMAUG, Zone.SUPPORT, "Troll Campfire", null, true); + super(Side.SHADOW, 2, CardType.CONDITION, Culture.GUNDABAD, Zone.SUPPORT, "Troll Campfire", null, true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java index 6420a8340..8faeccf84 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_068.java @@ -24,7 +24,7 @@ import java.util.List; */ public class Card31_068 extends AbstractAttachable { public Card31_068() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.SMAUG, PossessionClass.HAND_WEAPON, "Troll Knife"); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.GUNDABAD, PossessionClass.HAND_WEAPON, "Troll Knife"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java index 8eca02d8d..127fafcc4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/troll/Card31_069.java @@ -35,7 +35,7 @@ import java.util.List; */ public class Card31_069 extends AbstractMinion { public Card31_069() { - super(5, 11, 4, 2, Race.TROLL, Culture.SMAUG, "William", "Troll of Ettenmoors", true); + super(5, 11, 4, 2, Race.TROLL, Culture.GUNDABAD, "William", "Troll of Ettenmoors", true); addKeyword(Keyword.FIERCE); } From 0eb54330171e9853f89eb71bbf856a304169f1e1 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 22:52:35 -0400 Subject: [PATCH 15/17] Update Card31_057.java --- .../java/com/gempukku/lotro/cards/set31/spider/Card31_057.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java index 15bae4f94..f62d2b691 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/spider/Card31_057.java @@ -41,7 +41,7 @@ public class Card31_057 extends AbstractMinion { } @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.forEachDiscardedFromPlay(game, effectResult, CardType.MINION, Culture.MEN) && !PlayConditions.isPhase(game, Phase.REGROUP) && PlayConditions.canPlayFromHand(playerId, game, -2, Race.SPIDER)) { From cd46eedd87ed50bfd08e48e7d7b39da590c7d025 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 23:05:40 -0400 Subject: [PATCH 16/17] Corrected Card30_039.java --- .../com/gempukku/lotro/cards/set30/gundabad/Card30_039.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java index f80c95e8d..7230924c6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/gundabad/Card30_039.java @@ -39,8 +39,8 @@ import java.util.List; */ public class Card30_039 extends AbstractMinion { public Card30_039() { - super(2, 6, 2, 3, Race.ORC, Culture.SMAUG, "Orkish Aggressor"); - addKeyword(Keyword.WARG_RIDERGUNDABAD + super(2, 6, 2, 3, Race.ORC, Culture.GUNDABAD, "Orkish Aggressor"); + addKeyword(Keyword.WARG_RIDER); } @Override @@ -67,4 +67,4 @@ public class Card30_039 extends AbstractMinion { } return null; } -} \ No newline at end of file +} From aa6fd74785f7d75063e866f10fecfb85491f3aba Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 14 Jun 2017 23:07:41 -0400 Subject: [PATCH 17/17] Update Card31_027.java --- .../com/gempukku/lotro/cards/set31/gundabad/Card31_027.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java index 3a626a513..5fe0d537f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gundabad/Card31_027.java @@ -53,7 +53,7 @@ public class Card31_027 extends AbstractAttachable { @Override protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { - return Keyword.WARG_RIDER); + return Keyword.WARG_RIDER; } @Override