@sharpee/world-model 3.0.0 → 3.1.0

package/traits/combatant/combatantBehavior.js

@@ -1,33 +1,38 @@
 "use strict";
 /**
- * Behavior for combatant entities
+ * Behavior for combatant entities.
+ *
+ * Combat orchestration — armor reduction, inventory-drop on death, combat messages —
+ * over the entity's combat *stats* (`CombatantTrait`). Health itself lives on the
+ * required {@link HealthTrait}; all health reads/writes route through
+ * {@link HealthBehavior} (ADR-226 / ADR-223 child A). A combatant is guaranteed a
+ * `HealthTrait` by the load-time AC-7 check.
+ *
+ * Public interface: `canAttack` / `attack` / `heal` / `resurrect` / `isAlive` /
+ * `getHealth` / `getHealthPercentage` / `isHostile` / `setHostile`.
+ * Owner context: `@sharpee/world-model` — combat (requires the HEALTH layer).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CombatBehavior = void 0;
 const behavior_1 = require("../../behaviors/behavior");
 const trait_types_1 = require("../trait-types");
-/**
- * Behavior for combatant entities.
- *
- * Handles combat with health, armor, and death.
- * This is a world-aware behavior because it handles inventory dropping on death.
- */
+const healthBehavior_1 = require("../health/healthBehavior");
 class CombatBehavior extends behavior_1.Behavior {
-    static requiredTraits = [trait_types_1.TraitType.COMBATANT];
+    static requiredTraits = [trait_types_1.TraitType.COMBATANT, trait_types_1.TraitType.HEALTH];
     /**
-     * Check if a combatant can be attacked
+     * Check if a combatant can be attacked (present, and alive per its health).
      */
     static canAttack(entity) {
         if (!entity.has(trait_types_1.TraitType.COMBATANT)) {
             return false;
         }
-        const combatant = entity.get(trait_types_1.TraitType.COMBATANT);
-        return combatant.isAlive && combatant.health > 0;
+        const health = CombatBehavior.optional(entity, trait_types_1.TraitType.HEALTH);
+        return health ? healthBehavior_1.HealthBehavior.isAlive(health) : true;
     }
     /**
-     * Attack a combatant
+     * Attack a combatant.
      * @param entity The combatant to attack
-     * @param damage Base damage amount
+     * @param damage Base damage amount (pre-armor)
      * @param world The world model (needed for dropping inventory)
      * @returns Result describing what happened
      */
@@ -42,7 +47,8 @@ class CombatBehavior extends behavior_1.Behavior {
             };
         }
         const combatant = entity.get(trait_types_1.TraitType.COMBATANT);
-        if (!combatant.isAlive || combatant.health <= 0) {
+        const health = CombatBehavior.require(entity, trait_types_1.TraitType.HEALTH);
+        if (!healthBehavior_1.HealthBehavior.isAlive(health)) {
             return {
                 success: false,
                 damage: 0,
@@ -50,21 +56,19 @@ class CombatBehavior extends behavior_1.Behavior {
                 remainingHealth: 0
             };
         }
-        // Apply armor reduction
+        // Apply armor reduction (always at least 1 damage), then route through health.
         const actualDamage = Math.max(1, damage - combatant.armor);
-        // Apply damage
-        combatant.health = Math.max(0, combatant.health - actualDamage);
+        const killed = healthBehavior_1.HealthBehavior.takeDamage(health, actualDamage, 'combat');
         const result = {
             success: true,
             damage: actualDamage,
-            killed: combatant.health <= 0,
-            remainingHealth: combatant.health,
+            killed,
+            remainingHealth: health.health,
             message: combatant.hitMessage,
-            retaliated: combatant.canRetaliate && combatant.health > 0
+            retaliated: combatant.canRetaliate && !killed
         };
         // Handle death
-        if (combatant.health <= 0) {
-            combatant.isAlive = false;
+        if (killed) {
             result.deathMessage = combatant.deathMessage;
             // Drop inventory if specified
             if (combatant.dropsInventory) {
@@ -85,66 +89,64 @@ class CombatBehavior extends behavior_1.Behavior {
         return result;
     }
     /**
-     * Heal a combatant
+     * Heal a combatant. Returns the amount actually healed.
      */
     static heal(entity, amount) {
         if (!entity.has(trait_types_1.TraitType.COMBATANT)) {
             return 0;
         }
-        const combatant = entity.get(trait_types_1.TraitType.COMBATANT);
-        if (!combatant.isAlive)
-            return 0;
-        const oldHealth = combatant.health;
-        combatant.health = Math.min(combatant.maxHealth, combatant.health + amount);
-        return combatant.health - oldHealth;
+        const health = CombatBehavior.require(entity, trait_types_1.TraitType.HEALTH);
+        return healthBehavior_1.HealthBehavior.heal(health, amount);
     }
     /**
-     * Resurrect a dead combatant
+     * Resurrect a dead combatant — clears the terminal state and restores full health.
+     * @returns true if a dead combatant was resurrected, false if it was already alive
      */
     static resurrect(entity) {
         if (!entity.has(trait_types_1.TraitType.COMBATANT)) {
             return false;
         }
-        const combatant = entity.get(trait_types_1.TraitType.COMBATANT);
-        if (combatant.isAlive)
+        const health = CombatBehavior.require(entity, trait_types_1.TraitType.HEALTH);
+        if (healthBehavior_1.HealthBehavior.isAlive(health))
             return false;
-        combatant.isAlive = true;
-        combatant.health = combatant.maxHealth;
+        health.dead = false;
+        health.causeOfDeath = undefined;
+        health.health = health.maxHealth;
         return true;
     }
     /**
-     * Check if combatant is alive
+     * Check if combatant is alive (via its health). Non-combatants are alive by default.
      */
     static isAlive(entity) {
         if (!entity.has(trait_types_1.TraitType.COMBATANT)) {
             return true; // Non-combatants are considered 'alive' by default
         }
-        const combatant = entity.get(trait_types_1.TraitType.COMBATANT);
-        return combatant.isAlive && combatant.health > 0;
+        const health = CombatBehavior.optional(entity, trait_types_1.TraitType.HEALTH);
+        return health ? healthBehavior_1.HealthBehavior.isAlive(health) : true;
     }
     /**
-     * Get current health
+     * Get current health.
      */
     static getHealth(entity) {
-        const combatant = CombatBehavior.require(entity, trait_types_1.TraitType.COMBATANT);
-        return combatant.health;
+        const health = CombatBehavior.require(entity, trait_types_1.TraitType.HEALTH);
+        return health.health;
     }
     /**
-     * Get health percentage
+     * Get health percentage.
      */
     static getHealthPercentage(entity) {
-        const combatant = CombatBehavior.require(entity, trait_types_1.TraitType.COMBATANT);
-        return (combatant.health / combatant.maxHealth) * 100;
+        const health = CombatBehavior.require(entity, trait_types_1.TraitType.HEALTH);
+        return (health.health / health.maxHealth) * 100;
     }
     /**
-     * Check if combatant is hostile
+     * Check if combatant is hostile.
      */
     static isHostile(entity) {
         const combatant = CombatBehavior.require(entity, trait_types_1.TraitType.COMBATANT);
         return combatant.hostile;
     }
     /**
-     * Set hostility
+     * Set hostility.
      */
     static setHostile(entity, hostile) {
         const combatant = CombatBehavior.require(entity, trait_types_1.TraitType.COMBATANT);

package/traits/combatant/combatantBehavior.js.map

@@ -1 +1 @@
-{"version":3,"file":"combatantBehavior.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/combatant/combatantBehavior.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,uDAAoD;AAGpD,gDAA2C;AAkB3C;;;;;GAKG;AACH,MAAa,cAAe,SAAQ,mBAAQ;IAC1C,MAAM,CAAC,cAAc,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,CAAC;IAE9C;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,MAAgB;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAiB,uBAAS,CAAC,SAAS,CAAE,CAAC;QACnE,OAAO,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,MAAgB,EAAE,MAAc,EAAE,KAAiB;QAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC;gBACT,MAAM,EAAE,KAAK;gBACb,eAAe,EAAE,CAAC;gBAClB,OAAO,EAAE,2BAA2B;aACrC,CAAC;QACJ,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAiB,uBAAS,CAAC,SAAS,CAAE,CAAC;QAEnE,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAChD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC;gBACT,MAAM,EAAE,KAAK;gBACb,eAAe,EAAE,CAAC;aACnB,CAAC;QACJ,CAAC;QAED,wBAAwB;QACxB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAE3D,eAAe;QACf,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC;QAEhE,MAAM,MAAM,GAAkB;YAC5B,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,CAAC;YAC7B,eAAe,EAAE,SAAS,CAAC,MAAM;YACjC,OAAO,EAAE,SAAS,CAAC,UAAU;YAC7B,UAAU,EAAE,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;SAC3D,CAAC;QAEF,eAAe;QACf,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC1B,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;YAC1B,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;YAE7C,8BAA8B;YAC9B,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC/C,MAAM,YAAY,GAAe,EAAE,CAAC;gBAEpC,IAAI,QAAQ,EAAE,CAAC;oBACb,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;wBAC7B,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;wBACpC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;gBACrC,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,MAAgB,EAAE,MAAc;QAC1C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAiB,uBAAS,CAAC,SAAS,CAAE,CAAC;QAEnE,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAO,CAAC,CAAC;QAEjC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC;QACnC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;QAE5E,OAAO,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,MAAgB;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAiB,uBAAS,CAAC,SAAS,CAAE,CAAC;QAEnE,IAAI,SAAS,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC;QAEpC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QACzB,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,OAAO,CAAC,MAAgB;QAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,CAAC,mDAAmD;QAClE,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAiB,uBAAS,CAAC,SAAS,CAAE,CAAC;QACnE,OAAO,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,MAAgB;QAC/B,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAiB,MAAM,EAAE,uBAAS,CAAC,SAAS,CAAC,CAAC;QACtF,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,MAAgB;QACzC,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAiB,MAAM,EAAE,uBAAS,CAAC,SAAS,CAAC,CAAC;QACtF,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,MAAgB;QAC/B,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAiB,MAAM,EAAE,uBAAS,CAAC,SAAS,CAAC,CAAC;QACtF,OAAO,SAAS,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAgB,EAAE,OAAgB;QAClD,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAiB,MAAM,EAAE,uBAAS,CAAC,SAAS,CAAC,CAAC;QACtF,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;IAC9B,CAAC;;AA9JH,wCA+JC"}
+{"version":3,"file":"combatantBehavior.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/combatant/combatantBehavior.ts"],"names":[],"mappings":"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"}

package/traits/combatant/combatantTrait.d.ts

@@ -1,35 +1,35 @@
 /**
- * Combatant trait for entities that can engage in combat
+ * Combatant trait for entities that can engage in combat.
+ *
+ * Combat STATS only (ADR-226 / ADR-223 child A): a combatant's health, alive/
+ * conscious state, and recovery live on the entity's {@link HealthTrait} — the single
+ * life-state source — not here. `CombatantTrait` *requires* a `HealthTrait`
+ * (enforced at load; ADR-226 §2 / AC-7). Hostility stays here for now (moves to
+ * disposition in ADR-223 child C).
+ *
+ * Data only — all combat logic is in `CombatBehavior`, which reads/writes health
+ * through `HealthBehavior`.
+ * Owner context: `@sharpee/world-model` — combat stats (requires the HEALTH layer).
  */
 import { ITrait } from '../trait';
 export interface ICombatantData {
-    /** Current health points */
-    health?: number;
-    /** Maximum health points */
-    maxHealth?: number;
     /** Combat skill (0-100, affects hit/dodge chance) - ADR-072 */
     skill?: number;
     /** Natural damage (if no weapon) - ADR-072 */
     baseDamage?: number;
-    /** Whether this combatant is conscious (false = knocked out) - ADR-072 */
-    isConscious?: boolean;
-    /** Turns until consciousness recovery - ADR-072 */
-    recoveryTurns?: number;
     /** Armor value that reduces damage */
     armor?: number;
     /** Attack power modifier (legacy, use baseDamage) */
     attackPower?: number;
     /** Defense modifier */
     defense?: number;
-    /** Whether this combatant is alive */
-    isAlive?: boolean;
     /** Custom message when hit */
     hitMessage?: string;
     /** Custom message when killed */
     deathMessage?: string;
     /** Custom message when attacking */
     attackMessage?: string;
-    /** Whether this combatant is hostile by default */
+    /** Whether this combatant is hostile by default (moves to disposition, ADR-223 child C) */
     hostile?: boolean;
     /** Whether this combatant can retaliate */
     canRetaliate?: boolean;
@@ -43,22 +43,17 @@ export interface ICombatantData {
 /**
  * Combatant trait indicates an entity can engage in combat.
  *
- * This trait contains only data - all combat logic
- * is in CombatBehavior.
+ * This trait contains only combat *stats* — health and life-state are on the
+ * required {@link HealthTrait}. All combat logic is in `CombatBehavior`.
  */
 export declare class CombatantTrait implements ITrait, ICombatantData {
     static readonly type: "combatant";
     readonly type: "combatant";
-    health: number;
-    maxHealth: number;
     skill: number;
     baseDamage: number;
-    isConscious: boolean;
-    recoveryTurns?: number;
     armor: number;
     attackPower: number;
     defense: number;
-    isAlive: boolean;
     hitMessage?: string;
     deathMessage?: string;
     attackMessage?: string;
@@ -68,34 +63,5 @@ export declare class CombatantTrait implements ITrait, ICombatantData {
     experienceValue: number;
     isUndead: boolean;
     constructor(data?: ICombatantData);
-    /**
-     * Computed property to check if combatant is alive based on health
-     */
-    get alive(): boolean;
-    /**
-     * Check if combatant can act (alive and conscious)
-     */
-    get canAct(): boolean;
-    /**
-     * Knock out this combatant (unconscious but alive)
-     */
-    knockOut(recoveryTurns?: number): void;
-    /**
-     * Wake up this combatant
-     */
-    wakeUp(): void;
-    /**
-     * Kill this combatant
-     */
-    kill(): void;
-    /**
-     * Take damage
-     * @returns true if combatant was killed
-     */
-    takeDamage(amount: number): boolean;
-    /**
-     * Heal this combatant
-     */
-    heal(amount: number): void;
 }
 //# sourceMappingURL=combatantTrait.d.ts.map

package/traits/combatant/combatantTrait.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"combatantTrait.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/combatant/combatantTrait.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,cAAc;IAC7B,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,qDAAqD;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,uBAAuB;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,sCAAsC;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,oCAAoC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,mDAAmD;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,0CAA0C;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,qBAAa,cAAe,YAAW,MAAM,EAAE,cAAc;IAC3D,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAG,WAAW,CAAU;IAC5C,QAAQ,CAAC,IAAI,EAAG,WAAW,CAAU;IAGrC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;gBAEN,IAAI,GAAE,cAAmB;IAsBrC;;OAEG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI;IAOtC;;OAEG;IACH,MAAM,IAAI,IAAI;IAOd;;OAEG;IACH,IAAI,IAAI,IAAI;IAMZ;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAiBnC;;OAEG;IACH,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAQ3B"}
+{"version":3,"file":"combatantTrait.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/combatant/combatantTrait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,cAAc;IAC7B,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,qDAAqD;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,uBAAuB;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,oCAAoC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,2FAA2F;IAC3F,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,0CAA0C;IAC1C,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,qBAAa,cAAe,YAAW,MAAM,EAAE,cAAc;IAC3D,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAG,WAAW,CAAU;IAC5C,QAAQ,CAAC,IAAI,EAAG,WAAW,CAAU;IAErC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;gBAEN,IAAI,GAAE,cAAmB;CAgBtC"}

package/traits/combatant/combatantTrait.js

@@ -1,29 +1,33 @@
 "use strict";
 /**
- * Combatant trait for entities that can engage in combat
+ * Combatant trait for entities that can engage in combat.
+ *
+ * Combat STATS only (ADR-226 / ADR-223 child A): a combatant's health, alive/
+ * conscious state, and recovery live on the entity's {@link HealthTrait} — the single
+ * life-state source — not here. `CombatantTrait` *requires* a `HealthTrait`
+ * (enforced at load; ADR-226 §2 / AC-7). Hostility stays here for now (moves to
+ * disposition in ADR-223 child C).
+ *
+ * Data only — all combat logic is in `CombatBehavior`, which reads/writes health
+ * through `HealthBehavior`.
+ * Owner context: `@sharpee/world-model` — combat stats (requires the HEALTH layer).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CombatantTrait = void 0;
 /**
  * Combatant trait indicates an entity can engage in combat.
  *
- * This trait contains only data - all combat logic
- * is in CombatBehavior.
+ * This trait contains only combat *stats* — health and life-state are on the
+ * required {@link HealthTrait}. All combat logic is in `CombatBehavior`.
  */
 class CombatantTrait {
     static type = 'combatant';
     type = 'combatant';
-    // CombatantData properties
-    health;
-    maxHealth;
     skill;
     baseDamage;
-    isConscious;
-    recoveryTurns;
     armor;
     attackPower;
     defense;
-    isAlive;
     hitMessage;
     deathMessage;
     attackMessage;
@@ -34,16 +38,11 @@ class CombatantTrait {
     isUndead;
     constructor(data = {}) {
         // Set defaults and merge with provided data
-        this.health = data.health ?? data.maxHealth ?? 10;
-        this.maxHealth = data.maxHealth ?? 10;
         this.skill = data.skill ?? 30; // Default skill level (ADR-072)
         this.baseDamage = data.baseDamage ?? data.attackPower ?? 1; // ADR-072
-        this.isConscious = data.isConscious ?? true; // ADR-072
-        this.recoveryTurns = data.recoveryTurns; // ADR-072
         this.armor = data.armor ?? 0;
         this.attackPower = data.attackPower ?? 1;
         this.defense = data.defense ?? 0;
-        this.isAlive = data.isAlive ?? true;
         this.hitMessage = data.hitMessage;
         this.deathMessage = data.deathMessage;
         this.attackMessage = data.attackMessage;
@@ -53,72 +52,6 @@ class CombatantTrait {
         this.experienceValue = data.experienceValue ?? 0;
         this.isUndead = data.isUndead ?? false;
     }
-    /**
-     * Computed property to check if combatant is alive based on health
-     */
-    get alive() {
-        return this.health > 0;
-    }
-    /**
-     * Check if combatant can act (alive and conscious)
-     */
-    get canAct() {
-        return this.isAlive && this.isConscious;
-    }
-    /**
-     * Knock out this combatant (unconscious but alive)
-     */
-    knockOut(recoveryTurns) {
-        this.isConscious = false;
-        if (recoveryTurns !== undefined) {
-            this.recoveryTurns = recoveryTurns;
-        }
-    }
-    /**
-     * Wake up this combatant
-     */
-    wakeUp() {
-        if (this.isAlive) {
-            this.isConscious = true;
-            this.recoveryTurns = undefined;
-        }
-    }
-    /**
-     * Kill this combatant
-     */
-    kill() {
-        this.health = 0;
-        this.isAlive = false;
-        this.isConscious = false;
-    }
-    /**
-     * Take damage
-     * @returns true if combatant was killed
-     */
-    takeDamage(amount) {
-        const effectiveDamage = Math.max(0, amount - this.armor);
-        this.health = Math.max(0, this.health - effectiveDamage);
-        if (this.health <= 0) {
-            this.kill();
-            return true;
-        }
-        // Check for knockout (20% health threshold per ADR-072)
-        if (this.health <= this.maxHealth * 0.2) {
-            this.knockOut();
-        }
-        return false;
-    }
-    /**
-     * Heal this combatant
-     */
-    heal(amount) {
-        if (this.isAlive) {
-            this.health = Math.min(this.maxHealth, this.health + amount);
-            if (this.health > this.maxHealth * 0.2) {
-                this.wakeUp();
-            }
-        }
-    }
 }
 exports.CombatantTrait = CombatantTrait;
 //# sourceMappingURL=combatantTrait.js.map

package/traits/combatant/combatantTrait.js.map

@@ -1 +1 @@
-{"version":3,"file":"combatantTrait.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/combatant/combatantTrait.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"combatantTrait.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/combatant/combatantTrait.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;AA6CH;;;;;GAKG;AACH,MAAa,cAAc;IACzB,MAAM,CAAU,IAAI,GAAG,WAAoB,CAAC;IACnC,IAAI,GAAG,WAAoB,CAAC;IAErC,KAAK,CAAS;IACd,UAAU,CAAS;IACnB,KAAK,CAAS;IACd,WAAW,CAAS;IACpB,OAAO,CAAS;IAChB,UAAU,CAAU;IACpB,YAAY,CAAU;IACtB,aAAa,CAAU;IACvB,OAAO,CAAU;IACjB,YAAY,CAAU;IACtB,cAAc,CAAU;IACxB,eAAe,CAAS;IACxB,QAAQ,CAAU;IAElB,YAAY,OAAuB,EAAE;QACnC,4CAA4C;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,gCAAgC;QAC/D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,UAAU;QACtE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC;QAClD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC;IACzC,CAAC;;AAjCH,wCAkCC"}

package/traits/cuttable/cuttableBehavior.d.ts

@@ -0,0 +1,23 @@
+import { EntityId } from '@sharpee/core';
+import { Behavior } from '../../behaviors/behavior';
+import { IFEntity } from '../../entities/if-entity';
+/**
+ * Behavior for cuttable entities (ADR-230 D3c).
+ *
+ * Pure predicates only — the cutting action's validate() consults these;
+ * the cut mutation itself belongs to the entity's registered
+ * implementation, never here.
+ */
+export declare class CuttableBehavior extends Behavior {
+    static requiredTraits: "cuttable"[];
+    /**
+     * Check if this entity requires a tool to cut (mirrors
+     * LockableBehavior.requiresKey / OpenableBehavior.requiresTool)
+     */
+    static requiresTool(entity: IFEntity): boolean;
+    /**
+     * Check if a tool can cut this entity (mirrors LockableBehavior.canUnlockWith)
+     */
+    static canCutWith(entity: IFEntity, toolId: EntityId): boolean;
+}
+//# sourceMappingURL=cuttableBehavior.d.ts.map

package/traits/cuttable/cuttableBehavior.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cuttableBehavior.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/cuttable/cuttableBehavior.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIpD;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,QAAQ;IAC5C,MAAM,CAAC,cAAc,eAAwB;IAE7C;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO;IAK9C;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO;CAa/D"}

package/traits/cuttable/cuttableBehavior.js

@@ -0,0 +1,39 @@
+"use strict";
+// packages/world-model/src/traits/cuttable/cuttableBehavior.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CuttableBehavior = void 0;
+const behavior_1 = require("../../behaviors/behavior");
+const trait_types_1 = require("../trait-types");
+/**
+ * Behavior for cuttable entities (ADR-230 D3c).
+ *
+ * Pure predicates only — the cutting action's validate() consults these;
+ * the cut mutation itself belongs to the entity's registered
+ * implementation, never here.
+ */
+class CuttableBehavior extends behavior_1.Behavior {
+    static requiredTraits = [trait_types_1.TraitType.CUTTABLE];
+    /**
+     * Check if this entity requires a tool to cut (mirrors
+     * LockableBehavior.requiresKey / OpenableBehavior.requiresTool)
+     */
+    static requiresTool(entity) {
+        const cuttable = CuttableBehavior.require(entity, trait_types_1.TraitType.CUTTABLE);
+        return !!(cuttable.toolId || cuttable.toolIds?.length);
+    }
+    /**
+     * Check if a tool can cut this entity (mirrors LockableBehavior.canUnlockWith)
+     */
+    static canCutWith(entity, toolId) {
+        const cuttable = CuttableBehavior.require(entity, trait_types_1.TraitType.CUTTABLE);
+        if (cuttable.toolId === toolId) {
+            return true;
+        }
+        if (cuttable.toolIds && cuttable.toolIds.includes(toolId)) {
+            return true;
+        }
+        return false;
+    }
+}
+exports.CuttableBehavior = CuttableBehavior;
+//# sourceMappingURL=cuttableBehavior.js.map

package/traits/cuttable/cuttableBehavior.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cuttableBehavior.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/cuttable/cuttableBehavior.ts"],"names":[],"mappings":";AAAA,+DAA+D;;;AAG/D,uDAAoD;AAEpD,gDAA2C;AAG3C;;;;;;GAMG;AACH,MAAa,gBAAiB,SAAQ,mBAAQ;IAC5C,MAAM,CAAC,cAAc,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAC,CAAC;IAE7C;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,MAAgB;QAClC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAgB,MAAM,EAAE,uBAAS,CAAC,QAAQ,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAgB,EAAE,MAAgB;QAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAgB,MAAM,EAAE,uBAAS,CAAC,QAAQ,CAAC,CAAC;QAErF,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;;AA3BH,4CA4BC"}

package/traits/cuttable/cuttableTrait.d.ts

@@ -0,0 +1,37 @@
+import { EntityId } from '@sharpee/core';
+import { ITrait } from '../trait';
+/**
+ * Data for the cuttable trait (ADR-230 D3c).
+ *
+ * Tool fields mirror ILockableData's key config (PIN 2 shared shape with
+ * OpenableTrait's tool fields): a declared requirement makes the cutting
+ * action refuse wrong/missing tools; no requirement means any explicit
+ * tool (or none) passes validation.
+ */
+export interface ICuttableData {
+    /** Single tool entity required to cut this (mirrors ILockableData.keyId) */
+    toolId?: EntityId;
+    /** Multiple tool entities that can cut this (mirrors ILockableData.keyIds) */
+    toolIds?: EntityId[];
+}
+/**
+ * Cuttable trait — marks an entity the cutting action may target.
+ *
+ * The trait gates eligibility only. The cut OUTCOME is the entity's own
+ * registered implementation (ADR-090 capability behavior from TS, or a
+ * Chord `on cutting it` interceptor) — the standard cutting action never
+ * mutates state itself. An entity with this trait and no registered
+ * implementation is an authoring error (load-time in Chord; runtime
+ * safety-net refusal otherwise).
+ *
+ * This trait contains only data - eligibility/tool logic is in
+ * CuttableBehavior.
+ */
+export declare class CuttableTrait implements ITrait, ICuttableData {
+    static readonly type: "cuttable";
+    readonly type: "cuttable";
+    toolId?: EntityId;
+    toolIds?: EntityId[];
+    constructor(data?: ICuttableData);
+}
+//# sourceMappingURL=cuttableTrait.d.ts.map

package/traits/cuttable/cuttableTrait.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cuttableTrait.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/cuttable/cuttableTrait.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,QAAQ,CAAC;IAElB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC;CACtB;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,aAAc,YAAW,MAAM,EAAE,aAAa;IACzD,MAAM,CAAC,QAAQ,CAAC,IAAI,aAAsB;IAC1C,QAAQ,CAAC,IAAI,aAAsB;IAEnC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC;gBAET,IAAI,GAAE,aAAkB;CAIrC"}

package/traits/cuttable/cuttableTrait.js

@@ -0,0 +1,30 @@
+"use strict";
+// packages/world-model/src/traits/cuttable/cuttableTrait.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CuttableTrait = void 0;
+const trait_types_1 = require("../trait-types");
+/**
+ * Cuttable trait — marks an entity the cutting action may target.
+ *
+ * The trait gates eligibility only. The cut OUTCOME is the entity's own
+ * registered implementation (ADR-090 capability behavior from TS, or a
+ * Chord `on cutting it` interceptor) — the standard cutting action never
+ * mutates state itself. An entity with this trait and no registered
+ * implementation is an authoring error (load-time in Chord; runtime
+ * safety-net refusal otherwise).
+ *
+ * This trait contains only data - eligibility/tool logic is in
+ * CuttableBehavior.
+ */
+class CuttableTrait {
+    static type = trait_types_1.TraitType.CUTTABLE;
+    type = trait_types_1.TraitType.CUTTABLE;
+    toolId;
+    toolIds;
+    constructor(data = {}) {
+        this.toolId = data.toolId;
+        this.toolIds = data.toolIds;
+    }
+}
+exports.CuttableTrait = CuttableTrait;
+//# sourceMappingURL=cuttableTrait.js.map

package/traits/cuttable/cuttableTrait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cuttableTrait.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/cuttable/cuttableTrait.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;AAI5D,gDAA2C;AAkB3C;;;;;;;;;;;;GAYG;AACH,MAAa,aAAa;IACxB,MAAM,CAAU,IAAI,GAAG,uBAAS,CAAC,QAAQ,CAAC;IACjC,IAAI,GAAG,uBAAS,CAAC,QAAQ,CAAC;IAEnC,MAAM,CAAY;IAClB,OAAO,CAAc;IAErB,YAAY,OAAsB,EAAE;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;;AAVH,sCAWC"}

package/traits/cuttable/index.d.ts

@@ -0,0 +1,3 @@
+export * from './cuttableTrait';
+export * from './cuttableBehavior';
+//# sourceMappingURL=index.d.ts.map

package/traits/cuttable/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/cuttable/index.ts"],"names":[],"mappings":"AAEA,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC"}

package/traits/cuttable/index.js

@@ -0,0 +1,20 @@
+"use strict";
+// packages/world-model/src/traits/cuttable/index.ts
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./cuttableTrait"), exports);
+__exportStar(require("./cuttableBehavior"), exports);
+//# sourceMappingURL=index.js.map

package/traits/cuttable/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../repos/sharpee_v2/packages/world-model/src/traits/cuttable/index.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;;;;;;;;;;;AAEpD,kDAAgC;AAChC,qDAAmC"}