From 1e90cdc6420dd0b3f3bcc9255e6b29afa71b3368 Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Sun, 14 Oct 2018 16:58:55 -0700 Subject: [PATCH] Colored Borders! --- data/borders/artistBrush.png | Bin 857 -> 534 bytes data/borders/m15/borderColorMask.png | Bin 0 -> 4853 bytes index.html | 17 +++++++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 data/borders/m15/borderColorMask.png diff --git a/data/borders/artistBrush.png b/data/borders/artistBrush.png index 270a8af4bd72510b449d4d63c72e6679f343195c..e9583ee803e6b56f62b050c53c202cfd706a45a1 100644 GIT binary patch delta 502 zcmVd>KXQfkDhMKFUy5K6UzV+SR=mVeqIB3Tl!sMjgs8RMUz z-*(PD_dACl04?rTN-;S#+bebaJ^1%q(>l13(eRi%|4HB1%l1-xNm+!~7r0vbadz&F zei$IRzWzx{DaXPi?z*~KY*kjA51c&FG&Z(=EfmjR;(hExuPi}ocV`Vi0Hz8vRW=2y zS^+>q<6~A6tAEk_Y;1b&)dguZHdRsz0!3JGI-DpN05Df7II11k%qju{Z5~e{rc`P_ zS&)AFzVfz|^xfo4kG}2;^;2Veh|#EAI7%@o^mM;0$X%{xSd1@6WEtdgxuc=M;rgd- zexCbY5bA!-=lL%K`S*ByIl|ZYQd!dLNF)+b0HeiXR&Ting24{4xw#F1@$B^M-q72><{9 delta 828 zcmV-C1H=551lb0VDu4d~{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2jT}A0w5C_*JVBc00QPoL_t(I%Z-w6Xw-Ea$6vqS-S2Mac1vT9E%br4jgqKUJCDsd z^GSs`y(~AKC~9H|g*}PFK^Vo*=s{VH9`t8Ah}r`Q$#g}wZhyB>6VGO31Y6smNxih=c>yv&Rv@I3(x8gN0Rg(FYJoOAvsv-)kL$$g zvs&G|9{Rve}ZK46c;aCB3KlnC{)7SyDF)vuBN^|!r?<-;P=P_;K?NGdW3=&_gCMI z0XSJ3pXFnA*rGf*Es`Y9 zld`$Om${yl$$Og2*mClYQqH*SY*s1TQQCEt)qhOl@wgfrqtkC{nkrPwFu?P2?0WTe zy7zSxFbzzf1@a@$#C7xd{T8O_!#`EW)Z_#&@7zgKQxl2A@xOYywykaY#P;@f0jjRK zSC_9`E8O63`jgbeq~3k6Qwx;%1C z$u;B|?b-dNmMmF%>#!*qQ^Rdp6m1|}9LCLM=#TgDfA|B+&cY5U2=vte0000x` z7I;J!Gca%qgD@k*tT_@uLG}_)Usv`=TzukMQrp7+%P=qqHF>%?hE&{od-q`OAqNrH zi}s7BBz?cnCF>jJ5$Ui*<51mwyX8#T35AtX2_aXt7#I|;m9PNGTZ{}07x@?%7RfR& z2mqbakiiZS=qN)HaIt1!00}s3VTLFL34rv%1weZ78wOGeHXWol=5F{S=e1kgrn50L zEbcW7dsKW>_id9bLxXX2$?a`>_=Q8a2JxM^&BD+yBY-dJuJW|9gM17QvzEBcvj7@Dw(1bYx+ZFh`@_h|bBOJfJ6 zNdZe%qxB_nyBcfZL_`o_ZCs9qH+l~O7QFCQE=*vw{f*pj92VvGj+`z1hSMIiGc4#f z{(bclu*vxl-0=SPJ!T>!!-D3`yO9K;ZLo%n|1$AztPBc~PV1w9-Qx$n#~%wC8uYK~ zs+h3#+J|kxKCy`S9vc!qs=)lqppMuvh23HJNnX7B;sc5vR^x$8iE;$Q7u zT>IocKbghDz#!lGP|e(W*RKbLh*2~7Z3o=7DC literal 0 HcmV?d00001 diff --git a/index.html b/index.html index d35d028a..5a6acf01 100644 --- a/index.html +++ b/index.html @@ -43,6 +43,8 @@
Silver Border
+ Border Color +
Foil
@@ -392,7 +394,7 @@ var m15Info = true var canvas = document.getElementById("canvas") var card = canvas.getContext("2d") //Load dynamic images -var dynamicImageList = ["borderColor", "secondBorderColor", "thirdBorderColor", "borderCreature", "secondBorderCreature", "thirdBorderCreature", "borderLegendary", "secondBorderLegendary", "thirdBorderLegendary", "borderRareStamp", "secondBorderRareStamp", "art", "artMask", "setSymbol", "watermark", "multiMask", "LegendMultiMask", "legendSilver"] +var dynamicImageList = ["borderColor", "secondBorderColor", "thirdBorderColor", "borderCreature", "secondBorderCreature", "thirdBorderCreature", "borderLegendary", "secondBorderLegendary", "thirdBorderLegendary", "borderRareStamp", "secondBorderRareStamp", "art", "artMask", "setSymbol", "watermark", "multiMask", "LegendMultiMask", "legendSilver", "borderColorMask"] for (i = 0; i < dynamicImageList.length; i ++) { var imgName = "img" + dynamicImageList[i].charAt(0).toUpperCase() + dynamicImageList[i].slice(1) window[imgName] = new Image() @@ -470,6 +472,7 @@ function updateBorder() { imgMultiMask.src = "data/borders/" + document.getElementById("borderSelection").value + "multiMask.png" imgLegendMultiMask.src = "data/borders/" + document.getElementById("borderSelection").value + "legendMultiMask.png" imgLegendSilver.src = "data/borders/" + document.getElementById("borderSelection").value + "legendSilver.png" + imgBorderColorMask.src = "data/borders/" + document.getElementById("borderSelection").value + "borderColorMask.png" updateColor() } //Loads the images for the card frame, power toughness box, and rare stamp @@ -527,13 +530,15 @@ function drawBorder() { card.drawImage(imgRareStamp, 340, rareStampY, 70, 37) } } + //Draws the selected colored border + drawMask(document.getElementById("inputColor").value, 0, 0, canvas.width, canvas.height, imgBorderColorMask, false, false) if(document.getElementById("legendaryCheckbox").checked == true) { - card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height) + //////////////////////////////////////////////////////////////////////////////////////card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height) if (document.getElementById("silverBorderCheckbox").checked == true) { drawMask(imgLegendSilver, 0, 0, canvas.width, canvas.height, imgCardMask, false, false) } } else { - card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height) + /////////////////////////////////////////////////////////////////////////////////////card.drawImage(imgBorderEdge, 0, 0, canvas.width, canvas.height) if (document.getElementById("silverBorderCheckbox").checked == true) { card.drawImage(imgSilverBorder, 0, 0, canvas.width, canvas.height) } @@ -632,8 +637,12 @@ function writeText() { } //Bottom info on M15 cards function bottomInfoM15() { + if (document.getElementById("artistColor").checked == true) { + card.fillStyle = "black" + } else { + card.fillStyle = "white" + } var shiftInfo = 445 - card.fillStyle = "white" canvas.style.letterSpacing = "0.8px" card.font = "19.5px relaymedium" var bottomLine = document.getElementById("inputSet").value + " \u00b7 " + document.getElementById("inputLanguage").value