general improvements

creator/index.html

@@ -47,19 +47,23 @@
 						<div>
 							Select a frame version:<br>
 							<select id="inputFrameVersion" onchange="loadVersion(this.value)">
-				                <option value="m15">M15</option>
+								<option disabled value=''>Standard Frames</option>
+				                <option value="m15">Regular</option>
 				                <option value="token">Tokens</option>
-				                <option value="m15Promo">M15 Promo</option>
-				                <option value="m15Textless">Textless Kaladesh Inventions</option>
 				                <option value="m15Planeswalker">M15 Planeswalker</option>
-				                <option value="storybook">Storybook</option>
+				                <option disabled value=''>Special Frames</option>
+				                <option value="m15Promo">Promo</option>
+				                <option value="m15Textless">Textless Kaladesh Inventions</option>
+				                <option value="storybook">Eldraine Storybook</option>
 				                <option value="ixalan">Ixalan Maps</option>
 				                <option value="unstable">Unstable Basics</option>
-				                <option value="expedition">Expeditions</option>
+				                <option value="expedition">Zendikar Expeditions</option>
-				                <option value="planechase">Planechase</option>
 				                <option value="future">Future Shifted</option>
+				                <option disabled value=''>Old Frames</option>
 				                <option value="seventh">Seventh Edition</option>
 				                <option value="seventhTextless">Textless Seventh Edition</option>
+				                <option disabled value=''>Misc. Frames</option>
+				                <option value="planechase">Planechase</option>
 				            </select>
 						</div>
 						<div>
@@ -73,11 +77,15 @@
 				        <div id="framePicker" class="frameGrid"></div>
 				        <div id="maskPicker"></div>
 				    </div>
+				    
 				    <div class='autoGrid'>
 					    <button onclick='addSelectedFrame()'>Add</button>
 					    <button onclick='addSelectedFrame(["Right Half"])'>Add To Right Half</button>
 					    <button onclick='addSelectedFrame(["Middle Third"])'>Add To Middle Third</button>
 					</div>
+					<div id='previewSelectedFrame'>
+				    	(Selected: None)
+				    </div>
 					<div id="cardMaster">
 
 				    </div>

data/scripts/main.js

@@ -306,6 +306,7 @@ class frameImage {
 			frameImageList[parseInt(this.id.replace('frameIndex', ''))].masks.forEach(array => document.getElementById('maskPicker').innerHTML += '<div id="maskOption' + maskNameList.indexOf(array) + '" onclick="maskOptionClicked(event)"><img src="' + maskImageList[maskNameList.indexOf(array)].src + '">' + array + '</div>')
 			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 += '<option value="' + listOfFramePacks[i][0] + '">' + listOfFramePacks[i][1] + '</option>'
+		var framePackOptionDisabled = ''
+		if (listOfFramePacks[i][0] == 'disabled') {
+			framePackOptionDisabled = 'disabled '
+		}
+		framePackHTML += '<option ' + framePackOptionDisabled + 'value="' + listOfFramePacks[i][0] + '">' + listOfFramePacks[i][1] + '</option>'
 	}
 	document.getElementById('inputFramePack').innerHTML = framePackHTML
 	loadScript('/data/scripts/versions/' + document.getElementById('inputFrameVersion').value + '/regular.js')

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')
 }
 

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)

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')

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')
 }
 

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']])