From a2000ac20b01103cb9a37bcce476a7733e9e94ec Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 27 Nov 2024 00:29:28 -0600 Subject: [PATCH] V1 remapping - Remapped the 3 V1 promos starting at 101_101, which leaves a good 30 or so empty slots for future additions (if needed). - Added a SQL script for updating the transfer, collection-entries, and deck tables - Fixed the on-screen delivery popups being broken due to the card display rework --- .../db/2024-12-06_renumber_V1_promos.sql | 74 +++++++++++++++++++ .../src/main/web/js/gemp-022/PC_Cards.js | 18 +---- .../main/web/js/gemp-022/deliveryService.js | 8 +- .../src/main/resources/blueprintMapping.txt | 6 +- 4 files changed, 84 insertions(+), 22 deletions(-) create mode 100644 gemp-lotr/db/2024-12-06_renumber_V1_promos.sql diff --git a/gemp-lotr/db/2024-12-06_renumber_V1_promos.sql b/gemp-lotr/db/2024-12-06_renumber_V1_promos.sql new file mode 100644 index 000000000..590d7890f --- /dev/null +++ b/gemp-lotr/db/2024-12-06_renumber_V1_promos.sql @@ -0,0 +1,74 @@ + +SELECT * +FROM transfer t +WHERE collection RLIKE('(101_65|101_66|101_67)') +ORDER BY id DESC; + +SELECT * +FROM collection_entries ce +WHERE product IN ('101_65', '101_66', '101_67'); + +SELECT * +FROM deck d +WHERE contents RLIKE('(101_65|101_66|101_67)'); + +-- SELECT * +-- FROM collection c +-- INNER JOIN player p +-- ON p.id = c.player_id +-- WHERE c.id IN (59510, 64642, 64643) + +UPDATE transfer +SET collection = REGEXP_REPLACE(collection, '101_65', '101_101') +WHERE collection RLIKE('101_65'); + +UPDATE transfer +SET collection = REGEXP_REPLACE(collection, '101_66', '101_102') +WHERE collection RLIKE('101_66'); + +UPDATE transfer +SET collection = REGEXP_REPLACE(collection, '101_67', '101_103') +WHERE collection RLIKE('101_67'); + + +UPDATE collection_entries +SET product = REGEXP_REPLACE(product, '101_65', '101_101') +WHERE product RLIKE('101_65'); + +UPDATE collection_entries +SET product = REGEXP_REPLACE(product, '101_66', '101_102') +WHERE product RLIKE('101_66'); + +UPDATE collection_entries +SET product = REGEXP_REPLACE(product, '101_67', '101_103') +WHERE product RLIKE('101_67'); + + +UPDATE deck +SET contents = REGEXP_REPLACE(contents, '101_65', '101_101') +WHERE contents RLIKE('101_65'); + +UPDATE deck +SET contents = REGEXP_REPLACE(contents, '101_66', '101_102') +WHERE contents RLIKE('101_66'); + +UPDATE deck +SET contents = REGEXP_REPLACE(contents, '101_67', '101_103') +WHERE contents RLIKE('101_67'); + + + + +SELECT * +FROM transfer t +WHERE collection RLIKE('(101_101|101_102|101_103)') +ORDER BY id DESC; + +SELECT * +FROM collection_entries ce +WHERE product IN ('101_101', '101_102', '101_103'); + +SELECT * +FROM deck d +WHERE contents RLIKE('(101_101|101_102|101_103)') +ORDER BY id DESC; 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 a65ae4d70..d31a2af5e 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 @@ -56,18 +56,6 @@ var PCCards = { '53_42': 'https://i.lotrtcgpc.net/errata/xlist/53_042.jpg', //'53_68': 'https://i.lotrtcgpc.net/errata/xlist/53_068.jpg', - // May 2021 VPack1 - '101_1': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_001.jpg', - '101_2': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_002.jpg', - '101_3': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_003.jpg', - '101_4': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_004.jpg', - '101_5': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_005.jpg', - '101_6': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_006.jpg', - '101_7': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_007.jpg', - '101_8': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_008.jpg', - '101_9': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_009.jpg', - '101_10': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_010.jpg', - // May 2021 Errata Batch '51_45': 'https://i.lotrtcgpc.net/errata/xlist/51_045.jpg', //'51_80': 'https://i.lotrtcgpc.net/errata/xlist/51_080.jpg', @@ -286,9 +274,9 @@ var PCCards = { //August Weekend League Promos // Boromir, Redeemed FA (V1_20) - '101_65': 'https://i.lotrtcgpc.net/promos/LOTR-ENV1U020.0_card.jpg', + '101_101': 'https://i.lotrtcgpc.net/promos/LOTR-ENV1U020.0_card.jpg', // I See You FA (V1_46) - '101_66': 'https://i.lotrtcgpc.net/promos/LOTR-ENV1U046.0_card.jpg', + '101_102': 'https://i.lotrtcgpc.net/promos/LOTR-ENV1U046.0_card.jpg', //September 2022 Weekend League Promos //Gimli ARB Masterwork (9R+4) @@ -457,7 +445,7 @@ var PCCards = { //May 2023 Gala //Gimli, Vengeful Longbeard MW - '101_67': 'https://i.lotrtcgpc.net/promos/LOTR-ENV1O003.0_card.jpg', + '101_103': 'https://i.lotrtcgpc.net/promos/LOTR-ENV1O003.0_card.jpg', //Cave Troll of Moria, Scourge of the Black Pit FA '1_380': 'https://i.lotrtcgpc.net/promos/LOTR-EN01U165.0_card.jpg', diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js index b31b41679..d6eb4dbf5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deliveryService.js @@ -2,8 +2,8 @@ var deliveryDialogs = {}; var deliveryGroups = {}; function deliveryService(xml) { - log("Delivered a package:"); - log(xml); + console.log("Delivered a package:"); + console.log(xml); var root = xml.documentElement; if (root.tagName == "delivery") { @@ -49,7 +49,7 @@ function deliveryService(xml) { var count = packElem.getAttribute("count"); var card = new Card(blueprintId, "delivery", "deliveryPack" + i, "player"); card.tokens = {"count":count}; - var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), true, true, false); + var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), true, false, false, false); cardDiv.data("card", card); deliveryDialogs[collectionName].append(cardDiv); } @@ -61,7 +61,7 @@ function deliveryService(xml) { var count = cardElem.getAttribute("count"); var card = new Card(blueprintId, "delivery", "deliveryCard" + i, "player"); card.tokens = {"count":count}; - var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil(), true, false, card.hasErrata()); + var cardDiv = Card.CreateCardDiv(card.imageUrl, null, null, card.isFoil(), true, false, card.hasErrata(), false); cardDiv.data("card", card); deliveryDialogs[collectionName].append(cardDiv); } 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 f89e2d5e4..0051ca61a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -277,9 +277,9 @@ gl_theOneRing,1_2 #Aragorn's Bow, Ranger's Longbow MW 15_208,15_56 #Boromir, Redeemed FA (V1_20) -101_65,101_20 +101_101,101_20 #I See You FA (V1_46) -101_66,101_46 +101_102,101_46 #Gimli ARB Masterwork 9_56,9_4 #Desert Lord FA @@ -333,7 +333,7 @@ gl_theOneRing,1_2 #Saruman, Servant of Sauron FA 17_158,17_38 #Gimli, Vengeful Longbeard MW -101_67,101_3 +101_103,101_3 #Cave Troll of Moria, Scourge of the Black Pit FA 1_380,1_165 #The Tale of the Great Ring MW