This commit is contained in:
Kyle
2019-04-15 18:30:46 -07:00
parent 1767ddfc25
commit 579ad15af3
34 changed files with 96 additions and 169 deletions

View File

@@ -16,7 +16,7 @@ cardData.titleAlignment = "center"
cardData.titleX = cardWidth / 2 cardData.titleX = cardWidth / 2
cardData.titleY = cheight(95) cardData.titleY = cheight(95)
cardData.titleFontSize = cwidth(42) cardData.titleFontSize = cwidth(42)
cardData.titleRight = cwidth(1000) // cardData.titleRight = cwidth(1000)
cardData.typeAlignment = "center" cardData.typeAlignment = "center"
cardData.typeX = cardWidth / 2 cardData.typeX = cardWidth / 2
cardData.typeY = cheight(735) cardData.typeY = cheight(735)

View File

@@ -6,13 +6,22 @@ cardData.miracle = false
cardData.nyx = false cardData.nyx = false
cardData.rareStamp = false cardData.rareStamp = false
//Specific Values //Specific Values
cardData.cardArtX = cwidth(56)
cardData.cardArtY = cheight(124)
cardData.manaSymbolDirection = "none"
document.getElementById("inputTitleColor").value = "#ffe886"
cardData.titleX = cardWidth / 2
cardData.titleAlignment = "center"
cardData.titleFont = "belerenbsc"
//Images //Images
// imgArtMask.load("data/borders/fullArtLandM15/imgArtMask.png") imgArtMask.load("data/borders/tokenTall/imgArtMask.png")
// imgFrameMask.load("data/borders/fullArtLandM15/imgFrameMask.png") imgFrameMask.load("data/borders/tokenTall/imgFrameMask.png")
// imgPinlineMask.load("data/borders/fullArtLandM15/imgPinlineMask.png") imgPinlineMask.load("data/borders/tokenTall/imgPinlineMask.png")
// imgTitleMask.load("data/borders/fullArtLandM15/imgTitleMask.png") imgTitleMask.load("data/borders/tokenTall/imgTitleMask.png")
// imgTypeMask.load("data/borders/fullArtLandM15/imgTypeMask.png") imgTypeMask.load("data/borders/tokenTall/imgTypeMask.png")
imgRulesMask.load("data/borders/tokenTall/imgRulesMask.png")
imgLegendary.load("none", cwidth(26), cheight(20), cwidth(697), cheight(112))
imgLegendaryRight.load("none", cwidth(26), cheight(20), cwidth(697), cheight(112))
//Loads the Colors //Loads the Colors
loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless") loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless")
//Runs the things! //Runs the things!

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -1,57 +0,0 @@
//M15 Border
//Anything to do with...
//Loading Images
var artX = 56
var artY = 125
imgMultiMask.src = borderPath + "multiMask.png"
imgFrameMask.src = borderPath + "frameMask.png"
imgLegendFrameMask.src = borderPath + "legendFrameMask.png"
imgBorderMask.src = borderPath + "borderMask.png"
//Card Title
document.getElementById("inputTitleColor").value = "#ffe886"
var titleFont = "40px belerenbsc" //40
var titleFontSpacing = "0.15px" //0.15
var titleX = 374.5 //62
var titleY = 62 //62
var titleAlign = "center"
//Mana Cost
var manaCostRadius = 17.5 //17.5
var manaCostX = 657 //657
var manaCostY = 59 //59
//Card Type
var typeFont = "33.5px belerenb" //33.5
var typeFontSpacing = "0.05px" //0.05
var typeX = 60 //62
var typeY = 601 //601
// Rules/Flavor Text
var textFont = "px mplantin"
var textFontSpacing = 0.7 //0.7
var textX = 66 //66
var textY = 779 //779
var textWidth = 687 //682
//Power Toughness
var ptFont = "39px belerenb" //39
var ptFontSpacing = "0.3px" //0.3
var ptTextX = 645 //645
var ptTextY = 939 //939
imgBorderCreature.imgValues(571, 926, 137, 75)
//Bottom Info
var infoY = 999 //999
//Set Symbol
var setSymbolY = 616 //616
var setSymbolRight = 693 //693
var setSymbolWidth = 84 //77
var setSymbolHeight = 44 //44
//Color Options
loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,colorless-Colorless,artifact-Artifact")
document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
document.getElementById("thirdColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
//Things The Card Can Do
legendaryBorder = true
imgBorderLegendary.imgValues(26, 20, 697, 112, "imgSecondBorderLegendary")
// nyxBorder = true
// imgBorderNyx.imgValues(30, 30, 689, 643, "imgSecondBorderNyx")
//With all the new values in place, the program will update it's border images
finishTemplate()
//Any special functions go at the bottom
var uniqueFunctionName = "bottomInfoM15"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -0,0 +1,33 @@
//============================================//
// Full Art Land M15 Border //
//============================================//
//General Booleans
cardData.miracle = false
cardData.nyx = false
cardData.rareStamp = false
//Specific Values
cardData.cardArtX = cwidth(56)
cardData.cardArtY = cheight(124)
cardData.manaSymbolDirection = "none"
document.getElementById("inputTitleColor").value = "#ffe886"
cardData.titleX = cardWidth / 2
cardData.titleAlignment = "center"
cardData.titleFont = "belerenbsc"
cardData.typeY = cheight(751)
cardData.setSymbolY = cheight(739)
cardData.textY = cheight(808)
//Images
imgArtMask.load("data/borders/tokenText/imgArtMask.png")
imgFrameMask.load("data/borders/tokenText/imgFrameMask.png")
imgPinlineMask.load("data/borders/tokenText/imgPinlineMask.png")
imgTitleMask.load("data/borders/tokenText/imgTitleMask.png")
imgTypeMask.load("data/borders/tokenText/imgTypeMask.png")
imgRulesMask.load("data/borders/tokenText/imgRulesMask.png")
imgLegendary.load("none", cwidth(26), cheight(20), cwidth(697), cheight(112))
imgLegendaryRight.load("none", cwidth(26), cheight(20), cwidth(697), cheight(112))
//Loads the Colors
loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless")
//Runs the things!
sectionTextFunction()
sectionFrameFunction()
sectionOtherFunction()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -1,60 +0,0 @@
//Token Text
//Anything to do with...
//Loading Images
var artX = 56
var artY = 125
imgMultiMask.src = borderPath + "multiMask.png"
imgFrameMask.src = borderPath + "frameMask.png"
imgLegendFrameMask.src = borderPath + "legendFrameMask.png"
imgBorderMask.src = borderPath + "borderMask.png"
imgRulesMask.src = borderPath + "rulesMask.png"
imgTypeMask.src = borderPath + "typeMask.png"
imgTitleMask.src = borderPath + "titleMask.png"
//Card Title
document.getElementById("inputTitleColor").value = "#ffe886"
var titleFont = "40px belerenbsc" //40
var titleFontSpacing = "0.15px" //0.15
var titleX = 374.5 //62
var titleY = 62 //62
var titleAlign = "center"
//Mana Cost
var manaCostRadius = 17.5 //17.5
var manaCostX = 657 //657
var manaCostY = 59 //59
//Card Type
var typeFont = "33.5px belerenb" //33.5
var typeFontSpacing = "0.05px" //0.05
var typeX = 60 //62
var typeY = 719 //719
// Rules/Flavor Text
var textFont = "px mplantin"
var textFontSpacing = 0.7 //0.7
var textX = 66 //66
var textY = 779 //779
var textWidth = 682 //682
//Power Toughness
var ptFont = "39px belerenb" //39
var ptFontSpacing = "0.3px" //0.3
var ptTextX = 645 //645
var ptTextY = 939 //939
imgBorderCreature.imgValues(571, 926, 137, 75)
//Bottom Info
var infoY = 999 //999
//Set Symbol
var setSymbolY = 734 //616
var setSymbolRight = 693 //693
var setSymbolWidth = 84 //77
var setSymbolHeight = 44 //44
//Color Options
loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,colorless-Colorless,artifact-Artifact")
document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
document.getElementById("thirdColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML
//Things The Card Can Do
legendaryBorder = true
imgBorderLegendary.imgValues(26, 20, 697, 112, "imgSecondBorderLegendary")
nyxBorder = true
imgBorderNyx.imgValues(30, 30, 689, 643, "imgSecondBorderNyx")
//With all the new values in place, the program will update it's border images
finishTemplate()
//Any special functions go at the bottom
var uniqueFunctionName = "bottomInfoM15"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

View File

@@ -0,0 +1,33 @@
//============================================//
// Full Art Land M15 Border //
//============================================//
//General Booleans
cardData.miracle = false
cardData.nyx = false
cardData.rareStamp = false
cardData.rulesBox = false
//Specific Values
cardData.cardArtX = cwidth(56)
cardData.cardArtY = cheight(124)
cardData.manaSymbolDirection = "none"
document.getElementById("inputTitleColor").value = "#ffe886"
cardData.titleX = cardWidth / 2
cardData.titleAlignment = "center"
cardData.titleFont = "belerenbsc"
cardData.typeY = cheight(901)
cardData.setSymbolY = cheight(889)
cardData.textY = cheight(296)
//Images
imgArtMask.load("data/borders/tokenTextless/imgArtMask.png")
imgFrameMask.load("data/borders/tokenTextless/imgFrameMask.png")
imgPinlineMask.load("data/borders/tokenTextless/imgPinlineMask.png")
imgTitleMask.load("data/borders/tokenTextless/imgTitleMask.png")
imgTypeMask.load("data/borders/tokenTextless/imgTypeMask.png")
imgLegendary.load("none", cwidth(26), cheight(20), cwidth(697), cheight(112))
imgLegendaryRight.load("none", cwidth(26), cheight(20), cwidth(697), cheight(112))
//Loads the Colors
loadColors("white-White,blue-Blue,black-Black,red-Red,green-Green,gold-Gold,artifact-Artifact,colorless-Colorless")
//Runs the things!
sectionTextFunction()
sectionFrameFunction()
sectionOtherFunction()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -159,6 +159,11 @@ CanvasRenderingContext2D.prototype.writeText = function(text, inputX, inputY, in
} }
if (skipLines == false) { if (skipLines == false) {
//The text is condensed into one line //The text is condensed into one line
if (textAlignment == "center") {
rightLimit = rightLimit + (rightLimit - x)
} else if (textAlignment == "right") {
rightLimit = 2 * x - rightLimit
}
while(this.measureText(text).width + x > rightLimit) { while(this.measureText(text).width + x > rightLimit) {
textFontSize -= 0.5 textFontSize -= 0.5
this.font = textFontSize + "px " + textFont this.font = textFontSize + "px " + textFont
@@ -975,12 +980,12 @@ function checkCookies() {
alert("Thanks for using Card Conjurer! Unfortunately different browsers treat custom fonts differently and it appears that you are using a browser other than Chrome. Everything may work perfectly, but if you notice that the text looks odd try switching to Chrome.") alert("Thanks for using Card Conjurer! Unfortunately different browsers treat custom fonts differently and it appears that you are using a browser other than Chrome. Everything may work perfectly, but if you notice that the text looks odd try switching to Chrome.")
} }
setCookie("visited", "true") setCookie("visited", "true")
setCookie("updated_2", "true") setCookie("cookieUpdated3", "true")
} else { } else {
console.log("Welcome back to Card Conjurer!") console.log("Welcome back to Card Conjurer!")
if (getCookie("updated_2") != "true") { if (getCookie("cookieUpdated3") != "true") {
alert("Card Conjurer has been updated since your last visit. After reworking the system I haven't had time to add all the old border styles back, but feel free to contact me at CardConjurerMTG@gmail.com if you would like to request a border style or have any questions. \r\n\r\nNewest border style: Mini-Plane") alert("Card Conjurer has been updated since your last visit. After reworking the system I haven't had time to add all the old border styles back, but feel free to contact me at CardConjurerMTG@gmail.com if you would like to request a border style or have any questions. \r\n\r\nNewest border style: Tokens")
setCookie("updated_2", "true") setCookie("cookieUpdated3", "true")
} else { } else {
console.log("There are no new updates since your last visit.") console.log("There are no new updates since your last visit.")
if (getCookie("donationRequest") != "true") { if (getCookie("donationRequest") != "true") {
@@ -1014,7 +1019,7 @@ setTimeout(function(){sectionTextFunction()}, 500)
setTimeout(function(){sectionTextFunction()}, 1000) setTimeout(function(){sectionTextFunction()}, 1000)
// Only for working on frames n' stuff :) // Only for working on frames n' stuff :)
// setTimeout(function(){ // setTimeout(function(){
// document.getElementById("inputCardVersion").value = "miniplane" // document.getElementById("inputCardVersion").value = "tokenTextless"
// document.getElementById("inputCardVersion").onchange() // document.getElementById("inputCardVersion").onchange()
// }, 500) // }, 500)
@@ -1086,42 +1091,3 @@ setTimeout(function(){sectionTextFunction()}, 1000)
// } else { // } else {
// typeRightShift = 0 // typeRightShift = 0
// } // }
// //============================================//
// // Cookies! //
// //============================================//
// function setCookie(cookieName, cookieValue) {
// var tempDate = new Date();
// tempDate.setTime(tempDate.getTime() + (31 * 24 * 60 * 60 * 1000)); //days*hours*minutes*seconds*milliseconds
// var expires = "expires=" + tempDate.toUTCString();
// document.cookie = cookieName + "=" + cookieValue + ";" + expires + ";path=/";
// }
// function getCookie(cookieName) {
// var name = cookieName + "=";
// var cookieArray = document.cookie.split(";");
// for(var i = 0; i < cookieArray.length; i++) {
// var tempCookie = cookieArray[i];
// while (tempCookie.charAt(0) == " ") {
// tempCookie = tempCookie.substring(1);
// }
// if (tempCookie.indexOf(name) == 0) {
// return tempCookie.substring(name.length, tempCookie.length);
// }
// }
// return "";
// }
// function checkCookies() {
// if (getCookie("visited") != "true") {
// if (isMobile == true) {
// alert("Thanks for using Card Conjurer! Unfortunately some users have been experiencing difficulty on mobile devices when uploading pictures they took on that mobile device. An easy solution is to quickly edit that picture by cropping it slightly. Otherwise, images from URLs and other sources should work normally.")
// } else if (isSafari == false && isChrome == false) {
// alert("Thanks for using Card Conjurer! Unfortunately different browsers treat custom fonts differently and it appears that you are using a browser other than Safari or Chrome. Everything may work perfectly, but if you notice that the cards look odd try using Safari or Chrome.")
// }
// setCookie("visited", "true")
// } else {
// console.log("Welcome back to Card Conjurer!")
// }
// }
// checkCookies()

View File

@@ -89,6 +89,9 @@
<span class="dropdown"> <span class="dropdown">
<select onchange="backToDefault(this.value)" id="inputCardVersion"> <select onchange="backToDefault(this.value)" id="inputCardVersion">
<option value="m15">M15</option> <option value="m15">M15</option>
<option value="tokenTextless">Token (Textless)</option>
<option value="tokenText">Token (Regular)</option>
<option value="tokenTall">Token (Tall)</option>
<option value="miniPlane">Mini-Plane</option> <option value="miniPlane">Mini-Plane</option>
<option value="planeswalker">Planeswalker (M15)</option> <option value="planeswalker">Planeswalker (M15)</option>
<option value="fullArtLandM15">Full Art Land (M15)</option> <option value="fullArtLandM15">Full Art Land (M15)</option>