diff --git a/img/frames/etched/legends/nyx/a.png b/img/frames/etched/legends/nyx/a.png new file mode 100644 index 00000000..38738073 Binary files /dev/null and b/img/frames/etched/legends/nyx/a.png differ diff --git a/img/frames/etched/legends/nyx/aThumb.png b/img/frames/etched/legends/nyx/aThumb.png new file mode 100644 index 00000000..890d774a Binary files /dev/null and b/img/frames/etched/legends/nyx/aThumb.png differ diff --git a/img/frames/etched/legends/nyx/b.png b/img/frames/etched/legends/nyx/b.png new file mode 100644 index 00000000..0fd37567 Binary files /dev/null and b/img/frames/etched/legends/nyx/b.png differ diff --git a/img/frames/etched/legends/nyx/bThumb.png b/img/frames/etched/legends/nyx/bThumb.png new file mode 100644 index 00000000..58371d0d Binary files /dev/null and b/img/frames/etched/legends/nyx/bThumb.png differ diff --git a/img/frames/etched/legends/nyx/g.png b/img/frames/etched/legends/nyx/g.png new file mode 100644 index 00000000..489f5f9b Binary files /dev/null and b/img/frames/etched/legends/nyx/g.png differ diff --git a/img/frames/etched/legends/nyx/gThumb.png b/img/frames/etched/legends/nyx/gThumb.png new file mode 100644 index 00000000..95910f9e Binary files /dev/null and b/img/frames/etched/legends/nyx/gThumb.png differ diff --git a/img/frames/etched/legends/nyx/m.png b/img/frames/etched/legends/nyx/m.png new file mode 100644 index 00000000..2b6c4e39 Binary files /dev/null and b/img/frames/etched/legends/nyx/m.png differ diff --git a/img/frames/etched/legends/nyx/mThumb.png b/img/frames/etched/legends/nyx/mThumb.png new file mode 100644 index 00000000..cb89b2e1 Binary files /dev/null and b/img/frames/etched/legends/nyx/mThumb.png differ diff --git a/img/frames/etched/legends/nyx/maskInnerCrown.png b/img/frames/etched/legends/nyx/maskInnerCrown.png new file mode 100644 index 00000000..02e499c9 Binary files /dev/null and b/img/frames/etched/legends/nyx/maskInnerCrown.png differ diff --git a/img/frames/etched/legends/nyx/maskInnerCrownThumb.png b/img/frames/etched/legends/nyx/maskInnerCrownThumb.png new file mode 100644 index 00000000..1a0c6098 Binary files /dev/null and b/img/frames/etched/legends/nyx/maskInnerCrownThumb.png differ diff --git a/img/frames/etched/legends/nyx/maskPinline.png b/img/frames/etched/legends/nyx/maskPinline.png new file mode 100644 index 00000000..291fc71a Binary files /dev/null and b/img/frames/etched/legends/nyx/maskPinline.png differ diff --git a/img/frames/etched/legends/nyx/maskPinlineThumb.png b/img/frames/etched/legends/nyx/maskPinlineThumb.png new file mode 100644 index 00000000..2aafaa3f Binary files /dev/null and b/img/frames/etched/legends/nyx/maskPinlineThumb.png differ diff --git a/img/frames/etched/legends/nyx/r.png b/img/frames/etched/legends/nyx/r.png new file mode 100644 index 00000000..70894cec Binary files /dev/null and b/img/frames/etched/legends/nyx/r.png differ diff --git a/img/frames/etched/legends/nyx/rThumb.png b/img/frames/etched/legends/nyx/rThumb.png new file mode 100644 index 00000000..82277356 Binary files /dev/null and b/img/frames/etched/legends/nyx/rThumb.png differ diff --git a/img/frames/etched/legends/nyx/u.png b/img/frames/etched/legends/nyx/u.png new file mode 100644 index 00000000..abf129cb Binary files /dev/null and b/img/frames/etched/legends/nyx/u.png differ diff --git a/img/frames/etched/legends/nyx/uThumb.png b/img/frames/etched/legends/nyx/uThumb.png new file mode 100644 index 00000000..b2523e30 Binary files /dev/null and b/img/frames/etched/legends/nyx/uThumb.png differ diff --git a/img/frames/etched/legends/nyx/w.png b/img/frames/etched/legends/nyx/w.png new file mode 100644 index 00000000..26ed1f90 Binary files /dev/null and b/img/frames/etched/legends/nyx/w.png differ diff --git a/img/frames/etched/legends/nyx/wThumb.png b/img/frames/etched/legends/nyx/wThumb.png new file mode 100644 index 00000000..cbebb16d Binary files /dev/null and b/img/frames/etched/legends/nyx/wThumb.png differ diff --git a/img/frames/etched/legends/w.png b/img/frames/etched/legends/w.png index 611fb6aa..40d69a70 100644 Binary files a/img/frames/etched/legends/w.png and b/img/frames/etched/legends/w.png differ diff --git a/img/frames/etched/legends/wThumb.png b/img/frames/etched/legends/wThumb.png index 35cb6635..c85a0faa 100644 Binary files a/img/frames/etched/legends/wThumb.png and b/img/frames/etched/legends/wThumb.png differ diff --git a/img/frames/etched/regular/w.png b/img/frames/etched/regular/w.png index b183c6f1..ebe5c142 100644 Binary files a/img/frames/etched/regular/w.png and b/img/frames/etched/regular/w.png differ diff --git a/img/frames/etched/regular/wThumb.png b/img/frames/etched/regular/wThumb.png index 6ed47728..54d44501 100644 Binary files a/img/frames/etched/regular/wThumb.png and b/img/frames/etched/regular/wThumb.png differ diff --git a/img/frames/invocation/mul/margins/g.png b/img/frames/invocation/mul/margins/g.png index 678fdf36..aee8e378 100644 Binary files a/img/frames/invocation/mul/margins/g.png and b/img/frames/invocation/mul/margins/g.png differ diff --git a/img/frames/invocation/mul/margins/r.png b/img/frames/invocation/mul/margins/r.png index e3ccf764..b9e3c3e8 100644 Binary files a/img/frames/invocation/mul/margins/r.png and b/img/frames/invocation/mul/margins/r.png differ diff --git a/img/setSymbols/official/ltr-c.png b/img/setSymbols/official/ltr-c.png new file mode 100644 index 00000000..6ba47979 Binary files /dev/null and b/img/setSymbols/official/ltr-c.png differ diff --git a/img/setSymbols/official/ltr-m.png b/img/setSymbols/official/ltr-m.png new file mode 100644 index 00000000..3369181f Binary files /dev/null and b/img/setSymbols/official/ltr-m.png differ diff --git a/img/setSymbols/official/ltr-r.png b/img/setSymbols/official/ltr-r.png new file mode 100644 index 00000000..e5069dfb Binary files /dev/null and b/img/setSymbols/official/ltr-r.png differ diff --git a/img/setSymbols/official/ltr-u.png b/img/setSymbols/official/ltr-u.png new file mode 100644 index 00000000..61af52d5 Binary files /dev/null and b/img/setSymbols/official/ltr-u.png differ diff --git a/img/setSymbols/official/moc-c.png b/img/setSymbols/official/moc-c.png new file mode 100644 index 00000000..1618d3b2 Binary files /dev/null and b/img/setSymbols/official/moc-c.png differ diff --git a/img/setSymbols/official/moc-m.png b/img/setSymbols/official/moc-m.png new file mode 100644 index 00000000..e8705d0a Binary files /dev/null and b/img/setSymbols/official/moc-m.png differ diff --git a/img/setSymbols/official/moc-r.png b/img/setSymbols/official/moc-r.png new file mode 100644 index 00000000..26cc5a59 Binary files /dev/null and b/img/setSymbols/official/moc-r.png differ diff --git a/img/setSymbols/official/moc-u.png b/img/setSymbols/official/moc-u.png new file mode 100644 index 00000000..164daa1f Binary files /dev/null and b/img/setSymbols/official/moc-u.png differ diff --git a/js/frameSearch.js b/js/frameSearch.js index 1c8e3071..63dda3c8 100644 --- a/js/frameSearch.js +++ b/js/frameSearch.js @@ -63,6 +63,7 @@ const frameNames = new Map ([ ['Universes Beyond', 'UB'], ['Full Text', 'FullText'], ['Etched (Commander Precons)', 'Etched'], + ['Etched (Nyx)', 'EtchedNyx'], ['ZNR Expeditions (2020)', 'ExpeditionZNR-1'], ['Signature Spellbook (Jace/Gideon)', 'SignatureSpellbook'], ['Ixalan Maps', 'Ixalan'], diff --git a/js/frames/groupShowcase-5.js b/js/frames/groupShowcase-5.js index 562b6e22..6c0c675c 100644 --- a/js/frames/groupShowcase-5.js +++ b/js/frames/groupShowcase-5.js @@ -36,6 +36,7 @@ loadFramePacks([ {name:'Universes Beyond', value:'UB'}, {name:'Full Text', value:'FullText'}, {name:'Etched (Commander Precons)', value:'Etched'}, + {name:'Etched (Nyx)', value:'EtchedNyx'}, {name:'Masterpieces/Other', value:'disabled'}, {name:'Phyrexian', value:'Praetors'}, {name:'ZNR Expeditions (2020)', value:'ExpeditionZNR-1'}, diff --git a/js/frames/packEtchedNyx.js b/js/frames/packEtchedNyx.js new file mode 100644 index 00000000..d5a9220e --- /dev/null +++ b/js/frames/packEtchedNyx.js @@ -0,0 +1,60 @@ +//Create objects for common properties across available frames +var masks = [{src:'/img/frames/etched/legends/frame.svg', name:'Frame'}, {src:'/img/frames/etched/legends/nyx/maskPinline.png', name:'Pinline'}, {src:'/img/frames/etched/legends/nyx/maskInnerCrown.png', name:'Inner Crown'}, {src:'/img/frames/etched/regular/title.svg', name:'Title'}, {src:'/img/frames/etched/regular/type.svg', name:'Type'}, {src:'/img/frames/etched/regular/rules.svg', name:'Rules'}, {src:'/img/frames/etched/regular/border.svg', name:'Border'}]; +var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; +var bounds2 = {x:0.42, y:0.9062, width:0.16, height:0.0453}; +var bounds3 = {x:0.0307, y:0.0191, width:0.9387, height:0.092}; +//defines available frames +availableFrames = [ + {name:'White Frame', src:'/img/frames/etched/legends/nyx/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/etched/legends/nyx/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/etched/legends/nyx/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/etched/legends/nyx/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/etched/legends/nyx/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/etched/legends/nyx/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/etched/legends/nyx/a.png', masks:masks}, + // {name:'Colorless Frame', src:'/img/frames/etched/regular/c.png', masks:masks}, + {name:'White Power/Toughness', src:'/img/frames/etched/regular/pt/w.png', bounds:bounds}, + {name:'Blue Power/Toughness', src:'/img/frames/etched/regular/pt/u.png', bounds:bounds}, + {name:'Black Power/Toughness', src:'/img/frames/etched/regular/pt/b.png', bounds:bounds}, + {name:'Red Power/Toughness', src:'/img/frames/etched/regular/pt/r.png', bounds:bounds}, + {name:'Green Power/Toughness', src:'/img/frames/etched/regular/pt/g.png', bounds:bounds}, + {name:'Multicolored Power/Toughness', src:'/img/frames/etched/regular/pt/m.png', bounds:bounds}, + {name:'Artifact Power/Toughness', src:'/img/frames/etched/regular/pt/a.png', bounds:bounds}, + {name:'Colorless Power/Toughness', src:'/img/frames/etched/regular/pt/c.png', bounds:bounds}, + {name:'White Holo Stamp', src:'/img/frames/etched/regular/holo/w.png', bounds:bounds2}, + {name:'Blue Holo Stamp', src:'/img/frames/etched/regular/holo/u.png', bounds:bounds2}, + {name:'Black Holo Stamp', src:'/img/frames/etched/regular/holo/b.png', bounds:bounds2}, + {name:'Red Holo Stamp', src:'/img/frames/etched/regular/holo/r.png', bounds:bounds2}, + {name:'Green Holo Stamp', src:'/img/frames/etched/regular/holo/g.png', bounds:bounds2}, + {name:'Multicolored Holo Stamp', src:'/img/frames/etched/regular/holo/m.png', bounds:bounds2}, + {name:'Artifact Holo Stamp', src:'/img/frames/etched/regular/holo/a.png', bounds:bounds2}, + {name:'Colorless Holo Stamp', src:'/img/frames/etched/regular/holo/c.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 = 'etched'; + //art bounds + card.artBounds = {x:0.0767, y:0.1129, width:0.8476, height:0.4429}; + 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.0927, y:0.6303, width:0.8147, 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