From 28006cfa143d8cb4308fbad2cd29a0ed4331a010 Mon Sep 17 00:00:00 2001 From: Futil Date: Tue, 23 Jan 2024 14:06:40 -0700 Subject: [PATCH] SBT-Megdamage Menu --- css/mosh.css | 38 ++++- module/actor/ship-sheet-sbt.js | 87 ++++++----- module/windows/ship-macros.js | 16 +- module/windows/ship-megadamage.js | 140 ++++++++++++++++++ .../conditions_0e/{000031.log => 000035.log} | 0 packs/conditions_0e/CURRENT | 2 +- packs/conditions_0e/LOG | 6 +- packs/conditions_0e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 153 -> 153 bytes .../conditions_1e/{000031.log => 000035.log} | 0 packs/conditions_1e/CURRENT | 2 +- packs/conditions_1e/LOG | 6 +- packs/conditions_1e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 153 -> 153 bytes .../{000031.log => 000035.log} | 0 packs/macros_hotbar_0e/CURRENT | 2 +- packs/macros_hotbar_0e/LOG | 6 +- packs/macros_hotbar_0e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 156 -> 156 bytes .../{000031.log => 000035.log} | 0 packs/macros_hotbar_1e/CURRENT | 2 +- packs/macros_hotbar_1e/LOG | 6 +- packs/macros_hotbar_1e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 157 -> 157 bytes .../{000031.log => 000035.log} | 0 packs/macros_triggered_0e/CURRENT | 2 +- packs/macros_triggered_0e/LOG | 6 +- packs/macros_triggered_0e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 156 -> 156 bytes .../{000031.log => 000035.log} | 0 packs/macros_triggered_1e/CURRENT | 2 +- packs/macros_triggered_1e/LOG | 6 +- packs/macros_triggered_1e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 158 -> 158 bytes .../rolltables_0e/{000031.log => 000035.log} | 0 packs/rolltables_0e/CURRENT | 2 +- packs/rolltables_0e/LOG | 6 +- packs/rolltables_0e/LOG.old | 14 +- .../{MANIFEST-000030 => MANIFEST-000034} | Bin 207 -> 207 bytes packs/rolltables_1e/000031.log | Bin 5374 -> 0 bytes .../rolltables_1e/{000013.ldb => 000034.ldb} | Bin 47846 -> 47988 bytes packs/rolltables_1e/000036.log | 0 packs/rolltables_1e/CURRENT | 2 +- packs/rolltables_1e/LOG | 6 +- packs/rolltables_1e/LOG.old | 21 ++- packs/rolltables_1e/MANIFEST-000030 | Bin 208 -> 0 bytes packs/rolltables_1e/MANIFEST-000035 | Bin 0 -> 208 bytes template.json | 5 +- templates/actor/ship-sheet-sbt.html | 20 ++- templates/dialogs/ship-megadamage-dialog.html | 18 +++ 50 files changed, 365 insertions(+), 142 deletions(-) create mode 100644 module/windows/ship-megadamage.js rename packs/conditions_0e/{000031.log => 000035.log} (100%) rename packs/conditions_0e/{MANIFEST-000030 => MANIFEST-000034} (83%) rename packs/conditions_1e/{000031.log => 000035.log} (100%) rename packs/conditions_1e/{MANIFEST-000030 => MANIFEST-000034} (83%) rename packs/macros_hotbar_0e/{000031.log => 000035.log} (100%) rename packs/macros_hotbar_0e/{MANIFEST-000030 => MANIFEST-000034} (82%) rename packs/macros_hotbar_1e/{000031.log => 000035.log} (100%) rename packs/macros_hotbar_1e/{MANIFEST-000030 => MANIFEST-000034} (81%) rename packs/macros_triggered_0e/{000031.log => 000035.log} (100%) rename packs/macros_triggered_0e/{MANIFEST-000030 => MANIFEST-000034} (82%) rename packs/macros_triggered_1e/{000031.log => 000035.log} (100%) rename packs/macros_triggered_1e/{MANIFEST-000030 => MANIFEST-000034} (81%) rename packs/rolltables_0e/{000031.log => 000035.log} (100%) rename packs/rolltables_0e/{MANIFEST-000030 => MANIFEST-000034} (92%) delete mode 100644 packs/rolltables_1e/000031.log rename packs/rolltables_1e/{000013.ldb => 000034.ldb} (85%) create mode 100644 packs/rolltables_1e/000036.log delete mode 100644 packs/rolltables_1e/MANIFEST-000030 create mode 100644 packs/rolltables_1e/MANIFEST-000035 create mode 100644 templates/dialogs/ship-megadamage-dialog.html 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 b627b90f9b56199ded0f69eff31b7f7ece643d3e..9852e528da7c1d157d406fbb5762ee990666512d 100644 GIT binary patch delta 22 dcmbQqIFoTg7e7Pfq@5fLj7-X$49qGl$^b;g1cv|s delta 22 dcmbQqIFoTg7yt7O-E|xcj7;*J49p5F$^cWz1$zJh 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 82e6a71b6e23e6a3ee9ee34a168ab1ec24b0d7db..60fa7d3b3b7d481b4c202a79998cbe89b06fb5c4 100644 GIT binary patch delta 22 dcmbQqIFoTg7ys_^gHjv}j7-X$49qGlh5$@k1pWX3 delta 22 dcmbQqIFoTg7ylgoJ)s;7j7;*J49p5Fh5$!31f>7~ 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 9ff96071daa822f433ba0cc09e9c0d291bd32de3..efb8183c6193f76313603e572bf83dbade86ff5f 100644 GIT binary patch delta 22 dcmbQkIEQgUFMs}Hx4#?=j7-X$49qGloB&e21!n*N delta 22 dcmbQkIEQgUFMo%%y9oyaBa=KQ1G54PCjdcx1PA~C 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 51b7fe3cdff123244cf3a667ce3ce75477b854ed..10f24693d426bd4067da436539785bc010773a92 100644 GIT binary patch delta 22 dcmbQsIG1rkAOB9(^|2fbj7-X$49qGl+yF|!1i=6R delta 22 dcmbQsIG1rkAOF1CbwV5rj7;*J49p5F+yF{L1gZc4 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 39c23ab604fa41397f0c0fba1723bcf95cde93ca..852c61765fd094de17098019a9de9f1d063f1602 100644 GIT binary patch delta 22 dcmbQkIEQgUFaN;0sf_@nq@c`7@3qg8JJaAG5}dN1=s)p delta 22 dcmX@lc%E^>0scctUBMg-j7;*J49p5F830%S1;YRU diff --git a/packs/rolltables_1e/000031.log b/packs/rolltables_1e/000031.log deleted file mode 100644 index bfaa607273b1a3511fced52946a3a6fa8893f7e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5374 zcmcgw&2A$_5N6@R1AyRIYYAzQ2LHzSQxs`pj}veFleLpLS%g-dnf6StXQs#9J$AgS zl{oMO+z{f95HG=v8z)|XH{isT>haHpi5D5gCWk1Qn(C?ks{5<2${PLl&0ilq`sC4j z$h{Jh)?2}4aNMRhPP@@- zKR=>_(Rc+HszMr>#mjRQkBV$!ui!!^dtR$#T}$(6`}Bf7U%|y~4NnWN9HI8i3u0fm zE4U1T=lxs3mFrj97vtUL3NB{p>ZDO_lP>PP)UK5t{rBvD`~K_93+80@GwE}YF*0fr z(ae6{$T-}N0~)Fd_kC(B#zS-nW8cS@=C(R6q936fy;W#GkV^2-Jv18)=w5fvt!5Wm z?M~BdWDjyP+rf>1+#!^2%US49;!Hqs5X_-jT$u$fE+Z#W(Lm+`F1;KJh)ZRT**uiF znB@cpG(GUSfV#vX+Wvy}`xvFnMxl$#j45+H45(ma1PNW-(U*B6{}o0q$QU=$C%&Xc zrtcG1X7*pdd9wnH=^OF$0>-puZ7^C*t8;9%D%ViEuo}>?%+q@~S|chDLKaY%@EBx7 zLkIdX^^H6K7a-tb!vGhI!ovVg^T!VhfYX+>0o=39vv#Ws?OLr-Z&~-iHDkpCqL@v5 ze*%5Nd^jRX`4lQ1wFh#uN497bABJd}UVm92nzpPB(Uy5xKQ_^QD?KLmyFWGP)}E=pFWuLZQ8On z)NA#Q1qgZ7s@!LY8WR+GK_J&kP@dqi>+x9OpZM5gkpVW^6boG-$i=tJ2BMI9Bafov z0SykHI5E{MEd!1@W1&a$pM z+(!+7X_c`(pbq9t@+OpKB*DUB>oSn5h=L_}ouFBHB zowzgvp9M@Iu83;E!3z?gfM=1<@X-xcb-bYgxn)5d=sP+Fn;`T|O*VT)wvFwFfuEMb zKQ6#eTh<1C$E?<;WoM~M>JW!b%SeNcsE_AZbDpFU@L$wV#RPm7#tQo=3~F;abjR3v z7`W-C;Vrmn%i6%LT4ojMEjT~1pl6<2owqDBQ}ddIW~v={zwfgU8H5H@;32ms5b-hA zcpmy2KDoQb?!&-Mw^!dUPHx(=HgL@&vsJ~~-94$FJx+H?U98W*Bsf%ePm_d!XH4;b z9M(N!@89tJbT)aoH*xs=!@1;1&ms`EkObI}WtxlT4XkPNw!V9ZaM^-Iv##|ZI-EDA zcRu>0iE0FE;H)jxDEkbHCDHm*5F1tLA76hbp_(+9iO5N+s07`C&TAnLX%>1O4K&rmr#FztM^Q19RQd=iaEB|d*h!8wM1HwWrRdsAgL(w6g8kCV(I0+sqT|~bq;3GjJA61H; zU}W}{h_Tyun8at34rXuuXf`p!@xZcK$dbN(Nhi9bm0F_nmuSN!LS#vKTte#is0i=q z3#o|Gvy9pBM2}`NdVYdfOo{mtF`Q0u^4YCyse}g9>h$g7LLpnq@9M`%2Ay-9Dc}fY zd$+t-+Ai-D3%g|lmvmSk<;l#rli$u4%jKQj($=&^|#Wga+-fn9}?Wl+Pq< 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 ec6eb4616e72714d77c78a97e4253ca756ec288d..d49c8bd89f81d46fe661be611f0eee6eb8bbcadc 100644 GIT binary patch delta 2245 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 delta 2156 zcmZ9Ne{36P8OQHEJIOh59A8KpuSwfCDPd{my8ay})Y1Giv2(Fw$IdTc-PwK}U;N{o zyR#jeEnT{`Yr7JOo>Us3m0GETjS1Ff?UrPSb`qd%73;Rb5CcSqRMxd?Ck6us&A8+r zBwoEA=}vm}eV+GupZELz?KAx5-*K>X9&obelZ0b-V7$bRPgIy0FK;&XfGybaVVM<= ztefT1ykM47hieC1!X$FJLSrGnW!O6E0j7hd4kytMu_beUgw8Q>=t`k@8g{wpOjZjW zxdg{DiCrDqRl6L^14_Ox4yZ@0V!nDyq(M%gEUTI&G;{`*5Y7260tHsOk(b9f$Fr(= zLN2hNM#I4vhv+nDR_9qJCmgYAp^%~ln4P#K397X|4vn>6F;aIt zXlStUF4i)@SSF|Zey@2TuUb^uLOeg`2-z~F9xg`rMpc=5n>U+^xUIoTY?k-)w0nJ^ zR+<+EYTGbrfDKOk^uyuhJ|z#Ue+~bH^&S&n(wacC7^;kj{kut37aUD7dC2fEfk2}e z-|c9wTG#B!qG>uo1NaHG4<(Z*E{Jb0wTjnwH|~GDUGpUF3C!xV#jJ&y6^2uWqyUr{ zrt1RI(XDp@>BCJ?aCCAs;u#)=fna#pLFsyRZp)lS2g8U?l%c>vj!B^P9iX@a5PGfN zy8}>*_*gC(D;a&g6X7B^GZfMTRr@v!iwARIHx)2>CV7WHI21)wpwZgBnOrxpcWWu1*8@kRBO}3ZBpUYi z0CRAzJdJWN!(h8?*4A$Zk#@}me0F5a!qfb0**!g83NYiKq0?-!Y;?}XuG9g?m~Y@n zyZ2UglZ(#fSmC)dZIKjL;045OZzV>cLEj1EDLNNNkj`XajxI9Oo+r9sf);34V)7`l zo>mmo3c{o{c>^&(ox;mwl`+etUI>hjO40M9pxzqTtYZM!12)gFCp_Q@xF(@D>Y-pC zUxj(jO;Q4rMX<~kq?)2!0wxP6qur)f8eo=PUz5$R$q0ki(BBJAihGR@j#&Mhf_`B4 zcRA?oxfer`;D<4c1}07*(&d8MQWlRUIXgrl#H2 z%4YZquvgq}RAlI!04a8Q!9mc)a zoDzFp>D>R?ZT!zNY5ArtVv&?f^?t1xBW3LZ9m^oTJpjH?NIm#Y3r5Px7A!`#DBo*Y zXx^s5ilnCL58A7(*aM{g%Q_D6g^a+rn@QO81?E->5Yk-_1Hs) z446DPOp-?B#pD&$VjRO*(xCabAl`Y!h=1^;2v@d~&xqi71J-@$0EUf|%j&ad#o$UC ze(NV#O3?mA3siUk6{P7L6Fjkw(o&zXku4w4I-0?(}TMHo$wwMv^nd*`Pk4 z(?^}^zuW|;l#3=z?y`_c^^s4(gEKM5W&3EwMs4zuU2T7{0+z_v==Ih^251oJh9&WsG55HC=hSpleN7v+H HW{vnSH2 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 582d41ec852b7beed2527d2b018edcb5ed08390e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmaD>@M* -
+
+
+ + +
+ +
+ +
+
-
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