diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson index da605e3be..af45ec225 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Elven-playtest.hjson @@ -455,10 +455,22 @@ effects: { type: event cost: { - type: Exert - count: 2 - select: choose(valiant, companion) - }, + type: If + check: { + type: CanSpot + count: 2 + filter: valiant, Elf + } + true: { + type: Spot + count: 2 + filter: valiant, Elf + } + false: { + type: Exert + select: choose(valiant, companion) + } + } effect: [ { type: PutCardsFromDeckIntoHand @@ -470,7 +482,7 @@ } ] } - gametext: Exert 2 valiant companions to take a valiant (elven) companion or (elven) possession into hand from your draw deck. + gametext: Exert a valiant companion (or spot 2 valiant Elves) to take a valiant [elven] companion or [elven] possession into hand from your draw deck. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gandalf-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gandalf-playtest.hjson index 43c0e17f5..79cefc36d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gandalf-playtest.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Gandalf-playtest.hjson @@ -146,14 +146,6 @@ signet: Theoden resistance: 6 effects: [ - { - type: Modifier - modifier: { - type: ModifyStrength - amount: 1 - filter: name(Theoden) - } - } { type: Modifier modifier: { @@ -179,7 +171,7 @@ cost: [ { type: Spot - count: 3 + count: 2 filter: valiant, companion } { @@ -200,7 +192,7 @@ ] } ] - gametext: Theoden is strength +1.
Each mounted companion gains valiant.
Response: If a minion's special ability is used (except during a skirmish), spot 3 valiant companions and exert Gandalf to prevent that and wound that minion. + gametext: Each mounted companion gains valiant.\Response: If a minion's special ability is used (except during a skirmish), spot 2 valiant companions and exert Gandalf to prevent that and wound that minion. lore: "'No counsel have I to give to those that despair. Yet counsel I could give, and words I could speak to you.'" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Moria-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Moria-playtest.hjson index bb174f46b..cef67ac9e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Moria-playtest.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Moria-playtest.hjson @@ -28,7 +28,7 @@ site: 4 keywords: [ Fierce - Damage+2 + Damage+1 ] effects: [ { @@ -37,6 +37,10 @@ type: TakesWound filter: minion } + cost: { + type: RemoveTwilight + amount: 1 + } effect: { type: AddThreats amount: 1 @@ -57,7 +61,7 @@ } } ] - gametext: Fierce. Damage +2.
Each time a minion takes a wound, add a threat.
Each time the Free Peoples player uses a skirmish special ability during a skirmish involving the Balrog, you may wound a companion it is skirmishing. + gametext: Fierce. Damage +1.
Each time a minion takes a wound, you may remove (1) to add a threat.
Each time the Free Peoples player uses a skirmish special ability during a skirmish involving the Balrog, you may wound a companion it is skirmishing. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson index e61dd805d..e2f337f2a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Rohan-playtest.hjson @@ -16,7 +16,7 @@ style: Standard } title: Theoden - subtitle: Last of his House + subtitle: Last of His House unique: true side: Free Peoples culture: Rohan @@ -34,14 +34,35 @@ modifier: { type: ModifyStrength filter: self - amount: { - type: ForEachYouCanSpot - filter: valiant, companion, AssignedToSkirmish(any) + requires: { + type: CanSpot + count: 2 + filter: other, valiant, companion, AssignedToSkirmish(any) } + amount: 1 + } + } + { + type: Activated + phase: Regroup + cost: [ + { + type: Exert + times: 1 + select: self + } + { + type: Spot + count: 2 + filter: other, valiant, companion, AssignedToSkirmish(any) + } + ] + effect: { + type: LiberateSite } } ] - gametext: Valiant.
Theoden is strength +1 for each valiant companion assigned to a skirmish. + gametext: Valiant.
While 2 other valiant companions assigned to skirmishes, Theoden is strength +1.\Regroup: Exert Theoden and spot 2 other valiant companions to liberate a site. lore: "His beard was laid like snow upon his knees; but his eyes still burned with a bright light, glinting as he gazed..." promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Sauron-playtest.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Sauron-playtest.hjson index ad96bc75e..3ae011a59 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Sauron-playtest.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/setv02-Sauron-playtest.hjson @@ -399,28 +399,22 @@ amount: -3 } } - { - type: Modifier - modifier: { - type: AddKeyword - keyword: damage+1 - filter: culture(sauron),minion,siteNumber(0-1) - } - } { type: Activated - phase: Regroup + phase: Skirmish cost: { - type: Discard - select: choose(or(culture(sauron), culture(isengard)), tracker) + type: Exert + times: 1 + select: self } effect: { - type: PlayCardFromDiscard - select: choose(culture(sauron), condition) + type: AddKeyword + keyword: damage+1 + select: choose(InSkirmish, culture(Sauron), Orc, SiteNumber(0-1)) } } ] - gametext: Tracker.
The site number of each [sauron] orc is -3.
Each [sauron] orc with a site number of 1 or less is damage +1.
Regroup: Discard a [sauron] or [isengard] tracker to play a [sauron] condition from your discard pile. + gametext: Tracker.\The site number of each [sauron] orc is -3. \Skirmish: Exert Grishnakh to make a skirmishing [sauron] Orc with a site number of 1 or less damage +1. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java index 1c6450ea1..b08001f98 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_011_Tests.java @@ -39,7 +39,8 @@ public class Card_V2_011_Tests * Twilight Cost: 1 * Type: Event * Subtype: Fellowship - * Game Text: Exert 2 valiant companions to take a valiant (elven) companion or (elven) possession into hand from your draw deck. + * Game Text: Exert a valiant companion (or spot 2 valiant Elves) to take a valiant [elven] companion + * or [elven] possession into hand from your draw deck. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java index fbd7336e9..94b80873f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_014_Tests.java @@ -43,9 +43,9 @@ public class Card_V2_014_Tests * Vitality: 4 * Resistance: 6 * Signet: Theoden - * Game Text: Theoden is strength +1. - * Each mounted companion gains valiant. - * Response: If a minion's special ability is used (except during a skirmish), spot 3 valiant companions and exert Gandalf to prevent that and wound that minion. + * Game Text: Each mounted companion gains valiant. + * Response: If a minion's special ability is used (except during a skirmish), spot 2 valiant companions + * and exert Gandalf to prevent that and wound that minion. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_038_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_038_Tests.java index eac9e3c95..3945d0dd9 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_038_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_038_Tests.java @@ -42,9 +42,9 @@ public class Card_V2_038_Tests * Strength: 17 * Vitality: 5 * Site Number: 4 - * Game Text: Fierce. Damage +2. - * Each time a minion takes a wound, add a threat. - * Each time the Free Peoples player uses a skirmish special ability during a skirmish involving the Balrog, you may wound a companion it is skirmishing. + * Game Text: Fierce. Damage +1. + * Each time a minion takes a wound you may remove (1) to add a threat. + * Each time the Free Peoples player uses a skirmish special ability during a skirmish involving the Balrog, you may wound a companion it is skirmishing. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java index 6eee74caa..4e0243fef 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java @@ -44,7 +44,8 @@ public class Card_V2_043_Tests * Resistance: 6 * Signet: Theoden * Game Text: Valiant. - * Theoden is strength +1 for each valiant companion assigned to a skirmish. + * While 2 other valiant companions assigned to skirmishes, Theoden is strength +1. + * Regroup: Exert Theoden and spot 2 other valiant companions to liberate a site. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_060_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_060_Tests.java index 917b7f60d..53ed087a6 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_060_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_060_Tests.java @@ -43,9 +43,8 @@ public class Card_V2_060_Tests * Vitality: 3 * Site Number: 6 * Game Text: Tracker. - * The site number of each [sauron] orc is -3. - * Each [sauron] orc with a site number of 1 or less is damage +1. - * Regroup: Discard a [sauron] or [isengard] tracker to play a [sauron] condition from your discard pile. + * The site number of each [sauron] orc is -3. + * Skirmish: Exert Grishnakh to make a [sauron] Orc with a site number of 1 or less damage +1. */ var scn = GetScenario();