diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameA.png b/img/frames/m15/borderless/m15GenericShowcaseFrameA.png new file mode 100644 index 00000000..7fc413d5 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameA.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameAThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameAThumb.png new file mode 100644 index 00000000..665a11d8 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameAThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameB.png b/img/frames/m15/borderless/m15GenericShowcaseFrameB.png new file mode 100644 index 00000000..6e01533d Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameB.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameBThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameBThumb.png new file mode 100644 index 00000000..8a3b5e4d Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameBThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameG.png b/img/frames/m15/borderless/m15GenericShowcaseFrameG.png new file mode 100644 index 00000000..8c2ea160 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameG.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameGThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameGThumb.png new file mode 100644 index 00000000..56466d4b Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameGThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameL.png b/img/frames/m15/borderless/m15GenericShowcaseFrameL.png new file mode 100644 index 00000000..cc331d5b Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameL.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameLThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameLThumb.png new file mode 100644 index 00000000..65aaef68 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameLThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameM.png b/img/frames/m15/borderless/m15GenericShowcaseFrameM.png new file mode 100644 index 00000000..a9432e8a Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameM.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameMThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameMThumb.png new file mode 100644 index 00000000..7239105b Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameMThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameR.png b/img/frames/m15/borderless/m15GenericShowcaseFrameR.png new file mode 100644 index 00000000..6e5f5296 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameR.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameRThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameRThumb.png new file mode 100644 index 00000000..fc9e0692 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameRThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameU.png b/img/frames/m15/borderless/m15GenericShowcaseFrameU.png new file mode 100644 index 00000000..ddc06fc1 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameU.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameUThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameUThumb.png new file mode 100644 index 00000000..f0a093bc Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameUThumb.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameW.png b/img/frames/m15/borderless/m15GenericShowcaseFrameW.png new file mode 100644 index 00000000..be3039f2 Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameW.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameWThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameWThumb.png new file mode 100644 index 00000000..173b7e8c Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameWThumb.png differ diff --git a/img/frames/m15/borderless/pt/a.png b/img/frames/m15/borderless/pt/a.png new file mode 100644 index 00000000..bbb1d96d Binary files /dev/null and b/img/frames/m15/borderless/pt/a.png differ diff --git a/img/frames/m15/borderless/pt/aThumb.png b/img/frames/m15/borderless/pt/aThumb.png new file mode 100644 index 00000000..215d9f35 Binary files /dev/null and b/img/frames/m15/borderless/pt/aThumb.png differ diff --git a/img/frames/m15/borderless/pt/b.png b/img/frames/m15/borderless/pt/b.png new file mode 100644 index 00000000..c4ab69fc Binary files /dev/null and b/img/frames/m15/borderless/pt/b.png differ diff --git a/img/frames/m15/borderless/pt/bThumb.png b/img/frames/m15/borderless/pt/bThumb.png new file mode 100644 index 00000000..91ae7d59 Binary files /dev/null and b/img/frames/m15/borderless/pt/bThumb.png differ diff --git a/img/frames/m15/borderless/pt/c.png b/img/frames/m15/borderless/pt/c.png new file mode 100644 index 00000000..afd83600 Binary files /dev/null and b/img/frames/m15/borderless/pt/c.png differ diff --git a/img/frames/m15/borderless/pt/cThumb.png b/img/frames/m15/borderless/pt/cThumb.png new file mode 100644 index 00000000..790fb474 Binary files /dev/null and b/img/frames/m15/borderless/pt/cThumb.png differ diff --git a/img/frames/m15/borderless/pt/g.png b/img/frames/m15/borderless/pt/g.png new file mode 100644 index 00000000..3a39c0db Binary files /dev/null and b/img/frames/m15/borderless/pt/g.png differ diff --git a/img/frames/m15/borderless/pt/gThumb.png b/img/frames/m15/borderless/pt/gThumb.png new file mode 100644 index 00000000..55e01076 Binary files /dev/null and b/img/frames/m15/borderless/pt/gThumb.png differ diff --git a/img/frames/m15/borderless/pt/l.png b/img/frames/m15/borderless/pt/l.png new file mode 100644 index 00000000..73d9ecb3 Binary files /dev/null and b/img/frames/m15/borderless/pt/l.png differ diff --git a/img/frames/m15/borderless/pt/lThumb.png b/img/frames/m15/borderless/pt/lThumb.png new file mode 100644 index 00000000..d5760af9 Binary files /dev/null and b/img/frames/m15/borderless/pt/lThumb.png differ diff --git a/img/frames/m15/borderless/pt/m.png b/img/frames/m15/borderless/pt/m.png new file mode 100644 index 00000000..e58ad926 Binary files /dev/null and b/img/frames/m15/borderless/pt/m.png differ diff --git a/img/frames/m15/borderless/pt/mThumb.png b/img/frames/m15/borderless/pt/mThumb.png new file mode 100644 index 00000000..9d2cfdc8 Binary files /dev/null and b/img/frames/m15/borderless/pt/mThumb.png differ diff --git a/img/frames/m15/borderless/pt/r.png b/img/frames/m15/borderless/pt/r.png new file mode 100644 index 00000000..750574ba Binary files /dev/null and b/img/frames/m15/borderless/pt/r.png differ diff --git a/img/frames/m15/borderless/pt/rThumb.png b/img/frames/m15/borderless/pt/rThumb.png new file mode 100644 index 00000000..f931f0c1 Binary files /dev/null and b/img/frames/m15/borderless/pt/rThumb.png differ diff --git a/img/frames/m15/borderless/pt/u.png b/img/frames/m15/borderless/pt/u.png new file mode 100644 index 00000000..fdcde61c Binary files /dev/null and b/img/frames/m15/borderless/pt/u.png differ diff --git a/img/frames/m15/borderless/pt/uThumb.png b/img/frames/m15/borderless/pt/uThumb.png new file mode 100644 index 00000000..5b302964 Binary files /dev/null and b/img/frames/m15/borderless/pt/uThumb.png differ diff --git a/img/frames/m15/borderless/pt/w.png b/img/frames/m15/borderless/pt/w.png new file mode 100644 index 00000000..3cc59d4d Binary files /dev/null and b/img/frames/m15/borderless/pt/w.png differ diff --git a/img/frames/m15/borderless/pt/wThumb.png b/img/frames/m15/borderless/pt/wThumb.png new file mode 100644 index 00000000..2e8b4307 Binary files /dev/null and b/img/frames/m15/borderless/pt/wThumb.png differ diff --git a/img/frames/m15/genericShowcase/m15GenericShowcaseFrameR.png b/img/frames/m15/genericShowcase/m15GenericShowcaseFrameR.png index c1aeae80..3b8aa7c5 100644 Binary files a/img/frames/m15/genericShowcase/m15GenericShowcaseFrameR.png and b/img/frames/m15/genericShowcase/m15GenericShowcaseFrameR.png differ diff --git a/img/frames/m15/genericShowcase/m15GenericShowcaseFrameRThumb.png b/img/frames/m15/genericShowcase/m15GenericShowcaseFrameRThumb.png index 7c322fbb..59274ae7 100644 Binary files a/img/frames/m15/genericShowcase/m15GenericShowcaseFrameRThumb.png and b/img/frames/m15/genericShowcase/m15GenericShowcaseFrameRThumb.png differ diff --git a/js/frameSearch.js b/js/frameSearch.js index 22cc04cf..b1df0a42 100644 --- a/js/frameSearch.js +++ b/js/frameSearch.js @@ -62,6 +62,7 @@ const frameNames = new Map ([ ['Theros Beyond Death (THB)', 'M15NyxShowcase'], ['Eldraine Storybooks (ELD)', 'Storybook'], ['Borderless', 'GenericShowcase'], + ['Borderless (Alt)', 'Borderless'], ['Fullart', 'M15ClearTextboxes'], ['Nickname ("Godzilla")', 'M15Nickname'], ['Extended Art (Regular)', 'M15BoxTopper'], diff --git a/js/frames/groupShowcase-5.js b/js/frames/groupShowcase-5.js index 195abe89..e715e918 100644 --- a/js/frames/groupShowcase-5.js +++ b/js/frames/groupShowcase-5.js @@ -33,17 +33,19 @@ loadFramePacks([ {name:'Eldraine Storybooks (ELD)', value:'Storybook'}, {name:'Generic Showcase Frames', value:'disabled'}, {name:'Borderless', value:'GenericShowcase'}, + {name:'Borderless (Alt)', value:'Borderless'}, {name:'Fullart', value:'M15ClearTextboxes'}, {name:'Nickname ("Godzilla")', value:'M15Nickname'}, {name:'Extended Art (Regular)', value:'M15BoxTopper'}, {name:'Extended Art (Shorter Textbox)', value:'M15ExtendedArtShort'}, {name:'FNM Promo (Inverted Promos)', value:'FNM'}, - {name:'Universes Beyond', value:'UB'}, - {name:'Universes Beyond (Full art)', value:'UBFull'}, - {name:'Universes Beyond (Extended art)', value:'UBExtendedArt'}, {name:'Full Text', value:'FullText'}, {name:'Etched (Commander Precons)', value:'Etched'}, {name:'Etched (Nyx)', value:'EtchedNyx'}, + {name:'Universes Beyond', value:'disabled'}, + {name:'Universes Beyond', value:'UB'}, + {name:'Universes Beyond (Full art)', value:'UBFull'}, + {name:'Universes Beyond (Extended art)', value:'UBExtendedArt'}, {name:'Masterpieces/Other', value:'disabled'}, {name:'Phyrexian', value:'Praetors'}, {name:'ZNR Expeditions (2020)', value:'ExpeditionZNR-1'}, diff --git a/js/frames/packBorderless.js b/js/frames/packBorderless.js new file mode 100644 index 00000000..41ce494d --- /dev/null +++ b/js/frames/packBorderless.js @@ -0,0 +1,50 @@ +//Create objects for common properties across available frames +var masks = [{src:'/img/frames/m15/genericShowcase/m15GenericShowcaseMaskPinline.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/m15MaskBorder.png', name:'Border'}]; +var bounds = {x:1146/1500, y:1861/2100, width:274/1500, height:140/2100}; +//defines available frames +availableFrames = [ + {name:'White Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameW.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameU.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameB.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameR.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameG.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameM.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameA.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameL.png', masks:masks}, + {name:'White Power/Toughness', src:'/img/frames/m15/borderless/pt/w.png', bounds:bounds}, + {name:'Blue Power/Toughness', src:'/img/frames/m15/borderless/pt/u.png', bounds:bounds}, + {name:'Black Power/Toughness', src:'/img/frames/m15/borderless/pt/b.png', bounds:bounds}, + {name:'Red Power/Toughness', src:'/img/frames/m15/borderless/pt/r.png', bounds:bounds}, + {name:'Green Power/Toughness', src:'/img/frames/m15/borderless/pt/g.png', bounds:bounds}, + {name:'Multicolored Power/Toughness', src:'/img/frames/m15/borderless/pt/m.png', bounds:bounds}, + {name:'Artifact Power/Toughness', src:'/img/frames/m15/borderless/pt/a.png', bounds:bounds}, + {name:'Colorless Power/Toughness', src:'/img/frames/m15/borderless/pt/l.png', bounds:bounds} +]; +//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 = 'borderless'; + //art bounds + card.artBounds = {x:0, y:0, width:1, height:0.9224}; + 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'}, + 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'}, + rules: {name:'Rules Text', text:'', x:0.086, y:0.6303, width:0.828, height:0.2875, size:0.0362, color:'white'}, + 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/packGenericShowcase.js b/js/frames/packGenericShowcase.js index 0ef4acbc..96f8fec6 100644 --- a/js/frames/packGenericShowcase.js +++ b/js/frames/packGenericShowcase.js @@ -40,9 +40,9 @@ document.querySelector('#loadFrameVersion').onclick = async function() { //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.0014, shadowY:0.001}, - 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.0014, shadowY:0.001}, - rules: {name:'Rules Text', text:'', x:0.086, y:0.6303, width:0.828, height:0.2875, size:0.0362, color:'white', shadowX:0.0014, shadowY:0.001}, + 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'}, + 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'}, + rules: {name:'Rules Text', text:'', x:0.086, y:0.6303, width:0.828, height:0.2875, size:0.0362, color:'white'}, 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'} }); }