From f35970339beee13ec1459854674995e2c7398ca5 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 19 Oct 2024 07:09:53 -0500 Subject: [PATCH 1/7] Updating WC table verbiage --- 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 a6a8668e3..7303c04dd 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 @@ -734,7 +734,7 @@ var GempLotrHallUI = Class.extend({ //TODO: Replace this with an actual fix on the server side if(name.includes("Casual - WC")) { - name = "2024 Last-chance Walk-on Qualifiers" + userDesc + "" + name = "2024 World Championship - Group Stage" + userDesc + "" } row.append(name); row.append("" + statusDescription + ""); From 1ef242549a311887add37523135454eaae02431b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 25 Oct 2024 19:07:23 -0500 Subject: [PATCH 2/7] Updating WC verbiage hack --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7303c04dd..f2dbc5969 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 @@ -732,9 +732,9 @@ var GempLotrHallUI = Class.extend({ name += ""; - //TODO: Replace this with an actual fix on the server side + //TODO: Replace this with an actual fix on the server side if(name.includes("Casual - WC")) { - name = "2024 World Championship - Group Stage" + userDesc + "" + name = "2024 World Championship" + userDesc + "" } row.append(name); row.append("" + statusDescription + ""); From 9eb03df677d90e38519a15ca32846dd4a114d919 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 27 Oct 2024 20:02:05 -0500 Subject: [PATCH 3/7] Unlocking full art Greenleaf and unbranded Goblin Runner for the PC promo packs --- .../src/main/resources/product/Misc-Packs.hjson | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 250cbba90..b6ee61937 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 @@ -403,9 +403,9 @@ 1x5_129 #To be released after the 2024 WC concludes #Legolas, Greenleaf FA - #1x1_391 + 1x1_391 #Goblin Runner FA - #1x1_392 + 1x1_392 ] } @@ -503,9 +503,9 @@ 1x5_129 #To be released after the 2024 WC concludes #Legolas, Greenleaf FA - #1x1_391 + 1x1_391 #Goblin Runner FA - #1x1_392 + 1x1_392 ] } From 972d198cacbd06283e10cc164eb17de04f6cfd9b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Mon, 28 Oct 2024 22:25:40 -0500 Subject: [PATCH 4/7] helper db script updates --- gemp-lotr/db/extract-gameplay-replays.sql | 28 +++++++++++++++++++++++ gemp-lotr/db/extract-tourney-replays.sql | 9 ++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/db/extract-gameplay-replays.sql b/gemp-lotr/db/extract-gameplay-replays.sql index 27c1398f7..4f728fa9f 100644 --- a/gemp-lotr/db/extract-gameplay-replays.sql +++ b/gemp-lotr/db/extract-gameplay-replays.sql @@ -35,6 +35,34 @@ ORDER BY COUNT(*) DESC; +SET @player = 'Chadwick537'; + +SELECT + @player AS player + ,CASE WHEN winner = @player THEN loser ELSE winner END AS opponent + ,winner + ,win_reason + ,start_date + ,end_date + ,format_name + ,tournament + ,CASE WHEN winner = @player THEN winner_deck_name ELSE loser_deck_name END AS deck_name + ,CONCAT('https://play.lotrtcgpc.net/share/deck?id=', + CASE + WHEN winner = @player THEN TO_BASE64(CONCAT(winner, '|', winner_deck_name)) + ELSE TO_BASE64(CONCAT(loser, '|', loser_deck_name)) + END) AS DeckURL + ,CONCAT('https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=', + CASE + WHEN winner = @player THEN CONCAT(REPLACE(winner, '_', '%5F'), '$', win_recording_id) + ELSE CONCAT(REPLACE(loser, '_', '%5F'), '$', lose_recording_id) + END) AS ReplayURL + +FROM game_history gh +WHERE (winner = @player OR loser = @player) + AND (start_date > '2024-09-15') + + diff --git a/gemp-lotr/db/extract-tourney-replays.sql b/gemp-lotr/db/extract-tourney-replays.sql index 699759a1b..a7b6a1229 100644 --- a/gemp-lotr/db/extract-tourney-replays.sql +++ b/gemp-lotr/db/extract-tourney-replays.sql @@ -33,7 +33,7 @@ -SET @player = 'Axter', @rank=0; +SET @player = 'sempolPL', @rank=0; SELECT @player AS player @@ -41,14 +41,14 @@ SELECT CASE WHEN winner = @player THEN CONCAT(REPLACE(winner, '_', '%5F'), '$', win_recording_id) ELSE CONCAT(REPLACE(loser, '_', '%5F'), '$', lose_recording_id) - END, ']', @rank:=@rank+1,'[/url] • ') AS URL + END, ']', @rank:=@rank+1,'[/url] • ') AS URL FROM game_history gh INNER JOIN player p ON p.name = @player INNER JOIN deck d ON d.player_id = p.id AND (d.name = winner_deck_name OR d.name = loser_deck_name OR d.name = 'denethor / tentacle V2') -WHERE tournament = '2023 PC-Expanded Championship' +WHERE tournament = '2024 Championship Tournament - PC-Fellowship Deck Registration' AND start_date > '2023-07-20' AND (winner = @player OR loser = @player) ORDER BY gh.id; @@ -60,7 +60,8 @@ SELECT winner, loser, win_reason, lose_reason, start_date, end_date ,CONCAT('https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=',REPLACE(winner, '_', '%5F'), '$', win_recording_id) AS winner_replay ,CONCAT('https://play.lotrtcgpc.net/gemp-lotr/game.html?replayId=',REPLACE(loser, '_', '%5F'), '$', lose_recording_id) AS loser_replay FROM game_history gh -WHERE tournament = '2023 WC Group Stage' +WHERE tournament = '2024 Championship Tournament - PC-Movie Deck Registration' +ORDER BY start_date ASC From 04f9219c83220b4c6743463d1b09c80a87150d29 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Tue, 29 Oct 2024 21:45:42 -0500 Subject: [PATCH 5/7] 2024 WC Promos --- .../src/main/web/js/gemp-022/PC_Cards.js | 10 +++++++++- .../src/main/resources/blueprintMapping.txt | 12 +++++++++++- 2 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 8ec9d6b98..77f451abe 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 @@ -660,7 +660,15 @@ var PCCards = { '53_80' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E080.2_card.jpg', '53_85' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E085.2_card.jpg', '53_103' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E103.3_card.jpg', - '53_105' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E105.2_card.jpg' + '53_105' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E105.2_card.jpg', + + //2024 World Championship promos + //Unbranded - Do not release until 2025 WC has concluded. + //'1_393': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.0_card.jpg', + '1_394': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.1_card.jpg', + '1_395': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.2_card.jpg', + '1_396': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.3_card.jpg', + '1_397': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.4_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 e6a80e348..f89e2d5e4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -395,4 +395,14 @@ gl_theOneRing,1_2 #Legolas, Greenleaf FA 1_391,1_50 #2023 WC - Non-branded Goblin Runner FA for general consumption -1_392,1_178 \ No newline at end of file +1_392,1_178 +#Unbranded - They Are Coming FA - Do not release until 2025 WC has concluded +1_393,1_196 +#2024 World Championship - They Are Coming FA +1_394,1_196 +#2024 WC Top 8 - They Are Coming FA +1_395,1_196 +#2024 WC World Challenger - They Are Coming FA +1_396,1_196 +#2024 WC World Champion - They Are Coming FA +1_397,1_196 \ No newline at end of file From e7b0818315051d46ecf53ded3940bc041a494a7b Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Tue, 29 Oct 2024 21:49:12 -0500 Subject: [PATCH 6/7] bad URL copy-paste --- .../src/main/web/js/gemp-022/PC_Cards.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 77f451abe..8f0661956 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 @@ -664,11 +664,11 @@ var PCCards = { //2024 World Championship promos //Unbranded - Do not release until 2025 WC has concluded. - //'1_393': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.0_card.jpg', - '1_394': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.1_card.jpg', - '1_395': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.2_card.jpg', - '1_396': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.3_card.jpg', - '1_397': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U178.4_card.jpg' + //'1_393': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.0_card.jpg', + '1_394': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.1_card.jpg', + '1_395': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.2_card.jpg', + '1_396': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.3_card.jpg', + '1_397': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U196.4_card.jpg' } From d13ec7c177f1e50ffde918e0d3f846d33f07d5e8 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Wed, 30 Oct 2024 13:01:02 -0400 Subject: [PATCH 7/7] Fix for Moon-letters Choice effects were swapped, they now line up with the text as expected. --- .../resources/cards/unofficial/hobbit/set33/set33-fp.hjson | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson index ca3eb00a6..de999625d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson @@ -592,11 +592,11 @@ ] effects: [ { - type: putCardsFromDiscardIntoHand + type: putCardsFromDeckIntoHand filter: choose(or(culture(elven),culture(mirkwood))) } { - type: putCardsFromDeckIntoHand + type: putCardsFromDiscardIntoHand filter: choose(or(culture(elven),culture(mirkwood))) } ]