diff --git a/data/borders/m15/artifact/darkmiracle.png b/data/borders/m15/artifact/darkmiracle.png index ff7e1cee..2380e626 100644 Binary files a/data/borders/m15/artifact/darkmiracle.png and b/data/borders/m15/artifact/darkmiracle.png differ diff --git a/data/borders/m15/artifact/flipCircle.png b/data/borders/m15/artifact/flipCircle.png index 2276f753..af3a0d2a 100644 Binary files a/data/borders/m15/artifact/flipCircle.png and b/data/borders/m15/artifact/flipCircle.png differ diff --git a/data/borders/m15/artifact/flipTip.png b/data/borders/m15/artifact/flipTip.png index c81eaf8f..279dd50c 100644 Binary files a/data/borders/m15/artifact/flipTip.png and b/data/borders/m15/artifact/flipTip.png differ diff --git a/data/borders/m15/artifact/flippedDark.png b/data/borders/m15/artifact/flippedDark.png index ba8aea0e..8c93c024 100644 Binary files a/data/borders/m15/artifact/flippedDark.png and b/data/borders/m15/artifact/flippedDark.png differ diff --git a/data/borders/m15/artifact/legendary.png b/data/borders/m15/artifact/legendary.png index e4a7909f..988f7c73 100644 Binary files a/data/borders/m15/artifact/legendary.png and b/data/borders/m15/artifact/legendary.png differ diff --git a/data/borders/m15/artifact/miracle.png b/data/borders/m15/artifact/miracle.png index 9cb32fb5..730d5013 100644 Binary files a/data/borders/m15/artifact/miracle.png and b/data/borders/m15/artifact/miracle.png differ diff --git a/data/borders/m15/artifact/nyx.png b/data/borders/m15/artifact/nyx.png index 594ebc8d..22a2b300 100644 Binary files a/data/borders/m15/artifact/nyx.png and b/data/borders/m15/artifact/nyx.png differ diff --git a/data/borders/m15/black/darkmiracle.png b/data/borders/m15/black/darkmiracle.png index b1ac5c60..d03807c8 100644 Binary files a/data/borders/m15/black/darkmiracle.png and b/data/borders/m15/black/darkmiracle.png differ diff --git a/data/borders/m15/black/flipCircle.png b/data/borders/m15/black/flipCircle.png index 6da1fe86..7f191549 100644 Binary files a/data/borders/m15/black/flipCircle.png and b/data/borders/m15/black/flipCircle.png differ diff --git a/data/borders/m15/black/flipTip.png b/data/borders/m15/black/flipTip.png index 24533114..5e85eb26 100644 Binary files a/data/borders/m15/black/flipTip.png and b/data/borders/m15/black/flipTip.png differ diff --git a/data/borders/m15/black/flippedDark.png b/data/borders/m15/black/flippedDark.png index e45587c8..cbeca040 100644 Binary files a/data/borders/m15/black/flippedDark.png and b/data/borders/m15/black/flippedDark.png differ diff --git a/data/borders/m15/black/legendary.png b/data/borders/m15/black/legendary.png index 17481246..282b3ba0 100644 Binary files a/data/borders/m15/black/legendary.png and b/data/borders/m15/black/legendary.png differ diff --git a/data/borders/m15/black/miracle.png b/data/borders/m15/black/miracle.png index 15a417ca..cdba9415 100644 Binary files a/data/borders/m15/black/miracle.png and b/data/borders/m15/black/miracle.png differ diff --git a/data/borders/m15/black/nyx.png b/data/borders/m15/black/nyx.png index 7dfa00fa..b8a6cac7 100644 Binary files a/data/borders/m15/black/nyx.png and b/data/borders/m15/black/nyx.png differ diff --git a/data/borders/m15/blackLand/darkmiracle.png b/data/borders/m15/blackLand/darkmiracle.png index b1ac5c60..c563381b 100644 Binary files a/data/borders/m15/blackLand/darkmiracle.png and b/data/borders/m15/blackLand/darkmiracle.png differ diff --git a/data/borders/m15/blackLand/flipCircle.png b/data/borders/m15/blackLand/flipCircle.png index 6da1fe86..c578f0d5 100644 Binary files a/data/borders/m15/blackLand/flipCircle.png and b/data/borders/m15/blackLand/flipCircle.png differ diff --git a/data/borders/m15/blackLand/flipTip.png b/data/borders/m15/blackLand/flipTip.png index b257d684..40fad918 100644 Binary files a/data/borders/m15/blackLand/flipTip.png and b/data/borders/m15/blackLand/flipTip.png differ diff --git a/data/borders/m15/blackLand/flippedDark.png b/data/borders/m15/blackLand/flippedDark.png index 48176e7f..7a4f639a 100644 Binary files a/data/borders/m15/blackLand/flippedDark.png and b/data/borders/m15/blackLand/flippedDark.png differ diff --git a/data/borders/m15/blackLand/legendary.png b/data/borders/m15/blackLand/legendary.png index 17481246..93738efb 100644 Binary files a/data/borders/m15/blackLand/legendary.png and b/data/borders/m15/blackLand/legendary.png differ diff --git a/data/borders/m15/blackLand/miracle.png b/data/borders/m15/blackLand/miracle.png index 15a417ca..5855c9aa 100644 Binary files a/data/borders/m15/blackLand/miracle.png and b/data/borders/m15/blackLand/miracle.png differ diff --git a/data/borders/m15/blackLand/nyx.png b/data/borders/m15/blackLand/nyx.png index ba0fe826..5cf62019 100644 Binary files a/data/borders/m15/blackLand/nyx.png and b/data/borders/m15/blackLand/nyx.png differ diff --git a/data/borders/m15/blue/darkmiracle.png b/data/borders/m15/blue/darkmiracle.png index 034a6d9c..bc440252 100644 Binary files a/data/borders/m15/blue/darkmiracle.png and b/data/borders/m15/blue/darkmiracle.png differ diff --git a/data/borders/m15/blue/flipCircle.png b/data/borders/m15/blue/flipCircle.png index 4e0f49ea..775d2fc6 100644 Binary files a/data/borders/m15/blue/flipCircle.png and b/data/borders/m15/blue/flipCircle.png differ diff --git a/data/borders/m15/blue/flipTip.png b/data/borders/m15/blue/flipTip.png index 32b10384..ae2e90c1 100644 Binary files a/data/borders/m15/blue/flipTip.png and b/data/borders/m15/blue/flipTip.png differ diff --git a/data/borders/m15/blue/flippedDark.png b/data/borders/m15/blue/flippedDark.png index f755f502..fd88a8db 100644 Binary files a/data/borders/m15/blue/flippedDark.png and b/data/borders/m15/blue/flippedDark.png differ diff --git a/data/borders/m15/blue/legendary.png b/data/borders/m15/blue/legendary.png index bf63f21c..c4014aba 100644 Binary files a/data/borders/m15/blue/legendary.png and b/data/borders/m15/blue/legendary.png differ diff --git a/data/borders/m15/blue/miracle.png b/data/borders/m15/blue/miracle.png index 19c366f5..a6e8603d 100644 Binary files a/data/borders/m15/blue/miracle.png and b/data/borders/m15/blue/miracle.png differ diff --git a/data/borders/m15/blue/nyx.png b/data/borders/m15/blue/nyx.png index fbd004f6..06f224d0 100644 Binary files a/data/borders/m15/blue/nyx.png and b/data/borders/m15/blue/nyx.png differ diff --git a/data/borders/m15/blueLand/darkmiracle.png b/data/borders/m15/blueLand/darkmiracle.png index 034a6d9c..85e20b91 100644 Binary files a/data/borders/m15/blueLand/darkmiracle.png and b/data/borders/m15/blueLand/darkmiracle.png differ diff --git a/data/borders/m15/blueLand/flipCircle.png b/data/borders/m15/blueLand/flipCircle.png index 4e0f49ea..0cc4f064 100644 Binary files a/data/borders/m15/blueLand/flipCircle.png and b/data/borders/m15/blueLand/flipCircle.png differ diff --git a/data/borders/m15/blueLand/flipTip.png b/data/borders/m15/blueLand/flipTip.png index 047b705c..abbc5fca 100644 Binary files a/data/borders/m15/blueLand/flipTip.png and b/data/borders/m15/blueLand/flipTip.png differ diff --git a/data/borders/m15/blueLand/flippedDark.png b/data/borders/m15/blueLand/flippedDark.png index 139cb2f9..38c9d03a 100644 Binary files a/data/borders/m15/blueLand/flippedDark.png and b/data/borders/m15/blueLand/flippedDark.png differ diff --git a/data/borders/m15/blueLand/legendary.png b/data/borders/m15/blueLand/legendary.png index bf63f21c..f51705ae 100644 Binary files a/data/borders/m15/blueLand/legendary.png and b/data/borders/m15/blueLand/legendary.png differ diff --git a/data/borders/m15/blueLand/miracle.png b/data/borders/m15/blueLand/miracle.png index 19c366f5..f88ff474 100644 Binary files a/data/borders/m15/blueLand/miracle.png and b/data/borders/m15/blueLand/miracle.png differ diff --git a/data/borders/m15/blueLand/nyx.png b/data/borders/m15/blueLand/nyx.png index 3c9aa07e..dc16994b 100644 Binary files a/data/borders/m15/blueLand/nyx.png and b/data/borders/m15/blueLand/nyx.png differ diff --git a/data/borders/m15/border.js b/data/borders/m15/border.js index 28ad2a50..44644a6b 100644 --- a/data/borders/m15/border.js +++ b/data/borders/m15/border.js @@ -31,10 +31,7 @@ var ptFont = "39px belerenb" //39 var ptFontSpacing = "0.3px" //0.3 var ptTextX = 645 //645 var ptTextY = 936 //936 -var ptX = 571 //571 -var ptY = 929 //929 -var ptWidth = 137 //137 -var ptHeight = 75 //75 +imgBorderCreature.imgValues(571, 929, 137, 75) //Bottom Info var infoY = 993 //993 //Set Symbol @@ -48,6 +45,13 @@ var watermarkHeight = 250 //250 var watermarkY = 805 //805 //Rare Stamp var rareStampY = 958 //958 +//imgValues +imgBorderMiracle.imgValues(30, 30, 689, 511, "imgSecondBorderMiracle") +imgBorderFlipCircle.imgValues(26, 44, 78, 71) +imgBorderFlippedDark.imgValues(44, 50, 661, 915, "imgSecondBorderFlippedDark") +imgBorderFlipTip.imgValues(685, 877, 36, 48) +imgBorderNyx.imgValues(30, 30, 690, 586, "imgSecondBorderNyx") +imgBorderLegendary.imgValues(20, 20, 714, 186, "imgSecondBorderLegendary") //Color Options loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black-Black,blackLand-Black Land,red-Red,redLand-Red Land,green-Green,greenLand-Green Land,gold-Gold,goldLand-Gold Land,colorless-Colorless,colorlessLand-Colorless Land,artifact-Artifact,vehicle-Vehicle") document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML diff --git a/data/borders/m15/colorless/darkmiracle.png b/data/borders/m15/colorless/darkmiracle.png index 9a67907d..767d7f8e 100644 Binary files a/data/borders/m15/colorless/darkmiracle.png and b/data/borders/m15/colorless/darkmiracle.png differ diff --git a/data/borders/m15/colorless/flipCircle.png b/data/borders/m15/colorless/flipCircle.png index 53bb5a53..19e286a6 100644 Binary files a/data/borders/m15/colorless/flipCircle.png and b/data/borders/m15/colorless/flipCircle.png differ diff --git a/data/borders/m15/colorless/flipTip.png b/data/borders/m15/colorless/flipTip.png index 2995c85a..d1b7f621 100644 Binary files a/data/borders/m15/colorless/flipTip.png and b/data/borders/m15/colorless/flipTip.png differ diff --git a/data/borders/m15/colorless/flippedDark.png b/data/borders/m15/colorless/flippedDark.png index c27ab477..61b3bfa4 100644 Binary files a/data/borders/m15/colorless/flippedDark.png and b/data/borders/m15/colorless/flippedDark.png differ diff --git a/data/borders/m15/colorless/legendary.png b/data/borders/m15/colorless/legendary.png index 6dc978c1..ebddc01c 100644 Binary files a/data/borders/m15/colorless/legendary.png and b/data/borders/m15/colorless/legendary.png differ diff --git a/data/borders/m15/colorless/miracle.png b/data/borders/m15/colorless/miracle.png index 073e652b..56a495e3 100644 Binary files a/data/borders/m15/colorless/miracle.png and b/data/borders/m15/colorless/miracle.png differ diff --git a/data/borders/m15/colorless/nyx.png b/data/borders/m15/colorless/nyx.png index d5552afa..7b257a8d 100644 Binary files a/data/borders/m15/colorless/nyx.png and b/data/borders/m15/colorless/nyx.png differ diff --git a/data/borders/m15/colorlessLand/darkmiracle.png b/data/borders/m15/colorlessLand/darkmiracle.png index 9a67907d..2757f7a0 100644 Binary files a/data/borders/m15/colorlessLand/darkmiracle.png and b/data/borders/m15/colorlessLand/darkmiracle.png differ diff --git a/data/borders/m15/colorlessLand/flipCircle.png b/data/borders/m15/colorlessLand/flipCircle.png index 53bb5a53..54cfc73d 100644 Binary files a/data/borders/m15/colorlessLand/flipCircle.png and b/data/borders/m15/colorlessLand/flipCircle.png differ diff --git a/data/borders/m15/colorlessLand/flipTip.png b/data/borders/m15/colorlessLand/flipTip.png index bc441473..9b0b7d51 100644 Binary files a/data/borders/m15/colorlessLand/flipTip.png and b/data/borders/m15/colorlessLand/flipTip.png differ diff --git a/data/borders/m15/colorlessLand/flippedDark.png b/data/borders/m15/colorlessLand/flippedDark.png index 170d5cc8..f38f7a03 100644 Binary files a/data/borders/m15/colorlessLand/flippedDark.png and b/data/borders/m15/colorlessLand/flippedDark.png differ diff --git a/data/borders/m15/colorlessLand/legendary.png b/data/borders/m15/colorlessLand/legendary.png index 6dc978c1..18b7f5ee 100644 Binary files a/data/borders/m15/colorlessLand/legendary.png and b/data/borders/m15/colorlessLand/legendary.png differ diff --git a/data/borders/m15/colorlessLand/miracle.png b/data/borders/m15/colorlessLand/miracle.png index 073e652b..c87be3c7 100644 Binary files a/data/borders/m15/colorlessLand/miracle.png and b/data/borders/m15/colorlessLand/miracle.png differ diff --git a/data/borders/m15/colorlessLand/nyx.png b/data/borders/m15/colorlessLand/nyx.png index bb847d98..4b66cc1f 100644 Binary files a/data/borders/m15/colorlessLand/nyx.png and b/data/borders/m15/colorlessLand/nyx.png differ diff --git a/data/borders/m15/gold/darkmiracle.png b/data/borders/m15/gold/darkmiracle.png index 0c841017..0a87e00b 100644 Binary files a/data/borders/m15/gold/darkmiracle.png and b/data/borders/m15/gold/darkmiracle.png differ diff --git a/data/borders/m15/gold/flipCircle.png b/data/borders/m15/gold/flipCircle.png index 65c9f32d..400d9a3c 100644 Binary files a/data/borders/m15/gold/flipCircle.png and b/data/borders/m15/gold/flipCircle.png differ diff --git a/data/borders/m15/gold/flipTip.png b/data/borders/m15/gold/flipTip.png index 6caf7d8b..6d2fae05 100644 Binary files a/data/borders/m15/gold/flipTip.png and b/data/borders/m15/gold/flipTip.png differ diff --git a/data/borders/m15/gold/flippedDark.png b/data/borders/m15/gold/flippedDark.png index 8e36efc0..756a8719 100644 Binary files a/data/borders/m15/gold/flippedDark.png and b/data/borders/m15/gold/flippedDark.png differ diff --git a/data/borders/m15/gold/legendary.png b/data/borders/m15/gold/legendary.png index 8ec3e9f0..c6328cdf 100644 Binary files a/data/borders/m15/gold/legendary.png and b/data/borders/m15/gold/legendary.png differ diff --git a/data/borders/m15/gold/miracle.png b/data/borders/m15/gold/miracle.png index a15f219a..9de82474 100644 Binary files a/data/borders/m15/gold/miracle.png and b/data/borders/m15/gold/miracle.png differ diff --git a/data/borders/m15/gold/nyx.png b/data/borders/m15/gold/nyx.png index 228b511e..24000574 100644 Binary files a/data/borders/m15/gold/nyx.png and b/data/borders/m15/gold/nyx.png differ diff --git a/data/borders/m15/goldLand - Shortcut.lnk b/data/borders/m15/goldLand - Shortcut.lnk new file mode 100644 index 00000000..3942facf Binary files /dev/null and b/data/borders/m15/goldLand - Shortcut.lnk differ diff --git a/data/borders/m15/goldLand/darkmiracle.png b/data/borders/m15/goldLand/darkmiracle.png index 0c841017..c80fe53b 100644 Binary files a/data/borders/m15/goldLand/darkmiracle.png and b/data/borders/m15/goldLand/darkmiracle.png differ diff --git a/data/borders/m15/goldLand/flipCircle.png b/data/borders/m15/goldLand/flipCircle.png index 65c9f32d..932ddea3 100644 Binary files a/data/borders/m15/goldLand/flipCircle.png and b/data/borders/m15/goldLand/flipCircle.png differ diff --git a/data/borders/m15/goldLand/flipTip.png b/data/borders/m15/goldLand/flipTip.png index fd8c3573..bd0a8d41 100644 Binary files a/data/borders/m15/goldLand/flipTip.png and b/data/borders/m15/goldLand/flipTip.png differ diff --git a/data/borders/m15/goldLand/flippedDark.png b/data/borders/m15/goldLand/flippedDark.png index faf2432b..76a257a5 100644 Binary files a/data/borders/m15/goldLand/flippedDark.png and b/data/borders/m15/goldLand/flippedDark.png differ diff --git a/data/borders/m15/goldLand/legendary.png b/data/borders/m15/goldLand/legendary.png index 8ec3e9f0..9f4eb729 100644 Binary files a/data/borders/m15/goldLand/legendary.png and b/data/borders/m15/goldLand/legendary.png differ diff --git a/data/borders/m15/goldLand/miracle.png b/data/borders/m15/goldLand/miracle.png index a15f219a..d37b0136 100644 Binary files a/data/borders/m15/goldLand/miracle.png and b/data/borders/m15/goldLand/miracle.png differ diff --git a/data/borders/m15/goldLand/nyx.png b/data/borders/m15/goldLand/nyx.png index 0594a2a5..3f9cca87 100644 Binary files a/data/borders/m15/goldLand/nyx.png and b/data/borders/m15/goldLand/nyx.png differ diff --git a/data/borders/m15/green/darkmiracle.png b/data/borders/m15/green/darkmiracle.png index d04dae99..8193049f 100644 Binary files a/data/borders/m15/green/darkmiracle.png and b/data/borders/m15/green/darkmiracle.png differ diff --git a/data/borders/m15/green/flipCircle.png b/data/borders/m15/green/flipCircle.png index 9e8edab5..42449035 100644 Binary files a/data/borders/m15/green/flipCircle.png and b/data/borders/m15/green/flipCircle.png differ diff --git a/data/borders/m15/green/flipTip.png b/data/borders/m15/green/flipTip.png index 191ebcb8..fc76e395 100644 Binary files a/data/borders/m15/green/flipTip.png and b/data/borders/m15/green/flipTip.png differ diff --git a/data/borders/m15/green/flippedDark.png b/data/borders/m15/green/flippedDark.png index 971a0210..bc92da9e 100644 Binary files a/data/borders/m15/green/flippedDark.png and b/data/borders/m15/green/flippedDark.png differ diff --git a/data/borders/m15/green/legendary.png b/data/borders/m15/green/legendary.png index b3cec359..a37d48fd 100644 Binary files a/data/borders/m15/green/legendary.png and b/data/borders/m15/green/legendary.png differ diff --git a/data/borders/m15/green/miracle.png b/data/borders/m15/green/miracle.png index 77c6b4bd..e35be73c 100644 Binary files a/data/borders/m15/green/miracle.png and b/data/borders/m15/green/miracle.png differ diff --git a/data/borders/m15/green/nyx.png b/data/borders/m15/green/nyx.png index 0f48574a..cf49bf89 100644 Binary files a/data/borders/m15/green/nyx.png and b/data/borders/m15/green/nyx.png differ diff --git a/data/borders/m15/greenLand/darkmiracle.png b/data/borders/m15/greenLand/darkmiracle.png index d04dae99..66345976 100644 Binary files a/data/borders/m15/greenLand/darkmiracle.png and b/data/borders/m15/greenLand/darkmiracle.png differ diff --git a/data/borders/m15/greenLand/flipCircle.png b/data/borders/m15/greenLand/flipCircle.png index 9e8edab5..35305a60 100644 Binary files a/data/borders/m15/greenLand/flipCircle.png and b/data/borders/m15/greenLand/flipCircle.png differ diff --git a/data/borders/m15/greenLand/flipTip.png b/data/borders/m15/greenLand/flipTip.png index b4911cbe..470e1078 100644 Binary files a/data/borders/m15/greenLand/flipTip.png and b/data/borders/m15/greenLand/flipTip.png differ diff --git a/data/borders/m15/greenLand/flippedDark.png b/data/borders/m15/greenLand/flippedDark.png index 14e22ba4..b35a52e0 100644 Binary files a/data/borders/m15/greenLand/flippedDark.png and b/data/borders/m15/greenLand/flippedDark.png differ diff --git a/data/borders/m15/greenLand/legendary.png b/data/borders/m15/greenLand/legendary.png index b3cec359..cd230818 100644 Binary files a/data/borders/m15/greenLand/legendary.png and b/data/borders/m15/greenLand/legendary.png differ diff --git a/data/borders/m15/greenLand/miracle.png b/data/borders/m15/greenLand/miracle.png index 77c6b4bd..2284b44c 100644 Binary files a/data/borders/m15/greenLand/miracle.png and b/data/borders/m15/greenLand/miracle.png differ diff --git a/data/borders/m15/greenLand/nyx.png b/data/borders/m15/greenLand/nyx.png index f17de913..5ebabdb5 100644 Binary files a/data/borders/m15/greenLand/nyx.png and b/data/borders/m15/greenLand/nyx.png differ diff --git a/data/borders/m15/red/darkmiracle.png b/data/borders/m15/red/darkmiracle.png index 7d557454..2c33658e 100644 Binary files a/data/borders/m15/red/darkmiracle.png and b/data/borders/m15/red/darkmiracle.png differ diff --git a/data/borders/m15/red/flipCircle.png b/data/borders/m15/red/flipCircle.png index 55c33ebf..2dfa1b66 100644 Binary files a/data/borders/m15/red/flipCircle.png and b/data/borders/m15/red/flipCircle.png differ diff --git a/data/borders/m15/red/flipTip.png b/data/borders/m15/red/flipTip.png index 37043922..233c39e3 100644 Binary files a/data/borders/m15/red/flipTip.png and b/data/borders/m15/red/flipTip.png differ diff --git a/data/borders/m15/red/flippedDark.png b/data/borders/m15/red/flippedDark.png index 2cbbe7c6..bc055921 100644 Binary files a/data/borders/m15/red/flippedDark.png and b/data/borders/m15/red/flippedDark.png differ diff --git a/data/borders/m15/red/legendary.png b/data/borders/m15/red/legendary.png index 0877707e..9d32d2b0 100644 Binary files a/data/borders/m15/red/legendary.png and b/data/borders/m15/red/legendary.png differ diff --git a/data/borders/m15/red/miracle.png b/data/borders/m15/red/miracle.png index ad1b5e33..0201c4d4 100644 Binary files a/data/borders/m15/red/miracle.png and b/data/borders/m15/red/miracle.png differ diff --git a/data/borders/m15/red/nyx.png b/data/borders/m15/red/nyx.png index 1d6ba2bc..03917c2c 100644 Binary files a/data/borders/m15/red/nyx.png and b/data/borders/m15/red/nyx.png differ diff --git a/data/borders/m15/redLand/darkmiracle.png b/data/borders/m15/redLand/darkmiracle.png index 7d557454..dad91ba4 100644 Binary files a/data/borders/m15/redLand/darkmiracle.png and b/data/borders/m15/redLand/darkmiracle.png differ diff --git a/data/borders/m15/redLand/flipCircle.png b/data/borders/m15/redLand/flipCircle.png index 55c33ebf..3032c2dc 100644 Binary files a/data/borders/m15/redLand/flipCircle.png and b/data/borders/m15/redLand/flipCircle.png differ diff --git a/data/borders/m15/redLand/flipTip.png b/data/borders/m15/redLand/flipTip.png index 4631d46a..a3d73ee4 100644 Binary files a/data/borders/m15/redLand/flipTip.png and b/data/borders/m15/redLand/flipTip.png differ diff --git a/data/borders/m15/redLand/flippedDark.png b/data/borders/m15/redLand/flippedDark.png index 81769f61..c994d3ac 100644 Binary files a/data/borders/m15/redLand/flippedDark.png and b/data/borders/m15/redLand/flippedDark.png differ diff --git a/data/borders/m15/redLand/legendary.png b/data/borders/m15/redLand/legendary.png index 0877707e..5d4601af 100644 Binary files a/data/borders/m15/redLand/legendary.png and b/data/borders/m15/redLand/legendary.png differ diff --git a/data/borders/m15/redLand/miracle.png b/data/borders/m15/redLand/miracle.png index ad1b5e33..e9ad7caa 100644 Binary files a/data/borders/m15/redLand/miracle.png and b/data/borders/m15/redLand/miracle.png differ diff --git a/data/borders/m15/redLand/nyx.png b/data/borders/m15/redLand/nyx.png index c48c6a3d..e4cc2d45 100644 Binary files a/data/borders/m15/redLand/nyx.png and b/data/borders/m15/redLand/nyx.png differ diff --git a/data/borders/m15/vehicle/darkmiracle.png b/data/borders/m15/vehicle/darkmiracle.png index ff7e1cee..8071f686 100644 Binary files a/data/borders/m15/vehicle/darkmiracle.png and b/data/borders/m15/vehicle/darkmiracle.png differ diff --git a/data/borders/m15/vehicle/flipCircle.png b/data/borders/m15/vehicle/flipCircle.png index 2276f753..a04da673 100644 Binary files a/data/borders/m15/vehicle/flipCircle.png and b/data/borders/m15/vehicle/flipCircle.png differ diff --git a/data/borders/m15/vehicle/flipTip.png b/data/borders/m15/vehicle/flipTip.png index c81eaf8f..66511a6d 100644 Binary files a/data/borders/m15/vehicle/flipTip.png and b/data/borders/m15/vehicle/flipTip.png differ diff --git a/data/borders/m15/vehicle/flippedDark.png b/data/borders/m15/vehicle/flippedDark.png index 31a71f30..6383b88c 100644 Binary files a/data/borders/m15/vehicle/flippedDark.png and b/data/borders/m15/vehicle/flippedDark.png differ diff --git a/data/borders/m15/vehicle/legendary.png b/data/borders/m15/vehicle/legendary.png index e4a7909f..2e98ba82 100644 Binary files a/data/borders/m15/vehicle/legendary.png and b/data/borders/m15/vehicle/legendary.png differ diff --git a/data/borders/m15/vehicle/miracle.png b/data/borders/m15/vehicle/miracle.png index 9cb32fb5..9b55b95d 100644 Binary files a/data/borders/m15/vehicle/miracle.png and b/data/borders/m15/vehicle/miracle.png differ diff --git a/data/borders/m15/vehicle/nyx.png b/data/borders/m15/vehicle/nyx.png index 594ebc8d..3662cb6d 100644 Binary files a/data/borders/m15/vehicle/nyx.png and b/data/borders/m15/vehicle/nyx.png differ diff --git a/data/borders/m15/white/darkmiracle.png b/data/borders/m15/white/darkmiracle.png index ee063c17..a45c1257 100644 Binary files a/data/borders/m15/white/darkmiracle.png and b/data/borders/m15/white/darkmiracle.png differ diff --git a/data/borders/m15/white/flipCircle.png b/data/borders/m15/white/flipCircle.png index ec148961..fc7241f5 100644 Binary files a/data/borders/m15/white/flipCircle.png and b/data/borders/m15/white/flipCircle.png differ diff --git a/data/borders/m15/white/flipTip.png b/data/borders/m15/white/flipTip.png index 14b2cfa6..acb76fea 100644 Binary files a/data/borders/m15/white/flipTip.png and b/data/borders/m15/white/flipTip.png differ diff --git a/data/borders/m15/white/flippedDark.png b/data/borders/m15/white/flippedDark.png index 70c163a6..5e0928b2 100644 Binary files a/data/borders/m15/white/flippedDark.png and b/data/borders/m15/white/flippedDark.png differ diff --git a/data/borders/m15/white/legendary.png b/data/borders/m15/white/legendary.png index bcd9f1a8..c38f942f 100644 Binary files a/data/borders/m15/white/legendary.png and b/data/borders/m15/white/legendary.png differ diff --git a/data/borders/m15/white/miracle.png b/data/borders/m15/white/miracle.png index 66b2ef3e..3ab228b0 100644 Binary files a/data/borders/m15/white/miracle.png and b/data/borders/m15/white/miracle.png differ diff --git a/data/borders/m15/white/nyx.png b/data/borders/m15/white/nyx.png index 30d8aff8..420291cb 100644 Binary files a/data/borders/m15/white/nyx.png and b/data/borders/m15/white/nyx.png differ diff --git a/data/borders/m15/whiteLand/darkmiracle.png b/data/borders/m15/whiteLand/darkmiracle.png index ee063c17..b142af35 100644 Binary files a/data/borders/m15/whiteLand/darkmiracle.png and b/data/borders/m15/whiteLand/darkmiracle.png differ diff --git a/data/borders/m15/whiteLand/flipCircle.png b/data/borders/m15/whiteLand/flipCircle.png index ec148961..79a10b50 100644 Binary files a/data/borders/m15/whiteLand/flipCircle.png and b/data/borders/m15/whiteLand/flipCircle.png differ diff --git a/data/borders/m15/whiteLand/flipTip.png b/data/borders/m15/whiteLand/flipTip.png index 83149024..8000d62c 100644 Binary files a/data/borders/m15/whiteLand/flipTip.png and b/data/borders/m15/whiteLand/flipTip.png differ diff --git a/data/borders/m15/whiteLand/flippedDark.png b/data/borders/m15/whiteLand/flippedDark.png index ac6ff218..4d36f784 100644 Binary files a/data/borders/m15/whiteLand/flippedDark.png and b/data/borders/m15/whiteLand/flippedDark.png differ diff --git a/data/borders/m15/whiteLand/legendary.png b/data/borders/m15/whiteLand/legendary.png index bcd9f1a8..87aa95c4 100644 Binary files a/data/borders/m15/whiteLand/legendary.png and b/data/borders/m15/whiteLand/legendary.png differ diff --git a/data/borders/m15/whiteLand/miracle.png b/data/borders/m15/whiteLand/miracle.png index 66b2ef3e..9260154a 100644 Binary files a/data/borders/m15/whiteLand/miracle.png and b/data/borders/m15/whiteLand/miracle.png differ diff --git a/data/borders/m15/whiteLand/nyx.png b/data/borders/m15/whiteLand/nyx.png index 87275808..a98474b0 100644 Binary files a/data/borders/m15/whiteLand/nyx.png and b/data/borders/m15/whiteLand/nyx.png differ diff --git a/data/scripts/main.js b/data/scripts/main.js index f79d564d..3ca80ecf 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -323,11 +323,11 @@ function createBorder() { } } if (document.getElementById("checkboxFlipIcon").checked == true || document.getElementById("checkboxFlippedDark").checked == true) { - border.drawImage(imgBorderFlipCircle, 0, 0, cardWidth, cardHeight) + border.drawImage(imgBorderFlipCircle, imgBorderFlipCircle.imgX, imgBorderFlipCircle.imgY, imgBorderFlipCircle.imgW, imgBorderFlipCircle.imgH) border.drawImage(imgBorderFlipIcon, 39, 51, 60, 60) } if (document.getElementById("checkboxFlipTip").checked == true) { - border.drawImage(imgBorderFlipTip, 0, 0, cardWidth, cardHeight) + border.drawImage(imgBorderFlipTip, imgBorderFlipTip.imgX, imgBorderFlipTip.imgY, imgBorderFlipTip.imgW, imgBorderFlipTip.imgH) border.fillStyle="#666" canvas.style.letterSpacing = "0px" border.font = "28px belerenb" @@ -402,9 +402,7 @@ function createBorder() { } //RARE STAMP if (document.getElementById("checkboxRareStamp").checked == true && stampBorder == true) { - imgBorderRareStamp.imgValues(329, rareStampY - 15, 90, 50) - imgSecondBorderRareStamp.imgValues(329, rareStampY - 15, 90, 50) - imgRareStampMask.imgValues(329, rareStampY - 15, 90, 50) + imgBorderRareStamp.imgValues(329, rareStampY - 15, 90, 50, "imgSecondBorderRareStamp,imgRareStampMask") border.mask("imgCardMask,source-over", imgBorderRareStamp) if (document.getElementById("checkboxSecondColor").checked == true) { // border.mask("imgStampGradient,source-over;imgSecondBorderRareStamp,source-in", 329, rareStampY - 15, 90, 50)attention @@ -521,7 +519,7 @@ function writeText() { card.fillStyle = "White" } card.textAlign = "center" - card.drawImage(imgBorderCreature, ptX, ptY, ptWidth, ptHeight) + card.drawImage(imgBorderCreature, imgBorderCreature.imgX, imgBorderCreature.imgY, imgBorderCreature.imgW, imgBorderCreature.imgH) canvas.style.letterSpacing = ptFontSpacing card.font = ptFont powerToughness = document.getElementById("inputPowerToughness").value @@ -778,11 +776,21 @@ function loadImage(event, destination, arg) { //============================================// // Image Processing // //============================================// -Image.prototype.imgValues = function(x, y, w, h) { +Image.prototype.imgValues = function(x, y, w, h , otherImages) { this.imgX = x this.imgY = y this.imgW = w this.imgH = h + if (otherImages != undefined) { + otherImageList = otherImages.split(",") + for (i = 0; i < otherImageList.length; i ++) { + otherImage = window[otherImageList[i]] + otherImage.imgX = x + otherImage.imgY = y + otherImage.imgW = w + otherImage.imgH = h + } + } } var maskCanvas = document.createElement("canvas") var maskContext = maskCanvas.getContext("2d")