From c0d85c44275e04aff36cfe505f778c0e10598754 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 24 Apr 2024 21:58:38 -0500 Subject: [PATCH 1/4] Fixing card image reference snafus with the Barlimen/Elronds errata. --- .../gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js | 8 -------- 1 file changed, 8 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 2ad5cff3d..824f6f07e 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 @@ -548,12 +548,6 @@ var PCCards = { '58_51' : 'https://i.lotrtcgpc.net/errata/LOTR-EN08E051.2_card.jpg', // Dwarven Axe (1C9) [Errata] '51_9' : 'https://i.lotrtcgpc.net/errata/LOTR-EN01E009.2_card.jpg', - // Barliman Butterbur A, Prancing Pony Proprietor (1U70) [Errata] - '51_70' : 'https://i.lotrtcgpc.net/errata/LOTR-EN01E070.A_card.jpg', - // Barliman Butterbur B, Prancing Pony Proprietor (1U70) [Errata] - '51_70' : 'https://i.lotrtcgpc.net/errata/LOTR-EN01E070.B_card.jpg', - // Barliman Butterbur C, Prancing Pony Proprietor (1U70) [Errata] - '51_70' : 'https://i.lotrtcgpc.net/errata/LOTR-EN01E070.C_card.jpg', // Barliman Butterbur, Prancing Pony Proprietor (1U70) [Errata] '51_70' : 'https://i.lotrtcgpc.net/errata/LOTR-EN01E070.1_card.jpg', // A Wizard Is Never Late (1R87) [Errata] @@ -574,8 +568,6 @@ var PCCards = { '52_76' : 'https://i.lotrtcgpc.net/errata/LOTR-EN02E076.1_card.jpg', // Elrond, Herald to Gil-galad (3R13) [Errata] '53_13' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E013.1_card.jpg', - // Elrond, Herald to Gil-galad (3R13) [Errata] - '53_13' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E013.B_card.jpg', // Phial of Galadriel (3U24) [Errata] '53_24' : 'https://i.lotrtcgpc.net/errata/LOTR-EN03E024.1_card.jpg', // Can You Protect Me From Yourself? (3R50) [Errata] From 1661be53b86bffe95509d2498dd3ea3c39ced58f Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 26 Apr 2024 09:25:31 -0500 Subject: [PATCH 2/4] Fixed Murder of Crows self-discarding --- .../resources/cards/unofficial/pc/setV01/V1_isengard.hjson | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_isengard.hjson index dee73fe19..58c2740d0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_isengard.hjson @@ -645,10 +645,6 @@ ] } ] - cost: { - type: discard - filter: self - } effect: [ { type: choice From 6299ceadc068ecdbe67b0837259bebe487c13a67 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 28 Apr 2024 22:19:27 -0500 Subject: [PATCH 3/4] Adding promos for April weekend league --- gemp-lotr/db/extract-league-decks.sql | 28 ++++++++--- gemp-lotr/db/extract-tourney-replays.sql | 12 ++--- gemp-lotr/db/update-playtest-decks.sql | 48 +++++++++++++++++-- .../src/main/web/js/gemp-022/PC_Cards.js | 8 +++- .../src/main/resources/blueprintMapping.txt | 6 ++- .../main/resources/product/Misc-Packs.hjson | 11 +++++ 6 files changed, 96 insertions(+), 17 deletions(-) diff --git a/gemp-lotr/db/extract-league-decks.sql b/gemp-lotr/db/extract-league-decks.sql index ee93e3845..50daa8fdc 100644 --- a/gemp-lotr/db/extract-league-decks.sql +++ b/gemp-lotr/db/extract-league-decks.sql @@ -1,7 +1,11 @@ +-- +-- SELECT * +-- FROM league l +-- ORDER BY id DESC; + - -SET @player = 'sempolPL', @rank=0; +SET @player = 'Chadwick537', @rank=0; SELECT @player AS player @@ -15,16 +19,28 @@ 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 +LEFT 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 = 'Constructed - Weekend Qualifier PC-Expanded - Serie 1' - AND start_date > '2023-07-20' +WHERE tournament = 'PC Weekend Qualifier League - PC-FOTR - Serie 1' + AND start_date > '2024-04-20' AND (winner = @player OR loser = @player) ORDER BY gh.id; +-- SELECT * +-- FROM game_history gh +-- WHERE winner = @player OR loser = @player +-- ORDER BY id DESC +-- +-- +-- SELECT * +-- FROM deck d +-- INNER JOIN player p +-- ON d.player_id = p.id +-- WHERE p.name = @player + diff --git a/gemp-lotr/db/extract-tourney-replays.sql b/gemp-lotr/db/extract-tourney-replays.sql index 732b15437..699759a1b 100644 --- a/gemp-lotr/db/extract-tourney-replays.sql +++ b/gemp-lotr/db/extract-tourney-replays.sql @@ -55,12 +55,12 @@ ORDER BY gh.id; --- --- SELECT * --- ,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 PC-Expanded Championship' + +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' diff --git a/gemp-lotr/db/update-playtest-decks.sql b/gemp-lotr/db/update-playtest-decks.sql index f0bad271c..eaec5b30a 100644 --- a/gemp-lotr/db/update-playtest-decks.sql +++ b/gemp-lotr/db/update-playtest-decks.sql @@ -9,8 +9,50 @@ WHERE contents RLIKE '(7|8)\\d_' SELECT REGEXP_REPLACE(REGEXP_REPLACE('7_94,7_94,87_13,81_30,72_32,51_80,1_83,71_240,71_240,71_240,71_240,72_32', '7(\\d)_', '5\\1_'), '8(\\d)_', '6\\1_') +SELECT REGEXP_REPLACE('51_404,7_94,87_13,81_30,72_32,51_80,1_83,71_240,71_240,71_240,71_240,72_32,51_402,51_403', '51_40\\d', '51_70') + +SELECT REGEXP_REPLACE('51_404,7_94,87_13,81_30,72_32,51_80,1_83,71_240,71_240,71_240,71_240,72_32,51_402,51_403,51_401', '53_401', '53_13') + + + +UPDATE deck +SET contents = REGEXP_REPLACE(REGEXP_REPLACE(contents, '7(\\d)_', '5\\1_'), '8(\\d)_', '6\\1_') +WHERE contents RLIKE '(7|8)_' + +UPDATE deck +SET contents = REGEXP_REPLACE(contents, '51_40\\d', '51_70') +WHERE contents RLIKE '51_40\\d' + +UPDATE deck +SET contents = REGEXP_REPLACE(contents, '53_401', '53_13') +WHERE contents RLIKE '53_401' + +UPDATE deck +SET contents = CONCAT(contents,'|100_4') +WHERE target_format = 'Movie Block (PC)' + +UPDATE deck +SET contents = CONCAT(contents,'|100_4') +WHERE target_format = 'PLAYTEST - Movie Block (PC)' + AND contents RLIKE '(7_335|7_336|7_337)' + +UPDATE deck +SET contents = CONCAT(contents,'|100_2') +WHERE target_format = 'PLAYTEST - Movie Block (PC)' + AND contents RLIKE '(1_349)' + +UPDATE deck +SET contents = CONCAT(contents,'|100_3') +WHERE target_format = 'PLAYTEST - Movie Block (PC)' + AND contents RLIKE '(4_360|4_361|4_362|4_363|5_120|6_120)' + +SELECT * +FROM deck d +WHERE target_format = 'PLAYTEST - Movie Block (PC)' + + + + + --- UPDATE deck --- SET contents = REGEXP_REPLACE(REGEXP_REPLACE(contents, '7(\\d)_', '5\\1_'), '8(\\d)_', '6\\1_') --- WHERE contents RLIKE '(7|8)_' 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 824f6f07e..f51ed5858 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 @@ -621,6 +621,12 @@ var PCCards = { //Maps '100_2' : 'https://i.lotrtcgpc.net/sets/vset0/LOTR-ENV0S002.0_card.jpg', '100_3' : 'https://i.lotrtcgpc.net/sets/vset0/LOTR-ENV0S003.0_card.jpg', - '100_4' : 'https://i.lotrtcgpc.net/sets/vset0/LOTR-ENV0S004.0_card.jpg' + '100_4' : 'https://i.lotrtcgpc.net/sets/vset0/LOTR-ENV0S004.0_card.jpg', + + //April 2024 Weekend League + //Troop of Uruk-hai FA + '1_389': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U143.0_card.jpg', + //Gandalf's Staff MW + '2_127': 'https://i.lotrtcgpc.net/promos/LOTR-EN02O022.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 55e6750d4..689d49598 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -375,4 +375,8 @@ gl_theOneRing,1_2 #Pippin Holiday Promo 1_387,1_307 #Merry, Holiday Promo -1_388,1_302 \ No newline at end of file +1_388,1_302 +#Troop of Uruk-hai FA +1_389,1_143 +#Gandalf's Staff MW +2_127,2_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 31df19fa9..1bcc012ff 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 @@ -376,6 +376,10 @@ 1x10_127 #Arwen, Queen of Elves and Men FA 1x10_128 + #Troop of Uruk-hai FA + 1x1_389 + #Gandalf's Staff MW + 1x2_127 ] } @@ -461,6 +465,9 @@ 1x10_127 #Arwen, Queen of Elves and Men FA 1x10_128 + #Troop of Uruk-hai FA + 1x1_389 + ] } @@ -584,6 +591,8 @@ 1x8_125 #Sapling of the White Tree MW 1x9_58 + #Gandalf's Staff MW + 1x2_127 ] } @@ -707,6 +716,8 @@ 1x8_125 #Sapling of the White Tree MW 1x9_58 + #Gandalf's Staff MW + 1x2_127 ] } ] \ No newline at end of file From e457287c1b9d1ef34c09ddfcb994da1599f57420 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Mon, 29 Apr 2024 19:44:00 -0500 Subject: [PATCH 4/4] Fixing sealed league json cap serialization snafu --- .../src/main/web/includes/admin/leagueAdmin.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html index 40c50c725..8a8bb82d7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html @@ -298,8 +298,8 @@ $(document).ready( if (Object.prototype.hasOwnProperty.call(sealed, prop)) { //console.log(prop); - let code = sealed[prop].Format; - let id = sealed[prop].ID; + let code = sealed[prop].format; + let id = sealed[prop].id; let serieCount = sealed[prop].seriesProduct.length; var item = $("