diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gandalf/Card12_026.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gandalf/Card12_026.java index 81c1ce268..0f7a8dcb6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gandalf/Card12_026.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/gandalf/Card12_026.java @@ -24,6 +24,7 @@ public class Card12_026 extends AbstractEvent { public Card12_026() { super(Side.FREE_PEOPLE, 7, Culture.GANDALF, "Discoveries", Phase.FELLOWSHIP); addKeyword(Keyword.TOIL, 3); + addKeyword(Keyword.SPELL); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set01-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set01-Ringwraith.hjson index b8513afb4..f3d434ac6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set01-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set01-Ringwraith.hjson @@ -116,7 +116,6 @@ twilight: 5 type: Event keywords: [ - instead Maneuver ] /*requires: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Raider.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Raider.hjson index c2abcd14e..ed6efa43c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Raider.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set07-Raider.hjson @@ -1114,7 +1114,7 @@ style: Standard } title: Mûmak Commander - unique: true + unique: false side: Shadow culture: Raider twilight: 8 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set08-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set08-Gollum.hjson index e0e3677ca..339efb11e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set08-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set08-Gollum.hjson @@ -348,7 +348,10 @@ culture: Gollum twilight: 0 type: Event - keywords: Fellowship or Regroup + keywords: [ + Fellowship + Regroup + ] /*requires: { } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gollum.hjson index 85159f2d2..057e6e82f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gollum.hjson @@ -393,7 +393,10 @@ culture: Gollum twilight: 0 type: Event - keywords: Fellowship or Regroup + keywords: [ + Fellowship + Regroup + ] /*requires: { } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gondor.hjson index 4026c19d6..25f4b6eb8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/card-stubs/set11-Gondor.hjson @@ -635,8 +635,8 @@ twilight: 0 type: Event keywords: [ - ranger - Fellowship or Regroup + Fellowship + Regroup ] /*requires: { diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_205_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_205_Tests.java index 41ba364a2..db6a3e50c 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_205_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_205_Tests.java @@ -52,7 +52,6 @@ public class Card_01_205_Tests assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.WRAITH, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.HasKeyword(card, Keyword.INSTEAD)); assertTrue(scn.HasKeyword(card, Keyword.MANEUVER)); assertEquals(5, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set02/Card_02_026_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set02/Card_02_026_Tests.java index cfb74faaf..4bb960412 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set02/Card_02_026_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set02/Card_02_026_Tests.java @@ -46,7 +46,7 @@ public class Card_02_026_Tests var card = scn.GetFreepsCard("card"); - assertEquals("Speak "Friend" and Enter", card.getBlueprint().getTitle()); + assertEquals("Speak \"Friend\" and Enter", card.getBlueprint().getTitle()); assertNull(card.getBlueprint().getSubtitle()); assertFalse(card.getBlueprint().isUnique()); assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_018_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_018_Tests.java index 8642a99c2..83992a55b 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_018_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set03/Card_03_018_Tests.java @@ -50,7 +50,7 @@ public class Card_03_018_Tests var card = scn.GetFreepsCard("card"); assertEquals("Galdor", card.getBlueprint().getTitle()); - assertEquals("Councilor From The West", card.getBlueprint().getSubtitle()); + assertEquals("Councilor From the West", card.getBlueprint().getSubtitle()); assertTrue(card.getBlueprint().isUnique()); assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.ELVEN, card.getBlueprint().getCulture()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set05/Card_05_096_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set05/Card_05_096_Tests.java index 1c3c8a51b..1b1d21b00 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set05/Card_05_096_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set05/Card_05_096_Tests.java @@ -53,7 +53,8 @@ public class Card_05_096_Tests assertEquals(Culture.SAURON, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); assertTrue(scn.HasKeyword(card, Keyword.SKIRMISH)); - assertTrue(scn.HasKeyword(card, Keyword.RESPONSE)); + //Once this is converted to JSON, uncomment the below. + //assertTrue(scn.HasKeyword(card, Keyword.RESPONSE)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_152_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_152_Tests.java index 6b06522c9..9166332cc 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_152_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_152_Tests.java @@ -33,7 +33,7 @@ public class Card_07_152_Tests /** * Set: 7 * Name: Mûmak Commander - * Unique: True + * Unique: False * Side: Shadow * Culture: Raider * Twilight Cost: 8 @@ -51,7 +51,7 @@ public class Card_07_152_Tests assertEquals("Mûmak Commander", card.getBlueprint().getTitle()); assertNull(card.getBlueprint().getSubtitle()); - assertTrue(card.getBlueprint().isUnique()); + assertFalse(card.getBlueprint().isUnique()); assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.RAIDER, card.getBlueprint().getCulture()); assertEquals(CardType.MINION, card.getBlueprint().getCardType()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_303_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_303_Tests.java index cd9e6d629..8ac5542b2 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_303_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set07/Card_07_303_Tests.java @@ -49,7 +49,8 @@ public class Card_07_303_Tests var card = scn.GetFreepsCard("card"); - assertEquals("Orc Pursuer", card.getBlueprint().getTitle()); + //Decipher messed up and assigned this name after already naming 5C108 + assertEquals("Orc Pursuer(2)", card.getBlueprint().getTitle()); assertNull(card.getBlueprint().getSubtitle()); assertFalse(card.getBlueprint().isUnique()); assertEquals(Side.SHADOW, card.getBlueprint().getSide()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_029_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_029_Tests.java index 2ce153cfc..686fd005b 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_029_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set08/Card_08_029_Tests.java @@ -52,7 +52,8 @@ public class Card_08_029_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.GOLLUM, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.HasKeyword(card, Keyword.FELLOWSHIP_OR_REGROUP)); + assertTrue(scn.HasKeyword(card, Keyword.FELLOWSHIP)); + assertTrue(scn.HasKeyword(card, Keyword.REGROUP)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_049_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_049_Tests.java index 8883393d5..ddf51eab6 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_049_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_049_Tests.java @@ -52,7 +52,8 @@ public class Card_11_049_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.GOLLUM, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.HasKeyword(card, Keyword.FELLOWSHIP_OR_REGROUP)); + assertTrue(scn.HasKeyword(card, Keyword.FELLOWSHIP)); + assertTrue(scn.HasKeyword(card, Keyword.REGROUP)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_066_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_066_Tests.java index d9c7cd460..414458bfa 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_066_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_066_Tests.java @@ -52,8 +52,8 @@ public class Card_11_066_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.GONDOR, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.HasKeyword(card, Keyword.RANGER)); - assertTrue(scn.HasKeyword(card, Keyword.FELLOWSHIP_OR_REGROUP)); + assertTrue(scn.HasKeyword(card, Keyword.FELLOWSHIP)); + assertTrue(scn.HasKeyword(card, Keyword.REGROUP)); assertEquals(0, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_164_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_164_Tests.java index 37c1e0002..51befb285 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_164_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_164_Tests.java @@ -56,7 +56,6 @@ public class Card_11_164_Tests assertEquals(Culture.SHIRE, card.getBlueprint().getCulture()); assertEquals(CardType.COMPANION, card.getBlueprint().getCardType()); assertEquals(Race.HOBBIT, card.getBlueprint().getRace()); - assertTrue(scn.HasKeyword(card, Keyword.RING_BEARER)); assertTrue(scn.HasKeyword(card, Keyword.RING_BOUND)); assertTrue(scn.HasKeyword(card, Keyword.CAN_START_WITH_RING)); assertEquals(0, card.getBlueprint().getTwilightCost()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set12/Card_12_034_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set12/Card_12_034_Tests.java index 842ee3436..37a6f7662 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set12/Card_12_034_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set12/Card_12_034_Tests.java @@ -52,7 +52,8 @@ public class Card_12_034_Tests assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); assertEquals(Culture.GANDALF, card.getBlueprint().getCulture()); assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.HasKeyword(card, Keyword.MANEUVER_OR_REGROUP)); + assertTrue(scn.HasKeyword(card, Keyword.MANEUVER)); + assertTrue(scn.HasKeyword(card, Keyword.REGROUP)); assertEquals(1, card.getBlueprint().getTwilightCost()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set15/Card_15_144_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set15/Card_15_144_Tests.java index 9cc0e78ef..f541bcbdd 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set15/Card_15_144_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set15/Card_15_144_Tests.java @@ -56,7 +56,6 @@ public class Card_15_144_Tests assertEquals(Culture.SHIRE, card.getBlueprint().getCulture()); assertEquals(CardType.COMPANION, card.getBlueprint().getCardType()); assertEquals(Race.HOBBIT, card.getBlueprint().getRace()); - assertTrue(scn.HasKeyword(card, Keyword.RING_BEARER)); assertTrue(scn.HasKeyword(card, Keyword.RING_BOUND)); assertTrue(scn.HasKeyword(card, Keyword.CAN_START_WITH_RING)); assertEquals(0, card.getBlueprint().getTwilightCost());