From 32e441ef11410aea4431860f5d1769212046a74c Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Tue, 25 Jun 2024 22:18:36 -0500 Subject: [PATCH 1/6] Fixing Faramir CAI PC errata being a skirmish ability and not maneuver --- .../cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson index 74d8b8974..f8194dead 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set18/set18-Gondor-errata.hjson @@ -39,7 +39,7 @@ } { type: activated - phase: skirmish + phase: maneuver requires: { type: CanSpot filter: another,wounded,companion,ResistanceMoreThan(4) From 930c9fa7561239b3ff19271be4d4a248d3c21f09 Mon Sep 17 00:00:00 2001 From: dmasalin Date: Sun, 28 Jul 2024 18:23:47 -0400 Subject: [PATCH 2/6] TS Sealed Starter Deck Balance Changes Balance change to the TS Sealed. Switching the shadow decks for the S1D3 and S3D1, as well as some sites, where applicable. --- .../product/TS-Sealed-Starters.hjson | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson index 25dc31100..14d9ae8bc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson @@ -224,23 +224,23 @@ #Adventure Deck #1 4U328 The Riddermark - #2 4U331 Eastfold + #2 4U335 Uruk Camp #3 4U337 Barrows of Edoras #4 4U343 Ered Nimrais - #5 4U347 Deep of Helm + #5 4U348 Deeping Wall #6 4U354 Hornburg Armory #7 5U118 Hornburg Wall #8 4U359 Wizard's Vale - #9 6U120 Saruman's Laboratory + #9 5U120 Caverns of Isengard 1x4_328 - 1x4_331 + 1x4_335 1x4_337 1x4_343 - 1x4_347 + 1x4_348 1x4_354 1x5_118 1x4_359 - 1x6_120 + 1x5_120 #Free Peoples Draw Deck @@ -289,32 +289,28 @@ #Shadow Draw Deck - #3x 4C181 Uruk Chaser - 3x4_181 - #2x 4U188 Uruk Hunter - 2x4_188 - #2x 4C189 Uruk Plains Runner - 2x4_189 - #2x 4C190 Uruk Pursuer - 2x4_190 - #3x 4C193 Uruk Runner - 3x4_193 - #3x 2C47 Uruk Scout - 3x2_47 - #2x 4U194 Uruk Searcher - 2x4_194 - #2x 4C195 Uruk Seeker - 2x4_195 - #1x 1U231 Ulaire Enquea, Lieutenant of Morgul - 1x1_231 - #2x 4C142 Broad-bladed Sword - 2x4_142 - #2x 4C156 Kill Them Now - 2x4_156 - #4x 4U159 Many Riddles - 4x4_159 - #2x 1C133 Saruman's Ambition - 2x1_133 + #3x 4C153 Grima, Son of Galmod + 3x4_153 + #2x 3U57 Isengard Retainer + 2x3_57 + #2x 3U58 Isengard Servant + 2x3_58 + #2x 3U60 Isengard Smith + 2x3_60 + #2x 3C62 Isengard Worker + 2x3_62 + #4x 6C72 Rohirrim Traitor + 4x6_72 + #3x 3C69 Saruman, Servant of the Eye + 3x3_69 + #3x 4C178 Unferth, Grima's Bodyguard + 3x4_178 + #4x 4U161 Men Will Fall + 4x4_161 + #4x 6U61 Desertion + 4x6_61 + #1x 6U75 Twisted Tales + 1x6_75 #Shadow Total 30 @@ -640,23 +636,23 @@ #Adventure Deck #1 4U324 Eastemnet Downs - #2 4U330 Derndingle + #2 4U331 Eastfold #3 4U338 Golden Hall #4 4U346 White Rocks - #5 4U348 Deeping Wall + #5 4U347 Deep of Helm #6 4U354 Hornburg Armory #7 4U356 Hornburg Causeway #8 4U359 Wizard's Vale - #9 5U120 Caverns of Isengard + #9 6U120 Saruman's Laboratory 1x4_324 - 1x4_330 + 1x4_331 1x4_338 1x4_346 - 1x4_348 + 1x4_347 1x4_354 1x4_356 1x4_359 - 1x5_120 + 1x6_120 #Free Peoples Draw Deck @@ -705,28 +701,32 @@ #Shadow Draw Deck - #3x 4C153 Grima, Son of Galmod - 3x4_153 - #2x 3U57 Isengard Retainer - 2x3_57 - #2x 3U58 Isengard Servant - 2x3_58 - #2x 3U60 Isengard Smith - 2x3_60 - #2x 3C62 Isengard Worker - 2x3_62 - #4x 6C72 Rohirrim Traitor - 4x6_72 - #3x 3C69 Saruman, Servant of the Eye - 3x3_69 - #3x 4C178 Unferth, Grima's Bodyguard - 3x4_178 - #4x 4U161 Men Will Fall - 4x4_161 - #4x 6U61 Desertion - 4x6_61 - #1x 6U75 Twisted Tales - 1x6_75 + #3x 4C181 Uruk Chaser + 3x4_181 + #2x 4U188 Uruk Hunter + 2x4_188 + #2x 4C189 Uruk Plains Runner + 2x4_189 + #2x 4C190 Uruk Pursuer + 2x4_190 + #3x 4C193 Uruk Runner + 3x4_193 + #3x 2C47 Uruk Scout + 3x2_47 + #2x 4U194 Uruk Searcher + 2x4_194 + #2x 4C195 Uruk Seeker + 2x4_195 + #1x 1U231 Ulaire Enquea, Lieutenant of Morgul + 1x1_231 + #2x 4C142 Broad-bladed Sword + 2x4_142 + #2x 4C156 Kill Them Now + 2x4_156 + #4x 4U159 Many Riddles + 4x4_159 + #2x 1C133 Saruman's Ambition + 2x1_133 #Shadow Total 30 From d8eecd5809f95ab08bab6cfa67a8535b438b0c91 Mon Sep 17 00:00:00 2001 From: dmasalin Date: Sun, 28 Jul 2024 19:03:35 -0400 Subject: [PATCH 3/6] Additional Update to TS Sealed Moving the shotgun Enquea to Series 1 shadow deck for crowd control support. --- .../main/resources/product/TS-Sealed-Starters.hjson | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson index 14d9ae8bc..72f36ce4a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/TS-Sealed-Starters.hjson @@ -303,10 +303,12 @@ 4x6_72 #3x 3C69 Saruman, Servant of the Eye 3x3_69 + #1x 1U231 Ulaire Enquea, Lieutenant of Morgul + 1x1_231 #3x 4C178 Unferth, Grima's Bodyguard 3x4_178 - #4x 4U161 Men Will Fall - 4x4_161 + #3x 4U161 Men Will Fall + 3x4_161 #4x 6U61 Desertion 4x6_61 #1x 6U75 Twisted Tales @@ -709,16 +711,14 @@ 2x4_189 #2x 4C190 Uruk Pursuer 2x4_190 - #3x 4C193 Uruk Runner - 3x4_193 + #4x 4C193 Uruk Runner + 4x4_193 #3x 2C47 Uruk Scout 3x2_47 #2x 4U194 Uruk Searcher 2x4_194 #2x 4C195 Uruk Seeker 2x4_195 - #1x 1U231 Ulaire Enquea, Lieutenant of Morgul - 1x1_231 #2x 4C142 Broad-bladed Sword 2x4_142 #2x 4C156 Kill Them Now From 142ffd3af0466e8f1552f1042428143d386cc275 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Tue, 30 Jul 2024 12:38:57 -0500 Subject: [PATCH 4/6] July weekend league prizes --- .../gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js | 8 +++++++- .../src/main/resources/blueprintMapping.txt | 6 +++++- .../src/main/resources/product/Misc-Packs.hjson | 8 ++++++++ 3 files changed, 20 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 32dbc3ade..c70a5db30 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 @@ -639,6 +639,12 @@ var PCCards = { //Dwarven Bracers FA '2_128': 'https://i.lotrtcgpc.net/promos/LOTR-EN02U003.0_card.jpg', //Ulaire Cantea, Lieutenant of Dol Guldur MW - '1_390': 'https://i.lotrtcgpc.net/promos/LOTR-EN01O230.0_card.jpg' + '1_390': 'https://i.lotrtcgpc.net/promos/LOTR-EN01O230.0_card.jpg', + + //July 2024 Weekend League + //Theoden, Tall and Proud FA + '8_127': 'https://i.lotrtcgpc.net/promos/LOTR-EN08U092.0_card.jpg', + //Evil-smelling Fens FA + '5_129': 'https://i.lotrtcgpc.net/promos/LOTR-EN05U022.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 d56bd0fb7..db57adcb4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -387,4 +387,8 @@ gl_theOneRing,1_2 #Dwarven Bracers FA 2_128,2_3 #Ulaire Cantea, Lieutenant of Dol Guldur MW -1_390,1_230 \ No newline at end of file +1_390,1_230 +#Theoden, Tall and Proud FA +8_127,8_92 +#Evil-smelling Fens FA +5_129,5_22 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson index b25b82f0b..b4cc0a359 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Misc-Packs.hjson @@ -384,6 +384,10 @@ 1x9_60 #Sting, Bane of the Eight Legs MW 1x8_126 + #Theoden, Tall and Proud FA + 1x8_127 + #Evil-smelling Fens FA + 1x5_129 ] } @@ -473,6 +477,10 @@ 1x1_389 #Freca, Hungry Savage FA 1x9_60 + #Theoden, Tall and Proud FA + 1x8_127 + #Evil-smelling Fens FA + 1x5_129 ] } From 5ca7c86ef40d15cda5276843a9d4fcce8456933b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 10 Aug 2024 12:15:35 -0500 Subject: [PATCH 5/6] Fixing UI hack for WC events for now --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index 73a658576..e47bc168d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -653,7 +653,7 @@ var GempLotrHallUI = Class.extend({ //TODO: Replace this with an actual fix on the server side if(name.includes("Casual - WC")) { - name = "2023 World Championship - " + userDesc + "" + name = "2024 Format Championships" + userDesc + "" } row.append(name); row.append("" + statusDescription + ""); From ce76247de6bb45f5ca441a79b6de4280edb07946 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 11 Aug 2024 00:23:28 -0500 Subject: [PATCH 6/6] Fixing tournament report not working --- .../gempukku/lotro/async/handler/TournamentRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java index 2c9f1ca41..92cc58d15 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java @@ -62,7 +62,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen } else if (uri.startsWith("/") && uri.endsWith("/html") && uri.contains("/deck/") && request.method() == HttpMethod.GET) { getTournamentDeck(request, uri.substring(1, uri.indexOf("/deck/")), uri.substring(uri.indexOf("/deck/") + 6, uri.lastIndexOf("/html")), responseWriter); } else if (uri.startsWith("/") && uri.endsWith("/html") && uri.contains("/report/") && request.method() == HttpMethod.GET) { - getTournamentReport(request, uri.substring(1, uri.indexOf("/report/")), uri.substring(uri.indexOf("/report/") + 6, uri.lastIndexOf("/html")), responseWriter); + getTournamentReport(request, uri.substring(1, uri.indexOf("/report/")), uri.substring(uri.indexOf("/report/") + 8, uri.lastIndexOf("/html")), responseWriter); } else if (uri.startsWith("/") && request.method() == HttpMethod.GET) { getTournamentInfo(request, uri.substring(1), responseWriter); } else {