diff --git a/lang/en.json b/lang/en.json index dd3e162..5a69932 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1,6 +1,7 @@ { "ACTOR": { - "TypeCharacter": "Character" + "TypeCharacter": "Character", + "TypeMinion": "Minion" }, "ITEM": { "TypeSkill": "Skill", diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js index 8a6a91d..4f55840 100644 --- a/modules/hero6-actor-sheet.js +++ b/modules/hero6-actor-sheet.js @@ -89,9 +89,9 @@ export class Hero6ActorSheet extends ActorSheet { // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; - html.bind("keydown", function(e) { // Ignore Enter in actores sheet + /*html.bind("keydown", function(e) { // Ignore Enter in actores sheet if (e.keyCode === 13) return false; - }); + });*/ // Update Inventory Item html.find('.item-edit').click(ev => { diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index 9a72b7a..0a0f274 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -4,7 +4,7 @@ import { Hero6RollDialog } from "./hero6-roll-dialog.js"; import { Hero6LiftDice } from "./hero6-lift-dice.js"; /* -------------------------------------------- */ -const __speed2Segments = [ [0], [7], [6, 12], [4, 8, 12], [3, 6, 9, 12], [3, 5, 8, 10, 12], [2, 4, 6, 8, 10, 12], +const __speed2Segments = [[0], [7], [6, 12], [4, 8, 12], [3, 6, 9, 12], [3, 5, 8, 10, 12], [2, 4, 6, 8, 10, 12], [2, 4, 6, 7, 9, 11, 12], [2, 3, 5, 6, 8, 9, 11, 12], [2, 3, 4, 6, 7, 8, 10, 11, 12], [2, 3, 4, 5, 6, 8, 9, 10, 11, 12], [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]] @@ -40,12 +40,10 @@ export class Hero6Actor extends Actor { return actor; } - if (data.type == 'character') { + if (data.type == 'character' || data.type == 'minion') { const maneuvers = await Hero6Utility.loadCompendium("fvtt-hero-system-6.maneuvers") let maneuversObj = maneuvers.map(i => i.toObject()) - data.items = maneuversObj.filter(m => m.system.isstock) - } - if (data.type == 'npc') { + data.items = maneuversObj.filter(m => m.system.isstock) } return super.create(data, options); @@ -62,14 +60,11 @@ export class Hero6Actor extends Actor { /* -------------------------------------------- */ computeDerivatedData() { - if (this.type == "character") { - let newSTREND = this.computeSTREND() - if (newSTREND != this.system.characteristics.str.strend) { - this.update({ 'system.characteristics.str.strend': newSTREND }) - } + let newSTREND = this.computeSTREND() + if (newSTREND != this.system.characteristics.str.strend) { + this.update({ 'system.characteristics.str.strend': newSTREND }) } } - /* -------------------------------------------- */ performMigration() { // Fix OCV/OMCV rollable @@ -172,6 +167,19 @@ export class Hero6Actor extends Actor { } return item; } + + /* -------------------------------------------- */ + async _preCreate(data, options, user) { + await super._preCreate(data, options, user); + + // Configure prototype token settings + const prototypeToken = {}; + if (this.type === "character") Object.assign(prototypeToken, { + sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY + }); + this.updateSource({ prototypeToken }); + } + /* -------------------------------------------- */ prepareSkill(skill) { skill.roll = 0 @@ -213,12 +221,12 @@ export class Hero6Actor extends Actor { skill.roll += skill.system.levels } } - + /* -------------------------------------------- */ prepareManeuver(maneuver) { - + maneuver.roll = 11 + this.system.characteristics.ocv.value - if ( Number(maneuver.system.ocv)) { + if (Number(maneuver.system.ocv)) { maneuver.roll += Number(maneuver.system.ocv) } else { maneuver.noOCV = true @@ -408,7 +416,7 @@ export class Hero6Actor extends Actor { /* -------------------------------------------- */ async cleanCombat() { await this.setFlag("world", "hold-action", false) - await this.setFlag("world", "abort-action", { state: false, count: 0 } ) + await this.setFlag("world", "abort-action", { state: false, count: 0 }) } async holdAction() { await this.disableAbortAction() @@ -481,7 +489,7 @@ export class Hero6Actor extends Actor { } /* -------------------------------------------- */ getBaseInit(turn) { - if ( turn != this.turn) { + if (turn != this.turn) { let r = new Roll("1d6").roll({ async: false }) this.currentInit = Number(this.system.characteristics.dex.initiative) + Number(((r.total / 10).toFixed(2))) this.turn = turn @@ -516,8 +524,13 @@ export class Hero6Actor extends Actor { /* -------------------------------------------- */ prepareCharacValues(charac) { - charac.total = charac.value - charac.roll = 9 + Math.round((charac.value) / 5) + if (charac.label == "OCV" || charac.label == "OMCV" ) { + charac.total = charac.value + charac.roll = 11 + charac.value + } else { + charac.total = charac.value + charac.roll = 9 + Math.round((charac.value) / 5) + } } prepareCharac() { let characs = duplicate(this.system.characteristics) @@ -531,7 +544,7 @@ export class Hero6Actor extends Actor { if (key == "spd") { ch.phasesString = this.getPhasesString() } - if (key =="pre") { + if (key == "pre") { ch.presenceattack = duplicate(this.system.biodata.presenceattack) } } diff --git a/modules/hero6-config.js b/modules/hero6-config.js index 421a617..870a8ad 100644 --- a/modules/hero6-config.js +++ b/modules/hero6-config.js @@ -53,6 +53,5 @@ export const Hero6_CONFIG = { "standard": "Standard", "normal": "Normal", "killing": "Killing", - "countbody": "Killing (Count BODY)" } } \ No newline at end of file diff --git a/modules/hero6-main.js b/modules/hero6-main.js index 9e80d5a..c20d5af 100644 --- a/modules/hero6-main.js +++ b/modules/hero6-main.js @@ -61,7 +61,7 @@ Hooks.once("init", async function () { // Register sheet application classes Actors.unregisterSheet("core", ActorSheet); Actors.registerSheet("fvtt-hero-system-6", Hero6ActorSheet, { types: ["character"], makeDefault: true }); - Actors.registerSheet("fvtt-hero-system-6", Hero6NPCSheet, { types: ["npc"], makeDefault: false }); + Actors.registerSheet("fvtt-hero-system-6", Hero6ActorSheet, { types: ["minion"], makeDefault: false }); Items.unregisterSheet("core", ItemSheet); Items.registerSheet("fvtt-hero-system-6", Hero6ItemSheet, { makeDefault: true }); diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index 77856c2..86c4b2f 100644 --- a/modules/hero6-utility.js +++ b/modules/hero6-utility.js @@ -355,7 +355,7 @@ export class Hero6Utility { let myRoll = rollData.roll if (!myRoll) { // New rolls only of no rerolls myRoll = new Roll(diceFormula).roll({ async: false }) - await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) + //await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) } rollData.roll = myRoll diff --git a/packs/complications/000048.log b/packs/complications/000060.log similarity index 100% rename from packs/complications/000048.log rename to packs/complications/000060.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index a6d5883..717cf9a 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/complications/LOG b/packs/complications/LOG index 5272b24..8d54d52 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -2023/08/08-08:16:25.461187 7f5afd5f96c0 Recovering log #44 -2023/08/08-08:16:25.474679 7f5afd5f96c0 Delete type=3 #42 -2023/08/08-08:16:25.474715 7f5afd5f96c0 Delete type=0 #44 -2023/08/08-08:17:06.635707 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.635749 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.642802 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.643044 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/08-08:17:06.643110 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.525679 7fd68effd6c0 Recovering log #56 +2023/08/09-17:36:56.535383 7fd68effd6c0 Delete type=3 #54 +2023/08/09-17:36:56.535430 7fd68effd6c0 Delete type=0 #56 +2023/08/09-18:04:36.774987 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.775008 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/09-18:04:36.782936 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.793638 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/09-18:04:36.811250 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/LOG.old b/packs/complications/LOG.old index dcbf876..af5133f 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/07-22:18:14.000526 7f5afddfa6c0 Recovering log #40 -2023/08/07-22:18:14.012956 7f5afddfa6c0 Delete type=3 #38 -2023/08/07-22:18:14.012989 7f5afddfa6c0 Delete type=0 #40 -2023/08/07-23:27:51.013130 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:51.013173 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:51.019258 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:51.040432 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/07-23:27:51.040586 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.648635 7fd68effd6c0 Recovering log #52 +2023/08/09-17:27:09.658994 7fd68effd6c0 Delete type=3 #50 +2023/08/09-17:27:09.659039 7fd68effd6c0 Delete type=0 #52 +2023/08/09-17:29:29.520479 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.520509 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.529670 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.539844 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/09-17:29:29.547593 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/MANIFEST-000046 b/packs/complications/MANIFEST-000046 deleted file mode 100644 index b2e61cc..0000000 Binary files a/packs/complications/MANIFEST-000046 and /dev/null differ diff --git a/packs/complications/MANIFEST-000058 b/packs/complications/MANIFEST-000058 new file mode 100644 index 0000000..a0d18e2 Binary files /dev/null and b/packs/complications/MANIFEST-000058 differ diff --git a/packs/equipment/000048.log b/packs/equipment/000060.log similarity index 100% rename from packs/equipment/000048.log rename to packs/equipment/000060.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index a6d5883..717cf9a 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index f7e8db8..144b2f6 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2023/08/08-08:16:25.435366 7f5afcdf86c0 Recovering log #44 -2023/08/08-08:16:25.445289 7f5afcdf86c0 Delete type=3 #42 -2023/08/08-08:16:25.445363 7f5afcdf86c0 Delete type=0 #44 -2023/08/08-08:17:06.600288 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.600344 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.607987 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.615309 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.500479 7fd68f7fe6c0 Recovering log #56 +2023/08/09-17:36:56.510083 7fd68f7fe6c0 Delete type=3 #54 +2023/08/09-17:36:56.510136 7fd68f7fe6c0 Delete type=0 #56 +2023/08/09-18:04:36.702663 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.702688 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/09-18:04:36.708826 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.722473 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index 5a59311..5dc5f3e 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/08/07-22:18:13.969369 7f5afd5f96c0 Recovering log #40 -2023/08/07-22:18:13.978774 7f5afd5f96c0 Delete type=3 #38 -2023/08/07-22:18:13.978872 7f5afd5f96c0 Delete type=0 #40 -2023/08/07-23:27:50.976450 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:50.976502 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:50.982719 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:50.982828 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.618201 7fd68effd6c0 Recovering log #52 +2023/08/09-17:27:09.627459 7fd68effd6c0 Delete type=3 #50 +2023/08/09-17:27:09.627506 7fd68effd6c0 Delete type=0 #52 +2023/08/09-17:29:29.469685 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.469729 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.482821 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.493207 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000046 b/packs/equipment/MANIFEST-000046 deleted file mode 100644 index 5a5e24b..0000000 Binary files a/packs/equipment/MANIFEST-000046 and /dev/null differ diff --git a/packs/equipment/MANIFEST-000058 b/packs/equipment/MANIFEST-000058 new file mode 100644 index 0000000..51e4570 Binary files /dev/null and b/packs/equipment/MANIFEST-000058 differ diff --git a/packs/maneuvers/000040.log b/packs/maneuvers/000052.log similarity index 100% rename from packs/maneuvers/000040.log rename to packs/maneuvers/000052.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 59611b0..7570f19 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000050 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 152e1d9..1ec32a1 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,8 +1,8 @@ -2023/08/08-08:16:25.461251 7f5afddfa6c0 Recovering log #36 -2023/08/08-08:16:25.477680 7f5afddfa6c0 Delete type=3 #34 -2023/08/08-08:16:25.477718 7f5afddfa6c0 Delete type=0 #36 -2023/08/08-08:17:06.629201 7f58677fe6c0 Level-0 table #41: started -2023/08/08-08:17:06.629246 7f58677fe6c0 Level-0 table #41: 0 bytes OK -2023/08/08-08:17:06.635576 7f58677fe6c0 Delete type=0 #39 -2023/08/08-08:17:06.643022 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/08-08:17:06.643086 7f58677fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.525719 7fd68f7fe6c0 Recovering log #48 +2023/08/09-17:36:56.535384 7fd68f7fe6c0 Delete type=3 #46 +2023/08/09-17:36:56.535433 7fd68f7fe6c0 Delete type=0 #48 +2023/08/09-18:04:36.783105 7fd40dfff6c0 Level-0 table #53: started +2023/08/09-18:04:36.783138 7fd40dfff6c0 Level-0 table #53: 0 bytes OK +2023/08/09-18:04:36.793290 7fd40dfff6c0 Delete type=0 #51 +2023/08/09-18:04:36.793703 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/09-18:04:36.811271 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index 5b8c321..bd96c66 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,8 +1,8 @@ -2023/08/07-22:18:14.000527 7f5afd5f96c0 Recovering log #32 -2023/08/07-22:18:14.012956 7f5afd5f96c0 Delete type=3 #30 -2023/08/07-22:18:14.012992 7f5afd5f96c0 Delete type=0 #32 -2023/08/07-23:27:51.026690 7f58677fe6c0 Level-0 table #37: started -2023/08/07-23:27:51.026730 7f58677fe6c0 Level-0 table #37: 0 bytes OK -2023/08/07-23:27:51.033892 7f58677fe6c0 Delete type=0 #35 -2023/08/07-23:27:51.040520 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/07-23:27:51.040625 7f58677fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.648635 7fd6a4bfa6c0 Recovering log #44 +2023/08/09-17:27:09.658995 7fd6a4bfa6c0 Delete type=3 #42 +2023/08/09-17:27:09.659044 7fd6a4bfa6c0 Delete type=0 #44 +2023/08/09-17:29:29.539858 7fd40dfff6c0 Level-0 table #49: started +2023/08/09-17:29:29.539899 7fd40dfff6c0 Level-0 table #49: 0 bytes OK +2023/08/09-17:29:29.547399 7fd40dfff6c0 Delete type=0 #47 +2023/08/09-17:29:29.547606 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/09-17:29:29.547629 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000038 b/packs/maneuvers/MANIFEST-000038 deleted file mode 100644 index 34ac8e0..0000000 Binary files a/packs/maneuvers/MANIFEST-000038 and /dev/null differ diff --git a/packs/maneuvers/MANIFEST-000050 b/packs/maneuvers/MANIFEST-000050 new file mode 100644 index 0000000..b07d2e0 Binary files /dev/null and b/packs/maneuvers/MANIFEST-000050 differ diff --git a/packs/perks/000048.log b/packs/perks/000060.log similarity index 100% rename from packs/perks/000048.log rename to packs/perks/000060.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index a6d5883..717cf9a 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/perks/LOG b/packs/perks/LOG index 5b77949..8daff3a 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,8 +1,8 @@ -2023/08/08-08:16:25.476569 7f5afd5f96c0 Recovering log #44 -2023/08/08-08:16:25.493410 7f5afd5f96c0 Delete type=3 #42 -2023/08/08-08:16:25.493503 7f5afd5f96c0 Delete type=0 #44 -2023/08/08-08:17:06.643184 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.643236 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.650531 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.658850 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/08-08:17:06.658878 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.538368 7fd6a4bfa6c0 Recovering log #56 +2023/08/09-17:36:56.547813 7fd6a4bfa6c0 Delete type=3 #54 +2023/08/09-17:36:56.547848 7fd6a4bfa6c0 Delete type=0 #56 +2023/08/09-18:04:36.811286 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.811321 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/09-18:04:36.820964 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.833270 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/09-18:04:36.833326 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/LOG.old b/packs/perks/LOG.old index 3b9ec1c..8eb4d48 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/08/07-22:18:14.015482 7f5afcdf86c0 Recovering log #40 -2023/08/07-22:18:14.031405 7f5afcdf86c0 Delete type=3 #38 -2023/08/07-22:18:14.031513 7f5afcdf86c0 Delete type=0 #40 -2023/08/07-23:27:51.019445 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:51.019492 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:51.026550 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:51.040470 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/07-23:27:51.040607 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.660978 7fd68ffff6c0 Recovering log #52 +2023/08/09-17:27:09.674173 7fd68ffff6c0 Delete type=3 #50 +2023/08/09-17:27:09.674217 7fd68ffff6c0 Delete type=0 #52 +2023/08/09-17:29:29.556174 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.556203 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.562869 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.563055 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/09-17:29:29.563076 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/MANIFEST-000046 b/packs/perks/MANIFEST-000046 deleted file mode 100644 index 8f09c20..0000000 Binary files a/packs/perks/MANIFEST-000046 and /dev/null differ diff --git a/packs/perks/MANIFEST-000058 b/packs/perks/MANIFEST-000058 new file mode 100644 index 0000000..01275a0 Binary files /dev/null and b/packs/perks/MANIFEST-000058 differ diff --git a/packs/powers/000013.ldb b/packs/powers/000013.ldb deleted file mode 100644 index 07ff0b9..0000000 Binary files a/packs/powers/000013.ldb and /dev/null differ diff --git a/packs/powers/000048.log b/packs/powers/000060.log similarity index 100% rename from packs/powers/000048.log rename to packs/powers/000060.log diff --git a/packs/powers/000062.ldb b/packs/powers/000062.ldb new file mode 100644 index 0000000..c52d61d Binary files /dev/null and b/packs/powers/000062.ldb differ diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index a6d5883..717cf9a 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/powers/LOG b/packs/powers/LOG index b83c860..39d6876 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,15 @@ -2023/08/08-08:16:25.447883 7f5afddfa6c0 Recovering log #44 -2023/08/08-08:16:25.457469 7f5afddfa6c0 Delete type=3 #42 -2023/08/08-08:16:25.457528 7f5afddfa6c0 Delete type=0 #44 -2023/08/08-08:17:06.621801 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.621842 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.629025 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.642970 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/08-08:17:06.643067 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.512176 7fd68f7fe6c0 Recovering log #56 +2023/08/09-17:36:56.522559 7fd68f7fe6c0 Delete type=3 #54 +2023/08/09-17:36:56.522611 7fd68f7fe6c0 Delete type=0 #56 +2023/08/09-18:04:36.761906 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.767245 7fd40dfff6c0 Level-0 table #61: 68363 bytes OK +2023/08/09-18:04:36.774842 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.793538 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/09-18:04:36.793752 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at '!items!zpF2QY4tx7qdBomQ' @ 102 : 1 +2023/08/09-18:04:36.793773 7fd40dfff6c0 Compacting 1@1 + 1@2 files +2023/08/09-18:04:36.800168 7fd40dfff6c0 Generated table #62@1: 51 keys, 68363 bytes +2023/08/09-18:04:36.800231 7fd40dfff6c0 Compacted 1@1 + 1@2 files => 68363 bytes +2023/08/09-18:04:36.810747 7fd40dfff6c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2023/08/09-18:04:36.810965 7fd40dfff6c0 Delete type=2 #13 +2023/08/09-18:04:36.811159 7fd40dfff6c0 Delete type=2 #61 +2023/08/09-18:04:36.821156 7fd40dfff6c0 Manual compaction at level-1 from '!items!zpF2QY4tx7qdBomQ' @ 102 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/LOG.old b/packs/powers/LOG.old index 6241a04..e4cb7f5 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/07-22:18:13.982354 7f5afd5f96c0 Recovering log #40 -2023/08/07-22:18:13.997957 7f5afd5f96c0 Delete type=3 #38 -2023/08/07-22:18:13.998008 7f5afd5f96c0 Delete type=0 #40 -2023/08/07-23:27:51.005564 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:51.005735 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:51.012861 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:51.013069 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/07-23:27:51.013100 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.629533 7fd6a4bfa6c0 Recovering log #52 +2023/08/09-17:27:09.645952 7fd6a4bfa6c0 Delete type=3 #50 +2023/08/09-17:27:09.645993 7fd6a4bfa6c0 Delete type=0 #52 +2023/08/09-17:29:29.529881 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.529956 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.539673 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.547559 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/09-17:29:29.547616 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/MANIFEST-000046 b/packs/powers/MANIFEST-000046 deleted file mode 100644 index e22f8e1..0000000 Binary files a/packs/powers/MANIFEST-000046 and /dev/null differ diff --git a/packs/powers/MANIFEST-000058 b/packs/powers/MANIFEST-000058 new file mode 100644 index 0000000..10389f9 Binary files /dev/null and b/packs/powers/MANIFEST-000058 differ diff --git a/packs/skills/000048.log b/packs/skills/000060.log similarity index 100% rename from packs/skills/000048.log rename to packs/skills/000060.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index a6d5883..717cf9a 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/skills/LOG b/packs/skills/LOG index 7248ee7..d99331d 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/08/08-08:16:25.447873 7f5afcdf86c0 Recovering log #44 -2023/08/08-08:16:25.457419 7f5afcdf86c0 Delete type=3 #42 -2023/08/08-08:16:25.457478 7f5afcdf86c0 Delete type=0 #44 -2023/08/08-08:17:06.615328 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.615361 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.621611 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.629182 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/08-08:17:06.643000 7f58677fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.512154 7fd6a4bfa6c0 Recovering log #56 +2023/08/09-17:36:56.522559 7fd6a4bfa6c0 Delete type=3 #54 +2023/08/09-17:36:56.522604 7fd6a4bfa6c0 Delete type=0 #56 +2023/08/09-18:04:36.752034 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.752064 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/09-18:04:36.761678 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.774970 7fd40dfff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/09-18:04:36.793601 7fd40dfff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 5682962..ba8221a 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/08/07-22:18:13.982353 7f5afddfa6c0 Recovering log #40 -2023/08/07-22:18:13.997971 7f5afddfa6c0 Delete type=3 #38 -2023/08/07-22:18:13.998032 7f5afddfa6c0 Delete type=0 #40 -2023/08/07-23:27:50.999438 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:50.999471 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:51.005436 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:51.013039 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/07-23:27:51.013085 7f58677fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.629585 7fd68effd6c0 Recovering log #52 +2023/08/09-17:27:09.645953 7fd68effd6c0 Delete type=3 #50 +2023/08/09-17:27:09.646001 7fd68effd6c0 Delete type=0 #52 +2023/08/09-17:29:29.510252 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.510282 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.520343 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.539825 7fd40dfff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/09-17:29:29.547578 7fd40dfff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000046 b/packs/skills/MANIFEST-000046 deleted file mode 100644 index 4c0dac5..0000000 Binary files a/packs/skills/MANIFEST-000046 and /dev/null differ diff --git a/packs/skills/MANIFEST-000058 b/packs/skills/MANIFEST-000058 new file mode 100644 index 0000000..cfc6ee9 Binary files /dev/null and b/packs/skills/MANIFEST-000058 differ diff --git a/packs/talents/000048.log b/packs/talents/000060.log similarity index 100% rename from packs/talents/000048.log rename to packs/talents/000060.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index a6d5883..717cf9a 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/talents/LOG b/packs/talents/LOG index ecd067e..4f55ba0 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -2023/08/08-08:16:25.478881 7f5afddfa6c0 Recovering log #44 -2023/08/08-08:16:25.496212 7f5afddfa6c0 Delete type=3 #42 -2023/08/08-08:16:25.496252 7f5afddfa6c0 Delete type=0 #44 -2023/08/08-08:17:06.650728 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.650795 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.658621 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.658890 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/08-08:17:06.658907 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.538369 7fd68f7fe6c0 Recovering log #56 +2023/08/09-17:36:56.547813 7fd68f7fe6c0 Delete type=3 #54 +2023/08/09-17:36:56.547850 7fd68f7fe6c0 Delete type=0 #56 +2023/08/09-18:04:36.821182 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.821227 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/09-18:04:36.833134 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.833300 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/09-18:04:36.833337 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/LOG.old b/packs/talents/LOG.old index 95f6f5b..196c9ea 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2023/08/07-22:18:14.015482 7f5afd5f96c0 Recovering log #40 -2023/08/07-22:18:14.034395 7f5afd5f96c0 Delete type=3 #38 -2023/08/07-22:18:14.034433 7f5afd5f96c0 Delete type=0 #40 -2023/08/07-23:27:51.034000 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:51.034031 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:51.040235 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:51.040547 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/07-23:27:51.040656 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.660977 7fd6a4bfa6c0 Recovering log #52 +2023/08/09-17:27:09.670859 7fd6a4bfa6c0 Delete type=3 #50 +2023/08/09-17:27:09.670923 7fd6a4bfa6c0 Delete type=0 #52 +2023/08/09-17:29:29.547694 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.547735 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.556026 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.563037 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/09-17:29:29.563066 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000046 b/packs/talents/MANIFEST-000046 deleted file mode 100644 index 8d5f02c..0000000 Binary files a/packs/talents/MANIFEST-000046 and /dev/null differ diff --git a/packs/talents/MANIFEST-000058 b/packs/talents/MANIFEST-000058 new file mode 100644 index 0000000..f1c70b2 Binary files /dev/null and b/packs/talents/MANIFEST-000058 differ diff --git a/packs/weapons/000048.log b/packs/weapons/000060.log similarity index 100% rename from packs/weapons/000048.log rename to packs/weapons/000060.log diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT index a6d5883..717cf9a 100644 --- a/packs/weapons/CURRENT +++ b/packs/weapons/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000058 diff --git a/packs/weapons/LOG b/packs/weapons/LOG index aaed7db..6df2701 100644 --- a/packs/weapons/LOG +++ b/packs/weapons/LOG @@ -1,7 +1,7 @@ -2023/08/08-08:16:25.435335 7f5afddfa6c0 Recovering log #44 -2023/08/08-08:16:25.445302 7f5afddfa6c0 Delete type=3 #42 -2023/08/08-08:16:25.445339 7f5afddfa6c0 Delete type=0 #44 -2023/08/08-08:17:06.608167 7f58677fe6c0 Level-0 table #49: started -2023/08/08-08:17:06.608235 7f58677fe6c0 Level-0 table #49: 0 bytes OK -2023/08/08-08:17:06.615092 7f58677fe6c0 Delete type=0 #47 -2023/08/08-08:17:06.621758 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/09-17:36:56.500479 7fd6a4bfa6c0 Recovering log #56 +2023/08/09-17:36:56.510052 7fd6a4bfa6c0 Delete type=3 #54 +2023/08/09-17:36:56.510089 7fd6a4bfa6c0 Delete type=0 #56 +2023/08/09-18:04:36.745478 7fd40dfff6c0 Level-0 table #61: started +2023/08/09-18:04:36.745526 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/09-18:04:36.751893 7fd40dfff6c0 Delete type=0 #59 +2023/08/09-18:04:36.761885 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/LOG.old b/packs/weapons/LOG.old index f0a6267..aa924c9 100644 --- a/packs/weapons/LOG.old +++ b/packs/weapons/LOG.old @@ -1,7 +1,7 @@ -2023/08/07-22:18:13.969369 7f5afddfa6c0 Recovering log #40 -2023/08/07-22:18:13.978774 7f5afddfa6c0 Delete type=3 #38 -2023/08/07-22:18:13.978889 7f5afddfa6c0 Delete type=0 #40 -2023/08/07-23:27:50.992870 7f58677fe6c0 Level-0 table #45: started -2023/08/07-23:27:50.992899 7f58677fe6c0 Level-0 table #45: 0 bytes OK -2023/08/07-23:27:50.999291 7f58677fe6c0 Delete type=0 #43 -2023/08/07-23:27:51.013019 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/09-17:27:09.618200 7fd6a4bfa6c0 Recovering log #52 +2023/08/09-17:27:09.627458 7fd6a4bfa6c0 Delete type=3 #50 +2023/08/09-17:27:09.627499 7fd6a4bfa6c0 Delete type=0 #52 +2023/08/09-17:29:29.503863 7fd40dfff6c0 Level-0 table #57: started +2023/08/09-17:29:29.503908 7fd40dfff6c0 Level-0 table #57: 0 bytes OK +2023/08/09-17:29:29.510089 7fd40dfff6c0 Delete type=0 #55 +2023/08/09-17:29:29.529862 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/MANIFEST-000046 b/packs/weapons/MANIFEST-000046 deleted file mode 100644 index 5a5e24b..0000000 Binary files a/packs/weapons/MANIFEST-000046 and /dev/null differ diff --git a/packs/weapons/MANIFEST-000058 b/packs/weapons/MANIFEST-000058 new file mode 100644 index 0000000..51e4570 Binary files /dev/null and b/packs/weapons/MANIFEST-000058 differ diff --git a/system.json b/system.json index 65b87ce..19b0a62 100644 --- a/system.json +++ b/system.json @@ -100,14 +100,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.3", + "version": "11.0.5", "compatibility": { "minimum": "11", "verified": "11" }, "title": "Hero System v6 for FoundrtVTT (Official)", "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.3.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.5.zip", "url": "https://www.uberwald.me/gitea/uberwald/", "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp", "id": "fvtt-hero-system-6" diff --git a/template.json b/template.json index 13f408f..a4a053d 100644 --- a/template.json +++ b/template.json @@ -1,7 +1,8 @@ { "Actor": { "types": [ - "character" + "character", + "minion" ], "templates": { "biodata": { @@ -309,6 +310,15 @@ "movements" ], "subactors": [] + }, + "minion": { + "templates": [ + "biodata", + "characteristics", + "defenses", + "movements" + ], + "subactors": [] } }, "Item": { diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 9761342..ff59231 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -4,68 +4,74 @@
- + - +
 
- +

- +
  • - +
- +
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
@@ -73,19 +79,23 @@
  • - + - + - + - + - +
@@ -117,88 +127,100 @@ {{!-- Combat Tab --}}
- +
-
+
- {{#each maneuvers as |mlist key|}} -
    -
  • - - - - - - - - - - - - - - - -
    • - {{#each mlist as |maneuver key|}} -
  • - - {{maneuver.name}} - - + {{#each maneuvers as |mlist key|}} +
      +
    • + + + + + + + + + + + + + + + +
      • + {{#each mlist as |maneuver key|}} +
    • + + {{maneuver.name}} + + - {{maneuver.system.pha}} - {{maneuver.system.ocv}} - {{maneuver.system.dcv}} + {{maneuver.system.pha}} + {{maneuver.system.ocv}} + {{maneuver.system.dcv}} - {{maneuver.system.effects}} - {{#if maneuver.system.haseffectroll}} - - {{maneuver.system.effectrollformula}} - - {{/if}} - + {{maneuver.system.effects}} + {{#if maneuver.system.haseffectroll}} + + {{maneuver.system.effectrollformula}} + + {{/if}} + -   -
      - -
      -
      • - {{/each}} -
    +   +
    + +
    +
    • + {{/each}} +
{{/each}}
- +
  • - - + + - - - - + + + + - + {{system.biodata.presenceattack.displayFormula}} @@ -209,24 +231,26 @@
    • - - - - - - - - - + + + + + + + + +
      • - {{#each characteristics as |char key|}} - {{#if char.isvital}} -
    • - {{char.label}} - - -
      • - {{/if}} + {{#each characteristics as |char key|}} + {{#if char.isvital}} +
    • + {{char.label}} + + +
      • + {{/if}} {{/each}}
    @@ -236,57 +260,73 @@
    • - - - - - - - - - + + + + + + + + +
      • - {{#each characteristics as |char key|}} - {{#if char.isdefense}} -
    • - {{char.label}} - - -
      • - {{/if}} + {{#each characteristics as |char key|}} + {{#if char.isdefense}} +
    • + {{char.label}} + + +
      • + {{/if}} {{/each}} - {{#each defenses as |def key|}} -
    • - {{#if def.iseditable}} - - {{else}} - {{def.label}} - {{/if}} - - -
      • + {{#each defenses as |def key|}} +
    • + {{#if def.iseditable}} + + {{else}} + {{def.label}} + {{/if}} + + +
      • {{/each}}
    -
    -
- +
- - + + + - + - - + + - +
@@ -294,66 +334,75 @@
- +
- +
  • - - - - - - - - - + + + + + + + + +
    • - {{#each characteristics as |char key|}} - {{#if char.ismovement}} -
  • - {{char.label}} - - -
    • - {{/if}} + {{#each characteristics as |char key|}} + {{#if char.ismovement}} +
  • + {{char.label}} + + +
    • + {{/if}} {{/each}} - {{#each movements as |move key|}} -
  • - {{#if move.iseditable}} - - {{else}} - {{move.label}} - {{/if}} - - -
    • + {{#each movements as |move key|}} +
  • + {{#if move.iseditable}} + + {{else}} + {{move.label}} + {{/if}} + + +
    • {{/each}}
- +
- +
@@ -363,28 +412,28 @@
  • - - - - - - - - - - - - - - - -
     
    -
    • + + + + + + + + + + + + + + + +
     
    + {{#each characteristics as |charac key|}} - {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs charac=charac key=key}} + {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-full-charac.hbs charac=charac key=key}} {{/each}} -
+
@@ -411,7 +460,8 @@ src="{{skill.img}}" /> {{skill.name}} {{upper skill.charac}} - {{skill.roll}}- + {{skill.roll}}-
 
@@ -438,8 +488,9 @@ {{perk.name}} - {{#if perk.system.hasroll}} - {{perk.system.roll}}- + {{#if perk.system.hasroll}} + {{perk.system.roll}}- {{else}}   {{/if}} @@ -469,8 +520,9 @@ {{talent.name}} - {{#if talent.system.hasroll}} - {{talent.system.roll}}- + {{#if talent.system.hasroll}} + {{talent.system.roll}}- {{else}}   {{/if}} @@ -505,22 +557,22 @@ {{#each nonstockmaneuvers as |maneuver key|}} -
  • - - {{maneuver.name}} +
  • + + {{maneuver.name}} - {{maneuver.system.pha}} - {{maneuver.system.ocv}} - {{maneuver.system.dcv}} + {{maneuver.system.pha}} + {{maneuver.system.ocv}} + {{maneuver.system.dcv}} - {{maneuver.system.effects}} + {{maneuver.system.effects}} -
     
    -
    - -
    -
    • +
     
    +
    + +
    + {{/each}}
    @@ -555,13 +607,15 @@ {{#each powers as |power key|}}
  • + src="{{power.img}}" /> {{power.system.cost}} {{power.name}} {{power.system.displayname}} - {{power.system.damage}} - {{#if power.system.hasroll}} - {{power.system.roll}}- + {{power.system.damage}} + {{#if power.system.hasroll}} + {{power.system.roll}}- {{else}}   {{/if}} @@ -592,8 +646,9 @@ {{comp.name}} - {{#if comp.system.hasroll}} - {{comp.system.roll}}- + {{#if comp.system.hasroll}} + {{comp.system.roll}}- {{else}}   {{/if}} @@ -616,13 +671,16 @@ Total value : {{totalValue}}
    • - {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}} + {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" + items=weapons}} {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Armor" items=armors}} - {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields" items=shields}} + {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Shields" + items=shields}} - {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment" items=equipments}} + {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Equipment" + items=equipments}}
    @@ -677,7 +735,7 @@
    {{editor notes1 target="system.biodata.notes1" button=true owner=owner editable=editable}} -
    +

    Notes 2 :

    @@ -705,7 +763,7 @@
    - + \ No newline at end of file diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index ae5908d..1acca80 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -33,6 +33,12 @@ {{#if item}}
  • {{item.name}} ({{upperFirst item.type}})
    • + {{#if (eq item.type "maneuver")}} +
  • {{item.system.effects}}
    • + {{#if item.system.haseffectroll}} +
  • {{item.system.effectrollformula}}
    • + {{/if}} + {{/if}} {{/if}} {{#if (exists bonusMalus)}}