diff --git a/data/WIP/m15ADFull.png b/data/WIP/m15ADFull.png deleted file mode 100644 index f22306ae..00000000 Binary files a/data/WIP/m15ADFull.png and /dev/null differ diff --git a/data/WIP/m15ADPT.png b/data/WIP/m15ADPT.png deleted file mode 100644 index 1ed50325..00000000 Binary files a/data/WIP/m15ADPT.png and /dev/null differ diff --git a/data/WIP/m15AFlipCircle.png b/data/WIP/m15AFlipCircle.png deleted file mode 100644 index af3a0d2a..00000000 Binary files a/data/WIP/m15AFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15AFlipPT.png b/data/WIP/m15AFlipPT.png deleted file mode 100644 index 279dd50c..00000000 Binary files a/data/WIP/m15AFlipPT.png and /dev/null differ diff --git a/data/WIP/m15BDFull.png b/data/WIP/m15BDFull.png deleted file mode 100644 index cf973096..00000000 Binary files a/data/WIP/m15BDFull.png and /dev/null differ diff --git a/data/WIP/m15BDPT.png b/data/WIP/m15BDPT.png deleted file mode 100644 index 273ecca8..00000000 Binary files a/data/WIP/m15BDPT.png and /dev/null differ diff --git a/data/WIP/m15BFlipCircle.png b/data/WIP/m15BFlipCircle.png deleted file mode 100644 index 7f191549..00000000 Binary files a/data/WIP/m15BFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15BFlipPT.png b/data/WIP/m15BFlipPT.png deleted file mode 100644 index 5e85eb26..00000000 Binary files a/data/WIP/m15BFlipPT.png and /dev/null differ diff --git a/data/WIP/m15BLDFull.png b/data/WIP/m15BLDFull.png deleted file mode 100644 index 7f9542d9..00000000 Binary files a/data/WIP/m15BLDFull.png and /dev/null differ diff --git a/data/WIP/m15BLFlipPT.png b/data/WIP/m15BLFlipPT.png deleted file mode 100644 index 40fad918..00000000 Binary files a/data/WIP/m15BLFlipPT.png and /dev/null differ diff --git a/data/WIP/m15CDFull.png b/data/WIP/m15CDFull.png deleted file mode 100644 index cc78078f..00000000 Binary files a/data/WIP/m15CDFull.png and /dev/null differ diff --git a/data/WIP/m15CDPT.png b/data/WIP/m15CDPT.png deleted file mode 100644 index 7d779e01..00000000 Binary files a/data/WIP/m15CDPT.png and /dev/null differ diff --git a/data/WIP/m15CFlipCircle.png b/data/WIP/m15CFlipCircle.png deleted file mode 100644 index 19e286a6..00000000 Binary files a/data/WIP/m15CFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15CFlipPT.png b/data/WIP/m15CFlipPT.png deleted file mode 100644 index d1b7f621..00000000 Binary files a/data/WIP/m15CFlipPT.png and /dev/null differ diff --git a/data/WIP/m15CLDFull.png b/data/WIP/m15CLDFull.png deleted file mode 100644 index 2d934875..00000000 Binary files a/data/WIP/m15CLDFull.png and /dev/null differ diff --git a/data/WIP/m15CLFlipPT.png b/data/WIP/m15CLFlipPT.png deleted file mode 100644 index 9b0b7d51..00000000 Binary files a/data/WIP/m15CLFlipPT.png and /dev/null differ diff --git a/data/WIP/m15GDFull.png b/data/WIP/m15GDFull.png deleted file mode 100644 index 3f4ddfb6..00000000 Binary files a/data/WIP/m15GDFull.png and /dev/null differ diff --git a/data/WIP/m15GDPT.png b/data/WIP/m15GDPT.png deleted file mode 100644 index aa712323..00000000 Binary files a/data/WIP/m15GDPT.png and /dev/null differ diff --git a/data/WIP/m15GFlipPT.png b/data/WIP/m15GFlipPT.png deleted file mode 100644 index fc76e395..00000000 Binary files a/data/WIP/m15GFlipPT.png and /dev/null differ diff --git a/data/WIP/m15GFliptCircle.png b/data/WIP/m15GFliptCircle.png deleted file mode 100644 index 42449035..00000000 Binary files a/data/WIP/m15GFliptCircle.png and /dev/null differ diff --git a/data/WIP/m15GLDFull.png b/data/WIP/m15GLDFull.png deleted file mode 100644 index 71f4314b..00000000 Binary files a/data/WIP/m15GLDFull.png and /dev/null differ diff --git a/data/WIP/m15GLFlipPT.png b/data/WIP/m15GLFlipPT.png deleted file mode 100644 index 470e1078..00000000 Binary files a/data/WIP/m15GLFlipPT.png and /dev/null differ diff --git a/data/WIP/m15MDFull.png b/data/WIP/m15MDFull.png deleted file mode 100644 index 6157a87d..00000000 Binary files a/data/WIP/m15MDFull.png and /dev/null differ diff --git a/data/WIP/m15MDPT.png b/data/WIP/m15MDPT.png deleted file mode 100644 index 34779881..00000000 Binary files a/data/WIP/m15MDPT.png and /dev/null differ diff --git a/data/WIP/m15MFlipCircle.png b/data/WIP/m15MFlipCircle.png deleted file mode 100644 index 400d9a3c..00000000 Binary files a/data/WIP/m15MFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15MFlipPT.png b/data/WIP/m15MFlipPT.png deleted file mode 100644 index 6d2fae05..00000000 Binary files a/data/WIP/m15MFlipPT.png and /dev/null differ diff --git a/data/WIP/m15MLDFull.png b/data/WIP/m15MLDFull.png deleted file mode 100644 index be26b87f..00000000 Binary files a/data/WIP/m15MLDFull.png and /dev/null differ diff --git a/data/WIP/m15MLFlipPT.png b/data/WIP/m15MLFlipPT.png deleted file mode 100644 index bd0a8d41..00000000 Binary files a/data/WIP/m15MLFlipPT.png and /dev/null differ diff --git a/data/WIP/m15RDFull.png b/data/WIP/m15RDFull.png deleted file mode 100644 index 8d7c91ca..00000000 Binary files a/data/WIP/m15RDFull.png and /dev/null differ diff --git a/data/WIP/m15RDPT.png b/data/WIP/m15RDPT.png deleted file mode 100644 index 46495d99..00000000 Binary files a/data/WIP/m15RDPT.png and /dev/null differ diff --git a/data/WIP/m15RFlipCircle.png b/data/WIP/m15RFlipCircle.png deleted file mode 100644 index 2dfa1b66..00000000 Binary files a/data/WIP/m15RFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15RFlipPT.png b/data/WIP/m15RFlipPT.png deleted file mode 100644 index 233c39e3..00000000 Binary files a/data/WIP/m15RFlipPT.png and /dev/null differ diff --git a/data/WIP/m15RLDFull.png b/data/WIP/m15RLDFull.png deleted file mode 100644 index bdf3d7f0..00000000 Binary files a/data/WIP/m15RLDFull.png and /dev/null differ diff --git a/data/WIP/m15RLFlipPT.png b/data/WIP/m15RLFlipPT.png deleted file mode 100644 index a3d73ee4..00000000 Binary files a/data/WIP/m15RLFlipPT.png and /dev/null differ diff --git a/data/WIP/m15UDFull.png b/data/WIP/m15UDFull.png deleted file mode 100644 index 71699a20..00000000 Binary files a/data/WIP/m15UDFull.png and /dev/null differ diff --git a/data/WIP/m15UDPT.png b/data/WIP/m15UDPT.png deleted file mode 100644 index e7f6da44..00000000 Binary files a/data/WIP/m15UDPT.png and /dev/null differ diff --git a/data/WIP/m15UFlipCircle.png b/data/WIP/m15UFlipCircle.png deleted file mode 100644 index 775d2fc6..00000000 Binary files a/data/WIP/m15UFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15UFlipPT.png b/data/WIP/m15UFlipPT.png deleted file mode 100644 index ae2e90c1..00000000 Binary files a/data/WIP/m15UFlipPT.png and /dev/null differ diff --git a/data/WIP/m15ULDFull.png b/data/WIP/m15ULDFull.png deleted file mode 100644 index e705c7d6..00000000 Binary files a/data/WIP/m15ULDFull.png and /dev/null differ diff --git a/data/WIP/m15ULFlipPT.png b/data/WIP/m15ULFlipPT.png deleted file mode 100644 index abbc5fca..00000000 Binary files a/data/WIP/m15ULFlipPT.png and /dev/null differ diff --git a/data/WIP/m15WDFull.png b/data/WIP/m15WDFull.png deleted file mode 100644 index 05f1a990..00000000 Binary files a/data/WIP/m15WDFull.png and /dev/null differ diff --git a/data/WIP/m15WDPT.png b/data/WIP/m15WDPT.png deleted file mode 100644 index 74820584..00000000 Binary files a/data/WIP/m15WDPT.png and /dev/null differ diff --git a/data/WIP/m15WFlipCircle.png b/data/WIP/m15WFlipCircle.png deleted file mode 100644 index fc7241f5..00000000 Binary files a/data/WIP/m15WFlipCircle.png and /dev/null differ diff --git a/data/WIP/m15WFlipPT.png b/data/WIP/m15WFlipPT.png deleted file mode 100644 index acb76fea..00000000 Binary files a/data/WIP/m15WFlipPT.png and /dev/null differ diff --git a/data/WIP/m15WLDFull.png b/data/WIP/m15WLDFull.png deleted file mode 100644 index d245c817..00000000 Binary files a/data/WIP/m15WLDFull.png and /dev/null differ diff --git a/data/WIP/m15WLFlipPT.png b/data/WIP/m15WLFlipPT.png deleted file mode 100644 index 8000d62c..00000000 Binary files a/data/WIP/m15WLFlipPT.png and /dev/null differ diff --git a/data/images/imageSpreadsheet.csv b/data/images/imageSpreadsheet.csv index 0443e1e7..5af65413 100644 --- a/data/images/imageSpreadsheet.csv +++ b/data/images/imageSpreadsheet.csv @@ -1,135 +1,135 @@ -version,color,type,name,displayName,maskVersion,x,y,width,height,secondary -m15,W,Full,m15WFull,White,m15,0,0,1,1,TRUE -m15,U,Full,m15UFull,Blue,m15,0,0,1,1,TRUE -m15,B,Full,m15BFull,Black,m15,0,0,1,1,TRUE -m15,R,Full,m15RFull,Red,m15,0,0,1,1,TRUE -m15,G,Full,m15GFull,Green,m15,0,0,1,1,TRUE -m15,M,Full,m15MFull,Multicolored,m15,0,0,1,1,TRUE -m15,A,Full,m15AFull,Artifact,m15,0,0,1,1,TRUE -m15,C,Full,m15CFull,Colorless,m15,0,0,1,1,TRUE -m15,Mask,Frame,m15MaskFrame,,m15,0,0,1,1,TRUE -m15,Mask,Pinline,m15MaskPinline,,m15,0,0,1,1,TRUE -m15,Mask,Title,m15MaskTitle,,m15,0,0,1,1,TRUE -m15,Mask,Type,m15MaskType,,m15,0,0,1,1,TRUE -m15,Mask,Rules,m15MaskRules,,m15,0,0,1,1,TRUE -none,Mask,Secondary,secondary,,none,0,0,1,1,TRUE -m15,W,PT,m15WPT,White,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,U,PT,m15UPT,Blue,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,B,PT,m15BPT,Black,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,R,PT,m15RPT,Red,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,G,PT,m15GPT,Green,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,M,PT,m15MPT,Multicolored,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,A,PT,m15APT,Artifact,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,C,PT,m15CPT,Colorless,m15,0.7613,0.8898,0.183,0.0734,FALSE -none,Mask,Corners,corners,,none,0.0267,0.0191,0.952,0.1771,FALSE -m15,W,Legendary,m15WLegendary,White,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,U,Legendary,m15ULegendary,Blue,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,B,Legendary,m15BLegendary,Black,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,R,Legendary,m15RLegendary,Red,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,G,Legendary,m15GLegendary,Green,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,M,Legendary,m15MLegendary,Multicolored,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,A,Legendary,m15ALegendary,Artifact,m15,0.0267,0.0191,0.952,0.1771,TRUE -m15,C,Legendary,m15CLegendary,Colorless,m15,0.0267,0.0191,0.952,0.1771,TRUE -none,Mask,Stamp,stamp,,none,0.4387,0.9039,0.12,0.0477,FALSE -m15,W,RareStamp,m15WRareStamp,White,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,U,RareStamp,m15URareStamp,Blue,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,B,RareStamp,m15BRareStamp,Black,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,R,RareStamp,m15RRareStamp,Red,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,G,RareStamp,m15GRareStamp,Green,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,M,RareStamp,m15MRareStamp,Multicolored,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,A,RareStamp,m15ARareStamp,Artifact,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,C,RareStamp,m15CRareStamp,Colorless,m15,0.4387,0.9039,0.12,0.0477,TRUE -m15,V,PT,m15VPT,Vehicle,m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,V,Full,m15VFull,Vehicle,m15,0,0,1,1,TRUE -m15,WL,Full,m15WLFull,White Land,m15,0,0,1,1,TRUE -m15,UL,Full,m15ULFull,Blue Land,m15,0,0,1,1,TRUE -m15,BL,Full,m15BLFull,Black Land,m15,0,0,1,1,TRUE -m15,RL,Full,m15RLFull,Red Land,m15,0,0,1,1,TRUE -m15,GL,Full,m15GLFull,Green Land,m15,0,0,1,1,TRUE -m15,ML,Full,m15MLFull,Multicolored Land,m15,0,0,1,1,TRUE -m15,CL,Full,m15CLFull,Colorless Land,m15,0,0,1,1,TRUE -m15,W,Miracle,m15WMiracle,White,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,U,Miracle,m15UMiracle,Blue,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,B,Miracle,m15BMiracle,Black,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,R,Miracle,m15RMiracle,Red,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,G,Miracle,m15GMiracle,Green,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,M,Miracle,m15MMiracle,Multicolored,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,C,Miracle,m15CMiracle,Colorless,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,A,Miracle,m15AMiracle,Artifact,m15,0.04,0.0286,0.9187,0.4867,TRUE -m15,W,Nyx,m15WNyx,White,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,U,Nyx,m15UNyx,Blue,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,B,Nyx,m15BNyx,Black,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,R,Nyx,m15RNyx,Red,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,G,Nyx,m15GNyx,Green,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,M,Nyx,m15MNyx,Multicolored,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,A,Nyx,m15ANyx,Artifact,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,C,Nyx,m15CNyx,Colorless,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,WL,Nyx,m15WLNyx,White Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,UL,Nyx,m15ULNyx,Blue Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,BL,Nyx,m15BLNyx,Black Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,RL,Nyx,m15RLNyx,Red Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,GL,Nyx,m15GLNyx,Green Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,ML,Nyx,m15MLNyx,Multicolored Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,CL,Nyx,m15CLNyx,Colorless Land,m15,0.04,0.0286,0.92,0.5581,TRUE -m15,WD,Full,m15WDFull,White (Dark),m15,0,0,1,1,TRUE -m15,UD,Full,m15UDFull,Blue (Dark),m15,0,0,1,1,TRUE -m15,BD,Full,m15BDFull,Black (Dark),m15,0,0,1,1,TRUE -m15,RD,Full,m15RDFull,Red (Dark),m15,0,0,1,1,TRUE -m15,GD,Full,m15GDFull,Green (Dark),m15,0,0,1,1,TRUE -m15,MD,Full,m15MDFull,Multicolored (Dark),m15,0,0,1,1,TRUE -m15,AD,Full,m15ADFull,Artifact (Dark),m15,0,0,1,1,TRUE -m15,CD,Full,m15CDFull,Colorless (Dark),m15,0,0,1,1,TRUE -m15,WLD,Full,m15WLDFull,White Land (Dark),m15,0,0,1,1,TRUE -m15,ULD,Full,m15ULDFull,Blue Land (Dark),m15,0,0,1,1,TRUE -m15,BLD,Full,m15BLDFull,Black Land (Dark),m15,0,0,1,1,TRUE -m15,RLD,Full,m15RLDFull,Red Land (Dark),m15,0,0,1,1,TRUE -m15,GLD,Full,m15GLDFull,Green Land (Dark),m15,0,0,1,1,TRUE -m15,MLD,Full,m15MLDFull,Multicolored Land (Dark),m15,0,0,1,1,TRUE -m15,CLD,Full,m15CLDFull,Colorless Land (Dark),m15,0,0,1,1,TRUE -m15,WD,PT,m15WDPT,White (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,UD,PT,m15UDPT,Blue (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,BD,PT,m15BDPT,Black (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE -m15,RD,PT,m15RDPT,Red (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE -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.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 +version,color,type,displayName,maskVersion,x,y,width,height,secondary,advanced +m15,W,Full,White,m15,0,0,1,1,TRUE,FALSE +m15,U,Full,Blue,m15,0,0,1,1,TRUE,FALSE +m15,B,Full,Black,m15,0,0,1,1,TRUE,FALSE +m15,R,Full,Red,m15,0,0,1,1,TRUE,FALSE +m15,G,Full,Green,m15,0,0,1,1,TRUE,FALSE +m15,M,Full,Multicolored,m15,0,0,1,1,TRUE,FALSE +m15,A,Full,Artifact,m15,0,0,1,1,TRUE,FALSE +m15,C,Full,Colorless,m15,0,0,1,1,TRUE,FALSE +m15,Mask,Frame,,m15,0,0,1,1,TRUE,FALSE +m15,Mask,Pinline,,m15,0,0,1,1,TRUE,FALSE +m15,Mask,Title,,m15,0,0,1,1,TRUE,FALSE +m15,Mask,Type,,m15,0,0,1,1,TRUE,FALSE +m15,Mask,Rules,,m15,0,0,1,1,TRUE,FALSE +none,Mask,Secondary,,none,0,0,1,1,TRUE,FALSE +m15,W,PT,White,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,U,PT,Blue,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,B,PT,Black,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,R,PT,Red,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,G,PT,Green,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,M,PT,Multicolored,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,A,PT,Artifact,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,C,PT,Colorless,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +none,Mask,Corners,,none,0.0267,0.0191,0.952,0.1771,FALSE,FALSE +m15,W,Legendary,White,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,U,Legendary,Blue,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,B,Legendary,Black,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,R,Legendary,Red,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,G,Legendary,Green,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,M,Legendary,Multicolored,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,A,Legendary,Artifact,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +m15,C,Legendary,Colorless,m15,0.0267,0.0191,0.952,0.1771,TRUE,FALSE +none,Mask,Stamp,,none,0.4387,0.9039,0.12,0.0477,FALSE,FALSE +m15,W,RareStamp,White,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,U,RareStamp,Blue,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,B,RareStamp,Black,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,R,RareStamp,Red,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,G,RareStamp,Green,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,M,RareStamp,Multicolored,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,A,RareStamp,Artifact,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,C,RareStamp,Colorless,m15,0.4387,0.9039,0.12,0.0477,TRUE,FALSE +m15,V,PT,Vehicle,m15,0.7613,0.8898,0.183,0.0734,FALSE,FALSE +m15,V,Full,Vehicle,m15,0,0,1,1,TRUE,FALSE +m15,WL,Full,White Land,m15,0,0,1,1,TRUE,FALSE +m15,UL,Full,Blue Land,m15,0,0,1,1,TRUE,FALSE +m15,BL,Full,Black Land,m15,0,0,1,1,TRUE,FALSE +m15,RL,Full,Red Land,m15,0,0,1,1,TRUE,FALSE +m15,GL,Full,Green Land,m15,0,0,1,1,TRUE,FALSE +m15,ML,Full,Multicolored Land,m15,0,0,1,1,TRUE,FALSE +m15,CL,Full,Colorless Land,m15,0,0,1,1,TRUE,FALSE +m15,W,Miracle,White,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,U,Miracle,Blue,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,B,Miracle,Black,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,R,Miracle,Red,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,G,Miracle,Green,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,M,Miracle,Multicolored,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,C,Miracle,Colorless,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,A,Miracle,Artifact,m15,0.04,0.0286,0.9187,0.4867,TRUE,TRUE +m15,W,Nyx,White,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,U,Nyx,Blue,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,B,Nyx,Black,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,R,Nyx,Red,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,G,Nyx,Green,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,M,Nyx,Multicolored,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,A,Nyx,Artifact,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,C,Nyx,Colorless,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,WL,Nyx,White Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,UL,Nyx,Blue Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,BL,Nyx,Black Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,RL,Nyx,Red Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,GL,Nyx,Green Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,ML,Nyx,Multicolored Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,CL,Nyx,Colorless Land,m15,0.04,0.0286,0.92,0.5581,TRUE,TRUE +m15,WD,Full,White (Dark),m15,0,0,1,1,TRUE,TRUE +m15,UD,Full,Blue (Dark),m15,0,0,1,1,TRUE,TRUE +m15,BD,Full,Black (Dark),m15,0,0,1,1,TRUE,TRUE +m15,RD,Full,Red (Dark),m15,0,0,1,1,TRUE,TRUE +m15,GD,Full,Green (Dark),m15,0,0,1,1,TRUE,TRUE +m15,MD,Full,Multicolored (Dark),m15,0,0,1,1,TRUE,TRUE +m15,AD,Full,Artifact (Dark),m15,0,0,1,1,TRUE,TRUE +m15,CD,Full,Colorless (Dark),m15,0,0,1,1,TRUE,TRUE +m15,WLD,Full,White Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,ULD,Full,Blue Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,BLD,Full,Black Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,RLD,Full,Red Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,GLD,Full,Green Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,MLD,Full,Multicolored Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,CLD,Full,Colorless Land (Dark),m15,0,0,1,1,TRUE,TRUE +m15,WD,PT,White (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,UD,PT,Blue (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,BD,PT,Black (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,RD,PT,Red (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,GD,PT,Green (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,MD,PT,Multicolored (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,AD,PT,Artifact (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,CD,PT,Colorless (Dark),m15,0.7613,0.8898,0.183,0.0734,FALSE,TRUE +m15,W,FlipPT,White,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,U,FlipPT,Blue,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,B,FlipPT,Black,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,R,FlipPT,Red,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,G,FlipPT,Green,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,M,FlipPT,Multicolored,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,A,FlipPT,Artifact,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,C,FlipPT,Colorless,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,WL,FlipPT,White Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,UL,FlipPT,Blue Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,BL,FlipPT,Black Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,RL,FlipPT,Red Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,GL,FlipPT,Green Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,ML,FlipPT,Multicolorled Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,CL,FlipPT,Colorless Land,m15,0.914,0.8352,0.048,0.0457,FALSE,TRUE +m15,W,FlipCircle,White,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,U,FlipCircle,Blue,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,B,FlipCircle,Black,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,R,FlipCircle,Red,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,G,FlipCircle,Green,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,M,FlipCircle,Multicolored,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,A,FlipCircle,Artifact,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,C,FlipCircle,Colorless,m15,0.0347,0.044,0.104,0.0676,FALSE,TRUE +m15,Artifact,FlipIcon,Artifact,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Blank,FlipIcon,Blank,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Compass,FlipIcon,Compass,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Creature,FlipIcon,Creature,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Day,FlipIcon,Day,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Eldrazi,FlipIcon,Eldrazi,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Enchantment,FlipIcon,Enchantment,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Instant,FlipIcon,Instant,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Land,FlipIcon,Land,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Moon,FlipIcon,Moon,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Multitype,FlipIcon,Multitype,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Night,FlipIcon,Night,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Planeshift,FlipIcon,Planeshift,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Planeswalker,FlipIcon,Planeswalker,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Sorcery,FlipIcon,Sorcery,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Structure,FlipIcon,Structure,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE \ No newline at end of file diff --git a/data/images/m15ArtifactIcon.png b/data/images/m15ArtifactFlipIcon.png similarity index 100% rename from data/images/m15ArtifactIcon.png rename to data/images/m15ArtifactFlipIcon.png diff --git a/data/images/m15BlankIcon.png b/data/images/m15BlankFlipIcon.png similarity index 100% rename from data/images/m15BlankIcon.png rename to data/images/m15BlankFlipIcon.png diff --git a/data/images/m15CompassIcon.png b/data/images/m15CompassFlipIcon.png similarity index 100% rename from data/images/m15CompassIcon.png rename to data/images/m15CompassFlipIcon.png diff --git a/data/images/m15CreatureIcon.png b/data/images/m15CreatureFlipIcon.png similarity index 100% rename from data/images/m15CreatureIcon.png rename to data/images/m15CreatureFlipIcon.png diff --git a/data/images/m15DayIcon.png b/data/images/m15DayFlipIcon.png similarity index 100% rename from data/images/m15DayIcon.png rename to data/images/m15DayFlipIcon.png diff --git a/data/images/m15EldraziIcon.png b/data/images/m15EldraziFlipIcon.png similarity index 100% rename from data/images/m15EldraziIcon.png rename to data/images/m15EldraziFlipIcon.png diff --git a/data/images/m15EnchantmentIcon.png b/data/images/m15EnchantmentFlipIcon.png similarity index 100% rename from data/images/m15EnchantmentIcon.png rename to data/images/m15EnchantmentFlipIcon.png diff --git a/data/images/m15InstantIcon.png b/data/images/m15InstantFlipIcon.png similarity index 100% rename from data/images/m15InstantIcon.png rename to data/images/m15InstantFlipIcon.png diff --git a/data/images/m15LandIcon.png b/data/images/m15LandFlipIcon.png similarity index 100% rename from data/images/m15LandIcon.png rename to data/images/m15LandFlipIcon.png diff --git a/data/images/m15MoonIcon.png b/data/images/m15MoonFlipIcon.png similarity index 100% rename from data/images/m15MoonIcon.png rename to data/images/m15MoonFlipIcon.png diff --git a/data/images/m15MultitypeIcon.png b/data/images/m15MultitypeFlipIcon.png similarity index 100% rename from data/images/m15MultitypeIcon.png rename to data/images/m15MultitypeFlipIcon.png diff --git a/data/images/m15NightIcon.png b/data/images/m15NightFlipIcon.png similarity index 100% rename from data/images/m15NightIcon.png rename to data/images/m15NightFlipIcon.png diff --git a/data/images/m15PlaneshiftIcon.png b/data/images/m15PlaneshiftFlipIcon.png similarity index 100% rename from data/images/m15PlaneshiftIcon.png rename to data/images/m15PlaneshiftFlipIcon.png diff --git a/data/images/m15PlaneswalkerIcon.png b/data/images/m15PlaneswalkerFlipIcon.png similarity index 100% rename from data/images/m15PlaneswalkerIcon.png rename to data/images/m15PlaneswalkerFlipIcon.png diff --git a/data/images/m15SorceryIcon.png b/data/images/m15SorceryFlipIcon.png similarity index 100% rename from data/images/m15SorceryIcon.png rename to data/images/m15SorceryFlipIcon.png diff --git a/data/images/m15StructureIcon.png b/data/images/m15StructureFlipIcon.png similarity index 100% rename from data/images/m15StructureIcon.png rename to data/images/m15StructureFlipIcon.png diff --git a/data/images/corners.png b/data/images/noneMaskCorners.png similarity index 100% rename from data/images/corners.png rename to data/images/noneMaskCorners.png diff --git a/data/images/secondary.png b/data/images/noneMaskSecondary.png similarity index 100% rename from data/images/secondary.png rename to data/images/noneMaskSecondary.png diff --git a/data/images/stamp.png b/data/images/noneMaskStamp.png similarity index 100% rename from data/images/stamp.png rename to data/images/noneMaskStamp.png diff --git a/data/new wip/m15ArtifactIcon.png b/data/new wip/m15ArtifactIcon.png deleted file mode 100644 index 44fdac90..00000000 Binary files a/data/new wip/m15ArtifactIcon.png and /dev/null differ diff --git a/data/new wip/m15BlankIcon.png b/data/new wip/m15BlankIcon.png deleted file mode 100644 index 0ac01337..00000000 Binary files a/data/new wip/m15BlankIcon.png and /dev/null differ diff --git a/data/new wip/m15CompassIcon.png b/data/new wip/m15CompassIcon.png deleted file mode 100644 index 6280e620..00000000 Binary files a/data/new wip/m15CompassIcon.png and /dev/null differ diff --git a/data/new wip/m15CreatureIcon.png b/data/new wip/m15CreatureIcon.png deleted file mode 100644 index 3aabf62a..00000000 Binary files a/data/new wip/m15CreatureIcon.png and /dev/null differ diff --git a/data/new wip/m15DayIcon.png b/data/new wip/m15DayIcon.png deleted file mode 100644 index 71189d94..00000000 Binary files a/data/new wip/m15DayIcon.png and /dev/null differ diff --git a/data/new wip/m15EldraziIcon.png b/data/new wip/m15EldraziIcon.png deleted file mode 100644 index 6dbb1bc2..00000000 Binary files a/data/new wip/m15EldraziIcon.png and /dev/null differ diff --git a/data/new wip/m15EnchantmentIcon.png b/data/new wip/m15EnchantmentIcon.png deleted file mode 100644 index 9dddf8f6..00000000 Binary files a/data/new wip/m15EnchantmentIcon.png and /dev/null differ diff --git a/data/new wip/m15InstantIcon.png b/data/new wip/m15InstantIcon.png deleted file mode 100644 index 834033d2..00000000 Binary files a/data/new wip/m15InstantIcon.png and /dev/null differ diff --git a/data/new wip/m15LandIcon.png b/data/new wip/m15LandIcon.png deleted file mode 100644 index 74a74eab..00000000 Binary files a/data/new wip/m15LandIcon.png and /dev/null differ diff --git a/data/new wip/m15MoonIcon.png b/data/new wip/m15MoonIcon.png deleted file mode 100644 index 3774d5cf..00000000 Binary files a/data/new wip/m15MoonIcon.png and /dev/null differ diff --git a/data/new wip/m15MultitypeIcon.png b/data/new wip/m15MultitypeIcon.png deleted file mode 100644 index 48cfa783..00000000 Binary files a/data/new wip/m15MultitypeIcon.png and /dev/null differ diff --git a/data/new wip/m15NightIcon.png b/data/new wip/m15NightIcon.png deleted file mode 100644 index dab6f4bf..00000000 Binary files a/data/new wip/m15NightIcon.png and /dev/null differ diff --git a/data/new wip/m15PlaneshiftIcon.png b/data/new wip/m15PlaneshiftIcon.png deleted file mode 100644 index bf1a14cb..00000000 Binary files a/data/new wip/m15PlaneshiftIcon.png and /dev/null differ diff --git a/data/new wip/m15PlaneswalkerIcon.png b/data/new wip/m15PlaneswalkerIcon.png deleted file mode 100644 index becc1933..00000000 Binary files a/data/new wip/m15PlaneswalkerIcon.png and /dev/null differ diff --git a/data/new wip/m15SorceryIcon.png b/data/new wip/m15SorceryIcon.png deleted file mode 100644 index 24d3a40f..00000000 Binary files a/data/new wip/m15SorceryIcon.png and /dev/null differ diff --git a/data/new wip/m15StructureIcon.png b/data/new wip/m15StructureIcon.png deleted file mode 100644 index 89ed9a4e..00000000 Binary files a/data/new wip/m15StructureIcon.png and /dev/null differ diff --git a/data/site/main.js b/data/site/main.js index 03b5a9cb..2870d1af 100644 --- a/data/site/main.js +++ b/data/site/main.js @@ -51,6 +51,7 @@ loadImageSpreadsheet() //============================================// // Functions // //============================================// +var nameArray = [] //Load the CSV full of image data function loadImageSpreadsheet() { var xhttp = new XMLHttpRequest() @@ -65,8 +66,11 @@ function loadImageSpreadsheet() { window[rawText[0].split(",")[n].trim() + "Array"][i - 1] = rawText[i].split(",")[n].trim() } } + if (i != 0) { + nameArray[i - 1] = versionArray[i - 1] + colorArray[i - 1] + typeArray[i - 1] + } if (i == rawText.length - 1) { - init() + init() } } } @@ -142,7 +146,7 @@ CanvasRenderingContext2D.prototype.mask = function(cardMasterIndex) { maskContext.clearRect(0, 0, cardWidth, cardHeight) maskContext.globalCompositeOperation = "source-over" if (cardMasterTypes[cardMasterIndex].includes("Secondary")) { - maskContext.drawImage(window[nameArray[nameArray.indexOf("secondary")]].image, 0, 0, cardWidth, cardHeight) + maskContext.drawImage(window[nameArray[nameArray.indexOf("noneMaskSecondary")]].image, 0, 0, cardWidth, cardHeight) maskContext.globalCompositeOperation = "source-in" } var maskToUse = window[versionArray[cardMasterImages[cardMasterIndex].index] + "Mask" + cardMasterTypes[cardMasterIndex].replace("Secondary", "")] @@ -151,10 +155,10 @@ CanvasRenderingContext2D.prototype.mask = function(cardMasterIndex) { maskContext.globalCompositeOperation = "source-in" } var mainImageIndex = cardMasterImages[cardMasterIndex].index - maskContext.drawImage(cardMasterImages[cardMasterIndex].image, xArray[mainImageIndex] * cardWidth, yArray[mainImageIndex] * cardHeight, widthArray[mainImageIndex] * cardWidth, heightArray[mainImageIndex] * cardHeight) + maskContext.drawImage(cardMasterImages[cardMasterIndex].image, xArray[mainImageIndex] * cardWidth, yArray[mainImageIndex] * cardHeight, widthArray[mainImageIndex] * cardWidth, heightArray[mainImageIndex] * cardHeight) this.drawImage(maskCanvas, 0, 0, cardWidth, cardHeight) if (cardMasterTypes[cardMasterIndex].includes("RareStamp")) { - this.drawImage(window[nameArray[nameArray.indexOf("stamp")]].image, version.rareStampX, version.rareStampY, version.rareStampWidth, version.rareStampHeight) + this.drawImage(window[nameArray[nameArray.indexOf("noneMaskStamp")]].image, version.rareStampX, version.rareStampY, version.rareStampWidth, version.rareStampHeight) } updateImageCanvas() } @@ -237,7 +241,7 @@ function updateWatermarkCanvas() { if (document.getElementById("inputWatermarkSecondary").value != "none") { watermarkContext.globalCompositeOperation = "source-atop" tempContext.clearRect(0, 0, cardWidth, cardHeight) - tempContext.drawImage(window[nameArray[nameArray.indexOf("secondary")]].image, 0, 0, cardWidth, cardHeight) + tempContext.drawImage(window[nameArray[nameArray.indexOf("noneMaskSecondary")]].image, 0, 0, cardWidth, cardHeight) tempContext.globalCompositeOperation = "source-in" if (document.getElementById("inputWatermarkSecondary").value == "default") { tempContext.drawImage(watermark, watermarkX, watermarkY, watermarkWidth, watermarkHeight) @@ -275,7 +279,7 @@ function updateCardCanvas() { cardContext.drawImage(setSymbolCanvas, 0, 0, cardWidth, cardHeight) //clear the corners cardContext.globalCompositeOperation = "destination-out" - cardContext.drawImage(window[nameArray[nameArray.indexOf("corners")]].image, 0, 0, cardWidth, cardHeight) + cardContext.drawImage(window[nameArray[nameArray.indexOf("noneMaskCorners")]].image, 0, 0, cardWidth, cardHeight) cardContext.globalCompositeOperation = "source-over" //paste it to the visible canvas mainContext.clearRect(0, 0, cardWidth, cardHeight) @@ -357,7 +361,7 @@ function hideShowColors(enter = false) { document.getElementById("tabSelectColor").innerHTML = "" var activeTab = false for (var i = 0; i < versionArray.length; i ++) { - if (versionArray[i] == version.currentVersion && (typeArray[i] == getSelectedTab("frameType").replace("Secondary", "") || (typeArray[i] == "Full" && version.typeNotFull.includes(getSelectedTab("frameType")) == false)) && colorArray[i] != "Mask") { + if (versionArray[i] == version.currentVersion && (typeArray[i] == getSelectedTab("frameType").replace("Secondary", "") || (typeArray[i] == "Full" && version.typeNotFull.includes(getSelectedTab("frameType")) == false)) && colorArray[i] != "Mask" && (document.getElementById("checkboxAdvanced").checked || advancedArray[i] == "FALSE")) { tabSelectAddOption("tabSelectColor", displayNameArray[i], i) if (displayNameArray[i] == suggestedColor) { document.getElementsByClassName("tabSelectColor")[document.getElementsByClassName("tabSelectColor").length - 1].className += " activeTab" @@ -743,6 +747,10 @@ function checkCookies() { toggleTooltips(false) document.getElementById("tooltipToggler").checked = false } + if (getCookie("advancedBorders") == "true") { + document.getElementById("tooltipToggler").checked = true + hideShowColors() + } } @@ -833,6 +841,11 @@ function textCodeTutorial() { } } +function advancedBordersClicked() { + hideShowColors() + setCookie("advancedBorders", document.getElementById("checkboxAdvanced").checked + "") +} + textCodeTutorial() diff --git a/index.html b/index.html index 5e52bc92..0b6e1a44 100644 --- a/index.html +++ b/index.html @@ -173,6 +173,7 @@
Card Conjurer By Kyle Burton
Display tooltips
+ Advanced Borders
Navigation: