From 3f0e0a41b8b44b0a3ad17122ba8a1fae6f0fdc06 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 22 Aug 2023 23:30:31 +0200 Subject: [PATCH] Update equipments type --- modules/hero6-actor-sheet.js | 3 +- modules/hero6-actor.js | 5 ++ .../complications/{000072.log => 000076.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 16 ++-- packs/complications/LOG.old | 16 ++-- packs/complications/MANIFEST-000070 | Bin 135 -> 0 bytes packs/complications/MANIFEST-000074 | Bin 0 -> 135 bytes packs/equipment/{000072.log => 000076.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +-- packs/equipment/LOG.old | 14 +-- packs/equipment/MANIFEST-000070 | Bin 65 -> 0 bytes packs/equipment/MANIFEST-000074 | Bin 0 -> 65 bytes packs/maneuvers/{000064.log => 000068.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 16 ++-- packs/maneuvers/LOG.old | 16 ++-- packs/maneuvers/MANIFEST-000062 | Bin 134 -> 0 bytes packs/maneuvers/MANIFEST-000066 | Bin 0 -> 134 bytes packs/perks/{000072.log => 000076.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 16 ++-- packs/perks/LOG.old | 16 ++-- packs/perks/MANIFEST-000070 | Bin 134 -> 0 bytes packs/perks/MANIFEST-000074 | Bin 0 -> 134 bytes packs/powers/{000073.log => 000077.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 16 ++-- packs/powers/LOG.old | 16 ++-- .../{MANIFEST-000071 => MANIFEST-000075} | Bin 169 -> 169 bytes packs/skills/{000072.log => 000076.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 ++-- packs/skills/LOG.old | 16 ++-- packs/skills/MANIFEST-000070 | Bin 135 -> 0 bytes packs/skills/MANIFEST-000074 | Bin 0 -> 135 bytes packs/talents/{000072.log => 000076.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 16 ++-- packs/talents/LOG.old | 16 ++-- packs/talents/MANIFEST-000070 | Bin 134 -> 0 bytes packs/talents/MANIFEST-000074 | Bin 0 -> 134 bytes packs/weapons/{000072.log => 000076.log} | 0 packs/weapons/CURRENT | 2 +- packs/weapons/LOG | 14 +-- packs/weapons/LOG.old | 14 +-- packs/weapons/MANIFEST-000070 | Bin 65 -> 0 bytes packs/weapons/MANIFEST-000074 | Bin 0 -> 65 bytes styles/simple.css | 2 +- system.json | 4 +- template.json | 14 ++- templates/actors/actor-sheet.hbs | 3 + templates/items/item-equipment-sheet.hbs | 82 +++++++++++++++++- .../partial-actor-equipment-section.hbs | 63 ++++++++++++-- .../partials/partial-actor-equipment.hbs | 29 ++++++- .../partials/partial-power-equipment-cost.hbs | 3 + 57 files changed, 325 insertions(+), 147 deletions(-) rename packs/complications/{000072.log => 000076.log} (100%) delete mode 100644 packs/complications/MANIFEST-000070 create mode 100644 packs/complications/MANIFEST-000074 rename packs/equipment/{000072.log => 000076.log} (100%) delete mode 100644 packs/equipment/MANIFEST-000070 create mode 100644 packs/equipment/MANIFEST-000074 rename packs/maneuvers/{000064.log => 000068.log} (100%) delete mode 100644 packs/maneuvers/MANIFEST-000062 create mode 100644 packs/maneuvers/MANIFEST-000066 rename packs/perks/{000072.log => 000076.log} (100%) delete mode 100644 packs/perks/MANIFEST-000070 create mode 100644 packs/perks/MANIFEST-000074 rename packs/powers/{000073.log => 000077.log} (100%) rename packs/powers/{MANIFEST-000071 => MANIFEST-000075} (75%) rename packs/skills/{000072.log => 000076.log} (100%) delete mode 100644 packs/skills/MANIFEST-000070 create mode 100644 packs/skills/MANIFEST-000074 rename packs/talents/{000072.log => 000076.log} (100%) delete mode 100644 packs/talents/MANIFEST-000070 create mode 100644 packs/talents/MANIFEST-000074 rename packs/weapons/{000072.log => 000076.log} (100%) delete mode 100644 packs/weapons/MANIFEST-000070 create mode 100644 packs/weapons/MANIFEST-000074 diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js index 7a63865..b2c16fa 100644 --- a/modules/hero6-actor-sheet.js +++ b/modules/hero6-actor-sheet.js @@ -50,7 +50,8 @@ export class Hero6ActorSheet extends ActorSheet { weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ), armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())), shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())), - equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsMoneys()) ), + moneys: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getMoneys())), + equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipments()) ), subActors: duplicate(this.actor.getSubActors()), race: duplicate(this.actor.getRace()), encCapacity: this.actor.getEncumbranceCapacity(), diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index bf48c42..f55f2d0 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -326,6 +326,11 @@ export class Hero6Actor extends Actor { Hero6Utility.sortArrayObjectsByName(list) return list } + getMoneys() { + let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "money"); + Hero6Utility.sortArrayObjectsByName(list) + return list + } getWeapons() { let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon"); Hero6Utility.sortArrayObjectsByName(list) diff --git a/packs/complications/000072.log b/packs/complications/000076.log similarity index 100% rename from packs/complications/000072.log rename to packs/complications/000076.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index bcf1079..f8d57cc 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000074 diff --git a/packs/complications/LOG b/packs/complications/LOG index bf0d2da..a562aca 100644 --- a/packs/complications/LOG +++ b/packs/complications/LOG @@ -1,8 +1,8 @@ -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) +2023/08/22-22:40:59.336016 7f4f611fe6c0 Recovering log #72 +2023/08/22-22:40:59.352816 7f4f611fe6c0 Delete type=3 #70 +2023/08/22-22:40:59.352919 7f4f611fe6c0 Delete type=0 #72 +2023/08/22-23:29:53.757052 7f4ccb7fe6c0 Level-0 table #77: started +2023/08/22-23:29:53.757077 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK +2023/08/22-23:29:53.763742 7f4ccb7fe6c0 Delete type=0 #75 +2023/08/22-23:29:53.772111 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end) +2023/08/22-23:29:53.772172 7f4ccb7fe6c0 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 814794f..bf0d2da 100644 --- a/packs/complications/LOG.old +++ b/packs/complications/LOG.old @@ -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/MANIFEST-000070 b/packs/complications/MANIFEST-000070 deleted file mode 100644 index d78ca2b73a26ab6331b470f17ffc0d180f1b0439..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{w7pD7@52| V8JK-o_P0Xn1Z+-K&}@H0{{j@6VLzv diff --git a/packs/equipment/MANIFEST-000074 b/packs/equipment/MANIFEST-000074 new file mode 100644 index 0000000000000000000000000000000000000000..7274296bf260b894b8f8e1326b20506b887a3078 GIT binary patch literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAeo=R)J192UITqhPO0Ls-O!2kdN diff --git a/packs/maneuvers/MANIFEST-000066 b/packs/maneuvers/MANIFEST-000066 new file mode 100644 index 0000000000000000000000000000000000000000..0edba1c5eb8223e154341bee91fd2ea5bb5999fe 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=HFe3agMRSpJ5CU;H- UW)BvYC8@6QAg%|H>&3zX0B5Novj6}9 diff --git a/packs/perks/MANIFEST-000074 b/packs/perks/MANIFEST-000074 new file mode 100644 index 0000000000000000000000000000000000000000..772686a26cea526a8e6a7aac1a7903d989abc5db 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=HFeC?F`F&qqxOx~Of U%swnE9pA4hg1A0Ft{)2v0EY7;JOBUy literal 0 HcmV?d00001 diff --git a/packs/powers/000073.log b/packs/powers/000077.log similarity index 100% rename from packs/powers/000073.log rename to packs/powers/000077.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index be93edb..d2ea14c 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000071 +MANIFEST-000075 diff --git a/packs/powers/LOG b/packs/powers/LOG index e1bba01..129bc78 100644 --- a/packs/powers/LOG +++ b/packs/powers/LOG @@ -1,8 +1,8 @@ -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) +2023/08/22-22:40:59.317080 7f4f609fd6c0 Recovering log #73 +2023/08/22-22:40:59.334723 7f4f609fd6c0 Delete type=3 #71 +2023/08/22-22:40:59.334804 7f4f609fd6c0 Delete type=0 #73 +2023/08/22-23:29:53.750838 7f4ccb7fe6c0 Level-0 table #78: started +2023/08/22-23:29:53.750864 7f4ccb7fe6c0 Level-0 table #78: 0 bytes OK +2023/08/22-23:29:53.756935 7f4ccb7fe6c0 Delete type=0 #76 +2023/08/22-23:29:53.764078 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end) +2023/08/22-23:29:53.772157 7f4ccb7fe6c0 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 c11061f..e1bba01 100644 --- a/packs/powers/LOG.old +++ b/packs/powers/LOG.old @@ -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/MANIFEST-000071 b/packs/powers/MANIFEST-000075 similarity index 75% rename from packs/powers/MANIFEST-000071 rename to packs/powers/MANIFEST-000075 index 3682c12fbf80c4f536dd3109b76ef2a7273df18a..00108aa5b3fa72a47d789ec0aa63d569068d0721 100644 GIT binary patch delta 37 pcmZ3`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAywL|ix+7@6ET V8JIm-Y$p6X=m6q+0J&Z)HUM;yBP##^ diff --git a/packs/skills/MANIFEST-000074 b/packs/skills/MANIFEST-000074 new file mode 100644 index 0000000000000000000000000000000000000000..2e5de3018128e4101c9bf0ee1f99608a3e24b7fb GIT binary patch literal 135 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81Ao43us919_Ffw^_ VGBEqF*vv`RVE}P`fLuQo8vt^RB4hvn literal 0 HcmV?d00001 diff --git a/packs/talents/000072.log b/packs/talents/000076.log similarity index 100% rename from packs/talents/000072.log rename to packs/talents/000076.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index bcf1079..f8d57cc 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000074 diff --git a/packs/talents/LOG b/packs/talents/LOG index 5eb06fd..ef9ce6c 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -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) +2023/08/22-22:40:59.358596 7f4f611fe6c0 Recovering log #72 +2023/08/22-22:40:59.377178 7f4f611fe6c0 Delete type=3 #70 +2023/08/22-22:40:59.377250 7f4f611fe6c0 Delete type=0 #72 +2023/08/22-23:29:53.780352 7f4ccb7fe6c0 Level-0 table #77: started +2023/08/22-23:29:53.780385 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK +2023/08/22-23:29:53.787130 7f4ccb7fe6c0 Delete type=0 #75 +2023/08/22-23:29:53.787267 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end) +2023/08/22-23:29:53.787292 7f4ccb7fe6c0 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 75caefb..5eb06fd 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -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/MANIFEST-000070 b/packs/talents/MANIFEST-000070 deleted file mode 100644 index e877afe523a3f690aecd7c24a21bd158c54b812e..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|dAa)er5p^5OzxZv U%pNR!52l;;gSZ|*t``d*0Hoa`Pyhe` diff --git a/packs/talents/MANIFEST-000074 b/packs/talents/MANIFEST-000074 new file mode 100644 index 0000000000000000000000000000000000000000..a25884fb271b7230254f2a0a977d003ae883afbf 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|dCSc8Jsb>-Ox~Of U%swo9KF5|{1aWP0Xn1Z+-K&}@H0{{j@6VLzv diff --git a/packs/weapons/MANIFEST-000074 b/packs/weapons/MANIFEST-000074 new file mode 100644 index 0000000000000000000000000000000000000000..7274296bf260b894b8f8e1326b20506b887a3078 GIT binary patch literal 65 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAeo=Total value : {{totalValue}} + {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Money" + items=moneys}} + {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}} diff --git a/templates/items/item-equipment-sheet.hbs b/templates/items/item-equipment-sheet.hbs index 718cc86..8d5039b 100644 --- a/templates/items/item-equipment-sheet.hbs +++ b/templates/items/item-equipment-sheet.hbs @@ -56,8 +56,88 @@ - {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}} + {{#if (eq system.subtype "weapon") }} +
  • + +
  • +
  • + +
  • +
  • + +
  • + {{/if}} + {{#if (eq system.subtype "shield") }} +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • + {{/if}} + + {{#if (eq system.subtype "armor") }} +
  • + +
  • +
  • + +
  • + {{/if}} + + + {{#if (or (eq system.subtype "armor") (eq system.subtype "shield")) }} +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • + {{/if}} + + {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}} {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}} diff --git a/templates/partials/partial-actor-equipment-section.hbs b/templates/partials/partial-actor-equipment-section.hbs index 95df07e..cf68d85 100644 --- a/templates/partials/partial-actor-equipment-section.hbs +++ b/templates/partials/partial-actor-equipment-section.hbs @@ -6,20 +6,70 @@ - - + + - - + + {{#if (eq title "Weapons")}} + + + + + + + + + {{/if}} + + {{#if (eq title "Shields")}} + + + + + + + + + + + + + {{/if}} + + {{#if (eq title "Armor")}} + + + + + + + + + + + + + + + + {{/if}} + + + + + + {{#if (and (ne title "Armor") (ne title "Shields"))}} + {{/if}} + - - + + @@ -27,6 +77,7 @@ +
     
    diff --git a/templates/partials/partial-actor-equipment.hbs b/templates/partials/partial-actor-equipment.hbs index b2bae8a..17fe77e 100644 --- a/templates/partials/partial-actor-equipment.hbs +++ b/templates/partials/partial-actor-equipment.hbs @@ -3,15 +3,38 @@ - {{equip.name}} + {{equip.name}} -