diff --git a/module/SystemProvider.js b/module/SystemProvider.js index d83f9ab..793a6b9 100644 --- a/module/SystemProvider.js +++ b/module/SystemProvider.js @@ -731,14 +731,14 @@ export class pf2eProvider extends SystemProvider { return [ "modules/party-overview/templates/parts/PF2e-Lore.html", "modules/party-overview/templates/parts/PF2e-Proficiencies.html", - // "modules/party-overview/templates/parts/PF2e-Bulk.html" + "modules/party-overview/templates/parts/PF2e-Bulk.html", ]; } get tabs() { return { currencies: { id: "currencies", visible: true, localization: "party-overview.WEALTH" }, - // bulk: { id: "bulk", visible: true, localization: "PF2E.BulkShortLabel" }, + bulk: { id: "bulk", visible: true, localization: "PF2E.BulkShortLabel" }, languages: { id: "languages", visible: true, localization: "PF2E.Languages" }, lore: { id: "lore", visible: true, localization: "PF2E.Lore" }, proficiencies: { id: "skills", visible: true, localization: "PF2E.SkillsLabel" }, @@ -827,6 +827,7 @@ export class pf2eProvider extends SystemProvider { id: actor.id, name: actor.name, type: actor.type, + bulk: actor.inventory.bulk, hp: data.attributes.hp || { value: 0, max: 0 }, heroPoints: data.resources?.heroPoints || { value: 0, max: 0 }, focus: data.resources?.focus || { value: 0, max: 0 }, diff --git a/templates/parts/PF2e-Bulk.html b/templates/parts/PF2e-Bulk.html index ef7b37a..8109ba5 100644 --- a/templates/parts/PF2e-Bulk.html +++ b/templates/parts/PF2e-Bulk.html @@ -2,9 +2,9 @@
{{> "modules/party-overview/templates/parts/FilterButton.html"}}
{{localize "party-overview.NAME"}}
-
{{localize "PF2E.BulkShortLabel"}}
-
{{localize "party-overview.PF2E.EncumberedAt"}}
-
{{localize "party-overview.LIMIT"}}
+
{{localize "PF2E.BulkLabel"}}
+
{{localize "PF2E.ConditionTypeEncumbered"}}
+
{{localize "PF2E.BulkMaxLabel"}}
{{#each actors as | actor | }} @@ -15,10 +15,10 @@
{{ actor.shortestName }}
- {{#with actor.encumbrance}} -
{{combinedBulk.normal}} {{#if combinedBulk.light}}({{combinedBulk.light}} L){{/if}}
-
{{encumberedAt}}
-
{{limit}}
+ {{#with actor.bulk}} +
{{value.normal}} {{#if value.light}}({{value.light}} L){{/if}}
+
{{encumberedAt}}
+
{{max}}
{{/with}} {{/each}} diff --git a/templates/pf2e.hbs b/templates/pf2e.hbs index 86b679e..dd23518 100644 --- a/templates/pf2e.hbs +++ b/templates/pf2e.hbs @@ -108,7 +108,7 @@ - {{!-- {{> "modules/party-overview/templates/parts/PF2e-Bulk.html"}} --}} + {{> "modules/party-overview/templates/parts/PF2e-Bulk.html"}} {{> "modules/party-overview/templates/parts/PF2e-Proficiencies.html"}}