diff --git a/data/images/imageSpreadsheet.csv b/data/images/imageSpreadsheet.csv index 8c8ca3cd..0443e1e7 100644 --- a/data/images/imageSpreadsheet.csv +++ b/data/images/imageSpreadsheet.csv @@ -94,26 +94,42 @@ m15,GD,PT,m15GDPT,Green (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE m15,MD,PT,m15MDPT,Multicolored (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE m15,AD,PT,m15ADPT,Artifact (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE m15,CD,PT,m15CDPT,Colorless (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,W,FlipPT,m15WFlipPT,White,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,U,FlipPT,m15UFlipPT,Blue,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,B,FlipPT,m15BFlipPT,Black,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,R,FlipPT,m15RFlipPT,Red,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,G,FlipPT,m15GFlipPT,Green,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,M,FlipPT,m15MFlipPT,Multicolored,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,A,FlipPT,m15AFlipPT,Artifact,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,C,FlipPT,m15CFlipPT,Colorless,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,WL,FlipPT,m15WLFlipPT,White Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,UL,FlipPT,m15ULFlipPT,Blue Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,BL,FlipPT,m15BLFlipPT,Black Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,RL,FlipPT,m15RLFlipPT,Red Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,GL,FlipPT,m15GLFlipPT,Green Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,ML,FlipPT,m15MLFlipPT,Multicolorled Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,CL,FlipPT,m15CLFlipPT,Colorless Land,m15,0.9133,0.8352,0.048,0.0457,FALSE -m15,W,FlipCircle,m15WFlipCircle,White,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,U,FlipCircle,m15UFlipCircle,Blue,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,B,FlipCircle,m15BFlipCircle,Black,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,R,FlipCircle,m15RFlipCircle,Red,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,G,FlipCircle,m15GFlipCircle,Green,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,M,FlipCircle,m15MFlipCircle,Multicolored,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,A,FlipCircle,m15AFlipCircle,Artifact,m15,0.0347,0.0419,0.104,0.0676,FALSE -m15,C,FlipCircle,m15CFlipCircle,Colorless,m15,0.0347,0.0419,0.104,0.0676,FALSE \ No newline at end of file +m15,W,FlipPT,m15WFlipPT,White,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,U,FlipPT,m15UFlipPT,Blue,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,B,FlipPT,m15BFlipPT,Black,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,R,FlipPT,m15RFlipPT,Red,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,G,FlipPT,m15GFlipPT,Green,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,M,FlipPT,m15MFlipPT,Multicolored,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,A,FlipPT,m15AFlipPT,Artifact,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,C,FlipPT,m15CFlipPT,Colorless,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,WL,FlipPT,m15WLFlipPT,White Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,UL,FlipPT,m15ULFlipPT,Blue Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,BL,FlipPT,m15BLFlipPT,Black Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,RL,FlipPT,m15RLFlipPT,Red Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,GL,FlipPT,m15GLFlipPT,Green Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,ML,FlipPT,m15MLFlipPT,Multicolorled Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,CL,FlipPT,m15CLFlipPT,Colorless Land,m15,0.914,0.8352,0.048,0.0457,FALSE +m15,W,FlipCircle,m15WFlipCircle,White,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,U,FlipCircle,m15UFlipCircle,Blue,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,B,FlipCircle,m15BFlipCircle,Black,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,R,FlipCircle,m15RFlipCircle,Red,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,G,FlipCircle,m15GFlipCircle,Green,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,M,FlipCircle,m15MFlipCircle,Multicolored,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,A,FlipCircle,m15AFlipCircle,Artifact,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,C,FlipCircle,m15CFlipCircle,Colorless,m15,0.0347,0.044,0.104,0.0676,FALSE +m15,Icon,FlipIcon,m15ArtifactIcon,Artifact,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15BlankIcon,Blank,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15CompassIcon,Compass,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15CreatureIcon,Creature,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15DayIcon,Day,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15EldraziIcon,Eldrazi,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15EnchantmentIcon,Enchantment,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15InstantIcon,Instant,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15LandIcon,Land,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15MoonIcon,Moon,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15MultitypeIcon,Multitype,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15NightIcon,Night,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15PlaneshiftIcon,Planeshift,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15PlaneswalkerIcon,Planeswalker,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15SorceryIcon,Sorcery,m15,0.052,0.0486,0.08,0.0571,FALSE +m15,Icon,FlipIcon,m15StructureIcon,Structure,m15,0.052,0.0486,0.08,0.0571,FALSE \ No newline at end of file diff --git a/data/images/m15ADFull.png b/data/images/m15ADFull.png index f22306ae..838ad815 100644 Binary files a/data/images/m15ADFull.png and b/data/images/m15ADFull.png differ diff --git a/data/images/m15ArtifactIcon.png b/data/images/m15ArtifactIcon.png new file mode 100644 index 00000000..44fdac90 Binary files /dev/null and b/data/images/m15ArtifactIcon.png differ diff --git a/data/images/m15BDFull.png b/data/images/m15BDFull.png index cf973096..30deaa06 100644 Binary files a/data/images/m15BDFull.png and b/data/images/m15BDFull.png differ diff --git a/data/images/m15BLDFull.png b/data/images/m15BLDFull.png index 7f9542d9..f394d9d3 100644 Binary files a/data/images/m15BLDFull.png and b/data/images/m15BLDFull.png differ diff --git a/data/images/m15BNyx.png b/data/images/m15BNyx.png index 5cf62019..8696544e 100644 Binary files a/data/images/m15BNyx.png and b/data/images/m15BNyx.png differ diff --git a/data/images/m15BlankIcon.png b/data/images/m15BlankIcon.png new file mode 100644 index 00000000..0ac01337 Binary files /dev/null and b/data/images/m15BlankIcon.png differ diff --git a/data/images/m15CDFull.png b/data/images/m15CDFull.png index cc78078f..1934be8e 100644 Binary files a/data/images/m15CDFull.png and b/data/images/m15CDFull.png differ diff --git a/data/images/m15CLDFull.png b/data/images/m15CLDFull.png index 2d934875..6e8410e3 100644 Binary files a/data/images/m15CLDFull.png and b/data/images/m15CLDFull.png differ diff --git a/data/images/m15CompassIcon.png b/data/images/m15CompassIcon.png new file mode 100644 index 00000000..6280e620 Binary files /dev/null and b/data/images/m15CompassIcon.png differ diff --git a/data/images/m15CreatureIcon.png b/data/images/m15CreatureIcon.png new file mode 100644 index 00000000..3aabf62a Binary files /dev/null and b/data/images/m15CreatureIcon.png differ diff --git a/data/images/m15DayIcon.png b/data/images/m15DayIcon.png new file mode 100644 index 00000000..71189d94 Binary files /dev/null and b/data/images/m15DayIcon.png differ diff --git a/data/images/m15EldraziIcon.png b/data/images/m15EldraziIcon.png new file mode 100644 index 00000000..6dbb1bc2 Binary files /dev/null and b/data/images/m15EldraziIcon.png differ diff --git a/data/images/m15EnchantmentIcon.png b/data/images/m15EnchantmentIcon.png new file mode 100644 index 00000000..9dddf8f6 Binary files /dev/null and b/data/images/m15EnchantmentIcon.png differ diff --git a/data/images/m15GDFull.png b/data/images/m15GDFull.png index 3f4ddfb6..7a2ed415 100644 Binary files a/data/images/m15GDFull.png and b/data/images/m15GDFull.png differ diff --git a/data/images/m15GLDFull.png b/data/images/m15GLDFull.png index 71f4314b..c016688d 100644 Binary files a/data/images/m15GLDFull.png and b/data/images/m15GLDFull.png differ diff --git a/data/images/m15InstantIcon.png b/data/images/m15InstantIcon.png new file mode 100644 index 00000000..834033d2 Binary files /dev/null and b/data/images/m15InstantIcon.png differ diff --git a/data/images/m15LandIcon.png b/data/images/m15LandIcon.png new file mode 100644 index 00000000..74a74eab Binary files /dev/null and b/data/images/m15LandIcon.png differ diff --git a/data/images/m15MDFull.png b/data/images/m15MDFull.png index 6157a87d..2c064674 100644 Binary files a/data/images/m15MDFull.png and b/data/images/m15MDFull.png differ diff --git a/data/images/m15MLDFull.png b/data/images/m15MLDFull.png index be26b87f..97eb94b3 100644 Binary files a/data/images/m15MLDFull.png and b/data/images/m15MLDFull.png differ diff --git a/data/images/m15MoonIcon.png b/data/images/m15MoonIcon.png new file mode 100644 index 00000000..3774d5cf Binary files /dev/null and b/data/images/m15MoonIcon.png differ diff --git a/data/images/m15MultitypeIcon.png b/data/images/m15MultitypeIcon.png new file mode 100644 index 00000000..48cfa783 Binary files /dev/null and b/data/images/m15MultitypeIcon.png differ diff --git a/data/images/m15NightIcon.png b/data/images/m15NightIcon.png new file mode 100644 index 00000000..dab6f4bf Binary files /dev/null and b/data/images/m15NightIcon.png differ diff --git a/data/images/m15PlaneshiftIcon.png b/data/images/m15PlaneshiftIcon.png new file mode 100644 index 00000000..bf1a14cb Binary files /dev/null and b/data/images/m15PlaneshiftIcon.png differ diff --git a/data/images/m15PlaneswalkerIcon.png b/data/images/m15PlaneswalkerIcon.png new file mode 100644 index 00000000..becc1933 Binary files /dev/null and b/data/images/m15PlaneswalkerIcon.png differ diff --git a/data/images/m15RDFull.png b/data/images/m15RDFull.png index 8d7c91ca..54cdf04c 100644 Binary files a/data/images/m15RDFull.png and b/data/images/m15RDFull.png differ diff --git a/data/images/m15RLDFull.png b/data/images/m15RLDFull.png index bdf3d7f0..55c7356e 100644 Binary files a/data/images/m15RLDFull.png and b/data/images/m15RLDFull.png differ diff --git a/data/images/m15SorceryIcon.png b/data/images/m15SorceryIcon.png new file mode 100644 index 00000000..24d3a40f Binary files /dev/null and b/data/images/m15SorceryIcon.png differ diff --git a/data/images/m15StructureIcon.png b/data/images/m15StructureIcon.png new file mode 100644 index 00000000..89ed9a4e Binary files /dev/null and b/data/images/m15StructureIcon.png differ diff --git a/data/images/m15UDFull.png b/data/images/m15UDFull.png index 71699a20..8449f14f 100644 Binary files a/data/images/m15UDFull.png and b/data/images/m15UDFull.png differ diff --git a/data/images/m15ULDFull.png b/data/images/m15ULDFull.png index e705c7d6..033fa138 100644 Binary files a/data/images/m15ULDFull.png and b/data/images/m15ULDFull.png differ diff --git a/data/images/m15WDFull.png b/data/images/m15WDFull.png index 05f1a990..4ee3066d 100644 Binary files a/data/images/m15WDFull.png and b/data/images/m15WDFull.png differ diff --git a/data/images/m15WLDFull.png b/data/images/m15WLDFull.png index d245c817..9f169b17 100644 Binary files a/data/images/m15WLDFull.png and b/data/images/m15WLDFull.png differ diff --git a/data/new wip/m15ArtifactIcon.png b/data/new wip/m15ArtifactIcon.png new file mode 100644 index 00000000..44fdac90 Binary files /dev/null and b/data/new wip/m15ArtifactIcon.png differ diff --git a/data/new wip/m15BlankIcon.png b/data/new wip/m15BlankIcon.png new file mode 100644 index 00000000..0ac01337 Binary files /dev/null and b/data/new wip/m15BlankIcon.png differ diff --git a/data/new wip/m15CompassIcon.png b/data/new wip/m15CompassIcon.png new file mode 100644 index 00000000..6280e620 Binary files /dev/null and b/data/new wip/m15CompassIcon.png differ diff --git a/data/new wip/m15CreatureIcon.png b/data/new wip/m15CreatureIcon.png new file mode 100644 index 00000000..3aabf62a Binary files /dev/null and b/data/new wip/m15CreatureIcon.png differ diff --git a/data/new wip/m15DayIcon.png b/data/new wip/m15DayIcon.png new file mode 100644 index 00000000..71189d94 Binary files /dev/null and b/data/new wip/m15DayIcon.png differ diff --git a/data/new wip/m15EldraziIcon.png b/data/new wip/m15EldraziIcon.png new file mode 100644 index 00000000..6dbb1bc2 Binary files /dev/null and b/data/new wip/m15EldraziIcon.png differ diff --git a/data/new wip/m15EnchantmentIcon.png b/data/new wip/m15EnchantmentIcon.png new file mode 100644 index 00000000..9dddf8f6 Binary files /dev/null and b/data/new wip/m15EnchantmentIcon.png differ diff --git a/data/new wip/m15InstantIcon.png b/data/new wip/m15InstantIcon.png new file mode 100644 index 00000000..834033d2 Binary files /dev/null and b/data/new wip/m15InstantIcon.png differ diff --git a/data/new wip/m15LandIcon.png b/data/new wip/m15LandIcon.png new file mode 100644 index 00000000..74a74eab Binary files /dev/null and b/data/new wip/m15LandIcon.png differ diff --git a/data/new wip/m15MoonIcon.png b/data/new wip/m15MoonIcon.png new file mode 100644 index 00000000..3774d5cf Binary files /dev/null and b/data/new wip/m15MoonIcon.png differ diff --git a/data/new wip/m15MultitypeIcon.png b/data/new wip/m15MultitypeIcon.png new file mode 100644 index 00000000..48cfa783 Binary files /dev/null and b/data/new wip/m15MultitypeIcon.png differ diff --git a/data/new wip/m15NightIcon.png b/data/new wip/m15NightIcon.png new file mode 100644 index 00000000..dab6f4bf Binary files /dev/null and b/data/new wip/m15NightIcon.png differ diff --git a/data/new wip/m15PlaneshiftIcon.png b/data/new wip/m15PlaneshiftIcon.png new file mode 100644 index 00000000..bf1a14cb Binary files /dev/null and b/data/new wip/m15PlaneshiftIcon.png differ diff --git a/data/new wip/m15PlaneswalkerIcon.png b/data/new wip/m15PlaneswalkerIcon.png new file mode 100644 index 00000000..becc1933 Binary files /dev/null and b/data/new wip/m15PlaneswalkerIcon.png differ diff --git a/data/new wip/m15SorceryIcon.png b/data/new wip/m15SorceryIcon.png new file mode 100644 index 00000000..24d3a40f Binary files /dev/null and b/data/new wip/m15SorceryIcon.png differ diff --git a/data/new wip/m15StructureIcon.png b/data/new wip/m15StructureIcon.png new file mode 100644 index 00000000..89ed9a4e Binary files /dev/null and b/data/new wip/m15StructureIcon.png differ diff --git a/data/site/main.js b/data/site/main.js index cef3092e..aff16109 100644 --- a/data/site/main.js +++ b/data/site/main.js @@ -447,7 +447,11 @@ CanvasRenderingContext2D.prototype.writeText = function(text = "", textX = 0, te var artistBrushWidth = textSize * 1.2 lineContext.drawImage(manaSymbolImageList[62], currentLineX, currentLineY - artistBrushWidth * 0.58, artistBrushWidth, artistBrushWidth * 13 / 21) currentLineX += artistBrushWidth * 1.1 - } else if (possibleCodeLower.includes("font")) { + } else if (possibleCodeLower.includes("fontcolor")) { + console.log(possibleCodeLower.slice(9, possibleCodeLower.length)) + lineContext.fillStyle = possibleCodeLower.slice(9, possibleCodeLower.length) + console.log(lineContext.fillStyle) + }else if (possibleCodeLower.includes("font")) { textFont = possibleCodeLower.slice(5, possibleCodeLower.length) lineContext.font = textSize + "px " + textFont } else if (manaSymbolCodeList.includes(possibleCodeLower)) { @@ -468,7 +472,7 @@ CanvasRenderingContext2D.prototype.writeText = function(text = "", textX = 0, te } if (currentLineX + currentWordWidth > textWidth || finishLine) { //Finish the line - if (oneLine && i != splitString.length - 1) { + if (oneLine && i != splitString.length - 1 && inputTextSize > 1) { lineContext.clearRect(0, 0, cardWidth, cardHeight) this.writeText(text, textX, textY, textWidth, textHeight, textFont, inputTextSize - 1, textColor, other) return @@ -816,6 +820,7 @@ function textCodeTutorial() { _i-italicizes the following text _/i-removes italics from the following text _fontsize#-changes the font size to # pixels + _fontcolor#-changes the color to #. Can use color names, or hex codes _left-justifies text to the left _center-justifies text to the center _right-justifies text to the right @@ -826,7 +831,7 @@ function textCodeTutorial() { _SYMBOL-creates a mana symbol, where SYMBOL can be: w, u, b, r, g, 1, 2, 3, etc...` var textCodeTutorialArray = textCodeTutorialString.split("_") for (var i = 0; i < textCodeTutorialArray.length; i ++) { - document.getElementById("textCodeTutorial").innerHTML += "
{" + textCodeTutorialArray[i].split("-")[0] + "}
" + textCodeTutorialArray[i].split("-")[1] + "
" + document.getElementById("textCodeTutorial").innerHTML += "
{" + textCodeTutorialArray[i].split("-")[0] + "}
" + textCodeTutorialArray[i].split("-")[1] + "
" } } diff --git a/data/site/styles.css b/data/site/styles.css index 60abfc00..22be5812 100644 --- a/data/site/styles.css +++ b/data/site/styles.css @@ -66,6 +66,9 @@ html { user-select: none; font-size: 8pt; } +.selectable { + user-select: all; +} canvas { width: calc(100%); height: auto; diff --git a/data/versions/m15Version.js b/data/versions/m15Version.js index 6eec493f..5dd288a7 100644 --- a/data/versions/m15Version.js +++ b/data/versions/m15Version.js @@ -2,8 +2,8 @@ // Card Conjurer, by Kyle Burton // //============================================// version.currentVersion = "m15" -version.typeOrder = ["Full", "FullSecondary", "Frame", "FrameSecondary", "Nyx", "NyxSecondary", "Pinline", "PinlineSecondary", "Legendary", "LegendarySecondary", "Title", "TitleSecondary", "Miracle", "MiracleSecondary", "Type", "TypeSecondary", "Rules", "RulesSecondary", "PT", "RareStamp", "RareStampSecondary"] -version.typeNotFull = ["Legendary", "LegendarySecondary", "PT", "RareStamp", "RareStampSecondary", "Nyx", "NyxSecondary", "Miracle", "MiracleSecondary"] +version.typeOrder = ["Full", "FullSecondary", "Frame", "FrameSecondary", "Nyx", "NyxSecondary", "Pinline", "PinlineSecondary", "Legendary", "LegendarySecondary", "Title", "TitleSecondary", "Miracle", "MiracleSecondary", "Type", "TypeSecondary", "Rules", "RulesSecondary", "PT", "RareStamp", "RareStampSecondary", "FlipPT", "FlipCircle", "FlipIcon"] +version.typeNotFull = ["Legendary", "LegendarySecondary", "PT", "RareStamp", "RareStampSecondary", "Nyx", "NyxSecondary", "Miracle", "MiracleSecondary", "FlipPT", "FlipCircle", "FlipIcon"] version.artX = cwidth(58) version.artY = cheight(118) version.setSymbolRight = cwidth(693)