diff --git a/css/mosh.css b/css/mosh.css index d9fdc81..ad7c94c 100644 --- a/css/mosh.css +++ b/css/mosh.css @@ -560,6 +560,37 @@ p { padding: 10px; } +.button-black:hover, +.button-black:focus{ + /* color: #ffffff; */ + text-shadow: 0 0 10px rgb(112, 112, 112); + box-shadow: 0 0 10px 0px #9e9e9e; + background: #202020; + cursor: pointer; +} + +.mosh .button-grey { + font-weight: bold; + font-size: 16px; + color: white; + margin-left: 0px; + background: grey; + border-radius: 21px; + text-align: center; + overflow: hidden; + padding: 10px; +} + +.button-grey:hover, +.button-grey:focus{ + /* color: #494949; */ + text-shadow: 0 0 10px rgb(112, 112, 112); + box-shadow: 0 0 5px 0px #b9b9b9; + background: rgb(100, 100, 100); + cursor: pointer; + /* border: 1px solid #ffffff; */ +} + .mosh .button-white { font-weight: bold; font-size: 16px; @@ -659,6 +690,11 @@ p { /* height: auto; */ } +.mosh .sbt-megadamage-menu { + padding: 15px; + /* font-size: 15px; */ +} + .mosh .invert-title{ mix-blend-mode: difference; } @@ -1026,7 +1062,7 @@ p { margin: -0.15em; /* padding: 9px; */ border: 2px solid #111; - border-radius: 0.8em; + border-radius: 15px; font-size: 11pt; color: white; font-weight: 500; diff --git a/module/actor/ship-sheet-sbt.js b/module/actor/ship-sheet-sbt.js index 08e49be..3fee565 100644 --- a/module/actor/ship-sheet-sbt.js +++ b/module/actor/ship-sheet-sbt.js @@ -5,6 +5,7 @@ */ import { DLShipDeckplan } from "../windows/ship-deckplan.js"; import { DLShipMacros } from "../windows/ship-macros.js"; +import { DLShipMegaDamage } from "../windows/ship-megadamage.js"; import { DLShipSetup } from "../windows/ship-setup.js"; export class MothershipShipSheetSBT extends ActorSheet { @@ -45,6 +46,14 @@ export class MothershipShipSheetSBT extends ActorSheet { }).render(true); } + _onOpenMegadamage(event) { + event.preventDefault(); + new DLShipMegaDamage(this.actor, { + top: this.position.top + 40, + left: this.position.left + (this.position.width - 400) / 2 + }).render(true); + } + /* -------------------------------------------- */ /** @override */ @@ -93,8 +102,6 @@ export class MothershipShipSheetSBT extends ActorSheet { this._prepareMegadamage(data); - console.log(this); - return data.data; } @@ -137,8 +144,6 @@ export class MothershipShipSheetSBT extends ActorSheet { actorData.weapons = weapons; actorData.cargo = cargo; actorData.modules = modules; - - console.log(sheetData); } async _prepareMegadamage(sheetData){ @@ -170,38 +175,35 @@ export class MothershipShipSheetSBT extends ActorSheet { //get table data let tableData = await game.packs.get(tableLocation).getDocument(tableId); - console.log(tableData); - let megadamageHTML = ""; - // actorData.system.megadamage.hits = [1,5]; + let entries = Array.from(tableData.results.entries()); - let entries = tableData.results.entries(); + //Prep Megadamage List + if(actorData.system.megadamage.hits.length > 0){ + let index = 0; + for(const entry of entries){ - let index = 0; - for(const entry of entries){ - console.log(entry); - - console.log(entry[1].text); - - - if (actorData.system.megadamage.hits.includes(index)){ - megadamageHTML += `  `; - } - else{ - megadamageHTML += `  `; + // Megadamage - Only Active + if(index != 0 && actorData.system.megadamage.hits.includes(index)){ + if(index != 0) megadamageHTML += `  `; + + megadamageHTML += `${entry[1].text}

`; + } + index++; } + } else { - megadamageHTML += `${index+1} | ${entry[1].text}

`; - - index++; + megadamageHTML += entries[0][1].text + "

"; } await this.object.update({ "data.megadamage.html": megadamageHTML }); - console.log(tableData.results.entries()); + // await this.object.update({ + // "data.megadamage.hits": [] + // }); } @@ -213,26 +215,26 @@ export class MothershipShipSheetSBT extends ActorSheet { if (!this.options.editable) return; - html.on('mousedown', '.megadamage-button', ev => { - const data = super.getData(); + // html.on('mousedown', '.megadamage-button', ev => { + // const data = this.object; - const div = $(ev.currentTarget); - const targetKey = div.data("key"); - console.log(targetKey); + // const div = $(ev.currentTarget); + // const targetKey = div.data("key"); + // console.log(targetKey); - if(data.data.system.megadamage.hits.includes(targetKey)){ - const index = data.data.system.megadamage.hits.indexOf(targetKey); - data.data.system.megadamage.hits.splice(index, 1); - } else { - data.data.system.megadamage.hits.push(targetKey); - } + // if(data.data.system.megadamage.hits.includes(targetKey)){ + // const index = data.data.system.megadamage.hits.indexOf(targetKey); + // data.data.system.megadamage.hits.splice(index, 1); + // } else { + // data.data.system.megadamage.hits.push(targetKey); + // } - this.object.update({ - "data.megadamage.hits": data.data.system.megadamage.hits - }); + // this.object.update({ + // "data.megadamage.hits": data.data.system.megadamage.hits + // }); - this._prepareMegadamage(data); - }); + // this._prepareMegadamage(data); + // }); // Create inventory item. html.find('.item-create').click(this._onItemCreate.bind(this)); @@ -307,6 +309,10 @@ export class MothershipShipSheetSBT extends ActorSheet { //Testing Setup Menu Button html.find('.setup-menu-button').click(ev => this._onOpenSetup(ev)); + //Megadamage Menu Button + html.find('.megadamage-menu-button').click(ev => this._onOpenMegadamage(ev)); + + html.on('mousedown', '.weapon-ammo', ev => { const li = ev.currentTarget.closest(".item"); const item = duplicate(this.actor.getEmbeddedDocument("Item", li.dataset.itemId)) @@ -340,6 +346,7 @@ export class MothershipShipSheetSBT extends ActorSheet { }); + // Drag events for macros. if (this.actor.isOwner) { let handler = ev => this._onDragStart(ev); diff --git a/module/windows/ship-macros.js b/module/windows/ship-macros.js index 614e590..78c32bf 100644 --- a/module/windows/ship-macros.js +++ b/module/windows/ship-macros.js @@ -36,7 +36,6 @@ export class DLShipMacros extends BaseSheet { */ getData() { const actor = this.object; - console.log(this); return { actor @@ -71,8 +70,6 @@ export class DLShipMacros extends BaseSheet { */ async _updateObject(event, formData) { - console.log("Updating Object"); - // await this.object.update({ // "data.stats.loyalty.enabled": true // }); @@ -83,13 +80,14 @@ export class DLShipMacros extends BaseSheet { // await this.object.updateEmbeddedEntity("OwnedItem", update); - this.object.update({ - formData - }); - console.log(this); + // await this.object.update({ + // formData + // }); - await this.object.sheet.render(true, {focus: false}); - this.bringToTop(); + // console.log(this); + + // await this.object.sheet.render(true, {focus: false}); + // this.bringToTop(); } diff --git a/module/windows/ship-megadamage.js b/module/windows/ship-megadamage.js new file mode 100644 index 0000000..4f86dd6 --- /dev/null +++ b/module/windows/ship-megadamage.js @@ -0,0 +1,140 @@ +export class DLShipMegaDamage extends FormApplication { + static get defaultOptions() { + const options = super.defaultOptions; + options.id = 'sheet-modifiers'; + options.classes = ["mosh", "sheet", "actor", "ship"]; + options.template = 'systems/mosh/templates/dialogs/ship-megadamage-dialog.html'; + options.width = 320; + options.height = 'auto'; + options.resizeable = false; + return options; + } + /* -------------------------------------------- */ + /** + * Add the Entity name into the window title + * @type {String} + */ + get title() { + return `${this.object.name}: Megadamage Effects`; + } + /* -------------------------------------------- */ + /** + * Construct and return the data object used to render the HTML template for this form application. + * @return {Object} + */ + getData() { + const data = super.getData(); + const actor = this.object; + + + this._prepareMegadamage(data); + + + return { + actor + }; + } + + + async _prepareMegadamage(sheetData){ + const actorData = sheetData.object; + + //A script to return the data from a table. + let tableId = 'AqGWwoWXzijFs427'; + let currentLocation = ''; + let tableLocation = ''; + //find where this table is located + //get current compendium + let compendium = game.packs; + //loop through each compendium + compendium.forEach(function(pack){ + //is this a pack of rolltables? + if (pack.metadata.type === 'RollTable') { + //log where we are + currentLocation = pack.metadata.id; + //loop through each pack to find the right table + pack.index.forEach(function(table) { + //is this our table? + if (table._id === tableId) { + //grab the table location + tableLocation = currentLocation; + } + }); + } + }); + //get table data + let tableData = await game.packs.get(tableLocation).getDocument(tableId); + + let entries = Array.from(tableData.results.entries()); + + // MEGADAMAGE SETTINGS MENU + let megadamageSettingsHTML = ""; + let index = 0; + for(const entry of entries){ + if(index != 0){ + if (actorData.system.megadamage.hits.includes(index)){ + megadamageSettingsHTML += `  `; + } + else{ + megadamageSettingsHTML += `  `; + } + + megadamageSettingsHTML += `${index} | ${entry[1].text}

`; + } + index++; + } + + actorData.system.megadamage.menu.html = megadamageSettingsHTML; + + // await this.object.update({ + // "data.megadamage.menu.html": megadamageSettingsHTML + // }); + } + + /* -------------------------------------------- */ + + /** @override */ + activateListeners(html) { + super.activateListeners(html); + + html.on('mousedown', '.megadamage-button', ev => { + const data = this.object; + + const div = $(ev.currentTarget); + const targetKey = div.data("key"); + + if(data.system.megadamage.hits.includes(targetKey)){ + const index = data.system.megadamage.hits.indexOf(targetKey); + data.system.megadamage.hits.splice(index, 1); + } else { + data.system.megadamage.hits.push(targetKey); + } + + this.object.update({ + "data.megadamage.hits": data.system.megadamage.hits + }); + + this.render(true, {focus: true}); + }); + + // Close Button + html.find('.close-button').click(ev => this.close()); + } + + /** + * This method is called upon form submission after form data is validated + * @param event {Event} The initial triggering submission event + * @param formData {Object} The object of validated form data with which to update the object + * @private + */ + async _updateObject(event, formData) { + + // this.object.update({ + // formData + // }); + + //await this.object.sheet.render(true, {focus: false}); + + + } +} diff --git a/packs/conditions_0e/000031.log b/packs/conditions_0e/000035.log similarity index 100% rename from packs/conditions_0e/000031.log rename to packs/conditions_0e/000035.log diff --git a/packs/conditions_0e/CURRENT b/packs/conditions_0e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/conditions_0e/CURRENT +++ b/packs/conditions_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/conditions_0e/LOG b/packs/conditions_0e/LOG index 13b3be9..caa3635 100644 --- a/packs/conditions_0e/LOG +++ b/packs/conditions_0e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.636 5104 Recovering log #28 -2024/01/23-08:31:09.660 5104 Delete type=0 #28 -2024/01/23-08:31:09.660 5104 Delete type=3 #26 +2024/01/23-13:07:43.685 3a24 Recovering log #32 +2024/01/23-13:07:43.709 3a24 Delete type=0 #32 +2024/01/23-13:07:43.709 3a24 Delete type=3 #30 diff --git a/packs/conditions_0e/LOG.old b/packs/conditions_0e/LOG.old index 7174488..e4a090c 100644 --- a/packs/conditions_0e/LOG.old +++ b/packs/conditions_0e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.951 809c Recovering log #24 -2024/01/22-19:59:18.975 809c Delete type=0 #24 -2024/01/22-19:59:18.976 809c Delete type=3 #22 -2024/01/23-08:31:05.986 7e04 Level-0 table #29: started -2024/01/23-08:31:05.986 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:05.996 7e04 Delete type=0 #27 -2024/01/23-08:31:06.009 7e04 Manual compaction at level-0 from '!items!1r6ruvSdxn2bHHIk' @ 72057594037927935 : 1 .. '!items!zbKI2RCl5h3vowoy' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.636 5104 Recovering log #28 +2024/01/23-08:31:09.660 5104 Delete type=0 #28 +2024/01/23-08:31:09.660 5104 Delete type=3 #26 +2024/01/23-13:07:39.562 7e04 Level-0 table #33: started +2024/01/23-13:07:39.562 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.568 7e04 Delete type=0 #31 +2024/01/23-13:07:39.569 7e04 Manual compaction at level-0 from '!items!1r6ruvSdxn2bHHIk' @ 72057594037927935 : 1 .. '!items!zbKI2RCl5h3vowoy' @ 0 : 0; will stop at (end) diff --git a/packs/conditions_0e/MANIFEST-000030 b/packs/conditions_0e/MANIFEST-000034 similarity index 83% rename from packs/conditions_0e/MANIFEST-000030 rename to packs/conditions_0e/MANIFEST-000034 index b627b90..9852e52 100644 Binary files a/packs/conditions_0e/MANIFEST-000030 and b/packs/conditions_0e/MANIFEST-000034 differ diff --git a/packs/conditions_1e/000031.log b/packs/conditions_1e/000035.log similarity index 100% rename from packs/conditions_1e/000031.log rename to packs/conditions_1e/000035.log diff --git a/packs/conditions_1e/CURRENT b/packs/conditions_1e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/conditions_1e/CURRENT +++ b/packs/conditions_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/conditions_1e/LOG b/packs/conditions_1e/LOG index f69b4c7..530d38a 100644 --- a/packs/conditions_1e/LOG +++ b/packs/conditions_1e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.577 1d1c Recovering log #28 -2024/01/23-08:31:09.603 1d1c Delete type=0 #28 -2024/01/23-08:31:09.603 1d1c Delete type=3 #26 +2024/01/23-13:07:43.632 3a24 Recovering log #32 +2024/01/23-13:07:43.653 3a24 Delete type=0 #32 +2024/01/23-13:07:43.653 3a24 Delete type=3 #30 diff --git a/packs/conditions_1e/LOG.old b/packs/conditions_1e/LOG.old index 456ed12..dd6356f 100644 --- a/packs/conditions_1e/LOG.old +++ b/packs/conditions_1e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.898 3a24 Recovering log #24 -2024/01/22-19:59:18.921 3a24 Delete type=0 #24 -2024/01/22-19:59:18.921 3a24 Delete type=3 #22 -2024/01/23-08:31:05.970 7e04 Level-0 table #29: started -2024/01/23-08:31:05.970 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:05.976 7e04 Delete type=0 #27 -2024/01/23-08:31:05.986 7e04 Manual compaction at level-0 from '!items!0ZAwhewvLBwX3opf' @ 72057594037927935 : 1 .. '!items!z0avrplKe6M0RcXk' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.577 1d1c Recovering log #28 +2024/01/23-08:31:09.603 1d1c Delete type=0 #28 +2024/01/23-08:31:09.603 1d1c Delete type=3 #26 +2024/01/23-13:07:39.495 7e04 Level-0 table #33: started +2024/01/23-13:07:39.495 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.500 7e04 Delete type=0 #31 +2024/01/23-13:07:39.524 7e04 Manual compaction at level-0 from '!items!0ZAwhewvLBwX3opf' @ 72057594037927935 : 1 .. '!items!z0avrplKe6M0RcXk' @ 0 : 0; will stop at (end) diff --git a/packs/conditions_1e/MANIFEST-000030 b/packs/conditions_1e/MANIFEST-000034 similarity index 83% rename from packs/conditions_1e/MANIFEST-000030 rename to packs/conditions_1e/MANIFEST-000034 index 82e6a71..60fa7d3 100644 Binary files a/packs/conditions_1e/MANIFEST-000030 and b/packs/conditions_1e/MANIFEST-000034 differ diff --git a/packs/macros_hotbar_0e/000031.log b/packs/macros_hotbar_0e/000035.log similarity index 100% rename from packs/macros_hotbar_0e/000031.log rename to packs/macros_hotbar_0e/000035.log diff --git a/packs/macros_hotbar_0e/CURRENT b/packs/macros_hotbar_0e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/macros_hotbar_0e/CURRENT +++ b/packs/macros_hotbar_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/macros_hotbar_0e/LOG b/packs/macros_hotbar_0e/LOG index 8fddbf6..b7feb95 100644 --- a/packs/macros_hotbar_0e/LOG +++ b/packs/macros_hotbar_0e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.640 3a24 Recovering log #28 -2024/01/23-08:31:09.661 3a24 Delete type=0 #28 -2024/01/23-08:31:09.661 3a24 Delete type=3 #26 +2024/01/23-13:07:43.687 5104 Recovering log #32 +2024/01/23-13:07:43.712 5104 Delete type=0 #32 +2024/01/23-13:07:43.712 5104 Delete type=3 #30 diff --git a/packs/macros_hotbar_0e/LOG.old b/packs/macros_hotbar_0e/LOG.old index 728eeba..58a16eb 100644 --- a/packs/macros_hotbar_0e/LOG.old +++ b/packs/macros_hotbar_0e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.953 1d1c Recovering log #24 -2024/01/22-19:59:18.976 1d1c Delete type=0 #24 -2024/01/22-19:59:18.976 1d1c Delete type=3 #22 -2024/01/23-08:31:06.002 7e04 Level-0 table #29: started -2024/01/23-08:31:06.003 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:06.009 7e04 Delete type=0 #27 -2024/01/23-08:31:06.016 7e04 Manual compaction at level-0 from '!macros!2xRvRAixuocjCm40' @ 72057594037927935 : 1 .. '!macros!ilBclUmPwcd7aNQK' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.640 3a24 Recovering log #28 +2024/01/23-08:31:09.661 3a24 Delete type=0 #28 +2024/01/23-08:31:09.661 3a24 Delete type=3 #26 +2024/01/23-13:07:39.578 7e04 Level-0 table #33: started +2024/01/23-13:07:39.578 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.596 7e04 Delete type=0 #31 +2024/01/23-13:07:39.615 7e04 Manual compaction at level-0 from '!macros!2xRvRAixuocjCm40' @ 72057594037927935 : 1 .. '!macros!ilBclUmPwcd7aNQK' @ 0 : 0; will stop at (end) diff --git a/packs/macros_hotbar_0e/MANIFEST-000030 b/packs/macros_hotbar_0e/MANIFEST-000034 similarity index 82% rename from packs/macros_hotbar_0e/MANIFEST-000030 rename to packs/macros_hotbar_0e/MANIFEST-000034 index 9ff9607..efb8183 100644 Binary files a/packs/macros_hotbar_0e/MANIFEST-000030 and b/packs/macros_hotbar_0e/MANIFEST-000034 differ diff --git a/packs/macros_hotbar_1e/000031.log b/packs/macros_hotbar_1e/000035.log similarity index 100% rename from packs/macros_hotbar_1e/000031.log rename to packs/macros_hotbar_1e/000035.log diff --git a/packs/macros_hotbar_1e/CURRENT b/packs/macros_hotbar_1e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/macros_hotbar_1e/CURRENT +++ b/packs/macros_hotbar_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/macros_hotbar_1e/LOG b/packs/macros_hotbar_1e/LOG index ca91999..46b705f 100644 --- a/packs/macros_hotbar_1e/LOG +++ b/packs/macros_hotbar_1e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.577 3a24 Recovering log #28 -2024/01/23-08:31:09.603 3a24 Delete type=0 #28 -2024/01/23-08:31:09.603 3a24 Delete type=3 #26 +2024/01/23-13:07:43.632 809c Recovering log #32 +2024/01/23-13:07:43.653 809c Delete type=0 #32 +2024/01/23-13:07:43.653 809c Delete type=3 #30 diff --git a/packs/macros_hotbar_1e/LOG.old b/packs/macros_hotbar_1e/LOG.old index 268f118..9407ae4 100644 --- a/packs/macros_hotbar_1e/LOG.old +++ b/packs/macros_hotbar_1e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.898 809c Recovering log #24 -2024/01/22-19:59:18.921 809c Delete type=0 #24 -2024/01/22-19:59:18.921 809c Delete type=3 #22 -2024/01/23-08:31:05.976 7e04 Level-0 table #29: started -2024/01/23-08:31:05.977 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:05.986 7e04 Delete type=0 #27 -2024/01/23-08:31:05.996 7e04 Manual compaction at level-0 from '!macros!2u4a5gEogtLd3XQz' @ 72057594037927935 : 1 .. '!macros!trU0DtBJvJCPddsQ' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.577 3a24 Recovering log #28 +2024/01/23-08:31:09.603 3a24 Delete type=0 #28 +2024/01/23-08:31:09.603 3a24 Delete type=3 #26 +2024/01/23-13:07:39.489 7e04 Level-0 table #33: started +2024/01/23-13:07:39.489 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.495 7e04 Delete type=0 #31 +2024/01/23-13:07:39.524 7e04 Manual compaction at level-0 from '!macros!2u4a5gEogtLd3XQz' @ 72057594037927935 : 1 .. '!macros!trU0DtBJvJCPddsQ' @ 0 : 0; will stop at (end) diff --git a/packs/macros_hotbar_1e/MANIFEST-000030 b/packs/macros_hotbar_1e/MANIFEST-000034 similarity index 81% rename from packs/macros_hotbar_1e/MANIFEST-000030 rename to packs/macros_hotbar_1e/MANIFEST-000034 index 51b7fe3..10f2469 100644 Binary files a/packs/macros_hotbar_1e/MANIFEST-000030 and b/packs/macros_hotbar_1e/MANIFEST-000034 differ diff --git a/packs/macros_triggered_0e/000031.log b/packs/macros_triggered_0e/000035.log similarity index 100% rename from packs/macros_triggered_0e/000031.log rename to packs/macros_triggered_0e/000035.log diff --git a/packs/macros_triggered_0e/CURRENT b/packs/macros_triggered_0e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/macros_triggered_0e/CURRENT +++ b/packs/macros_triggered_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/macros_triggered_0e/LOG b/packs/macros_triggered_0e/LOG index 8a1d857..eb854a8 100644 --- a/packs/macros_triggered_0e/LOG +++ b/packs/macros_triggered_0e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.666 3a24 Recovering log #28 -2024/01/23-08:31:09.690 3a24 Delete type=0 #28 -2024/01/23-08:31:09.690 3a24 Delete type=3 #26 +2024/01/23-13:07:43.712 1d1c Recovering log #32 +2024/01/23-13:07:43.736 1d1c Delete type=0 #32 +2024/01/23-13:07:43.736 1d1c Delete type=3 #30 diff --git a/packs/macros_triggered_0e/LOG.old b/packs/macros_triggered_0e/LOG.old index baf6383..4b26255 100644 --- a/packs/macros_triggered_0e/LOG.old +++ b/packs/macros_triggered_0e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.980 809c Recovering log #24 -2024/01/22-19:59:19.001 809c Delete type=0 #24 -2024/01/22-19:59:19.001 809c Delete type=3 #22 -2024/01/23-08:31:06.016 7e04 Level-0 table #29: started -2024/01/23-08:31:06.016 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:06.033 7e04 Delete type=0 #27 -2024/01/23-08:31:06.033 7e04 Manual compaction at level-0 from '!macros!0Yw4QWSAeOuUzRqB' @ 72057594037927935 : 1 .. '!macros!z5V92LyXHjfMxnRQ' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.666 3a24 Recovering log #28 +2024/01/23-08:31:09.690 3a24 Delete type=0 #28 +2024/01/23-08:31:09.690 3a24 Delete type=3 #26 +2024/01/23-13:07:39.554 7e04 Level-0 table #33: started +2024/01/23-13:07:39.554 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.562 7e04 Delete type=0 #31 +2024/01/23-13:07:39.569 7e04 Manual compaction at level-0 from '!macros!0Yw4QWSAeOuUzRqB' @ 72057594037927935 : 1 .. '!macros!z5V92LyXHjfMxnRQ' @ 0 : 0; will stop at (end) diff --git a/packs/macros_triggered_0e/MANIFEST-000030 b/packs/macros_triggered_0e/MANIFEST-000034 similarity index 82% rename from packs/macros_triggered_0e/MANIFEST-000030 rename to packs/macros_triggered_0e/MANIFEST-000034 index 39c23ab..852c617 100644 Binary files a/packs/macros_triggered_0e/MANIFEST-000030 and b/packs/macros_triggered_0e/MANIFEST-000034 differ diff --git a/packs/macros_triggered_1e/000031.log b/packs/macros_triggered_1e/000035.log similarity index 100% rename from packs/macros_triggered_1e/000031.log rename to packs/macros_triggered_1e/000035.log diff --git a/packs/macros_triggered_1e/CURRENT b/packs/macros_triggered_1e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/macros_triggered_1e/CURRENT +++ b/packs/macros_triggered_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/macros_triggered_1e/LOG b/packs/macros_triggered_1e/LOG index 01a913d..9050029 100644 --- a/packs/macros_triggered_1e/LOG +++ b/packs/macros_triggered_1e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.607 5104 Recovering log #28 -2024/01/23-08:31:09.632 5104 Delete type=0 #28 -2024/01/23-08:31:09.632 5104 Delete type=3 #26 +2024/01/23-13:07:43.658 3a24 Recovering log #32 +2024/01/23-13:07:43.682 3a24 Delete type=0 #32 +2024/01/23-13:07:43.682 3a24 Delete type=3 #30 diff --git a/packs/macros_triggered_1e/LOG.old b/packs/macros_triggered_1e/LOG.old index c986849..42bce10 100644 --- a/packs/macros_triggered_1e/LOG.old +++ b/packs/macros_triggered_1e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.924 3a24 Recovering log #24 -2024/01/22-19:59:18.948 3a24 Delete type=0 #24 -2024/01/22-19:59:18.948 3a24 Delete type=3 #22 -2024/01/23-08:31:05.964 7e04 Level-0 table #29: started -2024/01/23-08:31:05.964 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:05.970 7e04 Delete type=0 #27 -2024/01/23-08:31:05.986 7e04 Manual compaction at level-0 from '!macros!06j3tzX29f4pwYwh' @ 72057594037927935 : 1 .. '!macros!zLRsweb35Lw0NMev' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.607 5104 Recovering log #28 +2024/01/23-08:31:09.632 5104 Delete type=0 #28 +2024/01/23-08:31:09.632 5104 Delete type=3 #26 +2024/01/23-13:07:39.548 7e04 Level-0 table #33: started +2024/01/23-13:07:39.548 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.554 7e04 Delete type=0 #31 +2024/01/23-13:07:39.569 7e04 Manual compaction at level-0 from '!macros!06j3tzX29f4pwYwh' @ 72057594037927935 : 1 .. '!macros!zLRsweb35Lw0NMev' @ 0 : 0; will stop at (end) diff --git a/packs/macros_triggered_1e/MANIFEST-000030 b/packs/macros_triggered_1e/MANIFEST-000034 similarity index 81% rename from packs/macros_triggered_1e/MANIFEST-000030 rename to packs/macros_triggered_1e/MANIFEST-000034 index a36aa0b..ee96928 100644 Binary files a/packs/macros_triggered_1e/MANIFEST-000030 and b/packs/macros_triggered_1e/MANIFEST-000034 differ diff --git a/packs/rolltables_0e/000031.log b/packs/rolltables_0e/000035.log similarity index 100% rename from packs/rolltables_0e/000031.log rename to packs/rolltables_0e/000035.log diff --git a/packs/rolltables_0e/CURRENT b/packs/rolltables_0e/CURRENT index caa721a..eea9b0f 100644 --- a/packs/rolltables_0e/CURRENT +++ b/packs/rolltables_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000034 diff --git a/packs/rolltables_0e/LOG b/packs/rolltables_0e/LOG index 9b2dd57..4ed7858 100644 --- a/packs/rolltables_0e/LOG +++ b/packs/rolltables_0e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.667 5104 Recovering log #28 -2024/01/23-08:31:09.691 5104 Delete type=0 #28 -2024/01/23-08:31:09.691 5104 Delete type=3 #26 +2024/01/23-13:07:43.714 5104 Recovering log #32 +2024/01/23-13:07:43.745 5104 Delete type=0 #32 +2024/01/23-13:07:43.745 5104 Delete type=3 #30 diff --git a/packs/rolltables_0e/LOG.old b/packs/rolltables_0e/LOG.old index 625b1f5..8b0c301 100644 --- a/packs/rolltables_0e/LOG.old +++ b/packs/rolltables_0e/LOG.old @@ -1,7 +1,7 @@ -2024/01/22-19:59:18.980 5104 Recovering log #24 -2024/01/22-19:59:19.001 5104 Delete type=0 #24 -2024/01/22-19:59:19.001 5104 Delete type=3 #22 -2024/01/23-08:31:06.009 7e04 Level-0 table #29: started -2024/01/23-08:31:06.009 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:06.015 7e04 Delete type=0 #27 -2024/01/23-08:31:06.033 7e04 Manual compaction at level-0 from '!tables!1vCm4ElRPotQXgNB' @ 72057594037927935 : 1 .. '!tables.results!kqKpQAXyLTEEyz6Z.xdwwswzfoPuVifvw' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.667 5104 Recovering log #28 +2024/01/23-08:31:09.691 5104 Delete type=0 #28 +2024/01/23-08:31:09.691 5104 Delete type=3 #26 +2024/01/23-13:07:39.596 7e04 Level-0 table #33: started +2024/01/23-13:07:39.596 7e04 Level-0 table #33: 0 bytes OK +2024/01/23-13:07:39.615 7e04 Delete type=0 #31 +2024/01/23-13:07:39.615 7e04 Manual compaction at level-0 from '!tables!1vCm4ElRPotQXgNB' @ 72057594037927935 : 1 .. '!tables.results!kqKpQAXyLTEEyz6Z.xdwwswzfoPuVifvw' @ 0 : 0; will stop at (end) diff --git a/packs/rolltables_0e/MANIFEST-000030 b/packs/rolltables_0e/MANIFEST-000034 similarity index 92% rename from packs/rolltables_0e/MANIFEST-000030 rename to packs/rolltables_0e/MANIFEST-000034 index 24b6297..c81f19c 100644 Binary files a/packs/rolltables_0e/MANIFEST-000030 and b/packs/rolltables_0e/MANIFEST-000034 differ diff --git a/packs/rolltables_1e/000031.log b/packs/rolltables_1e/000031.log deleted file mode 100644 index bfaa607..0000000 Binary files a/packs/rolltables_1e/000031.log and /dev/null differ diff --git a/packs/rolltables_1e/000013.ldb b/packs/rolltables_1e/000034.ldb similarity index 85% rename from packs/rolltables_1e/000013.ldb rename to packs/rolltables_1e/000034.ldb index ec6eb46..d49c8bd 100644 Binary files a/packs/rolltables_1e/000013.ldb and b/packs/rolltables_1e/000034.ldb differ diff --git a/packs/rolltables_1e/000036.log b/packs/rolltables_1e/000036.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/rolltables_1e/CURRENT b/packs/rolltables_1e/CURRENT index caa721a..29a53d8 100644 --- a/packs/rolltables_1e/CURRENT +++ b/packs/rolltables_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000030 +MANIFEST-000035 diff --git a/packs/rolltables_1e/LOG b/packs/rolltables_1e/LOG index 799423d..86be22d 100644 --- a/packs/rolltables_1e/LOG +++ b/packs/rolltables_1e/LOG @@ -1,3 +1,3 @@ -2024/01/23-08:31:09.608 1d1c Recovering log #28 -2024/01/23-08:31:09.635 1d1c Delete type=0 #28 -2024/01/23-08:31:09.635 1d1c Delete type=3 #26 +2024/01/23-13:07:43.659 1d1c Recovering log #32 +2024/01/23-13:07:43.682 1d1c Delete type=0 #32 +2024/01/23-13:07:43.682 1d1c Delete type=3 #30 diff --git a/packs/rolltables_1e/LOG.old b/packs/rolltables_1e/LOG.old index 6293c2f..2af79ad 100644 --- a/packs/rolltables_1e/LOG.old +++ b/packs/rolltables_1e/LOG.old @@ -1,7 +1,14 @@ -2024/01/22-19:59:18.925 809c Recovering log #24 -2024/01/22-19:59:18.948 809c Delete type=0 #24 -2024/01/22-19:59:18.949 809c Delete type=3 #22 -2024/01/23-08:31:05.996 7e04 Level-0 table #29: started -2024/01/23-08:31:05.996 7e04 Level-0 table #29: 0 bytes OK -2024/01/23-08:31:06.002 7e04 Delete type=0 #27 -2024/01/23-08:31:06.016 7e04 Manual compaction at level-0 from '!tables!31YibfjueXuZdNLb' @ 72057594037927935 : 1 .. '!tables.results!ypcoikqHLhnc9tNs.zJkYrssfrdWBSeRm' @ 0 : 0; will stop at (end) +2024/01/23-08:31:09.608 1d1c Recovering log #28 +2024/01/23-08:31:09.635 1d1c Delete type=0 #28 +2024/01/23-08:31:09.635 1d1c Delete type=3 #26 +2024/01/23-13:07:39.502 7e04 Level-0 table #33: started +2024/01/23-13:07:39.517 7e04 Level-0 table #33: 2804 bytes OK +2024/01/23-13:07:39.524 7e04 Delete type=0 #31 +2024/01/23-13:07:39.524 7e04 Manual compaction at level-0 from '!tables!31YibfjueXuZdNLb' @ 72057594037927935 : 1 .. '!tables.results!ypcoikqHLhnc9tNs.zJkYrssfrdWBSeRm' @ 0 : 0; will stop at '!tables.results!AqGWwoWXzijFs427.yVzV5Y0tNWSqPVpS' @ 280 : 0 +2024/01/23-13:07:39.524 7e04 Compacting 1@0 + 1@1 files +2024/01/23-13:07:39.540 7e04 Generated table #34@0: 278 keys, 47988 bytes +2024/01/23-13:07:39.542 7e04 Compacted 1@0 + 1@1 files => 47988 bytes +2024/01/23-13:07:39.548 7e04 compacted to: files[ 0 1 0 0 0 0 0 ] +2024/01/23-13:07:39.548 7e04 Delete type=2 #13 +2024/01/23-13:07:39.548 7e04 Delete type=2 #33 +2024/01/23-13:07:39.569 7e04 Manual compaction at level-0 from '!tables.results!AqGWwoWXzijFs427.yVzV5Y0tNWSqPVpS' @ 280 : 0 .. '!tables.results!ypcoikqHLhnc9tNs.zJkYrssfrdWBSeRm' @ 0 : 0; will stop at (end) diff --git a/packs/rolltables_1e/MANIFEST-000030 b/packs/rolltables_1e/MANIFEST-000030 deleted file mode 100644 index 582d41e..0000000 Binary files a/packs/rolltables_1e/MANIFEST-000030 and /dev/null differ diff --git a/packs/rolltables_1e/MANIFEST-000035 b/packs/rolltables_1e/MANIFEST-000035 new file mode 100644 index 0000000..416e267 Binary files /dev/null and b/packs/rolltables_1e/MANIFEST-000035 differ diff --git a/template.json b/template.json index 4bc735a..57b9e1d 100644 --- a/template.json +++ b/template.json @@ -224,7 +224,10 @@ "runSetup" : true, "megadamage" : { "html" : "", - "hits" : [] + "hits" : [], + "menu" : { + "html" : "" + } }, "stats": { "armor": { diff --git a/templates/actor/ship-sheet-sbt.html b/templates/actor/ship-sheet-sbt.html index 739dcef..de6fb05 100644 --- a/templates/actor/ship-sheet-sbt.html +++ b/templates/actor/ship-sheet-sbt.html @@ -249,17 +249,31 @@
-
+
+
+ + +
+ +
+ +
+
-
Megadamage
+
Megadamage Effects

-
{{{system.megadamage.html}}}
+
{{{system.megadamage.html}}}
+ + +
Add/Remove
+
diff --git a/templates/dialogs/ship-megadamage-dialog.html b/templates/dialogs/ship-megadamage-dialog.html new file mode 100644 index 0000000..81e4e6f --- /dev/null +++ b/templates/dialogs/ship-megadamage-dialog.html @@ -0,0 +1,18 @@ +
+
+ +
+ +
+
+ +
+
Megadamage Effects
+ + +
{{{actor.system.megadamage.menu.html}}}
+
+
+
FINISH
+ +
\ No newline at end of file