@maka/maka-cli 5.116.0 → 5.118.0

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

@@ -1,4 +1,7 @@
 import blessed from 'blessed';
+import { hostInteriorPanel } from './utilities/grid-view.js';
+import { DEFAULT_GRID_PROVIDER, PUBLIC_GRID, globalGrid } from './utilities/grids.js';
+import { hostsInReach, hostDockLine, gridVicinity } from './utilities/grid-reach.js';
 import { nameThem, scrubHandles } from './utilities/identity.js';
 import { dirname } from 'path';
 import { capitalCase } from 'change-case';
@@ -14,7 +17,7 @@ import { pushSave, burnCloudSaveFor, enqueueBoundPush, flushPushQueue, writeSpil
 import { DOCWAGON_TIERS, RESUSC_FEE, DEATH_COMP } from './utilities/docwagon.js';
 import { isFence, LIFESTYLE_TIERS, canonicalLifestyleTier } from './utilities/commerce.js';
 import { attachBrandMark, attachBrandMarkBottomRight } from './utilities/brand-mark.js';
-import { attachLogoMark } from './utilities/logo-mark.js';
+import { logoPanelLines } from './utilities/logo-mark.js';
 import { bestFakeSin, wandRead, processArrest } from './utilities/sin.js';
 import { tickEphemerals } from './utilities/ephemeral.js';
 import { requestAlarmBeat, newAlarmBeatLatch, ALARM_STIMULUS } from './utilities/alarmed-staff.js';
@@ -26,7 +29,7 @@ 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 { leaveMatrix, endPersona } from './utilities/planes.js';
 import { CommandQueue } from './utilities/command-queue.js';
 import { currentSession } from './utilities/session-context.js';
 import { PlayersCommand } from './commands/players.js';
@@ -65,6 +68,7 @@ import { EquipmentCommand } from './commands/equipment.js';
 import { MapCommand } from './commands/map.js';
 import { SilentCommand } from './commands/silent.js';
 import { EnterHostCommand, ExitHostCommand } from './commands/enter-host.js';
+import { HopCommand } from './commands/hop.js';
 import { RestCommand } from './commands/rest.js';
 import { ReloadCommand } from './commands/reload.js';
 import { SubdueCommand } from './commands/subdue.js';
@@ -1658,6 +1662,8 @@ export default class Game {
     // and while the tab stands, rest at the hideout recovers half (rest.ts;
     // "pay" squares it, pay.ts; "lifestyle" views and moves tiers).
     lifestyleTier = 'Squatter';
+    /** The Big Ten grid a High lifestyle rides (SR5 p.222). A placeholder default until chargen offers the pick (grids.ts). */
+    gridProvider = DEFAULT_GRID_PROVIDER;
     rentDebt = 0;
     /** The active lifestyle tier's row (falls back to Squatter). */
     get lifestyle() {
@@ -2286,6 +2292,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // branch ROUTES a bare "exit" to this command while the persona is
         // inside a host, and 'exit-host' is the always-reachable name.
         CommandFactory.registerCommand('enter', EnterHostCommand);
+        CommandFactory.registerCommand('hop', HopCommand);
         CommandFactory.registerCommand('exit-host', ExitHostCommand);
         CommandFactory.registerCommand('rest', RestCommand);
         CommandFactory.registerCommand('reload', ReloadCommand);
@@ -2661,6 +2668,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             throw new Error(`Scene generation failed: ${err.message}`);
         }
         this.scene.initialize(this);
+        this.resolveHostGrids();
         this.player.currentLocation = this.determineStartRoom();
         this.applySeedStartSpot(this.sceneSeed);
         this.registerCommands();
@@ -2861,11 +2869,26 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this._resumedAt = room;
     }
     /** The location a save carries: the current hub room and spot. */
+    /** Each host's seeded grid word ('public' | 'local' | 'global:<corp>') against this scene's local grid. */
+    resolveHostGrids() {
+        for (const room of Object.values(this.scene.getRooms())) {
+            const host = room.host;
+            if (!host?.gridSeed)
+                continue;
+            const w = host.gridSeed.trim().toLowerCase();
+            host.grid = w === 'public' ? PUBLIC_GRID : w === 'local' ? this.scene.localGrid : w.startsWith('global:') ? globalGrid(host.gridSeed.slice('global:'.length)) : undefined;
+        }
+    }
     hubLocationSnapshot() {
-        const room = this.player.currentLocation;
+        // The BODY's room, never the persona's: jacked in, currentLocation is
+        // wherever the persona stands (a host's room inside one), and a resume
+        // wakes the meat, not the icon.
+        const jackedIn = this.player.plane === 'matrix';
+        const room = jackedIn ? (this.player.bodyRoom ?? this.player.currentLocation) : this.player.currentLocation;
         if (!room)
             return undefined;
-        return { room: room.name, ...(this.player.atSpot ? { spot: this.player.atSpot } : {}) };
+        const spot = jackedIn ? undefined : this.player.atSpot;
+        return { room: room.name, ...(spot ? { spot } : {}) };
     }
     /**
      * Everything a save restores beyond the seed synthesis: the player,
@@ -2897,6 +2920,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // local file never knew -- that is the cloud repair's job, and the
         // sync protocol's, see the repair-visibility ruling in cloud-saves.)
         this.lifestyleTier = canonicalLifestyleTier(save.game.lifestyleTier) ?? 'Street';
+        if (typeof save.game.gridProvider === 'string' && save.game.gridProvider.trim())
+            this.gridProvider = save.game.gridProvider;
         this.rentDebt = save.game.rentDebt;
         this.syncHomeToLifestyle();
         this.player.lifestyleEdgeBonus = this.lifestyle.edgeBonus;
@@ -3163,6 +3188,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             player: serializePlayer(this.player),
             game: {
                 location: this.hubLocationSnapshot(),
+                gridProvider: this.gridProvider,
                 lifestyleTier: this.lifestyleTier,
                 rentDebt: this.rentDebt,
                 tier: this._tier,
@@ -3411,7 +3437,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.linkLockedBy.clear();
         // Same enumeration, same reason: insideHost is persona state and these
         // paths end the persona without passing through planes.leaveMatrix.
-        this.player.insideHost = undefined;
+        endPersona(this.player);
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -3515,7 +3541,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.linkLockedBy.clear();
         // Same enumeration, same reason: insideHost is persona state and these
         // paths end the persona without passing through planes.leaveMatrix.
-        this.player.insideHost = undefined;
+        endPersona(this.player);
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -3967,7 +3993,11 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // forward), and no blocking AI-redressing pass either -- the chunked
         // rooms pass already wrote this scene's prose.
         this.scene = await SceneSynthesizer.synthesizeFromJson(seed, this.player, false, false);
+        // A run happens in the same metroplex: it rides the hub's local grid.
+        if (this._hubScene)
+            this.scene.localGrid = this._hubScene.localGrid;
         this.scene.initialize(this);
+        this.resolveHostGrids();
         this.player.currentLocation = this.determineStartRoom();
         this.applySeedStartSpot(seed);
         // New job -- and the needs come due at the door (see
@@ -4546,9 +4576,6 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         });
         this._statusBox = statusBox;
         screen.append(statusBox);
-        // The site's dotted logo fills the HUD's six rows at the far right
-        // (utilities/logo-mark.ts). Not keyable (see initInputBox).
-        attachLogoMark(screen, statusBox);
     }
     /**
      * THE MINIMAP (map-overlay wave 2026-08-24; split into a pair
@@ -5079,11 +5106,19 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         if (!this._mapBox || this.remoteSession)
             return;
         const here = this.player.currentLocation;
-        if (!here || this.player.plane === 'matrix') {
+        if (!here) {
             this.hideMapOverlay();
             this.hideRoomOverlay();
             return;
         }
+        // JACKED IN (player request 2026-09-02): the docks stay lit. The
+        // district map keeps drawing -- the persona rides the same geography
+        // its body sits in -- and the Room dock shows a host's floor while
+        // you are inside one. Otherwise you are simply ON THE GRID (SR5
+        // pp.220-221, p.246: outside a host a persona is on its grid, and a
+        // grid has no floor to draw), so the dock carries the mark instead
+        // of going dark.
+        const onTheGrid = this.player.plane === 'matrix' && !this.player.insideHost;
         const screenW = Number(this._screen?.width) || 0;
         // Each box's inner width. Derived from the screen rather than read
         // off the widget: blessed resolves percentage geometry at render
@@ -5103,17 +5138,41 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // characters (playtest 2026-08-25: "getting some artifacting 'g'";
         // ui.ts documents this same smear from column drift). Odd widths
         // keep the player marker exactly centred.
-        const mapInner = mapWidth ?? 15;
-        const mapView = Math.max(7, mapInner % 2 === 0 ? mapInner - 1 : mapInner);
-        const mapLines = renderMapViewport(this.scene.getRooms(), here, (r, d) => this.scene.barrierSealing(r, d), {
-            visited: this.player.visitedRooms,
-            arEyes: this.player.hasMatrixEyes(),
-        }, mapView, tallestRoomRows());
-        // The captions the HUD used to carry: where you are under the
-        // district, where you stand under the room.
-        if (mapLines.length > 0)
-            mapLines.push(caption(here.name, mapWidth));
-        this.setMapOverlay(mapLines);
+        if (this.player.plane === 'matrix') {
+            // THE GRID IS A FLATLAND OF ICONS (SR5 pp.217-218, p.246): the Map
+            // dock shows the hosts overhead, not the district under the body.
+            const hosts = hostsInReach(this.scene.getRooms(), this.player);
+            const dockW = mapWidth ?? 15;
+            const lines = hosts.length > 0
+                ? hosts.map(h => hostDockLine(h, this.player, dockW))
+                : ['{cyan-fg}nothing overhead{/cyan-fg}'];
+            lines.push(caption(this.player.insideHost ? `inside ${this.player.insideHost.name}` : `on the grid from ${gridVicinity(this.player).name}`, mapWidth));
+            this.setMapOverlay(lines);
+            if (onTheGrid) {
+                this.setRoomOverlay(logoPanelLines(Game.MAP_DOCK_ROWS - 2, boxWidth ?? 16));
+                return;
+            }
+            // INSIDE A HOST there is no floor to draw (p.219, p.246): the dock
+            // shows the interior's icons, not the room the body sits in.
+            const inside = this.player.hostInside;
+            if (inside) {
+                this.setRoomOverlay(hostInteriorPanel(this.scene, this.player, inside, Game.MAP_DOCK_ROWS - 2, boxWidth ?? 16));
+                return;
+            }
+        }
+        else {
+            const mapInner = mapWidth ?? 15;
+            const mapView = Math.max(7, mapInner % 2 === 0 ? mapInner - 1 : mapInner);
+            const mapLines = renderMapViewport(this.scene.getRooms(), here, (r, d) => this.scene.barrierSealing(r, d), {
+                visited: this.player.visitedRooms,
+                arEyes: this.player.hasMatrixEyes(),
+            }, mapView, tallestRoomRows());
+            // The captions the HUD used to carry: where you are under the
+            // district, where you stand under the room.
+            if (mapLines.length > 0)
+                mapLines.push(caption(here.name, mapWidth));
+            this.setMapOverlay(mapLines);
+        }
         // A DECORATION MUST NEVER KILL THE RUN. This panel is pure derived
         // geometry -- if synthesis or rendering ever throws (a malformed
         // seed, a room shape no one anticipated), the right outcome is a
@@ -5427,16 +5486,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
     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)
+        // The host's turn happens INSIDE it (p.246-247): the ice acts on what
+        // is in the host, and the persona's position says whether it is.
+        const host = actor.hostInside;
+        if (!host || actor.plane !== 'matrix')
             return result;
-        const turn = runHostTurn(room, actor);
+        const turn = runHostTurn(host.over, actor, this.scene);
         if (turn.lines.length === 0 && turn.meta.length === 0)
             return result;
         // Dice to the Mechanics pane, and only for a human -- the same gate
@@ -5517,7 +5572,7 @@ ${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', 'astral'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['download'], ['enter'], ['exit-host'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['download'], ['enter'], ['exit-host'], ['hop'], ['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).
         // `sustain` shelves here and not under magic: the command is