GithubMirrors/cardconjurer
1
0
Fork 1
mirror of https://github.com/Investigamer/cardconjurer.git synced 2025-07-27 13:21:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Kyle
2019-12-26 15:50:01 -08:00
parent 35df768865
commit 811b2c09aa
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/scripts/main.js
View File

@@ -3,7 +3,7 @@
//============================================// //============================================//
/* Test things! */ /* Test things! */
function testFunction() { function testFunction() {
cardMaster.insertBefore(frameList[5].cardMasterElement("Full"), cardMaster.children[0]); cardMaster.insertBefore(frameList[5].cardMasterElement("Full"), cardMaster.children[newFrameInsertionLocation]);
cardMasterUpdated(); cardMasterUpdated();
// console.log("First frame manually loaded") // console.log("First frame manually loaded")
} }
@@ -28,7 +28,8 @@ function initiate() {
document.getElementById("displayCanvas").width = cardWidth; document.getElementById("displayCanvas").width = cardWidth;
document.getElementById("displayCanvas").height = cardHeight; document.getElementById("displayCanvas").height = cardHeight;
window.displayContext = displayCanvas.getContext("2d"); window.displayContext = displayCanvas.getContext("2d");
window.textCanvasesPadding = 100 window.textCanvasesPadding = 100;
window.newFrameInsertionLocation = 1;
newCanvas("frameMask"); newCanvas("frameMask");
newCanvas("frameFinal"); newCanvas("frameFinal");
newCanvas("text"); newCanvas("text");
@@ -209,7 +210,7 @@ function addFrameToCardMaster(right = "") {
//Takes the stored selectedFrame and selectedMask to add the frame w/ mask to the card master! //Takes the stored selectedFrame and selectedMask to add the frame w/ mask to the card master!
if (selectedFrame > -1 && selectedMask != "") { if (selectedFrame > -1 && selectedMask != "") {
//In order to both keep input values and insert new frames before old ones, they must be added like so: //In order to both keep input values and insert new frames before old ones, they must be added like so:
cardMaster.insertBefore(frameList[selectedFrame].cardMasterElement(selectedMask + right), cardMaster.children[0]); cardMaster.insertBefore(frameList[selectedFrame].cardMasterElement(selectedMask + right), cardMaster.children[newFrameInsertionLocation]);
cardMasterUpdated(); cardMasterUpdated();
} }
} }
@@ -240,7 +241,14 @@ function cardMasterUpdated() {
if (parseInt(targetChild.id.replace("frameIndex", "")) == -1) { if (parseInt(targetChild.id.replace("frameIndex", "")) == -1) {
//The card art placeholder is manually set to -1 and cannot be removed :) //The card art placeholder is manually set to -1 and cannot be removed :)
frameFinalContext.drawImage(cardArt, version.artX + getValue("inputCardArtX"), version.artY + getValue("inputCardArtY"), cardArt.width * getValue("inputCardArtZoom") / 100, cardArt.height * getValue("inputCardArtZoom") / 100); frameFinalContext.drawImage(cardArt, version.artX + getValue("inputCardArtX"), version.artY + getValue("inputCardArtY"), cardArt.width * getValue("inputCardArtZoom") / 100, cardArt.height * getValue("inputCardArtZoom") / 100);
} else { } else if (parseInt(targetChild.id.replace("frameIndex", "")) == -2) {
if (i == 0) {
newFrameInsertionLocation = 1;
} else {
newFrameInsertionLocation = 0;
}
frameFinalContext.drawImage(textCanvas, 0, 0, cardWidth, cardHeight);
} else {
var frameToDraw = frameList[parseInt(targetChild.id.replace("frameIndex", ""))]; var frameToDraw = frameList[parseInt(targetChild.id.replace("frameIndex", ""))];
var opacityToDraw = targetChild.children[1].children[1].value / 100; var opacityToDraw = targetChild.children[1].children[1].value / 100;
var maskName = targetChild.innerHTML.slice(targetChild.innerHTML.indexOf("(") + 1, targetChild.innerHTML.indexOf(")")); var maskName = targetChild.innerHTML.slice(targetChild.innerHTML.indexOf("(") + 1, targetChild.innerHTML.indexOf(")"));
@@ -292,7 +300,7 @@ function cardImageUpdated() {
} }
cardFinalContext.drawImage(watermarkCanvas, 0, 0, cardWidth, cardHeight) cardFinalContext.drawImage(watermarkCanvas, 0, 0, cardWidth, cardHeight)
cardFinalContext.drawImage(bottomInfoCanvas, 0, 0, cardWidth, cardHeight); cardFinalContext.drawImage(bottomInfoCanvas, 0, 0, cardWidth, cardHeight);
cardFinalContext.drawImage(textCanvas, 0, 0, cardWidth, cardHeight); // cardFinalContext.drawImage(textCanvas, 0, 0, cardWidth, cardHeight);
cardFinalContext.drawImage(setSymbolCanvas, 0, 0, cardWidth, cardHeight) cardFinalContext.drawImage(setSymbolCanvas, 0, 0, cardWidth, cardHeight)
cardFinalContext.drawManaCost(document.getElementById("inputManaCost").value, version.manaCostX, version.manaCostY, version.manaCostDiameter, version.manaCostDistance, version.manaCostDirection) cardFinalContext.drawManaCost(document.getElementById("inputManaCost").value, version.manaCostX, version.manaCostY, version.manaCostDiameter, version.manaCostDistance, version.manaCostDirection)
//Clear the corners //Clear the corners

5
data/versions/m15.js
View File

@@ -23,7 +23,8 @@ version.manaCostDirection = "horizontal"
version.watermarkWidth = scale(520) version.watermarkWidth = scale(520)
version.watermarkHeight = scale(250) version.watermarkHeight = scale(250)
version.watermarkY = scale(800) version.watermarkY = scale(800)
version.masksToAdd = ["Right Half", "Corners", "Full", "Title", "Type", "Rules Text", "Pinline", "Frame", "Border", "Legend", "Legend With Border", "Box Topper"] version.masksToAdd = ["Right Half", "Corners", "Full", "Title", "Type", "Rules Text", "Pinline", "Frame", "Border", "Legend", "Legend With Border", "Box Topper"];
filterFramePicker("frameClassRegular");
//Name, text, x, y, width, height, font, size, color, other //Name, text, x, y, width, height, font, size, color, other
version.textList = [ version.textList = [
["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"], ["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],
@@ -40,7 +41,7 @@ function m15BottomInfo() {
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") 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; var copyrightShift = 0;
for (var i = 0; i < cardMaster.children.length; i++) { 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") && !frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].framePickerClasses.includes("frameClassCustom")) { if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) >= 0 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT") && !frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].framePickerClasses.includes("frameClassCustom")) {
copyrightShift = 19; copyrightShift = 19;
} }
} }

1
data/versions/m15extras.js
View File

@@ -20,6 +20,7 @@ version.watermarkWidth = scale(520)
version.watermarkHeight = scale(250) version.watermarkHeight = scale(250)
version.watermarkY = scale(800) version.watermarkY = scale(800)
version.masksToAdd = [] version.masksToAdd = []
filterFramePicker("frameClassRegular");
//Name, text, x, y, width, height, font, size, color, other //Name, text, x, y, width, height, font, size, color, other
version.textList = [ version.textList = [
["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"], ["Title", "", scale(64), scale(83), scale(630), 0, "belerenb", 37, "black", "oneLine=true"],

2
data/versions/unhinged.js
View File

@@ -34,7 +34,7 @@ function unhingedBottomInfo() {
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") 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; var copyrightShift = 0;
for (var i = 0; i < cardMaster.children.length; i++) { 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")) { if (parseInt(cardMaster.children[i].id.replace("frameIndex", "")) >= 1 && frameList[parseInt(cardMaster.children[i].id.replace("frameIndex", ""))].image.src.includes("PT")) {
copyrightShift = 19; copyrightShift = 19;
} }
} }

1
index.html
View File

@@ -40,6 +40,7 @@
</div> </div>
<div id="selectedFramePreview">No frame selected</div> <div id="selectedFramePreview">No frame selected</div>
<div id="cardMaster"> <div id="cardMaster">
<div id="frameIndex-2" class="cardMasterElement"><span class="handle">|||</span><div>Text Placeholder</div><span></span></div>
<div id="frameIndex-1" class="cardMasterElement"><span class="handle">|||</span><div>Card Art Placeholder <img id="artPlaceholderImage"></div><span></span></div> <div id="frameIndex-1" class="cardMasterElement"><span class="handle">|||</span><div>Card Art Placeholder <img id="artPlaceholderImage"></div><span></span></div>
</div> </div>
<div class="bar"></div> <div class="bar"></div>