From 26d6a85516ac79a07a2e07830cc051b450cd1492 Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Tue, 16 Jun 2020 17:08:43 -0700 Subject: [PATCH] setsymbolfromgatherer --- data/images/misc/{kb-c.png => cc-c.png} | Bin data/images/misc/{kb-m.png => cc-m.png} | Bin data/images/misc/{kb-r.png => cc-r.png} | Bin data/images/misc/{kb-t.png => cc-s.png} | Bin data/images/misc/{kb-u.png => cc-u.png} | Bin data/scripts/main.js | 12 +++++++++++- index.html | 4 ++-- 7 files changed, 13 insertions(+), 3 deletions(-) rename data/images/misc/{kb-c.png => cc-c.png} (100%) rename data/images/misc/{kb-m.png => cc-m.png} (100%) rename data/images/misc/{kb-r.png => cc-r.png} (100%) rename data/images/misc/{kb-t.png => cc-s.png} (100%) rename data/images/misc/{kb-u.png => cc-u.png} (100%) diff --git a/data/images/misc/kb-c.png b/data/images/misc/cc-c.png similarity index 100% rename from data/images/misc/kb-c.png rename to data/images/misc/cc-c.png diff --git a/data/images/misc/kb-m.png b/data/images/misc/cc-m.png similarity index 100% rename from data/images/misc/kb-m.png rename to data/images/misc/cc-m.png diff --git a/data/images/misc/kb-r.png b/data/images/misc/cc-r.png similarity index 100% rename from data/images/misc/kb-r.png rename to data/images/misc/cc-r.png diff --git a/data/images/misc/kb-t.png b/data/images/misc/cc-s.png similarity index 100% rename from data/images/misc/kb-t.png rename to data/images/misc/cc-s.png diff --git a/data/images/misc/kb-u.png b/data/images/misc/cc-u.png similarity index 100% rename from data/images/misc/kb-u.png rename to data/images/misc/cc-u.png diff --git a/data/scripts/main.js b/data/scripts/main.js index 5d1b0129..71e735a4 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -70,6 +70,13 @@ cardArt.onload = function() { document.getElementById('inputCardArtY').value = artY cardArtUpdated() } +function setSymbolFromGatherer() { + if (document.getElementById('inputSetCode').value.toLowerCase() == 'cc') { + setSymbol.src = 'http://cardconjurer.com/data/images/misc/cc-' + document.getElementById('inputSetRarity').value.toLowerCase() + } else { + autoCrop(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) + } +} setSymbol.onload = function() { if (setSymbol.width / setSymbol.height > setSymbolWidth / setSymbolHeight) { setSymbolDrawWidth = setSymbolWidth @@ -680,6 +687,8 @@ function manaCostUpdated() { drawCardObjects() } + + function watermarkUpdated() { if (document.getElementById('inputWatermarkPrimary').value != 'none') { watermarkContext.clearRect(0, 0, cardWidth, cardHeight) @@ -767,7 +776,8 @@ function inputCardNameNumberTextImport(index) { document.getElementById('inputCardArtName').value = beforeAfter(importCardTextResponse, '"name":"', '",') document.getElementById('inputSetCode').value = beforeAfter(importCardTextResponse, '"set":"', '",') document.getElementById('inputSetRarity').value = beforeAfter(importCardTextResponse, '"rarity":"', '",')[0] - autoCrop(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) + setSymbolFromGatherer() + // autoCrop(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":"', '",')) manaCostUpdated() drawCardText() diff --git a/index.html b/index.html index 82d106cb..812b03f8 100644 --- a/index.html +++ b/index.html @@ -135,8 +135,8 @@
- - + +