diff --git a/.gitignore b/.gitignore index b7f469d0..9a552394 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ debug.log CORS.json *.bat +*.bak dev/* # dependencies diff --git a/img/frames/m15/ub/crowns/m15CrownA.png b/img/frames/m15/ub/crowns/m15CrownA.png new file mode 100644 index 00000000..2bb9ab39 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownA.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownAThumb.png b/img/frames/m15/ub/crowns/m15CrownAThumb.png new file mode 100644 index 00000000..6846b16f Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownAThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownB.png b/img/frames/m15/ub/crowns/m15CrownB.png new file mode 100644 index 00000000..527fb645 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownB.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownBThumb.png b/img/frames/m15/ub/crowns/m15CrownBThumb.png new file mode 100644 index 00000000..a0738ea2 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownBThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownFloatingOutline.png b/img/frames/m15/ub/crowns/m15CrownFloatingOutline.png new file mode 100644 index 00000000..bb5514bd Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownFloatingOutline.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownFloatingOutlineThumb.png b/img/frames/m15/ub/crowns/m15CrownFloatingOutlineThumb.png new file mode 100644 index 00000000..3201b4b5 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownFloatingOutlineThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownG.png b/img/frames/m15/ub/crowns/m15CrownG.png new file mode 100644 index 00000000..ff81f25d Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownG.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownGThumb.png b/img/frames/m15/ub/crowns/m15CrownGThumb.png new file mode 100644 index 00000000..b5cf1c82 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownGThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownL.png b/img/frames/m15/ub/crowns/m15CrownL.png new file mode 100644 index 00000000..12d0c11a Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownL.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownLThumb.png b/img/frames/m15/ub/crowns/m15CrownLThumb.png new file mode 100644 index 00000000..09622bda Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownLThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownM.png b/img/frames/m15/ub/crowns/m15CrownM.png new file mode 100644 index 00000000..9983c82c Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownM.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownMThumb.png b/img/frames/m15/ub/crowns/m15CrownMThumb.png new file mode 100644 index 00000000..ae030340 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownMThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownR.png b/img/frames/m15/ub/crowns/m15CrownR.png new file mode 100644 index 00000000..2146e7cc Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownR.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownRThumb.png b/img/frames/m15/ub/crowns/m15CrownRThumb.png new file mode 100644 index 00000000..46288d25 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownRThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownU.png b/img/frames/m15/ub/crowns/m15CrownU.png new file mode 100644 index 00000000..2b1b7925 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownU.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownUThumb.png b/img/frames/m15/ub/crowns/m15CrownUThumb.png new file mode 100644 index 00000000..c395bc77 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownUThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownW.png b/img/frames/m15/ub/crowns/m15CrownW.png new file mode 100644 index 00000000..f3210727 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownW.png differ diff --git a/img/frames/m15/ub/crowns/m15CrownWThumb.png b/img/frames/m15/ub/crowns/m15CrownWThumb.png new file mode 100644 index 00000000..22ab9447 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15CrownWThumb.png differ diff --git a/img/frames/m15/ub/crowns/m15MaskLegendCrownPinline.png b/img/frames/m15/ub/crowns/m15MaskLegendCrownPinline.png new file mode 100644 index 00000000..955baf1a Binary files /dev/null and b/img/frames/m15/ub/crowns/m15MaskLegendCrownPinline.png differ diff --git a/img/frames/m15/ub/crowns/m15MaskLegendCrownPinlineThumb.png b/img/frames/m15/ub/crowns/m15MaskLegendCrownPinlineThumb.png new file mode 100644 index 00000000..2b81f9b4 Binary files /dev/null and b/img/frames/m15/ub/crowns/m15MaskLegendCrownPinlineThumb.png differ diff --git a/js/creator-23.js b/js/creator-23.js index c5bbdd87..55c2fee8 100644 --- a/js/creator-23.js +++ b/js/creator-23.js @@ -829,10 +829,10 @@ async function autoUBFrame(colors, mana_cost, type_line, power) { if (type_line.toLowerCase().includes('legendary')) { if (properties.pinlineRight) { - frames.push(makeM15FrameByLetter(properties.pinlineRight, 'Crown', true)); + frames.push(makeUBFrameByLetter(properties.pinlineRight, 'Crown', true)); } - frames.push(makeM15FrameByLetter(properties.pinline, "Crown", false)); - frames.push(makeM15FrameByLetter(properties.pinline, "Crown Border Cover", false)); + frames.push(makeUBFrameByLetter(properties.pinline, "Crown", false)); + frames.push(makeUBFrameByLetter(properties.pinline, "Crown Border Cover", false)); } if (properties.pinlineRight) { frames.push(makeUBFrameByLetter(properties.pinlineRight, 'Stamp', true)); @@ -1561,7 +1561,7 @@ function makeUBFrameByLetter(letter, mask = false, maskToRightHalf = false) { if (mask == "Crown") { var frame = { 'name': frameName + ' Legend Crown', - 'src': '/img/frames/m15/crowns/m15Crown' + letter + '.png', + 'src': '/img/frames/m15/ub/crowns/m15Crown' + letter + '.png', 'masks': [], 'bounds': { 'height': 0.1667, diff --git a/js/frameSearch.js b/js/frameSearch.js index 2a62bf94..22cc04cf 100644 --- a/js/frameSearch.js +++ b/js/frameSearch.js @@ -70,6 +70,7 @@ const frameNames = new Map ([ ['Universes Beyond', 'UB'], ['Universes Beyond (Full art)', 'UBFull'], ['Universes Beyond (Extended art)', 'UBExtendedArt'], + ['Universes Beyond legend crowns', 'UBLegendCrowns'], ['Full Text', 'FullText'], ['Etched (Commander Precons)', 'Etched'], ['Etched (Nyx)', 'EtchedNyx'], diff --git a/js/frames/groupSaga-1.js b/js/frames/groupSaga-1.js index 07b2c445..f8d2bee5 100644 --- a/js/frames/groupSaga-1.js +++ b/js/frames/groupSaga-1.js @@ -3,6 +3,7 @@ loadFramePacks([ {name:'Universes Beyond Frames', value:'SagaUB'}, {name:'Addons', value:'disabled'}, {name:'Legend Crowns', value:'M15LegendCrowns'}, + {name:'Legend Crowns (Universes Beyond)', value:'UBLegendCrowns'}, {name:'Inner Crowns', value:'M15InnerCrowns'}, {name:'Holo Stamps', value:'M15HoloStamps'}, {name:'Colored Borders', value:'M15Borders'}, diff --git a/js/frames/groupShowcase-5.js b/js/frames/groupShowcase-5.js index 75f0a2a0..195abe89 100644 --- a/js/frames/groupShowcase-5.js +++ b/js/frames/groupShowcase-5.js @@ -57,6 +57,7 @@ loadFramePacks([ {name:'Future Shifted', value:'FutureRegular'}, {name:'Addons', value:'disabled'}, {name:'Legend Crowns', value:'M15LegendCrowns'}, + {name:'Legend Crowns (Universes Beyond)', value:'UBLegendCrowns'}, {name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'}, {name:'Inner Crowns', value:'M15InnerCrowns'}, {name:'Nicknames', value:'M15Nickname-2'}, diff --git a/js/frames/packUBLegendCrowns.js b/js/frames/packUBLegendCrowns.js new file mode 100644 index 00000000..e73939ee --- /dev/null +++ b/js/frames/packUBLegendCrowns.js @@ -0,0 +1,21 @@ +//Create objects for common properties across available frames +var masks = [{src:'/img/frames/m15/crowns/m15MaskLegendCrown.png', name:'Crown Without Pinlines'}, {src:'/img/frames/m15/ub/crowns/m15MaskLegendCrownPinline.png', name:'Crown With Pinlines'}]; +var bounds = {x:0.0274, y:0.0191, width:0.9454, height:0.1667}; +//defines available frames +availableFrames = [ + {name:'White Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownW.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Blue Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownU.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Black Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownB.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Red Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownR.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Green Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownG.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Multicolored Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownM.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Artifact Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownA.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Land Legend Crown', src:'/img/frames/m15/ub/crowns/m15CrownL.png', masks:masks, bounds:bounds, complementary:8}, + {name:'Legend Crown Border Cover', src:'/img/black.png', bounds:{x:0.0394, y:0.0277, width:0.9214, height:0.0177}} +]; +//disables/enables the "Load Frame Version" button +document.querySelector('#loadFrameVersion').disabled = true; +//defines process for loading this version, if applicable +document.querySelector('#loadFrameVersion').onclick = null; +//loads available frames +loadFramePack(); \ No newline at end of file