@archivist-gg/dnd5e 0.2.0 → 0.3.0

package/dist/chunk-353WXS6S.js

@@ -0,0 +1,25 @@
+import {
+  bareEntitySlug
+} from "./chunk-LV4SNWZQ.js";
+
+// src/weapon/weapon.classify.ts
+var PURE_RANGED_THROWN_SLUGS = /* @__PURE__ */ new Set(["dart", "net"]);
+function classifyWeaponRange(weapon) {
+  const has = (p) => weapon.properties.some((x) => x === p);
+  const isCatRanged = /ranged/.test(weapon.category);
+  const pureRanged = isCatRanged && (has("ammunition") || has("loading") || PURE_RANGED_THROWN_SLUGS.has(bareEntitySlug(weapon.slug)));
+  if (pureRanged) {
+    return {
+      melee: null,
+      ranged: weapon.range ? { normal: weapon.range.normal, long: weapon.range.long, thrown: false } : null
+    };
+  }
+  return {
+    melee: { reach: 5 + (has("reach") ? 5 : 0) },
+    ranged: weapon.range ? { normal: weapon.range.normal, long: weapon.range.long, thrown: true } : null
+  };
+}
+
+export {
+  classifyWeaponRange
+};

package/dist/{chunk-DC74TZNA.js → chunk-4LZJXJJS.js}

@@ -1,6 +1,6 @@
 import {
   slugify
-} from "./chunk-3TRGRSCH.js";
+} from "./chunk-LV4SNWZQ.js";
 
 // src/entities/base-item-resolver.ts
 function unwrapWikilink(input) {
@@ -10,6 +10,7 @@ function unwrapWikilink(input) {
   const pipe = inner.indexOf("|");
   return pipe === -1 ? inner : inner.slice(0, pipe);
 }
+var FOLDER_TO_TYPE = { Weapons: "weapon", Armor: "armor" };
 function vaultPathToSlug(target) {
   const segments = target.split("/").map((s) => s.trim()).filter((s) => s.length > 0);
   if (segments.length === 0) return "";
@@ -17,10 +18,13 @@ function vaultPathToSlug(target) {
     return slugify(segments[0]);
   }
   const compendiumName = segments[0];
+  const typeFolder = segments[segments.length - 2];
   const basename = segments[segments.length - 1];
   const prefix = slugify(compendiumName);
   const nameSlug = slugify(basename);
-  return prefix && nameSlug ? `${prefix}_${nameSlug}` : nameSlug;
+  if (!prefix || !nameSlug) return nameSlug;
+  const type = FOLDER_TO_TYPE[typeFolder];
+  return type ? `${prefix}_${type}_${nameSlug}` : `${prefix}_${nameSlug}`;
 }
 function resolveBaseItem(baseItem, registry) {
   var _a, _b;
@@ -41,6 +45,7 @@ function resolveBaseItemOfType(baseItem, entityType, registry) {
 }
 
 export {
+  vaultPathToSlug,
   resolveBaseItem,
   resolveBaseItemOfType
 };

package/dist/{chunk-R5SQHP2X.js → chunk-5MZSB6OM.js}

@@ -1,20 +1,23 @@
 import {
   ALL_SKILL_SLUGS
 } from "./chunk-BH6AMZVY.js";
-import {
-  isItemEntity,
-  resolveEntityForEntry
-} from "./chunk-UC4FE5X3.js";
 import {
   normalizeKnownSpell,
   resolveSpellcasting
-} from "./chunk-IXZXFFFW.js";
+} from "./chunk-M2EMFD6S.js";
 import {
   readTableColumn
 } from "./chunk-5XUXXAQJ.js";
 import {
   recognizeDecision
 } from "./chunk-JEYQU3JT.js";
+import {
+  isItemEntity,
+  resolveEntityForEntry
+} from "./chunk-N6N74K6X.js";
+import {
+  bareEntitySlug
+} from "./chunk-LV4SNWZQ.js";
 import {
   ABILITY_KEYS
 } from "./chunk-WP2CX2JO.js";
@@ -483,11 +486,6 @@ function wikilinkTailSlug(link) {
   const tail = (_a = inner.split("/").pop()) != null ? _a : inner;
   return tail.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "");
 }
-function bareEntitySlug(slug) {
-  if (!slug) return "";
-  const i = slug.indexOf("_");
-  return i === -1 ? slug : slug.slice(i + 1);
-}
 function matchesFilter(e, where, ownerBare) {
   var _a, _b, _c, _d, _e;
   const d = e.data;
@@ -1084,7 +1082,6 @@ export {
   collectChosenGrantedFeatures,
   collectResolvedFeatures,
   wikilinkTailSlug,
-  bareEntitySlug,
   __matchesFilterForTest,
   collectChosenProficiencies,
   collectChosenAbilityPoints,

package/dist/{chunk-5WQD3WNZ.js → chunk-A4WENOUQ.js}

@@ -94,7 +94,11 @@ var characterOverridesSchema = z.object({
     investigation: z.number().int().optional(),
     insight: z.number().int().optional()
   }).partial().optional(),
-  hp: z.object({ max: z.number().int().positive().optional() }).optional(),
+  hp: z.object({
+    max: z.number().int().positive().optional(),
+    rolled: z.number().int().positive().optional(),
+    modifier: z.number().int().optional()
+  }).optional(),
   ac: z.number().int().optional(),
   speed: z.number().int().optional(),
   initiative: z.number().int().optional(),

package/dist/{chunk-V6SOFUJW.js → chunk-AIRFC5NQ.js}

@@ -1,6 +1,6 @@
 import {
   bareEntitySlug
-} from "./chunk-R5SQHP2X.js";
+} from "./chunk-LV4SNWZQ.js";
 import {
   ABILITY_KEYS
 } from "./chunk-WP2CX2JO.js";
@@ -10,6 +10,7 @@ function emptyFeatureEffectTotals() {
   return {
     initiative_bonus: 0,
     hp_per_level_bonus: 0,
+    hp_per_level_terms: [],
     speed_walk_bonus: 0,
     speed_walk_set: 0,
     senses: { darkvision: 0, blindsight: 0, tremorsense: 0, truesight: 0 },
@@ -66,6 +67,7 @@ function applyEffect(out, eff, label) {
       break;
     case "hp-per-level-bonus":
       out.hp_per_level_bonus += eff.value;
+      out.hp_per_level_terms.push({ label, value: eff.value });
       break;
     case "speed-bonus":
       if (eff.mode === "walk") {

package/dist/{chunk-TQZB4OCJ.js → chunk-EMOORSQ7.js}

@@ -1,19 +1,22 @@
 import {
-  bareEntitySlug
-} from "./chunk-R5SQHP2X.js";
+  classifyWeaponRange
+} from "./chunk-353WXS6S.js";
 import {
   defaultSlotForType,
   effectiveArmor,
   isItemEntity,
   isWeaponEntity,
   resolveEntityForEntry
-} from "./chunk-UC4FE5X3.js";
+} from "./chunk-N6N74K6X.js";
 import {
   readNumericBonus
 } from "./chunk-LWFTHJIE.js";
 import {
   resolveBaseItem
-} from "./chunk-DC74TZNA.js";
+} from "./chunk-4LZJXJJS.js";
+import {
+  bareEntitySlug
+} from "./chunk-LV4SNWZQ.js";
 
 // src/weapon/weapon-mastery.ts
 var MASTERY = {
@@ -245,7 +248,14 @@ function assignSlots(resolved, registry, warnings) {
     const { entity, entityType } = resolveEntityForEntry(entry.item, registry);
     if (!entity || !entityType) continue;
     const defaultSlot = defaultSlotForType(entityType, entity, registry);
-    if (!defaultSlot) continue;
+    if (!defaultSlot) {
+      if (isItemEntity(entity) && typeof entity.base_item === "string" && entity.base_item.length > 0) {
+        warnings.push(
+          `Magic item "${entity.name}" base_item ${entity.base_item} did not resolve to a base weapon or armor; not slotted (AC/attack not applied).`
+        );
+      }
+      continue;
+    }
     const placed = { index: i, entity, entityType, entry };
     if (defaultSlot === "mainhand") {
       if (!slots.mainhand) slots.mainhand = placed;
@@ -265,12 +275,17 @@ function assignSlots(resolved, registry, warnings) {
   }
   return slots;
 }
-function computeAC(equippedSlots, resolved, mods, registry) {
+function computeAC(equippedSlots, resolved, mods, registry, warnings) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const breakdown = [];
   const armorSlot = equippedSlots.armor;
   const armorEntity = (_a = armorSlot == null ? void 0 : armorSlot.entity) != null ? _a : null;
   const armor = effectiveArmor(armorEntity, registry);
+  if (isItemEntity(armorEntity) && typeof armorEntity.base_item === "string" && !armor) {
+    warnings.push(
+      `Magic armor "${armorEntity.name}" base_item ${armorEntity.base_item} did not resolve to a base armor; AC not applied.`
+    );
+  }
   let ac = 10;
   if (armor) {
     const armorBase = armor.ac.base + ((_b = armor.ac.flat) != null ? _b : 0);
@@ -329,8 +344,9 @@ function hasProperty(weapon, prop) {
   return weapon.properties.some((p) => p === prop);
 }
 function attackAbility(weapon, mods, weaponAbilities) {
-  const isRanged = /ranged/.test(weapon.category);
-  if (!isRanged) {
+  const modes = classifyWeaponRange(weapon);
+  const finesse = hasProperty(weapon, "finesse");
+  if (modes.melee) {
     const scoped = weaponAbilities.find((o2) => {
       var _a;
       return (_a = o2.weaponSlugs) == null ? void 0 : _a.includes(bareEntitySlug(weapon.slug));
@@ -338,10 +354,10 @@ function attackAbility(weapon, mods, weaponAbilities) {
     const glob = weaponAbilities.find((o2) => !o2.weaponSlugs);
     const o = scoped != null ? scoped : glob;
     if (o) return o.ability;
+    if (finesse) return mods.dex >= mods.str ? "dex" : "str";
+    return "str";
   }
-  if (isRanged) return "dex";
-  if (hasProperty(weapon, "finesse")) return mods.dex >= mods.str ? "dex" : "str";
-  return "str";
+  return finesse && mods.str > mods.dex ? "str" : "dex";
 }
 function isWeaponSlugProficient(weapon, weaponSlug, profs) {
   const wp = profs.weapons;
@@ -420,8 +436,10 @@ function buildAttackRow(args) {
     { source: `${ability.toUpperCase()} modifier`, amount: abilityMod, kind: "ability" },
     { source: magicSource, amount: magic.dmg, kind: "item" }
   ];
-  const isRanged = /ranged/.test(weapon.category);
-  const range = isRanged && weapon.range ? `${weapon.range.normal}/${weapon.range.long}` : "melee";
+  const modes = classifyWeaponRange(weapon);
+  const fmtRanged = (r) => `${r.normal}/${r.long} ft`;
+  const range = modes.melee ? `${modes.melee.reach} ft` : modes.ranged ? fmtRanged(modes.ranged) : void 0;
+  const thrownRange = modes.melee && modes.ranged ? fmtRanged(modes.ranged) : void 0;
   const stringProps = weapon.properties.filter(
     (p) => typeof p === "string"
   );
@@ -429,7 +447,8 @@ function buildAttackRow(args) {
   const row = {
     id,
     name,
-    range,
+    ...range !== void 0 ? { range } : {},
+    ...thrownRange !== void 0 ? { thrownRange } : {},
     toHit,
     damageDice,
     damageType: (_b = magic.damageTypeOverride) != null ? _b : weapon.damage.type,
@@ -446,7 +465,7 @@ function buildAttackRow(args) {
     breakdown: { toHit: toHitBreakdown, damage: damageBreakdown },
     informational: args.magic.informational.length > 0 ? args.magic.informational : void 0,
     slotKey: args.slotKey,
-    subLabel: formatWeaponSubLabel(weapon, finalProps),
+    subLabel: formatWeaponSubLabel(weapon, finalProps, modes),
     actionCost: args.actionCost,
     versatile: args.versatileDice ? { damageDice: formatDice(args.versatileDice) } : void 0
   };
@@ -460,10 +479,16 @@ function buildAttackRow(args) {
   }
   return row;
 }
-function formatWeaponSubLabel(weapon, properties) {
+function humanizeWeaponToken(s) {
+  return s.replace(/[-_]/g, " ").replace(/(^|[\s(])\w/g, (c) => c.toUpperCase());
+}
+function formatWeaponSubLabel(weapon, properties, modes) {
   const parts = [];
-  if (weapon.category) parts.push(weapon.category);
-  if (properties.length > 0) parts.push(properties.join(", "));
+  if (weapon.category) {
+    const cat = modes.melee && /ranged/.test(weapon.category) ? weapon.category.replace("ranged", "melee") : weapon.category;
+    parts.push(humanizeWeaponToken(cat));
+  }
+  if (properties.length > 0) parts.push(properties.map(humanizeWeaponToken).join(", "));
   return parts.join(" \xB7 ");
 }
 function computeAttacks(equippedSlots, mods, profs, registry, warnings, proficiencyBonus, ctx, weaponMasteries, weaponAbilities = []) {
@@ -486,7 +511,7 @@ function computeAttacks(equippedSlots, mods, profs, registry, warnings, proficie
       if (found && found.entityType === "weapon" && isWeaponEntity(found.data)) {
         weapon = found.data;
       } else {
-        warnings.push(`Magic weapon ${entity.name} references missing base_item [[${baseSlug}]].`);
+        warnings.push(`Magic weapon ${entity.name} references missing base_item ${baseSlug}.`);
         continue;
       }
     } else {
@@ -547,7 +572,7 @@ function computeSlotsAndAttacks(resolved, mods, profs, registry, warnings, profi
   var _a, _b, _c;
   const equippedSlots = assignSlots(resolved, registry, warnings);
   const overrides = (_a = resolved.definition.overrides) != null ? _a : {};
-  const acOut = computeAC(equippedSlots, resolved, mods, registry);
+  const acOut = computeAC(equippedSlots, resolved, mods, registry, warnings);
   const ctx = buildConditionContext(resolved, equippedSlots);
   const attacks = computeAttacks(equippedSlots, mods, profs, registry, warnings, proficiencyBonus, ctx, weaponMasteries, weaponAbilities);
   return {

package/dist/{chunk-3TRGRSCH.js → chunk-LV4SNWZQ.js}

@@ -2,7 +2,13 @@
 function slugify(name) {
   return name.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/[\s]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
 }
+function bareEntitySlug(slug) {
+  if (!slug) return "";
+  const p = slug.split("_");
+  return p.length >= 3 ? p.slice(2).join("_") : p[p.length - 1];
+}
 
 export {
-  slugify
+  slugify,
+  bareEntitySlug
 };

package/dist/{chunk-IXZXFFFW.js → chunk-M2EMFD6S.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-5XUXXAQJ.js";
 import {
   bareSlug
-} from "./chunk-J2RYSZMQ.js";
+} from "./chunk-VTTA2ALZ.js";
 import {
   abilityModifier
 } from "./chunk-NAEPSZAM.js";

package/dist/{chunk-UC4FE5X3.js → chunk-N6N74K6X.js}

@@ -1,6 +1,6 @@
 import {
   resolveBaseItem
-} from "./chunk-DC74TZNA.js";
+} from "./chunk-4LZJXJJS.js";
 
 // src/pc/pc.slotting.ts
 function isItemEntity(e) {

package/dist/{chunk-J2RYSZMQ.js → chunk-VTTA2ALZ.js}

@@ -6,8 +6,8 @@ function bareSlug(ref) {
 }
 function baseClassName(ref) {
   const bare = bareSlug(ref);
-  const sep = bare.indexOf("_");
-  return sep >= 0 ? bare.slice(sep + 1) : bare;
+  const p = bare.split("_");
+  return p.length >= 3 ? p.slice(2).join("_") : p[p.length - 1];
 }
 
 export {

package/dist/class/class.slug.d.ts

@@ -2,10 +2,12 @@ export declare function bareSlug(ref: string): string;
 /**
  * Bare class name for profile / spell-`classes` lookups.
  *
- * Compendium-qualified slugs are `<compendium>_<name>` — e.g. `srd-5e_wizard`,
- * `srd-2024_bard` (compendium slugs are hyphen-cased, so `_` only ever separates
- * the compendium from the entity name). Strip that prefix to get the canonical
- * class key (`wizard`). Hand-written/test slugs without a `_` pass through
- * unchanged (`wizard` → `wizard`).
+ * Compendium-qualified slugs are `<compendium>_<type>_<name>` (3-part, e.g.
+ * `srd-2024_class_wizard`) or the legacy `<compendium>_<name>` (2-part, e.g.
+ * `srd-5e_wizard`); compendium/type segments are hyphen-cased, so `_` only ever
+ * separates the structural parts from the entity name. Strip that prefix to get
+ * the canonical class key (`wizard`). Name-slugs never contain `_`, so a 3-part
+ * slug's name is `parts.slice(2).join("_")`. Hand-written/test slugs without a
+ * `_` pass through unchanged (`wizard` → `wizard`).
  */
 export declare function baseClassName(ref: string): string;

package/dist/class/class.slug.js

@@ -1,7 +1,7 @@
 import {
   bareSlug,
   baseClassName
-} from "../chunk-J2RYSZMQ.js";
+} from "../chunk-VTTA2ALZ.js";
 export {
   bareSlug,
   baseClassName

package/dist/entities/base-item-resolver.d.ts

@@ -1,4 +1,13 @@
 import type { EntityRegistry, RegisteredEntity } from "@archivist-gg/core";
+/**
+ * Convert a vault-path target (e.g. `SRD 5e/Weapons/Longsword`) to a
+ * registry-compatible slug (`srd-5e_weapon_longsword`). The middle Type folder
+ * (`segments[length-2]`) supplies the entity-type token so the slug matches
+ * the now type-namespaced registry key. For a bare basename without any `/`,
+ * returns the slugified basename - which lets legacy wikilinks like
+ * `[[longsword]]` continue to resolve when registered under that bare slug.
+ */
+export declare function vaultPathToSlug(target: string): string;
 /**
  * Public: take a `base_item` string (vault-path wikilink, alias-form
  * wikilink, bare-slug wikilink, or bare slug) and return the matching

package/dist/entities/base-item-resolver.js

@@ -1,9 +1,11 @@
 import {
   resolveBaseItem,
-  resolveBaseItemOfType
-} from "../chunk-DC74TZNA.js";
-import "../chunk-3TRGRSCH.js";
+  resolveBaseItemOfType,
+  vaultPathToSlug
+} from "../chunk-4LZJXJJS.js";
+import "../chunk-LV4SNWZQ.js";
 export {
   resolveBaseItem,
-  resolveBaseItemOfType
+  resolveBaseItemOfType,
+  vaultPathToSlug
 };

package/dist/entities/slug.d.ts

@@ -3,3 +3,10 @@
  * "Ancient Red Dragon" -> "ancient-red-dragon"
  */
 export declare function slugify(name: string): string;
+/** "srd-2024_fighter" → "fighter", "srd-2024_background_acolyte" → "acolyte".
+ *  Arity-robust: strips a `<prefix>_<type>_<name>` (3-part) or legacy `<prefix>_<name>`
+ *  (2-part) slug down to the bare NAME, and passes a bare slug through unchanged.
+ *  Name-slugs never contain `_`, so for a 3-part-or-longer slug the name is
+ *  `parts.slice(2).join("_")`. Tolerates a nullish slug (degrades to "") so a
+ *  malformed entity can't hard-crash the builder; the resolver backfills real slugs. */
+export declare function bareEntitySlug(slug: string | null | undefined): string;

package/dist/entities/slug.js

@@ -1,6 +1,8 @@
 import {
+  bareEntitySlug,
   slugify
-} from "../chunk-3TRGRSCH.js";
+} from "../chunk-LV4SNWZQ.js";
 export {
+  bareEntitySlug,
   slugify
 };