diff --git a/css/mosh.css b/css/mosh.css index afabecb..b28b9a7 100644 --- a/css/mosh.css +++ b/css/mosh.css @@ -220,6 +220,13 @@ p { font-family: 'Roboto'; } +.mosh .center-icon{ + font-size: 42px; + align-items: center; + justify-content: center; + display: flex; +} + .mosh .transponder input[type="checkbox"] { /* display: none; */ appearance: inherit; @@ -553,6 +560,62 @@ p { padding: 10px; } +.mosh .button-white { + font-weight: bold; + font-size: 16px; + color: #111; + margin-left: 0px; + background: white; + border-radius: 21px; + text-align: center; + overflow: hidden; + padding: 10px; + border: 3px solid #111; +} + +/* Dropdown Button */ +.mosh .dropbtn { + background-color: #111; + color: white; + padding: 16px; + font-size: 16px; + border: none; +} + +/* The container
- needed to position the dropdown content */ +.mosh.dropdown { + position: relative; + display: inline-block; +} + +/* Dropdown Content (Hidden by Default) */ +.mosh .dropdown-content { + display: none; + position: absolute; + background-color: #f1f1f1; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +/* Links inside the dropdown */ +.mosh .dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +/* Change color of dropdown links on hover */ +.mosh .dropdown-content a:hover {background-color: #ddd;} + +/* Show the dropdown menu on hover */ +.mosh .dropdown:hover .dropdown-content {display: block;} + +/* Change the background color of the dropdown button when the dropdown content is shown */ +.mosh .dropdown:hover .dropbtn {background-color: #3d3d3d;} + + .mosh .sbt-profile { width: 100px; height: auto; @@ -927,10 +990,14 @@ p { font-weight: bold; text-align: center; text-transform: uppercase; - margin-bottom: 7px; + /* margin-bottom: 7px; */ color: grey; } +.mosh .black { + color: black; +} + .mosh .circlestattext { width: 100%; @@ -1045,7 +1112,7 @@ p { font-family: "Montserrat", "Arial Black", sans-serif; font-weight: bold; text-transform: uppercase; - border-radius: 10px; + border-radius: 15px; } .mosh .padding{ @@ -1128,16 +1195,27 @@ p { } .mosh .whiteline { - border-top: 2px solid white; + border-top: 3px solid white; grid-area: line; + margin-top: 5px; margin-bottom: 10px; margin-left: 15px; margin-right: 15px; } .mosh .blackline { - border-top: 2px solid black; + border-top: 3px solid black; grid-area: line; + margin-bottom: 5px; + margin-left: 15px; + margin-right: 15px; + margin-top: 5px; +} + +.mosh .greyline { + border-top: 3px solid grey; + grid-area: line; + margin-top: 5px; margin-bottom: 10px; margin-left: 15px; margin-right: 15px; @@ -1238,7 +1316,7 @@ p { grid-template-columns: 1fr 1fr 1fr 1fr; gap: 0.25rem; padding: 1em; - margin-top: -11px; + /* margin-top: -11px; */ } .mosh .headernamegrid { @@ -1271,6 +1349,8 @@ p { .mosh .profile { width: 140px; height: auto; + padding: 6px; + border-radius: 10px; border: 0; } diff --git a/module/actor/actor.js b/module/actor/actor.js index a5d2361..a847910 100644 --- a/module/actor/actor.js +++ b/module/actor/actor.js @@ -1263,6 +1263,23 @@ export class MothershipActor extends Actor { if (useCalm) {rollString = '1d100' + rollString;} } } + + // -- SHIP TABLES -- + // Ship Distress + if (tableId === 'ship-distress') { + //set special roll value for use later + rollString = "1d10-1"; + specialRoll = tableId; + tableId = 'UxAjAqUTjYTcCbS8'; + aimFor = null; + zeroBased = true; + checkCrit = true; + rollAgainst = null; + comparison = null; + } + + + //bounce this request away if certain parameters are NULL //if rollString is STILL blank, redirect player to choose the roll if (!rollString) { diff --git a/module/actor/ship-sheet-sbt.js b/module/actor/ship-sheet-sbt.js index c221cb5..6bb1bdd 100644 --- a/module/actor/ship-sheet-sbt.js +++ b/module/actor/ship-sheet-sbt.js @@ -4,7 +4,8 @@ * @extends {ActorSheet} */ import { DLShipDeckplan } from "../windows/ship-deckplan.js"; - +import { DLShipMacros } from "../windows/ship-macros.js"; +import { DLShipSetup } from "../windows/ship-setup.js"; export class MothershipShipSheetSBT extends ActorSheet { @@ -28,6 +29,22 @@ export class MothershipShipSheetSBT extends ActorSheet { }).render(true); } + _onOpenMacros(event) { + event.preventDefault(); + new DLShipMacros(this.actor, { + top: this.position.top + 40, + left: this.position.left + (this.position.width - 400) / 2 + }).render(true); + } + + _onOpenSetup(event) { + event.preventDefault(); + new DLShipSetup(this.actor, { + top: this.position.top + 40, + left: this.position.left + (this.position.width - 400) / 2 + }).render(true); + } + /* -------------------------------------------- */ /** @override */ @@ -60,6 +77,19 @@ export class MothershipShipSheetSBT extends ActorSheet { superData.supplies.hull.percentage = " [ "+Math.round(maxHull * 0.25)+" | "+Math.round(maxHull * 0.5)+" | "+Math.round(maxHull * 0.75)+" ]"; + console.log(this); + + //Run Setup + // if(data.data.system.runSetup){ + // this.render(true, {focus:false}); + // var setupMenu = new DLShipSetup(this.actor, {popOut: true, minimizable : false}); + // setupMenu.render(true, {focus: true}); + // console.log(setupMenu); + // this.close(); + + // data.data.system.runSetup = false; + // } + return data.data; } @@ -175,9 +205,15 @@ export class MothershipShipSheetSBT extends ActorSheet { this.actor.rollCheck(null,'low','combat',null,null,item); }); - // Rollable Weapon + // Deckplan Button html.find('.deckplan-button').click(ev => this._onOpenDeckplan(ev)); + //Macro Menu Button + html.find('.macro-menu-button').click(ev => this._onOpenMacros(ev)); + + //Testing Setup Menu Button + html.find('.setup-menu-button').click(ev => this._onOpenSetup(ev)); + html.on('mousedown', '.weapon-ammo', ev => { const li = ev.currentTarget.closest(".item"); const item = duplicate(this.actor.getEmbeddedDocument("Item", li.dataset.itemId)) diff --git a/module/windows/ship-deckplan.js b/module/windows/ship-deckplan.js index 7c8cbdb..e6c612f 100644 --- a/module/windows/ship-deckplan.js +++ b/module/windows/ship-deckplan.js @@ -50,14 +50,14 @@ export class DLShipDeckplan extends ActorSheet { * @private */ async _updateObject(event, formData) { - console.log(this.object.system); - console.log(formData); - console.log(formData['actor.system.images.layout']); + // console.log(this.object.system); + // console.log(formData); + // console.log(formData['actor.system.images.layout']); // Loyalty - await this.object.update({ - "system.images.layout": formData['actor.system.images.layout'] - }); + // await this.object.update({ + // "system.images.layout": formData['actor.system.images.layout'] + // }); // await this.object.updateEmbeddedEntity("OwnedItem", update); diff --git a/module/windows/ship-macros.js b/module/windows/ship-macros.js new file mode 100644 index 0000000..614e590 --- /dev/null +++ b/module/windows/ship-macros.js @@ -0,0 +1,96 @@ +import { DLShipDeckplan } from "../windows/ship-deckplan.js"; + + +export class DLShipMacros extends BaseSheet { + static get defaultOptions() { + const options = super.defaultOptions; + options.id = 'sheet-modifiers'; + options.classes = ["mosh", "sheet", "actor", "ship"]; + options.template = 'systems/mosh/templates/dialogs/ship-macro-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}: Ship Macros`; + } + /* -------------------------------------------- */ + + _onOpenDeckplan(event) { + event.preventDefault(); + new DLShipDeckplan(this.object, { + top: this.position.top + 40, + left: this.position.left + (this.position.width - 400) / 2 + }).render(true); + } + + /** + * Construct and return the data object used to render the HTML template for this form application. + * @return {Object} + */ + getData() { + const actor = this.object; + console.log(this); + + return { + actor + }; + } + /* -------------------------------------------- */ + + /** @override */ + activateListeners(html) { + super.activateListeners(html); + + // Stress - Panic Check + html.find('.distress-button').click(ev => { + //roll panic check + this.object.rollTable('ship-distress',null,null,null,null,null,null); + //this.object.rollTable('ship-distress',null,null,null,null,'system.stats.battle.value',null); + }); + + + // Deckplan Button + html.find('.deckplan-button').click(ev => this._onOpenDeckplan(ev)); + + // 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) { + + console.log("Updating Object"); + + // await this.object.update({ + // "data.stats.loyalty.enabled": true + // }); + + await this.object.update({ + "data.stats.bankruptcy.value": formData['actor.system.stats.bankruptcy.value'] + }); + + // await this.object.updateEmbeddedEntity("OwnedItem", update); + + this.object.update({ + formData + }); + console.log(this); + + await this.object.sheet.render(true, {focus: false}); + this.bringToTop(); + + + } +} diff --git a/module/windows/ship-setup.js b/module/windows/ship-setup.js new file mode 100644 index 0000000..c7bed8c --- /dev/null +++ b/module/windows/ship-setup.js @@ -0,0 +1,72 @@ +export class DLShipSetup 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-setup-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}: Ship Setup`; + } + /* -------------------------------------------- */ + /** + * Construct and return the data object used to render the HTML template for this form application. + * @return {Object} + */ + getData() { + const actor = this.object; + console.log(this); + + return { + actor + }; + } + /* -------------------------------------------- */ + + /** @override */ + activateListeners(html) { + super.activateListeners(html); + + // Starting Conditions + html.find('.conditions-button').click(ev => { + this.object.rollTable('ship-distress',null,null,null,null,null,null); + }); + + // 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) { + + console.log("Updating Object"); + + await this.object.update({ + "name": formData['actor.name'] + }); + + + this.object.update({ + formData + }); + console.log(this); + + await this.object.sheet.render(true, {focus: false}); + + + } +} diff --git a/packs/conditions_0e/000005.ldb b/packs/conditions_0e/000013.ldb similarity index 100% rename from packs/conditions_0e/000005.ldb rename to packs/conditions_0e/000013.ldb diff --git a/packs/conditions_0e/000004.log b/packs/conditions_0e/000027.log similarity index 100% rename from packs/conditions_0e/000004.log rename to packs/conditions_0e/000027.log diff --git a/packs/conditions_0e/CURRENT b/packs/conditions_0e/CURRENT index 1a84852..8b15215 100644 --- a/packs/conditions_0e/CURRENT +++ b/packs/conditions_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/conditions_0e/LOG b/packs/conditions_0e/LOG index 10e7ace..3c15a51 100644 --- a/packs/conditions_0e/LOG +++ b/packs/conditions_0e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.536 1714 Delete type=3 #1 -2024/01/19-14:45:12.065 3978 Level-0 table #5: started -2024/01/19-14:45:12.071 3978 Level-0 table #5: 8479 bytes OK -2024/01/19-14:45:12.073 3978 Delete type=0 #3 -2024/01/19-14:45:12.081 3978 Manual compaction at level-0 from '!items!1r6ruvSdxn2bHHIk' @ 72057594037927935 : 1 .. '!items!zbKI2RCl5h3vowoy' @ 0 : 0; will stop at (end) +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 diff --git a/packs/conditions_0e/LOG.old b/packs/conditions_0e/LOG.old new file mode 100644 index 0000000..9cbe293 --- /dev/null +++ b/packs/conditions_0e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.376 809c Recovering log #20 +2024/01/22-17:35:33.400 809c Delete type=0 #20 +2024/01/22-17:35:33.400 809c Delete type=3 #18 +2024/01/22-19:59:12.500 7e04 Level-0 table #25: started +2024/01/22-19:59:12.500 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.506 7e04 Delete type=0 #23 +2024/01/22-19:59:12.513 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-000026 b/packs/conditions_0e/MANIFEST-000026 new file mode 100644 index 0000000..d4be4ef Binary files /dev/null and b/packs/conditions_0e/MANIFEST-000026 differ diff --git a/packs/conditions_1e/000004.log b/packs/conditions_0e/lost/000004.log similarity index 100% rename from packs/conditions_1e/000004.log rename to packs/conditions_0e/lost/000004.log diff --git a/packs/conditions_0e/MANIFEST-000002 b/packs/conditions_0e/lost/MANIFEST-000002 similarity index 100% rename from packs/conditions_0e/MANIFEST-000002 rename to packs/conditions_0e/lost/MANIFEST-000002 diff --git a/packs/conditions_1e/000005.ldb b/packs/conditions_1e/000013.ldb similarity index 100% rename from packs/conditions_1e/000005.ldb rename to packs/conditions_1e/000013.ldb diff --git a/packs/macros_hotbar_0e/000004.log b/packs/conditions_1e/000027.log similarity index 100% rename from packs/macros_hotbar_0e/000004.log rename to packs/conditions_1e/000027.log diff --git a/packs/conditions_1e/CURRENT b/packs/conditions_1e/CURRENT index 1a84852..8b15215 100644 --- a/packs/conditions_1e/CURRENT +++ b/packs/conditions_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/conditions_1e/LOG b/packs/conditions_1e/LOG index d8d3675..7c11d79 100644 --- a/packs/conditions_1e/LOG +++ b/packs/conditions_1e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.400 1714 Delete type=3 #1 -2024/01/19-14:45:12.038 3978 Level-0 table #5: started -2024/01/19-14:45:12.041 3978 Level-0 table #5: 14495 bytes OK -2024/01/19-14:45:12.042 3978 Delete type=0 #3 -2024/01/19-14:45:12.042 3978 Manual compaction at level-0 from '!items!0ZAwhewvLBwX3opf' @ 72057594037927935 : 1 .. '!items!z0avrplKe6M0RcXk' @ 0 : 0; will stop at (end) +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 diff --git a/packs/conditions_1e/LOG.old b/packs/conditions_1e/LOG.old new file mode 100644 index 0000000..1b9f9ee --- /dev/null +++ b/packs/conditions_1e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.325 1d1c Recovering log #20 +2024/01/22-17:35:33.347 1d1c Delete type=0 #20 +2024/01/22-17:35:33.347 1d1c Delete type=3 #18 +2024/01/22-19:59:12.455 7e04 Level-0 table #25: started +2024/01/22-19:59:12.455 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.462 7e04 Delete type=0 #23 +2024/01/22-19:59:12.475 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-000026 b/packs/conditions_1e/MANIFEST-000026 new file mode 100644 index 0000000..2a57cd1 Binary files /dev/null and b/packs/conditions_1e/MANIFEST-000026 differ diff --git a/packs/macros_hotbar_1e/000004.log b/packs/conditions_1e/lost/000004.log similarity index 100% rename from packs/macros_hotbar_1e/000004.log rename to packs/conditions_1e/lost/000004.log diff --git a/packs/conditions_1e/MANIFEST-000002 b/packs/conditions_1e/lost/MANIFEST-000002 similarity index 100% rename from packs/conditions_1e/MANIFEST-000002 rename to packs/conditions_1e/lost/MANIFEST-000002 diff --git a/packs/macros_hotbar_0e/000005.ldb b/packs/macros_hotbar_0e/000013.ldb similarity index 100% rename from packs/macros_hotbar_0e/000005.ldb rename to packs/macros_hotbar_0e/000013.ldb diff --git a/packs/macros_triggered_0e/000004.log b/packs/macros_hotbar_0e/000027.log similarity index 100% rename from packs/macros_triggered_0e/000004.log rename to packs/macros_hotbar_0e/000027.log diff --git a/packs/macros_hotbar_0e/CURRENT b/packs/macros_hotbar_0e/CURRENT index 1a84852..8b15215 100644 --- a/packs/macros_hotbar_0e/CURRENT +++ b/packs/macros_hotbar_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/macros_hotbar_0e/LOG b/packs/macros_hotbar_0e/LOG index 713063a..1730e7e 100644 --- a/packs/macros_hotbar_0e/LOG +++ b/packs/macros_hotbar_0e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.571 481c Delete type=3 #1 -2024/01/19-14:45:12.073 3978 Level-0 table #5: started -2024/01/19-14:45:12.075 3978 Level-0 table #5: 13847 bytes OK -2024/01/19-14:45:12.076 3978 Delete type=0 #3 -2024/01/19-14:45:12.086 3978 Manual compaction at level-0 from '!macros!2xRvRAixuocjCm40' @ 72057594037927935 : 1 .. '!macros!ilBclUmPwcd7aNQK' @ 0 : 0; will stop at (end) +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 diff --git a/packs/macros_hotbar_0e/LOG.old b/packs/macros_hotbar_0e/LOG.old new file mode 100644 index 0000000..f19d5c2 --- /dev/null +++ b/packs/macros_hotbar_0e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.381 3a24 Recovering log #20 +2024/01/22-17:35:33.400 3a24 Delete type=0 #20 +2024/01/22-17:35:33.400 3a24 Delete type=3 #18 +2024/01/22-19:59:12.494 7e04 Level-0 table #25: started +2024/01/22-19:59:12.494 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.500 7e04 Delete type=0 #23 +2024/01/22-19:59:12.513 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-000026 b/packs/macros_hotbar_0e/MANIFEST-000026 new file mode 100644 index 0000000..67b3052 Binary files /dev/null and b/packs/macros_hotbar_0e/MANIFEST-000026 differ diff --git a/packs/macros_triggered_1e/000004.log b/packs/macros_hotbar_0e/lost/000004.log similarity index 100% rename from packs/macros_triggered_1e/000004.log rename to packs/macros_hotbar_0e/lost/000004.log diff --git a/packs/macros_hotbar_0e/MANIFEST-000002 b/packs/macros_hotbar_0e/lost/MANIFEST-000002 similarity index 100% rename from packs/macros_hotbar_0e/MANIFEST-000002 rename to packs/macros_hotbar_0e/lost/MANIFEST-000002 diff --git a/packs/macros_hotbar_1e/000005.ldb b/packs/macros_hotbar_1e/000013.ldb similarity index 100% rename from packs/macros_hotbar_1e/000005.ldb rename to packs/macros_hotbar_1e/000013.ldb diff --git a/packs/rolltables_0e/000004.log b/packs/macros_hotbar_1e/000027.log similarity index 100% rename from packs/rolltables_0e/000004.log rename to packs/macros_hotbar_1e/000027.log diff --git a/packs/macros_hotbar_1e/CURRENT b/packs/macros_hotbar_1e/CURRENT index 1a84852..8b15215 100644 --- a/packs/macros_hotbar_1e/CURRENT +++ b/packs/macros_hotbar_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/macros_hotbar_1e/LOG b/packs/macros_hotbar_1e/LOG index 992f1c7..f37ab38 100644 --- a/packs/macros_hotbar_1e/LOG +++ b/packs/macros_hotbar_1e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.433 481c Delete type=3 #1 -2024/01/19-14:45:12.052 3978 Level-0 table #5: started -2024/01/19-14:45:12.054 3978 Level-0 table #5: 17699 bytes OK -2024/01/19-14:45:12.055 3978 Delete type=0 #3 -2024/01/19-14:45:12.065 3978 Manual compaction at level-0 from '!macros!2u4a5gEogtLd3XQz' @ 72057594037927935 : 1 .. '!macros!trU0DtBJvJCPddsQ' @ 0 : 0; will stop at (end) +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 diff --git a/packs/macros_hotbar_1e/LOG.old b/packs/macros_hotbar_1e/LOG.old new file mode 100644 index 0000000..ba6c937 --- /dev/null +++ b/packs/macros_hotbar_1e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.325 809c Recovering log #20 +2024/01/22-17:35:33.347 809c Delete type=0 #20 +2024/01/22-17:35:33.347 809c Delete type=3 #18 +2024/01/22-19:59:12.469 7e04 Level-0 table #25: started +2024/01/22-19:59:12.469 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.475 7e04 Delete type=0 #23 +2024/01/22-19:59:12.475 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-000026 b/packs/macros_hotbar_1e/MANIFEST-000026 new file mode 100644 index 0000000..97e64f9 Binary files /dev/null and b/packs/macros_hotbar_1e/MANIFEST-000026 differ diff --git a/packs/rolltables_1e/000004.log b/packs/macros_hotbar_1e/lost/000004.log similarity index 100% rename from packs/rolltables_1e/000004.log rename to packs/macros_hotbar_1e/lost/000004.log diff --git a/packs/macros_hotbar_1e/MANIFEST-000002 b/packs/macros_hotbar_1e/lost/MANIFEST-000002 similarity index 100% rename from packs/macros_hotbar_1e/MANIFEST-000002 rename to packs/macros_hotbar_1e/lost/MANIFEST-000002 diff --git a/packs/macros_triggered_0e/000005.ldb b/packs/macros_triggered_0e/000013.ldb similarity index 100% rename from packs/macros_triggered_0e/000005.ldb rename to packs/macros_triggered_0e/000013.ldb diff --git a/packs/macros_triggered_0e/000027.log b/packs/macros_triggered_0e/000027.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/macros_triggered_0e/CURRENT b/packs/macros_triggered_0e/CURRENT index 1a84852..8b15215 100644 --- a/packs/macros_triggered_0e/CURRENT +++ b/packs/macros_triggered_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/macros_triggered_0e/LOG b/packs/macros_triggered_0e/LOG index 5018404..e0fc820 100644 --- a/packs/macros_triggered_0e/LOG +++ b/packs/macros_triggered_0e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.602 1714 Delete type=3 #1 -2024/01/19-14:45:12.077 3978 Level-0 table #5: started -2024/01/19-14:45:12.079 3978 Level-0 table #5: 14286 bytes OK -2024/01/19-14:45:12.081 3978 Delete type=0 #3 -2024/01/19-14:45:12.087 3978 Manual compaction at level-0 from '!macros!0Yw4QWSAeOuUzRqB' @ 72057594037927935 : 1 .. '!macros!z5V92LyXHjfMxnRQ' @ 0 : 0; will stop at (end) +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 diff --git a/packs/macros_triggered_0e/LOG.old b/packs/macros_triggered_0e/LOG.old new file mode 100644 index 0000000..2b679ce --- /dev/null +++ b/packs/macros_triggered_0e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.403 3a24 Recovering log #20 +2024/01/22-17:35:33.425 3a24 Delete type=0 #20 +2024/01/22-17:35:33.425 3a24 Delete type=3 #18 +2024/01/22-19:59:12.542 7e04 Level-0 table #25: started +2024/01/22-19:59:12.542 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.559 7e04 Delete type=0 #23 +2024/01/22-19:59:12.559 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-000026 b/packs/macros_triggered_0e/MANIFEST-000026 new file mode 100644 index 0000000..fd6e272 Binary files /dev/null and b/packs/macros_triggered_0e/MANIFEST-000026 differ diff --git a/packs/macros_triggered_0e/lost/000004.log b/packs/macros_triggered_0e/lost/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/macros_triggered_0e/MANIFEST-000002 b/packs/macros_triggered_0e/lost/MANIFEST-000002 similarity index 100% rename from packs/macros_triggered_0e/MANIFEST-000002 rename to packs/macros_triggered_0e/lost/MANIFEST-000002 diff --git a/packs/macros_triggered_1e/000005.ldb b/packs/macros_triggered_1e/000013.ldb similarity index 100% rename from packs/macros_triggered_1e/000005.ldb rename to packs/macros_triggered_1e/000013.ldb diff --git a/packs/macros_triggered_1e/000027.log b/packs/macros_triggered_1e/000027.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/macros_triggered_1e/CURRENT b/packs/macros_triggered_1e/CURRENT index 1a84852..8b15215 100644 --- a/packs/macros_triggered_1e/CURRENT +++ b/packs/macros_triggered_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/macros_triggered_1e/LOG b/packs/macros_triggered_1e/LOG index 1604664..6af984c 100644 --- a/packs/macros_triggered_1e/LOG +++ b/packs/macros_triggered_1e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.465 1714 Delete type=3 #1 -2024/01/19-14:45:12.055 3978 Level-0 table #5: started -2024/01/19-14:45:12.058 3978 Level-0 table #5: 18692 bytes OK -2024/01/19-14:45:12.059 3978 Delete type=0 #3 -2024/01/19-14:45:12.065 3978 Manual compaction at level-0 from '!macros!06j3tzX29f4pwYwh' @ 72057594037927935 : 1 .. '!macros!zLRsweb35Lw0NMev' @ 0 : 0; will stop at (end) +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 diff --git a/packs/macros_triggered_1e/LOG.old b/packs/macros_triggered_1e/LOG.old new file mode 100644 index 0000000..2a3e0e1 --- /dev/null +++ b/packs/macros_triggered_1e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.350 809c Recovering log #20 +2024/01/22-17:35:33.372 809c Delete type=0 #20 +2024/01/22-17:35:33.373 809c Delete type=3 #18 +2024/01/22-19:59:12.462 7e04 Level-0 table #25: started +2024/01/22-19:59:12.463 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.469 7e04 Delete type=0 #23 +2024/01/22-19:59:12.475 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-000026 b/packs/macros_triggered_1e/MANIFEST-000026 new file mode 100644 index 0000000..ab7bbaa Binary files /dev/null and b/packs/macros_triggered_1e/MANIFEST-000026 differ diff --git a/packs/macros_triggered_1e/lost/000004.log b/packs/macros_triggered_1e/lost/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/macros_triggered_1e/MANIFEST-000002 b/packs/macros_triggered_1e/lost/MANIFEST-000002 similarity index 100% rename from packs/macros_triggered_1e/MANIFEST-000002 rename to packs/macros_triggered_1e/lost/MANIFEST-000002 diff --git a/packs/rolltables_0e/000005.ldb b/packs/rolltables_0e/000013.ldb similarity index 100% rename from packs/rolltables_0e/000005.ldb rename to packs/rolltables_0e/000013.ldb diff --git a/packs/rolltables_0e/000027.log b/packs/rolltables_0e/000027.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/rolltables_0e/CURRENT b/packs/rolltables_0e/CURRENT index 1a84852..8b15215 100644 --- a/packs/rolltables_0e/CURRENT +++ b/packs/rolltables_0e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/rolltables_0e/LOG b/packs/rolltables_0e/LOG index b566750..d3c8233 100644 --- a/packs/rolltables_0e/LOG +++ b/packs/rolltables_0e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.634 481c Delete type=3 #1 -2024/01/19-14:45:12.081 3978 Level-0 table #5: started -2024/01/19-14:45:12.084 3978 Level-0 table #5: 23482 bytes OK -2024/01/19-14:45:12.086 3978 Delete type=0 #3 -2024/01/19-14:45:12.087 3978 Manual compaction at level-0 from '!tables!1vCm4ElRPotQXgNB' @ 72057594037927935 : 1 .. '!tables.results!kqKpQAXyLTEEyz6Z.xdwwswzfoPuVifvw' @ 0 : 0; will stop at (end) +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 diff --git a/packs/rolltables_0e/LOG.old b/packs/rolltables_0e/LOG.old new file mode 100644 index 0000000..24db023 --- /dev/null +++ b/packs/rolltables_0e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.404 1d1c Recovering log #20 +2024/01/22-17:35:33.424 1d1c Delete type=0 #20 +2024/01/22-17:35:33.425 1d1c Delete type=3 #18 +2024/01/22-19:59:12.522 7e04 Level-0 table #25: started +2024/01/22-19:59:12.522 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.542 7e04 Delete type=0 #23 +2024/01/22-19:59:12.559 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-000026 b/packs/rolltables_0e/MANIFEST-000026 new file mode 100644 index 0000000..5749c09 Binary files /dev/null and b/packs/rolltables_0e/MANIFEST-000026 differ diff --git a/packs/rolltables_0e/lost/000004.log b/packs/rolltables_0e/lost/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/rolltables_0e/MANIFEST-000002 b/packs/rolltables_0e/lost/MANIFEST-000002 similarity index 100% rename from packs/rolltables_0e/MANIFEST-000002 rename to packs/rolltables_0e/lost/MANIFEST-000002 diff --git a/packs/rolltables_1e/000005.ldb b/packs/rolltables_1e/000013.ldb similarity index 100% rename from packs/rolltables_1e/000005.ldb rename to packs/rolltables_1e/000013.ldb diff --git a/packs/rolltables_1e/000027.log b/packs/rolltables_1e/000027.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/rolltables_1e/CURRENT b/packs/rolltables_1e/CURRENT index 1a84852..8b15215 100644 --- a/packs/rolltables_1e/CURRENT +++ b/packs/rolltables_1e/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000026 diff --git a/packs/rolltables_1e/LOG b/packs/rolltables_1e/LOG index 5d628e7..e4eb923 100644 --- a/packs/rolltables_1e/LOG +++ b/packs/rolltables_1e/LOG @@ -1,5 +1,3 @@ -2024/01/19-14:44:37.498 481c Delete type=3 #1 -2024/01/19-14:45:12.059 3978 Level-0 table #5: started -2024/01/19-14:45:12.064 3978 Level-0 table #5: 47846 bytes OK -2024/01/19-14:45:12.065 3978 Delete type=0 #3 -2024/01/19-14:45:12.073 3978 Manual compaction at level-0 from '!tables!31YibfjueXuZdNLb' @ 72057594037927935 : 1 .. '!tables.results!ypcoikqHLhnc9tNs.zJkYrssfrdWBSeRm' @ 0 : 0; will stop at (end) +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 diff --git a/packs/rolltables_1e/LOG.old b/packs/rolltables_1e/LOG.old new file mode 100644 index 0000000..f8590a1 --- /dev/null +++ b/packs/rolltables_1e/LOG.old @@ -0,0 +1,7 @@ +2024/01/22-17:35:33.351 5104 Recovering log #20 +2024/01/22-17:35:33.378 5104 Delete type=0 #20 +2024/01/22-17:35:33.378 5104 Delete type=3 #18 +2024/01/22-19:59:12.507 7e04 Level-0 table #25: started +2024/01/22-19:59:12.507 7e04 Level-0 table #25: 0 bytes OK +2024/01/22-19:59:12.513 7e04 Delete type=0 #23 +2024/01/22-19:59:12.513 7e04 Manual compaction at level-0 from '!tables!31YibfjueXuZdNLb' @ 72057594037927935 : 1 .. '!tables.results!ypcoikqHLhnc9tNs.zJkYrssfrdWBSeRm' @ 0 : 0; will stop at (end) diff --git a/packs/rolltables_1e/MANIFEST-000026 b/packs/rolltables_1e/MANIFEST-000026 new file mode 100644 index 0000000..1619f13 Binary files /dev/null and b/packs/rolltables_1e/MANIFEST-000026 differ diff --git a/packs/rolltables_1e/lost/000004.log b/packs/rolltables_1e/lost/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/rolltables_1e/MANIFEST-000002 b/packs/rolltables_1e/lost/MANIFEST-000002 similarity index 100% rename from packs/rolltables_1e/MANIFEST-000002 rename to packs/rolltables_1e/lost/MANIFEST-000002 diff --git a/template.json b/template.json index dfdc9bd..3561183 100644 --- a/template.json +++ b/template.json @@ -221,6 +221,7 @@ "layout" : "systems/mosh/images/Galloway_Top.png", "beauty" : "systems/mosh/images/Galloway_Top.png" }, + "runSetup" : true, "stats": { "armor": { "value": 10, @@ -270,6 +271,13 @@ "max": 99, "label": "Systems", "rollLabel": "Systems Save" + }, + "bankruptcy": { + "value": 10, + "min": 0, + "max": 99, + "label": "Bankruptcy", + "rollLabel": "Bankruptcy Save" } }, "supplies": { diff --git a/templates/actor/ship-sheet-sbt.html b/templates/actor/ship-sheet-sbt.html index ef84a24..7178a41 100644 --- a/templates/actor/ship-sheet-sbt.html +++ b/templates/actor/ship-sheet-sbt.html @@ -3,22 +3,37 @@
-
+
- -
+ +
SHIP IDENTIFIER
+ + +
Transponder
+ +
+ +
+ + + + +
-
Stats & Saves
+ + +
@@ -266,6 +285,10 @@ {{!-- Biography Tab --}}
+ +
+ +
{{editor system.biography target="system.biography" button=true owner=owner editable=true}}
diff --git a/templates/dialogs/ship-macro-dialog.html b/templates/dialogs/ship-macro-dialog.html new file mode 100644 index 0000000..c1f4e6c --- /dev/null +++ b/templates/dialogs/ship-macro-dialog.html @@ -0,0 +1,62 @@ +
+
+ +
+ +
+
+
{{actor.name}}
+
+ +
+
Ship Macros
+ + +
Distress Signal
+ + +
Morale Check
+
+ +
+ +
+
Maintenance & Repairs
+ +
Maintenance Check
+ +
Roll Starting Condition
+
+ +
+ + +
+
Bankruptcy
+ + +
+ +
+
+ Bankruptcy Save +
+ + +
Bankruptcy Check
+
+ +
+ +
+ +
Open Deckplan
+
+ +
+ +
CLOSE MENU
+ +
\ No newline at end of file diff --git a/templates/dialogs/ship-setup-dialog.html b/templates/dialogs/ship-setup-dialog.html new file mode 100644 index 0000000..7c36e6b --- /dev/null +++ b/templates/dialogs/ship-setup-dialog.html @@ -0,0 +1,34 @@ +
+
+ +
+ +
+
+ +
+
Ship Setup
+ +
Roll Starting Condition
+ +
FINISH
+ +
+ + + + + + + + + +
\ No newline at end of file