From 4402cc2769e491ccab0d087aad7424af70054b63 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 25 Nov 2023 16:29:23 -0600 Subject: [PATCH] Fixing missing SHELBI starter definition. Fixing merchant not having access to right-click preview --- .../src/main/web/js/gemp-022/jCards.js | 3 ++- .../src/main/web/js/gemp-022/merchantUi.js | 9 +++++++++ .../main/resources/product/Starter-Selections.hjson | 12 ++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js index 00aedffb0..3f9761707 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js @@ -195,7 +195,8 @@ var packBlueprints = { "Random Common Foil": "/gemp-lotr/images/boosters/random_foil.png", "Random Uncommon Foil": "/gemp-lotr/images/boosters/random_foil.png", "Random Rare Foil": "/gemp-lotr/images/boosters/random_foil.png", - "Random Ultra Rare Foil": "/gemp-lotr/images/boosters/random_foil.png" + "Random Ultra Rare Foil": "/gemp-lotr/images/boosters/random_foil.png", + "(S)SHELBI - Starter": "/gemp-lotr/images/boosters/starter_selection.png" }; var Card = Class.extend({ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js index 1cca049ab..cf5e406e3 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js @@ -102,6 +102,15 @@ var GempLotrMerchantUI = Class.extend({ function (event) { return that.clickCardFunction(event); }); + $("body")[0].addEventListener("contextmenu", + function (event) { + if(!that.clickCardFunction(event)) + { + event.preventDefault(); + return false; + } + return true; + }); $("body").mousedown( function (event) { return that.dragStartCardFunction(event); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Starter-Selections.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Starter-Selections.hjson index 642456f56..b6b21248e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Starter-Selections.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/Starter-Selections.hjson @@ -387,4 +387,16 @@ 1xRoS - Evil Man Starter ] } + + { + name: (S)SHELBI - Starter + type: selection + selectionCount: 1 + items: [ + 1xSHELBI - Aragorn Starter + 1xSHELBI - Gandalf Starter + 1xSHELBI - Gimli Starter + 1xSHELBI - Treebeard Starter + ] + } ] \ No newline at end of file