diff --git a/data/images/m15/m15InnerCrownACompanion.png b/data/images/m15/m15InnerCrownACompanion.png new file mode 100644 index 00000000..153334de Binary files /dev/null and b/data/images/m15/m15InnerCrownACompanion.png differ diff --git a/data/images/m15/m15InnerCrownBCompanion.png b/data/images/m15/m15InnerCrownBCompanion.png new file mode 100644 index 00000000..3a8808e3 Binary files /dev/null and b/data/images/m15/m15InnerCrownBCompanion.png differ diff --git a/data/images/m15/m15InnerCrownGCompanion.png b/data/images/m15/m15InnerCrownGCompanion.png new file mode 100644 index 00000000..7a26c1df Binary files /dev/null and b/data/images/m15/m15InnerCrownGCompanion.png differ diff --git a/data/images/m15/m15InnerCrownMCompanion.png b/data/images/m15/m15InnerCrownMCompanion.png new file mode 100644 index 00000000..0b99b377 Binary files /dev/null and b/data/images/m15/m15InnerCrownMCompanion.png differ diff --git a/data/images/m15/m15InnerCrownRCompanion.png b/data/images/m15/m15InnerCrownRCompanion.png new file mode 100644 index 00000000..c6df34b7 Binary files /dev/null and b/data/images/m15/m15InnerCrownRCompanion.png differ diff --git a/data/images/m15/m15InnerCrownUCompanion.png b/data/images/m15/m15InnerCrownUCompanion.png new file mode 100644 index 00000000..7e5f2267 Binary files /dev/null and b/data/images/m15/m15InnerCrownUCompanion.png differ diff --git a/data/images/m15/m15InnerCrownWCompanion.png b/data/images/m15/m15InnerCrownWCompanion.png new file mode 100644 index 00000000..af27ea71 Binary files /dev/null and b/data/images/m15/m15InnerCrownWCompanion.png differ diff --git a/data/scripts/main.js b/data/scripts/main.js index cb7163a4..a96d0e01 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -173,6 +173,8 @@ class cardImage { temporaryElement.onclick = function() { if (document.getElementById('cardMasterElementEditor').classList.contains('hidden') && !deletingCardObject) { document.getElementById('cardMasterElementEditor').classList.remove('hidden') + } else { + deletingCardObject = false } selectedCardMasterElement = parseInt(this.id.replace('uniqueNumber', '')) var selectedObject = cardMasterList[selectedCardMasterElement] @@ -328,8 +330,6 @@ function deleteCardObject(event) { } else { drawCardObjects() } - - deletingCardObject = true document.getElementById('cardMasterElementEditor').classList.add('hidden') } diff --git a/data/scripts/versions/m15/companion.js b/data/scripts/versions/m15/companion.js new file mode 100644 index 00000000..fcdb9ec3 --- /dev/null +++ b/data/scripts/versions/m15/companion.js @@ -0,0 +1,14 @@ +if (!loadedVersions.includes('m15Companion')) { + loadedVersions.push('m15Companion') + loadFrameImages([ + ['White Companion Legend Crown', 'data/images/m15/m15InnerCrownWCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Blue Companion Legend Crown', 'data/images/m15/m15InnerCrownUCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Black Companion Legend Crown', 'data/images/m15/m15InnerCrownBCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Red Companion Legend Crown', 'data/images/m15/m15InnerCrownRCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Green Companion Legend Crown', 'data/images/m15/m15InnerCrownGCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Multicolored Companion Legend Crown', 'data/images/m15/m15InnerCrownMCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Artifact Companion Legend Crown', 'data/images/m15/m15InnerCrownACompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']] + ], 'frameClassM15Companion') +} + +hideFrameImages('frameClassM15Companion') \ No newline at end of file diff --git a/data/scripts/versions/m15/version.js b/data/scripts/versions/m15/version.js index 3a140176..a6cb5658 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'], ['nickname', 'Nickname (Godzilla)'], ['nyx', 'Nyx'], ['invention', 'Kaladesh Invention'], ['floatingCrowns', 'Floating Crowns']]) +loadFramePackOptions([['regular', 'Regular'], ['legendCrowns', 'Legend Crowns'], ['nickname', 'Nickname (Godzilla)'], ['companion', 'Companion'], ['nyx', 'Nyx'], ['invention', 'Kaladesh Invention'], ['floatingCrowns', 'Floating Crowns']]) function bottomInfoM15() { bottomInfoContext.clearRect(0, 0, cardWidth, cardHeight) diff --git a/data/scripts/versions/m15Promo/floatingCrowns.js b/data/scripts/versions/m15Promo/floatingCrowns.js index 9ceefce5..a71faad1 100644 --- a/data/scripts/versions/m15Promo/floatingCrowns.js +++ b/data/scripts/versions/m15Promo/floatingCrowns.js @@ -1,6 +1,7 @@ -if (!loadedVersions.includes('m15PromoFloatingCrown')) { - loadedVersions.push("m15PromoFloatingCrown") +if (!loadedVersions.includes('m15FloatingCrowns')) { + loadedVersions.push("m15FloatingCrowns") loadFrameImages([ + ['Invention Legend Crown Cutout', 'data/images/black.png', 110/1500, 230/2100, 1280/1500, 30/2100, ['Full']], ['White Floating Legend Crown', 'data/images/m15/m15CrownFloatingW.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Blue Floating Legend Crown', 'data/images/m15/m15CrownFloatingU.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Black Floating Legend Crown', 'data/images/m15/m15CrownFloatingB.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], @@ -8,8 +9,9 @@ if (!loadedVersions.includes('m15PromoFloatingCrown')) { ['Green Floating Legend Crown', 'data/images/m15/m15CrownFloatingG.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Multicolored Floating Legend Crown', 'data/images/m15/m15CrownFloatingM.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], ['Artifact Floating Legend Crown', 'data/images/m15/m15CrownFloatingA.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], - ['Land Floating Legend Crown', 'data/images/m15/m15CrownFloatingA.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']] - ], 'frameClassM15PromoFloatingCrowns') + ['Land Floating Legend Crown', 'data/images/m15/m15CrownFloatingL.png', 46/1500, 40/2100, 1408/1500, 215/2100, ['Full']], + ['Legend Crown Border Cover', 'data/images/black.png', 59/1500, 58/2100, 1384/1500, 37/2100, ['Full']] + ], 'frameClassM15FloatingCrowns') } -hideFrameImages('frameClassM15PromoFloatingCrowns') \ No newline at end of file +hideFrameImages('frameClassM15FloatingCrowns') \ No newline at end of file diff --git a/data/scripts/versions/m15Promo/innerCrowns.js b/data/scripts/versions/m15Promo/innerCrowns.js new file mode 100644 index 00000000..83bdb659 --- /dev/null +++ b/data/scripts/versions/m15Promo/innerCrowns.js @@ -0,0 +1,21 @@ +if (!loadedVersions.includes('m15InnerCrowns')) { + loadedVersions.push('m15InnerCrowns') + loadFrameImages([ + ['White Companion Legend Crown', 'data/images/m15/m15InnerCrownWCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Blue Companion Legend Crown', 'data/images/m15/m15InnerCrownUCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Black Companion Legend Crown', 'data/images/m15/m15InnerCrownBCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Red Companion Legend Crown', 'data/images/m15/m15InnerCrownRCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Green Companion Legend Crown', 'data/images/m15/m15InnerCrownGCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Multicolored Companion Legend Crown', 'data/images/m15/m15InnerCrownMCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Artifact Companion Legend Crown', 'data/images/m15/m15InnerCrownACompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['White Nyx Legend Crown', 'data/images/m15/m15InnerCrownWNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Blue Nyx Legend Crown', 'data/images/m15/m15InnerCrownUNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Black Nyx Legend Crown', 'data/images/m15/m15InnerCrownBNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Red Nyx Legend Crown', 'data/images/m15/m15InnerCrownRNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Green Nyx Legend Crown', 'data/images/m15/m15InnerCrownGNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Multicolored Nyx Legend Crown', 'data/images/m15/m15InnerCrownMNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Artifact Nyx Legend Crown', 'data/images/m15/m15InnerCrownANyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']] + ], 'frameClassM15InnerCrowns') +} + +hideFrameImages('frameClassM15InnerCrowns') \ No newline at end of file diff --git a/data/scripts/versions/m15Promo/version.js b/data/scripts/versions/m15Promo/version.js index 53ecce38..b6e2c4ec 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)']]) \ No newline at end of file +loadFramePackOptions([['regular', 'Regular'], ['floatingCrowns', 'Floating Crowns'], ['nickname', 'Nickname (Godzilla)'], ['innerCrowns', 'Inner Crowns']]) \ No newline at end of file diff --git a/data/scripts/versions/m15Textless/innerCrowns.js b/data/scripts/versions/m15Textless/innerCrowns.js new file mode 100644 index 00000000..83bdb659 --- /dev/null +++ b/data/scripts/versions/m15Textless/innerCrowns.js @@ -0,0 +1,21 @@ +if (!loadedVersions.includes('m15InnerCrowns')) { + loadedVersions.push('m15InnerCrowns') + loadFrameImages([ + ['White Companion Legend Crown', 'data/images/m15/m15InnerCrownWCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Blue Companion Legend Crown', 'data/images/m15/m15InnerCrownUCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Black Companion Legend Crown', 'data/images/m15/m15InnerCrownBCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Red Companion Legend Crown', 'data/images/m15/m15InnerCrownRCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Green Companion Legend Crown', 'data/images/m15/m15InnerCrownGCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Multicolored Companion Legend Crown', 'data/images/m15/m15InnerCrownMCompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Artifact Companion Legend Crown', 'data/images/m15/m15InnerCrownACompanion.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['White Nyx Legend Crown', 'data/images/m15/m15InnerCrownWNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Blue Nyx Legend Crown', 'data/images/m15/m15InnerCrownUNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Black Nyx Legend Crown', 'data/images/m15/m15InnerCrownBNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Red Nyx Legend Crown', 'data/images/m15/m15InnerCrownRNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Green Nyx Legend Crown', 'data/images/m15/m15InnerCrownGNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Multicolored Nyx Legend Crown', 'data/images/m15/m15InnerCrownMNyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']], + ['Artifact Nyx Legend Crown', 'data/images/m15/m15InnerCrownANyx.png', 246/1500, 50/2100, 1008/1500, 50/2100, ['Full']] + ], 'frameClassM15InnerCrowns') +} + +hideFrameImages('frameClassM15InnerCrowns') \ No newline at end of file diff --git a/data/scripts/versions/m15Textless/version.js b/data/scripts/versions/m15Textless/version.js index 3d91c839..d88772aa 100644 --- a/data/scripts/versions/m15Textless/version.js +++ b/data/scripts/versions/m15Textless/version.js @@ -38,7 +38,7 @@ if (currentVersion != 'm15Textless') { bottomInfoUpdated() } -loadFramePackOptions([['regular', 'Regular'], ['floatingCrowns', 'Floating Crowns']]) +loadFramePackOptions([['regular', 'Regular'], ['floatingCrowns', 'Floating Crowns'], ['innerCrowns', 'Inner Crowns']]) function bottomInfoM15() { bottomInfoContext.clearRect(0, 0, cardWidth, cardHeight)