diff --git a/OLDdisclaimer.html b/OLDdisclaimer.html deleted file mode 100644 index 2ebbb4ab..00000000 --- a/OLDdisclaimer.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - CC — Disclaimer - - - - - - -
-
-
- Disclaimer: -
-
-
-
- Card Conjurer is in no way affiliated with, sponsored by, or endorsed by Wizards of the Coast. Fonts, Mana symbols, and other related images are trademarks and copyrights of Wizards of the Coast, LLC, a subsidiary of Hasbro, Inc. -
-
-
-
- Most of the card frames were created by the following:
- Kentu, Narb777, CXA26843, FPM, Xander, Chrome Kaldra, CBG, Trancebam, Larme, RoblinTheGoblin, White Dragon, and Timmy XD69. -
-
-
-
- Some fonts and/or images used in this program have been gathered from the following sources under the Creative Commons BY-NC-SA 2.5 License:
- MTG Gamepedia
- Magic Set Editor
- Changes have been made to some of the images. Card Conjurer is not endorsed by these sources. -
-
-
-
- Any other uploaded artwork is property of the original artist, and it is at the discretion of the users that these images are properly credited. -
-
-
- - - - diff --git a/askscryfall.html b/askscryfall.html index 4df1905b..7e5cfffa 100644 --- a/askscryfall.html +++ b/askscryfall.html @@ -1,20 +1,11 @@ + - - - - CC — Ask Scryfall - - - - + CC - Ask Scryfall + + + -
-
-
- Ask Scryfall -
-
-
-
-
+
+
+ Ask Scryfall +
+
+
+
@@ -91,34 +91,41 @@
-
-
-
+
+
+
Ask Scryfall is a replacement for AskUrza.com that periodically compiles all planeswalker abilities (using Scryfall) and sorts them into three categories for use with Urza, Academy Headmaster. This allows for much more unpredictability and, in my opinion, much more fun. To use Ask Scryfall, simply click on the +1, -1, or -6, and let the gods of chaos decide your fate!
-
- -
-
-
-
Card Conjurer By Kyle Burton
-
-
-
- Navigation:
- Card Creator
- Life Counter
- Ask Scryfall -
-
- Legal:
- Disclaimer
- Terms of Use +
+
+ I hope you have as much fun playing Urza this way as I do! +
+ + - - + + diff --git a/data/images/m15/m15MaskNyxCrown.png b/data/images/m15/m15MaskNyxCrown.png index 0998c066..f936b7dd 100644 Binary files a/data/images/m15/m15MaskNyxCrown.png and b/data/images/m15/m15MaskNyxCrown.png differ diff --git a/data/images/m15/m15MaskNyxCrownOuter.png b/data/images/m15/m15MaskNyxCrownOuter.png index 96f54763..6b1d2485 100644 Binary files a/data/images/m15/m15MaskNyxCrownOuter.png and b/data/images/m15/m15MaskNyxCrownOuter.png differ diff --git a/data/images/m15/m15MaskNyxCrownShadowless.png b/data/images/m15/m15MaskNyxCrownShadowless.png index 1e23f941..5b6ca12f 100644 Binary files a/data/images/m15/m15MaskNyxCrownShadowless.png and b/data/images/m15/m15MaskNyxCrownShadowless.png differ diff --git a/data/images/storybook/mizzium_mortars_by_noahbradley-d5dvmd8.jpg b/data/images/storybook/mizzium_mortars_by_noahbradley-d5dvmd8.jpg deleted file mode 100644 index daf82e3f..00000000 Binary files a/data/images/storybook/mizzium_mortars_by_noahbradley-d5dvmd8.jpg and /dev/null differ diff --git a/data/scripts/cookies.js b/data/scripts/cookies.js index 5904bbae..26d845bc 100644 --- a/data/scripts/cookies.js +++ b/data/scripts/cookies.js @@ -1,3 +1,5 @@ +let rootStyles = document.documentElement.style + function setCookie(cookieName, cookieValue, cookieTime = (5 * 365 * 24 * 60 * 60 * 1000)) { //years*days*hours*minutes*seconds*milliseconds var tempDate = new Date() tempDate.setTime(tempDate.getTime() + cookieTime) @@ -21,4 +23,13 @@ function checkCookies() { if (getCookie('colorPalette') != undefined) { loadScript('data/scripts/' + getCookie('colorPalette') + '.js') } +} + +function loadScript(scriptPath){ + var script = document.createElement('script') + script.setAttribute('type','text/javascript') + script.setAttribute('src', scriptPath) + if (typeof script != 'undefined') { + document.getElementsByTagName('head')[0].appendChild(script) + } } \ No newline at end of file diff --git a/data/scripts/main.js b/data/scripts/main.js index cb118c50..9ac21c89 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -19,7 +19,6 @@ manaSymbolCodeList.forEach((item, index) => {manaSymbolImageList[index] = new Im date = new Date() var cornerCutout = new Image() cornerCutout.src = 'data/images/cornerCutout.png' -let rootStyles = document.documentElement.style function newCanvas(name) { window[name + 'Canvas'] = document.createElement('canvas') @@ -434,9 +433,11 @@ function writeText(textObjectList, targetContext) { } else if (possibleCodeLower.includes('right')) { textX += parseInt(possibleCodeLower.replace('right', '')) currentLineWidth += parseInt(possibleCodeLower.replace('right', '')) + permanentLineShift += parseInt(possibleCodeLower.replace('right', '')) } else if (possibleCodeLower.includes('left')) { textX -= parseInt(possibleCodeLower.replace('left', '')) currentLineWidth -= parseInt(possibleCodeLower.replace('left', '')) + permanentLineShift -= parseInt(possibleCodeLower.replace('left', '')) } else if (possibleCodeLower.includes('up')) { finishLine = true paragraphSpace -= parseInt(possibleCodeLower.replace('up', '')) + textSize @@ -685,38 +686,23 @@ function inputCardNameNumberTextImport(index) { } else { importText('', 'Power Toughness') } - /* - if (importCardTextResponse.includes('"loyalty":"') && version.currentVersion == 'planeswalker') { + if (importCardTextResponse.includes('"loyalty":"') && currentVersion == 'planeswalker') { importText(beforeAfter(importCardTextResponse, '"loyalty":"', '",'), 'Loyalty') var abilityList = beforeAfter(importCardTextResponse, '"oracle_text":"', '",').replace(/ \\"/g, ' \u201C').replace(/\\"/g, '\u201D').split(/\\n/g) for (var i = 0; i < abilityList.length; i++) { - var stringVersion = '' - switch(i) { - case 3: - stringVersion = 'Fourth' - break; - case 2: - stringVersion = 'Third' - break; - case 1: - stringVersion = 'Second' - break; - default: - stringVersion = 'First' - } if (abilityList[i].slice(0, 4).includes(':')) { - importText(abilityList[i].split(/: (.+)?/)[1], stringVersion + ' Ability') + importText(abilityList[i].split(/: (.+)?/)[1], 'Ability ' + (i+1)) document.getElementById('inputPlaneswalker' + (i + 1) + 'Icon').value = abilityList[i].split(/: (.+)?/)[0] } else { - importText('{left24}' + abilityList[i], stringVersion + ' Ability') + importText('{left' + parseInt(scaleX(24/750)) + '}' + abilityList[i], 'Ability ' + (i+1)) document.getElementById('inputPlaneswalker' + (i + 1) + 'Icon').value = '' } if (document.getElementById('inputPlaneswalker' + (i + 1)).value < 1) { document.getElementById('inputPlaneswalker' + (i + 1)).value = 1 } } + planeswalkerAbilities() } - */ document.getElementById('inputManaCost').value = beforeAfter(importCardTextResponse, '"mana_cost":"', '",') document.getElementById('inputCardArtName').value = beforeAfter(importCardTextResponse, '"name":"', '",') document.getElementById('inputSetCode').value = beforeAfter(importCardTextResponse, '"set":"', '",') @@ -752,7 +738,7 @@ function toggleTabs(clickedElement, targetId) { function downloadCardImage(linkElement) { if (document.getElementById("inputInfoArtist").value.replace(/ /g, "") != "") { - linkElement.download = cardTextList[0].name.toLowerCase().replace(/ /g, "_") + ".png" + linkElement.download = cardTextList[0].text.toLowerCase().replace(/ /g, "_") + ".png" if (linkElement.download == ".png") { linkElement.download = "card.png" } @@ -767,15 +753,6 @@ function downloadCardImage(linkElement) { linkElement.href = cardImageData } -function loadScript(scriptPath){ - var script = document.createElement('script') - script.setAttribute('type','text/javascript') - script.setAttribute('src', scriptPath) - if (typeof script != 'undefined') { - document.getElementsByTagName('head')[0].appendChild(script) - } -} - function hideFrameImages(frameClass) { Array.from(document.getElementById('framePicker').children).forEach(element => { if (!element.classList.contains(frameClass)) { diff --git a/data/scripts/raveMode.js b/data/scripts/raveMode.js new file mode 100644 index 00000000..929bf513 --- /dev/null +++ b/data/scripts/raveMode.js @@ -0,0 +1,59 @@ +rootStyles.setProperty('--background-color', '#1c1c1c') +rootStyles.setProperty('--background-color-contrast', '#111') +rootStyles.setProperty('--interactable-color', '#333') +rootStyles.setProperty('--interactable-selected-color', '#555') +rootStyles.setProperty('--input-color', '#3a3a3a') +rootStyles.setProperty('--font-color', '#fff') +rootStyles.setProperty('--font-color-contrast', '#eee') +rootStyles.setProperty('--body-background', 'url(images/lowpoly.png)') +setCookie('colorPalette', 'darkMode') + +//Cycles through a rainbow! +if (currentColorIndex == undefined) { + document.getElementById('inputColorPalette').addEventListener('change', function() { + clearInterval(raveMode) + }) +} +var raveMode = setInterval(changeColor, 250) +var regularAdjust = 0//60 +var lightAdjust = 64//100 +var lightLead = 255 +var currentColorIndex = 0 +function changeColor() { + var colors = indexToColor(currentColorIndex) + var lightColors = indexToColor(currentColorIndex + lightLead) + rootStyles.setProperty('--background-color', 'linear-gradient(to bottom right, ' + "rgb(" + parseInt(colors[0] + regularAdjust) + "," + parseInt(colors[1] + regularAdjust) + "," + parseInt(colors[2] + regularAdjust) + ")" + ', ' + "rgb(" + parseInt(lightColors[0] + lightAdjust) + "," + parseInt(lightColors[1] + lightAdjust) + "," + parseInt(lightColors[2] + lightAdjust) + ")" + ')') + currentColorIndex += 2.5 * 153 / 180 //The second number is how many seconds it takes to do a full loop +} +function indexToColor(colorIndex) { + var red = 0, green = 0, blue = 0 + var realColorIndex = colorIndex - Math.floor(colorIndex / 1530) * 1530 + var colorStage = Math.floor(realColorIndex / 255) + switch(colorStage) { + case 0: + green = 255 + red = realColorIndex - Math.floor(realColorIndex / 255) * 255 + break + case 1: + red = 255 + green = 255 - realColorIndex + Math.floor(realColorIndex / 255) * 255 + break + case 2: + red = 255 + blue = realColorIndex - Math.floor(realColorIndex / 255) * 255 + break + case 3: + blue = 255 + red = 255 - realColorIndex + Math.floor(realColorIndex / 255) * 255 + break + case 4: + blue = 255 + green = realColorIndex - Math.floor(realColorIndex / 255) * 255 + break + case 5: + green = 255 + blue = 255 - realColorIndex + Math.floor(realColorIndex / 255) * 255 + break + } + return [red, green, blue] +} diff --git a/data/scripts/versionPlaneswalker.js b/data/scripts/versionPlaneswalker.js index 7b870fa2..ad2ce28d 100644 --- a/data/scripts/versionPlaneswalker.js +++ b/data/scripts/versionPlaneswalker.js @@ -60,6 +60,7 @@ if (!loadedVersions.includes('planeswalker')) { var lightColor = 'white' var planeswalkerLightToDark = new Image() var planeswalkerDarkToLight = new Image() + planeswalkerDarkToLight.onload = function(){planeswalkerAbilities()} } if (currentVersion != 'planeswalker') { @@ -228,5 +229,4 @@ function invertPlaneswalkerColors() { planeswalkerLightToDark.src = lightToDarkPlaneswalker.src planeswalkerDarkToLight.src = darkToLightPlaneswalker.src } - planeswalkerAbilities(); } \ No newline at end of file diff --git a/data/site/images/lowpoly.png b/data/site/images/lowpoly.png new file mode 100644 index 00000000..2d6e1d17 Binary files /dev/null and b/data/site/images/lowpoly.png differ diff --git a/data/site/styles.css b/data/site/styles.css index c2fed828..1726b76f 100644 --- a/data/site/styles.css +++ b/data/site/styles.css @@ -48,7 +48,7 @@ } html { - font: 20pt roboto; + font: 20pt georgia; background: var(--background-color); color: var(--font-color); background-attachment: fixed; @@ -300,7 +300,7 @@ input[type='checkbox'], select, option, input[type='file'], button { padding: 2rem; background: var(--background-color-contrast); color: var(--font-color-contrast); - font: 0.6rem 'open sans'; + font: 0.6rem arial; display: grid; grid-template-columns: auto auto auto; } @@ -308,7 +308,8 @@ input[type='checkbox'], select, option, input[type='file'], button { .fiveSampleCards { display: grid; grid-template-columns: 1fr 1fr 1fr 1fr 1fr; - margin: 2rem 0; + margin-top: 1rem; + margin-bottom: 3rem; } .fiveSampleCards > div > img { position: relative; diff --git a/disclaimer.html b/disclaimer.html index 79d96a0b..2b882b23 100644 --- a/disclaimer.html +++ b/disclaimer.html @@ -40,6 +40,7 @@
diff --git a/index.html b/index.html index a49012a2..6be55ffc 100644 --- a/index.html +++ b/index.html @@ -171,17 +171,17 @@
-
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Laoreet suspendisse interdum consectetur libero id faucibus nisl tincidunt. Id volutpat lacus laoreet non curabitur. Adipiscing tristique risus nec feugiat in fermentum. Vulputate mi sit amet mauris. Morbi tincidunt augue interdum velit euismod in. Amet mattis vulputate enim nulla aliquet porttitor lacus luctus accumsan. Sed felis eget velit aliquet sagittis. Neque ornare aenean euismod elementum nisi quis eleifend. Nisl nunc mi ipsum faucibus vitae. Mattis nunc sed blandit libero volutpat sed cras ornare. Sed vulputate mi sit amet mauris commodo quis imperdiet massa. Condimentum mattis pellentesque id nibh tortor. Leo in vitae turpis massa. Dignissim cras tincidunt lobortis feugiat vivamus. Massa ultricies mi quis hendrerit dolor magna eget est.
-
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vehicula ipsum a arcu cursus vitae. Venenatis tellus in metus vulputate eu. Id diam maecenas ultricies mi. Enim nec dui nunc mattis enim ut tellus elementum. Consectetur libero id faucibus nisl tincidunt eget nullam non. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Morbi leo urna molestie at elementum eu facilisis sed odio. Nulla pharetra diam sit amet nisl suscipit. A erat nam at lectus urna duis. Neque viverra justo nec ultrices.
-
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vehicula ipsum a arcu cursus vitae. Venenatis tellus in metus vulputate eu. Id diam maecenas ultricies mi. Enim nec dui nunc mattis enim ut tellus elementum. Consectetur libero id faucibus nisl tincidunt eget nullam non. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Morbi leo urna molestie at elementum eu facilisis sed odio. Nulla pharetra diam sit amet nisl suscipit. A erat nam at lectus urna duis. Neque viverra justo nec ultrices.
@@ -192,6 +192,7 @@
diff --git a/termsofuse.html b/termsofuse.html index a0d4b231..1bc33177 100644 --- a/termsofuse.html +++ b/termsofuse.html @@ -31,6 +31,7 @@