Mindfang/cardconjurer
1
0
Fork 0
forked from GithubMirrors/cardconjurer
Code Pull Requests Actions Packages Activity

artifact

Browse Source
This commit is contained in:
Kyle
2018-12-08 11:26:16 -08:00
parent 7f006697ae
commit cd73f72588
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/borders/defaultBorder.js
View File

@@ -16,6 +16,7 @@ var creatureBorder = true
var thirdBorder = true var thirdBorder = true
var secondBorder = true var secondBorder = true
var transparentBorder = false var transparentBorder = false
var artifactBorder = false
//Shifted text //Shifted text
titleRightShift = 0 titleRightShift = 0
typeRightShift = 0 typeRightShift = 0

1
data/borders/m15/border.js
View File

@@ -64,6 +64,7 @@ imgBorderFlipCircle.imgValues(26, 44, 78, 71)
imgBorderFlippedDark.imgValues(44, 50, 661, 915, "imgSecondBorderFlippedDark") imgBorderFlippedDark.imgValues(44, 50, 661, 915, "imgSecondBorderFlippedDark")
imgBorderFlipTip.imgValues(685, 877, 36, 48) imgBorderFlipTip.imgValues(685, 877, 36, 48)
stampBorder = true stampBorder = true
artifactBorder = true
//With all the new values in place, the program will update it's border images //With all the new values in place, the program will update it's border images
finishTemplate() finishTemplate()
//Any special functions go at the bottom //Any special functions go at the bottom

14
data/scripts/main.js
View File

@@ -31,7 +31,7 @@ for (var i = 0; i < imgListTemplate.length; i ++) {
} }
//Load border images (images that are determined by border settings) //Load border images (images that are determined by border settings)
var imgListBorder = ["borderColor", "secondBorderColor", "thirdBorderColor", "borderCreature", "borderLegendary", "secondBorderLegendary", "borderRareStamp", "secondBorderRareStamp", "borderNyx", "secondBorderNyx", "borderMiracle", "secondBorderMiracle", "borderFlipIcon", "borderFlipCircle", "borderFlipTip", "borderFlippedDark", "secondBorderFlippedDark"] var imgListBorder = ["borderColor", "secondBorderColor", "thirdBorderColor", "artifactBorderColor", "borderCreature", "borderLegendary", "secondBorderLegendary", "borderRareStamp", "secondBorderRareStamp", "borderNyx", "secondBorderNyx", "borderMiracle", "secondBorderMiracle", "borderFlipIcon", "borderFlipCircle", "borderFlipTip", "borderFlippedDark", "secondBorderFlippedDark"]
for (var i = 0; i < imgListBorder.length; i ++) { for (var i = 0; i < imgListBorder.length; i ++) {
var imgName = "img" + imgListBorder[i].charAt(0).toUpperCase() + imgListBorder[i].slice(1) var imgName = "img" + imgListBorder[i].charAt(0).toUpperCase() + imgListBorder[i].slice(1)
window[imgName] = new Image() window[imgName] = new Image()
@@ -177,6 +177,9 @@ function updateBorder() {
imgBorderColor.src = firstColorPath + "/frame.png" imgBorderColor.src = firstColorPath + "/frame.png"
imgSecondBorderColor.src = secondColorPath + "/frame.png" imgSecondBorderColor.src = secondColorPath + "/frame.png"
imgThirdBorderColor.src = thirdColorPath + "/frame.png" imgThirdBorderColor.src = thirdColorPath + "/frame.png"
if (artifactBorder == true) {
imgArtifactBorderColor.src = borderPath + "artifact/frame.png"
}
if (document.getElementById("checkboxFlippedDark").checked == true && flipBorder == true) { if (document.getElementById("checkboxFlippedDark").checked == true && flipBorder == true) {
altframe = "dark" altframe = "dark"
} else { } else {
@@ -200,7 +203,9 @@ function updateBorder() {
imgSecondBorderRareStamp.src = secondColorPath + "/stamp.png" imgSecondBorderRareStamp.src = secondColorPath + "/stamp.png"
} }
if (nyxBorder == true) { if (nyxBorder == true) {
if (thirdColor == true) { if (artifactBorder == true && document.getElementById("checkboxArtifact").checked == true) {
imgBorderNyx.src = borderPath + "artifact/nyx.png"
} else if (thirdColor == true) {
imgBorderNyx.src = thirdColorPath + "/nyx.png" imgBorderNyx.src = thirdColorPath + "/nyx.png"
} else { } else {
imgBorderNyx.src = firstColorPath + "/nyx.png" imgBorderNyx.src = firstColorPath + "/nyx.png"
@@ -264,9 +269,12 @@ function createBorder() {
if (thirdColor == true && thirdBorder == true) { if (thirdColor == true && thirdBorder == true) {
border.mask("imgMultiMask,source-over;imgFrameMask,source-in", imgThirdBorderColor) border.mask("imgMultiMask,source-over;imgFrameMask,source-in", imgThirdBorderColor)
} }
if (artifactBorder == true && document.getElementById("checkboxArtifact").checked == true) {
border.mask("imgMultiMask,source-over;imgFrameMask,source-in;imgTitleMask,destination-out;imgTypeMask,destination-out", imgArtifactBorderColor)
}
//NYX //NYX
if (document.getElementById("checkboxNyx").checked == true && nyxBorder == true) { if (document.getElementById("checkboxNyx").checked == true && nyxBorder == true) {
if (thirdColor == true) { if (thirdColor == true || (document.getElementById("checkboxArtifact").checked == true && artifactBorder == true)) {
border.mask("imgMultiMask,source-over;imgFrameMask,source-in", imgBorderNyx) border.mask("imgMultiMask,source-over;imgFrameMask,source-in", imgBorderNyx)
} else { } else {
border.mask("imgFrameMask,source-over", imgBorderNyx) border.mask("imgFrameMask,source-over", imgBorderNyx)

10
index.html
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html5> <!DOCTYPE html5>
<html> <html itemscope itemtype="http://schema.org/Thing">
<head> <head>
<title>Card Conjurer</title> <title>Card Conjurer</title>
<!-- Favicon craziness! --> <!-- Favicon craziness! -->
@@ -25,7 +25,7 @@
} }
</script> </script>
</head> </head>
<body itemscope itemtype="http://schema.org/Thing"> <body>
<div class="title"><img itemprop="image" src="images/title.png"></div> <div class="title"><img itemprop="image" src="images/title.png"></div>
<div class="grid mainGrid"> <div class="grid mainGrid">
<div class="canvasContainer"> <div class="canvasContainer">
@@ -85,6 +85,12 @@
<span class="dropdown"> <span class="dropdown">
<select id="thirdColorSelection" onchange="updateBorder()"></select> <select id="thirdColorSelection" onchange="updateBorder()"></select>
</span> </span>
<br>
<div class="checkbox">
<input type="checkbox" id="checkboxArtifact" onchange="updateBorder()" />
<label for="checkboxArtifact" />
<div>Artifact</div>
</div>
</div> </div>
<div class="cmm" id="cmm-advanced"> <div class="cmm" id="cmm-advanced">
<div class="checkbox"> <div class="checkbox">