@archivist-gg/dnd5e 0.3.11 → 0.3.17

package/dist/pc/pc.recalc.js

@@ -1,28 +1,40 @@
+import {
+  amountBindingsFor
+} from "../chunk-PXVNAY7T.js";
+import "../chunk-KR6JF3BF.js";
 import {
   computeConditionEffects
-} from "../chunk-R2ZV233X.js";
+} from "../chunk-MYY2C5MB.js";
 import {
   collectChosenAbilityPoints,
   collectChosenProficiencies
-} from "../chunk-2INMRR3Q.js";
+} from "../chunk-ONTGZR5T.js";
+import "../chunk-2LULMQTF.js";
+import "../chunk-H5PTKYXL.js";
+import {
+  assembleEffectFeatures,
+  computeFeatureEffects,
+  foldsNow,
+  selfEffectsOf
+} from "../chunk-TULQ4FFX.js";
+import "../chunk-TOM66P2P.js";
+import "../chunk-KU3YLF6D.js";
+import {
+  featPickSites,
+  poolMemberSitesOf
+} from "../chunk-HTYMW5CH.js";
 import {
   resourceLevelFor
-} from "../chunk-4ISR76DH.js";
+} from "../chunk-KSTV7J2U.js";
 import {
   computeSpellLimits,
   deriveSpellSlots,
   effectiveSpellcastingAbility,
   resolveSpellcasting
 } from "../chunk-DPUJDOKV.js";
-import "../chunk-O4SRD3J5.js";
-import "../chunk-PP2UHLBA.js";
 import {
-  diceColumnAt,
-  unarmedDieColumnFor
-} from "../chunk-IUAAXXNO.js";
-import "../chunk-YHYTW5QA.js";
-import "../chunk-3HX5VLWP.js";
-import "../chunk-PVCEA4HZ.js";
+  legacyAsiBranch
+} from "../chunk-LBEXLN6I.js";
 import {
   toDefenseSlug
 } from "../chunk-XJ2F2WO6.js";
@@ -31,31 +43,38 @@ import {
   computeAppliedBonuses,
   computeSlotsAndAttacks,
   emptyAppliedBonuses
-} from "../chunk-V373TRJE.js";
-import "../chunk-UIRMA5KM.js";
-import "../chunk-UBBKSYBY.js";
-import {
-  assembleEffectFeatures,
-  computeFeatureEffects,
-  foldsNow,
-  selfEffectsOf
-} from "../chunk-CBEKVAX4.js";
-import "../chunk-TOM66P2P.js";
-import "../chunk-KU3YLF6D.js";
+} from "../chunk-JSM6JFZR.js";
+import "../chunk-3LWMFYKS.js";
+import "../chunk-YDGMBMYI.js";
+import "../chunk-EJP263OP.js";
 import "../chunk-RLGQ5PZZ.js";
-import "../chunk-LWFTHJIE.js";
-import "../chunk-DNAJRMNN.js";
-import "../chunk-LVQLWRCU.js";
-import "../chunk-WXWPK3LI.js";
-import "../chunk-6X4KUDMU.js";
+import "../chunk-3VZZDKRA.js";
+import "../chunk-W6GC6OKK.js";
+import "../chunk-B3DP42OM.js";
+import {
+  diceColumnAt,
+  unarmedDieColumnFor
+} from "../chunk-IUAAXXNO.js";
+import "../chunk-YHYTW5QA.js";
+import "../chunk-VRV3NNTA.js";
+import "../chunk-PVCEA4HZ.js";
+import "../chunk-IHE6KVC3.js";
+import "../chunk-HHBD4SQ6.js";
+import "../chunk-A54HHCWW.js";
+import "../chunk-LHZXYFBU.js";
 import "../chunk-YBLDE5CG.js";
+import "../chunk-ZUQW5VBZ.js";
+import "../chunk-LVQLWRCU.js";
+import "../chunk-CM5CWO4K.js";
 import {
-  evaluateMaxFormula,
-  isValidMaxFormula
-} from "../chunk-EVMUJYUD.js";
+  resolveAmountText
+} from "../chunk-QH36K2PU.js";
+import "../chunk-EVMUJYUD.js";
 import "../chunk-VTTA2ALZ.js";
-import "../chunk-XY6X2APM.js";
+import "../chunk-ZCTUYGNV.js";
+import "../chunk-7Q2VPKCD.js";
 import "../chunk-ZDAEGJH4.js";
+import "../chunk-3TM34RSJ.js";
 import {
   abilityModifier,
   attackBonus,
@@ -124,13 +143,11 @@ function collectClassAsiBranch(resolved) {
   var _a;
   const out = {};
   for (const c of resolved.classes) {
-    for (const [, choice] of Object.entries(c.choices)) {
-      const block = choice;
-      if (typeof (block == null ? void 0 : block.feat) === "string") continue;
-      const asi = block == null ? void 0 : block.asi;
-      if (!asi) continue;
+    for (const choice of Object.values(c.choices)) {
+      const alloc = legacyAsiBranch(choice);
+      if (!alloc) continue;
       for (const ab of ABILITY_KEYS) {
-        const v = asi[ab];
+        const v = alloc[ab];
         if (typeof v === "number") out[ab] = ((_a = out[ab]) != null ? _a : 0) + v;
       }
     }
@@ -190,14 +207,9 @@ function hpLevelCount(classes) {
 function multiclassMaxHP(classes, conMod) {
   return Math.max(1, hitDiceAverageSum(classes) + conMod * hpLevelCount(classes));
 }
-function resolveRiderAmount(amount, bindings) {
-  if (!amount.includes("{")) return amount;
-  const formula = amount.replace(/\{prof_bonus\}/g, "{prof}");
-  if (!isValidMaxFormula(formula)) return amount;
-  return String(evaluateMaxFormula(formula, bindings));
-}
 function resolveDamageRider(rider, rowDamageType, bindings) {
-  const out = { ...rider, amount: resolveRiderAmount(rider.amount, bindings) };
+  const { owner, ...rest } = rider;
+  const out = { ...rest, amount: resolveAmountText(rider.amount, bindings(owner)) };
   if (rider.damage_type !== void 0 && !isChosenDamageType(rider.damage_type)) {
     const resolved = isCanonicalDamageType(rider.damage_type) ? rider.damage_type : rowDamageType;
     if (resolved) out.damage_type = resolved;
@@ -205,6 +217,24 @@ function resolveDamageRider(rider, rowDamageType, bindings) {
   }
   return out;
 }
+function riderReachesRow(rider, row) {
+  var _a;
+  if (!((_a = rider.scope) == null ? void 0 : _a.length)) return true;
+  return rider.scope.some((word) => {
+    switch (word) {
+      case "weapon":
+        return true;
+      case "unarmed":
+        return row.unarmed === true;
+      case "melee":
+      case "ranged":
+        return row.weaponCategory === word;
+      case "finesse":
+      case "thrown":
+        return row.properties.includes(word);
+    }
+  });
+}
 function unarmoredAC(resolved, mods, warnings) {
   return unarmoredACBreakdown(resolved, mods, warnings).total;
 }
@@ -333,17 +363,17 @@ function collectClassFeatAbilityPoints(resolved) {
   const stripRef = (ref) => ref.replace(/^\[\[/, "").replace(/\]\]$/, "");
   const featBySlug = /* @__PURE__ */ new Map();
   for (const f of resolved.feats) featBySlug.set(f.slug, f);
-  for (const c of resolved.classes) {
-    for (const atLevel of Object.values(c.choices)) {
-      const block = atLevel;
-      if (!block) continue;
-      const featRef = block.feat;
-      if (typeof featRef !== "string") continue;
-      const feat = featBySlug.get(stripRef(featRef));
+  const sites = featPickSites(resolved.classes, poolMemberSitesOf(resolved), (ci) => {
+    var _a2, _b2, _c, _d;
+    return (_d = (_c = (_b2 = (_a2 = resolved.classes) == null ? void 0 : _a2[ci]) == null ? void 0 : _b2.entity) == null ? void 0 : _c.slug) != null ? _d : null;
+  });
+  for (const site of sites) {
+    {
+      const feat = featBySlug.get(stripRef(site.slug));
       if (!feat) continue;
       for (const ch of (_a = feat.choices) != null ? _a : []) {
         if (ch.kind !== "ability-points") continue;
-        const raw = block[`feat:${ch.id}`];
+        const raw = site.read(ch.id);
         if (!raw || typeof raw !== "object" || Array.isArray(raw)) continue;
         let left = ch.points;
         for (const ab of ABILITY_KEYS) {
@@ -519,7 +549,18 @@ function recalc(resolved, registry) {
   const overrides = (_a = resolved.definition.overrides) != null ? _a : {};
   const chosenProfs = collectChosenProficiencies(resolved);
   const { features: effectFeatures, activeBuffs } = assembleEffectFeatures(resolved);
-  const featureEffects = computeFeatureEffects(effectFeatures, { activeBuffs, levelFor: (src) => resourceLevelFor(src, resolved) });
+  const tableDiceFor = (src, column, level) => {
+    var _a2;
+    const cls = src.kind === "class" ? resolved.classes.find((c) => {
+      var _a3;
+      return ((_a3 = c.entity) == null ? void 0 : _a3.slug) === src.slug;
+    }) : src.kind === "subclass" ? resolved.classes.find((c) => {
+      var _a3;
+      return ((_a3 = c.subclass) == null ? void 0 : _a3.slug) === src.slug;
+    }) : void 0;
+    return cls ? diceColumnAt((_a2 = cls.entity) == null ? void 0 : _a2.table, level, column) : null;
+  };
+  const featureEffects = computeFeatureEffects(effectFeatures, { activeBuffs, levelFor: (src) => resourceLevelFor(src, resolved), tableDiceFor });
   const profsForApply = computeProficiencies(resolved);
   for (const t of chosenProfs.tools) {
     if (!profsForApply.tools.specific.includes(t)) profsForApply.tools.specific.push(t);
@@ -593,17 +634,30 @@ function recalc(resolved, registry) {
   for (const ab of chosenProfs.saves) saveProfs.add(ab);
   const saves = {};
   const saveBreakdowns = {};
+  const activeSaveBonusTerms = featureEffects.save_bonus_terms.filter((t) => {
+    var _a2;
+    return t.inactiveWhile === "incapacitated" ? !conditionEffects.actions_disabled : t.inactiveWhile === "unconscious" ? !((_a2 = resolved.state.conditions) != null ? _a2 : []).includes("unconscious") : true;
+  });
   for (const ab of ABILITY_KEYS) {
     const override = (_f = overrides.saves) == null ? void 0 : _f[ab];
     const prof = (_g = override == null ? void 0 : override.proficient) != null ? _g : saveProfs.has(ab);
-    const derivedBonus = savingThrow(scores[ab], prof, proficiencyBonus) + applied.save_bonus + conditionEffects.d20_test_penalty;
+    const featureTerms = [];
+    for (const t of activeSaveBonusTerms) {
+      if (t.saves.length > 0 && !t.saves.includes(ab)) continue;
+      const amount = Math.max(t.minimum, mods[t.ability]);
+      const prior = featureTerms.find((x) => x.source === t.label);
+      if (prior === void 0) featureTerms.push({ source: t.label, amount });
+      else if (amount > prior.amount) prior.amount = amount;
+    }
+    const derivedBonus = savingThrow(scores[ab], prof, proficiencyBonus) + applied.save_bonus + featureTerms.reduce((sum, t) => sum + t.amount, 0) + conditionEffects.d20_test_penalty;
     const bonus = (_h = override == null ? void 0 : override.bonus) != null ? _h : derivedBonus;
     saves[ab] = { bonus, proficient: prof };
     saveBreakdowns[ab] = [
       { source: ab.toUpperCase(), amount: mods[ab] },
       ...prof ? [{ source: "Proficiency", amount: proficiencyBonus }] : [],
-      ...applied.save_bonus ? [{ source: "Equipment", amount: applied.save_bonus }] : [],
-      ...conditionEffects.d20_test_penalty ? [{ source: "Conditions", amount: conditionEffects.d20_test_penalty }] : []
+      ...applied.save_terms.map((t) => ({ ...t })),
+      ...featureTerms,
+      ...conditionEffects.d20_test_penalty ? [{ source: `Exhaustion ${conditionEffects.exhaustion_level}`, amount: conditionEffects.d20_test_penalty }] : []
     ];
   }
   const profSet = /* @__PURE__ */ new Set([
@@ -634,7 +688,8 @@ function recalc(resolved, registry) {
     skills[skillKey] = {
       bonus,
       proficiency: tri,
-      ability: ab
+      ability: ab,
+      ...halfProfBest ? { halfProficiency: { source: halfProfBest.source, amount: halfProfBest.amount } } : {}
     };
   }
   const passives = {
@@ -808,18 +863,7 @@ function recalc(resolved, registry) {
     ))
   };
   const attackRows = [...(_U = derivedEquipment == null ? void 0 : derivedEquipment.attacks) != null ? _U : [], buildUnarmedRow(mods, proficiencyBonus, resolveUnarmedStrike(resolved))];
-  const riderBindings = {
-    level: totalLevel,
-    class_level: totalLevel,
-    prof: proficiencyBonus,
-    str_mod: mods.str,
-    dex_mod: mods.dex,
-    con_mod: mods.con,
-    int_mod: mods.int,
-    wis_mod: mods.wis,
-    cha_mod: mods.cha,
-    columns: {}
-  };
+  const riderBindings = (owner) => amountBindingsFor(owner, resolved, { proficiencyBonus, mods, spellcastingClasses });
   return {
     totalLevel,
     proficiencyBonus,
@@ -862,7 +906,7 @@ function recalc(resolved, registry) {
     // attackNotes: reroll-damage / attack-rule captions, only when non-empty.
     attacks: attackRows.map((a) => {
       var _a2;
-      const riders = [...(_a2 = a.damageRiders) != null ? _a2 : [], ...featureEffects.damageBonuses].map((r) => resolveDamageRider(r, a.damageType, riderBindings));
+      const riders = [...(_a2 = a.damageRiders) != null ? _a2 : [], ...featureEffects.damageBonuses.filter((r) => riderReachesRow(r, a))].map((r) => resolveDamageRider(r, a.damageType, riderBindings));
       return {
         ...a,
         toHit: a.toHit + conditionEffects.d20_test_penalty,
@@ -895,6 +939,7 @@ export {
   phbAverageForDie,
   recalc,
   resolveUnarmedStrike,
+  riderReachesRow,
   speedFromRace,
   unarmoredAC,
   unarmoredACBreakdown

package/dist/pc/pc.resolver.d.ts

@@ -4,6 +4,7 @@ import type { BackgroundEntity } from "@archivist-gg/dnd5e/background/background
 import type { FeatEntity } from "@archivist-gg/dnd5e/feat/feat.types";
 import type { Ability } from "@archivist-gg/dnd5e";
 import type { Character, ChoiceValue, ResolvedCharacter, ResolvedClass, ResolvedFeature, ResolvedSpell, FeatVia } from "./pc.types.js";
+import { type PoolMemberSite } from "./pc.member-choices.js";
 export interface ResolveResult {
     character: ResolvedCharacter;
     warnings: string[];
@@ -126,7 +127,7 @@ export declare function collectChosenGrantedFeatures(character: Character, class
     getByTypeAndSlug(type: string, slug: string): {
         data: Record<string, unknown>;
     } | undefined;
-}, race?: RaceEntity | null, background?: BackgroundEntity | null): ResolvedFeature[];
+}, race?: RaceEntity | null, background?: BackgroundEntity | null, memberSites?: PoolMemberSite[]): ResolvedFeature[];
 /**
  * `character.additional_features` → ResolvedFeatures (the DM-grant path).
  *

package/dist/pc/pc.resolver.js

@@ -10,28 +10,36 @@ import {
   dedupeResolvedSpells,
   resolveOriginFeat,
   stripSlug
-} from "../chunk-2INMRR3Q.js";
-import "../chunk-4ISR76DH.js";
+} from "../chunk-ONTGZR5T.js";
+import "../chunk-2LULMQTF.js";
+import "../chunk-H5PTKYXL.js";
+import "../chunk-TULQ4FFX.js";
+import "../chunk-TOM66P2P.js";
+import "../chunk-KU3YLF6D.js";
+import "../chunk-HTYMW5CH.js";
+import "../chunk-KSTV7J2U.js";
 import "../chunk-DPUJDOKV.js";
-import "../chunk-O4SRD3J5.js";
-import "../chunk-PP2UHLBA.js";
+import "../chunk-LBEXLN6I.js";
+import "../chunk-RLGQ5PZZ.js";
+import "../chunk-3VZZDKRA.js";
+import "../chunk-W6GC6OKK.js";
+import "../chunk-B3DP42OM.js";
 import "../chunk-IUAAXXNO.js";
 import "../chunk-YHYTW5QA.js";
-import "../chunk-3HX5VLWP.js";
+import "../chunk-VRV3NNTA.js";
 import "../chunk-PVCEA4HZ.js";
-import "../chunk-UBBKSYBY.js";
-import "../chunk-CBEKVAX4.js";
-import "../chunk-TOM66P2P.js";
-import "../chunk-KU3YLF6D.js";
-import "../chunk-RLGQ5PZZ.js";
-import "../chunk-LVQLWRCU.js";
-import "../chunk-WXWPK3LI.js";
-import "../chunk-6X4KUDMU.js";
+import "../chunk-IHE6KVC3.js";
+import "../chunk-LHZXYFBU.js";
 import "../chunk-YBLDE5CG.js";
+import "../chunk-ZUQW5VBZ.js";
+import "../chunk-LVQLWRCU.js";
+import "../chunk-CM5CWO4K.js";
 import "../chunk-EVMUJYUD.js";
 import "../chunk-VTTA2ALZ.js";
-import "../chunk-XY6X2APM.js";
+import "../chunk-ZCTUYGNV.js";
+import "../chunk-7Q2VPKCD.js";
 import "../chunk-ZDAEGJH4.js";
+import "../chunk-3TM34RSJ.js";
 import "../chunk-PDJSUH24.js";
 import "../chunk-WELIKLZF.js";
 import "../chunk-4U55VNC7.js";

package/dist/pc/pc.resource-seed.js

@@ -1,6 +1,6 @@
 import {
   resourceLevelFor
-} from "../chunk-4ISR76DH.js";
+} from "../chunk-KSTV7J2U.js";
 import "../chunk-DPUJDOKV.js";
 import {
   numericColumnsAt

package/dist/pc/pc.resources.d.ts

@@ -1,4 +1,4 @@
-import type { FeatureSource, ResolvedCharacter, ResolvedFeature, ResolvedPool, DerivedStats } from "./pc.types.js";
+import type { FeatureSource, ResolvedCharacter, ResolvedFeature, ResolvedPool, ResolvedPoolEntry, DerivedStats } from "./pc.types.js";
 import type { ResourceRecovery, ResourceDie, ResourceScaleStep, ResetTrigger } from "../types/resource.js";
 /** The level a resource granted via `source` scales against (R4-G4 §6.2.4, ONE derivation): the
  *  character's level in the granting class; for a `subclass` source the level in the class that OWNS
@@ -80,6 +80,11 @@ export declare function resolveRecovery(entry: ResourceRecovery): ResolvedRecove
  *  max-of-maxes merge). Reads the features array ONLY. `name` falls back to the owning feature's name,
  *  the rule `findResourceById` carried, for resources synthesised from older fixtures that omit it. */
 export declare function resolveFeatureResources(features: ReadonlyArray<ResolvedFeature>): ResourceIndex;
+/** The resource id a pool pick's own tracker uses (spec §5.2): a repeatable copy keys by its pick key, every other pick by its slug.
+ *  A repeatable (non-item-bound) copy keys its tracker by its KEY, so two copies are two trackers; `param != null` keeps a cast
+ *  fixture without the field on the slug. ONE rule for both sides: dnd5e seeds by it and the plugin's pick tracker reads by it
+ *  (ART-c1, R-3 c). */
+export declare function pickResourceId(entry: Pick<ResolvedPoolEntry, "slug" | "key" | "param">): string;
 /** The full index: the feature resources (`resolveFeatureResources`) plus the pool picks' own
  *  `uses` (R4-G4 §12, LANDED at T7b). A pure function of `resolved.features` and `resolved.pools`,
  *  each guarded `?? []` because the cast fixtures behind the rest suites in both repos carry

package/dist/pc/pc.resources.js

@@ -1,10 +1,11 @@
 import {
+  pickResourceId,
   poolSaveDC,
   resolveFeatureResources,
   resolveRecovery,
   resolveResourceIndex,
   resourceLevelFor
-} from "../chunk-4ISR76DH.js";
+} from "../chunk-KSTV7J2U.js";
 import "../chunk-DPUJDOKV.js";
 import "../chunk-IUAAXXNO.js";
 import "../chunk-LVQLWRCU.js";
@@ -13,6 +14,7 @@ import "../chunk-VTTA2ALZ.js";
 import "../chunk-PDJSUH24.js";
 import "../chunk-WELIKLZF.js";
 export {
+  pickResourceId,
   poolSaveDC,
   resolveFeatureResources,
   resolveRecovery,

package/dist/pc/pc.rest.d.ts

@@ -1,5 +1,6 @@
 import type { EntityRegistry } from "@archivist-gg/core";
-import type { Character, DerivedStats, ResolvedCharacter } from "./pc.types.js";
+import type { ResetTrigger } from "../types/resource.js";
+import type { Character, DerivedStats, EquipmentEntryState, ResolvedCharacter } from "./pc.types.js";
 export type RestType = "short" | "long";
 export type RestCategoryId = "hp-to-max" | "hd-regain" | "spell-slots" | "pact-slots" | "exhaustion" | "hp-modifier-reset" | `feature:${string}` | `item:${number}`
 /** R4-G5 §4.4.2: END an active buff whose carrier declares a structured `duration`. The tail is the STORED
@@ -15,6 +16,14 @@ export interface RestCategory {
     /** R4-G4 §7.2.2: a PARTIAL restore from a `recovery[]` entry of kind `uses` and flavour `rest` (N uses, or "all"),
      *  emitted only when the resource's own `reset` does not already fire at this rest. Absent = the own reset (to 0). */
     restore?: number | "all";
+    /** ART-c1 Task 9c (S-4, controller ruling 10): an `item:` category's recharge, the amount its rule restores ("1d6+1",
+     *  "3", "all") and the charges before the rest. The sheet's rest dialog rolls a DICE amount once when it opens and the
+     *  rest applies `min(max, current + n)`; this plan stays pure and rolls nothing. */
+    recharge?: {
+        amount: string;
+        current: number;
+        max: number;
+    };
 }
 export interface RestPlan {
     type: RestType;
@@ -29,4 +38,15 @@ export interface RestPlan {
         targetUsed: number;
     }>;
 }
+/** The persisted item-charge recovery vocabulary (`pc.schema.ts` `equipmentEntryStateSchema.recovery.reset`). */
+export type ItemRecoveryReset = NonNullable<EquipmentEntryState["recovery"]>["reset"];
+/** Every reset a counter can carry: a feature resource's `ResetTrigger` or an item's recovery reset. The two
+ *  vocabularies share only `dawn`, which means the same thing in both. */
+export type AnyReset = ResetTrigger | ItemRecoveryReset;
+/** The earliest rest that restores `reset` in full, or `null` when none does. A value outside both vocabularies (raw
+ *  note data reaches here unvalidated) is restored by no rest: an OWN-property lookup, so a prototype key such as
+ *  `constructor` is not a reset either. */
+export declare function earliestRestoringRest(reset: AnyReset): RestType | null;
+/** Whether a rest of `type` restores `reset` in full: the earliest rest that restores it is no longer than `type`. */
+export declare function restRestores(type: RestType, reset: AnyReset): boolean;
 export declare function computeRestPlan(character: Character, resolved: ResolvedCharacter, derived: DerivedStats, registry: EntityRegistry | null, type: RestType): RestPlan;

package/dist/pc/pc.rest.js

@@ -1,11 +1,23 @@
 import {
   resolveResourceIndex
-} from "../chunk-4ISR76DH.js";
+} from "../chunk-KSTV7J2U.js";
 import "../chunk-DPUJDOKV.js";
+import {
+  effectiveItemCharges,
+  effectiveItemRecovery
+} from "../chunk-3VZZDKRA.js";
+import "../chunk-W6GC6OKK.js";
+import "../chunk-B3DP42OM.js";
 import "../chunk-IUAAXXNO.js";
+import "../chunk-IHE6KVC3.js";
+import "../chunk-LHZXYFBU.js";
+import "../chunk-ZUQW5VBZ.js";
 import "../chunk-LVQLWRCU.js";
+import "../chunk-CM5CWO4K.js";
 import "../chunk-EVMUJYUD.js";
 import "../chunk-VTTA2ALZ.js";
+import "../chunk-ZCTUYGNV.js";
+import "../chunk-3TM34RSJ.js";
 import "../chunk-PDJSUH24.js";
 import "../chunk-WELIKLZF.js";
 
@@ -17,18 +29,35 @@ function resolveItemName(entry, registry) {
   const slug = ref ? ref[1] : entry.item;
   return (_a = registry.getBySlug(slug)) == null ? void 0 : _a.name;
 }
-var FIRES_AT = {
-  long: /* @__PURE__ */ new Set(["short-rest", "long-rest", "either", "dawn", "dusk"]),
-  short: /* @__PURE__ */ new Set(["short-rest", "either"])
+var RESTORED_BY = {
+  "short-rest": "short",
+  either: "short",
+  short: "short",
+  "long-rest": "long",
+  long: "long",
+  dawn: "long",
+  dusk: "long",
+  turn: null,
+  round: null,
+  custom: null,
+  special: null
 };
+var REST_SPAN = { short: 1, long: 2 };
+function earliestRestoringRest(reset) {
+  return Object.prototype.hasOwnProperty.call(RESTORED_BY, reset) ? RESTORED_BY[reset] : null;
+}
+function restRestores(type, reset) {
+  const earliest = earliestRestoringRest(reset);
+  return earliest !== null && REST_SPAN[earliest] <= REST_SPAN[type];
+}
 function pushPartialRecoveries(cats, character, index, type) {
   var _a, _b;
   for (const [key, fu] of Object.entries((_a = character.state.feature_uses) != null ? _a : {})) {
     if (fu.used <= 0) continue;
     const res = index.get(key);
     if (!((_b = res == null ? void 0 : res.recovery) == null ? void 0 : _b.length)) continue;
-    if (FIRES_AT[type].has(res.reset)) continue;
-    const entry = res.recovery.find((r) => r.kind === "uses" && r.flavour === "rest" && FIRES_AT[type].has(r.entry.reset));
+    if (restRestores(type, res.reset)) continue;
+    const entry = res.recovery.find((r) => r.kind === "uses" && r.flavour === "rest" && restRestores(type, r.entry.reset));
     if (!entry) continue;
     const amount = entry.entry.amount;
     const restore = amount === "all" ? "all" : typeof amount === "number" ? amount : Number(amount);
@@ -132,8 +161,7 @@ function computeRestPlan(character, resolved, derived, registry, type) {
       const bankedRolls = banked ? banked.filter((v) => v > 0).length : 0;
       if (fu.used <= 0 && bankedRolls <= 0) continue;
       const res = index.get(key);
-      const reset = (_h = res == null ? void 0 : res.reset) != null ? _h : "long-rest";
-      if (reset !== "short-rest" && reset !== "long-rest" && reset !== "either" && reset !== "dawn" && reset !== "dusk") continue;
+      if (!restRestores("long", (_h = res == null ? void 0 : res.reset) != null ? _h : "long-rest")) continue;
       const rollsNote = bankedRolls > 0 ? ` \xB7 ${bankedRolls} roll${bankedRolls === 1 ? "" : "s"} cleared` : "";
       cats.push({
         id: `feature:${key}`,
@@ -144,16 +172,18 @@ function computeRestPlan(character, resolved, derived, registry, type) {
     pushPartialRecoveries(cats, character, index, "long");
     character.equipment.forEach((entry, idx) => {
       var _a2, _b2, _c2, _d2, _e2;
-      const rec = (_a2 = entry.state) == null ? void 0 : _a2.recovery;
-      const charges = (_b2 = entry.state) == null ? void 0 : _b2.charges;
+      const view = (_b2 = (_a2 = resolved.infusions) == null ? void 0 : _a2.views.get(idx)) != null ? _b2 : null;
+      const rec = effectiveItemRecovery(entry, registry, view);
+      const charges = effectiveItemCharges(entry, registry, view);
       if (!rec || !charges) return;
       if (charges.current >= charges.max) return;
-      if (rec.reset !== "short" && rec.reset !== "long" && rec.reset !== "dawn") return;
+      if (!restRestores("long", rec.reset)) return;
       const label = (_e2 = (_d2 = (_c2 = entry.overrides) == null ? void 0 : _c2.name) != null ? _d2 : resolveItemName(entry, registry)) != null ? _e2 : entry.item;
       cats.push({
         id: `item:${idx}`,
         label,
-        preview: `${charges.current} \u2192 ${charges.max}`
+        preview: `${charges.current} \u2192 ${charges.max}`,
+        recharge: { amount: rec.amount, current: charges.current, max: charges.max }
       });
     });
   }
@@ -163,8 +193,7 @@ function computeRestPlan(character, resolved, derived, registry, type) {
       const bankedRolls = banked ? banked.filter((v) => v > 0).length : 0;
       if (fu.used <= 0 && bankedRolls <= 0) continue;
       const res = index.get(key);
-      const r = (_l = res == null ? void 0 : res.reset) != null ? _l : "long-rest";
-      if (r !== "short-rest" && r !== "either") continue;
+      if (!restRestores("short", (_l = res == null ? void 0 : res.reset) != null ? _l : "long-rest")) continue;
       const rollsNote = bankedRolls > 0 ? ` \xB7 ${bankedRolls} roll${bankedRolls === 1 ? "" : "s"} cleared` : "";
       cats.push({
         id: `feature:${key}`,
@@ -175,16 +204,18 @@ function computeRestPlan(character, resolved, derived, registry, type) {
     pushPartialRecoveries(cats, character, index, "short");
     character.equipment.forEach((entry, idx) => {
       var _a2, _b2, _c2, _d2, _e2;
-      const rec = (_a2 = entry.state) == null ? void 0 : _a2.recovery;
-      const charges = (_b2 = entry.state) == null ? void 0 : _b2.charges;
+      const view = (_b2 = (_a2 = resolved.infusions) == null ? void 0 : _a2.views.get(idx)) != null ? _b2 : null;
+      const rec = effectiveItemRecovery(entry, registry, view);
+      const charges = effectiveItemCharges(entry, registry, view);
       if (!rec || !charges) return;
       if (charges.current >= charges.max) return;
-      if (rec.reset !== "short") return;
+      if (!restRestores("short", rec.reset)) return;
       const label = (_e2 = (_d2 = (_c2 = entry.overrides) == null ? void 0 : _c2.name) != null ? _d2 : resolveItemName(entry, registry)) != null ? _e2 : entry.item;
       cats.push({
         id: `item:${idx}`,
         label,
-        preview: `${charges.current} \u2192 ${charges.max}`
+        preview: `${charges.current} \u2192 ${charges.max}`,
+        recharge: { amount: rec.amount, current: charges.current, max: charges.max }
       });
     });
   }
@@ -193,5 +224,7 @@ function computeRestPlan(character, resolved, derived, registry, type) {
   return { type, categories: cats, hdAvailable, hdRegainDist };
 }
 export {
-  computeRestPlan
+  computeRestPlan,
+  earliestRestoringRest,
+  restRestores
 };