feat: make items consumable #73

Open

Athemis wants to merge 85 commits from feature/consume-items into main

pull from: feature/consume-items

merge into: Athemis:main

Athemis:main

Athemis:renovate/npm-dependencies

Athemis:renovate/major-eslint-monorepo

Athemis:feat/talents-for-humanoid-creatures

Athemis:feat/caera

Athemis:v13-appv2

Athemis:typescript-conversion

Athemis:chore/remove-unused-lora-font

Athemis:v13-appv1

Athemis:feature/group-actor

Athemis:custom-checks

Athemis:34-npc-monster-import

Conversation 6 Commits 85 Files changed 95 +5497 -382

Athemis commented 2026-01-14 16:13:55 +00:00

Owner

Copy link

This PR makes items consumable.

Fixes #51

This PR makes items consumable. Fixes #51

Athemis added 40 commits 2026-01-14 16:13:55 +00:00

feat: make items consumable ... 00cda38e72

Add consumable flag and gated consume overlay for items.

Merge remote-tracking branch 'origin/main' into feature/consume-items c0b282a2ec

feat(packs): add consumable flag to suitable items ... 61990e0a72

This includes all potions, light sources and herbs

feat: track item uses for consumables and support multi-use items 332814534b

feat: track consumable uses and prevent zero-qty with remaining uses 95afb39733

feat: link consumed items in chat via UUID da66bd7443

feat: format consume chat messages b45626bd7d

feat: restore uses to max when refilling empty item stacks 10e17839cb

fix: lift quantity to 1 when setting uses on empty stacks 8a9b710f31

fix: keep consumables usable after manual uses edits and refresh ... a4a3c40cfd

overlays

refactor: prepare item change handling for future improvements e5936c90a5

refactor: change pre-update-item hook from TypeScript to JavaScript cc0dd6a689

test: cover preUpdateItem hook edge cases 61908b7fc7

feat: switch consumable uses to max/spent and add hook coverage e2a9535ef5

Merge branch 'main' into feature/consume-items 8023cb10dc

refactor: sorting icons use shared utility function 2e9497d72c

style(ui): indicate "consume" by hand icon 0ddfadb1a2

feat: add uses column for consumables 3e491140d6

style: rename remaining uses variable to avoid confusion 54dbf57dc8

feat: add consume target selection for effects 85f46f401d

refactor: remove uses column and related flags from equipment inventory ... 837c4dba40

list display

- currently no equipment item has a limited amount of uses -> drop the
  column to not waste space

fix(tests): adjust render-chat globals stubs 5ca78f54b7

feat: add consume effect type selector and default to roll d1c6ff0df5

fix(ui): use fallback text for consumable effects button 03cefcdbbd

feat: add target-change option and undo consume effect in chat ... 97044257ea

- Add allowTargetChange flag for consume effects with checkbox UI
- Display target info and allow changing target via chat messages
- Implement undo button to revert item consume with permission checks
- Disable buttons after effect applied or undone
- Add related localization strings and styles for chat components

Merge remote-tracking branch 'origin/main' into feature/consume-items ba4a7d9042

Merge remote-tracking branch 'origin/main' into feature/consume-items b0ba3d9af5

Merge remote-tracking branch 'origin/main' into feature/consume-items 86e3a0fdc4

refactor(consume): move effect apply into dialog and simplify chat card 5ee425f836

refactor: move item description enrichment into a utility function 92a8ec6fb5

feat(consume): Add editable formula input to consume effect target ... deaffae1f0

prompt

Allow users to edit the consume effect formula when selecting a target
token or actor,
and pass the updated formula through the consume effect workflow.
Include item icon and name in the prompt header and improve form layout.

feat(consume): enhance dialog with icons and short formula label a53cec0454

feat(consume): gate consume UI by permissions and unify warnings 50ef9e0223

feat(ui): refine chat summary and usage display c9b0e48115

feat(ui): show effect type and target as select with icon ec2cc6c922

feat(ui): add icons to roll option labels and improve custom modifier ... eb6ef6098c

toggle

Set dialog width to 590px to enhance layout and toggle visibility
of the custom modifier input based on selection for better UX.

fix(ui): add consistent fa-fw class and wrap inputs in div.form-fields ... e419131e18

for layout

fix(ui): add fixed-width icons to consume effect UI labels ebcdae0c45

fix(ui): add fixed-width class to profile icons for alignment 4f9cf2568d

Merge branch 'main' into feature/consume-items e4f76d7c12

Athemis added the

enhancement

label 2026-01-14 16:14:08 +00:00

Athemis self-assigned this 2026-01-14 16:14:11 +00:00

Athemis added 1 commit 2026-01-14 16:18:56 +00:00

feat: add damage effect type support for consumables and HP updates 744cac45f6

Athemis added 1 commit 2026-01-14 16:40:28 +00:00

feat(packs): add healing effects to appropriate consumable items 8f360953f6

Athemis added 1 commit 2026-01-14 16:50:05 +00:00

fix(ui): add "No effect" option to consume effect type selectors cc78462541

Athemis added 1 commit 2026-01-15 18:29:00 +00:00

feat: add support for consume ActiveEffect type with stacking ... e2927007fe

- Introduce "activeEffect" as a consume effect type option
- Add stacking and stack key configuration for consume effects
- Inject stacking fields into ActiveEffect item effect config UI
- Implement application of consume ActiveEffects on target actor
- Update item sheet logic to handle activeEffect consume type and apply
  effects
- Add localization entries for stacking modes and activeEffect type

Athemis added 1 commit 2026-01-15 18:39:22 +00:00

feat(active-effect): add consume-driven ActiveEffect stacking and v13 ... 8b7f338236

sheet parts

Athemis added 1 commit 2026-01-15 20:52:32 +00:00

fix(consume): refine consume effect config, labels, and item sheet ... 3ab0a9b4f9

layout

Athemis added 1 commit 2026-01-16 09:10:29 +00:00

fix(consume): move consume options into dedicated item section cc657265a8

Athemis added 2 commits 2026-01-23 16:26:10 +00:00

Merge remote-tracking branch 'origin/main' into feature/consume-items 0a772b16e5

feat(consume): expire consume effects on combat end ... 06c077233f

- add item effect flag to mark combat-end expiry
- remove flagged actor effects on deleteCombat (GM-only)
- expose UI toggle in active effect config

Athemis added 1 commit 2026-01-23 20:30:42 +00:00

feat(consume): add confirmation dialog for consume effects needing ... e9d2d0b7d6

active combat

Athemis added 1 commit 2026-01-23 20:37:23 +00:00

feat(consume): confirm combat-end expiry outside combat 5bb13da77c

Athemis added 1 commit 2026-01-23 20:37:45 +00:00

Merge remote-tracking branch 'origin/main' into feature/consume-items 36d7bd20a7

Athemis added 1 commit 2026-01-25 18:53:11 +00:00

feat(packs): add consumable effects for combat potions ... b9e7548740

- add active effects for Kampf-, Zauber- und Zieltrank (expire on combat
  end)
- mark Fackel as consumable

Athemis added 2 commits 2026-01-26 17:16:44 +00:00

refactor(items): split usable and consumedOnUse ... 4280dd2626

- replace consumable flag with usable/consumedOnUse across schema, UI,
  and logic
- migrate item packs to new fields (incl. combat potion effects + torch)
- update usage strings to neutral “use/effect” wording in de/en

refactor(i18n): remove unused consume strings 81d9e0ad62

Athemis added 1 commit 2026-01-26 20:10:57 +00:00

feat(consume): add configurable duration formula and units to consume ... b15ffdb057

effects

Athemis added 2 commits 2026-01-27 10:31:26 +00:00

fix: add default round time to configuration ... d4334922d9

Sets round time to 5 s as per DS4 rule book.

fix(tests): adjust for usable and consumedOnUse flags of items 503244eb69

Athemis force-pushed feature/consume-items from 503244eb69 to 5dcfd7ec13 2026-01-27 10:35:43 +00:00 Compare

Athemis force-pushed feature/consume-items from 5dcfd7ec13 to 97de41c15f 2026-01-27 10:45:04 +00:00 Compare

Athemis added 1 commit 2026-01-27 13:19:09 +00:00

feat(effects): add active-effect expiry engine and combat reconciliation ... 42ea815f63

- introduce effect-expiry engine with combat start/end handling
  - set combatId/start fields on combat start and honor expireOnCombatEnd without duration
  - ignore non-transfer item effects in expiry processing
  - register expiry hooks and document new ds4.effectExpiry flags
  - move expire-on-combat-end toggle to the Duration tab

Athemis added 1 commit 2026-01-27 13:27:12 +00:00

refactor(effects): add fast path check for actors with no effects ... 303a86744c

Helps to minimize backfill amount

Athemis added 1 commit 2026-01-27 14:23:26 +00:00

fix(hooks): backfill seconds effects for token actors ... 035de17343

- include unlinked token actors from scenes in backfill
  - requeue using update results instead of UUID lookups
  - centralize requeue logic and speed up actor effect checks

Athemis force-pushed feature/consume-items from 035de17343 to 597764ab3b 2026-01-27 16:10:06 +00:00 Compare

Athemis added 1 commit 2026-01-27 16:31:35 +00:00

chore(hooks): log backfill duration and warn on slow runs 23d0d5b1bd

Athemis added 1 commit 2026-01-27 20:13:01 +00:00

fix(hooks): stabilize effect expiry outside combat ... eb71afab5a

- convert rounds to seconds outside combat without losing rounds
- avoid turn-based rounding on combat end
- document new expiry flags

Athemis added 1 commit 2026-01-28 08:51:41 +00:00

refactor(hooks): simplify effect expiry state flow ... 26035f948c

- document flag transitions
- derive rounds outside combat and reconcile flags
- prefer rounds-based remaining time on combat end

Athemis added 1 commit 2026-01-28 09:40:21 +00:00

test(hooks): add effect-expiry hook coverage ... 11dfd437c4

Adds local stubs and tests for backfill, seconds expiry, combat conversions, and logging

Athemis added 1 commit 2026-01-28 09:50:07 +00:00

Merge remote-tracking branch 'origin/main' into feature/consume-items 8004a09651

Athemis added this to the 3.3.0 milestone 2026-02-05 12:46:35 +00:00

claw-bot commented 2026-02-05 12:59:52 +00:00

First-time contributor

Copy link

Review summary

• Big feature set: consumables (usable + consumedOnUse + uses + consumeEffect) incl. UI + chat feedback.
• Adds a centralized ActiveEffect expiry engine (seconds queue + combat start/end reconciliation, expireOnCombatEnd).
• Local checks on the PR branch: pnpm format:check, pnpm lint, pnpm test ✅

Blockers

• None found.

Major

• Very large scope (91 files, ~4k LOC): consumables + expiry engine + ActiveEffect sheet refactor + pack migrations.
  For future work, consider splitting into 2–3 PRs to make review and bisecting easier.
• Expiry engine is effectively a new core subsystem: the GM-only gating + queue approach looks solid.
  I’d suggest adding 2–3 sentences to the PR description/docs clarifying:
  • Which effects are intended to be covered (consume-driven only vs. any actor effect with duration).
  • Expected rounding semantics for seconds↔rounds conversion (e.g. floor when converting remaining seconds to rounds).

Minor / nit

• src/apps/actor/base-sheet.js: the consume flow is now quite large; long-term it might be worth extracting into a helper (e.g. src/utils/consume.ts) to keep the sheet lean.
• For roll/heal/damage consume effects, an empty formula currently results in “no effect” (since hasEffect depends on formula). That’s fine, but a small UI warning could prevent confusion when type is set but formula is empty.

Questions

• Is expireOnCombatEnd meant to apply only to consume item effects, or more broadly to actor effects in general? (It’s currently wired via flags.ds4.consumeEffect.)
• On the last stack element you end up with quantity=0 and uses.spent=usesMax (not 0). Is that intentional as an “empty/depleted” signal? Looks consistent, just confirming.

Suggested tests

• Consumable with uses.max=3, quantity=2, consumedOnUse=true: consume repeatedly → uses decrements, when uses reach max then qty-- and uses reset; final unit ends at qty=0 / depleted.
• Consume-driven ActiveEffect with durationFormula (rounds/seconds) + expireOnCombatEnd=true: apply effect → start combat → end combat → verify expire/reconversion behavior.

Areas reviewed

• src/apps/actor/base-sheet.js (consume flow + target prompt + ActiveEffect application)
• src/hooks/pre-update-item.js (prevent qty=0 while uses remain)
• src/hooks/effect-expiry.js (queue + combat reconciliation)
• spec/hooks/effect-expiry.spec.ts, spec/hooks/pre-update-item.spec.ts (test coverage)

## Review summary - Big feature set: **consumables** (`usable` + `consumedOnUse` + `uses` + `consumeEffect`) incl. UI + chat feedback. - Adds a centralized **ActiveEffect expiry engine** (seconds queue + combat start/end reconciliation, `expireOnCombatEnd`). - Local checks on the PR branch: `pnpm format:check`, `pnpm lint`, `pnpm test` ✅ ### Blockers - None found. ### Major - **Very large scope (91 files, ~4k LOC):** consumables + expiry engine + ActiveEffect sheet refactor + pack migrations. For future work, consider splitting into 2–3 PRs to make review and bisecting easier. - **Expiry engine is effectively a new core subsystem:** the GM-only gating + queue approach looks solid. I’d suggest adding 2–3 sentences to the PR description/docs clarifying: - Which effects are intended to be covered (consume-driven only vs. any actor effect with duration). - Expected rounding semantics for seconds↔rounds conversion (e.g. `floor` when converting remaining seconds to rounds). ### Minor / nit - `src/apps/actor/base-sheet.js`: the consume flow is now quite large; long-term it might be worth extracting into a helper (e.g. `src/utils/consume.ts`) to keep the sheet lean. - For `roll/heal/damage` consume effects, an empty formula currently results in “no effect” (since `hasEffect` depends on `formula`). That’s fine, but a small UI warning could prevent confusion when `type` is set but `formula` is empty. ### Questions - Is `expireOnCombatEnd` meant to apply **only** to consume item effects, or more broadly to actor effects in general? (It’s currently wired via `flags.ds4.consumeEffect`.) - On the last stack element you end up with `quantity=0` and `uses.spent=usesMax` (not `0`). Is that intentional as an “empty/depleted” signal? Looks consistent, just confirming. ### Suggested tests - Consumable with `uses.max=3`, `quantity=2`, `consumedOnUse=true`: consume repeatedly → uses decrements, when uses reach max then qty-- and uses reset; final unit ends at qty=0 / depleted. - Consume-driven ActiveEffect with `durationFormula` (rounds/seconds) + `expireOnCombatEnd=true`: apply effect → start combat → end combat → verify expire/reconversion behavior. ### Areas reviewed - `src/apps/actor/base-sheet.js` (consume flow + target prompt + ActiveEffect application) - `src/hooks/pre-update-item.js` (prevent qty=0 while uses remain) - `src/hooks/effect-expiry.js` (queue + combat reconciliation) - `spec/hooks/effect-expiry.spec.ts`, `spec/hooks/pre-update-item.spec.ts` (test coverage)

Athemis added 1 commit 2026-02-05 13:50:08 +00:00

Merge branch 'main' into feature/consume-items 0237556090

Athemis added 3 commits 2026-02-06 12:14:40 +00:00

feat(consume): add effects to Schnelligkeitstrank and Zauberwechseltrank items 528cb9794e

refactor(actor-sheet): extract item consume flow into dedicated module ... 21c480c751

- Move consume logic from src/apps/actor/base-sheet.js to src/apps/actor/consume-flow.js
- Keep behavior unchanged and delegate _onConsumeItem to new module
- Remove consume-related helper methods from actor sheet to reduce class size
- Add tests for consume flow in spec/apps/consume-flow.spec.ts
- Document consume flow and helper responsibilities with JSDoc/comments in
  src/apps/actor/consume-flow.js

fix(consume): warn when formula-based effects have no formula ... a15037ef69

- show a hint in item usage properties for roll/heal/damage without formula
- warn on every use click while still allowing item use
- add de/en i18n strings for hint and runtime warning
- cover missing-formula warning behavior in consume-flow spec

Athemis added 1 commit 2026-02-06 13:33:11 +00:00

feat(active-effect): show combat-end expiry on actor effects ... 5b24506820

- display a read-only "Expire at combat end" indicator in actor effect duration tab
- render indicator only when expireOnCombatEnd is true

Athemis added 1 commit 2026-02-06 13:38:58 +00:00

test(consume): document and verify depleted last-stack state ... e3e958e6ae

- document that last stack consumption keeps uses.spent at uses.max when quantity reaches 0
- add consume-flow spec asserting quantity=0 with uses.spent=max for final stack

Athemis added a new dependency 2026-02-06 14:12:49 +00:00

#88 Track remaining usable items (including complex effect automation)

Athemis added a new dependency 2026-02-06 14:16:07 +00:00

#89 Complex consumables: movement/state transformations

Athemis added a new dependency 2026-02-06 14:19:38 +00:00

#90 Complex consumables: spell-like and special resolution

Athemis added 1 commit 2026-02-06 14:36:51 +00:00

test(consume): expand consume-flow and expiry coverage ... 7c56866c95

- add consume-flow tests for damage, selected targets, consumedOnUse=false, stack stacking, and
  duration unit conversion
- add effect-expiry test to ensure non-transfer item effects are ignored

Athemis added 1 commit 2026-02-06 15:40:49 +00:00

chore(migration): add migration 012 for consume-model item backfill ... c294d06ea2

- migrate legacy loot/equipment items from ds4 equipment source refs
- backfill usable/consumedOnUse/consumeEffect only for untouched items
- copy consume-related active effects from source items when missing
- process world items, world actors, unlinked token actors, and world compendiums

Athemis changed title from WIP: feat: make items consumable to feat: make items consumable 2026-02-06 15:42:12 +00:00

Athemis commented 2026-02-06 17:25:35 +00:00

Author

Owner

Copy link

@claw-bot review

@claw-bot review

claw-bot commented 2026-02-06 18:01:10 +00:00

First-time contributor

Copy link

Ack — ich schaue mir das an.

Ack — ich schaue mir das an.

claw-bot commented 2026-02-06 18:05:45 +00:00

First-time contributor

Copy link

Quick review (claw-bot)

✅ CI: Success (ci/woodpecker/pr/checks)

Highlights

• Consume flow looks solid: quantity/uses handling (incl. depleted marker), permission checks for actor updates, clear chat summary, and inventory-part re-render only.
• ActiveEffect consume-copy: nice stacking model (replace vs stack) + durationFormula evaluation at consume time + flags normalized.
• Effect expiry engine: GM-only, queue-based for seconds effects, explicit combat start/end reconciliation; good approach to avoid full-world scans.
• Migration 012: conservative backfill, respects user edits, uses core.sourceId/_stats.compendiumSource and caches pack lookups.

Nits / things to double-check

• Formula consume types with missing formula: you warn but still allow “apply”; later Roll(undefined) will error (caught). Consider disabling the action or forcing formula entry when type in {roll/heal/damage}.
• Ensure Roll evaluation API matches the Foundry version target (some versions prefer evaluate({async:true})).
• Small HTML safety: uses label in chat summary (item.system.uses.label) isn’t escaped.

Overall: LGTM for merge; main risk area is the expiry engine complexity, but tests + GM-only gating help.

Quick review (claw-bot) ✅ CI: Success (ci/woodpecker/pr/checks) Highlights - Consume flow looks solid: quantity/uses handling (incl. depleted marker), permission checks for actor updates, clear chat summary, and inventory-part re-render only. - ActiveEffect consume-copy: nice stacking model (replace vs stack) + durationFormula evaluation at consume time + flags normalized. - Effect expiry engine: GM-only, queue-based for seconds effects, explicit combat start/end reconciliation; good approach to avoid full-world scans. - Migration 012: conservative backfill, respects user edits, uses core.sourceId/_stats.compendiumSource and caches pack lookups. Nits / things to double-check - Formula consume types with missing formula: you warn but still allow “apply”; later Roll(undefined) will error (caught). Consider disabling the action or forcing formula entry when type in {roll/heal/damage}. - Ensure Roll evaluation API matches the Foundry version target (some versions prefer evaluate({async:true})). - Small HTML safety: uses label in chat summary (item.system.uses.label) isn’t escaped. Overall: LGTM for merge; main risk area is the expiry engine complexity, but tests + GM-only gating help.

claw-bot commented 2026-02-06 18:18:39 +00:00

First-time contributor

Copy link

Full review (claw-bot)

✅ CI: Success (ci/woodpecker/pr/checks)

Overall

• Big feature, but the implementation is surprisingly disciplined: clear separation of concerns (consume-flow vs sheet glue), good test coverage, and the new expiry engine avoids world-wide scans in the hot path.

Highlights

• Consume flow (src/apps/actor/consume-flow.js)
  • Quantity/uses logic looks consistent, incl. the “depleted marker” (qty=0 + spent=max) for the last stack.
  • Good UX: target picker + optional formula override, permission checks before actor updates, and a concise chat summary.
  • ActiveEffect copy path: stacking (replace vs stack) + per-consume durationFormula is a nice model.
• Effect expiry engine (src/hooks/effect-expiry.js)
  • GM-only, queue-driven for seconds-based effects; combat start/end reconciliation is centralized.
  • Good guardrails: recursion suppression via options, backfill once on ready, and duplicate combat-end handling guarded.
• Migration 012
  • Conservative backfill (tries not to overwrite user edits), supports core.sourceId + legacy compendiumSource, caches pack lookups.

Issues / suggestions

1. Item description enrichment: secrets regression

• src/utils/enrich-description.js forces secrets: false.
• Previously the item sheet enriched with secrets: this.item.isOwner (so owners could see secret blocks). With the new helper, owners will no longer see them.
  Suggestion: make enrichItemDescription(item, { secrets }) configurable, or default to secrets: item.isOwner.

2. Uses sorting key likely broken

• Actor list displays {{item.usesRemaining}} (computed in _prepareContext).
• But header uses data-data-path="system.usesRemaining".
  Unless system.usesRemaining exists, sorting by remaining uses won’t work.
  Suggestion: either
  • change header path to usesRemaining, OR
  • put the derived value into item.system.usesRemaining for display-only sorting.

3. HTML safety in chat summary

• item.system?.uses?.label is interpolated into HTML without escaping in the chat message.
  Suggestion: wrap with foundry.utils.escapeHTML(...).

4. Effect expiry: rounding edge (seconds → rounds)

• buildSecondsToRoundsUpdate uses Math.floor(secondsRemaining / roundTime) and sets turns=1 when rounds=0.
  This is probably fine (avoids giving extra time), but it can shorten effects near boundaries.
  Suggestion: confirm expected semantics for “< 1 round remaining” and add/adjust a test if needed.

5. Minor UX polish

• rollable-image.hbs overlay alt text remains “dice overlay” even when using the hand icon.
  Suggestion: allow passing overlayAlt (optional).

6. CONFIG.time.roundTime = 5

• src/hooks/init.js sets CONFIG.time.roundTime = 5.
  If DS4 intends 5s rounds: great. If not, this will affect any time/round conversions across the system.

Suggested test scenarios (manual)

• Item with uses.max=3, quantity=2, consumedOnUse=true: consume repeatedly → uses decrement, then qty-- and uses reset; last unit ends at qty=0/spent=max.
• Consume-driven ActiveEffect with durationFormula (rounds/seconds) + expireOnCombatEnd: apply → start combat → end combat → verify expiry/reconversion.

Verdict

• LGTM once (1) secrets enrichment and (2) uses sorting path are addressed; (3) HTML escaping is a low-effort hardening.

Full review (claw-bot) ✅ CI: Success (ci/woodpecker/pr/checks) Overall - Big feature, but the implementation is surprisingly disciplined: clear separation of concerns (consume-flow vs sheet glue), good test coverage, and the new expiry engine avoids world-wide scans in the hot path. Highlights - Consume flow (`src/apps/actor/consume-flow.js`) - Quantity/uses logic looks consistent, incl. the “depleted marker” (qty=0 + spent=max) for the last stack. - Good UX: target picker + optional formula override, permission checks before actor updates, and a concise chat summary. - ActiveEffect copy path: stacking (replace vs stack) + per-consume durationFormula is a nice model. - Effect expiry engine (`src/hooks/effect-expiry.js`) - GM-only, queue-driven for seconds-based effects; combat start/end reconciliation is centralized. - Good guardrails: recursion suppression via options, backfill once on ready, and duplicate combat-end handling guarded. - Migration 012 - Conservative backfill (tries not to overwrite user edits), supports core.sourceId + legacy compendiumSource, caches pack lookups. Issues / suggestions 1) Item description enrichment: secrets regression - `src/utils/enrich-description.js` forces `secrets: false`. - Previously the item sheet enriched with `secrets: this.item.isOwner` (so owners could see secret blocks). With the new helper, owners will no longer see them. Suggestion: make `enrichItemDescription(item, { secrets })` configurable, or default to `secrets: item.isOwner`. 2) Uses sorting key likely broken - Actor list displays `{{item.usesRemaining}}` (computed in `_prepareContext`). - But header uses `data-data-path="system.usesRemaining"`. Unless `system.usesRemaining` exists, sorting by remaining uses won’t work. Suggestion: either - change header path to `usesRemaining`, OR - put the derived value into `item.system.usesRemaining` for display-only sorting. 3) HTML safety in chat summary - `item.system?.uses?.label` is interpolated into HTML without escaping in the chat message. Suggestion: wrap with `foundry.utils.escapeHTML(...)`. 4) Effect expiry: rounding edge (seconds → rounds) - `buildSecondsToRoundsUpdate` uses `Math.floor(secondsRemaining / roundTime)` and sets `turns=1` when rounds=0. This is probably fine (avoids giving extra time), but it can shorten effects near boundaries. Suggestion: confirm expected semantics for “< 1 round remaining” and add/adjust a test if needed. 5) Minor UX polish - `rollable-image.hbs` overlay alt text remains “dice overlay” even when using the hand icon. Suggestion: allow passing overlayAlt (optional). 6) CONFIG.time.roundTime = 5 - `src/hooks/init.js` sets `CONFIG.time.roundTime = 5`. If DS4 intends 5s rounds: great. If not, this will affect any time/round conversions across the system. Suggested test scenarios (manual) - Item with `uses.max=3`, `quantity=2`, `consumedOnUse=true`: consume repeatedly → uses decrement, then qty-- and uses reset; last unit ends at qty=0/spent=max. - Consume-driven ActiveEffect with durationFormula (rounds/seconds) + expireOnCombatEnd: apply → start combat → end combat → verify expiry/reconversion. Verdict - LGTM once (1) secrets enrichment and (2) uses sorting path are addressed; (3) HTML escaping is a low-effort hardening.

claw-bot commented 2026-02-06 18:25:20 +00:00

First-time contributor

Copy link

Addendum (claw-bot)

One additional critical issue found by the subagent:

⚠️ High: Consume formula rolls have no roll data

• src/apps/actor/consume-flow.js: new Roll(resolvedFormula) and duration formula roll are evaluated without actor/item roll data.
• Formulas with @-references (e.g., @abilities.str.value, @item.level) will not resolve correctly.
• Affects both the consume formula and the ActiveEffect durationFormula.

Suggestion:

const rollData = targetActor.getRollData();
// merge item data if needed
const roll = new Roll(resolvedFormula, rollData);
await roll.evaluate({ async: true }); // v13 compatibility

Same applies to the durationFormula evaluation when applying ActiveEffects.

Addendum (claw-bot) One additional critical issue found by the subagent: **⚠️ High: Consume formula rolls have no roll data** - `src/apps/actor/consume-flow.js`: `new Roll(resolvedFormula)` and duration formula roll are evaluated without actor/item roll data. - Formulas with `@`-references (e.g., `@abilities.str.value`, `@item.level`) will not resolve correctly. - Affects both the consume formula and the ActiveEffect durationFormula. Suggestion: ```js const rollData = targetActor.getRollData(); // merge item data if needed const roll = new Roll(resolvedFormula, rollData); await roll.evaluate({ async: true }); // v13 compatibility ``` Same applies to the durationFormula evaluation when applying ActiveEffects.

Athemis added 1 commit 2026-02-09 07:28:37 +00:00

Merge remote-tracking branch 'origin/main' into feature/consume-items 54418bf973

Athemis added 1 commit 2026-02-09 08:50:44 +00:00

fix(consume): resolve @-references in consume and duration formulas ... 09537c2dfd

Formulas containing @-references (e.g. @attributes.body.total) were passed to `new Roll()` without
substitution, causing silent failures.

Use `DS4Actor.replaceFormulaData()` to resolve placeholders against the target actor's system data
before rolling. Unresolvable references now show a user-facing warning instead of failing silently.

Athemis added 2 commits 2026-02-09 09:09:59 +00:00

chore(actor-sheet): remove outdated TODO comments in item update handler 69b9f2a30a

refactor(test): move consume-flow spec to mirror src/ directory structure c834145aee

Athemis added 1 commit 2026-02-09 09:58:33 +00:00

perf(effect-expiry): reconcile only new actor on mid-combat combatant add ... 14bad78854

Extract reconcileActorsForCombat from onCombatStart so the createCombatant hook can reconcile a
single actor instead of iterating all combatants. This avoids redundant work and preserves the
combat-end guard.

Athemis added 1 commit 2026-02-09 10:21:25 +00:00

Merge remote-tracking branch 'origin/main' into feature/consume-items 2161ff8f12

Athemis added 2 commits 2026-02-09 10:34:46 +00:00

fix(consume): escape user-provided uses label in chat summary HTML eb8a51cb4c

fix(actor-sheet): correct sort path for remaining uses column 1b5d9be808

Athemis added 1 commit 2026-02-09 10:54:44 +00:00

fix(actor-sheet): preserve input focus during quantity edits ... 032dc14ab4

Re-render the inventory tab only when quantity crosses the zero boundary, since that is the only
transition affecting the consume overlay. Other quantity changes (e.g. 3→5) no longer replace the
DOM, so the number input keeps focus.

Athemis added 1 commit 2026-02-09 12:22:27 +00:00

Merge remote-tracking branch 'origin/main' into feature/consume-items 261685f273

Athemis added 1 commit 2026-02-09 13:08:39 +00:00

chore(assets): Ensure proper line ending in hand.svg d1b77c8994

Athemis force-pushed feature/consume-items from d1b77c8994 to 9838b39acc 2026-02-09 13:31:55 +00:00 Compare

All checks were successful

Hide all checks

renovate/stability-days Not a Renovate PR - check skipped

Required

ci/woodpecker/pr/auto-approve-renovate-checks Pipeline was successful

Details

ci/woodpecker/pr/checks Pipeline was successful

Required

Details

This pull request can be merged automatically.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin feature/consume-items:feature/consume-items

git switch feature/consume-items

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

technical-debt

Technical improvements needed to maintain code quality and future compatibility

  

wontfix

This won't be fixed

No labels

bug

duplicate

enhancement

help wanted

invalid

question

technical-debt

wontfix

Milestone

Clear milestone

No items

No milestone

3.3.0

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

Athemis

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Blocks

#88 Track remaining usable items (including complex effect automation)

Athemis/ds4

#89 Complex consumables: movement/state transformations

Athemis/ds4

#90 Complex consumables: spell-like and special resolution

Athemis/ds4

Reference

Athemis/ds4!73

No description provided.