From 9bb706c0dc1c82c32f947cb2ebfe92ebfbf2f2ed Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 19:48:13 -0500 Subject: [PATCH 01/14] Fixed Be Gone! not lasting until regroup --- .../src/main/resources/cards/official/set15/set15-Gandalf.hjson | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson index 9bc242678..4bf2af754 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson @@ -52,6 +52,7 @@ type: modifyStrength select: choose(minion) amount: -2 + until: start(regroup) } } ] From 7557401f87c9d8b0b7768600ad155c78b5ffb0d1 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 20:42:35 -0500 Subject: [PATCH 02/14] Fixed Storied Homestead Response being a required trigger instead of optional. --- .../src/main/resources/cards/official/set13/set13-Gondor.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson index e4cb2e46a..c885f3980 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson @@ -1013,7 +1013,7 @@ } { type: Trigger - optional: false + optional: true trigger: { type: usesSpecialAbility filter: minion From d8999d46323e348ebe44b6ad42a29fe3075a0057 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 21:02:04 -0500 Subject: [PATCH 03/14] Fixed Eastfold not preventing move until the end of the turn. --- .../src/main/resources/cards/official/set04/set04-Sites.hjson | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson index 6bceb5489..ffd05629d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson @@ -389,6 +389,7 @@ modifier: { type: cantMove } + until: EndOfTurn } } ] From c327f2ecd976685606cefd955477cb0ba8bc4076 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 21:11:17 -0500 Subject: [PATCH 04/14] Fixed Blood Runs Chill targeting any Dwarf, as opposed to only Dwarves with a damage bonus and at least 3 vitality. --- .../src/main/resources/cards/official/set08/set08-Dwarven.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson index 860562bc9..a212f2222 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson @@ -127,7 +127,7 @@ type: event cost: { type: exert - select: choose(dwarf) + select: choose(dwarf,damage,CanExert,MinVitality(3)) times: 2 memorize: exertedDwarf }, From 9f03d5b15b85b481583ce7169b4823ef037d8f24 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 21:17:40 -0500 Subject: [PATCH 05/14] Fixed Wind that Sped Ships permitting the player to choose to spot more than 6 tokens (the strength bonus was correctly being set to +6, it's only the selection being a nuisance). --- .../resources/cards/official/set08/set08-Raider.hjson | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson index 642cd0eb1..0be217db0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson @@ -980,8 +980,12 @@ text: Choose how many {raider} tokens to spot from: 0 to: { - type: ForEachCultureToken - culture: raider + type: Min + firstNumber: { + type: ForEachCultureToken + culture: raider + } + secondNumber: 6 } memorize: spotCount } From a41a95976b997862fd79c84eb2aec11b61cae54c Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 21:33:36 -0500 Subject: [PATCH 06/14] Fixed V2 Legion of Isengard blocking skirmish special abilities in all skirmishes and not just its own. --- .../cards/unofficial/pc/setV02/V2-Isengard.hjson | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson index 95d851ce1..53f4fb1e1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson @@ -709,10 +709,16 @@ type: cantUseSpecialAbilities filter: any phase: skirmish - requires: { - type: Location - filter: battleground - } + requires: [ + { + type: Location + filter: battleground + } + { + type: CanSpot + filter: inSkirmish, self + } + ] } } ] From fbddb6de100e1fe41db27c3af0334ea872474f16 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:01:44 -0500 Subject: [PATCH 07/14] Fixed Ithilien Trap exerting X minions instead of exerting a minion for each X. --- .../resources/cards/official/set04/set04-Gondor.hjson | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson index 0b170c995..ebb1c6376 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson @@ -817,14 +817,17 @@ phase: maneuver effect: [ { - type: exert - select: choose(minion) - count: { + type: Repeat + times: { type: ForEachCultureToken filter: self culture: gondor limit: 3 } + effect: { + type: exert + select: choose(minion) + } } { type: discard From db22132aec38e12d8c9c976994f5c17be7228b90 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:02:09 -0500 Subject: [PATCH 08/14] Fixed Ulaire Nertea, WInged Hunter exerting X companions insetad of for each X. --- .../cards/official/set06/set06-Ringwraith.hjson | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson index c578d8292..c420ba833 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson @@ -215,13 +215,16 @@ filter: another,nazgul } effect: { - type: exert - player: fp - select: choose(ringBound,companion) - count: { + type: Repeat + times: { type: forEachFPCulture over: 2 } + effect: { + type: exert + player: fp + select: choose(ringBound,companion) + } } } ] From d4e82a12ebe64260e07bee556a8d00280c494ac6 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:13:52 -0500 Subject: [PATCH 09/14] Fixing Faramir, Defender of Osgiliath playing all revealed knights instead of just 1 --- .../cards/official/set08/set08-Gondor.hjson | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson index ed1b247fe..4b1cd5b98 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson @@ -201,21 +201,10 @@ memorize: revealedCards } { - type: Repeat - times: { - type: ForEachInMemory - memory: revealedCards - filter: knight - } - effect: { - type: playCardFromDrawDeck - select: choose(memory(revealedCards),knight) - showAll: false - shuffle: false - } - } - { - type: shuffleDeck + type: playCardFromDrawDeck + select: choose(memory(revealedCards),knight) + showAll: false + shuffle: true } ] } From d0322ec70339c1f234d1be3f989ae0f433b887c7 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:25:57 -0500 Subject: [PATCH 10/14] Fixed Beyond the Height of Men not respecting the 6-companion clause --- .../main/resources/cards/official/set02/set02-Isengard.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson index 124dc22e0..4bab5d1a8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson @@ -35,7 +35,7 @@ { type: If check: { - type: cantSpot + type: canSpot filter: companion count: 6 } From 9855161a59afc01a2612778b6e9764065024067b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:29:24 -0500 Subject: [PATCH 11/14] Fixed Bill the Pony, Dearly-loved not removing [Shire] tokens --- .../src/main/resources/cards/official/set13/set13-Shire.hjson | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson index 93c5c0eb9..5cdc71a04 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson @@ -97,6 +97,7 @@ cost: { type: removeTokensCumulative culture: shire + count: 2 } effect: { type: discard From 6cb60c112df02fa95457f125e25320b00e9aea95 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:31:37 -0500 Subject: [PATCH 12/14] Fixed Aegnor working with ring-bound companions. --- .../src/main/resources/cards/official/set10/set10-Elven.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson index 3fe46a9ae..afcbdea1a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson @@ -33,7 +33,7 @@ } { type: modifyStrength - select: choose(minion,inSkirmishAgainst(culture(elven),companion)) + select: choose(minion,inSkirmishAgainst(culture(elven),unbound,companion)) amount: { type: fromMemory memory: spotCount From 0947eced75a42138e43d7c420e048ab0e6423953 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:38:07 -0500 Subject: [PATCH 13/14] Fixed White Hand Guard working on non-hunter minions. --- .../main/resources/cards/official/set17/set17-Uruk-hai.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson index 89027f3bf..9b2434b9a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson @@ -714,7 +714,7 @@ } effect: { type: modifyStrength - select: choose(culture(uruk-hai),minion) + select: choose(culture(uruk-hai),hunter,minion) amount: 2 } } From 531a54fb8161e22ff4165f9cb2152a03ce6b470a Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 19 Mar 2025 23:55:45 -0500 Subject: [PATCH 14/14] Fixing Beyond the Height of Men fix --- .../cards/official/set02/set02-Isengard.hjson | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson index 4bab5d1a8..499929023 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson @@ -31,15 +31,7 @@ type: discard select: all(side(free people),possession,or(armor,helm,shield)) } - } - { - type: If - check: { - type: canSpot - filter: companion - count: 6 - } - true: { + false: { type: discard select: choose(possession,or(armor,helm,shield)) }