@maka/maka-cli 5.76.0 → 5.78.0

package/bundle/typescript/src/commands/game/sideQuest/game.js

@@ -15,11 +15,13 @@ import { isFence, LIFESTYLE_TIERS } from './utilities/commerce.js';
 import { bestFakeSin, wandRead, processArrest } from './utilities/sin.js';
 import { renderMapViewport, mapCaption } from './utilities/map-view.js';
 import { tallestRoomRows } from './utilities/room-grid.js';
-import { renderRoomLayoutCompact, crewOfTable, roomCaption } from './utilities/room-view.js';
+import { renderRoomLayoutCompact, crewOfTable } from './utilities/room-view.js';
 import { getPref } from './utilities/prefs.js';
 import { rollPool, formatRoll } from './utilities/dice.js';
 import { Direction } from './types/shared/direction-enum.js';
 import { Logger } from './utilities/logger.js';
+import { runHostTurn } from './utilities/ic.js';
+import { leaveMatrix } from './utilities/planes.js';
 import { CommandQueue } from './utilities/command-queue.js';
 import { currentSession } from './utilities/session-context.js';
 import { PlayersCommand } from './commands/players.js';
@@ -4528,9 +4530,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 isOtherPlayer: a => this.scene.isHumanControlled(a),
             });
             if (roomLines.length > 0) {
-                // roomCaption owns BOTH halves now -- where you stand, and that
-                // somebody here has no cell to be drawn in (S6b4TLQWq46RN5kGu).
-                roomLines.push(caption(roomCaption(here, this.player), boxWidth));
+                const spot = spotOf(this.player);
+                roomLines.push(caption(spot ? `@ ${spot}` : '(moving through)', boxWidth));
             }
             this.setRoomOverlay(roomLines);
         }
@@ -4682,7 +4683,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         const command = CommandFactory.createCommand(verb, context);
         if (command) {
             const result = await command.execute(args);
-            return out(result);
+            return out(this.withICTurn(actor, result));
         }
         // Typo tolerance: two straight sessions bounced on slips like "searh"
         // and "maop". Reuse the same fuzzy matcher item/NPC names go through
@@ -4709,6 +4710,62 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         }
         return out(`I don't understand the command "${verb}".`);
     }
+    /**
+     * THE HOST'S TURN, appended to whatever the player's action returned.
+     *
+     * This is the Combat Turn mapping from the IC design, and it is an
+     * ENGINE MAPPING rather than a rule: canon paces IC in Combat Turns
+     * (one program launched per turn, at the beginning of it) and this
+     * engine has no Matrix initiative structure, so ONE PLAYER ACTION
+     * TAKEN INSIDE AN ALERTED HOST counts as one turn. Not a citation, and
+     * not presented as one.
+     *
+     * It hangs off the single command dispatch rather than off hack.ts on
+     * purpose. Ice hunts you while you do ANYTHING in the host -- looking,
+     * moving, taking -- so hooking only the hacking verb would have made
+     * the host blind to every other action, which is the "fixed one verb,
+     * left its siblings" shape CLAUDE.md warns about.
+     *
+     * utilities/ic.ts decides whether anything happens at all
+     * (hostIsHunting); this only carries the result to the panes.
+     */
+    withICTurn(actor, result) {
+        if (result === null)
+            return null;
+        const room = actor.currentLocation;
+        // Phase 1b widened this gate. It used to ask hostIsHunting, which is
+        // only true AFTER the host had made someone -- so the host could
+        // never notice you in the first place, and measurement said so:
+        // twelve runs, twelve cracked hosts, zero sightings. A host with a
+        // node gets its turn whenever a persona is standing in it, and
+        // ic.ts decides whether that turn is eyes or ice.
+        if (!room || actor.plane !== 'matrix' || !room.hasNode)
+            return result;
+        const turn = runHostTurn(room, actor);
+        if (turn.lines.length === 0 && turn.meta.length === 0)
+            return result;
+        // Dice to the Mechanics pane, and only for a human -- the same gate
+        // every other roll in this engine uses.
+        if (this.scene.isHumanControlled(actor)) {
+            const logger = Logger.getInstance();
+            for (const m of turn.meta)
+                logger.meta(m);
+        }
+        for (const w of turn.world)
+            this.scene.addWorldEvent(w);
+        // A deck bricked by IC owes the same forced dump a convergence does.
+        // ic.ts reports it rather than performing it -- leaveMatrix needs the
+        // Scene and that module deliberately takes none, exactly as hack.ts
+        // splits the convergence hammer from the dump that follows it.
+        if (turn.bricked) {
+            turn.lines.push(...leaveMatrix(this.scene, actor, {
+                forced: true,
+                reason: `The host's ice burns your deck out from under you.`,
+            }));
+        }
+        const body = turn.lines.join('\n');
+        return result.length > 0 ? `${result}\n${body}` : body;
+    }
     /**
      * The help taxonomy: every entry is [primary, ...aliases], grouped the
      * way a player thinks, not the order commands were registered. The
@@ -4719,8 +4776,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * future command can't silently fall out of help.
      */
     static HELP_CATEGORIES = [
-        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['climb', 'descend'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow', 'unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
-        { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['drop'], ['give'], ['store'], ['equip'], ['unequip'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
+        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['climb', 'descend', 'mantle', 'scale', 'clamber'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow', 'unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
+        { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['equip'], ['unequip'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
         { title: 'combat', entries: [['attack', 'kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest']] },
         // The party layer: everyone who walks (or flies, or manifests) at
         // your side answers to these.
@@ -4728,15 +4785,18 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // players" / "crew street"); the bare verb still answers quietly.
         { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
         { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
         // The Emerged get their own shelf (player request: "there MUST be
         // resonance" -- matrix is the place, Resonance is the talent).
-        { title: 'resonance', entries: [['compile', 'decompile'], ['thread'], ['unravel'], ['register'], ['standby'], ['sprites']] },
+        // `sustain` shelves here and not under magic: the command is
+        // technomancer-gated (a sprite task, SR5 p.256) and refuses anyone
+        // else, so the Emerged shelf is where its audience looks.
+        { title: 'resonance', entries: [['compile', 'decompile'], ['thread'], ['unravel'], ['register'], ['standby'], ['sustain'], ['sprites']] },
         { title: 'social', entries: [['say'], ['emote', 'me'], ['talk-to'], ['call'], ['end-call', 'end', 'hangup'], ['accept'], ['decline', 'deny', 'refuse'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },
         { title: 'street', entries: [['abandon'], ['browse', 'buy'], ['sell'], ['catalog'], ['source', 'procure'], ['work', 'gig'], ['jobs'], ['journal'], ['perform'], ['palm'], ['docwagon'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
         { title: 'barriers', entries: [['pick'], ['breach'], ['dispel', 'dispell'], ['bluff'], ['unlock'], ['lock']] },
         { title: 'character', entries: [['sheet', 'stats'], ['advance'], ['qualities', 'quality'], ['sin', 'sins', 'papers'], ['initiate', 'submerge'], ['install', 'chrome']] },
-        { title: 'session', entries: [['help'], ['hints'], ['time', 'clock'], ['note'], ['backlog'], ['roles'], ['clear'], ['quit', 'exit']] },
+        { title: 'session', entries: [['help'], ['hints'], ['time', 'clock'], ['note'], ['backlog'], ['review'], ['roles'], ['clear'], ['quit', 'exit']] },
     ];
     /** Registered but deliberately UNLISTED: reachable as subcommands or
      *  muscle-memory ("players" folded back under crew after playtesting
@@ -4748,7 +4808,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      *  -- the server role-gates both and 403s everyone else. Listed in
      *  help ONLY for a confirmed play-tester; see helpCategories. `roles`
      *  rides along because it is admin-only, a strictly narrower group. */
-    static PLAYTESTER_VERBS = new Set(['backlog', 'roles']);
+    static PLAYTESTER_VERBS = new Set(['backlog', 'review', 'roles']);
     /** Descriptions for the verbs handled inline in handleInput() rather than registered. */
     static BUILTIN_DESCRIPTIONS = {
         help: 'This overview. "help <category>" for one group with full descriptions; "help <command>" for one command.',