This commit is contained in:
Kyle
2019-11-11 20:05:03 -08:00
parent a20535433a
commit 96048004db
52 changed files with 52 additions and 28 deletions

View File

@@ -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
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
1 version color type name displayName maskVersion x y width height secondary
94 m15 MD PT m15MDPT Multicolored (Dark) m15 0.7613 0.8898 0.183 0.0734 FALSE
95 m15 AD PT m15ADPT Artifact (Dark) m15 0.7613 0.8898 0.183 0.0734 FALSE
96 m15 CD PT m15CDPT Colorless (Dark) m15 0.7613 0.8898 0.183 0.0734 FALSE
97 m15 W FlipPT m15WFlipPT White m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
98 m15 U FlipPT m15UFlipPT Blue m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
99 m15 B FlipPT m15BFlipPT Black m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
100 m15 R FlipPT m15RFlipPT Red m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
101 m15 G FlipPT m15GFlipPT Green m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
102 m15 M FlipPT m15MFlipPT Multicolored m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
103 m15 A FlipPT m15AFlipPT Artifact m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
104 m15 C FlipPT m15CFlipPT Colorless m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
105 m15 WL FlipPT m15WLFlipPT White Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
106 m15 UL FlipPT m15ULFlipPT Blue Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
107 m15 BL FlipPT m15BLFlipPT Black Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
108 m15 RL FlipPT m15RLFlipPT Red Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
109 m15 GL FlipPT m15GLFlipPT Green Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
110 m15 ML FlipPT m15MLFlipPT Multicolorled Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
111 m15 CL FlipPT m15CLFlipPT Colorless Land m15 0.9133 0.914 0.8352 0.048 0.0457 FALSE
112 m15 W FlipCircle m15WFlipCircle White m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
113 m15 U FlipCircle m15UFlipCircle Blue m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
114 m15 B FlipCircle m15BFlipCircle Black m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
115 m15 R FlipCircle m15RFlipCircle Red m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
116 m15 G FlipCircle m15GFlipCircle Green m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
117 m15 M FlipCircle m15MFlipCircle Multicolored m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
118 m15 A FlipCircle m15AFlipCircle Artifact m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
119 m15 C FlipCircle m15CFlipCircle Colorless m15 0.0347 0.0419 0.044 0.104 0.0676 FALSE
120 m15 Icon FlipIcon m15ArtifactIcon Artifact m15 0.052 0.0486 0.08 0.0571 FALSE
121 m15 Icon FlipIcon m15BlankIcon Blank m15 0.052 0.0486 0.08 0.0571 FALSE
122 m15 Icon FlipIcon m15CompassIcon Compass m15 0.052 0.0486 0.08 0.0571 FALSE
123 m15 Icon FlipIcon m15CreatureIcon Creature m15 0.052 0.0486 0.08 0.0571 FALSE
124 m15 Icon FlipIcon m15DayIcon Day m15 0.052 0.0486 0.08 0.0571 FALSE
125 m15 Icon FlipIcon m15EldraziIcon Eldrazi m15 0.052 0.0486 0.08 0.0571 FALSE
126 m15 Icon FlipIcon m15EnchantmentIcon Enchantment m15 0.052 0.0486 0.08 0.0571 FALSE
127 m15 Icon FlipIcon m15InstantIcon Instant m15 0.052 0.0486 0.08 0.0571 FALSE
128 m15 Icon FlipIcon m15LandIcon Land m15 0.052 0.0486 0.08 0.0571 FALSE
129 m15 Icon FlipIcon m15MoonIcon Moon m15 0.052 0.0486 0.08 0.0571 FALSE
130 m15 Icon FlipIcon m15MultitypeIcon Multitype m15 0.052 0.0486 0.08 0.0571 FALSE
131 m15 Icon FlipIcon m15NightIcon Night m15 0.052 0.0486 0.08 0.0571 FALSE
132 m15 Icon FlipIcon m15PlaneshiftIcon Planeshift m15 0.052 0.0486 0.08 0.0571 FALSE
133 m15 Icon FlipIcon m15PlaneswalkerIcon Planeswalker m15 0.052 0.0486 0.08 0.0571 FALSE
134 m15 Icon FlipIcon m15SorceryIcon Sorcery m15 0.052 0.0486 0.08 0.0571 FALSE
135 m15 Icon FlipIcon m15StructureIcon Structure m15 0.052 0.0486 0.08 0.0571 FALSE

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 154 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
data/images/m15DayIcon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 161 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
data/images/m15LandIcon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 160 KiB

BIN
data/images/m15MoonIcon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 153 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 157 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
data/new wip/m15DayIcon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@@ -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 += "<div><b>{" + textCodeTutorialArray[i].split("-")[0] + "}</b></div><div>" + textCodeTutorialArray[i].split("-")[1] + "</div>"
document.getElementById("textCodeTutorial").innerHTML += "<div class='selectable'><b>{" + textCodeTutorialArray[i].split("-")[0] + "}</b></div><div>" + textCodeTutorialArray[i].split("-")[1] + "</div>"
}
}

View File

@@ -66,6 +66,9 @@ html {
user-select: none;
font-size: 8pt;
}
.selectable {
user-select: all;
}
canvas {
width: calc(100%);
height: auto;

View File

@@ -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)