diff --git a/data/borders/defaultBorder.js b/data/borders/defaultBorder.js
index a59f831f..e2b7df98 100644
--- a/data/borders/defaultBorder.js
+++ b/data/borders/defaultBorder.js
@@ -16,6 +16,7 @@ var creatureBorder = true
var thirdBorder = true
var secondBorder = true
var transparentBorder = false
+var artifactBorder = false
//Shifted text
titleRightShift = 0
typeRightShift = 0
diff --git a/data/borders/m15/border.js b/data/borders/m15/border.js
index ed7db62f..65556ee8 100644
--- a/data/borders/m15/border.js
+++ b/data/borders/m15/border.js
@@ -64,6 +64,7 @@ imgBorderFlipCircle.imgValues(26, 44, 78, 71)
imgBorderFlippedDark.imgValues(44, 50, 661, 915, "imgSecondBorderFlippedDark")
imgBorderFlipTip.imgValues(685, 877, 36, 48)
stampBorder = true
+artifactBorder = true
//With all the new values in place, the program will update it's border images
finishTemplate()
//Any special functions go at the bottom
diff --git a/data/scripts/main.js b/data/scripts/main.js
index 3913cae9..acc00b27 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -31,7 +31,7 @@ for (var i = 0; i < imgListTemplate.length; i ++) {
}
//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 ++) {
var imgName = "img" + imgListBorder[i].charAt(0).toUpperCase() + imgListBorder[i].slice(1)
window[imgName] = new Image()
@@ -177,6 +177,9 @@ function updateBorder() {
imgBorderColor.src = firstColorPath + "/frame.png"
imgSecondBorderColor.src = secondColorPath + "/frame.png"
imgThirdBorderColor.src = thirdColorPath + "/frame.png"
+ if (artifactBorder == true) {
+ imgArtifactBorderColor.src = borderPath + "artifact/frame.png"
+ }
if (document.getElementById("checkboxFlippedDark").checked == true && flipBorder == true) {
altframe = "dark"
} else {
@@ -200,7 +203,9 @@ function updateBorder() {
imgSecondBorderRareStamp.src = secondColorPath + "/stamp.png"
}
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"
} else {
imgBorderNyx.src = firstColorPath + "/nyx.png"
@@ -264,9 +269,12 @@ function createBorder() {
if (thirdColor == true && thirdBorder == true) {
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
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)
} else {
border.mask("imgFrameMask,source-over", imgBorderNyx)
diff --git a/index.html b/index.html
index ff4c8212..92c74679 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
-
+
Card Conjurer
@@ -25,7 +25,7 @@
}
-
+
