Drop pet deliveries to visible adjacent tiles and enrich pet:deliver payload

.gitmodules

@@ -2,3 +2,6 @@
 	path = src/lib/ecs-js
 	url = https://github.com/PJensen/ecs-js.git
 	branch = main
+[submodule "src/lib/deity-js"]
+	path = src/lib/deity-js
+	url = https://github.com/PJensen/Deity-js.git

app/input/rulesDispatch.js

@@ -2,7 +2,7 @@
 // App-owned translation from display/input Actions → rules intents on the ECS world.
 // This file is allowed to import rules and the ECS World (per Separation Manifest).
 
-import { MoveIntent, WaitIntent, DrinkIntent, CastSpellIntent, PickupIntent, EquipIntent, Position, ItemInfo } from "../../src/rules/components/index.js";
+import { MoveIntent, WaitIntent, DrinkIntent, CastSpellIntent, PickupIntent, EquipIntent, RangedAttackIntent, EngraveIntent, Position, ItemInfo } from "../../src/rules/components/index.js";
 import { UseIntent } from "../../src/rules/components/Intents/UseIntent.js";
 import { itemsAt } from "../../src/rules/utils/queries.js";
 
@@ -36,7 +36,13 @@ export function makeRulesDispatcher(world, getActorId) {
         break;
       }
       case "rules.castActiveSpell": {
-        const { spellId = 0, targetId = actorId } = action.payload || {};
+        const { spellId, targetId = actorId } = action.payload || {};
+        if (!spellId) {
+          // No spell specified (keyboard shortcut); delegate to app-side
+          // active spell resolution via the same path as the Cast button.
+          try { window.dispatchEvent(new CustomEvent('ui:castActiveSpell')); } catch {}
+          break;
+        }
         world?.add?.(actorId, CastSpellIntent, { spellId, targetId });
         world?.tick?.(1);
         break;
@@ -55,6 +61,25 @@ export function makeRulesDispatcher(world, getActorId) {
         world?.tick?.(1);
         break;
       }
+      case "rules.shootRanged": {
+        // No explicit target; delegate to app-side auto-targeting
+        try { window.dispatchEvent(new CustomEvent('ui:shootRanged')); } catch {}
+        break;
+      }
+      case "rules.rangedAttack": {
+        const { targetId = 0, toX = 0, toY = 0 } = action.payload || {};
+        if (!Number.isInteger(targetId) || targetId <= 0) break;
+        world?.add?.(actorId, RangedAttackIntent, { targetId, toX, toY });
+        world?.tick?.(1);
+        break;
+      }
+      case "rules.engrave": {
+        const { text = "" } = action.payload || {};
+        if (!text) break;
+        world?.add?.(actorId, EngraveIntent, { text });
+        world?.tick?.(1);
+        break;
+      }
       case "rules.pickupItem": {
         // Determine which item to pick up: prefer payload.itemId; otherwise choose a ground item at actor's tile.
         const { itemId = 0, count = null } = action.payload || {};

app/rules/scheduler.js

@@ -2,27 +2,33 @@
 // Register rules systems into phases and set the world scheduler.
 
 import { composeScheduler, registerSystem, clearSystems, getOrderedSystems } from "../../src/lib/ecs-js/index.js";
-/** @typedef {import('../../src/lib/ecs-js').World} World */
+/** @typedef {import('../../src/lib/ecs-js/index.js').World} World */
 import { drinkSystem } from "../../src/rules/systems/drinkSystem.js";
 import { itemPickupSystem, autoPickupPostMoveSystem } from "../../src/rules/systems/itemPickupSystem.js";
 import { itemDropSystem } from "../../src/rules/systems/itemDropSystem.js";
 import { equipItemSystem } from "../../src/rules/systems/equipItemSystem.js";
 import { useItemSystem } from "../../src/rules/systems/useItemSystem.js";
-import { projectileSystem } from "../../src/rules/systems/projectileSystem.js";
+import { rangedAttackSystem } from "../../src/rules/systems/rangedAttackSystem.js";
 import { interactionSystem } from "../../src/rules/systems/interactionSystem.js";
 import { effectSystem } from "../../src/rules/systems/effectSystem.js";
 import { equipmentSystem } from "../../src/rules/systems/equipmentSystem.js";
 import { waitSystem } from "../../src/rules/systems/waitSystem.js";
 import { castSpellSystem } from "../../src/rules/systems/castSpellSystem.js";
 import { aiChaseSystem } from "../../src/rules/systems/aiChaseSystem.js";
+import { petFollowSystem } from "../../src/rules/systems/petFollowSystem.js";
 import { movementSystem } from "../../src/rules/systems/movementSystem.js";
 import { combatSystem } from "../../src/rules/systems/combatSystem.js";
 import { installAffixTriggers } from "../../src/rules/systems/affixTriggerSystem.js";
 import { cleanupSystem } from "../../src/rules/systems/cleanupSystem.js";
 import { trapSystem } from "../../src/rules/systems/trapSystem.js";
+import { manaRegenerationSystem } from "../../src/rules/systems/manaRegenerationSystem.js";
 import { monsterSpawnerSystem } from "../../src/rules/systems/monsterSpawnerSystem.js";
-// Side-effect: registers trap script handlers at import time
+import { spatialIndexSystem } from "../../src/rules/systems/spatialIndexSystem.js";
+import { deitySystem } from "../../src/rules/systems/deitySystem.js";
+import { engraveSystem, installEngraveListeners } from "../../src/rules/systems/engraveSystem.js";
+// Side-effect: registers script handlers at import time
 import "../../src/rules/scripts/traps.js";
+import "../../src/rules/scripts/monsters.js";
 
 /**
  * @param {World} world
@@ -32,19 +38,26 @@ export function configureWorld(world) {
 
   // Install affix event listeners once per world
   installAffixTriggers(world);
+  // Install engraving scramble-on-step listener once per world
+  installEngraveListeners(world);
 
   // Phase: intents (consume queued intents)
   // Producers first (AI), then consumers (movement, interactions, etc.)
   registerSystem(aiChaseSystem, 'intents');
+  registerSystem(petFollowSystem, 'intents');
   registerSystem(waitSystem, 'intents');
   registerSystem(drinkSystem, 'intents');
   registerSystem(useItemSystem, 'intents');
   registerSystem(equipItemSystem, 'intents');
   registerSystem(itemDropSystem, 'intents');
-  registerSystem(projectileSystem, 'intents');
-  registerSystem(interactionSystem, 'intents');
+  registerSystem(rangedAttackSystem, 'intents');
   registerSystem(castSpellSystem, 'intents');
+  registerSystem(engraveSystem, 'intents');
   registerSystem(movementSystem, 'intents');
+  // interactionSystem must run AFTER movementSystem: bump-to-interact adds
+  // InteractIntent during movement; processing it in the same tick prevents
+  // the shop overlay from re-firing on every subsequent action.
+  registerSystem(interactionSystem, 'intents');
   registerSystem(combatSystem, 'intents');
   // Run pickup after movement so stepping onto items can pick them up immediately
   registerSystem(itemPickupSystem, 'intents');
@@ -54,13 +67,18 @@ export function configureWorld(world) {
   // Phase: effects (derived first, then per-turn effects)
   registerSystem(equipmentSystem, 'effects');
   registerSystem(effectSystem, 'effects');
+  registerSystem(manaRegenerationSystem, 'effects');
   // Post-move auto-pickup runs after intents, within the same tick
   registerSystem(autoPickupPostMoveSystem, 'effects');
   // Spawners tick in the effects phase
   registerSystem(monsterSpawnerSystem, 'effects');
+  // Deity mood ticks in the effects phase (after combat results are emitted)
+  registerSystem(deitySystem, 'effects');
 
   // Phase: cleanup (end-of-turn removals like killing entities with hp <= 0)
   registerSystem(cleanupSystem, 'cleanup');
+  // Keep spatial index in sync after structural changes
+  registerSystem(spatialIndexSystem, 'cleanup');
 
   // Compose scheduler: order of phases matters
   const baseScheduler = composeScheduler('intents', 'effects', 'cleanup');
@@ -71,8 +89,8 @@ export function configureWorld(world) {
   }
 
   // Build profiled scheduler: measure per system and per phase using high-res timer
-  /** @type {Array<'intents'|'effects'>} */
-  const phases = ['intents', 'effects'];
+  /** @type {Array<'intents'|'effects'|'cleanup'>} */
+  const phases = ['intents', 'effects', 'cleanup'];
   /** @type {Record<string, Function[]>} */
   const phaseSystems = Object.create(null);
   for (const ph of phases) phaseSystems[ph] = getOrderedSystems(ph);
@@ -89,8 +107,8 @@ export function configureWorld(world) {
       let phStart = performance.now();
       const sysTimes = [];
       for (let i = 0; i < list.length; i++) {
-  /** @type {Function} */
-  const fn = /** @type any */ (list[i] || (()=>{}));
+        /** @type {Function} */
+        const fn = /** @type any */ (list[i] || (()=>{}));
         const s0 = performance.now();
         fn(w, dt);
         const s1 = performance.now();
@@ -106,6 +124,7 @@ export function configureWorld(world) {
 }
 
 function shouldProfileRules() {
+  if (typeof window === 'undefined') return false;
   const params = new URLSearchParams(window.location.search || '');
   const v = (params.get('rulesProfile') || (typeof localStorage !== 'undefined' ? localStorage.getItem('jshack.rulesProfile') : '0') || '0');
   return v === '1' || v === 'true' || v === 'on';