diff --git a/img/frames/dungeon/regular/b.png b/img/frames/dungeon/regular/b.png index 8d697422..ac08810e 100644 Binary files a/img/frames/dungeon/regular/b.png and b/img/frames/dungeon/regular/b.png differ diff --git a/img/frames/dungeon/regular/bThumb.png b/img/frames/dungeon/regular/bThumb.png index 9052f8ab..06f17ff2 100644 Binary files a/img/frames/dungeon/regular/bThumb.png and b/img/frames/dungeon/regular/bThumb.png differ diff --git a/img/frames/dungeon/regular/c.png b/img/frames/dungeon/regular/c.png new file mode 100644 index 00000000..2c679155 Binary files /dev/null and b/img/frames/dungeon/regular/c.png differ diff --git a/img/frames/dungeon/regular/cThumb.png b/img/frames/dungeon/regular/cThumb.png new file mode 100644 index 00000000..ac4f2c92 Binary files /dev/null and b/img/frames/dungeon/regular/cThumb.png differ diff --git a/img/frames/dungeon/regular/frame.svg b/img/frames/dungeon/regular/frame.svg new file mode 100644 index 00000000..8e73565b --- /dev/null +++ b/img/frames/dungeon/regular/frame.svg @@ -0,0 +1,5 @@ + + + diff --git a/img/frames/dungeon/regular/frameThumb.png b/img/frames/dungeon/regular/frameThumb.png new file mode 100644 index 00000000..646a590e Binary files /dev/null and b/img/frames/dungeon/regular/frameThumb.png differ diff --git a/img/frames/dungeon/regular/g.png b/img/frames/dungeon/regular/g.png new file mode 100644 index 00000000..2fec5584 Binary files /dev/null and b/img/frames/dungeon/regular/g.png differ diff --git a/img/frames/dungeon/regular/gThumb.png b/img/frames/dungeon/regular/gThumb.png new file mode 100644 index 00000000..c892bcca Binary files /dev/null and b/img/frames/dungeon/regular/gThumb.png differ diff --git a/img/frames/dungeon/regular/pinline.svg b/img/frames/dungeon/regular/pinline.svg new file mode 100644 index 00000000..f2c4c575 --- /dev/null +++ b/img/frames/dungeon/regular/pinline.svg @@ -0,0 +1,8 @@ + + + diff --git a/img/frames/dungeon/regular/pinlineThumb.png b/img/frames/dungeon/regular/pinlineThumb.png new file mode 100644 index 00000000..844527d2 Binary files /dev/null and b/img/frames/dungeon/regular/pinlineThumb.png differ diff --git a/img/frames/dungeon/regular/r.png b/img/frames/dungeon/regular/r.png new file mode 100644 index 00000000..a66f445c Binary files /dev/null and b/img/frames/dungeon/regular/r.png differ diff --git a/img/frames/dungeon/regular/rThumb.png b/img/frames/dungeon/regular/rThumb.png new file mode 100644 index 00000000..aa743f58 Binary files /dev/null and b/img/frames/dungeon/regular/rThumb.png differ diff --git a/img/frames/dungeon/regular/u.png b/img/frames/dungeon/regular/u.png new file mode 100644 index 00000000..ed06a566 Binary files /dev/null and b/img/frames/dungeon/regular/u.png differ diff --git a/img/frames/dungeon/regular/uThumb.png b/img/frames/dungeon/regular/uThumb.png new file mode 100644 index 00000000..e96a7e7d Binary files /dev/null and b/img/frames/dungeon/regular/uThumb.png differ diff --git a/img/frames/dungeon/regular/w.png b/img/frames/dungeon/regular/w.png new file mode 100644 index 00000000..06786793 Binary files /dev/null and b/img/frames/dungeon/regular/w.png differ diff --git a/img/frames/dungeon/regular/wThumb.png b/img/frames/dungeon/regular/wThumb.png new file mode 100644 index 00000000..a9bcca0b Binary files /dev/null and b/img/frames/dungeon/regular/wThumb.png differ diff --git a/img/frames/dungeon/walls/fx/corner.png b/img/frames/dungeon/walls - original/fx/corner.png similarity index 100% rename from img/frames/dungeon/walls/fx/corner.png rename to img/frames/dungeon/walls - original/fx/corner.png diff --git a/img/frames/dungeon/walls/fx/cross.png b/img/frames/dungeon/walls - original/fx/cross.png similarity index 100% rename from img/frames/dungeon/walls/fx/cross.png rename to img/frames/dungeon/walls - original/fx/cross.png diff --git a/img/frames/dungeon/walls/fx/straight.png b/img/frames/dungeon/walls - original/fx/straight.png similarity index 100% rename from img/frames/dungeon/walls/fx/straight.png rename to img/frames/dungeon/walls - original/fx/straight.png diff --git a/img/frames/dungeon/walls/fx/t.png b/img/frames/dungeon/walls - original/fx/t.png similarity index 100% rename from img/frames/dungeon/walls/fx/t.png rename to img/frames/dungeon/walls - original/fx/t.png diff --git a/img/frames/dungeon/walls - original/shape/corner.png b/img/frames/dungeon/walls - original/shape/corner.png new file mode 100644 index 00000000..52095db5 Binary files /dev/null and b/img/frames/dungeon/walls - original/shape/corner.png differ diff --git a/img/frames/dungeon/walls - original/shape/cross.png b/img/frames/dungeon/walls - original/shape/cross.png new file mode 100644 index 00000000..8ad286a1 Binary files /dev/null and b/img/frames/dungeon/walls - original/shape/cross.png differ diff --git a/img/frames/dungeon/walls - original/shape/straight.png b/img/frames/dungeon/walls - original/shape/straight.png new file mode 100644 index 00000000..ad1ce0af Binary files /dev/null and b/img/frames/dungeon/walls - original/shape/straight.png differ diff --git a/img/frames/dungeon/walls - original/shape/t.png b/img/frames/dungeon/walls - original/shape/t.png new file mode 100644 index 00000000..efb80eb6 Binary files /dev/null and b/img/frames/dungeon/walls - original/shape/t.png differ diff --git a/img/frames/dungeon/walls/arrow.png b/img/frames/dungeon/walls/arrow.png new file mode 100644 index 00000000..d8efe8b4 Binary files /dev/null and b/img/frames/dungeon/walls/arrow.png differ diff --git a/img/frames/dungeon/walls/doorway.png b/img/frames/dungeon/walls/doorway.png new file mode 100644 index 00000000..ba40c0d1 Binary files /dev/null and b/img/frames/dungeon/walls/doorway.png differ diff --git a/img/frames/dungeon/walls/fx/bottom.png b/img/frames/dungeon/walls/fx/bottom.png new file mode 100644 index 00000000..0c6dd91f Binary files /dev/null and b/img/frames/dungeon/walls/fx/bottom.png differ diff --git a/img/frames/dungeon/walls/fx/bottomleft.png b/img/frames/dungeon/walls/fx/bottomleft.png new file mode 100644 index 00000000..d07d8b04 Binary files /dev/null and b/img/frames/dungeon/walls/fx/bottomleft.png differ diff --git a/img/frames/dungeon/walls/fx/bottomright.png b/img/frames/dungeon/walls/fx/bottomright.png new file mode 100644 index 00000000..e4fd09c6 Binary files /dev/null and b/img/frames/dungeon/walls/fx/bottomright.png differ diff --git a/img/frames/dungeon/walls/fx/doorway.png b/img/frames/dungeon/walls/fx/doorway.png new file mode 100644 index 00000000..9f639085 Binary files /dev/null and b/img/frames/dungeon/walls/fx/doorway.png differ diff --git a/img/frames/dungeon/walls/fx/left.png b/img/frames/dungeon/walls/fx/left.png new file mode 100644 index 00000000..57b55045 Binary files /dev/null and b/img/frames/dungeon/walls/fx/left.png differ diff --git a/img/frames/dungeon/walls/fx/outer.png b/img/frames/dungeon/walls/fx/outer.png new file mode 100644 index 00000000..f46eb3cc Binary files /dev/null and b/img/frames/dungeon/walls/fx/outer.png differ diff --git a/img/frames/dungeon/walls/fx/right.png b/img/frames/dungeon/walls/fx/right.png new file mode 100644 index 00000000..53605a63 Binary files /dev/null and b/img/frames/dungeon/walls/fx/right.png differ diff --git a/img/frames/dungeon/walls/fx/top.png b/img/frames/dungeon/walls/fx/top.png new file mode 100644 index 00000000..f147ee2f Binary files /dev/null and b/img/frames/dungeon/walls/fx/top.png differ diff --git a/img/frames/dungeon/walls/fx/topleft.png b/img/frames/dungeon/walls/fx/topleft.png new file mode 100644 index 00000000..415f29d4 Binary files /dev/null and b/img/frames/dungeon/walls/fx/topleft.png differ diff --git a/img/frames/dungeon/walls/fx/topright.png b/img/frames/dungeon/walls/fx/topright.png new file mode 100644 index 00000000..5b2b2051 Binary files /dev/null and b/img/frames/dungeon/walls/fx/topright.png differ diff --git a/img/frames/dungeon/walls/ref.png b/img/frames/dungeon/walls/ref.png new file mode 100644 index 00000000..e56ffbdc Binary files /dev/null and b/img/frames/dungeon/walls/ref.png differ diff --git a/img/frames/dungeon/walls/shape/bottom.png b/img/frames/dungeon/walls/shape/bottom.png new file mode 100644 index 00000000..0531a05b Binary files /dev/null and b/img/frames/dungeon/walls/shape/bottom.png differ diff --git a/img/frames/dungeon/walls/shape/bottomleft.png b/img/frames/dungeon/walls/shape/bottomleft.png new file mode 100644 index 00000000..a530686b Binary files /dev/null and b/img/frames/dungeon/walls/shape/bottomleft.png differ diff --git a/img/frames/dungeon/walls/shape/bottomright.png b/img/frames/dungeon/walls/shape/bottomright.png new file mode 100644 index 00000000..f95f960b Binary files /dev/null and b/img/frames/dungeon/walls/shape/bottomright.png differ diff --git a/img/frames/dungeon/walls/shape/corner.png b/img/frames/dungeon/walls/shape/corner.png deleted file mode 100644 index 28fe0313..00000000 Binary files a/img/frames/dungeon/walls/shape/corner.png and /dev/null differ diff --git a/img/frames/dungeon/walls/shape/cross.png b/img/frames/dungeon/walls/shape/cross.png deleted file mode 100644 index 3c349428..00000000 Binary files a/img/frames/dungeon/walls/shape/cross.png and /dev/null differ diff --git a/img/frames/dungeon/walls/shape/doorway.png b/img/frames/dungeon/walls/shape/doorway.png new file mode 100644 index 00000000..a68c1aae Binary files /dev/null and b/img/frames/dungeon/walls/shape/doorway.png differ diff --git a/img/frames/dungeon/walls/shape/left.png b/img/frames/dungeon/walls/shape/left.png new file mode 100644 index 00000000..cdc3edbe Binary files /dev/null and b/img/frames/dungeon/walls/shape/left.png differ diff --git a/img/frames/dungeon/walls/shape/outer.png b/img/frames/dungeon/walls/shape/outer.png new file mode 100644 index 00000000..d2541e09 Binary files /dev/null and b/img/frames/dungeon/walls/shape/outer.png differ diff --git a/img/frames/dungeon/walls/shape/right.png b/img/frames/dungeon/walls/shape/right.png new file mode 100644 index 00000000..55f84b90 Binary files /dev/null and b/img/frames/dungeon/walls/shape/right.png differ diff --git a/img/frames/dungeon/walls/shape/straight.png b/img/frames/dungeon/walls/shape/straight.png deleted file mode 100644 index 3a539e24..00000000 Binary files a/img/frames/dungeon/walls/shape/straight.png and /dev/null differ diff --git a/img/frames/dungeon/walls/shape/t.png b/img/frames/dungeon/walls/shape/t.png deleted file mode 100644 index fb8f4191..00000000 Binary files a/img/frames/dungeon/walls/shape/t.png and /dev/null differ diff --git a/img/frames/dungeon/walls/shape/top.png b/img/frames/dungeon/walls/shape/top.png new file mode 100644 index 00000000..7ef16d2c Binary files /dev/null and b/img/frames/dungeon/walls/shape/top.png differ diff --git a/img/frames/dungeon/walls/shape/topleft.png b/img/frames/dungeon/walls/shape/topleft.png new file mode 100644 index 00000000..9d5c5f3e Binary files /dev/null and b/img/frames/dungeon/walls/shape/topleft.png differ diff --git a/img/frames/dungeon/walls/shape/topright.png b/img/frames/dungeon/walls/shape/topright.png new file mode 100644 index 00000000..f9b75f87 Binary files /dev/null and b/img/frames/dungeon/walls/shape/topright.png differ diff --git a/img/frames/dungeon/walls/textures/b.png b/img/frames/dungeon/walls/textures/b.png new file mode 100644 index 00000000..46b2fa72 Binary files /dev/null and b/img/frames/dungeon/walls/textures/b.png differ diff --git a/img/frames/dungeon/walls/textures/c.png b/img/frames/dungeon/walls/textures/c.png new file mode 100644 index 00000000..608ea36d Binary files /dev/null and b/img/frames/dungeon/walls/textures/c.png differ diff --git a/img/frames/dungeon/walls/textures/g.png b/img/frames/dungeon/walls/textures/g.png new file mode 100644 index 00000000..a1d0b9b4 Binary files /dev/null and b/img/frames/dungeon/walls/textures/g.png differ diff --git a/img/frames/dungeon/walls/textures/r.png b/img/frames/dungeon/walls/textures/r.png new file mode 100644 index 00000000..31a3deb0 Binary files /dev/null and b/img/frames/dungeon/walls/textures/r.png differ diff --git a/img/frames/dungeon/walls/textures/u.png b/img/frames/dungeon/walls/textures/u.png new file mode 100644 index 00000000..ac7aa489 Binary files /dev/null and b/img/frames/dungeon/walls/textures/u.png differ diff --git a/img/frames/dungeon/walls/textures/w.png b/img/frames/dungeon/walls/textures/w.png new file mode 100644 index 00000000..e06c63fb Binary files /dev/null and b/img/frames/dungeon/walls/textures/w.png differ diff --git a/img/manaSymbols/tafr-21-lost-mine-of-phandelver.jpg b/img/manaSymbols/tafr-21-lost-mine-of-phandelver.jpg new file mode 100644 index 00000000..a3fd263d Binary files /dev/null and b/img/manaSymbols/tafr-21-lost-mine-of-phandelver.jpg differ diff --git a/js/creator-20.js b/js/creator-20.js index a4795ef2..23c513c7 100644 --- a/js/creator-20.js +++ b/js/creator-20.js @@ -1392,6 +1392,9 @@ function drawCard() { if (card.version.includes('saga') && typeof sagaCanvas !== "undefined") { cardContext.drawImage(sagaCanvas, 0, 0, cardCanvas.width, cardCanvas.height); } + if (card.version.includes('dungeon') && typeof dungeonCanvas !== "undefined") { + cardContext.drawImage(dungeonCanvas, 0, 0, cardCanvas.width, cardCanvas.height); + } cardContext.drawImage(textCanvas, 0, 0, cardCanvas.width, cardCanvas.height); cardContext.drawImage(setSymbol, scaleX(card.setSymbolX), scaleY(card.setSymbolY), setSymbol.width * card.setSymbolZoom, setSymbol.height * card.setSymbolZoom) cardContext.drawImage(bottomInfoCanvas, 0, 0, cardCanvas.width, cardCanvas.height); diff --git a/js/frames/groupMisc-1.js b/js/frames/groupMisc-1.js index fe42dfcf..3317944f 100644 --- a/js/frames/groupMisc-1.js +++ b/js/frames/groupMisc-1.js @@ -1,4 +1,5 @@ loadFramePacks([ + {name:'Dungeon (AFR)', value:'Dungeon'}, {name:'Future Shifted', value:'FutureRegular'}, {name:'Seventh Edition', value:'Seventh'}, {name:'Fifth Edition', value:'SeventhButFifth'}, diff --git a/js/frames/packDungeon.js b/js/frames/packDungeon.js index 8e8aeade..9654f6a6 100644 --- a/js/frames/packDungeon.js +++ b/js/frames/packDungeon.js @@ -1,20 +1,21 @@ //Create objects for common properties across available frames -// var masks = [{src:'/img/frames/saga/sagaMaskPinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/saga/sagaMaskType.png', name:'Type'}, {src:'/img/frames/saga/sagaMaskFrame.png', name:'Frame'}, {src:'/img/frames/saga/sagaMaskBanner.png', name:'Banner'}, {src:'/img/frames/saga/sagaMaskBannerRight.png', name:'Banner (Right)'}, {src:'/img/frames/saga/sagaMaskText.png', name:'Text'}, {src:'/img/frames/saga/sagaMaskTextRight.png', name:'Text (Right)'}, {src:'/img/frames/saga/sagaMaskBorder.png', name:'Border'}]; +var masks = [{src:'/img/frames/dungeon/regular/pinline.svg', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/dungeon/regular/frame.svg', name:'Frame'}]; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, - {name:'Blue Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, - {name:'Black Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, - {name:'Red Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, - {name:'Green Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, - {name:'Multicolored Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, - {name:'Land Frame', src:'/img/frames/dungeon/regular/b.png', complementary:7}, + {name:'White Frame', src:'/img/frames/dungeon/regular/w.png', complementary:6, masks:masks}, + {name:'Blue Frame', src:'/img/frames/dungeon/regular/u.png', complementary:6, masks:masks}, + {name:'Black Frame', src:'/img/frames/dungeon/regular/b.png', complementary:6, masks:masks}, + {name:'Red Frame', src:'/img/frames/dungeon/regular/r.png', complementary:6, masks:masks}, + {name:'Green Frame', src:'/img/frames/dungeon/regular/g.png', complementary:6, masks:masks}, + {name:'Colorless Frame', src:'/img/frames/dungeon/regular/c.png', complementary:6, masks:masks}, {name:'Floor', src:'/img/frames/dungeon/regular/floor.png'} ]; //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() { + // message + notify('Dungeons should now be fully functional, though the interface can be difficult. See the "Dungeon" tab to adjust rooms, and for more information.', 15); //resets things so that every frame doesn't have to await resetCardIrregularities(); //sets card version @@ -25,15 +26,14 @@ document.querySelector('#loadFrameVersion').onclick = async function() { card.artBounds = {x:0, y:0, width:1, height:1}; autoFitArt(); //set symbol bounds - card.setSymbolBounds = {x:0.9227, y:0.8739, width:0.12, height:0.0381, vertical:'center', horizontal: 'right'}; + card.setSymbolBounds = {x:0.5, y:0.8967, width:0.12, height:0.0410, vertical:'center', horizontal: 'center'}; resetSetSymbol(); //watermark bounds card.watermarkBounds = {x:0.3027, y:0.4748, width:0.3547, height:0.6767}; resetWatermark(); //text loadTextOptions({ - title: {name:'Title', text:'', x:0.0854, y:0.0522, width:0.8292, height:0.0543, oneLine:true, font:'belerenbsc', size:0.0381, color:'white', align:'center'}, - room1: {name:'Ability 1', text:'', x:0.1334, y:0.2896, width:0.35, height:0.1786, size:0.0305}, + title: {name:'Title', text:'', x:0.0854, y:0.0522, width:0.8292, height:0.0543, oneLine:true, font:'belerenbsc', size:0.0381, color:'white', align:'center'} }); } //loads available frames diff --git a/js/frames/versionDungeon.js b/js/frames/versionDungeon.js index a6b83532..9237849c 100644 --- a/js/frames/versionDungeon.js +++ b/js/frames/versionDungeon.js @@ -2,38 +2,66 @@ if (!loadedVersions.includes('/js/frames/versionDungeon.js')) { loadedVersions.push('/js/frames/versionDungeon.js'); sizeCanvas('dungeon'); + sizeCanvas('dungeonFX'); document.querySelector('#creator-menu-tabs').innerHTML += '