diff --git a/data/images/imageSpreadsheet.csv b/data/images/imageSpreadsheet.csv index 5af65413..b60d47ba 100644 --- a/data/images/imageSpreadsheet.csv +++ b/data/images/imageSpreadsheet.csv @@ -132,4 +132,6 @@ 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 +m15,Structure,FlipIcon,Structure,m15,0.052,0.0486,0.08,0.0571,FALSE,TRUE +m15,Mask,Border,m15MaskBorder,m15,0,0,1,1,TRUE,FALSE +m15,Default,Border,m15DefaultBorder,m15,0,0,1,1,TRUE,FALSE \ No newline at end of file diff --git a/data/images/m15DefaultBorder.png b/data/images/m15DefaultBorder.png new file mode 100644 index 00000000..ba340487 Binary files /dev/null and b/data/images/m15DefaultBorder.png differ diff --git a/data/images/m15MaskBorder.png b/data/images/m15MaskBorder.png new file mode 100644 index 00000000..bf57bbfd Binary files /dev/null and b/data/images/m15MaskBorder.png differ diff --git a/data/site/main.js b/data/site/main.js index fe679fb7..16c8ff76 100644 --- a/data/site/main.js +++ b/data/site/main.js @@ -382,7 +382,7 @@ function hideShowColors(enter = false) { } //Loads the opacity value function loadOpacityValue() { - document.getElementById("inputOpacityValue").value = cardMasterOpacityValue[version.typeOrder.indexOf(document.getElementById("inputImageTypeOpacity").value)] + document.getElementById("inputOpacityValue").value = cardMasterOpacityValue[version.typeOrder.indexOf(document.getElementById("inputImageTypeOpacity").value)] || 100 } function opacityValueUpdated() { cardMasterOpacityValue[version.typeOrder.indexOf(document.getElementById("inputImageTypeOpacity").value)] = document.getElementById("inputOpacityValue").value diff --git a/data/versions/m15Version.js b/data/versions/m15Version.js index a16fa135..026f8bd2 100644 --- a/data/versions/m15Version.js +++ b/data/versions/m15Version.js @@ -2,9 +2,9 @@ // 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", "FlipPT", "FlipCircle", "FlipIcon"] +version.typeOrder = ["Full", "FullSecondary", "Frame", "FrameSecondary", "Nyx", "NyxSecondary", "Pinline", "PinlineSecondary", "Legendary", "LegendarySecondary", "Title", "TitleSecondary", "Miracle", "MiracleSecondary", "Type", "TypeSecondary", "Rules", "RulesSecondary", "Border", "BorderSecondary", "PT", "RareStamp", "RareStampSecondary", "FlipPT", "FlipCircle", "FlipIcon"] version.typesAdvanced = ["Nyx", "Miracle", "FlipPT", "FlipCircle", "FlipIcon"] -version.typeNotFull = ["Legendary", "LegendarySecondary", "PT", "RareStamp", "RareStampSecondary", "Nyx", "NyxSecondary", "Miracle", "MiracleSecondary", "FlipPT", "FlipCircle", "FlipIcon"] +version.typeNotFull = ["Legendary", "LegendarySecondary", "PT", "RareStamp", "RareStampSecondary", "Nyx", "NyxSecondary", "Miracle", "MiracleSecondary", "FlipPT", "FlipCircle", "FlipIcon", "Border", "BorderSecondary"] version.artX = cwidth(58) version.artY = cheight(118) version.setSymbolRight = cwidth(693)