diff --git a/data/borders/m15/artifact/stamp.png b/data/borders/m15/artifact/stamp.png index e7332402..99a1fb1d 100644 Binary files a/data/borders/m15/artifact/stamp.png and b/data/borders/m15/artifact/stamp.png differ diff --git a/data/borders/m15/black/stamp.png b/data/borders/m15/black/stamp.png index 970d9ebd..eb8a2458 100644 Binary files a/data/borders/m15/black/stamp.png and b/data/borders/m15/black/stamp.png differ diff --git a/data/borders/m15/blackLand/stamp.png b/data/borders/m15/blackLand/stamp.png index 7326fbd5..eb8a2458 100644 Binary files a/data/borders/m15/blackLand/stamp.png and b/data/borders/m15/blackLand/stamp.png differ diff --git a/data/borders/m15/blue/stamp.png b/data/borders/m15/blue/stamp.png index 446d9476..f7ea61ae 100644 Binary files a/data/borders/m15/blue/stamp.png and b/data/borders/m15/blue/stamp.png differ diff --git a/data/borders/m15/blueLand/stamp.png b/data/borders/m15/blueLand/stamp.png index 7a4af91c..f7ea61ae 100644 Binary files a/data/borders/m15/blueLand/stamp.png and b/data/borders/m15/blueLand/stamp.png differ diff --git a/data/borders/m15/colorless/stamp.png b/data/borders/m15/colorless/stamp.png index 23d1b970..ca5bfbfd 100644 Binary files a/data/borders/m15/colorless/stamp.png and b/data/borders/m15/colorless/stamp.png differ diff --git a/data/borders/m15/colorlessLand/stamp.png b/data/borders/m15/colorlessLand/stamp.png index 89b7c03b..ca5bfbfd 100644 Binary files a/data/borders/m15/colorlessLand/stamp.png and b/data/borders/m15/colorlessLand/stamp.png differ diff --git a/data/borders/m15/gold/stamp.png b/data/borders/m15/gold/stamp.png index 30c05e99..63313a57 100644 Binary files a/data/borders/m15/gold/stamp.png and b/data/borders/m15/gold/stamp.png differ diff --git a/data/borders/m15/goldLand/stamp.png b/data/borders/m15/goldLand/stamp.png index 17bbc73e..63313a57 100644 Binary files a/data/borders/m15/goldLand/stamp.png and b/data/borders/m15/goldLand/stamp.png differ diff --git a/data/borders/m15/green/stamp.png b/data/borders/m15/green/stamp.png index 4911100b..3e4cd6cd 100644 Binary files a/data/borders/m15/green/stamp.png and b/data/borders/m15/green/stamp.png differ diff --git a/data/borders/m15/greenLand/stamp.png b/data/borders/m15/greenLand/stamp.png index 4424256a..3e4cd6cd 100644 Binary files a/data/borders/m15/greenLand/stamp.png and b/data/borders/m15/greenLand/stamp.png differ diff --git a/data/borders/m15/red/stamp.png b/data/borders/m15/red/stamp.png index 20ba3c26..3430bf60 100644 Binary files a/data/borders/m15/red/stamp.png and b/data/borders/m15/red/stamp.png differ diff --git a/data/borders/m15/redLand/stamp.png b/data/borders/m15/redLand/stamp.png index fad08023..3430bf60 100644 Binary files a/data/borders/m15/redLand/stamp.png and b/data/borders/m15/redLand/stamp.png differ diff --git a/data/borders/m15/vehicle/stamp.png b/data/borders/m15/vehicle/stamp.png index e7332402..99a1fb1d 100644 Binary files a/data/borders/m15/vehicle/stamp.png and b/data/borders/m15/vehicle/stamp.png differ diff --git a/data/borders/m15/white/stamp.png b/data/borders/m15/white/stamp.png index 313138ba..bd677a7d 100644 Binary files a/data/borders/m15/white/stamp.png and b/data/borders/m15/white/stamp.png differ diff --git a/data/borders/m15/whiteLand/stamp.png b/data/borders/m15/whiteLand/stamp.png index 8f1f9eb0..bd677a7d 100644 Binary files a/data/borders/m15/whiteLand/stamp.png and b/data/borders/m15/whiteLand/stamp.png differ diff --git a/data/borders/map/border.js b/data/borders/map/border.js index 9e580137..de741921 100644 --- a/data/borders/map/border.js +++ b/data/borders/map/border.js @@ -25,9 +25,9 @@ var textWidth = 660 //Power Toughness var ptFont = "32px belerenb" var ptFontSpacing = "0.3px" -var ptTextX = 374.5 +var ptTextX = 635 var ptTextY = 933 -var ptX = 300 +var ptX = 560 var ptY = 920 var ptWidth = 150 var ptHeight = 70 diff --git a/index.html b/index.html index 09deb657..5def045f 100644 --- a/index.html +++ b/index.html @@ -758,7 +758,10 @@ function createBorder() { } } //MIRACLE - if (document.getElementById("checkboxMiracle").checked == true && miracleBorder == true) { + if (document.getElementById("checkboxMiracle").checked == true && miracleBorder == true && (document.getElementById("checkboxFlippedDark").checked == false || flipBorder == false)) { + if (document.getElementById("checkboxFlippedDark").checked == true) { + alert("hmmm") + } if (thirdColor == true) { drawMask(imgBorderMiracle, 0, 0, cardWidth, cardHeight, border, imgFrameMask, false, false) } else { @@ -793,7 +796,18 @@ function createBorder() { } } } - if (document.getElementById("checkboxFlipIcon").checked == true) { + //redraws the miracle border if required to match with the newer darker overlay + if (document.getElementById("checkboxMiracle").checked == true && miracleBorder == true && (document.getElementById("checkboxLegendary").checked == false || legendaryBorder == false)) { + if (thirdColor == true) { + drawMask(imgBorderMiracle, 0, 0, cardWidth, cardHeight, border, imgFrameMask, false, false) + } else { + drawMask(imgBorderMiracle, 0, 0, cardWidth, cardHeight, border, imgFrameMask, false, false) + if (secondColor == true) { + drawMask(imgSecondBorderMiracle, 0, 0, cardWidth, cardHeight, border, imgFrameMask, imgMultiGradient, "reverseSecond") + } + } + } + if (document.getElementById("checkboxFlipIcon").checked == true || document.getElementById("checkboxFlippedDark").checked == true) { border.drawImage(imgBorderFlipCircle, 0, 0, cardWidth, cardHeight) border.drawImage(imgBorderFlipIcon, 39, 51, 60, 60) } @@ -975,6 +989,9 @@ function writeText() { card.fillText(document.getElementById("inputType").value, typeX + typeRightShift, typeY) //Power/Toughness if (document.getElementById("checkboxCreature").checked == true && creatureBorder == true) { + if (imgBorderCreature.src.substr(imgBorderCreature.src.length - 14) == "vehicle/pt.png") { + card.fillStyle = "White" + } card.textAlign = "center" card.drawImage(imgBorderCreature, ptX, ptY, ptWidth, ptHeight) canvas.style.letterSpacing = ptFontSpacing