diff --git a/backup.html b/backup.html deleted file mode 100644 index 9a152baf..00000000 --- a/backup.html +++ /dev/null @@ -1,614 +0,0 @@ - - - - Card Conjurer - - - - - - - - - - - - - - - -
-
-
- -
-
Card Border
-
- Border - - - -
- Color - - - -
-
- -
- - - -
-
- -
- - - -
-
- -
- -
-
-
-
Border (Advanced)
-
-
- -
-
- -
-
- -
-
- -
-
- -
- - - -
- -
- -
- -
-
- -
- Border Color -
- -
-
- -
- -
-
-
-
Name, Mana Cost, Type
-
- Name - -
- Mana Cost - -
- Type - -
-
-
-
Rules Text
-
- Rules Text -
- -
- Rules Text Font Size - -
- Pixels Between Paragraphs - -
- Shift All Text Down - -
- Shift Mana Symbols Down - -
-
-
-
Card Art
-
- Image - -
- -
- Image Zoom - -
- Image Left - -
- Image Up - -
-
-
-
Bottom Information
-
- Other Info - -
- Card Number - -
- Rarity - -
- Set Abbreviation - -
- Language - -
- Artist Credit - -
-
- -
-
-
-
-
Set Symbol and Watermark
-
-
- -
- Set Code - -
- Set Symbol Rarity - -
- Custom Set Symbol - -
- -
- Scale Set Symbol - -

-
- -
- -
- -
- -
- Watermark Color -
- - - -
-
- -
- - - - Watermark Opacity - -
-
-
-
Download/Options
-
- Frame Rate - - Download -
-
- -
-
-
-
-
-
Mana Symbol Codes
-
- Use the following codes to get the respective symbol in the card's mana cost and rules text. In the mana cost, make sure to include spaces in between the codes, and in the rules text include '<' before each code and '>' after. These codes are caps sensative.
-
-
-
-
-
Other Codes
-
- Like the mana symbols, each of the following codes must include '<' before each code and '>' after. These codes are also caps sensative.
- • line → Skips to the next line
- • bar → Just like line, except adds the bar that usually seperates flavor text
- • lineNoSpace → Just like line, except stays closer to the previous line
- • i → Text is italicized
- • /i → Text returns to normal
- • left → Text aligns to the left
- • center → Text aligns to the center
- • right → Text aligns to the right
- • plane → Creates a large and shifts the following text to the right. This is designed for planar cards. -
-
-
-
Set Abbreviations
-
- Every set in Magic: The Gathering has an associated 2-3 letter code. For example, Homelands is HM and Innistrad is ISD. This program uses the codes from The Gatherer, the official Magic card database. A handy list of all sets and their codes can be found on Wikipedia -
-
-
-
Choosing Your Border
-
- Under the 'Card Border' tab use the following guidelines:
- • Border → Selects the border style, such as planar card, m15 card, etc...
- • Color → Selects the card's primary color
- • Second Color → Selects the card's secondary color which only affects the right half of the card. This creates the same effect as seen on hybrid cards.
- • Third Color → Selects the card's tertiary color which will affect the entire card, including power and toughness. This is used to create two-colored gold cards.
- Under the 'Border (Advanced)' tab the checkboxes are fairly straightforward. Try each feature out to see what it does. -
-
-
- Check out some samples!
- - - -
-
-
- - - - - - - - - - - - - - - - diff --git a/data/background-original.png b/data/background-original.png deleted file mode 100644 index bf5104d0..00000000 Binary files a/data/background-original.png and /dev/null differ diff --git a/data/background.png b/data/background.png deleted file mode 100644 index 46441a3f..00000000 Binary files a/data/background.png and /dev/null differ diff --git a/data/borders/8th/border.js b/data/borders/8th/border.js index 4ecaa02e..a0d3e3c3 100644 --- a/data/borders/8th/border.js +++ b/data/borders/8th/border.js @@ -1,3 +1,7 @@ +imgMultiMask.src = borderPath + "multiMask.png" +imgFrameMask.src = borderPath + "frameMask.png" +imgBorderMask.src = borderPath + "frameMask.png" + var titleFont = "44px matrixb" var titleFontSpacing = "0.5px" var titleX = 66 @@ -27,10 +31,7 @@ var ptY = 920.5 var ptWidth = 162 var ptHeight = 84 -var eighthInfo = true -var eighthInfoY = 956 -var m15Info = false -var m15InfoY = 992 +var infoY = 956 var setSymbolY = 615 var setSymbolRight = 689 @@ -47,4 +48,19 @@ loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black- document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML document.getElementById("thirdColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML -finishTemplate() \ No newline at end of file +finishTemplate() + +var uniqueFunctionName = "bottomInfo8th" +function bottomInfo8th() { + if (document.getElementById("checkboxArtistColor").checked == true) { + card.fillStyle = "black" + } else { + card.fillStyle = "white" + } + canvas.style.letterSpacing = "1px" + card.font = "25px matrixb" + card.fillText(document.getElementById("inputArtist").value, 116, infoY) + canvas.style.letterSpacing = "0.5px" + card.font = "16px mplantin" + card.fillText("CC \u2014 " + document.getElementById("inputInfo").value + " " + document.getElementById("inputNumber").value, 62, infoY + 31) +} \ No newline at end of file diff --git a/data/borders/defaultBorder.js b/data/borders/defaultBorder.js index e6ad7c9d..daa726ab 100644 --- a/data/borders/defaultBorder.js +++ b/data/borders/defaultBorder.js @@ -4,8 +4,6 @@ var cardWidth = 749 var cardHeight = 1044 document.getElementsByClassName("mainGrid")[0].classList.remove("plane") //Sets the correct values to anything that may have been changed from an out of the ordinary border -var eighthInfo = false -var m15Info = false var planechaseInfo = false var legendaryBorder = false var nyxBorder = false diff --git a/data/borders/m15/border.js b/data/borders/m15/border.js index f03688fc..62e35f5c 100644 --- a/data/borders/m15/border.js +++ b/data/borders/m15/border.js @@ -1,5 +1,11 @@ //M15 Border //Anything to do with... +//Loading Images +imgMultiMask.src = borderPath + "multiMask.png" +imgFrameMask.src = borderPath + "frameMask.png" +imgLegendFrameMask.src = borderPath + "legendFrameMask.png" +imgRareStampMask.src = borderPath + "rareStampMask.png" +imgBorderMask.src = borderPath + "borderMask.png" //Card Title var titleFont = "40px belerenb" //40 var titleFontSpacing = "0.15px" //0.15 @@ -30,8 +36,7 @@ var ptY = 929 //929 var ptWidth = 137 //137 var ptHeight = 75 //75 //Bottom Info -var m15Info = true -var m15InfoY = 993 //993 +var infoY = 993 //993 //Set Symbol var setSymbolY = 616 //616 var setSymbolRight = 693 //693 @@ -47,7 +52,7 @@ var rareStampY = 958 //958 loadColors("white-White,whiteLand-White Land,blue-Blue,blueLand-Blue Land,black-Black,blackLand-Black Land,red-Red,redLand-Red Land,green-Green,greenLand-Green Land,gold-Gold,goldLand-Gold Land,colorless-Colorless,colorlessLand-Colorless Land,artifact-Artifact,vehicle-Vehicle") document.getElementById("secondColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML document.getElementById("thirdColorSelection").innerHTML = document.getElementById("colorSelection").innerHTML -//Other +//Things The Card Can Do legendaryBorder = true stampBorder = true nyxBorder = true @@ -55,4 +60,5 @@ miracleBorder = true flipBorder = true //With all the new values in place, the program will update it's border images finishTemplate() -//Any special functions go at the bottom \ No newline at end of file +//Any special functions go at the bottom +var uniqueFunctionName = "bottomInfoM15" \ No newline at end of file diff --git a/data/borders/map/border.js b/data/borders/map/border.js index de741921..4da257cc 100644 --- a/data/borders/map/border.js +++ b/data/borders/map/border.js @@ -1,5 +1,8 @@ //Map Border //Anything to do with... +//Loading Images +imgFrameMask.src = borderPath + "frameMask.png" +imgBorderMask.src = borderPath + "borderMask.png" //Card Title var titleFont = "40px belerenbsc" var titleFontSpacing = "0.1px" @@ -32,10 +35,7 @@ var ptY = 920 var ptWidth = 150 var ptHeight = 70 //Bottom Info -var eighthInfo = false -var eighthInfoY = 992 -var m15Info = true -var m15InfoY = 993 +var infoY = 993 //Set Symbol var setSymbolY = 123 var setSymbolRight = 374.5 @@ -56,4 +56,5 @@ var artX = 30 var artY = 116 //With all the new values in place, the program will update it's border images finishTemplate() -//Any special functions go at the bottom \ No newline at end of file +//Any special functions go at the bottom +var uniqueFunctionName = "bottomInfoM15" \ No newline at end of file diff --git a/data/borders/plane/border.js b/data/borders/plane/border.js index e6fcbd34..d00b0ea2 100644 --- a/data/borders/plane/border.js +++ b/data/borders/plane/border.js @@ -1,5 +1,8 @@ //Plane Border //Anything to do with... +//Loading Images +imgFrameMask.src = borderPath + "frameMask.png" +imgBorderMask.src = borderPath + "borderMask.png" //Card Size cardWidth = 1074 cardHeight = 749 @@ -52,6 +55,7 @@ transparentBorder = true //With all the new values in place, the program will update it's border images finishTemplate() //Any special functions go at the bottom +var uniqueFunctionName = "bottomInfoPlanechase" function bottomInfoPlanechase() { card.textAlign = "left" if (document.getElementById("checkboxArtistColor").checked == true) { diff --git a/data/favicons/android-chrome-192x192.png b/data/favicons/android-chrome-192x192.png deleted file mode 100644 index 3fb39a90..00000000 Binary files a/data/favicons/android-chrome-192x192.png and /dev/null differ diff --git a/data/favicons/android-chrome-256x256.png b/data/favicons/android-chrome-256x256.png deleted file mode 100644 index 3200a2c1..00000000 Binary files a/data/favicons/android-chrome-256x256.png and /dev/null differ diff --git a/data/favicons/apple-touch-icon-120x120.png b/data/favicons/apple-touch-icon-120x120.png deleted file mode 100644 index 50a625ee..00000000 Binary files a/data/favicons/apple-touch-icon-120x120.png and /dev/null differ diff --git a/data/favicons/apple-touch-icon-152x152.png b/data/favicons/apple-touch-icon-152x152.png deleted file mode 100644 index 14e0c2f9..00000000 Binary files a/data/favicons/apple-touch-icon-152x152.png and /dev/null differ diff --git a/data/favicons/apple-touch-icon-180x180.png b/data/favicons/apple-touch-icon-180x180.png deleted file mode 100644 index 336835a9..00000000 Binary files a/data/favicons/apple-touch-icon-180x180.png and /dev/null differ diff --git a/data/favicons/apple-touch-icon-60x60.png b/data/favicons/apple-touch-icon-60x60.png deleted file mode 100644 index 511a4293..00000000 Binary files a/data/favicons/apple-touch-icon-60x60.png and /dev/null differ diff --git a/data/favicons/apple-touch-icon-76x76.png b/data/favicons/apple-touch-icon-76x76.png deleted file mode 100644 index f2a01488..00000000 Binary files a/data/favicons/apple-touch-icon-76x76.png and /dev/null differ diff --git a/data/favicons/apple-touch-icon.png b/data/favicons/apple-touch-icon.png deleted file mode 100644 index 336835a9..00000000 Binary files a/data/favicons/apple-touch-icon.png and /dev/null differ diff --git a/data/favicons/browserconfig.xml b/data/favicons/browserconfig.xml deleted file mode 100644 index 4c9ad6fc..00000000 --- a/data/favicons/browserconfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - #00a300 - - - diff --git a/data/largeIcon.png b/data/largeIcon.png deleted file mode 100644 index caf59b16..00000000 Binary files a/data/largeIcon.png and /dev/null differ diff --git a/data/scripts/main.js b/data/scripts/main.js index 74c9eb30..02a7eba0 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -129,14 +129,8 @@ function cardClock() { drawWatermark() //writes all the text: name, type, rules... writeText() - //m15 and 8th edition have different info at the bottom of the cards and require completely different functions - if (m15Info == true) { - bottomInfoM15() - } else if (eighthInfo == true) { - bottomInfo8th() - }else if (planechaseInfo == true) { - bottomInfoPlanechase() - } + //Runs any special function that a card may have, including bottom information. + window[uniqueFunctionName]() //A shiny foil overlay! if(document.getElementById("checkboxFoil").checked == true) { card.drawImage(imgFoil, 0, 0, cardWidth, cardHeight) @@ -157,6 +151,7 @@ function cardClock() { //The two following functions load border images function changeTemplate() { //the loadScript function is located in data/scripts/loadScript.js. It sets values to variables such as set symbol coordinates or title font + borderPath = "data/borders/" + document.getElementById("borderSelection").value loadScript("data/borders/defaultBorder.js") } function finishTemplate() { @@ -166,20 +161,10 @@ function finishTemplate() { borderCanvas.width = cardWidth borderCanvas.height = cardHeight document.getElementById("colorSelection").value = "white" - imgMultiMask.src = borderPath + "multiMask.png" - imgFrameMask.src = borderPath + "frameMask.png" - if (m15Info == true) { - imgLegendFrameMask.src = borderPath + "legendFrameMask.png" - imgRareStampMask.src = borderPath + "rareStampMask.png" - imgBorderMask.src = borderPath + "borderMask.png" - } else if (eighthInfo == true) { - imgBorderMask.src = borderPath + "frameMask.png" - } updateBorder() } //Loads the images for the card frame, power toughness box, and rare stamp function updateBorder() { - borderPath = "data/borders/" + document.getElementById("borderSelection").value secondColor = document.getElementById("checkboxSecondColor").checked thirdColor = document.getElementById("checkboxThirdColor").checked var firstColorPath = borderPath + document.getElementById("colorSelection").value @@ -557,19 +542,19 @@ function bottomInfoM15() { canvas.style.letterSpacing = "0.8px" card.font = "19.5px relaymedium" var bottomLine = document.getElementById("inputSet").value + " \u00b7 " + document.getElementById("inputLanguage").value - card.fillText(bottomLine, 48, m15InfoY) + card.fillText(bottomLine, 48, infoY) var artistBrushShift = card.measureText(bottomLine).width + 58 - drawMask(card.fillStyle, artistBrushShift, m15InfoY + 5, 21, 13, card, imgArtistBrush, false, false) + drawMask(card.fillStyle, artistBrushShift, infoY + 5, 21, 13, card, imgArtistBrush, false, false) canvas.style.letterSpacing = "1.3px" card.font = "19.5px relaymedium" - card.fillText(document.getElementById("inputNumber").value, 49, m15InfoY - 20) - card.fillText(document.getElementById("inputRarity").value, artistBrushShift - 1, m15InfoY - 20) + card.fillText(document.getElementById("inputNumber").value, 49, infoY - 20) + card.fillText(document.getElementById("inputRarity").value, artistBrushShift - 1, infoY - 20) if (442 < artistBrushShift + card.measureText(document.getElementById("inputRarity").value).width && document.getElementById("checkboxCreature").checked == false) { shiftInfo = artistBrushShift + card.measureText(document.getElementById("inputRarity").value).width + 5 } canvas.style.letterSpacing = "-0.1px" card.font = "24px matrixbsc" - card.fillText(document.getElementById("inputArtist").value, artistBrushShift + 21, m15InfoY + 2) + card.fillText(document.getElementById("inputArtist").value, artistBrushShift + 21, infoY + 2) if (442 < artistBrushShift + 21 + card.measureText(document.getElementById("inputArtist").value).width && document.getElementById("checkboxCreature").checked == true) { shiftInfo = artistBrushShift + card.measureText(document.getElementById("inputArtist").value).width + 26 } @@ -584,26 +569,12 @@ function bottomInfoM15() { bottomInfo = "\u2122 & \u00a9 " + year + " Wizards of the Coast" } if (document.getElementById("checkboxCreature").checked == true) { - card.fillText(bottomInfo, shiftInfo, m15InfoY + 3) + card.fillText(bottomInfo, shiftInfo, infoY + 3) } else { - card.fillText(bottomInfo, shiftInfo, m15InfoY - 17) + card.fillText(bottomInfo, shiftInfo, infoY - 17) } } } -//Bottom info on 8th edition cards -function bottomInfo8th() { - if (document.getElementById("checkboxArtistColor").checked == true) { - card.fillStyle = "black" - } else { - card.fillStyle = "white" - } - canvas.style.letterSpacing = "1px" - card.font = "25px matrixb" - card.fillText(document.getElementById("inputArtist").value, 116, eighthInfoY) - canvas.style.letterSpacing = "0.5px" - card.font = "16px mplantin" - card.fillText("CC \u2014 " + document.getElementById("inputInfo").value + " " + document.getElementById("inputNumber").value, 62, eighthInfoY + 31) -} //============================================// diff --git a/favicon-16x16.png b/favicon-16x16.png deleted file mode 100644 index d946d30d..00000000 Binary files a/favicon-16x16.png and /dev/null differ diff --git a/favicon-32x32.png b/favicon-32x32.png deleted file mode 100644 index d5e6a0c3..00000000 Binary files a/favicon-32x32.png and /dev/null differ diff --git a/android-chrome-192x192.png b/favicons/android-chrome-192x192.png similarity index 100% rename from android-chrome-192x192.png rename to favicons/android-chrome-192x192.png diff --git a/android-chrome-256x256.png b/favicons/android-chrome-256x256.png similarity index 100% rename from android-chrome-256x256.png rename to favicons/android-chrome-256x256.png diff --git a/apple-touch-icon-120x120.png b/favicons/apple-touch-icon-120x120.png similarity index 100% rename from apple-touch-icon-120x120.png rename to favicons/apple-touch-icon-120x120.png diff --git a/apple-touch-icon-152x152.png b/favicons/apple-touch-icon-152x152.png similarity index 100% rename from apple-touch-icon-152x152.png rename to favicons/apple-touch-icon-152x152.png diff --git a/apple-touch-icon-180x180.png b/favicons/apple-touch-icon-180x180.png similarity index 100% rename from apple-touch-icon-180x180.png rename to favicons/apple-touch-icon-180x180.png diff --git a/apple-touch-icon-60x60.png b/favicons/apple-touch-icon-60x60.png similarity index 100% rename from apple-touch-icon-60x60.png rename to favicons/apple-touch-icon-60x60.png diff --git a/apple-touch-icon-76x76.png b/favicons/apple-touch-icon-76x76.png similarity index 100% rename from apple-touch-icon-76x76.png rename to favicons/apple-touch-icon-76x76.png diff --git a/apple-touch-icon.png b/favicons/apple-touch-icon.png similarity index 100% rename from apple-touch-icon.png rename to favicons/apple-touch-icon.png diff --git a/browserconfig.xml b/favicons/browserconfig.xml similarity index 100% rename from browserconfig.xml rename to favicons/browserconfig.xml diff --git a/data/favicons/favicon-16x16.png b/favicons/favicon-16x16.png similarity index 100% rename from data/favicons/favicon-16x16.png rename to favicons/favicon-16x16.png diff --git a/data/favicons/favicon-32x32.png b/favicons/favicon-32x32.png similarity index 100% rename from data/favicons/favicon-32x32.png rename to favicons/favicon-32x32.png diff --git a/data/favicons/favicon.ico b/favicons/favicon.ico similarity index 100% rename from data/favicons/favicon.ico rename to favicons/favicon.ico diff --git a/data/favicons/mstile-150x150.png b/favicons/mstile-150x150.png similarity index 100% rename from data/favicons/mstile-150x150.png rename to favicons/mstile-150x150.png diff --git a/data/favicons/safari-pinned-tab.svg b/favicons/safari-pinned-tab.svg similarity index 100% rename from data/favicons/safari-pinned-tab.svg rename to favicons/safari-pinned-tab.svg diff --git a/data/favicons/site.webmanifest b/favicons/site.webmanifest similarity index 100% rename from data/favicons/site.webmanifest rename to favicons/site.webmanifest diff --git a/index.html b/index.html index 84efc723..4e4339ae 100644 --- a/index.html +++ b/index.html @@ -4,11 +4,11 @@ Card Conjurer
- - - - - + + + + + @@ -391,12 +391,6 @@ /*Color Palette*/ :root { - /*Green*/ - /*--color-a: #13c800; - --color-b: #13c80080; - --color-c: #034e10; - --color-d: #013d0b80; - --color-e: #013d0b;*/ /*Regular*/ --color-a: #073c00; --color-b: #073c0040; @@ -409,12 +403,10 @@ * { font-family: belerenb; font-size: 6vw; - /*font-size: 24px;*/ user-select: none; color: #ddd; } html { - /*background: linear-gradient(#252522, #101010) no-repeat center center fixed;*/ background: url("data/background.png") no-repeat center center fixed; -webkit-background-size: cover; -moz-background-size: cover; diff --git a/mstile-150x150.png b/mstile-150x150.png deleted file mode 100644 index 2e9155fb..00000000 Binary files a/mstile-150x150.png and /dev/null differ diff --git a/safari-pinned-tab.svg b/safari-pinned-tab.svg deleted file mode 100644 index a7441eb8..00000000 --- a/safari-pinned-tab.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - diff --git a/site.webmanifest b/site.webmanifest deleted file mode 100644 index 181529a1..00000000 --- a/site.webmanifest +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Card Conjurer", - "short_name": "Card Conjurer", - "icons": [ - { - "src": "https://imkyle4815.github.io/cardconjurer/data/favicons/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "https://imkyle4815.github.io/cardconjurer/data/favicons/android-chrome-256x256.png", - "sizes": "256x256", - "type": "image/png" - } - ], - "theme_color": "#64ca2f", - "background_color": "#64ca2f", - "display": "standalone" -}