diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js index b0dc2b4..1440b96 100644 --- a/modules/hero6-actor-sheet.js +++ b/modules/hero6-actor-sheet.js @@ -166,21 +166,15 @@ export class Hero6ActorSheet extends ActorSheet { const li = $(event.currentTarget).parents(".item") this.actor.rollWeapon(li.data("item-id")); }); - html.find('.roll-mental-maneuver').click((event) => { - const li = $(event.currentTarget).parents(".item") - this.actor.rollMentalManeuver(li.data("item-id")); - }); html.find('.roll-power-attack').click((event) => { const li = $(event.currentTarget).parents(".item") this.actor.rollPowerAttack(li.data("item-id")); - }); - + }); html.find('.roll-direct').click((event) => { const rollFormula = $(event.currentTarget).data("roll-formula") const rollSource = $(event.currentTarget).data("roll-source") Hero6Utility.processDirectRoll( { actorId: this.actor.id, rollFormula: rollFormula, rollSource: rollSource, mode:"directroll"} ) - }); - + }); html.find('.roll-item').click((event) => { const li = $(event.currentTarget).parents(".item"); let itemId = li.data("item-id") @@ -196,11 +190,6 @@ export class Hero6ActorSheet extends ActorSheet { let itemId = li.data("item-id") this.actor.rollLiftDice(itemId); }); - 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 8632e7d..c085289 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -224,12 +224,20 @@ export class Hero6Actor extends Actor { /* -------------------------------------------- */ prepareManeuver(maneuver) { - - maneuver.roll = 11 + this.system.characteristics.ocv.value - if (Number(maneuver.system.ocv)) { - maneuver.roll += Number(maneuver.system.ocv) + if (maneuver.system.maneuvertype == "mental") { + maneuver.roll = 11 + this.system.characteristics.omcv.value + if (Number(maneuver.system.omcv)) { + maneuver.roll += Number(maneuver.system.omcv) + } else { + maneuver.noOMCV = true + } } else { - maneuver.noOCV = true + maneuver.roll = 11 + this.system.characteristics.ocv.value + if (Number(maneuver.system.ocv)) { + maneuver.roll += Number(maneuver.system.ocv) + } else { + maneuver.noOCV = true + } } } @@ -745,28 +753,6 @@ export class Hero6Actor extends Actor { console.log("Rolldata result", rollData) } /* -------------------------------------------- */ - rollManeuver(maneuverId) { - let skill = this.items.get(maneuverId) - 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) if (skill) { diff --git a/packs/complications/000114.log b/packs/complications/000118.log similarity index 100% rename from packs/complications/000114.log rename to packs/complications/000118.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index b59a6ba..2b6390e 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000116 diff --git a/packs/complications/LOG b/packs/complications/LOG index 88e5885..c11caae 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.658202 7f2deaffd6c0 Recovering log #110 -2023/08/26-05:35:25.710452 7f2deaffd6c0 Delete type=3 #108 -2023/08/26-05:35:25.710513 7f2deaffd6c0 Delete type=0 #110 -2023/08/26-05:36:09.833813 7f2b69bff6c0 Level-0 table #115: started -2023/08/26-05:36:09.833846 7f2b69bff6c0 Level-0 table #115: 0 bytes OK -2023/08/26-05:36:09.840534 7f2b69bff6c0 Delete type=0 #113 -2023/08/26-05:36:09.847596 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.847688 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.616025 7f2deaffd6c0 Recovering log #114 +2023/08/26-09:36:55.641371 7f2deaffd6c0 Delete type=3 #112 +2023/08/26-09:36:55.641419 7f2deaffd6c0 Delete type=0 #114 +2023/08/26-09:47:17.308368 7f2b69bff6c0 Level-0 table #119: started +2023/08/26-09:47:17.308393 7f2b69bff6c0 Level-0 table #119: 0 bytes OK +2023/08/26-09:47:17.348814 7f2b69bff6c0 Delete type=0 #117 +2023/08/26-09:47:17.377261 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.377290 7f2b69bff6c0 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 15784db..88e5885 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:19.953484 7f2debfff6c0 Recovering log #106 -2023/08/26-04:58:20.012916 7f2debfff6c0 Delete type=3 #104 -2023/08/26-04:58:20.013033 7f2debfff6c0 Delete type=0 #106 -2023/08/26-05:13:26.081356 7f2b69bff6c0 Level-0 table #111: started -2023/08/26-05:13:26.081421 7f2b69bff6c0 Level-0 table #111: 0 bytes OK -2023/08/26-05:13:26.089187 7f2b69bff6c0 Delete type=0 #109 -2023/08/26-05:13:26.089328 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.089355 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.658202 7f2deaffd6c0 Recovering log #110 +2023/08/26-05:35:25.710452 7f2deaffd6c0 Delete type=3 #108 +2023/08/26-05:35:25.710513 7f2deaffd6c0 Delete type=0 #110 +2023/08/26-05:36:09.833813 7f2b69bff6c0 Level-0 table #115: started +2023/08/26-05:36:09.833846 7f2b69bff6c0 Level-0 table #115: 0 bytes OK +2023/08/26-05:36:09.840534 7f2b69bff6c0 Delete type=0 #113 +2023/08/26-05:36:09.847596 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.847688 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/MANIFEST-000112 b/packs/complications/MANIFEST-000112 deleted file mode 100644 index c6d4338..0000000 Binary files a/packs/complications/MANIFEST-000112 and /dev/null differ diff --git a/packs/complications/MANIFEST-000116 b/packs/complications/MANIFEST-000116 new file mode 100644 index 0000000..4d84f45 Binary files /dev/null and b/packs/complications/MANIFEST-000116 differ diff --git a/packs/equipment/000116.log b/packs/equipment/000120.log similarity index 100% rename from packs/equipment/000116.log rename to packs/equipment/000120.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 3182b19..7530019 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000114 +MANIFEST-000118 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 73f9d54..d896c24 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.591750 7f2dea7fc6c0 Recovering log #112 -2023/08/26-05:35:25.654891 7f2dea7fc6c0 Delete type=3 #110 -2023/08/26-05:35:25.654982 7f2dea7fc6c0 Delete type=0 #112 -2023/08/26-05:36:09.796628 7f2b69bff6c0 Level-0 table #117: started -2023/08/26-05:36:09.796668 7f2b69bff6c0 Level-0 table #117: 0 bytes OK -2023/08/26-05:36:09.803598 7f2b69bff6c0 Delete type=0 #115 -2023/08/26-05:36:09.820108 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.820164 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.581647 7f2dea7fc6c0 Recovering log #116 +2023/08/26-09:36:55.613104 7f2dea7fc6c0 Delete type=3 #114 +2023/08/26-09:36:55.613185 7f2dea7fc6c0 Delete type=0 #116 +2023/08/26-09:47:17.031250 7f2b69bff6c0 Level-0 table #121: started +2023/08/26-09:47:17.031303 7f2b69bff6c0 Level-0 table #121: 0 bytes OK +2023/08/26-09:47:17.068068 7f2b69bff6c0 Delete type=0 #119 +2023/08/26-09:47:17.178686 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.245324 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index f4964e5..73f9d54 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:19.893099 7f2deb7fe6c0 Recovering log #108 -2023/08/26-04:58:19.950229 7f2deb7fe6c0 Delete type=3 #106 -2023/08/26-04:58:19.950315 7f2deb7fe6c0 Delete type=0 #108 -2023/08/26-05:13:26.059587 7f2b69bff6c0 Level-0 table #113: started -2023/08/26-05:13:26.059618 7f2b69bff6c0 Level-0 table #113: 0 bytes OK -2023/08/26-05:13:26.066099 7f2b69bff6c0 Delete type=0 #111 -2023/08/26-05:13:26.081276 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.089307 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.591750 7f2dea7fc6c0 Recovering log #112 +2023/08/26-05:35:25.654891 7f2dea7fc6c0 Delete type=3 #110 +2023/08/26-05:35:25.654982 7f2dea7fc6c0 Delete type=0 #112 +2023/08/26-05:36:09.796628 7f2b69bff6c0 Level-0 table #117: started +2023/08/26-05:36:09.796668 7f2b69bff6c0 Level-0 table #117: 0 bytes OK +2023/08/26-05:36:09.803598 7f2b69bff6c0 Delete type=0 #115 +2023/08/26-05:36:09.820108 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.820164 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000114 b/packs/equipment/MANIFEST-000118 similarity index 73% rename from packs/equipment/MANIFEST-000114 rename to packs/equipment/MANIFEST-000118 index a378d8b..91d53c1 100644 Binary files a/packs/equipment/MANIFEST-000114 and b/packs/equipment/MANIFEST-000118 differ diff --git a/packs/maneuvers/000106.log b/packs/maneuvers/000110.log similarity index 100% rename from packs/maneuvers/000106.log rename to packs/maneuvers/000110.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index c8e9be6..db6fa61 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000104 +MANIFEST-000108 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index e2b10ac..cde3019 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.713305 7f2debfff6c0 Recovering log #102 -2023/08/26-05:35:25.813680 7f2debfff6c0 Delete type=3 #100 -2023/08/26-05:35:25.813733 7f2debfff6c0 Delete type=0 #102 -2023/08/26-05:36:09.827049 7f2b69bff6c0 Level-0 table #107: started -2023/08/26-05:36:09.827083 7f2b69bff6c0 Level-0 table #107: 0 bytes OK -2023/08/26-05:36:09.833693 7f2b69bff6c0 Delete type=0 #105 -2023/08/26-05:36:09.847570 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.847666 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.640615 7f2dea7fc6c0 Recovering log #106 +2023/08/26-09:36:55.658513 7f2dea7fc6c0 Delete type=3 #104 +2023/08/26-09:36:55.658566 7f2dea7fc6c0 Delete type=0 #106 +2023/08/26-09:47:17.348939 7f2b69bff6c0 Level-0 table #111: started +2023/08/26-09:47:17.348972 7f2b69bff6c0 Level-0 table #111: 0 bytes OK +2023/08/26-09:47:17.377099 7f2b69bff6c0 Delete type=0 #109 +2023/08/26-09:47:17.377272 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.377305 7f2b69bff6c0 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 1101a84..e2b10ac 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:20.016031 7f2dea7fc6c0 Recovering log #98 -2023/08/26-04:58:20.111013 7f2dea7fc6c0 Delete type=3 #96 -2023/08/26-04:58:20.111139 7f2dea7fc6c0 Delete type=0 #98 -2023/08/26-05:13:26.089433 7f2b69bff6c0 Level-0 table #103: started -2023/08/26-05:13:26.089798 7f2b69bff6c0 Level-0 table #103: 0 bytes OK -2023/08/26-05:13:26.096668 7f2b69bff6c0 Delete type=0 #101 -2023/08/26-05:13:26.115684 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.115763 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.713305 7f2debfff6c0 Recovering log #102 +2023/08/26-05:35:25.813680 7f2debfff6c0 Delete type=3 #100 +2023/08/26-05:35:25.813733 7f2debfff6c0 Delete type=0 #102 +2023/08/26-05:36:09.827049 7f2b69bff6c0 Level-0 table #107: started +2023/08/26-05:36:09.827083 7f2b69bff6c0 Level-0 table #107: 0 bytes OK +2023/08/26-05:36:09.833693 7f2b69bff6c0 Delete type=0 #105 +2023/08/26-05:36:09.847570 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.847666 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000104 b/packs/maneuvers/MANIFEST-000104 deleted file mode 100644 index 2d46c6b..0000000 Binary files a/packs/maneuvers/MANIFEST-000104 and /dev/null differ diff --git a/packs/maneuvers/MANIFEST-000108 b/packs/maneuvers/MANIFEST-000108 new file mode 100644 index 0000000..a295bf5 Binary files /dev/null and b/packs/maneuvers/MANIFEST-000108 differ diff --git a/packs/perks/000114.log b/packs/perks/000118.log similarity index 100% rename from packs/perks/000114.log rename to packs/perks/000118.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index b59a6ba..2b6390e 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000116 diff --git a/packs/perks/LOG b/packs/perks/LOG index 1959333..24f68f6 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.714189 7f2deaffd6c0 Recovering log #110 -2023/08/26-05:35:25.838791 7f2deaffd6c0 Delete type=3 #108 -2023/08/26-05:35:25.838847 7f2deaffd6c0 Delete type=0 #110 -2023/08/26-05:36:09.840742 7f2b69bff6c0 Level-0 table #115: started -2023/08/26-05:36:09.840802 7f2b69bff6c0 Level-0 table #115: 0 bytes OK -2023/08/26-05:36:09.847326 7f2b69bff6c0 Delete type=0 #113 -2023/08/26-05:36:09.847619 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.847709 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.643370 7f2debfff6c0 Recovering log #114 +2023/08/26-09:36:55.661508 7f2debfff6c0 Delete type=3 #112 +2023/08/26-09:36:55.661568 7f2debfff6c0 Delete type=0 #114 +2023/08/26-09:47:17.415364 7f2b69bff6c0 Level-0 table #119: started +2023/08/26-09:47:17.415408 7f2b69bff6c0 Level-0 table #119: 0 bytes OK +2023/08/26-09:47:17.468404 7f2b69bff6c0 Delete type=0 #117 +2023/08/26-09:47:17.468554 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.468570 7f2b69bff6c0 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 5cb022c..1959333 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:20.016520 7f2debfff6c0 Recovering log #106 -2023/08/26-04:58:20.129984 7f2debfff6c0 Delete type=3 #104 -2023/08/26-04:58:20.130077 7f2debfff6c0 Delete type=0 #106 -2023/08/26-05:13:26.096833 7f2b69bff6c0 Level-0 table #111: started -2023/08/26-05:13:26.096889 7f2b69bff6c0 Level-0 table #111: 0 bytes OK -2023/08/26-05:13:26.105671 7f2b69bff6c0 Delete type=0 #109 -2023/08/26-05:13:26.115702 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.115741 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.714189 7f2deaffd6c0 Recovering log #110 +2023/08/26-05:35:25.838791 7f2deaffd6c0 Delete type=3 #108 +2023/08/26-05:35:25.838847 7f2deaffd6c0 Delete type=0 #110 +2023/08/26-05:36:09.840742 7f2b69bff6c0 Level-0 table #115: started +2023/08/26-05:36:09.840802 7f2b69bff6c0 Level-0 table #115: 0 bytes OK +2023/08/26-05:36:09.847326 7f2b69bff6c0 Delete type=0 #113 +2023/08/26-05:36:09.847619 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.847709 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/MANIFEST-000112 b/packs/perks/MANIFEST-000112 deleted file mode 100644 index 558e550..0000000 Binary files a/packs/perks/MANIFEST-000112 and /dev/null differ diff --git a/packs/perks/MANIFEST-000116 b/packs/perks/MANIFEST-000116 new file mode 100644 index 0000000..9301c93 Binary files /dev/null and b/packs/perks/MANIFEST-000116 differ diff --git a/packs/powers/000115.log b/packs/powers/000119.log similarity index 100% rename from packs/powers/000115.log rename to packs/powers/000119.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index f97fd0f..5ff346e 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000113 +MANIFEST-000117 diff --git a/packs/powers/LOG b/packs/powers/LOG index 40db3a0..9e15fe1 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.658202 7f2deb7fe6c0 Recovering log #111 -2023/08/26-05:35:25.710453 7f2deb7fe6c0 Delete type=3 #109 -2023/08/26-05:35:25.710530 7f2deb7fe6c0 Delete type=0 #111 -2023/08/26-05:36:09.820280 7f2b69bff6c0 Level-0 table #116: started -2023/08/26-05:36:09.820311 7f2b69bff6c0 Level-0 table #116: 0 bytes OK -2023/08/26-05:36:09.826570 7f2b69bff6c0 Delete type=0 #114 -2023/08/26-05:36:09.847536 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.847643 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.615731 7f2deb7fe6c0 Recovering log #115 +2023/08/26-09:36:55.638127 7f2deb7fe6c0 Delete type=3 #113 +2023/08/26-09:36:55.638240 7f2deb7fe6c0 Delete type=0 #115 +2023/08/26-09:47:17.273897 7f2b69bff6c0 Level-0 table #120: started +2023/08/26-09:47:17.273922 7f2b69bff6c0 Level-0 table #120: 0 bytes OK +2023/08/26-09:47:17.308253 7f2b69bff6c0 Delete type=0 #118 +2023/08/26-09:47:17.377250 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.377280 7f2b69bff6c0 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 b56a51e..40db3a0 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:19.953484 7f2dea7fc6c0 Recovering log #107 -2023/08/26-04:58:20.012935 7f2dea7fc6c0 Delete type=3 #105 -2023/08/26-04:58:20.013216 7f2dea7fc6c0 Delete type=0 #107 -2023/08/26-05:13:26.072863 7f2b69bff6c0 Level-0 table #112: started -2023/08/26-05:13:26.072888 7f2b69bff6c0 Level-0 table #112: 0 bytes OK -2023/08/26-05:13:26.080939 7f2b69bff6c0 Delete type=0 #110 -2023/08/26-05:13:26.089296 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.089347 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.658202 7f2deb7fe6c0 Recovering log #111 +2023/08/26-05:35:25.710453 7f2deb7fe6c0 Delete type=3 #109 +2023/08/26-05:35:25.710530 7f2deb7fe6c0 Delete type=0 #111 +2023/08/26-05:36:09.820280 7f2b69bff6c0 Level-0 table #116: started +2023/08/26-05:36:09.820311 7f2b69bff6c0 Level-0 table #116: 0 bytes OK +2023/08/26-05:36:09.826570 7f2b69bff6c0 Delete type=0 #114 +2023/08/26-05:36:09.847536 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.847643 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/MANIFEST-000113 b/packs/powers/MANIFEST-000117 similarity index 75% rename from packs/powers/MANIFEST-000113 rename to packs/powers/MANIFEST-000117 index 9e7d7c1..93bfc8f 100644 Binary files a/packs/powers/MANIFEST-000113 and b/packs/powers/MANIFEST-000117 differ diff --git a/packs/skills/000114.log b/packs/skills/000118.log similarity index 100% rename from packs/skills/000114.log rename to packs/skills/000118.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index b59a6ba..2b6390e 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000116 diff --git a/packs/skills/LOG b/packs/skills/LOG index 0b586dd..0fcd2ca 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.591750 7f2deaffd6c0 Recovering log #110 -2023/08/26-05:35:25.654890 7f2deaffd6c0 Delete type=3 #108 -2023/08/26-05:35:25.654974 7f2deaffd6c0 Delete type=0 #110 -2023/08/26-05:36:09.813203 7f2b69bff6c0 Level-0 table #115: started -2023/08/26-05:36:09.813236 7f2b69bff6c0 Level-0 table #115: 0 bytes OK -2023/08/26-05:36:09.819942 7f2b69bff6c0 Delete type=0 #113 -2023/08/26-05:36:09.820154 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.820177 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.581650 7f2deaffd6c0 Recovering log #114 +2023/08/26-09:36:55.613104 7f2deaffd6c0 Delete type=3 #112 +2023/08/26-09:36:55.613190 7f2deaffd6c0 Delete type=0 #114 +2023/08/26-09:47:17.245521 7f2b69bff6c0 Level-0 table #119: started +2023/08/26-09:47:17.245592 7f2b69bff6c0 Level-0 table #119: 0 bytes OK +2023/08/26-09:47:17.273789 7f2b69bff6c0 Delete type=0 #117 +2023/08/26-09:47:17.377230 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.377298 7f2b69bff6c0 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 2a8fe1c..0b586dd 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:19.893100 7f2deaffd6c0 Recovering log #106 -2023/08/26-04:58:19.950231 7f2deaffd6c0 Delete type=3 #104 -2023/08/26-04:58:19.950317 7f2deaffd6c0 Delete type=0 #106 -2023/08/26-05:13:26.066187 7f2b69bff6c0 Level-0 table #111: started -2023/08/26-05:13:26.066210 7f2b69bff6c0 Level-0 table #111: 0 bytes OK -2023/08/26-05:13:26.072734 7f2b69bff6c0 Delete type=0 #109 -2023/08/26-05:13:26.081328 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.089318 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.591750 7f2deaffd6c0 Recovering log #110 +2023/08/26-05:35:25.654890 7f2deaffd6c0 Delete type=3 #108 +2023/08/26-05:35:25.654974 7f2deaffd6c0 Delete type=0 #110 +2023/08/26-05:36:09.813203 7f2b69bff6c0 Level-0 table #115: started +2023/08/26-05:36:09.813236 7f2b69bff6c0 Level-0 table #115: 0 bytes OK +2023/08/26-05:36:09.819942 7f2b69bff6c0 Delete type=0 #113 +2023/08/26-05:36:09.820154 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.820177 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000112 b/packs/skills/MANIFEST-000112 deleted file mode 100644 index 442ca6d..0000000 Binary files a/packs/skills/MANIFEST-000112 and /dev/null differ diff --git a/packs/skills/MANIFEST-000116 b/packs/skills/MANIFEST-000116 new file mode 100644 index 0000000..d800e52 Binary files /dev/null and b/packs/skills/MANIFEST-000116 differ diff --git a/packs/talents/000114.log b/packs/talents/000118.log similarity index 100% rename from packs/talents/000114.log rename to packs/talents/000118.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index b59a6ba..2b6390e 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000116 diff --git a/packs/talents/LOG b/packs/talents/LOG index 43ac344..e722aff 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -2023/08/26-05:35:25.815813 7f2deb7fe6c0 Recovering log #110 -2023/08/26-05:35:25.893020 7f2deb7fe6c0 Delete type=3 #108 -2023/08/26-05:35:25.893112 7f2deb7fe6c0 Delete type=0 #110 -2023/08/26-05:36:09.847777 7f2b69bff6c0 Level-0 table #115: started -2023/08/26-05:36:09.847839 7f2b69bff6c0 Level-0 table #115: 0 bytes OK -2023/08/26-05:36:09.855108 7f2b69bff6c0 Delete type=0 #113 -2023/08/26-05:36:09.855336 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/26-05:36:09.855380 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-09:36:55.660955 7f2deb7fe6c0 Recovering log #114 +2023/08/26-09:36:55.671184 7f2deb7fe6c0 Delete type=3 #112 +2023/08/26-09:36:55.671335 7f2deb7fe6c0 Delete type=0 #114 +2023/08/26-09:47:17.377408 7f2b69bff6c0 Level-0 table #119: started +2023/08/26-09:47:17.377442 7f2b69bff6c0 Level-0 table #119: 0 bytes OK +2023/08/26-09:47:17.415173 7f2b69bff6c0 Delete type=0 #117 +2023/08/26-09:47:17.468538 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-09:47:17.468563 7f2b69bff6c0 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 a417ac1..43ac344 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2023/08/26-04:58:20.113830 7f2deb7fe6c0 Recovering log #106 -2023/08/26-04:58:20.187880 7f2deb7fe6c0 Delete type=3 #104 -2023/08/26-04:58:20.187957 7f2deb7fe6c0 Delete type=0 #106 -2023/08/26-05:13:26.105823 7f2b69bff6c0 Level-0 table #111: started -2023/08/26-05:13:26.105848 7f2b69bff6c0 Level-0 table #111: 0 bytes OK -2023/08/26-05:13:26.115575 7f2b69bff6c0 Delete type=0 #109 -2023/08/26-05:13:26.115715 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/26-05:13:26.115753 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-05:35:25.815813 7f2deb7fe6c0 Recovering log #110 +2023/08/26-05:35:25.893020 7f2deb7fe6c0 Delete type=3 #108 +2023/08/26-05:35:25.893112 7f2deb7fe6c0 Delete type=0 #110 +2023/08/26-05:36:09.847777 7f2b69bff6c0 Level-0 table #115: started +2023/08/26-05:36:09.847839 7f2b69bff6c0 Level-0 table #115: 0 bytes OK +2023/08/26-05:36:09.855108 7f2b69bff6c0 Delete type=0 #113 +2023/08/26-05:36:09.855336 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/26-05:36:09.855380 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000112 b/packs/talents/MANIFEST-000112 deleted file mode 100644 index c4ab386..0000000 Binary files a/packs/talents/MANIFEST-000112 and /dev/null differ diff --git a/packs/talents/MANIFEST-000116 b/packs/talents/MANIFEST-000116 new file mode 100644 index 0000000..0e9aafd Binary files /dev/null and b/packs/talents/MANIFEST-000116 differ diff --git a/system.json b/system.json index 6b40b62..655a1a4 100644 --- a/system.json +++ b/system.json @@ -5,7 +5,7 @@ "flags": {} } ], - "description": "Hero System v6E for FoundryVTT (Official)", + "description": "Hero System 6E for FoundryVTT (Official)", "esmodules": [ "modules/hero6-main.js" ], @@ -91,14 +91,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.15", + "version": "11.0.16", "compatibility": { "minimum": "11", "verified": "11" }, - "title": "Hero System v6 for FoundrtVTT (Official)", + "title": "Hero System 6E Basic (Official)", "manifest": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/raw/branch/master/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.15.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.16.zip", "url": "https://www.uberwald.me/public/uberwald/", "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp", "id": "fvtt-hero-system-6" diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 4ee41b1..579a47b 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -149,21 +149,32 @@ - {{#each maneuvers as |mlist key|}} + {{#each maneuvers as |mlist mtype|}}