From 58bcfc07a3d7ecf16bd8f8b2e2ed6f0c723c298f Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 7 Aug 2023 23:28:04 +0200 Subject: [PATCH] Various fixes and enhancents --- modules/hero6-actor-sheet.js | 10 ++-- modules/hero6-actor.js | 47 +++++++++++++++++- modules/hero6-combat.js | 47 +++++++++++------- modules/hero6-main.js | 2 +- modules/hero6-utility.js | 19 +++++-- .../complications/{000028.log => 000044.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 16 +++--- packs/complications/LOG.old | 16 +++--- packs/complications/MANIFEST-000026 | Bin 135 -> 0 bytes packs/complications/MANIFEST-000042 | Bin 0 -> 135 bytes packs/equipment/{000028.log => 000044.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +++--- packs/equipment/LOG.old | 14 +++--- packs/equipment/MANIFEST-000026 | Bin 65 -> 0 bytes packs/equipment/MANIFEST-000042 | Bin 0 -> 65 bytes packs/maneuvers/{000020.log => 000036.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 16 +++--- packs/maneuvers/LOG.old | 16 +++--- packs/maneuvers/MANIFEST-000018 | Bin 134 -> 0 bytes packs/maneuvers/MANIFEST-000034 | Bin 0 -> 134 bytes packs/perks/{000028.log => 000044.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 16 +++--- packs/perks/LOG.old | 16 +++--- packs/perks/MANIFEST-000026 | Bin 134 -> 0 bytes packs/perks/MANIFEST-000042 | Bin 0 -> 134 bytes packs/powers/{000028.log => 000044.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 16 +++--- packs/powers/LOG.old | 16 +++--- packs/powers/MANIFEST-000026 | Bin 135 -> 0 bytes packs/powers/MANIFEST-000042 | Bin 0 -> 135 bytes packs/skills/{000028.log => 000044.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +++--- packs/skills/LOG.old | 16 +++--- packs/skills/MANIFEST-000026 | Bin 135 -> 0 bytes packs/skills/MANIFEST-000042 | Bin 0 -> 135 bytes packs/talents/{000028.log => 000044.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 16 +++--- packs/talents/LOG.old | 16 +++--- packs/talents/MANIFEST-000026 | Bin 134 -> 0 bytes packs/talents/MANIFEST-000042 | Bin 0 -> 134 bytes packs/weapons/{000028.log => 000044.log} | 0 packs/weapons/CURRENT | 2 +- packs/weapons/LOG | 14 +++--- packs/weapons/LOG.old | 14 +++--- packs/weapons/MANIFEST-000026 | Bin 65 -> 0 bytes packs/weapons/MANIFEST-000042 | Bin 0 -> 65 bytes styles/simple.css | 2 +- system.json | 4 +- template.json | 27 +++++++--- templates/actors/actor-sheet.hbs | 16 ++++-- templates/apps/combat-tracker.hbs | 5 +- templates/items/item-skill-sheet.hbs | 6 +-- .../partials/partial-power-equipment-cost.hbs | 14 +++++- 60 files changed, 284 insertions(+), 179 deletions(-) rename packs/complications/{000028.log => 000044.log} (100%) delete mode 100644 packs/complications/MANIFEST-000026 create mode 100644 packs/complications/MANIFEST-000042 rename packs/equipment/{000028.log => 000044.log} (100%) delete mode 100644 packs/equipment/MANIFEST-000026 create mode 100644 packs/equipment/MANIFEST-000042 rename packs/maneuvers/{000020.log => 000036.log} (100%) delete mode 100644 packs/maneuvers/MANIFEST-000018 create mode 100644 packs/maneuvers/MANIFEST-000034 rename packs/perks/{000028.log => 000044.log} (100%) delete mode 100644 packs/perks/MANIFEST-000026 create mode 100644 packs/perks/MANIFEST-000042 rename packs/powers/{000028.log => 000044.log} (100%) delete mode 100644 packs/powers/MANIFEST-000026 create mode 100644 packs/powers/MANIFEST-000042 rename packs/skills/{000028.log => 000044.log} (100%) delete mode 100644 packs/skills/MANIFEST-000026 create mode 100644 packs/skills/MANIFEST-000042 rename packs/talents/{000028.log => 000044.log} (100%) delete mode 100644 packs/talents/MANIFEST-000026 create mode 100644 packs/talents/MANIFEST-000042 rename packs/weapons/{000028.log => 000044.log} (100%) delete mode 100644 packs/weapons/MANIFEST-000026 create mode 100644 packs/weapons/MANIFEST-000042 diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js index 955dcbe..8a6a91d 100644 --- a/modules/hero6-actor-sheet.js +++ b/modules/hero6-actor-sheet.js @@ -179,14 +179,18 @@ export class Hero6ActorSheet extends ActorSheet { const li = $(event.currentTarget).parents(".item"); let itemId = li.data("item-id") this.actor.rollLiftDice(itemId); - }); - + }); html.find('.roll-weapon').click((event) => { const li = $(event.currentTarget).parents(".item"); const skillId = li.data("item-id") this.actor.rollWeapon(skillId) }); - + html.find('.roll-maneuver').click((event) => { + const li = $(event.currentTarget).parents(".item"); + const maneuverId = li.data("maneuver-id") + this.actor.rollManeuver(maneuverId) + }); + html.find('.hold-action').click((event) => { this.actor.holdAction() }); diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index 6875a81..9a72b7a 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -70,6 +70,14 @@ export class Hero6Actor extends Actor { } } + /* -------------------------------------------- */ + performMigration() { + // Fix OCV/OMCV rollable + if (!this.system.characteristics.ocv.hasroll) { + this.update({ 'system.characteristics.ocv.hasroll': true, 'system.characteristics.omcv.hasroll': true }) + } + } + /* -------------------------------------------- */ computeDicesValue() { this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.pre.value) this.system.characteristics.str.strdice = Hero6LiftDice.getLiftDice(this.system.characteristics.str.value) @@ -205,6 +213,17 @@ 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)) { + maneuver.roll += Number(maneuver.system.ocv) + } else { + maneuver.noOCV = true + } + } /* -------------------------------------------- */ getSkills() { @@ -464,7 +483,7 @@ export class Hero6Actor extends Actor { getBaseInit(turn) { if ( turn != this.turn) { let r = new Roll("1d6").roll({ async: false }) - this.currentInit = this.system.characteristics.dex.initiative + (r.total / 10) + this.currentInit = Number(this.system.characteristics.dex.initiative) + Number(((r.total / 10).toFixed(2))) this.turn = turn } return this.currentInit @@ -648,6 +667,9 @@ export class Hero6Actor extends Actor { if (item.type == "skill") { this.prepareSkill(rollData.item) } + if (item.type == "maneuver") { + this.prepareManeuver(rollData.item) + } this.startRoll(rollData) } /* -------------------------------------------- */ @@ -697,7 +719,28 @@ export class Hero6Actor extends Actor { msg.setFlag("world", "rolldata", rollData) console.log("Rolldata result", rollData) } - + /* -------------------------------------------- */ + rollManeuver(maneuverId) { + let skill = this.items.get(skillId) + if (skill) { + if (skill.system.islore && skill.system.level == 0) { + ui.notifications.warn("You can't use Lore Skills with a SL of 0.") + return + } + skill = duplicate(skill) + Hero6Utility.updateSkill(skill) + let abilityKey = skill.system.ability + let rollData = this.getCommonRollData(abilityKey) + rollData.mode = "skill" + rollData.skill = skill + rollData.img = skill.img + if (rollData.target) { + ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.") + return + } + this.startRoll(rollData) + } + } /* -------------------------------------------- */ rollSkill(skillId) { let skill = this.items.get(skillId) diff --git a/modules/hero6-combat.js b/modules/hero6-combat.js index 81f2196..54840f8 100644 --- a/modules/hero6-combat.js +++ b/modules/hero6-combat.js @@ -77,19 +77,28 @@ export class Hero6Combat extends Combat { } /* -------------------------------------------- */ forceHold(actor, isHold) { - let updList = [] - let c = this.combatants.find(c => c.actor._id == actor.id) - let name = actor.name + ((isHold) ? " (H)" : "") - updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) }) - this.updateEmbeddedDocuments("Combatant", updList) + if (game.user.isGM) { + let updList = [] + let c = this.combatants.find(c => c.actor._id == actor.id) + let name = actor.name + ((isHold) ? " (H)" : "") + console.log("ForceHold!!", c, actor) + updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) }) + this.updateEmbeddedDocuments("Combatant", updList) + } else { + game.socket.emit("system.fvtt-hero-system-6", { name: "msg_force_hold", data: { actorId: actor.id, isHold: isHold } }); + } } /* -------------------------------------------- */ forceAbort(actor, isAbort) { - let updList = [] - let c = this.combatants.find(c => c.actor._id == actor.id) - let name = actor.name + ((isAbort) ? " (A)" : "") - updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) }) - this.updateEmbeddedDocuments("Combatant", updList) + if (game.user.isGM) { + let updList = [] + let c = this.combatants.find(c => c.actor._id == actor.id) + let name = actor.name + ((isAbort) ? " (A)" : "") + updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) }) + this.updateEmbeddedDocuments("Combatant", updList) + } else { + game.socket.emit("system.fvtt-hero-system-6", { name: "msg_force_abort", data: { actorId: actor.id, isAbort: isAbort } }); + } } /* -------------------------------------------- */ @@ -110,7 +119,7 @@ export class Hero6Combat extends Combat { } if (isOnAbort) { name = c.actor.name + " (A)" - if ( c.actor.incAbortActionCount() ) { + if (c.actor.incAbortActionCount()) { c.actor.disableAbortAction() } } @@ -159,7 +168,7 @@ export class Hero6Combat extends Combat { nextTurn() { let nbC = this.combatants.filter(c => c.initiative > 0).length //console.log("Next turn called....", this.turn, nbC) - if (this.turn < nbC-1) { + if (this.turn < nbC - 1) { super.nextTurn() } else { this.nextRound() @@ -172,7 +181,7 @@ export class Hero6Combat extends Combat { let nextRound = this.round let advanceTime = 0 let turn = this.turn === null ? null : 0; // Preserve the fact that it's no-one's turn currently. - let turnData = this.getFlag("world", "hero6-turn-data") + let turnData = this.getFlag("world", "turnData") //console.log("Next round called....", nextRound, turnData) while (!hasCombatants) { @@ -187,18 +196,21 @@ export class Hero6Combat extends Combat { advanceTime += CONFIG.time.roundTime; nextRound = nextRound + 1; //console.log("Next round called....2", nextRound, turnData) - turnData = this.getFlag("world", "hero6-turn-data") + turnData = this.getFlag("world", "turnData") if (!turnData) { turnData = { turnNumber: 0, segmentNumber: 12 } - this.setFlag("world", "hero6-turn-data", turnData) + this.setFlag("world", "turnData", turnData) } turnData = duplicate(turnData) turnData.segmentNumber += 1 if (turnData.segmentNumber > 12) { turnData.segmentNumber = 1 turnData.turnNumber++ + ChatMessage.create({ + content: "Complete Post-Segment 12 Recoveries." + }) } - await this.setFlag("world", "hero6-turn-data", turnData) + await this.setFlag("world", "turnData", turnData) this.turnNumber = turnData.turnNumber; this.segmentNumber = turnData.segmentNumber; //console.log("Next round called....3", nextRound, turnData) @@ -209,9 +221,10 @@ export class Hero6Combat extends Combat { } // Update the document, passing data through a hook first - const updateData = { round: nextRound, turn: turn, segmentNumber: turnData.segmentNumber, turnNumber: turnData.turnNumber }; + const updateData = { round: nextRound, turn }; const updateOptions = { advanceTime, direction: 1 }; Hooks.callAll("combatRound", this, updateData, updateOptions); + console.log(this) return this.update(updateData, updateOptions); } diff --git a/modules/hero6-main.js b/modules/hero6-main.js index db649ed..9e80d5a 100644 --- a/modules/hero6-main.js +++ b/modules/hero6-main.js @@ -41,7 +41,7 @@ Hooks.once("init", async function () { // Set an initiative formula for the system CONFIG.Combat.initiative = { formula: "1d6", - decimals: 3 + decimals: 2 }; /* ------------------------------- ------------- */ diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index 58108f7..77856c2 100644 --- a/modules/hero6-utility.js +++ b/modules/hero6-utility.js @@ -124,6 +124,10 @@ export class Hero6Utility { const rollTables = await Hero6Utility.loadCompendium("fvtt-hero-system-6.rolltables") this.rollTables = rollTables.map(i => i.toObject()) + for (let actor of game.actors) { + actor.performMigration() + } + } /* -------------------------------------------- */ @@ -230,12 +234,21 @@ export class Hero6Utility { /* -------------------------------------------- */ static async onSocketMesssage(msg) { - console.log("SOCKET MESSAGE", msg.name) + console.log("SOCKET MESSAGE", msg.name, msg) if (msg.name == "msg_update_roll") { this.updateRollData(msg.data) } - if (msg.name == "msg_gm_process_attack_defense") { - this.processSuccessResult(msg.data) + if (msg.name == "msg_force_hold") { + if (game.user.isGM) { + let actor = game.actors.get(msg.data.actorId) + game.combat.forceHold(actor, msg.data.isHold) + } + } + if (msg.name == "msg_force_abort") { + if (game.user.isGM) { + let actor = game.actors.get(msg.data.actorId) + game.combat.forceAbort(actor, msg.data.isAbort) + } } if (msg.name == "msg_gm_item_drop" && game.user.isGM) { let actor = game.actors.get(msg.data.actorId) diff --git a/packs/complications/000028.log b/packs/complications/000044.log similarity index 100% rename from packs/complications/000028.log rename to packs/complications/000044.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index 8b15215..8e0a062 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000042 diff --git a/packs/complications/LOG b/packs/complications/LOG index 6b7e562..dcbf876 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -2023/08/03-22:40:14.252896 7f01523fc6c0 Recovering log #24 -2023/08/03-22:40:14.358951 7f01523fc6c0 Delete type=3 #22 -2023/08/03-22:40:14.359046 7f01523fc6c0 Delete type=0 #24 -2023/08/04-06:57:06.069198 7f0151bfb6c0 Level-0 table #29: started -2023/08/04-06:57:06.069219 7f0151bfb6c0 Level-0 table #29: 0 bytes OK -2023/08/04-06:57:06.076321 7f0151bfb6c0 Delete type=0 #27 -2023/08/04-06:57:06.083882 7f0151bfb6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/04-06:57:06.083924 7f0151bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +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) diff --git a/packs/complications/LOG.old b/packs/complications/LOG.old index 234c740..7bf8402 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/03-22:32:11.523171 7f01523fc6c0 Recovering log #20 -2023/08/03-22:32:11.540084 7f01523fc6c0 Delete type=3 #18 -2023/08/03-22:32:11.540129 7f01523fc6c0 Delete type=0 #20 -2023/08/03-22:32:17.500527 7f0151bfb6c0 Level-0 table #25: started -2023/08/03-22:32:17.500588 7f0151bfb6c0 Level-0 table #25: 0 bytes OK -2023/08/03-22:32:17.506820 7f0151bfb6c0 Delete type=0 #23 -2023/08/03-22:32:17.520955 7f0151bfb6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/03-22:32:17.521030 7f0151bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/07-22:00:56.735452 7f5afd5f96c0 Recovering log #36 +2023/08/07-22:00:56.833916 7f5afd5f96c0 Delete type=3 #34 +2023/08/07-22:00:56.833991 7f5afd5f96c0 Delete type=0 #36 +2023/08/07-22:18:10.662583 7f58677fe6c0 Level-0 table #41: started +2023/08/07-22:18:10.662627 7f58677fe6c0 Level-0 table #41: 0 bytes OK +2023/08/07-22:18:10.668688 7f58677fe6c0 Delete type=0 #39 +2023/08/07-22:18:10.668861 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/07-22:18:10.668891 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/MANIFEST-000026 b/packs/complications/MANIFEST-000026 deleted file mode 100644 index 11ece26a52e7351d39406bdf76c255871d86e3a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{n&Z diff --git a/packs/complications/MANIFEST-000042 b/packs/complications/MANIFEST-000042 new file mode 100644 index 0000000000000000000000000000000000000000..875312887df205cde8e5eb74c9bbb27986f89bda GIT binary patch literal 135 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{Ts0Oc0O2AdYXATM literal 0 HcmV?d00001 diff --git a/packs/perks/000028.log b/packs/perks/000044.log similarity index 100% rename from packs/perks/000028.log rename to packs/perks/000044.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index 8b15215..8e0a062 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000042 diff --git a/packs/perks/LOG b/packs/perks/LOG index a72bc94..3b9ec1c 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,8 +1,8 @@ -2023/08/03-22:40:14.361180 7f01523fc6c0 Recovering log #24 -2023/08/03-22:40:14.470422 7f01523fc6c0 Delete type=3 #22 -2023/08/03-22:40:14.470476 7f01523fc6c0 Delete type=0 #24 -2023/08/04-06:57:06.091250 7f0151bfb6c0 Level-0 table #29: started -2023/08/04-06:57:06.091271 7f0151bfb6c0 Level-0 table #29: 0 bytes OK -2023/08/04-06:57:06.097212 7f0151bfb6c0 Delete type=0 #27 -2023/08/04-06:57:06.097326 7f0151bfb6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/04-06:57:06.097346 7f0151bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +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) diff --git a/packs/perks/LOG.old b/packs/perks/LOG.old index 3669faa..7fbc80d 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/08/03-22:32:11.542387 7f01523fc6c0 Recovering log #20 -2023/08/03-22:32:11.560297 7f01523fc6c0 Delete type=3 #18 -2023/08/03-22:32:11.560512 7f01523fc6c0 Delete type=0 #20 -2023/08/03-22:32:17.493642 7f0151bfb6c0 Level-0 table #25: started -2023/08/03-22:32:17.493688 7f0151bfb6c0 Level-0 table #25: 0 bytes OK -2023/08/03-22:32:17.500316 7f0151bfb6c0 Delete type=0 #23 -2023/08/03-22:32:17.520920 7f0151bfb6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/03-22:32:17.521020 7f0151bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/07-22:00:56.836453 7f5afd5f96c0 Recovering log #36 +2023/08/07-22:00:56.950488 7f5afd5f96c0 Delete type=3 #34 +2023/08/07-22:00:56.950642 7f5afd5f96c0 Delete type=0 #36 +2023/08/07-22:18:10.683235 7f58677fe6c0 Level-0 table #41: started +2023/08/07-22:18:10.683286 7f58677fe6c0 Level-0 table #41: 0 bytes OK +2023/08/07-22:18:10.690928 7f58677fe6c0 Delete type=0 #39 +2023/08/07-22:18:10.691057 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/07-22:18:10.691082 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/MANIFEST-000026 b/packs/perks/MANIFEST-000026 deleted file mode 100644 index 1353da96df7a76551433564d4578b27b264783fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmX>X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HF{ONB;VmTNXnWQ-x Um}OX4_RT!20OHC3xpFKl0E~Si-~a#s diff --git a/packs/perks/MANIFEST-000042 b/packs/perks/MANIFEST-000042 new file mode 100644 index 0000000000000000000000000000000000000000..5ded7143a4c0a2e3a899116337c5858778f1a6f4 GIT binary patch literal 134 zcmX>X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HFyjbYzXB-TSOxm0b U%sMPA%)1UNgSa|Ct{w{u0BzhMxc~qF literal 0 HcmV?d00001 diff --git a/packs/powers/000028.log b/packs/powers/000044.log similarity index 100% rename from packs/powers/000028.log rename to packs/powers/000044.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index 8b15215..8e0a062 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000042 diff --git a/packs/powers/LOG b/packs/powers/LOG index e546150..6241a04 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,8 @@ -2023/08/03-22:40:14.154949 7f01523fc6c0 Recovering log #24 -2023/08/03-22:40:14.250244 7f01523fc6c0 Delete type=3 #22 -2023/08/03-22:40:14.250297 7f01523fc6c0 Delete type=0 #24 -2023/08/04-06:57:06.062151 7f0151bfb6c0 Level-0 table #29: started -2023/08/04-06:57:06.062185 7f0151bfb6c0 Level-0 table #29: 0 bytes OK -2023/08/04-06:57:06.069091 7f0151bfb6c0 Delete type=0 #27 -2023/08/04-06:57:06.076526 7f0151bfb6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/04-06:57:06.083902 7f0151bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +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) diff --git a/packs/powers/LOG.old b/packs/powers/LOG.old index 91ecda0..ff3cd59 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/03-22:32:11.504542 7f01523fc6c0 Recovering log #20 -2023/08/03-22:32:11.521105 7f01523fc6c0 Delete type=3 #18 -2023/08/03-22:32:11.521156 7f01523fc6c0 Delete type=0 #20 -2023/08/03-22:32:17.471567 7f0151bfb6c0 Level-0 table #25: started -2023/08/03-22:32:17.471602 7f0151bfb6c0 Level-0 table #25: 0 bytes OK -2023/08/03-22:32:17.480333 7f0151bfb6c0 Delete type=0 #23 -2023/08/03-22:32:17.493507 7f0151bfb6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/03-22:32:17.493543 7f0151bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/07-22:00:56.642444 7f5afcdf86c0 Recovering log #36 +2023/08/07-22:00:56.750892 7f5afcdf86c0 Delete type=3 #34 +2023/08/07-22:00:56.750934 7f5afcdf86c0 Delete type=0 #36 +2023/08/07-22:18:10.655429 7f58677fe6c0 Level-0 table #41: started +2023/08/07-22:18:10.655482 7f58677fe6c0 Level-0 table #41: 0 bytes OK +2023/08/07-22:18:10.662426 7f58677fe6c0 Delete type=0 #39 +2023/08/07-22:18:10.668849 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/07-22:18:10.668882 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/MANIFEST-000026 b/packs/powers/MANIFEST-000026 deleted file mode 100644 index 33d54a6eb8fa98b5ce95ea83380dafccabfad2df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmbQTUdt$nfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ_v`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoB59PBt72j7-v; V49qetHd#ll{)4zOK&~8%4FG6XB3J+b diff --git a/packs/skills/MANIFEST-000042 b/packs/skills/MANIFEST-000042 new file mode 100644 index 0000000000000000000000000000000000000000..8ca6cead9b589b9c8bdb277a1cd7113a5c878a9a GIT binary patch literal 135 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81Ao5C_7MvUmj7-{` V49q$#Hs;G5+(29%AXksY1^`9PAh-Yk literal 0 HcmV?d00001 diff --git a/packs/talents/000028.log b/packs/talents/000044.log similarity index 100% rename from packs/talents/000028.log rename to packs/talents/000044.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index 8b15215..8e0a062 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000042 diff --git a/packs/talents/LOG b/packs/talents/LOG index 14a7553..95f6f5b 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -2023/08/03-22:40:14.380282 7f0153bff6c0 Recovering log #24 -2023/08/03-22:40:14.489987 7f0153bff6c0 Delete type=3 #22 -2023/08/03-22:40:14.490073 7f0153bff6c0 Delete type=0 #24 -2023/08/04-06:57:06.084030 7f0151bfb6c0 Level-0 table #29: started -2023/08/04-06:57:06.084051 7f0151bfb6c0 Level-0 table #29: 0 bytes OK -2023/08/04-06:57:06.091132 7f0151bfb6c0 Delete type=0 #27 -2023/08/04-06:57:06.097307 7f0151bfb6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/04-06:57:06.097331 7f0151bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +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) diff --git a/packs/talents/LOG.old b/packs/talents/LOG.old index a224535..c5ddf3b 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2023/08/03-22:32:11.546170 7f0152bfd6c0 Recovering log #20 -2023/08/03-22:32:11.563632 7f0152bfd6c0 Delete type=3 #18 -2023/08/03-22:32:11.563697 7f0152bfd6c0 Delete type=0 #20 -2023/08/03-22:32:17.506983 7f0151bfb6c0 Level-0 table #25: started -2023/08/03-22:32:17.507022 7f0151bfb6c0 Level-0 table #25: 0 bytes OK -2023/08/03-22:32:17.513835 7f0151bfb6c0 Delete type=0 #23 -2023/08/03-22:32:17.520991 7f0151bfb6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/03-22:32:17.521446 7f0151bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/07-22:00:56.853665 7f5afcdf86c0 Recovering log #36 +2023/08/07-22:00:56.969522 7f5afcdf86c0 Delete type=3 #34 +2023/08/07-22:00:56.969559 7f5afcdf86c0 Delete type=0 #36 +2023/08/07-22:18:10.675457 7f58677fe6c0 Level-0 table #41: started +2023/08/07-22:18:10.675493 7f58677fe6c0 Level-0 table #41: 0 bytes OK +2023/08/07-22:18:10.683073 7f58677fe6c0 Delete type=0 #39 +2023/08/07-22:18:10.691049 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/07-22:18:10.691077 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000026 b/packs/talents/MANIFEST-000026 deleted file mode 100644 index d0e969cf00ccbf0c1a06908aee1ea0701f26bf16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmY$qR;ZK6z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|dH&;DdpQ^wnWQ-x Um}OY_ekJd{0OHC3xpFLg0I)qHwg3PC diff --git a/packs/talents/MANIFEST-000042 b/packs/talents/MANIFEST-000042 new file mode 100644 index 0000000000000000000000000000000000000000..d7a742316e92545a0976ad79670364c9f00ce758 GIT binary patch literal 134 zcmY$qR;ZK6z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|`AaKyZ{uKKWYXqj UVAf&bJI=hh7{t{9a`jmF0KSwX&j0`b literal 0 HcmV?d00001 diff --git a/packs/weapons/000028.log b/packs/weapons/000044.log similarity index 100% rename from packs/weapons/000028.log rename to packs/weapons/000044.log diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT index 8b15215..8e0a062 100644 --- a/packs/weapons/CURRENT +++ b/packs/weapons/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000042 diff --git a/packs/weapons/LOG b/packs/weapons/LOG index 5a946ef..f0a6267 100644 --- a/packs/weapons/LOG +++ b/packs/weapons/LOG @@ -1,7 +1,7 @@ -2023/08/03-22:40:14.091925 7f01523fc6c0 Recovering log #24 -2023/08/03-22:40:14.149880 7f01523fc6c0 Delete type=3 #22 -2023/08/03-22:40:14.149922 7f01523fc6c0 Delete type=0 #24 -2023/08/04-06:57:06.036393 7f0151bfb6c0 Level-0 table #29: started -2023/08/04-06:57:06.036424 7f0151bfb6c0 Level-0 table #29: 0 bytes OK -2023/08/04-06:57:06.043560 7f0151bfb6c0 Delete type=0 #27 -2023/08/04-06:57:06.054891 7f0151bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +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) diff --git a/packs/weapons/LOG.old b/packs/weapons/LOG.old index 356cb54..d6f3841 100644 --- a/packs/weapons/LOG.old +++ b/packs/weapons/LOG.old @@ -1,7 +1,7 @@ -2023/08/03-22:32:11.490520 7f01523fc6c0 Recovering log #20 -2023/08/03-22:32:11.500170 7f01523fc6c0 Delete type=3 #18 -2023/08/03-22:32:11.500333 7f01523fc6c0 Delete type=0 #20 -2023/08/03-22:32:17.480474 7f0151bfb6c0 Level-0 table #25: started -2023/08/03-22:32:17.480502 7f0151bfb6c0 Level-0 table #25: 0 bytes OK -2023/08/03-22:32:17.487051 7f0151bfb6c0 Delete type=0 #23 -2023/08/03-22:32:17.493518 7f0151bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/07-22:00:56.587421 7f5afcdf86c0 Recovering log #36 +2023/08/07-22:00:56.639569 7f5afcdf86c0 Delete type=3 #34 +2023/08/07-22:00:56.639646 7f5afcdf86c0 Delete type=0 #36 +2023/08/07-22:18:10.642928 7f58677fe6c0 Level-0 table #41: started +2023/08/07-22:18:10.642973 7f58677fe6c0 Level-0 table #41: 0 bytes OK +2023/08/07-22:18:10.649077 7f58677fe6c0 Delete type=0 #39 +2023/08/07-22:18:10.668818 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/MANIFEST-000026 b/packs/weapons/MANIFEST-000026 deleted file mode 100644 index 07b73bf1ae40c099c768d0cc2f0ebd711e3df62d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$l*q1`7@bMkZ-a24)!+ RhSfYjK7qJ0K&~7M0|4HH5;Xt- diff --git a/packs/weapons/MANIFEST-000042 b/packs/weapons/MANIFEST-000042 new file mode 100644 index 0000000000000000000000000000000000000000..b5dbe9be633c5d80bf76da57505958ccac21c33c GIT binary patch literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$nIezj!zp7@4#=8JKlg R7`|yS1%bFaK&~DO0|5P561xBZ literal 0 HcmV?d00001 diff --git a/styles/simple.css b/styles/simple.css index 1cc7c70..740321d 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -74,7 +74,7 @@ color: rgba(224, 208, 197, 0.9); } .dialog-content, .dialog-buttons, .form-fields { - color: rgba(224, 208, 197, 0.9); + color: rgba(4, 44, 44, 0.98); } .dialog-buttons { color: rgba(224, 208, 197, 0.9); diff --git a/system.json b/system.json index 00e5176..690d117 100644 --- a/system.json +++ b/system.json @@ -100,14 +100,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.0", + "version": "11.0.2", "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.0.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.1.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 6a4f3ff..13f408f 100644 --- a/template.json +++ b/template.json @@ -72,7 +72,7 @@ "category": "main", "value": 10, "base": 10, - "perceptionroll": 10 + "perceptionroll": 11 }, "ego": { "label": "EGO", @@ -90,7 +90,7 @@ }, "ocv": { "label": "OCV", - "hasroll": false, + "hasroll": true, "base": 3, "autoMod": "0", "userMod": "0", @@ -108,7 +108,7 @@ }, "omcv": { "label": "OMCV", - "hasroll": false, + "hasroll": true, "base": 3, "autoMod": "0", "userMod": "0", @@ -205,6 +205,7 @@ "ismovement": true, "hasroll": false, "value": 12, + "ncvalue": 24, "base": 12 }, "swimming": { @@ -212,6 +213,7 @@ "ismovement": true, "hasroll": false, "value": 4, + "ncvalue": 8, "base": 4 }, "leaping": { @@ -219,6 +221,7 @@ "ismovement": true, "hasroll": false, "value": 4, + "ncvalue": 8, "base": 4, "leaping_horizontal_base": 0, "leaping_horizontal_total": 0, @@ -231,25 +234,31 @@ "movements": { "fly": { "label": "Fly", - "value": 0 + "value": 0, + "ncvalue": 0 + }, "teleport": { "label": "Teleport", - "value": 0 + "value": 0, + "ncvalue": 0 }, "tunnel": { "label": "Tunnel", - "value": 0 + "value": 0, + "ncvalue": 0 }, "move1": { "label": "N/A", "iseditable": true, - "value": 0 + "value": 0, + "ncvalue": 0 }, "move2": { "label": "N/A", "iseditable": true, - "value": 0 + "value": 0, + "ncvalue": 0 } } }, @@ -343,6 +352,8 @@ "haseffectroll": false, "effectroll": "standard", "effectrollformula": "", + "hascharges": false, + "nbcharges": 0, "items": {} } }, diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index cdf486e..9761342 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -158,13 +158,21 @@
  • - {{maneuver.name}} + {{maneuver.name}} + + {{maneuver.system.pha}} {{maneuver.system.ocv}} {{maneuver.system.dcv}} - {{maneuver.system.effects}} + {{maneuver.system.effects}} + {{#if maneuver.system.haseffectroll}} + + {{maneuver.system.effectrollformula}} + + {{/if}} +  
    @@ -314,7 +322,7 @@ - + @@ -325,7 +333,7 @@
  • {{char.label}} - +
    • {{/if}} {{/each}} diff --git a/templates/apps/combat-tracker.hbs b/templates/apps/combat-tracker.hbs index 1102abd..f8bc707 100644 --- a/templates/apps/combat-tracker.hbs +++ b/templates/apps/combat-tracker.hbs @@ -32,9 +32,12 @@ {{/if}} + {{log combat.flags}} + {{#if combatCount}} {{#if combat.round}} -

    Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}

    + +

    Turn {{combat.flags.world.turnData.turnNumber}} Segment {{combat.flags.world.turnData.segmentNumber}}

    {{else}}

    {{localize 'COMBAT.NotStarted'}}

    {{/if}} diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs index 82d5c6d..2e74664 100644 --- a/templates/items/item-skill-sheet.hbs +++ b/templates/items/item-skill-sheet.hbs @@ -17,7 +17,7 @@
    • - {{#select system.characteristic}} + {{#select (lower system.characteristic)}} {{#each config.rollCharac as |char key|}} {{/each}} {{/select}}
      • - {{#if (eq system.characteristic "manual")}} + {{#if (eq (lower system.characteristic) "manual")}}
      • diff --git a/templates/partials/partial-power-equipment-cost.hbs b/templates/partials/partial-power-equipment-cost.hbs index fc6b9ef..325dce8 100644 --- a/templates/partials/partial-power-equipment-cost.hbs +++ b/templates/partials/partial-power-equipment-cost.hbs @@ -1,6 +1,6 @@
    • - {{#select system.typemodifier}} + {{#select (lower system.typemodifier)}} {{#each config.powerTypeModifiers as |name key|}} {{/each}} @@ -31,6 +31,16 @@
      • + +
    • + +
      • + {{#if system.hascharges}} +
    • + +
      • + {{/if}} + {{#if quantityDone}} {{else}}