diff --git a/data/site/askScryfallStyles.css b/askScryfallStyles.css similarity index 100% rename from data/site/askScryfallStyles.css rename to askScryfallStyles.css diff --git a/askscryfall.html b/askscryfall.html index f1ce2e09..300ee598 100644 --- a/askscryfall.html +++ b/askscryfall.html @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ CC - Ask Scryfall - +
Ask Scryfall @@ -78,4 +78,4 @@
- \ No newline at end of file + diff --git a/data/images/blank.png b/data/images/blank.png new file mode 100644 index 00000000..fa5d1ff0 Binary files /dev/null and b/data/images/blank.png differ diff --git a/data/scripts/main.js b/data/scripts/main.js index 45358524..813eb9bf 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -50,9 +50,10 @@ newCanvas('autoCrop') var artWidth = cardWidth, artHeight = cardHeight var setSymbolDrawX, setSymbolDrawY, setSymbolDrawWidth, setSymbolDrawHeight var watermarkDrawX = 0, watermarkDrawY = 0, watermarkDrawWidth = 0, watermarkDrawHeight = 0 -cardArt = new Image() -setSymbol = new Image() -watermark = new Image() +var cardArt = new Image() +cardArt.src = 'data/images/blank.png' +var setSymbol = new Image() +var watermark = new Image() cardArt.crossOrigin = "anonymous" setSymbol.crossOrigin = "anonymous" watermark.crossOrigin = "anonymous" @@ -116,7 +117,9 @@ class cardPlaceholder { } else { mainContext.globalAlpha = 1 } - mainContext.drawImage(this.whatToDraw, scaleX(this.x), scaleY(this.y), scaleX(this.width) * this.zoom, scaleY(this.height) * this.zoom) + console.log(this.whatToDraw, scaleX(this.x), scaleY(this.y), scaleX(this.width) * this.zoom, scaleY(this.height) * this.zoom) + mainContext.drawImage(this.whatToDraw, scaleX(this.x), scaleY(this.y), scaleX(this.width) * this.zoom, scaleY(this.height) * this.zoom) +// breaks here } cardMasterElement() { var temporaryElement = document.createElement('div') @@ -219,7 +222,8 @@ function drawCardObjects() { mainContext.drawImage(setSymbol, setSymbolDrawX, setSymbolDrawY, setSymbolDrawWidth, setSymbolDrawHeight) mainContext.drawImage(bottomInfoCanvas, 0, 0, cardWidth, cardHeight) mainContext.globalCompositeOperation = 'destination-over' - mainContext.drawImage(cardArt, scaleX(cardMasterList[0].x), scaleY(cardMasterList[0].y), scaleX(cardMasterList[0].width) * cardMasterList[0].zoom, scaleY(cardMasterList[0].height) * cardMasterList[0].zoom) + mainContext.drawImage(cardArt, scaleX(cardMasterList[0].x), scaleY(cardMasterList[0].y), scaleX(cardMasterList[0].width) * cardMasterList[0].zoom, scaleY(cardMasterList[0].height) * cardMasterList[0].zoom) + //breaks here mainContext.globalCompositeOperation = 'destination-out' //draw the corner cutters mainContext.drawImage(cornerCutout, 0, 0, scaleX(59/1500), scaleX(59/1500)) @@ -843,4 +847,4 @@ function autoCrop(targetImage, source = targetImage.src) { //Must run last: -initialize() \ No newline at end of file +initialize() diff --git a/data/scripts/palettes/dayRave.js b/data/scripts/palettes/dayRave.js index 2bb12b6f..ab1e3022 100644 --- a/data/scripts/palettes/dayRave.js +++ b/data/scripts/palettes/dayRave.js @@ -7,7 +7,7 @@ rootStyles.setProperty('--input-color', '#efefef') rootStyles.setProperty('--input-font-color', '#000') rootStyles.setProperty('--font-color', '#000') rootStyles.setProperty('--font-color-contrast', '#000') -rootStyles.setProperty('--body-background', 'url(images/lowpoly.png)') +rootStyles.setProperty('--body-background', 'url(data/site/images/lowpoly.png)') setCookie('colorPalette', 'dayRave') //Cycles through a rainbow! diff --git a/data/scripts/palettes/nightRave.js b/data/scripts/palettes/nightRave.js index 39f5b456..e1fc6330 100644 --- a/data/scripts/palettes/nightRave.js +++ b/data/scripts/palettes/nightRave.js @@ -7,7 +7,7 @@ rootStyles.setProperty('--input-color', '#3a3a3a') rootStyles.setProperty('--input-font-color', '#efefef') rootStyles.setProperty('--font-color', '#000') rootStyles.setProperty('--font-color-contrast', '#efefef') -rootStyles.setProperty('--body-background', 'url(images/lowpoly.png)') +rootStyles.setProperty('--body-background', 'url(data/site/images/lowpoly.png)') setCookie('colorPalette', 'nightRave') //Cycles through a rainbow! diff --git a/data/scripts/palettes/scholarMode.js b/data/scripts/palettes/scholarMode.js index 016971db..2522502e 100644 --- a/data/scripts/palettes/scholarMode.js +++ b/data/scripts/palettes/scholarMode.js @@ -1,11 +1,11 @@ rootStyles.setProperty('--background-color', 'none') -rootStyles.setProperty('--background-color-contrast', 'url(images/palettes/canvasPaper.png)') -rootStyles.setProperty('--interactable-color', 'url(images/palettes/whitePaperTileable.png)') -rootStyles.setProperty('--interactable-selected-color', 'url(images/palettes/whitePaperHighlightedTileable.png)') +rootStyles.setProperty('--background-color-contrast', 'url(data/site/images/palettes/canvasPaper.png)') +rootStyles.setProperty('--interactable-color', 'url(data/site/images/palettes/whitePaperTileable.png)') +rootStyles.setProperty('--interactable-selected-color', 'url(data/site/images/palettes/whitePaperHighlightedTileable.png)') rootStyles.setProperty('--interactable-tiling', 'auto') -rootStyles.setProperty('--input-color', 'url(images/palettes/whitePaperTileable.png)') +rootStyles.setProperty('--input-color', 'url(data/site/images/palettes/whitePaperTileable.png)') rootStyles.setProperty('--input-font-color', '#000') rootStyles.setProperty('--font-color', '#eee') rootStyles.setProperty('--font-color-contrast', '#000') -rootStyles.setProperty('--body-background', 'url(images/palettes/darkWood.png)') -setCookie('colorPalette', 'scholarMode') \ No newline at end of file +rootStyles.setProperty('--body-background', 'url(data/site/images/palettes/darkWood.png)') +setCookie('colorPalette', 'scholarMode') diff --git a/disclaimer.html b/disclaimer.html index 6902f765..e4452ea4 100644 --- a/disclaimer.html +++ b/disclaimer.html @@ -2,7 +2,7 @@ - + @@ -65,4 +65,4 @@
- \ No newline at end of file + diff --git a/index.html b/index.html index 27f4d70b..311cef38 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + @@ -270,4 +270,4 @@ - \ No newline at end of file + diff --git a/data/site/styles.css b/styles.css similarity index 96% rename from data/site/styles.css rename to styles.css index f860293b..c275697d 100644 --- a/data/site/styles.css +++ b/styles.css @@ -1,39 +1,39 @@ /*fonts*/ @font-face { font-family: gothammedium; - src: url("../fonts/gotham-medium.ttf"); + src: url("data/fonts/gotham-medium.ttf"); } @font-face { font-family: belerenb; - src: url("../fonts/beleren-b.ttf"); + src: url("data/fonts/beleren-b.ttf"); } @font-face { font-family: belerenbsc; - src: url("../fonts/beleren-bsc.ttf"); + src: url("data/fonts/beleren-bsc.ttf"); } @font-face { font-family: matrix; - src: url("../fonts/matrix.ttf"); + src: url("data/fonts/matrix.ttf"); } @font-face { font-family: matrixb; - src: url("../fonts/matrix-b.ttf"); + src: url("data/fonts/matrix-b.ttf"); } @font-face { font-family: matrixbsc; - src: url("../fonts/matrix-bsc.ttf"); + src: url("data/fonts/matrix-bsc.ttf"); } @font-face { font-family: mplantin; - src: url("../fonts/mplantin.ttf"); + src: url("data/fonts/mplantin.ttf"); } @font-face { font-family: mplantini; - src: url("../fonts/mplantin-i.ttf"); + src: url("data/fonts/mplantin-i.ttf"); } @font-face { font-family: goudymedieval; - src: url("../fonts/goudy-medieval.ttf"); + src: url("data/fonts/goudy-medieval.ttf"); } :root { @@ -448,4 +448,4 @@ canvas { html { font: 20pt georgia; } -} \ No newline at end of file +} diff --git a/termsofuse.html b/termsofuse.html index 4c0be6e5..a2437412 100644 --- a/termsofuse.html +++ b/termsofuse.html @@ -2,7 +2,7 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file +