From 20c49eb48c9b94b14c6381bd0ef270f4a9635fb7 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 15 Aug 2023 22:12:02 +0200 Subject: [PATCH] Fix Maneuvers --- modules/hero6-actor-sheet.js | 13 ++++++ modules/hero6-actor.js | 5 +++ modules/hero6-utility.js | 1 + .../complications/{000068.log => 000072.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 16 +++---- packs/complications/LOG.old | 16 +++---- packs/complications/MANIFEST-000066 | Bin 135 -> 0 bytes packs/complications/MANIFEST-000070 | Bin 0 -> 135 bytes packs/equipment/{000068.log => 000072.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +++--- packs/equipment/LOG.old | 14 +++--- packs/equipment/MANIFEST-000066 | Bin 65 -> 0 bytes packs/equipment/MANIFEST-000070 | Bin 0 -> 65 bytes packs/maneuvers/{000060.log => 000064.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 16 +++---- packs/maneuvers/LOG.old | 16 +++---- packs/maneuvers/MANIFEST-000058 | Bin 134 -> 0 bytes packs/maneuvers/MANIFEST-000062 | Bin 0 -> 134 bytes packs/perks/{000068.log => 000072.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 16 +++---- packs/perks/LOG.old | 16 +++---- packs/perks/MANIFEST-000066 | Bin 134 -> 0 bytes packs/perks/MANIFEST-000070 | Bin 0 -> 134 bytes packs/powers/{000069.log => 000073.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 16 +++---- packs/powers/LOG.old | 16 +++---- .../{MANIFEST-000067 => MANIFEST-000071} | Bin 169 -> 169 bytes packs/skills/{000068.log => 000072.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +++---- packs/skills/LOG.old | 16 +++---- packs/skills/MANIFEST-000066 | Bin 135 -> 0 bytes packs/skills/MANIFEST-000070 | Bin 0 -> 135 bytes packs/talents/{000068.log => 000072.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 16 +++---- packs/talents/LOG.old | 16 +++---- packs/talents/MANIFEST-000066 | Bin 134 -> 0 bytes packs/talents/MANIFEST-000070 | Bin 0 -> 134 bytes packs/weapons/{000068.log => 000072.log} | 0 packs/weapons/CURRENT | 2 +- packs/weapons/LOG | 14 +++--- packs/weapons/LOG.old | 14 +++--- packs/weapons/MANIFEST-000066 | Bin 65 -> 0 bytes packs/weapons/MANIFEST-000070 | Bin 0 -> 65 bytes styles/simple.css | 4 ++ system.json | 4 +- templates/actors/actor-sheet.hbs | 42 +++++++++--------- templates/items/item-advantage-sheet.hbs | 2 + templates/items/item-armor-sheet.hbs | 2 + templates/items/item-complication-sheet.hbs | 3 ++ templates/items/item-currency-sheet.hbs | 2 + templates/items/item-equipment-sheet.hbs | 2 + templates/items/item-limitation-sheet.hbs | 5 ++- templates/items/item-maneuver-sheet.hbs | 3 ++ templates/items/item-perk-sheet.hbs | 3 ++ templates/items/item-power-sheet.hbs | 3 ++ templates/items/item-skill-sheet.hbs | 3 ++ templates/items/item-talent-sheet.hbs | 4 +- templates/items/item-weapon-sheet.hbs | 2 + .../partials/partial-item-description.hbs | 7 --- templates/partials/partial-item-nav.hbs | 1 + templates/partials/partial-item-notes.hbs | 8 ++++ 68 files changed, 220 insertions(+), 163 deletions(-) rename packs/complications/{000068.log => 000072.log} (100%) delete mode 100644 packs/complications/MANIFEST-000066 create mode 100644 packs/complications/MANIFEST-000070 rename packs/equipment/{000068.log => 000072.log} (100%) delete mode 100644 packs/equipment/MANIFEST-000066 create mode 100644 packs/equipment/MANIFEST-000070 rename packs/maneuvers/{000060.log => 000064.log} (100%) delete mode 100644 packs/maneuvers/MANIFEST-000058 create mode 100644 packs/maneuvers/MANIFEST-000062 rename packs/perks/{000068.log => 000072.log} (100%) delete mode 100644 packs/perks/MANIFEST-000066 create mode 100644 packs/perks/MANIFEST-000070 rename packs/powers/{000069.log => 000073.log} (100%) rename packs/powers/{MANIFEST-000067 => MANIFEST-000071} (75%) rename packs/skills/{000068.log => 000072.log} (100%) delete mode 100644 packs/skills/MANIFEST-000066 create mode 100644 packs/skills/MANIFEST-000070 rename packs/talents/{000068.log => 000072.log} (100%) delete mode 100644 packs/talents/MANIFEST-000066 create mode 100644 packs/talents/MANIFEST-000070 rename packs/weapons/{000068.log => 000072.log} (100%) delete mode 100644 packs/weapons/MANIFEST-000066 create mode 100644 packs/weapons/MANIFEST-000070 create mode 100644 templates/partials/partial-item-notes.hbs diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js index 4f55840..7a63865 100644 --- a/modules/hero6-actor-sheet.js +++ b/modules/hero6-actor-sheet.js @@ -46,6 +46,7 @@ export class Hero6ActorSheet extends ActorSheet { complications: this.actor.getComplications( ), maneuvers: this.actor.getManeuvers( ), nonstockmaneuvers: this.actor.getNonStockManeuvers(), + allmaneuvers: this.actor.getAllManeuvers(), weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ), armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())), shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())), @@ -74,7 +75,9 @@ export class Hero6ActorSheet extends ActorSheet { editScore: this.options.editScore, isGM: game.user.isGM } + this.formData = formData; + this.stockManeuverDisplayed = false console.log("PC : ", formData, this.object); return formData; @@ -198,6 +201,16 @@ export class Hero6ActorSheet extends ActorSheet { this.actor.abortAction() }); + html.find(".show-stock-maneuver").click((event) => { + if ( !this.stockManeuverDisplayed) { + $('div .maneuver-list').removeClass('maneuver-is-stock'); + this.stockManeuverDisplayed = true + } else { + $('div .maneuver-list').addClass('maneuver-is-stock'); + this.stockManeuverDisplayed = false + } + }); + html.find('.lock-unlock-sheet').click((event) => { this.options.editScore = !this.options.editScore; this.render(true); diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index 0a0f274..bf48c42 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -311,6 +311,11 @@ export class Hero6Actor extends Actor { Hero6Utility.sortArrayObjectsByName(maneuvers.defensive) return maneuvers } + getAllManeuvers() { + let maneuvers = this.items.filter(item => item.type == "maneuver") + Hero6Utility.sortArrayObjectsByName(maneuvers) + return maneuvers + } getNonStockManeuvers() { let maneuvers = this.items.filter(item => item.type == "maneuver" && !item.system.isstock) Hero6Utility.sortArrayObjectsByName(maneuvers) diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index 86c4b2f..5fcb5ea 100644 --- a/modules/hero6-utility.js +++ b/modules/hero6-utility.js @@ -163,6 +163,7 @@ export class Hero6Utility { 'systems/fvtt-hero-system-6/templates/partials/partial-options-abilities.hbs', 'systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs', 'systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs', + 'systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs', 'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs', 'systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs', 'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs', diff --git a/packs/complications/000068.log b/packs/complications/000072.log similarity index 100% rename from packs/complications/000068.log rename to packs/complications/000072.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index 7873dc6..bcf1079 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000066 +MANIFEST-000070 diff --git a/packs/complications/LOG b/packs/complications/LOG index 814794f..bf0d2da 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -2023/08/10-13:03:20.564375 7fd68f7fe6c0 Recovering log #64 -2023/08/10-13:03:20.579793 7fd68f7fe6c0 Delete type=3 #62 -2023/08/10-13:03:20.579835 7fd68f7fe6c0 Delete type=0 #64 -2023/08/10-13:05:41.069254 7fd40dfff6c0 Level-0 table #69: started -2023/08/10-13:05:41.069298 7fd40dfff6c0 Level-0 table #69: 0 bytes OK -2023/08/10-13:05:41.080890 7fd40dfff6c0 Delete type=0 #67 -2023/08/10-13:05:41.092975 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/10-13:05:41.100392 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/15-21:47:51.923693 7fa0ddffb6c0 Recovering log #68 +2023/08/15-21:47:52.020246 7fa0ddffb6c0 Delete type=3 #66 +2023/08/15-21:47:52.020324 7fa0ddffb6c0 Delete type=0 #68 +2023/08/15-22:11:19.852100 7f9e3ffff6c0 Level-0 table #73: started +2023/08/15-22:11:19.852160 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK +2023/08/15-22:11:19.858657 7f9e3ffff6c0 Delete type=0 #71 +2023/08/15-22:11:19.859003 7f9e3ffff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/15-22:11:19.859027 7f9e3ffff6c0 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 7d5ea4b..814794f 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -1,8 +1,8 @@ -2023/08/09-19:54:51.996463 7fd68effd6c0 Recovering log #60 -2023/08/09-19:54:52.012482 7fd68effd6c0 Delete type=3 #58 -2023/08/09-19:54:52.012521 7fd68effd6c0 Delete type=0 #60 -2023/08/09-22:32:48.122436 7fd40dfff6c0 Level-0 table #65: started -2023/08/09-22:32:48.122465 7fd40dfff6c0 Level-0 table #65: 0 bytes OK -2023/08/09-22:32:48.140182 7fd40dfff6c0 Delete type=0 #63 -2023/08/09-22:32:48.152651 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) -2023/08/09-22:32:48.161955 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/10-13:03:20.564375 7fd68f7fe6c0 Recovering log #64 +2023/08/10-13:03:20.579793 7fd68f7fe6c0 Delete type=3 #62 +2023/08/10-13:03:20.579835 7fd68f7fe6c0 Delete type=0 #64 +2023/08/10-13:05:41.069254 7fd40dfff6c0 Level-0 table #69: started +2023/08/10-13:05:41.069298 7fd40dfff6c0 Level-0 table #69: 0 bytes OK +2023/08/10-13:05:41.080890 7fd40dfff6c0 Delete type=0 #67 +2023/08/10-13:05:41.092975 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/10-13:05:41.100392 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) diff --git a/packs/complications/MANIFEST-000066 b/packs/complications/MANIFEST-000066 deleted file mode 100644 index 8f6a02472dc7dfb0df3f56ec2eda8514e26b9732..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{Re-oIK&~4L0|5S@6I=iQ diff --git a/packs/equipment/MANIFEST-000070 b/packs/equipment/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..aa5ef8a0719bf3292295213d828b48878da5ee18 GIT binary patch literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAeo_DSYyKPzj7;vF49p%Z R3>P0Xn1Z+-K&}@H0{{j@6VLzv literal 0 HcmV?d00001 diff --git a/packs/maneuvers/000060.log b/packs/maneuvers/000064.log similarity index 100% rename from packs/maneuvers/000060.log rename to packs/maneuvers/000064.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 717cf9a..5ca571d 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000062 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index d53f19e..4692f24 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,8 +1,8 @@ -2023/08/10-13:03:20.566148 7fd6a4bfa6c0 Recovering log #56 -2023/08/10-13:03:20.582806 7fd6a4bfa6c0 Delete type=3 #54 -2023/08/10-13:03:20.582865 7fd6a4bfa6c0 Delete type=0 #56 -2023/08/10-13:05:41.081044 7fd40dfff6c0 Level-0 table #61: started -2023/08/10-13:05:41.081087 7fd40dfff6c0 Level-0 table #61: 0 bytes OK -2023/08/10-13:05:41.092838 7fd40dfff6c0 Delete type=0 #59 -2023/08/10-13:05:41.100288 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/10-13:05:41.109268 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/15-21:47:51.927283 7fa0dcff96c0 Recovering log #60 +2023/08/15-21:47:52.038744 7fa0dcff96c0 Delete type=3 #58 +2023/08/15-21:47:52.038839 7fa0dcff96c0 Delete type=0 #60 +2023/08/15-22:11:19.865715 7f9e3ffff6c0 Level-0 table #65: started +2023/08/15-22:11:19.865740 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK +2023/08/15-22:11:19.872425 7f9e3ffff6c0 Delete type=0 #63 +2023/08/15-22:11:19.879299 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/15-22:11:19.879345 7f9e3ffff6c0 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 8104ae7..d53f19e 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,8 +1,8 @@ -2023/08/09-19:54:51.998063 7fd68f7fe6c0 Recovering log #52 -2023/08/09-19:54:52.015485 7fd68f7fe6c0 Delete type=3 #50 -2023/08/09-19:54:52.015523 7fd68f7fe6c0 Delete type=0 #52 -2023/08/09-22:32:48.140349 7fd40dfff6c0 Level-0 table #57: started -2023/08/09-22:32:48.140375 7fd40dfff6c0 Level-0 table #57: 0 bytes OK -2023/08/09-22:32:48.152529 7fd40dfff6c0 Delete type=0 #55 -2023/08/09-22:32:48.161932 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) -2023/08/09-22:32:48.168159 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/10-13:03:20.566148 7fd6a4bfa6c0 Recovering log #56 +2023/08/10-13:03:20.582806 7fd6a4bfa6c0 Delete type=3 #54 +2023/08/10-13:03:20.582865 7fd6a4bfa6c0 Delete type=0 #56 +2023/08/10-13:05:41.081044 7fd40dfff6c0 Level-0 table #61: started +2023/08/10-13:05:41.081087 7fd40dfff6c0 Level-0 table #61: 0 bytes OK +2023/08/10-13:05:41.092838 7fd40dfff6c0 Delete type=0 #59 +2023/08/10-13:05:41.100288 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) +2023/08/10-13:05:41.109268 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000058 b/packs/maneuvers/MANIFEST-000058 deleted file mode 100644 index 9b288c14fe27173c508c31b324143f070d85b733..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmdPiVEjIjfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQbwj1RVrEHdZn2_) zM`~1ZS!!8crkQb4QFt1oC<7S4uWYnXEY( Um~B|3aw55vKwKLj*N#OB0J=XRy#N3J diff --git a/packs/maneuvers/MANIFEST-000062 b/packs/maneuvers/MANIFEST-000062 new file mode 100644 index 0000000000000000000000000000000000000000..7f8d14d3846a5408ba0ff994d4a463d14ec1b3fa GIT binary patch literal 134 zcmdPiVEjIjfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQbwj1RVrEHdZn2_) zM`~1ZS!!8crkQb4QFt1oC<7S4R)J192UITqhPO0Ls-O!2kdN literal 0 HcmV?d00001 diff --git a/packs/perks/000068.log b/packs/perks/000072.log similarity index 100% rename from packs/perks/000068.log rename to packs/perks/000072.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index 7873dc6..bcf1079 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000066 +MANIFEST-000070 diff --git a/packs/perks/LOG b/packs/perks/LOG index 88938de..ce363af 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,8 +1,8 @@ -2023/08/10-13:03:20.581819 7fd68f7fe6c0 Recovering log #64 -2023/08/10-13:03:20.598440 7fd68f7fe6c0 Delete type=3 #62 -2023/08/10-13:03:20.598503 7fd68f7fe6c0 Delete type=0 #64 -2023/08/10-13:05:41.093002 7fd40dfff6c0 Level-0 table #69: started -2023/08/10-13:05:41.093032 7fd40dfff6c0 Level-0 table #69: 0 bytes OK -2023/08/10-13:05:41.100152 7fd40dfff6c0 Delete type=0 #67 -2023/08/10-13:05:41.109249 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/10-13:05:41.109302 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/15-21:47:52.040277 7fa0ddffb6c0 Recovering log #68 +2023/08/15-21:47:52.138553 7fa0ddffb6c0 Delete type=3 #66 +2023/08/15-21:47:52.138627 7fa0ddffb6c0 Delete type=0 #68 +2023/08/15-22:11:19.859141 7f9e3ffff6c0 Level-0 table #73: started +2023/08/15-22:11:19.859174 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK +2023/08/15-22:11:19.865615 7f9e3ffff6c0 Delete type=0 #71 +2023/08/15-22:11:19.879276 7f9e3ffff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/15-22:11:19.879335 7f9e3ffff6c0 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 3657148..88938de 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/08/09-19:54:52.014139 7fd68effd6c0 Recovering log #60 -2023/08/09-19:54:52.030828 7fd68effd6c0 Delete type=3 #58 -2023/08/09-19:54:52.030868 7fd68effd6c0 Delete type=0 #60 -2023/08/09-22:32:48.152675 7fd40dfff6c0 Level-0 table #65: started -2023/08/09-22:32:48.152695 7fd40dfff6c0 Level-0 table #65: 0 bytes OK -2023/08/09-22:32:48.161677 7fd40dfff6c0 Delete type=0 #63 -2023/08/09-22:32:48.168140 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) -2023/08/09-22:32:48.168192 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/10-13:03:20.581819 7fd68f7fe6c0 Recovering log #64 +2023/08/10-13:03:20.598440 7fd68f7fe6c0 Delete type=3 #62 +2023/08/10-13:03:20.598503 7fd68f7fe6c0 Delete type=0 #64 +2023/08/10-13:05:41.093002 7fd40dfff6c0 Level-0 table #69: started +2023/08/10-13:05:41.093032 7fd40dfff6c0 Level-0 table #69: 0 bytes OK +2023/08/10-13:05:41.100152 7fd40dfff6c0 Delete type=0 #67 +2023/08/10-13:05:41.109249 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) +2023/08/10-13:05:41.109302 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end) diff --git a/packs/perks/MANIFEST-000066 b/packs/perks/MANIFEST-000066 deleted file mode 100644 index 3c9d05abbdd92afb57e527b94ba9ccf3b9230994..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=HFyotf*`y336OwODP U%q}b}il=|i0&!h{TsIaL0Dzt&5dZ)H diff --git a/packs/perks/MANIFEST-000070 b/packs/perks/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..6b247c6acb940d3219b237739ba4f6b30d844f45 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=HFe3agMRSpJ5CU;H- UW)BvYC8@6QAg%|H>&3zX0B5Novj6}9 literal 0 HcmV?d00001 diff --git a/packs/powers/000069.log b/packs/powers/000073.log similarity index 100% rename from packs/powers/000069.log rename to packs/powers/000073.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index 0094dac..be93edb 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000067 +MANIFEST-000071 diff --git a/packs/powers/LOG b/packs/powers/LOG index c11061f..e1bba01 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,8 @@ -2023/08/10-13:03:20.550530 7fd6a4bfa6c0 Recovering log #65 -2023/08/10-13:03:20.564384 7fd6a4bfa6c0 Delete type=3 #63 -2023/08/10-13:03:20.564676 7fd6a4bfa6c0 Delete type=0 #65 -2023/08/10-13:05:41.056785 7fd40dfff6c0 Level-0 table #70: started -2023/08/10-13:05:41.056809 7fd40dfff6c0 Level-0 table #70: 0 bytes OK -2023/08/10-13:05:41.069063 7fd40dfff6c0 Delete type=0 #68 -2023/08/10-13:05:41.081017 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/10-13:05:41.092990 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/15-21:47:51.861656 7fa0dcff96c0 Recovering log #69 +2023/08/15-21:47:51.916356 7fa0dcff96c0 Delete type=3 #67 +2023/08/15-21:47:51.916435 7fa0dcff96c0 Delete type=0 #69 +2023/08/15-22:11:19.843844 7f9e3ffff6c0 Level-0 table #74: started +2023/08/15-22:11:19.843905 7f9e3ffff6c0 Level-0 table #74: 0 bytes OK +2023/08/15-22:11:19.851729 7f9e3ffff6c0 Delete type=0 #72 +2023/08/15-22:11:19.858992 7f9e3ffff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/15-22:11:19.859036 7f9e3ffff6c0 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 9fd5c96..c11061f 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -1,8 +1,8 @@ -2023/08/09-19:54:51.978931 7fd68f7fe6c0 Recovering log #60 -2023/08/09-19:54:51.996667 7fd68f7fe6c0 Delete type=3 #58 -2023/08/09-19:54:51.996711 7fd68f7fe6c0 Delete type=0 #60 -2023/08/09-22:32:48.104080 7fd40dfff6c0 Level-0 table #66: started -2023/08/09-22:32:48.104109 7fd40dfff6c0 Level-0 table #66: 0 bytes OK -2023/08/09-22:32:48.122280 7fd40dfff6c0 Delete type=0 #64 -2023/08/09-22:32:48.140320 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) -2023/08/09-22:32:48.152663 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/10-13:03:20.550530 7fd6a4bfa6c0 Recovering log #65 +2023/08/10-13:03:20.564384 7fd6a4bfa6c0 Delete type=3 #63 +2023/08/10-13:03:20.564676 7fd6a4bfa6c0 Delete type=0 #65 +2023/08/10-13:05:41.056785 7fd40dfff6c0 Level-0 table #70: started +2023/08/10-13:05:41.056809 7fd40dfff6c0 Level-0 table #70: 0 bytes OK +2023/08/10-13:05:41.069063 7fd40dfff6c0 Delete type=0 #68 +2023/08/10-13:05:41.081017 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/10-13:05:41.092990 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) diff --git a/packs/powers/MANIFEST-000067 b/packs/powers/MANIFEST-000071 similarity index 75% rename from packs/powers/MANIFEST-000067 rename to packs/powers/MANIFEST-000071 index b25b2fbca3e9eda5a641ced9d9fe2df0ddb6eeeb..3682c12fbf80c4f536dd3109b76ef2a7273df18a 100644 GIT binary patch delta 37 pcmZ3`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81Ao2_{0*5#l7@3?o V8JJyIY((ohYC&8VAlHq>1^`oMAy5DS diff --git a/packs/skills/MANIFEST-000070 b/packs/skills/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..1aac3bae62dd292e27e8c1bece684ada835e2ab1 GIT binary patch literal 135 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAywL|ix+7@6ET V8JIm-Y$p6X=m6q+0J&Z)HUM;yBP##^ literal 0 HcmV?d00001 diff --git a/packs/talents/000068.log b/packs/talents/000072.log similarity index 100% rename from packs/talents/000068.log rename to packs/talents/000072.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index 7873dc6..bcf1079 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000066 +MANIFEST-000070 diff --git a/packs/talents/LOG b/packs/talents/LOG index 75caefb..5eb06fd 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -2023/08/10-13:03:20.584203 7fd6a4bfa6c0 Recovering log #64 -2023/08/10-13:03:20.602339 7fd6a4bfa6c0 Delete type=3 #62 -2023/08/10-13:03:20.602426 7fd6a4bfa6c0 Delete type=0 #64 -2023/08/10-13:05:41.100405 7fd40dfff6c0 Level-0 table #69: started -2023/08/10-13:05:41.100432 7fd40dfff6c0 Level-0 table #69: 0 bytes OK -2023/08/10-13:05:41.109117 7fd40dfff6c0 Delete type=0 #67 -2023/08/10-13:05:41.109289 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/10-13:05:41.109316 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/15-21:47:52.052796 7fa0de7fc6c0 Recovering log #68 +2023/08/15-21:47:52.154403 7fa0de7fc6c0 Delete type=3 #66 +2023/08/15-21:47:52.154479 7fa0de7fc6c0 Delete type=0 #68 +2023/08/15-22:11:19.872538 7f9e3ffff6c0 Level-0 table #73: started +2023/08/15-22:11:19.872564 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK +2023/08/15-22:11:19.878867 7f9e3ffff6c0 Delete type=0 #71 +2023/08/15-22:11:19.879310 7f9e3ffff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/15-22:11:19.879353 7f9e3ffff6c0 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 6b101bb..75caefb 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2023/08/09-19:54:52.016781 7fd68f7fe6c0 Recovering log #60 -2023/08/09-19:54:52.033878 7fd68f7fe6c0 Delete type=3 #58 -2023/08/09-19:54:52.033921 7fd68f7fe6c0 Delete type=0 #60 -2023/08/09-22:32:48.161969 7fd40dfff6c0 Level-0 table #65: started -2023/08/09-22:32:48.162008 7fd40dfff6c0 Level-0 table #65: 0 bytes OK -2023/08/09-22:32:48.168054 7fd40dfff6c0 Delete type=0 #63 -2023/08/09-22:32:48.168167 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) -2023/08/09-22:32:48.168181 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/10-13:03:20.584203 7fd6a4bfa6c0 Recovering log #64 +2023/08/10-13:03:20.602339 7fd6a4bfa6c0 Delete type=3 #62 +2023/08/10-13:03:20.602426 7fd6a4bfa6c0 Delete type=0 #64 +2023/08/10-13:05:41.100405 7fd40dfff6c0 Level-0 table #69: started +2023/08/10-13:05:41.100432 7fd40dfff6c0 Level-0 table #69: 0 bytes OK +2023/08/10-13:05:41.109117 7fd40dfff6c0 Delete type=0 #67 +2023/08/10-13:05:41.109289 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/10-13:05:41.109316 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000066 b/packs/talents/MANIFEST-000066 deleted file mode 100644 index 8a3526622e32ae3b0786a0be349222ad3413afb7..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|`GVSJehvmkCTC6t UW)~K|RHbe&5Z49Bbz|WJ0Fx{tF8}}l diff --git a/packs/talents/MANIFEST-000070 b/packs/talents/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..e877afe523a3f690aecd7c24a21bd158c54b812e 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|dAa)er5p^5OzxZv U%pNR!52l;;gSZ|*t``d*0Hoa`Pyhe` literal 0 HcmV?d00001 diff --git a/packs/weapons/000068.log b/packs/weapons/000072.log similarity index 100% rename from packs/weapons/000068.log rename to packs/weapons/000072.log diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT index 7873dc6..bcf1079 100644 --- a/packs/weapons/CURRENT +++ b/packs/weapons/CURRENT @@ -1 +1 @@ -MANIFEST-000066 +MANIFEST-000070 diff --git a/packs/weapons/LOG b/packs/weapons/LOG index 55df4d0..01f7b3f 100644 --- a/packs/weapons/LOG +++ b/packs/weapons/LOG @@ -1,7 +1,7 @@ -2023/08/10-13:03:20.538110 7fd68f7fe6c0 Recovering log #64 -2023/08/10-13:03:20.547376 7fd68f7fe6c0 Delete type=3 #62 -2023/08/10-13:03:20.547427 7fd68f7fe6c0 Delete type=0 #64 -2023/08/10-13:05:41.044355 7fd40dfff6c0 Level-0 table #69: started -2023/08/10-13:05:41.044380 7fd40dfff6c0 Level-0 table #69: 0 bytes OK -2023/08/10-13:05:41.056662 7fd40dfff6c0 Delete type=0 #67 -2023/08/10-13:05:41.069241 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/15-21:47:51.802282 7fa0dcff96c0 Recovering log #68 +2023/08/15-21:47:51.859665 7fa0dcff96c0 Delete type=3 #66 +2023/08/15-21:47:51.859740 7fa0dcff96c0 Delete type=0 #68 +2023/08/15-22:11:19.837182 7f9e3ffff6c0 Level-0 table #73: started +2023/08/15-22:11:19.837243 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK +2023/08/15-22:11:19.843628 7f9e3ffff6c0 Delete type=0 #71 +2023/08/15-22:11:19.858980 7f9e3ffff6c0 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 a52e934..55df4d0 100644 --- a/packs/weapons/LOG.old +++ b/packs/weapons/LOG.old @@ -1,7 +1,7 @@ -2023/08/09-19:54:51.957872 7fd68effd6c0 Recovering log #60 -2023/08/09-19:54:51.973552 7fd68effd6c0 Delete type=3 #58 -2023/08/09-19:54:51.973583 7fd68effd6c0 Delete type=0 #60 -2023/08/09-22:32:48.089701 7fd40dfff6c0 Level-0 table #65: started -2023/08/09-22:32:48.089745 7fd40dfff6c0 Level-0 table #65: 0 bytes OK -2023/08/09-22:32:48.103941 7fd40dfff6c0 Delete type=0 #63 -2023/08/09-22:32:48.122422 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/08/10-13:03:20.538110 7fd68f7fe6c0 Recovering log #64 +2023/08/10-13:03:20.547376 7fd68f7fe6c0 Delete type=3 #62 +2023/08/10-13:03:20.547427 7fd68f7fe6c0 Delete type=0 #64 +2023/08/10-13:05:41.044355 7fd40dfff6c0 Level-0 table #69: started +2023/08/10-13:05:41.044380 7fd40dfff6c0 Level-0 table #69: 0 bytes OK +2023/08/10-13:05:41.056662 7fd40dfff6c0 Delete type=0 #67 +2023/08/10-13:05:41.069241 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/MANIFEST-000066 b/packs/weapons/MANIFEST-000066 deleted file mode 100644 index 76f09f8313d3eb8fd16576bdb78c442715b49c4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAev#wWOItY@7@3?o8JJyI R7(${>Re-oIK&~4L0|5S@6I=iQ diff --git a/packs/weapons/MANIFEST-000070 b/packs/weapons/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..aa5ef8a0719bf3292295213d828b48878da5ee18 GIT binary patch literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAeo_DSYyKPzj7;vF49p%Z R3>P0Xn1Z+-K&}@H0{{j@6VLzv literal 0 HcmV?d00001 diff --git a/styles/simple.css b/styles/simple.css index 2af0993..5fb295e 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1426,4 +1426,8 @@ Focus FOC: #ff0084 } .margin-left-8 { margin-left: 8px; +} +.maneuver-is-stock { + display: none; + visibility: hidden; } \ No newline at end of file diff --git a/system.json b/system.json index a2c069d..14b62c3 100644 --- a/system.json +++ b/system.json @@ -100,14 +100,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.6", + "version": "11.0.7", "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.6.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.7.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/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 3651873..878375d 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -169,7 +169,7 @@ {{#each mlist as |maneuver key|}} -
  • +
  • {{maneuver.name}} @@ -188,10 +188,6 @@ {{/if}} -   -
    - -
    • {{/each}} @@ -537,6 +533,10 @@ {{!-- Maneuvers Tab --}}
    +
    + +
    +
    • @@ -551,27 +551,29 @@ - +
      • - {{#each nonstockmaneuvers as |maneuver key|}} -
    • - - {{maneuver.name}} + {{#each allmaneuvers as |maneuver key|}} +
      +
    • + + {{maneuver.name}} - {{maneuver.system.pha}} - {{maneuver.system.ocv}} - {{maneuver.system.dcv}} + {{maneuver.system.pha}} + {{maneuver.system.ocv}} + {{maneuver.system.dcv}} - {{maneuver.system.effects}} + {{maneuver.system.effects}} -
       
      -
      - -
      -
      • +
       
      +
      + +
      + +
    {{/each}} diff --git a/templates/items/item-advantage-sheet.hbs b/templates/items/item-advantage-sheet.hbs index 1016fd8..a740842 100644 --- a/templates/items/item-advantage-sheet.hbs +++ b/templates/items/item-advantage-sheet.hbs @@ -20,6 +20,8 @@ + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} diff --git a/templates/items/item-armor-sheet.hbs b/templates/items/item-armor-sheet.hbs index 5b29a5c..05e84fa 100644 --- a/templates/items/item-armor-sheet.hbs +++ b/templates/items/item-armor-sheet.hbs @@ -67,5 +67,7 @@ + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-complication-sheet.hbs b/templates/items/item-complication-sheet.hbs index 0c34d8f..90d181c 100644 --- a/templates/items/item-complication-sheet.hbs +++ b/templates/items/item-complication-sheet.hbs @@ -21,5 +21,8 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}} + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-currency-sheet.hbs b/templates/items/item-currency-sheet.hbs index c248e8a..6fb09a7 100644 --- a/templates/items/item-currency-sheet.hbs +++ b/templates/items/item-currency-sheet.hbs @@ -24,5 +24,7 @@ + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-equipment-sheet.hbs b/templates/items/item-equipment-sheet.hbs index 24fbe31..718cc86 100644 --- a/templates/items/item-equipment-sheet.hbs +++ b/templates/items/item-equipment-sheet.hbs @@ -65,5 +65,7 @@ + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + \ No newline at end of file diff --git a/templates/items/item-limitation-sheet.hbs b/templates/items/item-limitation-sheet.hbs index 42a6cc6..d4640c3 100644 --- a/templates/items/item-limitation-sheet.hbs +++ b/templates/items/item-limitation-sheet.hbs @@ -11,13 +11,16 @@ {{!-- Sheet Body --}}
    + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}} +
      - {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}} {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
    + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} +
    diff --git a/templates/items/item-maneuver-sheet.hbs b/templates/items/item-maneuver-sheet.hbs index eebef8f..000cee7 100644 --- a/templates/items/item-maneuver-sheet.hbs +++ b/templates/items/item-maneuver-sheet.hbs @@ -53,5 +53,8 @@ + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-perk-sheet.hbs b/templates/items/item-perk-sheet.hbs index 416a95e..27b3ebf 100644 --- a/templates/items/item-perk-sheet.hbs +++ b/templates/items/item-perk-sheet.hbs @@ -21,5 +21,8 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}} + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-power-sheet.hbs b/templates/items/item-power-sheet.hbs index de16e37..cf55ad1 100644 --- a/templates/items/item-power-sheet.hbs +++ b/templates/items/item-power-sheet.hbs @@ -25,5 +25,8 @@ {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}} + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs index 2e74664..31cee39 100644 --- a/templates/items/item-skill-sheet.hbs +++ b/templates/items/item-skill-sheet.hbs @@ -79,5 +79,8 @@ + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-talent-sheet.hbs b/templates/items/item-talent-sheet.hbs index 7b2b996..e77ef41 100644 --- a/templates/items/item-talent-sheet.hbs +++ b/templates/items/item-talent-sheet.hbs @@ -22,6 +22,8 @@ - + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs index 3833786..ffbb429 100644 --- a/templates/items/item-weapon-sheet.hbs +++ b/templates/items/item-weapon-sheet.hbs @@ -103,5 +103,7 @@ + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-notes.hbs}} + diff --git a/templates/partials/partial-item-description.hbs b/templates/partials/partial-item-description.hbs index b7dc069..d3d7daf 100644 --- a/templates/partials/partial-item-description.hbs +++ b/templates/partials/partial-item-description.hbs @@ -4,13 +4,6 @@ -
    - -
    - {{editor notes target="system.notes" button=true owner=owner editable=editable}} -
    -
    -
    diff --git a/templates/partials/partial-item-nav.hbs b/templates/partials/partial-item-nav.hbs index 95b52cd..b161f09 100644 --- a/templates/partials/partial-item-nav.hbs +++ b/templates/partials/partial-item-nav.hbs @@ -2,4 +2,5 @@ diff --git a/templates/partials/partial-item-notes.hbs b/templates/partials/partial-item-notes.hbs new file mode 100644 index 0000000..2fa5795 --- /dev/null +++ b/templates/partials/partial-item-notes.hbs @@ -0,0 +1,8 @@ +
    +
    + +
    + {{editor notes target="system.notes" button=true owner=owner editable=editable}} +
    +
    +