diff --git a/img/frames/m15/new/extended/a.png b/img/frames/m15/new/extended/a.png new file mode 100644 index 00000000..74a31d75 Binary files /dev/null and b/img/frames/m15/new/extended/a.png differ diff --git a/img/frames/m15/new/extended/aThumb.png b/img/frames/m15/new/extended/aThumb.png new file mode 100644 index 00000000..0faff6eb Binary files /dev/null and b/img/frames/m15/new/extended/aThumb.png differ diff --git a/img/frames/m15/new/extended/b.png b/img/frames/m15/new/extended/b.png new file mode 100644 index 00000000..91ec892f Binary files /dev/null and b/img/frames/m15/new/extended/b.png differ diff --git a/img/frames/m15/new/extended/bThumb.png b/img/frames/m15/new/extended/bThumb.png new file mode 100644 index 00000000..7b4454a9 Binary files /dev/null and b/img/frames/m15/new/extended/bThumb.png differ diff --git a/img/frames/m15/new/extended/c.png b/img/frames/m15/new/extended/c.png new file mode 100644 index 00000000..21ed1d0a Binary files /dev/null and b/img/frames/m15/new/extended/c.png differ diff --git a/img/frames/m15/new/extended/cThumb.png b/img/frames/m15/new/extended/cThumb.png new file mode 100644 index 00000000..8b0f6de5 Binary files /dev/null and b/img/frames/m15/new/extended/cThumb.png differ diff --git a/img/frames/m15/new/extended/g.png b/img/frames/m15/new/extended/g.png new file mode 100644 index 00000000..9c955c03 Binary files /dev/null and b/img/frames/m15/new/extended/g.png differ diff --git a/img/frames/m15/new/extended/gThumb.png b/img/frames/m15/new/extended/gThumb.png new file mode 100644 index 00000000..2274a4c5 Binary files /dev/null and b/img/frames/m15/new/extended/gThumb.png differ diff --git a/img/frames/m15/new/extended/l.png b/img/frames/m15/new/extended/l.png new file mode 100644 index 00000000..b80cec93 Binary files /dev/null and b/img/frames/m15/new/extended/l.png differ diff --git a/img/frames/m15/new/extended/lThumb.png b/img/frames/m15/new/extended/lThumb.png new file mode 100644 index 00000000..09298922 Binary files /dev/null and b/img/frames/m15/new/extended/lThumb.png differ diff --git a/img/frames/m15/new/extended/lb.png b/img/frames/m15/new/extended/lb.png new file mode 100644 index 00000000..86bddb59 Binary files /dev/null and b/img/frames/m15/new/extended/lb.png differ diff --git a/img/frames/m15/new/extended/lbThumb.png b/img/frames/m15/new/extended/lbThumb.png new file mode 100644 index 00000000..f5fd3815 Binary files /dev/null and b/img/frames/m15/new/extended/lbThumb.png differ diff --git a/img/frames/m15/new/extended/lg.png b/img/frames/m15/new/extended/lg.png new file mode 100644 index 00000000..c755c77d Binary files /dev/null and b/img/frames/m15/new/extended/lg.png differ diff --git a/img/frames/m15/new/extended/lgThumb.png b/img/frames/m15/new/extended/lgThumb.png new file mode 100644 index 00000000..b667e66b Binary files /dev/null and b/img/frames/m15/new/extended/lgThumb.png differ diff --git a/img/frames/m15/new/extended/lm.png b/img/frames/m15/new/extended/lm.png new file mode 100644 index 00000000..82f37e64 Binary files /dev/null and b/img/frames/m15/new/extended/lm.png differ diff --git a/img/frames/m15/new/extended/lmThumb.png b/img/frames/m15/new/extended/lmThumb.png new file mode 100644 index 00000000..104390d8 Binary files /dev/null and b/img/frames/m15/new/extended/lmThumb.png differ diff --git a/img/frames/m15/new/extended/lr.png b/img/frames/m15/new/extended/lr.png new file mode 100644 index 00000000..6c6621fe Binary files /dev/null and b/img/frames/m15/new/extended/lr.png differ diff --git a/img/frames/m15/new/extended/lrThumb.png b/img/frames/m15/new/extended/lrThumb.png new file mode 100644 index 00000000..37184cc2 Binary files /dev/null and b/img/frames/m15/new/extended/lrThumb.png differ diff --git a/img/frames/m15/new/extended/lu.png b/img/frames/m15/new/extended/lu.png new file mode 100644 index 00000000..7f2b5f5c Binary files /dev/null and b/img/frames/m15/new/extended/lu.png differ diff --git a/img/frames/m15/new/extended/luThumb.png b/img/frames/m15/new/extended/luThumb.png new file mode 100644 index 00000000..d196e134 Binary files /dev/null and b/img/frames/m15/new/extended/luThumb.png differ diff --git a/img/frames/m15/new/extended/lw.png b/img/frames/m15/new/extended/lw.png new file mode 100644 index 00000000..014704ff Binary files /dev/null and b/img/frames/m15/new/extended/lw.png differ diff --git a/img/frames/m15/new/extended/lwThumb.png b/img/frames/m15/new/extended/lwThumb.png new file mode 100644 index 00000000..9653def2 Binary files /dev/null and b/img/frames/m15/new/extended/lwThumb.png differ diff --git a/img/frames/m15/new/extended/m.png b/img/frames/m15/new/extended/m.png new file mode 100644 index 00000000..dcfd980d Binary files /dev/null and b/img/frames/m15/new/extended/m.png differ diff --git a/img/frames/m15/new/extended/mThumb.png b/img/frames/m15/new/extended/mThumb.png new file mode 100644 index 00000000..b9f5ef4f Binary files /dev/null and b/img/frames/m15/new/extended/mThumb.png differ diff --git a/img/frames/m15/new/extended/pinline.png b/img/frames/m15/new/extended/pinline.png new file mode 100644 index 00000000..ec4585bb Binary files /dev/null and b/img/frames/m15/new/extended/pinline.png differ diff --git a/img/frames/m15/new/extended/pinlineThumb.png b/img/frames/m15/new/extended/pinlineThumb.png new file mode 100644 index 00000000..dc70365d Binary files /dev/null and b/img/frames/m15/new/extended/pinlineThumb.png differ diff --git a/img/frames/m15/new/extended/r.png b/img/frames/m15/new/extended/r.png new file mode 100644 index 00000000..abc11f46 Binary files /dev/null and b/img/frames/m15/new/extended/r.png differ diff --git a/img/frames/m15/new/extended/rThumb.png b/img/frames/m15/new/extended/rThumb.png new file mode 100644 index 00000000..02164921 Binary files /dev/null and b/img/frames/m15/new/extended/rThumb.png differ diff --git a/img/frames/m15/new/extended/u.png b/img/frames/m15/new/extended/u.png new file mode 100644 index 00000000..66fe5b37 Binary files /dev/null and b/img/frames/m15/new/extended/u.png differ diff --git a/img/frames/m15/new/extended/uThumb.png b/img/frames/m15/new/extended/uThumb.png new file mode 100644 index 00000000..bdf5c4dc Binary files /dev/null and b/img/frames/m15/new/extended/uThumb.png differ diff --git a/img/frames/m15/new/extended/v.png b/img/frames/m15/new/extended/v.png new file mode 100644 index 00000000..7350b055 Binary files /dev/null and b/img/frames/m15/new/extended/v.png differ diff --git a/img/frames/m15/new/extended/vThumb.png b/img/frames/m15/new/extended/vThumb.png new file mode 100644 index 00000000..4054afe2 Binary files /dev/null and b/img/frames/m15/new/extended/vThumb.png differ diff --git a/img/frames/m15/new/extended/w.png b/img/frames/m15/new/extended/w.png new file mode 100644 index 00000000..7ceb0622 Binary files /dev/null and b/img/frames/m15/new/extended/w.png differ diff --git a/img/frames/m15/new/extended/wThumb.png b/img/frames/m15/new/extended/wThumb.png new file mode 100644 index 00000000..5add0c27 Binary files /dev/null and b/img/frames/m15/new/extended/wThumb.png differ diff --git a/img/frames/margins/new/extendedArt.png b/img/frames/margins/new/extendedArt.png new file mode 100644 index 00000000..134557f9 Binary files /dev/null and b/img/frames/margins/new/extendedArt.png differ diff --git a/img/frames/margins/new/extendedArtThumb.png b/img/frames/margins/new/extendedArtThumb.png new file mode 100644 index 00000000..47aec8c0 Binary files /dev/null and b/img/frames/margins/new/extendedArtThumb.png differ diff --git a/js/frames/groupAccurate.js b/js/frames/groupAccurate.js index 5029b868..306e1227 100644 --- a/js/frames/groupAccurate.js +++ b/js/frames/groupAccurate.js @@ -1,5 +1,6 @@ loadFramePacks([ {name:'Regular Frames', value:'M15RegularNew'}, + {name:'Extended Art Frames', value:'M15ExtendedArtNew'}, {name:'Addons', value:'disabled'}, {name:'Legend Crowns', value:'M15LegendCrownsNew'}, diff --git a/js/frames/groupMargin.js b/js/frames/groupMargin.js index aed723d8..ac25c38c 100644 --- a/js/frames/groupMargin.js +++ b/js/frames/groupMargin.js @@ -6,6 +6,7 @@ loadFramePacks([ {name:'Mystical Archive Margins', value:'MarginMysticalArchive'}, {name:'Unstable Basics Margins', value:'MarginUnstable'}, {name:'Invocation Margins', value:'MarginInvocation'}, + {name:'Accurate Frame Margins', value:'MarginNew'}, {name:'Custom Margins', value:'disabled'}, {name:'Celid\'s Asap Margins', value:'CustomMarginCelidAsap'} ]) diff --git a/js/frames/packM15ExtendedArtNew.js b/js/frames/packM15ExtendedArtNew.js new file mode 100644 index 00000000..0ea0cf65 --- /dev/null +++ b/js/frames/packM15ExtendedArtNew.js @@ -0,0 +1,66 @@ +//Create objects for common properties across available frames +var masks = [{src:'/img/frames/m15/new/extended/pinline.png', name:'Pinline'}, {src:'/img/frames/m15/new/title.png', name:'Title'}, {src:'/img/frames/m15/new/type.png', name:'Type'}, {src:'/img/frames/m15/new/rules.png', name:'Rules'}, {src:'/img/frames/m15/new/frame.png', name:'Frame'}, {src:'/img/frames/m15/new/border.png', name:'Border'}]; +var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; +//defines available frames +availableFrames = [ + {name:'White Frame', src:'/img/frames/m15/new/extended/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/m15/new/extended/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/m15/new/extended/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/m15/new/extended/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/m15/new/extended/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/m15/new/extended/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/m15/new/extended/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/m15/new/extended/l.png', masks:masks}, + {name:'Eldrazi Frame', src:'/img/frames/m15/new/extended/c.png', masks:masks}, + {name:'Vehicle Frame', src:'/img/frames/m15/new/extended/v.png', masks:masks}, + + {name:'White Power/Toughness', src:'/img/frames/m15/regular/m15PTW.png', bounds:bounds}, + {name:'Blue Power/Toughness', src:'/img/frames/m15/regular/m15PTU.png', bounds:bounds}, + {name:'Black Power/Toughness', src:'/img/frames/m15/regular/m15PTB.png', bounds:bounds}, + {name:'Red Power/Toughness', src:'/img/frames/m15/regular/m15PTR.png', bounds:bounds}, + {name:'Green Power/Toughness', src:'/img/frames/m15/regular/m15PTG.png', bounds:bounds}, + {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:'White Land Frame', src:'/img/frames/m15/new/extended/lw.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/m15/new/extended/lu.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/m15/new/extended/lb.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/m15/new/extended/lr.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/m15/new/extended/lg.png', masks:masks}, + {name:'Multicolored Land Frame', src:'/img/frames/m15/new/extended/lm.png', masks:masks}, +]; +//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([2010,2814,0,0]); + //sets card version + card.version = 'm15Extended'; + //art bounds + card.artBounds = {x:0, y:236/2814, width:1, height:1530/2814}; + autoFitArt(); + //set symbol bounds + card.setSymbolBounds = {x:1862/2010, 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:176/2814, width:1864/2010, height:71/2100, oneLine:true, size:70.5/1638, align:'right', shadowX:-0.001, shadowY:0.0029, manaCost:true, manaSpacing:0}, + title: {name:'Title', text:'', x:168/2010, y:145/2814, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0381}, + type: {name:'Type', text:'', x:168/2010, y:1588/2814, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0324, color:'white'}, + rules: {name:'Rules Text', text:'', x:0.086, y:1780/2814, width:0.828, height:0.2875, size:0.0362}, + 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'} + }); +} +//loads available frames +loadFramePack(); +//Only for the main version as the webpage loads: +if (!card.text) { + document.querySelector('#loadFrameVersion').click(); +} \ No newline at end of file diff --git a/js/frames/packMarginNew.js b/js/frames/packMarginNew.js new file mode 100644 index 00000000..8b3341b3 --- /dev/null +++ b/js/frames/packMarginNew.js @@ -0,0 +1,15 @@ +//Create objects for common properties across available frames +var bounds = {x:-0.044, y:-1/35, width:1.088, height:37/35}; +var ogBounds = {x:0, y:0, width:1, height:1}; +var masks = [{name:'Border Extension', src:'/img/frames/margins/blackBorderExtension.png'}, {name:'Borderless Border Extension', src:'/img/frames/margins/borderlessBorderExtension.png'}, {name:'Box Topper Border Extension', src:'/img/frames/margins/boxTopperBorderExtension.png'}, {name:'Cornered Border Extension', src:'/img/frames/margins/blackCorners.png'}]; +//defines available frames +availableFrames = [ + {name:'Black Extension', src:'/img/frames/margins/blackBorderExtension.png', bounds:bounds}, + {name:'Extended Art Extension', src:'/img/frames/margins/new/extendedArt.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 = loadMarginVersion; +//loads available frames +loadFramePack(); \ No newline at end of file