diff --git a/data/images/invention/inventionFrame.png b/data/images/invention/inventionFrame.png index a250161f..ac7bfdd7 100644 Binary files a/data/images/invention/inventionFrame.png and b/data/images/invention/inventionFrame.png differ diff --git a/data/images/invention/inventionPT.png b/data/images/invention/inventionPT.png index 9ba35a60..9ce256f5 100644 Binary files a/data/images/invention/inventionPT.png and b/data/images/invention/inventionPT.png differ diff --git a/data/images/m15/REFERENCEm15FrameW.png b/data/images/m15/REFERENCEm15FrameW.png deleted file mode 100644 index 295988b7..00000000 Binary files a/data/images/m15/REFERENCEm15FrameW.png and /dev/null differ diff --git a/data/images/m15/m15CrownA.png b/data/images/m15/m15CrownA.png index 34c8f152..2ec0dc66 100644 Binary files a/data/images/m15/m15CrownA.png and b/data/images/m15/m15CrownA.png differ diff --git a/data/images/m15/m15CrownB.png b/data/images/m15/m15CrownB.png index b03f7722..1517f8a0 100644 Binary files a/data/images/m15/m15CrownB.png and b/data/images/m15/m15CrownB.png differ diff --git a/data/images/m15/m15CrownBNyx.png b/data/images/m15/m15CrownBNyx.png deleted file mode 100644 index 802874d3..00000000 Binary files a/data/images/m15/m15CrownBNyx.png and /dev/null differ diff --git a/data/images/m15/m15CrownG.png b/data/images/m15/m15CrownG.png index 78dd95a9..d9bc2029 100644 Binary files a/data/images/m15/m15CrownG.png and b/data/images/m15/m15CrownG.png differ diff --git a/data/images/m15/m15CrownGNyx.png b/data/images/m15/m15CrownGNyx.png deleted file mode 100644 index 117e423e..00000000 Binary files a/data/images/m15/m15CrownGNyx.png and /dev/null differ diff --git a/data/images/m15/m15CrownL.png b/data/images/m15/m15CrownL.png index 68d3a112..c323f220 100644 Binary files a/data/images/m15/m15CrownL.png and b/data/images/m15/m15CrownL.png differ diff --git a/data/images/m15/m15CrownM.png b/data/images/m15/m15CrownM.png index c0402b89..c3fd4e9e 100644 Binary files a/data/images/m15/m15CrownM.png and b/data/images/m15/m15CrownM.png differ diff --git a/data/images/m15/m15CrownMNyx.png b/data/images/m15/m15CrownMNyx.png deleted file mode 100644 index f0ba1615..00000000 Binary files a/data/images/m15/m15CrownMNyx.png and /dev/null differ diff --git a/data/images/m15/m15CrownR.png b/data/images/m15/m15CrownR.png index 5111a39a..374c5685 100644 Binary files a/data/images/m15/m15CrownR.png and b/data/images/m15/m15CrownR.png differ diff --git a/data/images/m15/m15CrownRNyx.png b/data/images/m15/m15CrownRNyx.png deleted file mode 100644 index ec94830b..00000000 Binary files a/data/images/m15/m15CrownRNyx.png and /dev/null differ diff --git a/data/images/m15/m15CrownU.png b/data/images/m15/m15CrownU.png index 04dc8b94..0969a750 100644 Binary files a/data/images/m15/m15CrownU.png and b/data/images/m15/m15CrownU.png differ diff --git a/data/images/m15/m15CrownUNyx.png b/data/images/m15/m15CrownUNyx.png deleted file mode 100644 index 0d2059b7..00000000 Binary files a/data/images/m15/m15CrownUNyx.png and /dev/null differ diff --git a/data/images/m15/m15CrownW.png b/data/images/m15/m15CrownW.png index f9decf86..ada5aa98 100644 Binary files a/data/images/m15/m15CrownW.png and b/data/images/m15/m15CrownW.png differ diff --git a/data/images/m15/m15CrownWNyx.png b/data/images/m15/m15CrownWNyx.png deleted file mode 100644 index 1eeace23..00000000 Binary files a/data/images/m15/m15CrownWNyx.png and /dev/null differ diff --git a/data/images/m15/m15FrameA.png b/data/images/m15/m15FrameA.png index a99132b5..edb61233 100644 Binary files a/data/images/m15/m15FrameA.png and b/data/images/m15/m15FrameA.png differ diff --git a/data/images/m15/m15FrameANyx.png b/data/images/m15/m15FrameANyx.png index 22889320..6a54c9e7 100644 Binary files a/data/images/m15/m15FrameANyx.png and b/data/images/m15/m15FrameANyx.png differ diff --git a/data/images/m15/m15FrameB.png b/data/images/m15/m15FrameB.png index 5a323ea3..dceb3ae2 100644 Binary files a/data/images/m15/m15FrameB.png and b/data/images/m15/m15FrameB.png differ diff --git a/data/images/m15/m15FrameBNyx.png b/data/images/m15/m15FrameBNyx.png index 9f7b165b..cb58a068 100644 Binary files a/data/images/m15/m15FrameBNyx.png and b/data/images/m15/m15FrameBNyx.png differ diff --git a/data/images/m15/m15FrameG.png b/data/images/m15/m15FrameG.png index facf0e03..f3954f02 100644 Binary files a/data/images/m15/m15FrameG.png and b/data/images/m15/m15FrameG.png differ diff --git a/data/images/m15/m15FrameGNyx.png b/data/images/m15/m15FrameGNyx.png index a4579f99..b8e39677 100644 Binary files a/data/images/m15/m15FrameGNyx.png and b/data/images/m15/m15FrameGNyx.png differ diff --git a/data/images/m15/m15FrameL.png b/data/images/m15/m15FrameL.png index 231b97e1..f6a6f907 100644 Binary files a/data/images/m15/m15FrameL.png and b/data/images/m15/m15FrameL.png differ diff --git a/data/images/m15/m15FrameM.png b/data/images/m15/m15FrameM.png index 6e90db3e..be49028d 100644 Binary files a/data/images/m15/m15FrameM.png and b/data/images/m15/m15FrameM.png differ diff --git a/data/images/m15/m15FrameMNyx.png b/data/images/m15/m15FrameMNyx.png index c973eb59..53cb2282 100644 Binary files a/data/images/m15/m15FrameMNyx.png and b/data/images/m15/m15FrameMNyx.png differ diff --git a/data/images/m15/m15FrameR.png b/data/images/m15/m15FrameR.png index 5287e26f..8c951709 100644 Binary files a/data/images/m15/m15FrameR.png and b/data/images/m15/m15FrameR.png differ diff --git a/data/images/m15/m15FrameRNyx.png b/data/images/m15/m15FrameRNyx.png index 62f0a67f..8749f026 100644 Binary files a/data/images/m15/m15FrameRNyx.png and b/data/images/m15/m15FrameRNyx.png differ diff --git a/data/images/m15/m15FrameU.png b/data/images/m15/m15FrameU.png index fa820790..1a03ae43 100644 Binary files a/data/images/m15/m15FrameU.png and b/data/images/m15/m15FrameU.png differ diff --git a/data/images/m15/m15FrameUNyx.png b/data/images/m15/m15FrameUNyx.png index 54b0c60d..cd5524e6 100644 Binary files a/data/images/m15/m15FrameUNyx.png and b/data/images/m15/m15FrameUNyx.png differ diff --git a/data/images/m15/m15FrameV.png b/data/images/m15/m15FrameV.png index 8768ce0b..483e863f 100644 Binary files a/data/images/m15/m15FrameV.png and b/data/images/m15/m15FrameV.png differ diff --git a/data/images/m15/m15FrameW.png b/data/images/m15/m15FrameW.png index 95cc60f9..6b823d37 100644 Binary files a/data/images/m15/m15FrameW.png and b/data/images/m15/m15FrameW.png differ diff --git a/data/images/m15/m15FrameWNyx.png b/data/images/m15/m15FrameWNyx.png index 165d6165..c036be2b 100644 Binary files a/data/images/m15/m15FrameWNyx.png and b/data/images/m15/m15FrameWNyx.png differ diff --git a/data/images/m15/m15InnerCrownANyx.png b/data/images/m15/m15InnerCrownANyx.png new file mode 100644 index 00000000..79d79f6b Binary files /dev/null and b/data/images/m15/m15InnerCrownANyx.png differ diff --git a/data/images/m15/m15InnerCrownBNyx.png b/data/images/m15/m15InnerCrownBNyx.png new file mode 100644 index 00000000..767c7ba4 Binary files /dev/null and b/data/images/m15/m15InnerCrownBNyx.png differ diff --git a/data/images/m15/m15InnerCrownGNyx.png b/data/images/m15/m15InnerCrownGNyx.png new file mode 100644 index 00000000..97dd741a Binary files /dev/null and b/data/images/m15/m15InnerCrownGNyx.png differ diff --git a/data/images/m15/m15InnerCrownMNyx.png b/data/images/m15/m15InnerCrownMNyx.png new file mode 100644 index 00000000..57733814 Binary files /dev/null and b/data/images/m15/m15InnerCrownMNyx.png differ diff --git a/data/images/m15/m15InnerCrownRNyx.png b/data/images/m15/m15InnerCrownRNyx.png new file mode 100644 index 00000000..8073167b Binary files /dev/null and b/data/images/m15/m15InnerCrownRNyx.png differ diff --git a/data/images/m15/m15InnerCrownUNyx.png b/data/images/m15/m15InnerCrownUNyx.png new file mode 100644 index 00000000..85728f19 Binary files /dev/null and b/data/images/m15/m15InnerCrownUNyx.png differ diff --git a/data/images/m15/m15InnerCrownWNyx.png b/data/images/m15/m15InnerCrownWNyx.png new file mode 100644 index 00000000..06f0c8d0 Binary files /dev/null and b/data/images/m15/m15InnerCrownWNyx.png differ diff --git a/data/images/m15/m15LegendCrownBorderCover.png b/data/images/m15/m15LegendCrownBorderCover.png index 27eac41b..e51a19e4 100644 Binary files a/data/images/m15/m15LegendCrownBorderCover.png and b/data/images/m15/m15LegendCrownBorderCover.png differ diff --git a/data/images/m15/m15MaskBorder.png b/data/images/m15/m15MaskBorder.png index d04411e9..36e96db9 100644 Binary files a/data/images/m15/m15MaskBorder.png and b/data/images/m15/m15MaskBorder.png differ diff --git a/data/images/m15/m15MaskFrame.png b/data/images/m15/m15MaskFrame.png index 074f3742..6863cfeb 100644 Binary files a/data/images/m15/m15MaskFrame.png and b/data/images/m15/m15MaskFrame.png differ diff --git a/data/images/m15/m15MaskLegendCrown.png b/data/images/m15/m15MaskLegendCrown.png index 0cbf66a6..43fe2d97 100644 Binary files a/data/images/m15/m15MaskLegendCrown.png and b/data/images/m15/m15MaskLegendCrown.png differ diff --git a/data/images/m15/m15MaskLegendCrownPinline.png b/data/images/m15/m15MaskLegendCrownPinline.png index ce2c1774..955baf1a 100644 Binary files a/data/images/m15/m15MaskLegendCrownPinline.png and b/data/images/m15/m15MaskLegendCrownPinline.png differ diff --git a/data/images/m15/m15MaskNicknameLegendCrownStrokeless.png b/data/images/m15/m15MaskNicknameLegendCrownStrokeless.png new file mode 100644 index 00000000..fd3fa2bc Binary files /dev/null and b/data/images/m15/m15MaskNicknameLegendCrownStrokeless.png differ diff --git a/data/images/m15/m15MaskNyxCrown.png b/data/images/m15/m15MaskNyxCrown.png deleted file mode 100644 index f936b7dd..00000000 Binary files a/data/images/m15/m15MaskNyxCrown.png and /dev/null differ diff --git a/data/images/m15/m15MaskNyxCrownInner.png b/data/images/m15/m15MaskNyxCrownInner.png deleted file mode 100644 index 31f0e9dd..00000000 Binary files a/data/images/m15/m15MaskNyxCrownInner.png and /dev/null differ diff --git a/data/images/m15/m15MaskNyxCrownOuter.png b/data/images/m15/m15MaskNyxCrownOuter.png deleted file mode 100644 index 6b1d2485..00000000 Binary files a/data/images/m15/m15MaskNyxCrownOuter.png and /dev/null differ diff --git a/data/images/m15/m15MaskNyxCrownShadowless.png b/data/images/m15/m15MaskNyxCrownShadowless.png deleted file mode 100644 index 5b6ca12f..00000000 Binary files a/data/images/m15/m15MaskNyxCrownShadowless.png and /dev/null differ diff --git a/data/images/m15/m15MaskPinline.png b/data/images/m15/m15MaskPinline.png index 0b07d060..427ce7a8 100644 Binary files a/data/images/m15/m15MaskPinline.png and b/data/images/m15/m15MaskPinline.png differ diff --git a/data/images/m15/m15MaskPinlineSuper.png b/data/images/m15/m15MaskPinlineSuper.png index ca02274b..7467f505 100644 Binary files a/data/images/m15/m15MaskPinlineSuper.png and b/data/images/m15/m15MaskPinlineSuper.png differ diff --git a/data/images/m15/m15MaskRules.png b/data/images/m15/m15MaskRules.png index 68467c1e..b939230e 100644 Binary files a/data/images/m15/m15MaskRules.png and b/data/images/m15/m15MaskRules.png differ diff --git a/data/images/m15/m15MaskTitle.png b/data/images/m15/m15MaskTitle.png index 1549f111..1d8684aa 100644 Binary files a/data/images/m15/m15MaskTitle.png and b/data/images/m15/m15MaskTitle.png differ diff --git a/data/images/m15/m15MaskType.png b/data/images/m15/m15MaskType.png index eb67dbb1..50f3a328 100644 Binary files a/data/images/m15/m15MaskType.png and b/data/images/m15/m15MaskType.png differ diff --git a/data/images/m15/m15Midnight.png b/data/images/m15/m15Midnight.png index a0d9ae21..96dc4e71 100644 Binary files a/data/images/m15/m15Midnight.png and b/data/images/m15/m15Midnight.png differ diff --git a/data/images/m15/m15NicknameCrownA.png b/data/images/m15/m15NicknameCrownA.png new file mode 100644 index 00000000..b4745126 Binary files /dev/null and b/data/images/m15/m15NicknameCrownA.png differ diff --git a/data/images/m15/m15NicknameCrownB.png b/data/images/m15/m15NicknameCrownB.png new file mode 100644 index 00000000..9a43278d Binary files /dev/null and b/data/images/m15/m15NicknameCrownB.png differ diff --git a/data/images/m15/m15NicknameCrownG.png b/data/images/m15/m15NicknameCrownG.png new file mode 100644 index 00000000..8ec33e2d Binary files /dev/null and b/data/images/m15/m15NicknameCrownG.png differ diff --git a/data/images/m15/m15NicknameCrownL.png b/data/images/m15/m15NicknameCrownL.png new file mode 100644 index 00000000..dfb9fff2 Binary files /dev/null and b/data/images/m15/m15NicknameCrownL.png differ diff --git a/data/images/m15/m15NicknameCrownM.png b/data/images/m15/m15NicknameCrownM.png new file mode 100644 index 00000000..9bb5c3dd Binary files /dev/null and b/data/images/m15/m15NicknameCrownM.png differ diff --git a/data/images/m15/m15NicknameCrownR.png b/data/images/m15/m15NicknameCrownR.png new file mode 100644 index 00000000..693374a2 Binary files /dev/null and b/data/images/m15/m15NicknameCrownR.png differ diff --git a/data/images/m15/m15NicknameCrownU.png b/data/images/m15/m15NicknameCrownU.png new file mode 100644 index 00000000..848b0269 Binary files /dev/null and b/data/images/m15/m15NicknameCrownU.png differ diff --git a/data/images/m15/m15NicknameCrownW.png b/data/images/m15/m15NicknameCrownW.png new file mode 100644 index 00000000..ec84660e Binary files /dev/null and b/data/images/m15/m15NicknameCrownW.png differ diff --git a/data/images/m15/m15NicknameFrameA.png b/data/images/m15/m15NicknameFrameA.png new file mode 100644 index 00000000..f2d4a92e Binary files /dev/null and b/data/images/m15/m15NicknameFrameA.png differ diff --git a/data/images/m15/m15NicknameFrameB.png b/data/images/m15/m15NicknameFrameB.png new file mode 100644 index 00000000..ab4693cd Binary files /dev/null and b/data/images/m15/m15NicknameFrameB.png differ diff --git a/data/images/m15/m15NicknameFrameG.png b/data/images/m15/m15NicknameFrameG.png new file mode 100644 index 00000000..e5f15cf7 Binary files /dev/null and b/data/images/m15/m15NicknameFrameG.png differ diff --git a/data/images/m15/m15NicknameFrameL.png b/data/images/m15/m15NicknameFrameL.png new file mode 100644 index 00000000..75ab5de2 Binary files /dev/null and b/data/images/m15/m15NicknameFrameL.png differ diff --git a/data/images/m15/m15NicknameFrameM.png b/data/images/m15/m15NicknameFrameM.png new file mode 100644 index 00000000..1daa946c Binary files /dev/null and b/data/images/m15/m15NicknameFrameM.png differ diff --git a/data/images/m15/m15NicknameFrameR.png b/data/images/m15/m15NicknameFrameR.png new file mode 100644 index 00000000..c4773faf Binary files /dev/null and b/data/images/m15/m15NicknameFrameR.png differ diff --git a/data/images/m15/m15NicknameFrameU.png b/data/images/m15/m15NicknameFrameU.png new file mode 100644 index 00000000..296cf760 Binary files /dev/null and b/data/images/m15/m15NicknameFrameU.png differ diff --git a/data/images/m15/m15NicknameFrameW.png b/data/images/m15/m15NicknameFrameW.png new file mode 100644 index 00000000..5d7e8dd5 Binary files /dev/null and b/data/images/m15/m15NicknameFrameW.png differ diff --git a/data/images/m15/m15NicknameTextboxes.png b/data/images/m15/m15NicknameTextboxes.png new file mode 100644 index 00000000..e12141a6 Binary files /dev/null and b/data/images/m15/m15NicknameTextboxes.png differ diff --git a/data/images/m15/m15PTA.png b/data/images/m15/m15PTA.png index 2d314bb3..4c249a65 100644 Binary files a/data/images/m15/m15PTA.png and b/data/images/m15/m15PTA.png differ diff --git a/data/images/m15/m15PTB.png b/data/images/m15/m15PTB.png index 5b803a77..16c03bb1 100644 Binary files a/data/images/m15/m15PTB.png and b/data/images/m15/m15PTB.png differ diff --git a/data/images/m15/m15PTG.png b/data/images/m15/m15PTG.png index 4bc9533f..fe539b9c 100644 Binary files a/data/images/m15/m15PTG.png and b/data/images/m15/m15PTG.png differ diff --git a/data/images/m15/m15PTM.png b/data/images/m15/m15PTM.png index 3a2fd8d6..867c9432 100644 Binary files a/data/images/m15/m15PTM.png and b/data/images/m15/m15PTM.png differ diff --git a/data/images/m15/m15PTR.png b/data/images/m15/m15PTR.png index 3c7e74ad..bfb942c6 100644 Binary files a/data/images/m15/m15PTR.png and b/data/images/m15/m15PTR.png differ diff --git a/data/images/m15/m15PTU.png b/data/images/m15/m15PTU.png index d111fbb6..62b519df 100644 Binary files a/data/images/m15/m15PTU.png and b/data/images/m15/m15PTU.png differ diff --git a/data/images/m15/m15PTW.png b/data/images/m15/m15PTW.png index 4cbfaca4..d039eaa8 100644 Binary files a/data/images/m15/m15PTW.png and b/data/images/m15/m15PTW.png differ diff --git a/data/scripts/main.js b/data/scripts/main.js index 72a3b6a2..ff60225e 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -387,12 +387,12 @@ function writeText(textObjectList, targetContext) { textParagraphCanvas.height = scaleY(textObjectList[i].height) + 2 * textCanvasBuffer textLineContext.clearRect(0, 0, textLineCanvas.width, textLineCanvas.height) textParagraphContext.clearRect(0, 0, textParagraphCanvas.width, textParagraphCanvas.height) - var outline, shadow = 0, oneLine = false, outlineThickness = 2, textAlign = 'left', finishLine = false, paragraphSpace = 0, permanentLineShift = 0, temporaryLineShift = 0 + var outline, shadow = 0, oneLine = false, outlineThickness = 2, textAlign = 'left', finishLine = false, paragraphSpace = 0, permanentLineShift = 0, temporaryLineShift = 0, fontStyle = '' textObjectList[i].otherParameters.forEach(item => eval(item)) textLineContext.strokeStyle = outline textLineContext.lineWidth = outlineThickness textFont = textObjectList[i].font - textLineContext.font = textSize + 'px ' + textFont + textLineContext.font = fontStyle + textSize + 'px ' + textFont textLineContext.fillStyle = textObjectList[i].fontColor var textX = textCanvasBuffer var textY = 0 @@ -416,16 +416,19 @@ function writeText(textObjectList, targetContext) { var barHeight = scaleY(0.001) textLineContext.drawImage(manaSymbolImageList[63], textCanvasBuffer + (scaleX(textObjectList[i].width) - barWidth) / 2, textSize * 1.6 + textCanvasBuffer, barWidth, barHeight) paragraphSpace += textSize * 0.8 - if (possibleCodeLower == 'flavor') { - textLineContext.font = 'italic ' + (textSize * 0.92) + 'px ' + textFont + if (possibleCodeLower == 'flavor' && !fontStyle.includes('italic')) { + fontStyle += 'italic ' + textLineContext.font = fontStyle + (textSize * 0.92) + 'px ' + textFont } - } else if (possibleCodeLower == 'i') { - textLineContext.font = 'italic ' + textSize + 'px ' + textFont + } else if (possibleCodeLower == 'i' && !fontStyle.includes('italic')) { + fontStyle += 'italic ' + textLineContext.font = fontStyle + textSize + 'px ' + textFont } else if (possibleCodeLower == '/i') { - textLineContext.font = textSize + 'px ' + textFont + fontStyle.replace('italic ', '') + textLineContext.font = fontStyle + textSize + 'px ' + textFont } else if (possibleCodeLower.includes('fontsize')) { textSize += parseInt(possibleCodeLower.slice(8, possibleCodeLower.length)) - textLineContext.font = textSize + 'px ' + textFont + textLineContext.font = fontStyle + textSize + 'px ' + textFont } else if (possibleCodeLower == 'left') { textAlign = 'left' } else if (possibleCodeLower == 'center') { @@ -476,7 +479,7 @@ function writeText(textObjectList, targetContext) { currentLineWidth += artistBrushWidth * 1.1 } else if (possibleCodeLower.includes('font')) { textFont = possibleCodeLower.replace('font', '') - textLineContext.font = textSize + 'px ' + textFont + textLineContext.font = fontStyle + textSize + 'px ' + textFont } else if (manaSymbolCodeList.includes(possibleCodeLower.split('/').join(''))) { //THIS HAS TO BE THE LAST ONE var manaSymbolDiameter = textSize * 0.77 diff --git a/data/scripts/versions/versionInvention.js b/data/scripts/versions/versionInvention.js index baf721b4..6b1a48ac 100644 --- a/data/scripts/versions/versionInvention.js +++ b/data/scripts/versions/versionInvention.js @@ -1,6 +1,6 @@ var versionInventionImageList = [ ['Invention Frame', 'data/images/invention/inventionFrame.png', 0, 0, 1, 1, ['Full', 'Pinline Super (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)']], -['Invention Power/Toughness', 'data/images/invention/inventionPT.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']] +['Invention Power/Toughness', 'data/images/invention/inventionPT.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']] ] var versionInventionMaskList = [] @@ -17,16 +17,16 @@ if (currentVersion != 'invention') { hideFrameImages('frameClassM15') loadTextOptions([ - new cardText('Card Title', '', 126/1500, 187/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), - new cardText('Card Type', '', 126/1500, 1263/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), - new cardText('Rules Text', '', 135/1500, 1372/2100, 1230/1500, 624/2100, 'mplantin', 74/2100, 'black'), - new cardText('Power/Toughness', '', 1190/1500, 1950/2100, 210/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"']) + new cardText('Card Title', '', 126/1500, 188/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), + new cardText('Card Type', '', 126/1500, 1264/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), + new cardText('Rules Text', '', 135/1500, 1375/2100, 1230/1500, 625/2100, 'mplantin', 74/2100, 'black'), + new cardText('Power/Toughness', '', 1190/1500, 1957/2100, 205/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"']) ]) artX = scaleX(60/1500) artY = scaleY(60/2100) - artWidth = scaleX(1440/1500) - artHeight = scaleY(1888/2100) + artWidth = scaleX(1381/1500) + artHeight = scaleY(1876/2100) manaCostXPath = '1316 - 78 * manaSymbolIndex' manaCostYPath = '121' diff --git a/data/scripts/versions/versionM15.js b/data/scripts/versions/versionM15.js index a3ab2392..f0317a21 100644 --- a/data/scripts/versions/versionM15.js +++ b/data/scripts/versions/versionM15.js @@ -8,22 +8,22 @@ var versionM15ImageList = [ ['Artifact Frame', 'data/images/m15/m15FrameA.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)', 'Pinline Super (m15)']], ['Vehicle Frame', 'data/images/m15/m15FrameV.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)', 'Pinline Super (m15)']], ['Land Frame', 'data/images/m15/m15FrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)', 'Pinline Super (m15)']], -['White Power/Toughness', 'data/images/m15/m15PTW.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['Blue Power/Toughness', 'data/images/m15/m15PTU.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['Black Power/Toughness', 'data/images/m15/m15PTB.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['Red Power/Toughness', 'data/images/m15/m15PTR.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['Green Power/Toughness', 'data/images/m15/m15PTG.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['Multicolored Power/Toughness', 'data/images/m15/m15PTM.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['Artifact Power/Toughness', 'data/images/m15/m15PTA.png', 1142/1500, 1856/2100, 287/1500, 157/2100, ['Full']], -['White Legend Crown', 'data/images/m15/m15CrownW.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Blue Legend Crown', 'data/images/m15/m15CrownU.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Black Legend Crown', 'data/images/m15/m15CrownB.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Red Legend Crown', 'data/images/m15/m15CrownR.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Green Legend Crown', 'data/images/m15/m15CrownG.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Multicolored Legend Crown', 'data/images/m15/m15CrownM.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Artifact Legend Crown', 'data/images/m15/m15CrownA.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Land Legend Crown', 'data/images/m15/m15CrownL.png', 38/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], -['Legend Crown Border Cover', 'data/images/m15/m15LegendCrownBorderCover.png', 0, 0, 1, 1, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['White Power/Toughness', 'data/images/m15/m15PTW.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['Blue Power/Toughness', 'data/images/m15/m15PTU.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['Black Power/Toughness', 'data/images/m15/m15PTB.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['Red Power/Toughness', 'data/images/m15/m15PTR.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['Green Power/Toughness', 'data/images/m15/m15PTG.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['Multicolored Power/Toughness', 'data/images/m15/m15PTM.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['Artifact Power/Toughness', 'data/images/m15/m15PTA.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], +['White Legend Crown', 'data/images/m15/m15CrownW.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Blue Legend Crown', 'data/images/m15/m15CrownU.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Black Legend Crown', 'data/images/m15/m15CrownB.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Red Legend Crown', 'data/images/m15/m15CrownR.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Green Legend Crown', 'data/images/m15/m15CrownG.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Multicolored Legend Crown', 'data/images/m15/m15CrownM.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Artifact Legend Crown', 'data/images/m15/m15CrownA.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Land Legend Crown', 'data/images/m15/m15CrownL.png', 41/1500, 40/2100, 1418/1500, 350/2100, ['Full', 'Legend Crown (m15)', 'Legend Crown W/ Pinline (m15)']], +['Legend Crown Border Cover', 'data/images/m15/m15LegendCrownBorderCover.png', 0, 0, 1, 1, ['Full']], ['Midnight Frame', 'data/images/m15/m15Midnight.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)']] ] @@ -41,16 +41,16 @@ if (currentVersion != 'm15') { hideFrameImages('frameClassM15') loadTextOptions([ - new cardText('Card Title', '', 126/1500, 187/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), - new cardText('Card Type', '', 126/1500, 1263/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), - new cardText('Rules Text', '', 135/1500, 1372/2100, 1230/1500, 624/2100, 'mplantin', 74/2100, 'black'), - new cardText('Power/Toughness', '', 1190/1500, 1950/2100, 210/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"']) + new cardText('Card Title', '', 126/1500, 188/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), + new cardText('Card Type', '', 126/1500, 1264/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), + new cardText('Rules Text', '', 135/1500, 1375/2100, 1230/1500, 625/2100, 'mplantin', 74/2100, 'black'), + new cardText('Power/Toughness', '', 1190/1500, 1957/2100, 205/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"']) ]) - artX = scaleX(111 / 1500) - artY = scaleY(233 / 2100) - artWidth = scaleX(1278 / 1500) - artHeight = scaleY(936 / 2100) + artX = scaleX(115 / 1500) + artY = scaleY(237 / 2100) + artWidth = scaleX(1270 / 1500) + artHeight = scaleY(929 / 2100) manaCostXPath = '1316 - 78 * manaSymbolIndex' manaCostYPath = '121' diff --git a/data/scripts/versions/versionM15Nickname.js b/data/scripts/versions/versionM15Nickname.js new file mode 100644 index 00000000..228f5d44 --- /dev/null +++ b/data/scripts/versions/versionM15Nickname.js @@ -0,0 +1,66 @@ +var versionM15NicknameImageList = [ +['Base Nickname Frame', 'data/images/m15/m15NicknameTextboxes.png', 0, 0, 1, 1, ['Full', 'Title (m15)', 'Type (m15)', 'Rules (m15)']], +['White Nickname Frame', 'data/images/m15/m15NicknameFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Blue Nickname Frame', 'data/images/m15/m15NicknameFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Black Nickname Frame', 'data/images/m15/m15NicknameFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Red Nickname Frame', 'data/images/m15/m15NicknameFrameR.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Green Nickname Frame', 'data/images/m15/m15NicknameFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Multicolored Nickname Frame', 'data/images/m15/m15NicknameFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Artifact Nickname Frame', 'data/images/m15/m15NicknameFrameA.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['Land Nickname Frame', 'data/images/m15/m15NicknameFrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], +['White Nickname Legend Crown', 'data/images/m15/m15NicknameCrownW.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Blue Nickname Legend Crown', 'data/images/m15/m15NicknameCrownU.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Black Nickname Legend Crown', 'data/images/m15/m15NicknameCrownB.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Red Nickname Legend Crown', 'data/images/m15/m15NicknameCrownR.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Green Nickname Legend Crown', 'data/images/m15/m15NicknameCrownG.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Multicolored Nickname Legend Crown', 'data/images/m15/m15NicknameCrownM.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Artifact Nickname Legend Crown', 'data/images/m15/m15NicknameCrownA.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']], +['Land Nickname Legend Crown', 'data/images/m15/m15NicknameCrownL.png', 36/1500, 36/2100, 1428/1500, 270/2100, ['Full', 'Nickname Legend Crown (m15)']] +] + +var versionM15NicknameMaskList = [['Nickname Legend Crown (m15)', 'data/images/m15/m15MaskNicknameLegendCrownStrokeless.png']] + +if (!loadedVersions.includes('m15Nickname')) { + loadedVersions.push("m15Nickname") + loadMaskImages(versionM15NicknameMaskList) + loadFrameImages(versionM15NicknameImageList, 'frameClassM15') +} + +if (currentVersion != 'm15Nickname') { + currentVersion = 'm15Nickname' + + hideFrameImages('frameClassM15') + + loadTextOptions([ + new cardText('Card Nickname', '', 126/1500, 188/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'white', ['oneLine=true']), + new cardText('Card Title', '', 210/1500, 276/2100, 1080/1500, 48/2100, 'belerenb', 48/2100, 'white', ['oneLine=true', 'textAlign="center"', 'fontStyle="italic "']), + new cardText('Card Type', '', 126/1500, 1264/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'white', ['oneLine=true']), + new cardText('Rules Text', '', 135/1500, 1375/2100, 1230/1500, 625/2100, 'mplantin', 74/2100, 'white'), + new cardText('Power/Toughness', '', 1190/1500, 1957/2100, 205/1500, 78/2100, 'belerenbsc', 78/2100, 'white', ['oneLine=true,textAlign="center"']) + ]) + + artX = 0 + artY = 0 + artWidth = scaleX(1) + artHeight = scaleY(1936 / 2100) + + manaCostXPath = '1316 - 78 * manaSymbolIndex' + manaCostYPath = '121' + manaCostDiameter = '70' + manaCostShadowOffset = '[-2, 6]' + manaCostDirection = 'reverse' + + setSymbolX = [scaleX(1382/1500), 'right'] + setSymbolY = [scaleY(1240/2100), 'center'] + setSymbolWidth = scaleX(180/1500) + setSymbolHeight = scaleY(80/2100) + + watermarkX = scaleX(0.5) + watermarkY = scaleY(1630/2100) + watermarkWidth = scaleX(1140/1500) + watermarkHeight = scaleY(484/2100) + + bottomInfoFunction = 'bottomInfoM15' + + bottomInfoUpdated() +} \ No newline at end of file diff --git a/data/scripts/versions/versionM15Nyx.js b/data/scripts/versions/versionM15Nyx.js index fada4f7c..a0a5b087 100644 --- a/data/scripts/versions/versionM15Nyx.js +++ b/data/scripts/versions/versionM15Nyx.js @@ -6,19 +6,20 @@ var versionM15NyxImageList = [ ['Green Nyx Frame', 'data/images/m15/m15FrameGNyx.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)', 'Pinline Super (m15)']], ['Multicolored Nyx Frame', 'data/images/m15/m15FrameMNyx.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)', 'Pinline Super (m15)']], ['Artifact Nyx Frame', 'data/images/m15/m15FrameANyx.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Frame (m15)', 'Border (m15)', 'Pinline Super (m15)']], -['White Nyx Legend Crown', 'data/images/m15/m15CrownWNyx.png', 39/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Nyx Crown (m15)', 'Nyx Crown Outer (m15)', 'Nyx Crown Inner (m15)', 'Nyx Crown Shadowless (m15)', 'Title (m15)']], -['Blue Nyx Legend Crown', 'data/images/m15/m15CrownUNyx.png', 39/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Nyx Crown (m15)', 'Nyx Crown Outer (m15)', 'Nyx Crown Inner (m15)', 'Nyx Crown Shadowless (m15)', 'Title (m15)']], -['Black Nyx Legend Crown', 'data/images/m15/m15CrownBNyx.png', 39/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Nyx Crown (m15)', 'Nyx Crown Outer (m15)', 'Nyx Crown Inner (m15)', 'Nyx Crown Shadowless (m15)', 'Title (m15)']], -['Red Nyx Legend Crown', 'data/images/m15/m15CrownRNyx.png', 39/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Nyx Crown (m15)', 'Nyx Crown Outer (m15)', 'Nyx Crown Inner (m15)', 'Nyx Crown Shadowless (m15)', 'Title (m15)']], -['Green Nyx Legend Crown', 'data/images/m15/m15CrownGNyx.png', 39/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Nyx Crown (m15)', 'Nyx Crown Outer (m15)', 'Nyx Crown Inner (m15)', 'Nyx Crown Shadowless (m15)', 'Title (m15)']], -['Multicolored Nyx Legend Crown', 'data/images/m15/m15CrownMNyx.png', 39/1500, 29/2100, 1422/1500, 341/2100, ['Full', 'Nyx Crown (m15)', 'Nyx Crown Outer (m15)', 'Nyx Crown Inner (m15)', 'Nyx Crown Shadowless (m15)', 'Title (m15)']] +['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']] ] -var versionM15NyxMaskList = [['Nyx Crown (m15)', 'data/images/m15/m15MaskNyxCrown.png'], ['Nyx Crown Outer (m15)', 'data/images/m15/m15MaskNyxCrownOuter.png'], ['Nyx Crown Inner (m15)', 'data/images/m15/m15MaskNyxCrownInner.png'], ['Nyx Crown Shadowless (m15)', 'data/images/m15/m15MaskNyxCrownShadowless.png']] +var versionM15NyxMaskList = [] if (!loadedVersions.includes('m15Nyx')) { loadedVersions.push("m15Nyx") - loadMaskImages(versionM15NyxMaskList) + // loadMaskImages(versionM15NyxMaskList) loadFrameImages(versionM15NyxImageList, 'frameClassM15') } @@ -28,16 +29,16 @@ if (currentVersion != 'm15') { hideFrameImages('frameClassM15') loadTextOptions([ - new cardText('Card Title', '', 126/1500, 187/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), - new cardText('Card Type', '', 126/1500, 1263/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), - new cardText('Rules Text', '', 135/1500, 1372/2100, 1230/1500, 624/2100, 'mplantin', 74/2100, 'black'), - new cardText('Power/Toughness', '', 1190/1500, 1950/2100, 210/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"']) + new cardText('Card Title', '', 126/1500, 188/2100, 1248/1500, 80/2100, 'belerenb', 80/2100, 'black', ['oneLine=true']), + new cardText('Card Type', '', 126/1500, 1264/2100, 1248/1500, 68/2100, 'belerenb', 68/2100, 'black', ['oneLine=true']), + new cardText('Rules Text', '', 135/1500, 1375/2100, 1230/1500, 625/2100, 'mplantin', 74/2100, 'black'), + new cardText('Power/Toughness', '', 1190/1500, 1957/2100, 205/1500, 78/2100, 'belerenbsc', 78/2100, 'black', ['oneLine=true,textAlign="center"']) ]) - artX = scaleX(111 / 1500) - artY = scaleY(233 / 2100) - artWidth = scaleX(1278 / 1500) - artHeight = scaleY(936 / 2100) + artX = scaleX(115 / 1500) + artY = scaleY(237 / 2100) + artWidth = scaleX(1270 / 1500) + artHeight = scaleY(929 / 2100) manaCostXPath = '1316 - 78 * manaSymbolIndex' manaCostYPath = '121' diff --git a/index.html b/index.html index 47c3607e..a5fcc69c 100644 --- a/index.html +++ b/index.html @@ -157,6 +157,7 @@