From 8ff4a1c4feefe506b4a7013dfe4279a7e18cf0df Mon Sep 17 00:00:00 2001
From: Kyle <41976328+ImKyle4815@users.noreply.github.com>
Date: Tue, 24 Dec 2019 15:53:23 -0800
Subject: [PATCH] fix
---
data/scripts/main.js | 24 ++++++++++++++++++------
data/versions/expedition.js | 6 ++++--
data/versions/m15.js | 2 ++
data/versions/m15extras.js | 2 ++
data/versions/planeswalker.js | 6 ++++--
data/versions/unhinged.js | 6 ++++--
index.html | 2 +-
7 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/data/scripts/main.js b/data/scripts/main.js
index 9949907b..8718eb32 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -52,9 +52,15 @@ function initiate() {
setSymbol.crossOrigin = "anonymous";
watermark.crossOrigin = "anonymous";
cardArt.onload = function() {
- // cardImageUpdated();
+ if (this.width / this.height > version.artWidth / version.artHeight) {
+ document.getElementById("inputCardArtZoom").value = version.artHeight / this.height * 100;
+ } else {
+ document.getElementById("inputCardArtZoom").value = version.artWidth / this.width * 100;
+ }
+ document.getElementById("inputCardArtX").value = 0;
+ document.getElementById("inputCardArtY").value = 0;
cardMasterUpdated();
- document.getElementById("artPlaceholderImage").src = this.src
+ document.getElementById("artPlaceholderImage").src = this.src;
}
setSymbol.onload = function() {
updateSetSymbol();
@@ -560,10 +566,10 @@ CanvasRenderingContext2D.prototype.writeText = function(text = "", textX = 0, te
outline = true;
lineContext.strokeStyle = possibleCodeLower.replace("outline:", "").split(",")[0];
lineContext.lineWidth = parseInt(possibleCodeLower.replace("outline:", "").split(",")[1]);
- } else if (manaSymbolCodeList.includes(possibleCodeLower)) {
+ } else if (manaSymbolCodeList.includes(possibleCodeLower.split("/").join(""))) {
//THIS HAS TO BE THE LAST ONE
var manaSymbolDiameter = textSize * 0.77
- lineContext.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf(possibleCodeLower)], currentLineX, currentLineY - manaSymbolDiameter * 0.95, manaSymbolDiameter, manaSymbolDiameter)
+ lineContext.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf(possibleCodeLower.split("/").join(""))], currentLineX, currentLineY - manaSymbolDiameter * 0.95, manaSymbolDiameter, manaSymbolDiameter)
currentLineX += manaSymbolDiameter * 1.02
} else {
wordToWrite = splitString[i]
@@ -640,7 +646,7 @@ function loadManaSymbolImages() {
}
//Draws a mana cost
CanvasRenderingContext2D.prototype.drawManaCost = function(text, symbolsX, symbolsY, diameter = 50, distance = -50, direction = "horizontal") {
- var splitManaCost = text.toLowerCase().replace(/{/g, " ").replace(/}/g, " ").split(" ")
+ var splitManaCost = text.toLowerCase().replace(/{/g, " ").replace(/}/g, " ").split("/").join("").split(" ")
var currentSymbolIndex = 0
var currentX = symbolsX
var currentY = symbolsY
@@ -949,14 +955,20 @@ function inputCardNameTextImport(cardName) {
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
var importCardTextResponse = this.responseText;
- console.log(importCardTextResponse);
importText(beforeAfter(importCardTextResponse, '"name":"', '",'), "Title");
importText(beforeAfter(importCardTextResponse, '"type_line":"', '",'), "Type");
importText(beforeAfter(importCardTextResponse, '"oracle_text":"', '",').replace(/\\n/g, "{line}"), "Rules Text");
if (importCardTextResponse.includes('"power":"')) {
importText(beforeAfter(importCardTextResponse, '"power":"', '",') + "/" + beforeAfter(importCardTextResponse, '"toughness":"', '",'), "Power Toughness");
+ } else {
+ importText("", "Power Toughness");
}
document.getElementById("inputManaCost").value = beforeAfter(importCardTextResponse, '"mana_cost":"', '",');
+ document.getElementById("inputCardArtName").value = beforeAfter(importCardTextResponse, '"name":"', '",');
+ document.getElementById("inputSetCode").value = beforeAfter(importCardTextResponse, '"set":"', '",');
+ document.getElementById("inputSetRarity").value = beforeAfter(importCardTextResponse, '"rarity":"', '",')[0];
+ whiteToTransparent(setSymbol, "https://cors-anywhere.herokuapp.com/http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + document.getElementById("inputSetCode").value + "&size=large&rarity=" + document.getElementById("inputSetRarity").value)
+ inputCardArtName(beforeAfter(importCardTextResponse, '"name":"', '",'));
} else if (this.readyState == 4 && this.status == 404) {
alert("Sorry, but we can't seem to find any card named '" + cardName + "'");
}
diff --git a/data/versions/expedition.js b/data/versions/expedition.js
index 6c929643..542da66d 100644
--- a/data/versions/expedition.js
+++ b/data/versions/expedition.js
@@ -2,8 +2,10 @@
// Card Conjurer, by Kyle Burton //
//============================================//
version.currentVersion = "expedition"
-version.artX = scale(58)
-version.artY = scale(118)
+version.artX = scale(56)
+version.artY = scale(113)
+version.artWidth = scale(630)
+version.artHeight = scale(720)
version.setSymbolRight = scale(687)
version.setSymbolVertical = scale(872)
version.setSymbolWidth = scale(90)
diff --git a/data/versions/m15.js b/data/versions/m15.js
index cd9620f6..9beff01b 100644
--- a/data/versions/m15.js
+++ b/data/versions/m15.js
@@ -4,6 +4,8 @@
version.currentVersion = "m15"
version.artX = scale(58)
version.artY = scale(118)
+version.artWidth = scale(626)
+version.artHeight = scale(458)
version.setSymbolRight = scale(684)
version.setSymbolVertical = scale(614)
version.setSymbolWidth = scale(90)
diff --git a/data/versions/m15extras.js b/data/versions/m15extras.js
index 95305c0a..d9b4ccc6 100644
--- a/data/versions/m15extras.js
+++ b/data/versions/m15extras.js
@@ -4,6 +4,8 @@
version.currentVersion = "m15"
version.artX = scale(58)
version.artY = scale(118)
+version.artWidth = scale(626)
+version.artHeight = scale(458)
version.setSymbolRight = scale(684)
version.setSymbolVertical = scale(614)
version.setSymbolWidth = scale(90)
diff --git a/data/versions/planeswalker.js b/data/versions/planeswalker.js
index 40e38cfc..f13df187 100644
--- a/data/versions/planeswalker.js
+++ b/data/versions/planeswalker.js
@@ -2,8 +2,10 @@
// Card Conjurer, by Kyle Burton //
//============================================//
version.currentVersion = "planeswalker"
-version.artX = scale(58)
-version.artY = scale(118)
+version.artX = scale(50)
+version.artY = scale(95)
+version.artWidth = scale(754)
+version.artHeight = scale(853)
version.setSymbolRight = scale(687)
version.setSymbolVertical = scale(612)
version.setSymbolWidth = scale(90)
diff --git a/data/versions/unhinged.js b/data/versions/unhinged.js
index d9d82ee1..2e6b466d 100644
--- a/data/versions/unhinged.js
+++ b/data/versions/unhinged.js
@@ -2,8 +2,10 @@
// Card Conjurer, by Kyle Burton //
//============================================//
version.currentVersion = "unhinged"
-version.artX = scale(58)
-version.artY = scale(118)
+version.artX = scale(59)
+version.artY = scale(58)
+version.artWidth = scale(623)
+version.artHeight = scale(864)
version.setSymbolRight = scale(684)
version.setSymbolVertical = scale(614)
version.setSymbolWidth = scale(90)
diff --git a/index.html b/index.html
index 243059d4..66f19c4a 100644
--- a/index.html
+++ b/index.html
@@ -27,7 +27,7 @@
Set Symbol
Watermark
Advanced
- Import Text
+ Import Card