diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameA.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameA.png new file mode 100644 index 00000000..0abc3f7b Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameA.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameB.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameB.png new file mode 100644 index 00000000..34cdf8a1 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameB.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameG.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameG.png new file mode 100644 index 00000000..69f39ce7 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameG.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameL.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameL.png new file mode 100644 index 00000000..e8d637d3 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameL.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameM.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameM.png new file mode 100644 index 00000000..d8211190 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameM.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameR.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameR.png new file mode 100644 index 00000000..a99ad0b8 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameR.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameU.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameU.png new file mode 100644 index 00000000..38084e73 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameU.png differ diff --git a/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameW.png b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameW.png new file mode 100644 index 00000000..9bab0cc6 Binary files /dev/null and b/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameW.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerCSV.csv b/data/images/cardImages/planeswalker/planeswalkerCSV.csv deleted file mode 100644 index 3d7f28e6..00000000 --- a/data/images/cardImages/planeswalker/planeswalkerCSV.csv +++ /dev/null @@ -1,11 +0,0 @@ -displayName,imagePath,maskOptions,framePickerOptions -White,planeswalker/m15WPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Blue,planeswalker/m15UPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Black,planeswalker/m15BPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Red,planeswalker/m15RPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Green,planeswalker/m15GPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Multicolored,planeswalker/m15MPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Artifact,planeswalker/m15APlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Colorless,planeswalker/m15CPlaneswalker.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039;Pinline Planeswalker-0-0-744-1039;Frame Planeswalker-0-0-744-1039;Loyalty Planeswalker-0-0-744-1039,Planeswalker -Dark Twins,planeswalker/darkTwins.png,Full-0-0-744-1039;Title Planeswalker-0-0-744-1039;Type Planeswalker-0-0-744-1039,Planeswalker -Border,masks/BorderPlaneswalker.png,Full-0-0-744-1039;Border Planeswalker-0-0-744-1039,Planeswalker \ No newline at end of file diff --git a/data/images/cardImages/planeswalker/planeswalkerDarkTwins.png b/data/images/cardImages/planeswalker/planeswalkerDarkTwins.png deleted file mode 100644 index 86734d5e..00000000 Binary files a/data/images/cardImages/planeswalker/planeswalkerDarkTwins.png and /dev/null differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameA.png b/data/images/cardImages/planeswalker/planeswalkerFrameA.png index 65860598..13ff35ae 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameA.png and b/data/images/cardImages/planeswalker/planeswalkerFrameA.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameB.png b/data/images/cardImages/planeswalker/planeswalkerFrameB.png index d80aba89..63f9f4f8 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameB.png and b/data/images/cardImages/planeswalker/planeswalkerFrameB.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameC.png b/data/images/cardImages/planeswalker/planeswalkerFrameC.png deleted file mode 100644 index 08df8676..00000000 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameC.png and /dev/null differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameG.png b/data/images/cardImages/planeswalker/planeswalkerFrameG.png index 3c1ee313..ccaa8e37 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameG.png and b/data/images/cardImages/planeswalker/planeswalkerFrameG.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameM.png b/data/images/cardImages/planeswalker/planeswalkerFrameM.png index 6affd7a5..2eeccf4d 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameM.png and b/data/images/cardImages/planeswalker/planeswalkerFrameM.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameR.png b/data/images/cardImages/planeswalker/planeswalkerFrameR.png index 71c2364f..a39212a8 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameR.png and b/data/images/cardImages/planeswalker/planeswalkerFrameR.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameU.png b/data/images/cardImages/planeswalker/planeswalkerFrameU.png index cd914947..09c3bfeb 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameU.png and b/data/images/cardImages/planeswalker/planeswalkerFrameU.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerFrameW.png b/data/images/cardImages/planeswalker/planeswalkerFrameW.png index be44c001..203f548a 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerFrameW.png and b/data/images/cardImages/planeswalker/planeswalkerFrameW.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskBorder.png b/data/images/cardImages/planeswalker/planeswalkerMaskBorder.png index 79a49598..fd2a2996 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskBorder.png and b/data/images/cardImages/planeswalker/planeswalkerMaskBorder.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskFrame.png b/data/images/cardImages/planeswalker/planeswalkerMaskFrame.png index 59e786dd..fe7e0060 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskFrame.png and b/data/images/cardImages/planeswalker/planeswalkerMaskFrame.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskLoyalty.png b/data/images/cardImages/planeswalker/planeswalkerMaskLoyalty.png deleted file mode 100644 index d1113d2c..00000000 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskLoyalty.png and /dev/null differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskPinline.png b/data/images/cardImages/planeswalker/planeswalkerMaskPinline.png index b27cbba5..1f02e965 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskPinline.png and b/data/images/cardImages/planeswalker/planeswalkerMaskPinline.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskText.png b/data/images/cardImages/planeswalker/planeswalkerMaskText.png index 84893340..030095ce 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskText.png and b/data/images/cardImages/planeswalker/planeswalkerMaskText.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskTitle.png b/data/images/cardImages/planeswalker/planeswalkerMaskTitle.png index 88713515..f695842b 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskTitle.png and b/data/images/cardImages/planeswalker/planeswalkerMaskTitle.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerMaskType.png b/data/images/cardImages/planeswalker/planeswalkerMaskType.png index 459417da..061ee90e 100644 Binary files a/data/images/cardImages/planeswalker/planeswalkerMaskType.png and b/data/images/cardImages/planeswalker/planeswalkerMaskType.png differ diff --git a/data/images/cardImages/planeswalker/planeswalkerPT.png b/data/images/cardImages/planeswalker/planeswalkerPT.png deleted file mode 100644 index 3ca7595c..00000000 Binary files a/data/images/cardImages/planeswalker/planeswalkerPT.png and /dev/null differ diff --git a/data/scripts/main.js b/data/scripts/main.js index 9f98a706..5e9a21a6 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -162,7 +162,7 @@ class cardPlaceholder { } draw() { if (this.whatToDraw == textCanvas) { - if (currentVersion == 'm15Planeswalker/version') { + if (currentVersion.includes('m15Planeswalker/')) { mainContext.drawImage(planeswalkerCanvas, 0, 0, cardWidth, cardHeight) } mainContext.globalAlpha = parseInt(document.getElementById('inputWatermarkOpacity').value) / 100 @@ -425,7 +425,12 @@ function cardMasterElementEdited() { } function getFloat(input) { - return parseFloat(document.getElementById(input).value) + var getFloatResponse = parseFloat(document.getElementById(input).value) + if (getFloatResponse) { + return getFloatResponse + } else { + return 0 + } } function loadTextOptions(textArray = []) { @@ -877,7 +882,7 @@ function inputCardNameNumberTextImport(index) { } else { importText('', 'Power/Toughness') } - if (importCardTextResponse.includes('"loyalty":"') && currentVersion == 'm15Planeswalker/version') { + if (importCardTextResponse.includes('"loyalty":"') && currentVersion.includes('m15Planeswalker/')) { importText(beforeAfter(importCardTextResponse, '"loyalty":"', '",'), 'Loyalty') var abilityList = beforeAfter(importCardTextResponse, '"oracle_text":"', '",').replace(/ \\"/g, ' \u201C').replace(/\\"/g, '\u201D').split(/\\n/g) for (var i = 0; i < abilityList.length; i++) { diff --git a/data/scripts/versions/m15Planeswalker/nickname.js b/data/scripts/versions/m15Planeswalker/nickname.js new file mode 100644 index 00000000..27b1455e --- /dev/null +++ b/data/scripts/versions/m15Planeswalker/nickname.js @@ -0,0 +1,43 @@ +if (!loadedVersions.includes('m15Planeswalker/nickname')) { + loadedVersions.push('m15Planeswalker/nickname') + loadFrameImages([ + ['White Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Blue Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Black Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Red Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameR.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Green Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Multicolored Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Artifact Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameA.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['Land Frame', '/data/images/cardImages/planeswalker/nickname/planeswalkerNicknameFrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Border (planeswalker)']], + ['White Border', '/data/images/cardImages/white.png', 0, 0, 1, 1, ['Alternative Border', 'Border (planeswalker)']], + ['Silver Border', '/data/images/cardImages/silver.png', 0, 0, 1, 1, ['Alternative Border', 'Border (planeswalker)']], + ['Gold Border', '/data/images/cardImages/gold.png', 0, 0, 1, 1, ['Alternative Border', 'Border (planeswalker)']] + ], 'frameClassPlaneswalkerNickname') +} + +if (currentVersion != 'm15Planeswalker/nickname') { + currentVersion = 'm15Planeswalker/nickname' + + artX = 0 + artY = 0 + artWidth = 1 + artHeight = scaleY(1921 / 2100) + + loadTextOptions([ + new cardText('Card Nickname', '', 130/1500, 157/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'white', ['oneLine=true', 'shadow=3']), + new cardText('Card Title', '', 210/1500, 252/2100, 1080/1500, 48/2100, 'belerenb', 48/2100, 'white', ['oneLine=true', 'textAlign="center"', 'fontStyle="italic "', 'shadow=3']), + new cardText('Card Type', '', 130/1500, 1258/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'white', ['oneLine=true', 'shadow=3']), + new cardText('Ability 1', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'white', ['shadow=3']), + new cardText('Ability 2', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'white', ['shadow=3']), + new cardText('Ability 3', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'white', ['shadow=3']), + new cardText('Ability 4', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'white', ['shadow=3']), + new cardText('Loyalty', '', 1209/1500, 1954/2100, 210/1500, 78/2100, 'belerenbsc', 78/2100, 'white', ['oneLine=true,textAlign="center"', 'shadow=3']) + ]) + + document.getElementById('inputColorInvert').checked = true + invertPlaneswalkerColors() +} + +planeswalkerTextBoxX = scaleX(179/1500), planeswalkerTextBoxWidth = scaleX(1205/1500), planeswalkerTextBoxY = scaleY(1314/2100), planeswalkerTextBoxHeight = scaleY(607/2100) + +hideFrameImages('frameClassPlaneswalkerNickname') \ No newline at end of file diff --git a/data/scripts/versions/m15Planeswalker/regular.js b/data/scripts/versions/m15Planeswalker/regular.js index c3695abf..f8cd93b2 100644 --- a/data/scripts/versions/m15Planeswalker/regular.js +++ b/data/scripts/versions/m15Planeswalker/regular.js @@ -8,13 +8,12 @@ if (!loadedVersions.includes('m15Planeswalker/regular')) { ['Green Frame', '/data/images/cardImages/planeswalker/planeswalkerFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Frame (planeswalker)', 'Border (planeswalker)']], ['Multicolored Frame', '/data/images/cardImages/planeswalker/planeswalkerFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Frame (planeswalker)', 'Border (planeswalker)']], ['Artifact Frame', '/data/images/cardImages/planeswalker/planeswalkerFrameA.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Frame (planeswalker)', 'Border (planeswalker)']], - ['Colorless Frame', '/data/images/cardImages/planeswalker/planeswalkerFrameC.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Frame (planeswalker)', 'Border (planeswalker)']], - ['Dark Twins', '/data/images/cardImages/planeswalker/planeswalkerDarkTwins.png', 0, 0, 1, 1, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Frame (planeswalker)', 'Border (planeswalker)']], - ['Holo Stamp', '/data/images/cardImages/stamp.png', 338/744, 951/1039, 70/744, 36/1039, ['Full', 'Pinline (planeswalker)', 'Title (planeswalker)', 'Type (planeswalker)', 'Frame (planeswalker)', 'Border (planeswalker)']], - ['White Border', '/data/images/cardImages/white.png', 0, 0, 1, 1, ['Alternative Border', 'Alternative Border (Crown)', 'Border (m15)']], - ['Silver Border', '/data/images/cardImages/silver.png', 0, 0, 1, 1, ['Alternative Border', 'Alternative Border (Crown)', 'Border (m15)']], - ['Gold Border', '/data/images/cardImages/gold.png', 0, 0, 1, 1, ['Alternative Border', 'Alternative Border (Crown)', 'Border (m15)']] + ['White Border', '/data/images/cardImages/white.png', 0, 0, 1, 1, ['Alternative Border', 'Border (planeswalker)']], + ['Silver Border', '/data/images/cardImages/silver.png', 0, 0, 1, 1, ['Alternative Border', 'Border (planeswalker)']], + ['Gold Border', '/data/images/cardImages/gold.png', 0, 0, 1, 1, ['Alternative Border', 'Border (planeswalker)']] ], 'frameClassPlaneswalkerRegular') } +planeswalkerTextBoxX = scaleX(179/1500), planeswalkerTextBoxWidth = scaleX(1205/1500), planeswalkerTextBoxY = scaleY(1314/2100), planeswalkerTextBoxHeight = scaleY(607/2100) + hideFrameImages('frameClassPlaneswalkerRegular') \ No newline at end of file diff --git a/data/scripts/versions/m15Planeswalker/version.js b/data/scripts/versions/m15Planeswalker/version.js index a23fb8c8..9b2ea847 100644 --- a/data/scripts/versions/m15Planeswalker/version.js +++ b/data/scripts/versions/m15Planeswalker/version.js @@ -8,10 +8,11 @@ if (!loadedVersions.includes('m15Planeswalker/version')) { planeswalkerTab.classList.add('hidden') planeswalkerTab.id = 'planeswalkerTab' planeswalkerTab.innerHTML = ` - One: - Two: - Three: - Four:
+ Adjust the height (first input) and loyalty cost (second input) of each Planeswalker ability:
+ First Ability: + Second Ability: + Third Ability: + Fourth Ability:
For two-ability Planeswalkers only:
Use War of the Spark ability spacing
Reverse War of the Spark ability spacing
@@ -51,13 +52,13 @@ if (!loadedVersions.includes('m15Planeswalker/version')) { if (currentVersion != 'm15Planeswalker/version') { currentVersion = 'm15Planeswalker/version' - artX = scaleX(100 / 1500) - artY = scaleY(190 / 2100) - artWidth = scaleX(1508 / 1500) - artHeight = scaleY(1730 / 2100) + artX = scaleX(105 / 1500) + artY = scaleY(212 / 2100) + artWidth = scaleX(1290 / 1500) + artHeight = scaleY(1709 / 2100) manaCostXPath = '1316 - 78 * manaSymbolIndex' - manaCostYPath = '86' + manaCostYPath = '94' manaCostDiameter = '70' manaCostShadowOffset = '[-2, 6]' manaCostDirection = 'reverse' @@ -75,13 +76,13 @@ if (currentVersion != 'm15Planeswalker/version') { bottomInfoFunction = 'bottomInfoPlaneswalker' loadTextOptions([ - new cardText('Card Title', '', 130/1500, 149/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), + new cardText('Card Title', '', 130/1500, 157/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), new cardText('Card Type', '', 130/1500, 1258/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), new cardText('Ability 1', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'black'), new cardText('Ability 2', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'black'), new cardText('Ability 3', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'black'), new cardText('Ability 4', '', 270/1500, 1153/2100, 1120/1500, 624/2100, 'mplantin', 74/2100, 'black'), - new cardText('Loyalty', '', 1215/1500, 1954/2100, 210/1500, 78/2100, 'belerenbsc', 78/2100, 'white', ['oneLine=true,textAlign="center"']) + new cardText('Loyalty', '', 1209/1500, 1954/2100, 210/1500, 78/2100, 'belerenbsc', 78/2100, 'white', ['oneLine=true,textAlign="center"']) ]) } @@ -101,12 +102,17 @@ function bottomInfoPlaneswalker() { var planeswalkerAbilityLayout = [[0], [0, scaleY(784/1050)], [0, scaleY(730/1050), scaleY(863/1050)], [0, scaleY(697/1050), scaleY(784/1050), scaleY(878/1050)], [0, scaleY(683/1050), scaleY(756/1050), scaleY(830/1050), scaleY(904/1050)]] var planeswalkerAbilityCount = 3 var ability1Y = 0, ability2Y = 0, ability3Y = 0, ability4Y = 0, ability5Y = cardHeight +var planeswalkerTextBoxX = scaleX(179/1500), planeswalkerTextBoxWidth = scaleX(1205/1500), planeswalkerTextBoxY = scaleY(1314/2100), planeswalkerTextBoxHeight = scaleY(607/2100) function planeswalkerAbilities() { planeswalkerContext.clearRect(0, 0, cardWidth, cardHeight) planeswalkerAbilityCount = 0 + var cardTextListMod = 0 + if (currentVersion == 'm15Planeswalker/nickname') { + cardTextListMod = 1 + } for (var i = 1; i < 5; i++) { - cardTextList[i + 1].y = 2 + cardTextList[i + 1 + cardTextListMod].y = 2 if (getFloat('inputPlaneswalker' + i) != 0) { planeswalkerAbilityCount += 1; } else { @@ -114,35 +120,30 @@ function planeswalkerAbilities() { } } if (planeswalkerAbilityCount > 0) { - ability1Y = scaleY(648/1050) + ability1Y = planeswalkerTextBoxY if (planeswalkerAbilityCount > 1) { window.ability2Y = getFloat("inputPlaneswalker1") + ability1Y if (planeswalkerAbilityCount > 2) { ability3Y = getFloat('inputPlaneswalker2') + ability2Y if (planeswalkerAbilityCount > 3) { ability4Y = getFloat('inputPlaneswalker3') + ability3Y - // planeswalkerContext.writeText(version.textList[5][1], scale(133), ability4Y + (scale(950) - ability4Y) / 2, scale(555), 0, "mplantin", scale(38), "black", "lineSpace=0.97"); - cardTextList[5].y = (ability4Y) / cardHeight + cardTextList[5].fontSize - 10/2100 - cardTextList[5].height = getFloat('inputPlaneswalker4') / cardHeight + cardTextList[5 + cardTextListMod].y = (ability4Y) / cardHeight + cardTextList[5 + cardTextListMod].fontSize - 10/2100 + cardTextList[5 + cardTextListMod].height = getFloat('inputPlaneswalker4') / cardHeight } - // planeswalkerContext.writeText(version.textList[4][1], scale(133), ability3Y + getValue("inputPlaneswalker3") / 2, scale(555), 0, "mplantin", scale(38), "black", "lineSpace=0.97"); - cardTextList[4].y = (ability3Y) / cardHeight + cardTextList[4].fontSize - 10/2100 - cardTextList[4].height = getFloat('inputPlaneswalker3') / cardHeight + cardTextList[4 + cardTextListMod].y = (ability3Y) / cardHeight + cardTextList[4 + cardTextListMod].fontSize - 10/2100 + cardTextList[4 + cardTextListMod].height = getFloat('inputPlaneswalker3') / cardHeight } - // planeswalkerContext.writeText(version.textList[3][1], scale(133), ability2Y + getValue("inputPlaneswalker2") / 2, scale(555), 0, "mplantin", scale(38), "black", "lineSpace=0.97"); - cardTextList[3].y = (ability2Y) / cardHeight + cardTextList[3].fontSize - 10/2100 - cardTextList[3].height = getFloat('inputPlaneswalker2') / cardHeight + cardTextList[3 + cardTextListMod].y = (ability2Y) / cardHeight + cardTextList[3 + cardTextListMod].fontSize - 10/2100 + cardTextList[3 + cardTextListMod].height = getFloat('inputPlaneswalker2') / cardHeight } - // planeswalkerContext.writeText(version.textList[2][1], scale(133), ability1Y + getValue("inputPlaneswalker1") / 2, scale(555), 0, "mplantin", scale(38), "black", "lineSpace=0.97", "planeswalkerTextFunction"); - cardTextList[2].y = (ability1Y) / cardHeight + cardTextList[2].fontSize - 10/2100 - cardTextList[2].height = getFloat('inputPlaneswalker1') / cardHeight + cardTextList[2 + cardTextListMod].y = (ability1Y) / cardHeight + cardTextList[2 + cardTextListMod].fontSize - 10/2100 + cardTextList[2 + cardTextListMod].height = getFloat('inputPlaneswalker1') / cardHeight planeswalkerTextFunction() } } function planeswalkerTextFunction() { planeswalkerContext.globalCompositeOperation = 'destination-over' var lastAdjust = 0 - var textBoxWidth = scaleX(1210/1500) for (var i = 1; i < planeswalkerAbilityCount + 1; i++) { if (i == planeswalkerAbilityCount) { lastAdjust = 2 * cardHeight @@ -150,18 +151,18 @@ function planeswalkerTextFunction() { if (i % 2 == 1) { planeswalkerContext.fillStyle = lightColor planeswalkerContext.globalAlpha = 0.608 - planeswalkerContext.fillRect(scaleX(91/750), window['ability' + i + 'Y'] + scaleY(10/1050), textBoxWidth, window['ability' + (i + 1) + 'Y'] - window['ability' + i + 'Y'] - scaleY(20/1050) + lastAdjust) + planeswalkerContext.fillRect(planeswalkerTextBoxX, window['ability' + i + 'Y'] + scaleY(10/1050), planeswalkerTextBoxWidth, window['ability' + (i + 1) + 'Y'] - window['ability' + i + 'Y'] - scaleY(20/1050) + lastAdjust) if (i == 1 && planeswalkerAbilityCount != 1) { - planeswalkerContext.fillRect(scaleX(91/750), window['ability' + i + 'Y'], textBoxWidth, scaleY(10/1050)) + planeswalkerContext.fillRect(planeswalkerTextBoxX, window['ability' + i + 'Y'], planeswalkerTextBoxWidth, scaleY(10/1050)) } planeswalkerContext.globalAlpha = 1 - planeswalkerContext.drawImage(planeswalkerLightToDark, scaleX(91/750), window['ability' + (i + 1) + 'Y'] - scaleY(10/1050) + lastAdjust, textBoxWidth, scaleY(20/1050)) + planeswalkerContext.drawImage(planeswalkerLightToDark, planeswalkerTextBoxX, window['ability' + (i + 1) + 'Y'] - scaleY(10/1050) + lastAdjust, planeswalkerTextBoxWidth, scaleY(20/1050)) } else { planeswalkerContext.fillStyle = darkColor planeswalkerContext.globalAlpha = 0.706 - planeswalkerContext.fillRect(scaleX(91/750), window['ability' + i + 'Y'] + scaleY(10/1050), textBoxWidth, window['ability' + (i + 1) + 'Y'] - window['ability' + i + 'Y'] - scaleY(20/1050) + lastAdjust) + planeswalkerContext.fillRect(planeswalkerTextBoxX, window['ability' + i + 'Y'] + scaleY(10/1050), planeswalkerTextBoxWidth, window['ability' + (i + 1) + 'Y'] - window['ability' + i + 'Y'] - scaleY(20/1050) + lastAdjust) planeswalkerContext.globalAlpha = 1 - planeswalkerContext.drawImage(planeswalkerDarkToLight, scaleX(91/750), window['ability' + (i + 1)+ 'Y'] - scaleY(10/1050) + lastAdjust, textBoxWidth, scaleY(20/1050)) + planeswalkerContext.drawImage(planeswalkerDarkToLight, planeswalkerTextBoxX, window['ability' + (i + 1)+ 'Y'] - scaleY(10/1050) + lastAdjust, planeswalkerTextBoxWidth, scaleY(20/1050)) } } planeswalkerContext.globalCompositeOperation = 'destination-in' @@ -212,4 +213,4 @@ function invertPlaneswalkerColors() { } } -loadFramePackOptions([['regular', 'Regular']]) +loadFramePackOptions([['regular', 'Regular'], ['nickname', 'Nickname (Godzilla)']])