diff --git a/img/frames/invocation/a.png b/img/frames/invocation/a.png index 58df9d78..23e0ca4b 100644 Binary files a/img/frames/invocation/a.png and b/img/frames/invocation/a.png differ diff --git a/img/frames/invocation/aThumb.png b/img/frames/invocation/aThumb.png index fc0bf06f..e81db89e 100644 Binary files a/img/frames/invocation/aThumb.png and b/img/frames/invocation/aThumb.png differ diff --git a/img/frames/invocation/accents.png b/img/frames/invocation/accents.png new file mode 100644 index 00000000..09e3bbbb Binary files /dev/null and b/img/frames/invocation/accents.png differ diff --git a/img/frames/invocation/accentsThumb.png b/img/frames/invocation/accentsThumb.png new file mode 100644 index 00000000..bec5cf66 Binary files /dev/null and b/img/frames/invocation/accentsThumb.png differ diff --git a/img/frames/invocation/b.png b/img/frames/invocation/b.png index 87016b86..eab3fd9c 100644 Binary files a/img/frames/invocation/b.png and b/img/frames/invocation/b.png differ diff --git a/img/frames/invocation/bThumb.png b/img/frames/invocation/bThumb.png index 6b03c626..6989738d 100644 Binary files a/img/frames/invocation/bThumb.png and b/img/frames/invocation/bThumb.png differ diff --git a/img/frames/invocation/g.png b/img/frames/invocation/g.png index e869d4bb..7d7b3a2d 100644 Binary files a/img/frames/invocation/g.png and b/img/frames/invocation/g.png differ diff --git a/img/frames/invocation/gThumb.png b/img/frames/invocation/gThumb.png index e908f994..7b79349f 100644 Binary files a/img/frames/invocation/gThumb.png and b/img/frames/invocation/gThumb.png differ diff --git a/img/frames/invocation/m.png b/img/frames/invocation/m.png index bfb1267c..6e732d9f 100644 Binary files a/img/frames/invocation/m.png and b/img/frames/invocation/m.png differ diff --git a/img/frames/invocation/mThumb.png b/img/frames/invocation/mThumb.png index 2700bba9..010336b0 100644 Binary files a/img/frames/invocation/mThumb.png and b/img/frames/invocation/mThumb.png differ diff --git a/img/frames/invocation/mul/a.png b/img/frames/invocation/mul/a.png new file mode 100644 index 00000000..34c179e8 Binary files /dev/null and b/img/frames/invocation/mul/a.png differ diff --git a/img/frames/invocation/mul/aThumb.png b/img/frames/invocation/mul/aThumb.png new file mode 100644 index 00000000..99c7e613 Binary files /dev/null and b/img/frames/invocation/mul/aThumb.png differ diff --git a/img/frames/invocation/mul/b.png b/img/frames/invocation/mul/b.png new file mode 100644 index 00000000..e4970d51 Binary files /dev/null and b/img/frames/invocation/mul/b.png differ diff --git a/img/frames/invocation/mul/bThumb.png b/img/frames/invocation/mul/bThumb.png new file mode 100644 index 00000000..9cd59fcf Binary files /dev/null and b/img/frames/invocation/mul/bThumb.png differ diff --git a/img/frames/invocation/mul/g.png b/img/frames/invocation/mul/g.png new file mode 100644 index 00000000..12603727 Binary files /dev/null and b/img/frames/invocation/mul/g.png differ diff --git a/img/frames/invocation/mul/gThumb.png b/img/frames/invocation/mul/gThumb.png new file mode 100644 index 00000000..4ac111c0 Binary files /dev/null and b/img/frames/invocation/mul/gThumb.png differ diff --git a/img/frames/invocation/mul/m.png b/img/frames/invocation/mul/m.png new file mode 100644 index 00000000..c4cf2d2e Binary files /dev/null and b/img/frames/invocation/mul/m.png differ diff --git a/img/frames/invocation/mul/mThumb.png b/img/frames/invocation/mul/mThumb.png new file mode 100644 index 00000000..1a7a2f9f Binary files /dev/null and b/img/frames/invocation/mul/mThumb.png differ diff --git a/img/frames/invocation/mul/pt.png b/img/frames/invocation/mul/pt.png new file mode 100644 index 00000000..ca50c8a6 Binary files /dev/null and b/img/frames/invocation/mul/pt.png differ diff --git a/img/frames/invocation/mul/ptThumb.png b/img/frames/invocation/mul/ptThumb.png new file mode 100644 index 00000000..e557911c Binary files /dev/null and b/img/frames/invocation/mul/ptThumb.png differ diff --git a/img/frames/invocation/mul/r.png b/img/frames/invocation/mul/r.png new file mode 100644 index 00000000..a0312bc1 Binary files /dev/null and b/img/frames/invocation/mul/r.png differ diff --git a/img/frames/invocation/mul/rThumb.png b/img/frames/invocation/mul/rThumb.png new file mode 100644 index 00000000..06a768ef Binary files /dev/null and b/img/frames/invocation/mul/rThumb.png differ diff --git a/img/frames/invocation/mul/u.png b/img/frames/invocation/mul/u.png new file mode 100644 index 00000000..5eaebaa5 Binary files /dev/null and b/img/frames/invocation/mul/u.png differ diff --git a/img/frames/invocation/mul/uThumb.png b/img/frames/invocation/mul/uThumb.png new file mode 100644 index 00000000..ddcd3b39 Binary files /dev/null and b/img/frames/invocation/mul/uThumb.png differ diff --git a/img/frames/invocation/mul/w.png b/img/frames/invocation/mul/w.png new file mode 100644 index 00000000..e892abf9 Binary files /dev/null and b/img/frames/invocation/mul/w.png differ diff --git a/img/frames/invocation/mul/wThumb.png b/img/frames/invocation/mul/wThumb.png new file mode 100644 index 00000000..db5595fc Binary files /dev/null and b/img/frames/invocation/mul/wThumb.png differ diff --git a/img/frames/invocation/r.png b/img/frames/invocation/r.png index bb361620..428d2c61 100644 Binary files a/img/frames/invocation/r.png and b/img/frames/invocation/r.png differ diff --git a/img/frames/invocation/rThumb.png b/img/frames/invocation/rThumb.png index 7f21441c..70fef23d 100644 Binary files a/img/frames/invocation/rThumb.png and b/img/frames/invocation/rThumb.png differ diff --git a/img/frames/invocation/u.png b/img/frames/invocation/u.png index cfa42767..e7bce96d 100644 Binary files a/img/frames/invocation/u.png and b/img/frames/invocation/u.png differ diff --git a/img/frames/invocation/uThumb.png b/img/frames/invocation/uThumb.png index d20a3768..637fe11f 100644 Binary files a/img/frames/invocation/uThumb.png and b/img/frames/invocation/uThumb.png differ diff --git a/img/frames/invocation/w.png b/img/frames/invocation/w.png index 31458668..a56221bb 100644 Binary files a/img/frames/invocation/w.png and b/img/frames/invocation/w.png differ diff --git a/img/frames/invocation/wThumb.png b/img/frames/invocation/wThumb.png index 9173f27b..2fc2b703 100644 Binary files a/img/frames/invocation/wThumb.png and b/img/frames/invocation/wThumb.png differ diff --git a/js/creator-23.js b/js/creator-23.js index 9cd250cf..7c56649e 100644 --- a/js/creator-23.js +++ b/js/creator-23.js @@ -2322,6 +2322,7 @@ function writeText(textObject, targetContext) { rawText = rawText.replace(/\/\//g, '{lns}'); } if (autoFramePack == 'Seventh' || autoFramePack == '8th' || autoFramePack == 'Praetors') { + if (autoFramePack == 'Seventh' || autoFramePack == '8th' || autoFramePack == 'Praetors' || card.version == 'invocation') { rawText = rawText.replace(/{flavor}/g, '{oldflavor}'); } rawText = rawText.replace(/ - /g, ' — '); diff --git a/js/frameSearch.js b/js/frameSearch.js index bab8e5ec..5a43ca98 100644 --- a/js/frameSearch.js +++ b/js/frameSearch.js @@ -65,6 +65,7 @@ const frameNames = new Map ([ ['Signature Spellbook (Jace/Gideon)', 'SignatureSpellbook'], ['Ixalan Maps', 'Ixalan'], ['Amonkhet Invocations (u/Smyris)', 'Invocation'], + ['Amonkhet Invocations (Multiverse Legends)', 'InvocationMUL'], ['Kaladesh Inventions', 'Invention'], ['BFZ Expeditions (2015)', 'ExpeditionBFZ-1'], ['SDCC15 (Blackout)', 'SDCC15'], diff --git a/js/frames/groupShowcase-5.js b/js/frames/groupShowcase-5.js index 576215e3..5d0d0912 100644 --- a/js/frames/groupShowcase-5.js +++ b/js/frames/groupShowcase-5.js @@ -40,6 +40,7 @@ loadFramePacks([ {name:'Signature Spellbook (Jace/Gideon)', value:'SignatureSpellbook'}, {name:'Ixalan Maps', value:'Ixalan'}, {name:'Amonkhet Invocations (u/Smyris)', value:'Invocation'}, + {name:'Amonkhet Invocations (Multiverse Legends)', value:'InvocationMUL'}, {name:'Kaladesh Inventions', value:'Invention'}, {name:'BFZ Expeditions (2015)', value:'ExpeditionBFZ-1'}, {name:'SDCC15 (Blackout)', value:'SDCC15'}, diff --git a/js/frames/packInvocation.js b/js/frames/packInvocation.js index fbfa061d..a1345a74 100644 --- a/js/frames/packInvocation.js +++ b/js/frames/packInvocation.js @@ -1,16 +1,16 @@ //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 masks = [{src:'img/frames/invocation/accents.png', name:'Accents'}]; var bounds = {x:0.8587, y:0.8186, width:0.062, height:0.1258}; var bounds2 = {x:0.0527, y:0.0496, width:0.8947, height:0.0515}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/invocation/w.png'}, - {name:'Blue Frame', src:'/img/frames/invocation/u.png'}, - {name:'Black Frame', src:'/img/frames/invocation/b.png'}, - {name:'Red Frame', src:'/img/frames/invocation/r.png'}, - {name:'Green Frame', src:'/img/frames/invocation/g.png'}, - {name:'Multicolored Frame', src:'/img/frames/invocation/m.png'}, - {name:'Artifact Frame', src:'/img/frames/invocation/a.png'}, + {name:'White Frame', src:'/img/frames/invocation/w.png', masks: masks}, + {name:'Blue Frame', src:'/img/frames/invocation/u.png', masks: masks}, + {name:'Black Frame', src:'/img/frames/invocation/b.png', masks: masks}, + {name:'Red Frame', src:'/img/frames/invocation/r.png', masks: masks}, + {name:'Green Frame', src:'/img/frames/invocation/g.png', masks: masks}, + {name:'Multicolored Frame', src:'/img/frames/invocation/m.png', masks: masks}, + {name:'Artifact Frame', src:'/img/frames/invocation/a.png', masks: masks}, {name:'Power/Toughness', src:'/img/frames/invocation/pt.png', bounds:bounds}, {name:'Set Symbol Cover', src:'/img/frames/invocation/set.png', bounds:{x:0.8494, y:0.5705, width:0.0907, height:0.0434}}, {name:'Mana Bracket (1)', src:'/img/frames/invocation/mana/1.png', bounds:bounds2}, @@ -34,7 +34,7 @@ document.querySelector('#loadFrameVersion').onclick = async function() { card.version = 'invocation'; loadScript('/js/frames/manaSymbolsOutline.js'); //art bounds - card.artBounds = {x:0, y:0.1067, width:1, height:0.4386}; + card.artBounds = {x:173/1500, y:313/2100, width:1150/1500, height:819/2100}; autoFitArt(); //set symbol bounds card.setSymbolBounds = {x:0.8954, y:0.5910, width:0.06, height:0.0353, vertical:'center', horizontal: 'center'}; diff --git a/js/frames/packInvocationMUL.js b/js/frames/packInvocationMUL.js new file mode 100644 index 00000000..aba36960 --- /dev/null +++ b/js/frames/packInvocationMUL.js @@ -0,0 +1,42 @@ +//Create objects for common properties across available frames +var masks = [{src:'img/frames/invocation/accents.png', name:'Accents'}]; +var bounds = {x:0.8587, y:0.8186, width:0.062, height:0.1258}; +//defines available frames +availableFrames = [ + {name:'White Frame', src:'/img/frames/invocation/mul/w.png', masks: masks}, + {name:'Blue Frame', src:'/img/frames/invocation/mul/u.png', masks: masks}, + {name:'Black Frame', src:'/img/frames/invocation/mul/b.png', masks: masks}, + {name:'Red Frame', src:'/img/frames/invocation/mul/r.png', masks: masks}, + {name:'Green Frame', src:'/img/frames/invocation/mul/g.png', masks: masks}, + {name:'Multicolored Frame', src:'/img/frames/invocation/mul/m.png', masks: masks}, + {name:'Artifact Frame', src:'/img/frames/invocation/mul/a.png', masks: masks}, + {name:'Power/Toughness', src:'/img/frames/invocation/mul/pt.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 = 'invocation'; + //art bounds + card.artBounds = {x:173/1500, y:313/2100, width:1150/1500, height:819/2100}; + 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({ //old color: 24150E + mana: {name:'Mana Cost', text:'', y:0.0613, width:0.93, height:78/2100, oneLine:true, size:78/1638, align:'right', manaCost:true, manaSpacing:0, shadowX:-0.001, shadowY:0.0029}, + title: {name:'Title', text:'', x:0.0834, y:0.05, width:0.8292, height:0.0515, oneLine:true, font:'belerenb', size:0.0381, color:'black'}, + type: {name:'Type', text:'', x:0.0767, y:1198/2100, width:0.8292, height:97/2100, oneLine:true, font:'belerenb', size:0.0324, color:'black'}, + rules: {name:'Rules Text', text:'', x:148 /1500, y:1349/2100 , width:1204/1500, height:579/2100, size:0.0362}, + pt: {name:'Power/Toughness', text:'', x:0.8707, y:0.8315, width:0.0387, height:0.0929, size:0.0372, font:'belerenbsc', align:'center', color:'black'} + }); +} +//loads available frames +loadFramePack();