From a07f367b0cbe20400a5ff99d6c245caf367ee7ec Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 26 Aug 2023 09:48:07 +0200 Subject: [PATCH] Move repo to public area --- modules/hero6-actor-sheet.js | 15 +------ modules/hero6-actor.js | 40 ++++++------------ .../complications/{000114.log => 000118.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 16 +++---- packs/complications/LOG.old | 16 +++---- packs/complications/MANIFEST-000112 | Bin 135 -> 0 bytes packs/complications/MANIFEST-000116 | Bin 0 -> 135 bytes packs/equipment/{000116.log => 000120.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 16 +++---- packs/equipment/LOG.old | 16 +++---- .../{MANIFEST-000114 => MANIFEST-000118} | Bin 173 -> 173 bytes packs/maneuvers/{000106.log => 000110.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 16 +++---- packs/maneuvers/LOG.old | 16 +++---- packs/maneuvers/MANIFEST-000104 | Bin 134 -> 0 bytes packs/maneuvers/MANIFEST-000108 | Bin 0 -> 134 bytes packs/perks/{000114.log => 000118.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 16 +++---- packs/perks/LOG.old | 16 +++---- packs/perks/MANIFEST-000112 | Bin 134 -> 0 bytes packs/perks/MANIFEST-000116 | Bin 0 -> 134 bytes packs/powers/{000115.log => 000119.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 16 +++---- packs/powers/LOG.old | 16 +++---- .../{MANIFEST-000113 => MANIFEST-000117} | Bin 169 -> 169 bytes packs/skills/{000114.log => 000118.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +++---- packs/skills/LOG.old | 16 +++---- packs/skills/MANIFEST-000112 | Bin 135 -> 0 bytes packs/skills/MANIFEST-000116 | Bin 0 -> 135 bytes packs/talents/{000114.log => 000118.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 16 +++---- packs/talents/LOG.old | 16 +++---- packs/talents/MANIFEST-000112 | Bin 134 -> 0 bytes packs/talents/MANIFEST-000116 | Bin 0 -> 134 bytes system.json | 8 ++-- templates/actors/actor-sheet.hbs | 32 ++++++++++---- 44 files changed, 162 insertions(+), 171 deletions(-) rename packs/complications/{000114.log => 000118.log} (100%) delete mode 100644 packs/complications/MANIFEST-000112 create mode 100644 packs/complications/MANIFEST-000116 rename packs/equipment/{000116.log => 000120.log} (100%) rename packs/equipment/{MANIFEST-000114 => MANIFEST-000118} (73%) rename packs/maneuvers/{000106.log => 000110.log} (100%) delete mode 100644 packs/maneuvers/MANIFEST-000104 create mode 100644 packs/maneuvers/MANIFEST-000108 rename packs/perks/{000114.log => 000118.log} (100%) delete mode 100644 packs/perks/MANIFEST-000112 create mode 100644 packs/perks/MANIFEST-000116 rename packs/powers/{000115.log => 000119.log} (100%) rename packs/powers/{MANIFEST-000113 => MANIFEST-000117} (75%) rename packs/skills/{000114.log => 000118.log} (100%) delete mode 100644 packs/skills/MANIFEST-000112 create mode 100644 packs/skills/MANIFEST-000116 rename packs/talents/{000114.log => 000118.log} (100%) delete mode 100644 packs/talents/MANIFEST-000112 create mode 100644 packs/talents/MANIFEST-000116 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 c6d4338fd408c60c0e628c4e97a3d4a67fcad100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{xR!B3uL9SaAHtjrj7;U649pcQ-xR!B3ufp6G_7YA8My6s;2Idl$?@SZ_3D|@9Ktbj*ARhqSG71j> 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 2d46c6bb542c8a5f920fd5082348f06ffa2c2726..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmdPiVEjIjfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQbwj1RVrEHdZn2_) zM`~1ZS!!8crkQb4QFt1oC<7S4 diff --git a/packs/maneuvers/MANIFEST-000108 b/packs/maneuvers/MANIFEST-000108 new file mode 100644 index 0000000000000000000000000000000000000000..a295bf5e1dab14d64c00ece51ca963fd496abcd1 GIT binary patch literal 134 zcmdPiVEjIjfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQbwj1RVrEHdZn2_) zM`~1ZS!!8crkQb4QFt1oC<7S4X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HF{57HP_8bh1Oof~b U%tb6L`S)|}K-?lAw}gcS0D|NrDF6Tf diff --git a/packs/perks/MANIFEST-000116 b/packs/perks/MANIFEST-000116 new file mode 100644 index 0000000000000000000000000000000000000000..9301c93c9030ecebb5a522e0b2f11129b7d6ccf4 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=HFe3VTpBL@Q`Qz<6{ Ua~TVZ;@!#t<8 literal 0 HcmV?d00001 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 9e7d7c19dc4e2d1fc7c5cbf76a76fc6688f8a09d..93bfc8f2155ec8286a74559a5bbb6ce4a99870c9 100644 GIT binary patch delta 37 pcmZ3+Pj$a%Mj7(*m49w*$Y5XC^P9SbMkXy-;1^~bN2xI^N delta 37 pcmZ3`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81Ao59eJV_i3j7)`` V49rC=HoLQDMT59SKyC?(4FGSQBPsv@ diff --git a/packs/skills/MANIFEST-000116 b/packs/skills/MANIFEST-000116 new file mode 100644 index 0000000000000000000000000000000000000000..d800e529c6b982b8b6a49480b6a824cb688b5fe4 GIT binary patch literal 135 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAw~7RhliFfx^L VGBB61*oYSPtpst)fZPfe8vuH_BWwTw literal 0 HcmV?d00001 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 c4ab3860bd9e3fc73fd285a4bc70317730138a8a..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|d7<0w`5X+4Oof~b U%tb7G+I+HkAZ`(mTf)Kz0G;+Cvj6}9 diff --git a/packs/talents/MANIFEST-000116 b/packs/talents/MANIFEST-000116 new file mode 100644 index 0000000000000000000000000000000000000000..0e9aafd4e3327e27fc7eb5440ef89bad7c347078 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|dAUN-jT{V&Or@L* U%w;TmsREo5AZ{6uTfxEy0F4+T2LJ#7 literal 0 HcmV?d00001 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|}}
  • - + + + {{#if (eq mtype "mental")}} + + + + + + + {{else}} + {{/if}} + @@ -176,9 +187,14 @@ {{maneuver.system.pha}} + {{#if (eq ../mtype "mental")}} + {{maneuver.system.omcv}} + {{maneuver.system.dmcv}} + {{else}} {{maneuver.system.ocv}} {{maneuver.system.dcv}} - + {{/if}} + {{maneuver.system.effects}} {{#if maneuver.system.haseffectroll}} - - {{maneuver.name}} + + {{maneuver.name}} - {{maneuver.system.pha}} - {{maneuver.system.omcv}} - {{maneuver.system.dmcv}} + {{maneuver.system.pha}} + {{maneuver.system.omcv}} + {{maneuver.system.dmcv}} {{maneuver.system.effects}}