diff --git a/data/borders/icons/artifact.png b/data/icons/artifact.png
similarity index 100%
rename from data/borders/icons/artifact.png
rename to data/icons/artifact.png
diff --git a/data/borders/icons/blank.png b/data/icons/blank.png
similarity index 100%
rename from data/borders/icons/blank.png
rename to data/icons/blank.png
diff --git a/data/borders/icons/compass.png b/data/icons/compass.png
similarity index 100%
rename from data/borders/icons/compass.png
rename to data/icons/compass.png
diff --git a/data/borders/icons/creature.png b/data/icons/creature.png
similarity index 100%
rename from data/borders/icons/creature.png
rename to data/icons/creature.png
diff --git a/data/borders/icons/day.png b/data/icons/day.png
similarity index 100%
rename from data/borders/icons/day.png
rename to data/icons/day.png
diff --git a/data/borders/icons/eldrazi.png b/data/icons/eldrazi.png
similarity index 100%
rename from data/borders/icons/eldrazi.png
rename to data/icons/eldrazi.png
diff --git a/data/borders/icons/enchantment.png b/data/icons/enchantment.png
similarity index 100%
rename from data/borders/icons/enchantment.png
rename to data/icons/enchantment.png
diff --git a/data/borders/icons/instant.png b/data/icons/instant.png
similarity index 100%
rename from data/borders/icons/instant.png
rename to data/icons/instant.png
diff --git a/data/borders/icons/land.png b/data/icons/land.png
similarity index 100%
rename from data/borders/icons/land.png
rename to data/icons/land.png
diff --git a/data/borders/icons/moon.png b/data/icons/moon.png
similarity index 100%
rename from data/borders/icons/moon.png
rename to data/icons/moon.png
diff --git a/data/borders/icons/multitype.png b/data/icons/multitype.png
similarity index 100%
rename from data/borders/icons/multitype.png
rename to data/icons/multitype.png
diff --git a/data/borders/icons/night.png b/data/icons/night.png
similarity index 100%
rename from data/borders/icons/night.png
rename to data/icons/night.png
diff --git a/data/borders/icons/planeshift.png b/data/icons/planeshift.png
similarity index 100%
rename from data/borders/icons/planeshift.png
rename to data/icons/planeshift.png
diff --git a/data/borders/icons/planeswalker.png b/data/icons/planeswalker.png
similarity index 100%
rename from data/borders/icons/planeswalker.png
rename to data/icons/planeswalker.png
diff --git a/data/borders/icons/sorcery.png b/data/icons/sorcery.png
similarity index 100%
rename from data/borders/icons/sorcery.png
rename to data/icons/sorcery.png
diff --git a/data/borders/icons/structure.png b/data/icons/structure.png
similarity index 100%
rename from data/borders/icons/structure.png
rename to data/icons/structure.png
diff --git a/data/scripts/main.js b/data/main.js
similarity index 99%
rename from data/scripts/main.js
rename to data/main.js
index b65177f7..f1d01e3a 100644
--- a/data/scripts/main.js
+++ b/data/main.js
@@ -263,7 +263,7 @@ function updateBorder() {
imgBorderFlipTip.src = firstColorPath + "/flipTip.png"
}
imgBorderFlipCircle.src = firstColorPath + "/flipCircle.png"
- imgBorderFlipIcon.src = "data/borders/icons/" + document.getElementById("inputFlipIcon").value
+ imgBorderFlipIcon.src = "data/icons/" + document.getElementById("inputFlipIcon").value
}
//This allows all the images to be loaded
imagesToLoad = 0
@@ -786,7 +786,7 @@ function randomizeSampleCards(count) {
cardNumbers[cardNumbers.length] = randomNumber
var imgName = "sampleCard" + cardNumbers.length
window[imgName] = new Image()
- window[imgName].src = "sampleCards/sample-card-" + randomNumber + ".png"
+ window[imgName].src = "images/sampleCards/sample-card-" + randomNumber + ".png"
}
sampleCard1.onload = function() {
document.getElementById("sampleCardA").src = sampleCard1.src
diff --git a/data/scripts/old/autocrop.js b/data/scripts/old/autocrop.js
deleted file mode 100644
index 091f73d6..00000000
--- a/data/scripts/old/autocrop.js
+++ /dev/null
@@ -1,50 +0,0 @@
-//Create canvas for cropping the image
-var cropCanvas = document.createElement("canvas")
-var cropContext = cropCanvas.getContext("2d")
-
-//Function that auto crops the image
-function autocrop(url, destination) {
- //Create image, size canvas, draw image
- var imgTempSetSymbol = new Image()
- imgTempSetSymbol.crossOrigin = "anonymous"
- imgTempSetSymbol.src = url
- imgTempSetSymbol.onload = function() {
- if (imgTempSetSymbol.width > 0 && imgTempSetSymbol.height > 0) {
- cropCanvas.width = imgTempSetSymbol.width
- cropCanvas.height = imgTempSetSymbol.height
- cropContext.drawImage(imgTempSetSymbol, 0, 0)
- //declare variables
- var width = cropCanvas.width
- var height = cropCanvas.height
- var pix = {x:[], y:[]}
- var imageData = cropContext.getImageData(0,0,cropCanvas.width,cropCanvas.height)
- var x, y, index
- //Go through every pixel and
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- //(y * width + x) * 4 + 3 calculates the index at which the alpha value of the pixel at x, y is given
- index = (y * width + x) * 4 + 3
- if (imageData.data[index] > 0) {
- //pix is the image object that stores two arrays of x and y coordinates. These stored coordinates are all the visible pixels
- pix.x.push(x)
- pix.y.push(y)
- }
- }
- }
- //sorts the arrays numerically
- pix.x.sort(function(a,b){return a-b})
- pix.y.sort(function(a,b){return a-b})
- var n = pix.x.length - 1
- //Finds the difference between the leftmost and rightmost visible pixels, and the topmost and bottommost pixels, cuts out a section of the canvas
- width = pix.x[n] - pix.x[0]
- height = pix.y[n] - pix.y[0]
- var cropped = cropContext.getImageData(pix.x[0], pix.y[0], width + 1, height + 1)
- //Resizes the canvas and draws cropped image
- cropCanvas.width = width + 1
- cropCanvas.height = height + 1
- cropContext.putImageData(cropped, 0, 0)
- //Saves the newly cropped image to the given image
- destination.src = cropCanvas.toDataURL()
- }
- }
-}
\ No newline at end of file
diff --git a/data/scripts/old/loadColors.js b/data/scripts/old/loadColors.js
deleted file mode 100644
index ac04808d..00000000
--- a/data/scripts/old/loadColors.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//loadColors("white-White,blue-Blue,colorlessLand-Colorless Land,gold-Gold"), this is an example of how to use the function
-function loadColors(colors) {
- var endResult = ""
- var colorList = colors.split(",")
- for (i = 0; i < colorList.length; i++) {
- endResult += ""
- }
- document.getElementById("colorSelection").innerHTML = endResult
-}
\ No newline at end of file
diff --git a/data/scripts/old/loadImage.js b/data/scripts/old/loadImage.js
deleted file mode 100644
index d7b0efb9..00000000
--- a/data/scripts/old/loadImage.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function loadImage(event, destination, arg) {
- if (arg != false) {
- var input = event.target
- var reader = new FileReader()
- reader.onload = function() {
- var dataURL = reader.result
- destination.src = dataURL
- destination.cropped = false
- if (destination == imgWatermark) {
- imgWatermark.whiteToTransparent = false
- }
- }
- reader.readAsDataURL(input.files[0])
- }
-}
\ No newline at end of file
diff --git a/data/scripts/old/loadScript.js b/data/scripts/old/loadScript.js
deleted file mode 100644
index d3d66296..00000000
--- a/data/scripts/old/loadScript.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//Allows javascript files to be loaded through javascript code
-function loadScript(scriptName){
- var script = document.createElement("script")
- script.setAttribute("type","text/javascript")
- script.setAttribute("src", scriptName)
- if (typeof script != "undefined") {
- document.getElementsByTagName("head")[0].appendChild(script)
- }
-}
\ No newline at end of file
diff --git a/data/scripts/old/mask.js b/data/scripts/old/mask.js
deleted file mode 100644
index 20ed0b85..00000000
--- a/data/scripts/old/mask.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var mask = document.createElement("canvas")
-var maskContext = mask.getContext("2d")
-
-function drawMask(img, x, y, width, height, targetContext, imgMask, secondMask, arg) {
- if (imgMask.width > 0) {
- var context = targetContext
- mask.width = width
- mask.height = height
- maskContext.clearRect(0, 0, width, height)
- maskContext.globalCompositeOperation = "source-over"
- if (secondMask.src != undefined && secondMask.width > 0) {
- maskContext.drawImage(secondMask, 0, 0, width, height)
- if (arg == "reverseSecond") {
- maskContext.globalCompositeOperation = "source-out"
- } else {
- maskContext.globalCompositeOperation = "source-in"
- }
- }
- //console.log(width + ", " + height + " --- " + imgMask.width + ", " + imgMask.height + " --- " + img.width + ", " + img.height)
- maskContext.drawImage(imgMask, 0, 0, width, height)
- maskContext.globalCompositeOperation = "source-in"
- if (img.src == undefined) {
- maskContext.fillStyle = img
- maskContext.fillRect(0, 0, width, height)
- } else if (img.width > 0) {
- maskContext.drawImage(img, 0, 0, width, height)
- }
- targetContext.drawImage(mask, x, y, width, height)
- }
-}
-
-CanvasRenderingContext2D.prototype.mask = function(content, x, y, width, height) {
- mask.width = width
- mask.height = height
- maskContext.clearRect(0, 0, width, height)
- var contentList = content.split(";")
- for (i = 0; i < contentList.length; i ++) {
- var currentContent = contentList[i].split(",")
- maskContext.globalCompositeOperation = currentContent[1]
- if (window[currentContent[0]] != undefined) {
- maskContext.drawImage(window[currentContent[0]], 0, 0, width, height)
- } else {
- maskContext.fillStyle = currentContent[0]
- maskContext.fillRect(0, 0, width, height)
- }
- }
- this.drawImage(mask, x, y, width, height)
-}
diff --git a/data/scripts/old/whiteToTransparent.js b/data/scripts/old/whiteToTransparent.js
deleted file mode 100644
index ec90aab0..00000000
--- a/data/scripts/old/whiteToTransparent.js
+++ /dev/null
@@ -1,35 +0,0 @@
-//Create a canvas to work on when making white pixels transparent
-var transparentCanvas = document.createElement("canvas")
-var transparentContext = transparentCanvas.getContext("2d")
-
-//Function that auto the image
-function whiteToTransparent(targetImage) {
- //Create image, size canvas, draw image
- var imgTemporary = new Image()
- imgTemporary.crossOrigin = "anonymous"
- imgTemporary.src = targetImage.src
- imgTemporary.onload = function() {
- if (imgTemporary.width > 0 && imgTemporary.height > 0) {
- transparentCanvas.width = imgTemporary.width
- transparentCanvas.height = imgTemporary.height
- transparentContext.drawImage(imgTemporary, 0, 0)
- //declare variables
- var width = transparentCanvas.width
- var height = transparentCanvas.height
- var imageData = transparentContext.getImageData(0,0,transparentCanvas.width,transparentCanvas.height)
- var x, y, index
- //Go through every pixel and
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- index = (y * width + x) * 4
- if (imageData.data[index] >= 250 && imageData.data[index + 1] >= 250 && imageData.data[index + 2] >= 250) {
- imageData.data[index + 3] = 0
- }
- }
- }
- transparentContext.clearRect(0, 0, width, height)
- transparentContext.putImageData(imageData, 0, 0)
- targetImage.src = transparentCanvas.toDataURL()
- }
- }
-}
diff --git a/sampleCards/sample-card-1.png b/images/sampleCards/sample-card-1.png
similarity index 100%
rename from sampleCards/sample-card-1.png
rename to images/sampleCards/sample-card-1.png
diff --git a/sampleCards/sample-card-10.png b/images/sampleCards/sample-card-10.png
similarity index 100%
rename from sampleCards/sample-card-10.png
rename to images/sampleCards/sample-card-10.png
diff --git a/sampleCards/sample-card-11.png b/images/sampleCards/sample-card-11.png
similarity index 100%
rename from sampleCards/sample-card-11.png
rename to images/sampleCards/sample-card-11.png
diff --git a/sampleCards/sample-card-12.png b/images/sampleCards/sample-card-12.png
similarity index 100%
rename from sampleCards/sample-card-12.png
rename to images/sampleCards/sample-card-12.png
diff --git a/sampleCards/sample-card-13.png b/images/sampleCards/sample-card-13.png
similarity index 100%
rename from sampleCards/sample-card-13.png
rename to images/sampleCards/sample-card-13.png
diff --git a/sampleCards/sample-card-2.png b/images/sampleCards/sample-card-2.png
similarity index 100%
rename from sampleCards/sample-card-2.png
rename to images/sampleCards/sample-card-2.png
diff --git a/sampleCards/sample-card-3.png b/images/sampleCards/sample-card-3.png
similarity index 100%
rename from sampleCards/sample-card-3.png
rename to images/sampleCards/sample-card-3.png
diff --git a/sampleCards/sample-card-4.png b/images/sampleCards/sample-card-4.png
similarity index 100%
rename from sampleCards/sample-card-4.png
rename to images/sampleCards/sample-card-4.png
diff --git a/sampleCards/sample-card-5.png b/images/sampleCards/sample-card-5.png
similarity index 100%
rename from sampleCards/sample-card-5.png
rename to images/sampleCards/sample-card-5.png
diff --git a/sampleCards/sample-card-6.png b/images/sampleCards/sample-card-6.png
similarity index 100%
rename from sampleCards/sample-card-6.png
rename to images/sampleCards/sample-card-6.png
diff --git a/sampleCards/sample-card-7.png b/images/sampleCards/sample-card-7.png
similarity index 100%
rename from sampleCards/sample-card-7.png
rename to images/sampleCards/sample-card-7.png
diff --git a/sampleCards/sample-card-8.png b/images/sampleCards/sample-card-8.png
similarity index 100%
rename from sampleCards/sample-card-8.png
rename to images/sampleCards/sample-card-8.png
diff --git a/sampleCards/sample-card-9.png b/images/sampleCards/sample-card-9.png
similarity index 100%
rename from sampleCards/sample-card-9.png
rename to images/sampleCards/sample-card-9.png
diff --git a/index.html b/index.html
index a17e5a6e..e110083e 100644
--- a/index.html
+++ b/index.html
@@ -776,7 +776,7 @@ a:hover, a:active {
}
-
+