From 330aace3735e6af8795ab023affd782366043539 Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Mon, 20 Jul 2020 19:52:26 -0700 Subject: [PATCH] general improvements --- creator/index.html | 20 +++++++++++++------ data/scripts/main.js | 11 +++++++++- data/scripts/versions/m15/floatingCrowns.js | 3 ++- data/scripts/versions/m15/version.js | 2 +- data/scripts/versions/m15Promo/darkPT.js | 15 ++++++++++++++ .../versions/m15Promo/floatingCrowns.js | 4 ++-- data/scripts/versions/m15Promo/version.js | 2 +- 7 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 data/scripts/versions/m15Promo/darkPT.js diff --git a/creator/index.html b/creator/index.html index 6b3084ac..532c010b 100644 --- a/creator/index.html +++ b/creator/index.html @@ -47,19 +47,23 @@
Select a frame version:
@@ -73,11 +77,15 @@
+
+
+ (Selected: None) +
diff --git a/data/scripts/main.js b/data/scripts/main.js index be2c93e3..3f094699 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -306,6 +306,7 @@ class frameImage { frameImageList[parseInt(this.id.replace('frameIndex', ''))].masks.forEach(array => document.getElementById('maskPicker').innerHTML += '
' + array + '
') document.getElementById('maskPicker').children[0].classList.add('maskOptionSelected') selectedMaskImage = parseInt(document.getElementById('maskPicker').children[0].id.replace('maskOption', '')) + updateSelectedFramePreview() } } } @@ -318,12 +319,20 @@ function maskOptionClicked(event) { event.target.classList.add('maskOptionSelected') selectedMaskImage = parseInt(event.target.id.replace('maskOption', '')) } + updateSelectedFramePreview() +} +function updateSelectedFramePreview() { + document.getElementById('previewSelectedFrame').innerHTML = '(Selected: ' + frameImageList[selectedFrameImage].name + ' with a ' + maskNameList[selectedMaskImage] + ' mask.)' } function loadFramePackOptions(listOfFramePacks) { var framePackHTML = '' for (var i = 0; i < listOfFramePacks.length; i++) { - framePackHTML += '' + var framePackOptionDisabled = '' + if (listOfFramePacks[i][0] == 'disabled') { + framePackOptionDisabled = 'disabled ' + } + framePackHTML += '' } document.getElementById('inputFramePack').innerHTML = framePackHTML loadScript('/data/scripts/versions/' + document.getElementById('inputFrameVersion').value + '/regular.js') diff --git a/data/scripts/versions/m15/floatingCrowns.js b/data/scripts/versions/m15/floatingCrowns.js index d85befca..8b7a7345 100644 --- a/data/scripts/versions/m15/floatingCrowns.js +++ b/data/scripts/versions/m15/floatingCrowns.js @@ -1,6 +1,7 @@ if (!loadedVersions.includes('m15FloatingCrowns')) { loadedVersions.push("m15FloatingCrowns") loadFrameImages([ + ['Lower Crown Cutout', '/data/images/cardImages/black.png', 110/1500, 230/2100, 1280/1500, 30/2100, ['Full']], ['White Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingW.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Blue Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingU.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Black Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingB.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], @@ -9,7 +10,7 @@ if (!loadedVersions.includes('m15FloatingCrowns')) { ['Multicolored Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingM.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Artifact Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingA.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Land Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingL.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], - ['Legend Crown Border Cover', '/data/images/cardImages/black.png', 59/1500, 58/2100, 1384/1500, 37/2100, ['Full']] + ['Upper Crown Border Cover', '/data/images/cardImages/black.png', 59/1500, 58/2100, 1384/1500, 37/2100, ['Full']] ], 'frameClassM15FloatingCrowns') } diff --git a/data/scripts/versions/m15/version.js b/data/scripts/versions/m15/version.js index 177396f0..6d2e05df 100644 --- a/data/scripts/versions/m15/version.js +++ b/data/scripts/versions/m15/version.js @@ -39,7 +39,7 @@ if (currentVersion != 'm15') { bottomInfoUpdated() } -loadFramePackOptions([['regular', 'Regular'], ['legendCrowns', 'Legend Crowns'], ['m21', 'M21 Showcase'], ['nickname', 'Nickname (Godzilla)'], ['companion', 'Companion'], ['nyx', 'Nyx'], ['invention', 'Kaladesh Invention'], ['inventionClassic', 'Simple Invention'], ['devoid', 'Devoid'], ['floatingCrowns', 'Floating Crowns'], ['darkPT', 'Dark Power/Toughness']]) +loadFramePackOptions([['disabled', 'Standard'],['regular', 'Regular'], ['disabled', 'Crowns'], ['legendCrowns', 'Legend Crowns'], ['floatingCrowns', 'Floating Crowns'], ['disabled', 'Mechanic-Based'], ['companion', 'Companion'], ['nyx', 'Nyx'], ['devoid', 'Devoid'], ['disabled', 'Special'], ['m21', 'M21 Showcase'], ['nickname', 'Nickname (Godzilla)'], ['invention', 'Kaladesh Invention'], ['darkPT', 'Dark Power/Toughness'], ['disabled', 'Custom'], ['inventionClassic', 'Simple Invention']]) function bottomInfoM15() { bottomInfoContext.clearRect(0, 0, cardWidth, cardHeight) diff --git a/data/scripts/versions/m15Promo/darkPT.js b/data/scripts/versions/m15Promo/darkPT.js new file mode 100644 index 00000000..fa6b9982 --- /dev/null +++ b/data/scripts/versions/m15Promo/darkPT.js @@ -0,0 +1,15 @@ +if (!loadedVersions.includes('m15DarkPT')) { + loadedVersions.push("m15DarkPT") + loadFrameImages([ + ['Darkened White Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTW.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Blue Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTU.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Black Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTB.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Red Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTR.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Green Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTG.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Multicolored Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTM.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Artifact Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTA.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], + ['Darkened Colorless Power/Toughness', '/data/images/cardImages/m15/m15NicknamePTC.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']] + ], 'frameClassM15DarkPT') +} + +hideFrameImages('frameClassM15DarkPT') \ No newline at end of file diff --git a/data/scripts/versions/m15Promo/floatingCrowns.js b/data/scripts/versions/m15Promo/floatingCrowns.js index 6b356f61..8b7a7345 100644 --- a/data/scripts/versions/m15Promo/floatingCrowns.js +++ b/data/scripts/versions/m15Promo/floatingCrowns.js @@ -1,7 +1,7 @@ if (!loadedVersions.includes('m15FloatingCrowns')) { loadedVersions.push("m15FloatingCrowns") loadFrameImages([ - ['Invention Legend Crown Cutout', '/data/images/cardImages/black.png', 110/1500, 230/2100, 1280/1500, 30/2100, ['Full']], + ['Lower Crown Cutout', '/data/images/cardImages/black.png', 110/1500, 230/2100, 1280/1500, 30/2100, ['Full']], ['White Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingW.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Blue Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingU.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Black Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingB.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], @@ -10,7 +10,7 @@ if (!loadedVersions.includes('m15FloatingCrowns')) { ['Multicolored Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingM.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Artifact Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingA.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Land Floating Legend Crown', '/data/images/cardImages/m15/m15CrownFloatingL.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], - ['Legend Crown Border Cover', '/data/images/cardImages/black.png', 59/1500, 58/2100, 1384/1500, 37/2100, ['Full']] + ['Upper Crown Border Cover', '/data/images/cardImages/black.png', 59/1500, 58/2100, 1384/1500, 37/2100, ['Full']] ], 'frameClassM15FloatingCrowns') } diff --git a/data/scripts/versions/m15Promo/version.js b/data/scripts/versions/m15Promo/version.js index 53ae6fd9..1db9e352 100644 --- a/data/scripts/versions/m15Promo/version.js +++ b/data/scripts/versions/m15Promo/version.js @@ -39,4 +39,4 @@ if (currentVersion != 'm15Promo') { bottomInfoUpdated() } -loadFramePackOptions([['regular', 'Regular'], ['floatingCrowns', 'Floating Crowns'], ['nickname', 'Nickname (Godzilla)'], ['innerCrowns', 'Inner Crowns']]) +loadFramePackOptions([['regular', 'Regular'], ['floatingCrowns', 'Floating Crowns'], ['nickname', 'Nickname (Godzilla)'], ['innerCrowns', 'Inner Crowns'], ['darkPT', 'Dark Power/Toughness']])