diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Ringwraith-errata.hjson index 830f08c96..1cc135bc2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Ringwraith-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Ringwraith-errata.hjson @@ -48,6 +48,7 @@ type: addKeyword filter: choose(Nazgul) keyword: damage+1 + until: start(regroup) } } { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson index 08fd4bd40..ccfaac2c9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson @@ -43,13 +43,13 @@ type: wound player: freeps count: 2 - filter: choose(your,character) + filter: choose(freeps,character) } { type: wound player: shadow count: 2 - filter: choose(your,character) + filter: choose(shadow,character) } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson index 4f242dac4..6dfdc8842 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson @@ -147,6 +147,10 @@ filter: your,companion memorize: exertedComp } + requires: { + type: Location + filter: self + } cost: { type: exert filter: choose(culture(elven),ally) diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_061_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_061_Tests.java index 473ed9827..13e5df87c 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_061_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_061_Tests.java @@ -36,7 +36,7 @@ public class Card_V1_061_Tests put("site4", "1_343"); put("site5", "1_349"); put("site6", "101_61"); - put("site7", "1_353"); + put("site7", "3_118"); //NOT Anduin Confluence! lol put("site8", "1_356"); put("site9", "1_360"); }}, @@ -176,17 +176,20 @@ public class Card_V1_061_Tests // 5 -> 6 scn.SkipToPhase(Phase.REGROUP); + assertEquals(5, (long)scn.GetCurrentSite().getSiteNumber()); scn.FreepsPlayCard(pathfinder); //ensure that it counts as "ours" scn.ShadowPassCurrentPhaseAction(); scn.FreepsPassCurrentPhaseAction(); scn.ShadowDeclineReconciliation(); scn.FreepsChooseToMove(); + assertEquals("Lorien Throne Room", scn.GetCurrentSite().getBlueprint().getTitle()); // 6 -> 7 scn.SkipToPhase(Phase.REGROUP); scn.PassCurrentPhaseActions(); scn.ShadowDeclineReconciliation(); scn.FreepsChooseToMove(); + assertEquals(7, (long)scn.GetCurrentSite().getSiteNumber()); scn.ShadowMoveCharToTable(runner);