diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson index da762cbb2..72975e680 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Elven-errata.hjson @@ -210,7 +210,7 @@ //One of: Variant, Errata, Reprint //parentType: Errata //parentPath: errata/pc - version: 1? + version: 1 collInfo: 3C14 rarity: C setNum: "3" @@ -224,7 +224,7 @@ culture: Elven twilight: 2 type: Ally - allyHome: 3 + allyHome: 3F race: Elf strength: 5 vitality: 3 @@ -348,7 +348,7 @@ //One of: Variant, Errata, Reprint //parentType: Errata //parentPath: errata/pc - version: 1? + version: 1 collInfo: 3U20 rarity: U setNum: "3" @@ -362,7 +362,7 @@ culture: Elven twilight: 2 type: Ally - allyHome: 3 + allyHome: 3F race: Elf strength: 4 vitality: 3 @@ -476,7 +476,7 @@ //One of: Variant, Errata, Reprint //parentType: Errata //parentPath: errata/pc - version: 1? + version: 1 collInfo: 3U25 rarity: U setNum: "3" @@ -490,7 +490,7 @@ culture: Elven twilight: 2 type: Ally - allyHome: 3 + allyHome: 3F race: Elf strength: 4 vitality: 3 diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/ModifiersAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/ModifiersAtTest.java index 857cccae3..7e4c056c1 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/ModifiersAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/ModifiersAtTest.java @@ -298,7 +298,7 @@ public class ModifiersAtTest extends AbstractAtTest { JSONObject obj = new JSONObject(); obj.put("amount", 1); - ModifierSource modifierSource = new FPCultureSpot().getModifierSource(obj, lotroCardBlueprintBuilder); + ModifierSource modifierSource = new FPCultureCount().getModifierSource(obj, lotroCardBlueprintBuilder); DefaultActionContext actionContext = new DefaultActionContext(P1, _game, null, null, null); passUntil(Phase.FELLOWSHIP); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java index 786a6edf2..7feec4165 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java @@ -461,23 +461,24 @@ public class TriggersAtTest extends AbstractAtTest { assertEquals(Zone.DISCARD, iSeeYou.getZone()); } - @Test - public void siteLiberated() throws Exception { - initializeSimplestGame(); - - PhysicalCard drivenIntoTheHills = addToZone(createCard(P2, "102_1"), Zone.SUPPORT); - PhysicalCard theodenSonOfThengel = addToZone(createCard(P1, "4_292"), Zone.FREE_CHARACTERS); - PhysicalCard guma = addToZone(createCard(P1, "4_277"), Zone.SUPPORT); - - passUntil(Phase.SHADOW); - _game.getGameState().takeControlOfCard(P2, _game, _game.getGameState().getSite(1), Zone.SUPPORT); - _game.getGameState().setPlayerPosition(P2, 2); - - passUntil(Phase.REGROUP); - assertEquals(Zone.SUPPORT, drivenIntoTheHills.getZone()); - selectCardAction(P1, theodenSonOfThengel); - assertEquals(Zone.DISCARD, drivenIntoTheHills.getZone()); - } + // The card used in this example was reworked +// @Test +// public void siteLiberated() throws Exception { +// initializeSimplestGame(); +// +// PhysicalCard drivenIntoTheHills = addToZone(createCard(P2, "102_1"), Zone.SUPPORT); +// PhysicalCard theodenSonOfThengel = addToZone(createCard(P1, "4_292"), Zone.FREE_CHARACTERS); +// PhysicalCard guma = addToZone(createCard(P1, "4_277"), Zone.SUPPORT); +// +// passUntil(Phase.SHADOW); +// _game.getGameState().takeControlOfCard(P2, _game, _game.getGameState().getSite(1), Zone.SUPPORT); +// _game.getGameState().setPlayerPosition(P2, 2); +// +// passUntil(Phase.REGROUP); +// assertEquals(Zone.SUPPORT, drivenIntoTheHills.getZone()); +// selectCardAction(P1, theodenSonOfThengel); +// assertEquals(Zone.DISCARD, drivenIntoTheHills.getZone()); +// } @Test public void siteControlled() throws Exception { diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_014_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_014_ErrataTests.java index 288d4a792..be76c89ce 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_014_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_014_ErrataTests.java @@ -59,7 +59,7 @@ public class Card_03_014_ErrataTests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(5, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.SHADOWS, 3))); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.FELLOWSHIP, 3))); } // Uncomment any @Test markers below once this is ready to be used diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_020_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_020_ErrataTests.java index 4c4de346e..bb31ab2fb 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_020_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_020_ErrataTests.java @@ -59,7 +59,7 @@ public class Card_03_020_ErrataTests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(4, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.SHADOWS, 3))); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.FELLOWSHIP, 3))); } // Uncomment any @Test markers below once this is ready to be used diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_025_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_025_ErrataTests.java index d9d09b37a..a32c8a210 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_025_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set03/Card_03_025_ErrataTests.java @@ -59,7 +59,7 @@ public class Card_03_025_ErrataTests assertEquals(2, card.getBlueprint().getTwilightCost()); assertEquals(4, card.getBlueprint().getStrength()); assertEquals(3, card.getBlueprint().getVitality()); - assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.SHADOWS, 3))); + assertTrue(card.getBlueprint().hasAllyHome(new AllyHome(SitesBlock.FELLOWSHIP, 3))); } // Uncomment any @Test markers below once this is ready to be used