From 586802f134705e2866b55453c30de8a4fee6ae30 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 5 Jul 2025 11:39:50 -0500 Subject: [PATCH 1/5] Fixed another (completely separate!) crash for Called Away when using its ability --- .../src/main/resources/cards/official/set08/set08-Sauron.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson index b10bf202e..cf5be2dea 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson @@ -31,7 +31,7 @@ type: removeBurdens ignoreCostCheckFailure: true amount: { - type: fromMemory + type: TwilightCostInMemory memory: chosenCompanion } } From 16d03f8bd2b3700be3e37d36397a4302f36020d7 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 6 Jul 2025 13:00:22 -0500 Subject: [PATCH 2/5] Fixed TWK, Conqueror of Arthedain triggering even on non-fierce skirmishes --- .../main/resources/cards/official/set17/set17-Ringwraith.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson index d9afc525f..299753ec8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Ringwraith.hjson @@ -343,7 +343,7 @@ optional: true trigger: { type: winsSkirmish - filter: self + filter: self, InFierceSkirmish } effect: { type: repeat From f152e026ff1c90106f4768fee9790b19128bfaad Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 9 Jul 2025 23:12:04 -0500 Subject: [PATCH 3/5] Fixed Book of Mazarbul working on site paths other than Fellowship --- .../src/main/resources/cards/official/set03/set03-Dwarven.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson index dcc87dcd9..ce6c2bf66 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Dwarven.hjson @@ -23,7 +23,7 @@ } requires: { type: location - filter: siteNumber(4-100) + filter: siteNumber(4-100), SiteBlock(Fellowship) } effect: { type: drawCards From 99617e1a06da375a69ac52fd8312f94ed3f0bef0 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 13 Jul 2025 11:43:16 -0500 Subject: [PATCH 4/5] Added full arts for Mumak Commander GATS and Sam GEW --- .../gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js | 6 +++++- .../src/main/resources/blueprintMapping.txt | 6 +++++- .../src/main/resources/product/PC-Packs.hjson | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js index 740938dc3..938b0451a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js @@ -983,6 +983,10 @@ var PCCards = { // Pale Crown FA '101_104' : 'https://i.lotrtcgpc.net/promos/LOTR-ENV1U039.0_card.jpg', // V2 Saruman FA - '102_100': 'https://i.lotrtcgpc.net/promos/LOTR-ENV2U029.0_card.jpg' + '102_100': 'https://i.lotrtcgpc.net/promos/LOTR-ENV2U029.0_card.jpg', + // FA Sam, Great Elf Warrior + '10_129': 'https://i.lotrtcgpc.net/promos/LOTR-EN10U122.0_card.jpg', + // July 2025 WC Circuit: FA Mumak Commander, GATS + '15_211': 'https://i.lotrtcgpc.net/promos/LOTR-EN15U086.0_card.jpg' } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt index ad062a477..3cb5fef22 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -417,4 +417,8 @@ gl_theOneRing,1_2 #2025 WC Circuit: Pale Crown 101_104,101_39 #June 2025 WC Circuit: V2 Saruman -102_100,102_29 \ No newline at end of file +102_100,102_29 +#FA Sam, Great Elf Warrior +10_129,10_122 +#July 2025 WC Circuit: FA Mumak Commander, GATS +15_211,15_86 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson index e18ea41e6..65693d9b4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/PC-Packs.hjson @@ -185,6 +185,10 @@ #1x101_104 // V2 Saruman FA 1x102_100 + #FA Sam, Great Elf Warrior + #1x10_129 + #July 2025 WC Circuit: FA Mumak Commander, GATS + 1x15_211 ] } @@ -292,6 +296,10 @@ #1x101_104 // V2 Saruman FA 1x102_100 + #FA Sam, Great Elf Warrior + #1x10_129 + #July 2025 WC Circuit: FA Mumak Commander, GATS + 1x15_211 ] } From 1331826c113294e1a782bdb31dd8cd025138d881 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 13 Jul 2025 11:47:12 -0500 Subject: [PATCH 5/5] Fixed Mithlond errata not having the RIver keyword --- .../cards/unofficial/pc/errata/set18/set18-Sites-errata.hjson | 1 + 1 file changed, 1 insertion(+) 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 992898c22..6c52f056e 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 @@ -72,6 +72,7 @@ type: Site block: Shadows direction: Left + keywords: River effects: [ { type: Trigger