diff --git a/creator/index.php b/creator/index.php
index 4784a91f..1c6712ed 100644
--- a/creator/index.php
+++ b/creator/index.php
@@ -60,7 +60,7 @@
-
+
\ No newline at end of file
diff --git a/img/frames/m15/custom/m15CustomPTInnerFill.png b/img/frames/m15/custom/m15CustomPTInnerFill.png
new file mode 100644
index 00000000..c6e3dad4
Binary files /dev/null and b/img/frames/m15/custom/m15CustomPTInnerFill.png differ
diff --git a/img/frames/m15/custom/m15CustomPTInnerFillThumb.png b/img/frames/m15/custom/m15CustomPTInnerFillThumb.png
new file mode 100644
index 00000000..f7161bfb
Binary files /dev/null and b/img/frames/m15/custom/m15CustomPTInnerFillThumb.png differ
diff --git a/img/frames/m15/custom/m15Midnight.png b/img/frames/m15/custom/m15Midnight.png
new file mode 100644
index 00000000..96dc4e71
Binary files /dev/null and b/img/frames/m15/custom/m15Midnight.png differ
diff --git a/img/frames/m15/custom/m15MidnightThumb.png b/img/frames/m15/custom/m15MidnightThumb.png
new file mode 100644
index 00000000..81b93a83
Binary files /dev/null and b/img/frames/m15/custom/m15MidnightThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/a.png b/img/frames/m15/nyxShowcase/a.png
new file mode 100644
index 00000000..1a66b9e7
Binary files /dev/null and b/img/frames/m15/nyxShowcase/a.png differ
diff --git a/img/frames/m15/nyxShowcase/aThumb.png b/img/frames/m15/nyxShowcase/aThumb.png
new file mode 100644
index 00000000..b6c9a7d2
Binary files /dev/null and b/img/frames/m15/nyxShowcase/aThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/b.png b/img/frames/m15/nyxShowcase/b.png
new file mode 100644
index 00000000..c894acbb
Binary files /dev/null and b/img/frames/m15/nyxShowcase/b.png differ
diff --git a/img/frames/m15/nyxShowcase/bThumb.png b/img/frames/m15/nyxShowcase/bThumb.png
new file mode 100644
index 00000000..4e758db4
Binary files /dev/null and b/img/frames/m15/nyxShowcase/bThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/g.png b/img/frames/m15/nyxShowcase/g.png
new file mode 100644
index 00000000..0c17d9e1
Binary files /dev/null and b/img/frames/m15/nyxShowcase/g.png differ
diff --git a/img/frames/m15/nyxShowcase/gThumb.png b/img/frames/m15/nyxShowcase/gThumb.png
new file mode 100644
index 00000000..10730477
Binary files /dev/null and b/img/frames/m15/nyxShowcase/gThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/m.png b/img/frames/m15/nyxShowcase/m.png
new file mode 100644
index 00000000..bbe0c8b8
Binary files /dev/null and b/img/frames/m15/nyxShowcase/m.png differ
diff --git a/img/frames/m15/nyxShowcase/mThumb.png b/img/frames/m15/nyxShowcase/mThumb.png
new file mode 100644
index 00000000..78a855ac
Binary files /dev/null and b/img/frames/m15/nyxShowcase/mThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/r.png b/img/frames/m15/nyxShowcase/r.png
new file mode 100644
index 00000000..512df05c
Binary files /dev/null and b/img/frames/m15/nyxShowcase/r.png differ
diff --git a/img/frames/m15/nyxShowcase/rThumb.png b/img/frames/m15/nyxShowcase/rThumb.png
new file mode 100644
index 00000000..6c53de09
Binary files /dev/null and b/img/frames/m15/nyxShowcase/rThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/u.png b/img/frames/m15/nyxShowcase/u.png
new file mode 100644
index 00000000..b4ba151a
Binary files /dev/null and b/img/frames/m15/nyxShowcase/u.png differ
diff --git a/img/frames/m15/nyxShowcase/uThumb.png b/img/frames/m15/nyxShowcase/uThumb.png
new file mode 100644
index 00000000..430fee8e
Binary files /dev/null and b/img/frames/m15/nyxShowcase/uThumb.png differ
diff --git a/img/frames/m15/nyxShowcase/w.png b/img/frames/m15/nyxShowcase/w.png
new file mode 100644
index 00000000..f67a695a
Binary files /dev/null and b/img/frames/m15/nyxShowcase/w.png differ
diff --git a/img/frames/m15/nyxShowcase/wThumb.png b/img/frames/m15/nyxShowcase/wThumb.png
new file mode 100644
index 00000000..da1cb3d8
Binary files /dev/null and b/img/frames/m15/nyxShowcase/wThumb.png differ
diff --git a/js/creator-3.js b/js/creator-4.js
similarity index 99%
rename from js/creator-3.js
rename to js/creator-4.js
index 1bc0447e..9cd5b447 100644
--- a/js/creator-3.js
+++ b/js/creator-4.js
@@ -1364,5 +1364,5 @@ function fetchScryfallData(cardName, callback = console.log) {
}
//Initialization
document.querySelector('#info-number').value = date.getFullYear();
-loadScript('/js/frames/groupStandard-1.js');
+loadScript('/js/frames/groupStandard-2.js');
loadAvailableCards();
diff --git a/js/frames/groupShowcase-1.js b/js/frames/groupShowcase-1.js
index a136ff49..d462cbd6 100644
--- a/js/frames/groupShowcase-1.js
+++ b/js/frames/groupShowcase-1.js
@@ -3,6 +3,7 @@ loadFramePacks([
{name:'Commander Legends', value:'CommanderLegends'},
{name:'Zendikar Rising', value:'ZendikarRising'},
{name:'M21', value:'M21'},
+ {name:'Theros Beyond Death', value:'M15NyxShowcase'},
{name:'Eldraine Storybooks', value:'Storybook'},
{name:'Generic Showcase', value:'GenericShowcase'},
{name:'Masterpieces/Other', value:'disabled'},
diff --git a/js/frames/groupStandard-1.js b/js/frames/groupStandard-2.js
similarity index 92%
rename from js/frames/groupStandard-1.js
rename to js/frames/groupStandard-2.js
index 3f0d39b1..93832d7d 100644
--- a/js/frames/groupStandard-1.js
+++ b/js/frames/groupStandard-2.js
@@ -1,5 +1,5 @@
loadFramePacks([
- {name:'Regular Frames', value:'M15Regular'},
+ {name:'Regular Frames', value:'M15Regular-1'},
{name:'Lands', value:'M15Lands'},
{name:'Addons', value:'disabled'},
{name:'Legend Crowns', value:'M15LegendCrowns'},
diff --git a/js/frames/packM15Nyx.js b/js/frames/packM15Nyx.js
index eca1d275..9328508e 100644
--- a/js/frames/packM15Nyx.js
+++ b/js/frames/packM15Nyx.js
@@ -1,5 +1,6 @@
//Create objects for common properties across available frames
var masks = [{src:'/img/frames/m15/regular/m15MaskPinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}, {src:'/img/frames/m15/regular/m15MaskRules.png', name:'Rules'}, {src:'/img/frames/m15/regular/m15MaskFrame.png', name:'Frame'}, {src:'/img/frames/m15/regular/m15MaskBorder.png', name:'Border'}];
+var bounds = {x:0.164, y:0.0239, width:0.672, height:0.0239};
//defines available frames
availableFrames = [
{name:'White Frame', src:'/img/frames/m15/nyx/m15FrameWNyx.png', masks:masks},
@@ -8,7 +9,14 @@ availableFrames = [
{name:'Red Frame', src:'/img/frames/m15/nyx/m15FrameRNyx.png', masks:masks},
{name:'Green Frame', src:'/img/frames/m15/nyx/m15FrameGNyx.png', masks:masks},
{name:'Multicolored Frame', src:'/img/frames/m15/nyx/m15FrameMNyx.png', masks:masks},
- {name:'Artifact Frame', src:'/img/frames/m15/nyx/m15FrameANyx.png', masks:masks}
+ {name:'Artifact Frame', src:'/img/frames/m15/nyx/m15FrameANyx.png', masks:masks},
+ {name:'White Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownWNyx.png', bounds:bounds},
+ {name:'Blue Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownUNyx.png', bounds:bounds},
+ {name:'Black Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownBNyx.png', bounds:bounds},
+ {name:'Red Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownRNyx.png', bounds:bounds},
+ {name:'Green Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownGNyx.png', bounds:bounds},
+ {name:'Multicolored Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownMNyx.png', bounds:bounds},
+ {name:'Artifact Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownANyx.png', bounds:bounds},
];
//disables/enables the "Load Frame Version" button
document.querySelector('#loadFrameVersion').disabled = true;
diff --git a/js/frames/packM15NyxShowcase.js b/js/frames/packM15NyxShowcase.js
new file mode 100644
index 00000000..54868e1d
--- /dev/null
+++ b/js/frames/packM15NyxShowcase.js
@@ -0,0 +1,57 @@
+//Create objects for common properties across available frames
+var masks = [{src:'/img/frames/m15/regular/m15MaskPinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}, {src:'/img/frames/m15/regular/m15MaskRules.png', name:'Rules'}, {src:'/img/frames/m15/regular/m15MaskFrame.png', name:'Frame'}, {src:'/img/frames/m15/regular/m15MaskBorder.png', name:'Border'}];
+var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733};
+var bounds2 = {x:0.164, y:0.0239, width:0.672, height:0.0239};
+//defines available frames
+availableFrames = [
+ {name:'White Frame', src:'/img/frames/m15/nyxShowcase/w.png', masks:masks},
+ {name:'Blue Frame', src:'/img/frames/m15/nyxShowcase/u.png', masks:masks},
+ {name:'Black Frame', src:'/img/frames/m15/nyxShowcase/b.png', masks:masks},
+ {name:'Red Frame', src:'/img/frames/m15/nyxShowcase/r.png', masks:masks},
+ {name:'Green Frame', src:'/img/frames/m15/nyxShowcase/g.png', masks:masks},
+ {name:'Multicolored Frame', src:'/img/frames/m15/nyxShowcase/m.png', masks:masks},
+ {name:'Artifact Frame', src:'/img/frames/m15/nyxShowcase/a.png', masks:masks},
+ {name:'White Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTW.png', bounds:bounds},
+ {name:'Blue Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTU.png', bounds:bounds},
+ {name:'Black Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTB.png', bounds:bounds},
+ {name:'Red Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTR.png', bounds:bounds},
+ {name:'Green Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTG.png', bounds:bounds},
+ {name:'Multicolored Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTM.png', bounds:bounds},
+ {name:'Artifact Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTA.png', bounds:bounds},
+ {name:'Colorless Power/Toughness', src:'/img/frames/m15/nickname/m15NicknamePTC.png', bounds:bounds},
+ {name:'White Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownWNyx.png', bounds:bounds2},
+ {name:'Blue Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownUNyx.png', bounds:bounds2},
+ {name:'Black Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownBNyx.png', bounds:bounds2},
+ {name:'Red Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownRNyx.png', bounds:bounds2},
+ {name:'Green Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownGNyx.png', bounds:bounds2},
+ {name:'Multicolored Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownMNyx.png', bounds:bounds2},
+ {name:'Artifact Inner Crown (Nyx)', src:'/img/frames/m15/innerCrowns/m15InnerCrownANyx.png', bounds:bounds2}
+];
+//disables/enables the "Load Frame Version" button
+document.querySelector('#loadFrameVersion').disabled = false;
+//defines process for loading this version, if applicable
+document.querySelector('#loadFrameVersion').onclick = async function() {
+ //resets things so that every frame doesn't have to
+ await resetCardIrregularities();
+ //sets card version
+ card.version = 'nyxShowcase';
+ //art bounds
+ card.artBounds = {x:0.062, y:0.1129, width:0.876, height:0.8096};
+ autoFitArt();
+ //set symbol bounds
+ card.setSymbolBounds = {x:0.9213, y:0.5910, width:0.12, height:0.0410, vertical:'center', horizontal: 'right'};
+ resetSetSymbol();
+ //watermark bounds
+ card.watermarkBounds = {x:0.5, y:0.7762, width:0.75, height:0.2305};
+ resetWatermark();
+ //text
+ loadTextOptions({
+ mana: {name:'Mana Cost', text:'', y:0.0613, width:0.9292, height:71/2100, oneLine:true, size:71/1638, align:'right', shadowX:-0.001, shadowY:0.0029, manaCost:true, manaSpacing:0},
+ title: {name:'Title', text:'', x:0.0854, y:0.0522, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0381, color:'white', shadowX:0.002, shadowY:0.0015},
+ type: {name:'Type', text:'', x:0.0854, y:0.5664, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0324, color:'white', shadowX:0.002, shadowY:0.0015},
+ rules: {name:'Rules Text', text:'', x:0.086, y:0.6303, width:0.828, height:0.2875, size:0.0362, color:'white', shadowX:0.0013, shadowY:0.001},
+ pt: {name:'Power/Toughness', text:'', x:0.7928, y:0.902, width:0.1367, height:0.0372, size:0.0372, font:'belerenbsc', oneLine:true, align:'center', color:'white'}
+ });
+}
+//loads available frames
+loadFramePack();
\ No newline at end of file
diff --git a/js/frames/packM15Regular.js b/js/frames/packM15Regular-1.js
similarity index 93%
rename from js/frames/packM15Regular.js
rename to js/frames/packM15Regular-1.js
index f17dcd2f..517ff1a9 100644
--- a/js/frames/packM15Regular.js
+++ b/js/frames/packM15Regular-1.js
@@ -20,7 +20,9 @@ availableFrames = [
{name:'Multicolored Power/Toughness', src:'/img/frames/m15/regular/m15PTM.png', bounds:bounds},
{name:'Artifact Power/Toughness', src:'/img/frames/m15/regular/m15PTA.png', bounds:bounds},
{name:'Colorless Power/Toughness', src:'/img/frames/m15/regular/m15PTC.png', bounds:bounds},
- {name:'Vehicle Power/Toughness', src:'/img/frames/m15/regular/m15PTV.png', bounds:bounds}
+ {name:'Vehicle Power/Toughness', src:'/img/frames/m15/regular/m15PTV.png', bounds:bounds},
+ {name:'Midnight Frame', src:'/img/frames/m15/custom/m15Midnight.png', masks:masks},
+ {name:'PT Inner Fill', src:'/img/frames/m15/custom/m15CustomPTInnerFill.png', bounds:{x:0.79, y:0.8977, width:0.1414, height:0.04}}
];
//disables/enables the "Load Frame Version" button
document.querySelector('#loadFrameVersion').disabled = false;