diff --git a/data/scripts/main.js b/data/scripts/main.js index c48336cd..8c53a135 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -1,16 +1,6 @@ //============================================// // Card Conjurer, by Kyle Burton // //============================================// -/* Test things! */ -function testFunction() { - cardMaster.insertBefore(frameList[5].cardMasterElement("Full"), cardMaster.children[newFrameInsertionLocation]); - cardMasterUpdated(); -// changeVersionTo("future") -// setTimeout(function() {cardMaster.insertBefore(frameList[37].cardMasterElement("Full"), cardMaster.children[newFrameInsertionLocation]);cardMasterUpdated();}, 1000); - // console.log("First frame manually loaded") -} - - /* Initiate! */ window.onload = initiate; function initiate() { @@ -97,15 +87,25 @@ function loadImageCSV(targetCSV) { for (var i = 1; i < splitImageCSV.length; i++) { var splitIndividualImageCSV = splitImageCSV[i].split(","); frameList[frameList.length] = new frameImage(splitIndividualImageCSV[0], "data/images/" + splitIndividualImageCSV[1], splitIndividualImageCSV[2], splitIndividualImageCSV[3].toString()); - if (i == 6) { - frameList[5].image.onload = testFunction; + if (i == version.frameIndexToInsert + 1) { + version.trueFrameIndexToInsert = frameList.length - 1 + version.frameIndexToInsert = "none"; + frameList[frameList.length - 1].image.onload = function() { + cardMaster.insertBefore(frameList[version.trueFrameIndexToInsert].cardMasterElement("Full"), cardMaster.children[newFrameInsertionLocation]); + cardMasterUpdated(); + }; } } for (var i = 0; i < frameList.length; i++) { frameList[i].framePickerElement(); } console.log("image csv loaded, happy card conjuring!"); - // setTimeout(testFunction, 0); //deleteme + //Inserts a frame! + if (version.frameIndexToInsert != "none") { + cardMaster.insertBefore(frameList[version.frameIndexToInsert].cardMasterElement("Full"), cardMaster.children[newFrameInsertionLocation]); +// version.frameIndexToInsert = "none"; + cardMasterUpdated(); + } } } xhttp.open("GET", targetCSV, true); @@ -145,7 +145,7 @@ class frameImage { var tempElement = document.createElement("div"); tempElement.id = "frameIndex" + frameList.indexOf(this); tempElement.classList.add("cardMasterElement"); - tempElement.innerHTML = "|||
" + this.displayName + " (" + targetMask + ")
x"; + tempElement.innerHTML = "|||
" + this.displayName + " (" + targetMask + ")
x"; return tempElement } framePickerElement(targetElement) { diff --git a/data/site/styles.css b/data/site/styles.css index 8c95d664..f1917f49 100644 --- a/data/site/styles.css +++ b/data/site/styles.css @@ -320,6 +320,9 @@ footer a:hover { .cardmasterElement img.cardMasterElementMaskImage { transform: translate(1.5rem, 0); } +.cardMasterElement img.cardMasterElementMaskImage.zoom:hover { + transform: translate(1.5rem, 0) scale(3); +} .cardMasterElementMoving { background-color: var(--clear-dark); } @@ -487,7 +490,13 @@ input[type="checkbox"], .frameOption, .maskOption, .button { height: auto; } - +.zoom { + transition: 0.2s; +} +.zoom:hover { + transform: scale(3); + z-index: 100; +} diff --git a/data/versions/expedition.js b/data/versions/expedition.js index d628195f..d7ba36a3 100644 --- a/data/versions/expedition.js +++ b/data/versions/expedition.js @@ -9,6 +9,7 @@ if (version.currentVersion != "expedition") { ["Rules Text", "", scale(64), scale(729), scale(616), scale(0), "mplantin", 38, "black", "lineSpace=0.97"], ["Power Toughness", "", scale(587), scale(958), scale(110), 0, "belerenb", 38, "black", "oneLine=true,textAlign='center'"] ] + version.frameIndexToInsert = 7; } version.currentVersion = "expedition" version.artX = scale(56) diff --git a/data/versions/future.js b/data/versions/future.js index 982f7058..35a229ea 100644 --- a/data/versions/future.js +++ b/data/versions/future.js @@ -18,6 +18,7 @@ if (version.currentVersion != "future") { version.futureManaSymbolImageList[i].src = "data/images/manaSymbols/future/" + i + ".png" } } + version.frameIndexToInsert = 2; } version.currentVersion = "future" version.artX = scale(64) diff --git a/data/versions/m15.js b/data/versions/m15.js index 1a83f2d9..1c35d9a8 100644 --- a/data/versions/m15.js +++ b/data/versions/m15.js @@ -10,6 +10,7 @@ if (version.currentVersion != "m15") { ["Power Toughness", "", scale(587), scale(958), scale(110), 0, "belerenb", 38, "black", "oneLine=true,textAlign='center'"]/*, ["Flip PT", "", scale(588), scale(902), scale(100), 0, "belerenb", 28, "#666", "oneLine=true,textAlign='right'"]*/ ] + version.frameIndexToInsert = 5; } version.currentVersion = "m15" version.artX = scale(58) diff --git a/data/versions/moreMasks.js b/data/versions/moreMasks.js index a39a95ba..6f26ebcb 100644 --- a/data/versions/moreMasks.js +++ b/data/versions/moreMasks.js @@ -14,4 +14,3 @@ if (!version.addedMoreMasks) { } } } - diff --git a/data/versions/planeswalker.js b/data/versions/planeswalker.js index 5b53b28d..9e1577c8 100644 --- a/data/versions/planeswalker.js +++ b/data/versions/planeswalker.js @@ -12,6 +12,7 @@ if (version.currentVersion != "planeswalker") { ["Fourth Ability", "",,,,,,,,,"ignore"], ["Loyalty", "", scale(615), scale(958), scale(79), 0, "belerenb", scale(38), "white", "oneLine=true,textAlign='center'"] ] + version.frameIndexToInsert = 5; } version.currentVersion = "planeswalker" version.artX = scale(50) diff --git a/data/versions/seventh.js b/data/versions/seventh.js index 41d3e036..4338df17 100644 --- a/data/versions/seventh.js +++ b/data/versions/seventh.js @@ -9,6 +9,7 @@ if (version.currentVersion != "seventh") { ["Rules Text", "", scale(97), scale(630), scale(554), scale(292), "mplantin", 36, "black", "lineSpace=0.97"], ["Power Toughness", "", scale(592), scale(959), scale(110), 0, "mplantin", 47, "white", "oneLine=true,textAlign='center',shadow=2"] ]; + version.frameIndexToInsert = 6; } version.currentVersion = "seventh" version.artX = scale(88) diff --git a/data/versions/unhinged.js b/data/versions/unhinged.js index f45cb809..eae7e279 100644 --- a/data/versions/unhinged.js +++ b/data/versions/unhinged.js @@ -4,18 +4,18 @@ if (version.currentVersion != "unhinged") { //Name, text, x, y, width, height, font, size, color, other version.textList = [ - ["Title", "", scale(280), scale(56), scale(174), 0, "belerenb", 37, "black", "oneLine=true,textAlign='center'"],/*, - ["Flip PT", "", scale(588), scale(902), scale(100), 0, "belerenb", 28, "#666", "oneLine=true,textAlign='right'"]*/ + ["Title", "", scale(280), scale(56), scale(174), 0, "belerenb", 37, "black", "oneLine=true,textAlign='center'"] ] + version.frameIndexToInsert = 4; } version.currentVersion = "unhinged" 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) +version.setSymbolRight = scale(690) +version.setSymbolVertical = scale(967) +version.setSymbolWidth = scale(100) version.setSymbolHeight = scale(40) version.bottomInfoFunction = "unhingedBottomInfo" version.manaCostX = scale(653) @@ -32,19 +32,11 @@ filterFramePicker("frameClassUnhinged") function unhingedBottomInfo() { - //remember to ctrl+f for 'artistBrushWidth' and adjust that when fixing these values! - bottomInfoContext.clearRect(0, 0, cardWidth, cardHeight) - bottomInfoContext.writeText(document.getElementById("inputInfoNumber").value + " " + document.getElementById("inputInfoRarity").value + " *Not For Sale*", scale(46), scale(980), scale(329), 0, "gothammedium", 17, "white", "oneLine=true") - bottomInfoContext.writeText(document.getElementById("inputInfoSet").value + " \u2022 " + document.getElementById("inputInfoLanguage").value + " {font:belerenbsc}{artistBrush}{fontsize1}" + document.getElementById("inputInfoArtist").value, scale(46), scale(1000), scale(375), 0, "gothammedium", 17, "white", "oneLine=true") - var copyrightShift = 0; - for (var i = 0; i < cardMaster.children.length; i++) { - if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) >= 1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT")) { - copyrightShift = 19; - } - } - bottomInfoContext.writeText("\u2122 & \u00a9 " + date.getFullYear() + " Wizards of the Coast", cardWidth / 2, scale(980 + copyrightShift), scale(322), 0, "mplantin", 17, "white", "oneLine=true,textAlign='right'") - cardImageUpdated() + bottomInfoContext.clearRect(0, 0, cardWidth, cardHeight) + bottomInfoContext.writeText("{oldArtistBrush}John Avon" + document.getElementById("inputInfoArtist").value, scale(60), scale(964), scale(624), 0, "matrixb", scale(26), 'white', "oneLine=true") + bottomInfoContext.writeText("\u2122 & \u00a9 " + date.getFullYear() + " Wizards of the Coast *Not For Sale*", scale(62), scale(987), scale(620), 0, "mplantin", scale(17), 'white', "oneLine=true") + cardImageUpdated() } -// setTimeout(m15BottomInfo, 250) +setTimeout(unhingedBottomInfo, 250) finishChangingVersion("data/images/unhinged/unhingedCSV.csv")