@maka/maka-cli 5.120.0 → 5.122.0

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

@@ -1,4 +1,5 @@
 import { agentRatingFromName } from './utilities/programs.js';
+import { MATRIX_STANCE_ACTION } from './models/player.js';
 import blessed from 'blessed';
 import { hostLabel } from './utilities/grid-names.js';
 import { marksPlaced, marksOnYou } from './utilities/marks.js';
@@ -54,6 +55,7 @@ import { GoCommand } from './commands/go.js';
 import { UseCommand } from './commands/use.js';
 import { EquipCommand } from './commands/equip.js';
 import { UnequipCommand } from './commands/unequip.js';
+import { FitCommand, UnfitCommand } from './commands/fit.js';
 import { DropCommand } from './commands/drop.js';
 import { UnlockCommand } from './commands/unlock.js';
 import { LockCommand } from './commands/lock.js';
@@ -218,6 +220,26 @@ export default class Game {
     /** Its twin, docked to its right: the current room's own layout
      *  (spatial-viz follow-up 2026-08-25). See utilities/room-view.ts. */
     _roomMapBox;
+    /** The last string actually painted into each dock -- compared so a
+     *  repaint (and its scheduleRender cost) only happens when the
+     *  content genuinely changed, same reasoning as _clockFace above.
+     *  Read by setMapOverlay/setRoomOverlay; written there too. */
+    _lastMapPaint;
+    _lastRoomPaint;
+    /** The docked panels' HEARTBEAT (2FrYWFdLnh6uqFLcp, player: "I'd like
+     *  the area map to update on a heartbeat, not only when I issue a
+     *  command. That way I can tell where things are in 'real time'").
+     *
+     *  Every other panel refresh rides a player-typed command
+     *  (updateExits already fires on move/look/lock/unlock -- see its own
+     *  header) or a server push in a shared run. Nothing repainted it
+     *  while the player sat still watching an NPC close in. This ticker
+     *  is that missing beat for solo play, built on the clock's own
+     *  lesson one field up: call the SAME updateExits a command would,
+     *  and let the _lastMapPaint/_lastRoomPaint diff (not a second
+     *  change-detector) decide whether anything actually redraws. */
+    _mapHeartbeatTimer;
+    static MAP_HEARTBEAT_MS = 2_000;
     _useAi = false;
     _aiRefusalAnnounced = false;
     // ACCOUNT BINDING (ruling 2026-08-23): who this runner belongs to,
@@ -1317,7 +1339,7 @@ export default class Game {
         for (const c of this.companions) {
             const dev = c.boundDevice;
             const services = typeof c.services === 'number' ? `, ${c.services} service${c.services === 1 ? '' : 's'}` : '';
-            const line = c.kind === 'drone' && dev ? `Pilot ${2 + dev.qualityBonus}, hull ${dev.droneSummary()}`
+            const line = c.kind === 'drone' && dev ? `Pilot ${dev.pilotRating}, hull ${dev.droneSummary()}`
                 : c.kind === 'agent' && dev ? `rating ${c.force} on ${dev.name} ${dev.deckSummary()}`
                     : c.kind === 'sprite' ? `${c.spriteType ?? 'sprite'} level ${c.force}${services}${c.registered ? ', registered' : ''}`
                         : c.kind === 'spirit' ? `Force ${c.force}${services}`
@@ -1338,7 +1360,7 @@ export default class Game {
         for (const d of player.inventory.getAllItems().filter(i => i.isDrone())) {
             if (out.some(o => o.name === d.name))
                 continue;
-            out.push({ name: d.name, kind: 'drone', deployed: false, line: `Pilot ${2 + d.qualityBonus}, hull ${d.droneSummary()}${d.isWrecked ? ' -- WRECKED' : ''}`, damage: { taken: d.droneDamage, max: d.maxDroneBoxes } });
+            out.push({ name: d.name, kind: 'drone', deployed: false, line: `Pilot ${d.pilotRating}, hull ${d.droneSummary()}${d.isWrecked ? ' -- WRECKED' : ''}`, damage: { taken: d.droneDamage, max: d.maxDroneBoxes } });
         }
         const deck = player.getAnyCyberdeck();
         if (deck && !this.companions.some(c => c.kind === 'agent')) {
@@ -1384,13 +1406,15 @@ export default class Game {
         tiny: 0.5, small: 2, medium: 8, large: 20, huge: 40,
     };
     deployDroneShell(item, room) {
-        const pilot = 2 + item.qualityBonus;
-        const armed = /armed|combat|gun|roto|assault|sentry|weapon/i.test(`${item.name} ${item.description ?? ''}`);
+        // The drone's own Pilot, Body and mount (catalog v13 vehicle block; the
+        // price-tier and name fallbacks live in Item for generated frames).
+        const pilot = item.pilotRating;
+        const armed = item.hasWeaponMount;
         const shell = this.spawnCompanionShell({
             name: `${item.name} (autopilot)`,
             description: `${this.player.name}'s drone running its dog-brain autopilot: it follows them, watches, and ${armed ? 'shoots what threatens them' : 'has cameras where guns would go -- it never attacks'}.`,
             kind: 'drone',
-            combat: { body: 2 + item.qualityBonus, agility: pilot, reaction: pilot, logic: pilot, intuition: pilot, willpower: pilot, strength: 1, charisma: 1, skills: { perception: pilot, ...(armed ? { firearms: pilot } : {}) } },
+            combat: { body: item.droneBody, agility: pilot, reaction: pilot, logic: pilot, intuition: pilot, willpower: pilot, strength: 1, charisma: 1, skills: { perception: pilot, ...(armed ? { firearms: pilot } : {}) } },
             room, plane: 'meat', force: pilot, boundDevice: item,
         });
         // Take-command weight checks (Player.addInventory) enforce this cap
@@ -2359,6 +2383,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('exit-host', ExitHostCommand);
         CommandFactory.registerCommand('rest', RestCommand);
         CommandFactory.registerCommand('reload', ReloadCommand);
+        CommandFactory.registerCommand('fit', FitCommand);
+        CommandFactory.registerCommand('unfit', UnfitCommand);
         CommandFactory.registerCommand('subdue', SubdueCommand);
         // SUBDUING p.195 (see commands/grapple.ts): restrain without damage.
         // Canon skill hooks (see SkillName in models/player.ts).
@@ -2846,6 +2872,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.warmNpcAppearancesInBackground();
         this.startPursuitHeartbeat();
         this.startClockTicker();
+        this.startMapHeartbeat();
         // The banner learns where we are only after the hub/scene bookkeeping
         // above settles.
         this.refreshLogLabel();
@@ -4329,6 +4356,50 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this._clockTimer = undefined;
         }
     }
+    /**
+     * THE PANELS' MISSING BEAT (2FrYWFdLnh6uqFLcp). updateExits already
+     * fires on everything the PLAYER does; nothing fired it for what
+     * everyone else in the room does while the player sits still and
+     * watches. Same lifecycle as startClockTicker one field up --
+     * headless-guarded, idempotent, unref'd -- because this is the same
+     * shape of thing: a UI-only convenience with nothing behind it for a
+     * session with no screen to paint.
+     */
+    startMapHeartbeat() {
+        if (!this._mapBox || this._mapHeartbeatTimer)
+            return;
+        this._mapHeartbeatTimer = setInterval(() => this.mapHeartbeatTick(), Game.MAP_HEARTBEAT_MS);
+        this._mapHeartbeatTimer.unref?.();
+    }
+    stopMapHeartbeat() {
+        if (this._mapHeartbeatTimer) {
+            clearInterval(this._mapHeartbeatTimer);
+            this._mapHeartbeatTimer = undefined;
+        }
+    }
+    /**
+     * ONE TICK, and it does nothing clever: call the exact function a
+     * player's own move/look already calls. Whether anything actually
+     * repaints is _lastMapPaint/_lastRoomPaint's call, not this one's --
+     * see setMapOverlay/setRoomOverlay. That is deliberate: a second,
+     * bespoke "did the room change" detector here would be a second
+     * place for that answer to drift from what the panels actually paint.
+     *
+     * SKIPPED MID-EXCHANGE. Combat already repaints itself blow-by-blow
+     * (CombatExchange narrates and this.scene.updateStatus()/updateExits
+     * follow each strike) -- a wall-clock beat competing with that is
+     * noise at best. It also stays the RIGHT default once combat moves to
+     * a turn-based cadence (player's stated plan): pacing there is the
+     * turn structure's job, not a 2-second ticker's.
+     */
+    mapHeartbeatTick() {
+        if (this.player.inExchange)
+            return;
+        const here = this.player.currentLocation;
+        if (!here)
+            return;
+        this.updateExits(here);
+    }
     stopPresenceHeartbeat() {
         if (this._presenceTimer) {
             clearInterval(this._presenceTimer);
@@ -4345,6 +4416,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // A stray interval outliving a closed shared session would be a
         // nasty thing to find later, so it retires with the rest of them.
         this.stopClockTicker();
+        this.stopMapHeartbeat();
         if (this._presenceEquipTimer)
             clearTimeout(this._presenceEquipTimer);
         this.stopPursuitHeartbeat();
@@ -4736,9 +4808,18 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this.hideMapOverlay();
             return;
         }
-        this._mapBox.setContent(lines.join('\n'));
         this._mapBox.show();
         this.syncMapDock();
+        // SAME GUARD THE CLOCK USES ONE FIELD UP: paint only when the
+        // content actually differs. Load-bearing now that updateExits can
+        // fire off the map heartbeat as well as a typed command -- an idle
+        // scene must cost a string compare, not a repaint, or "live" would
+        // mean "flickering".
+        const joined = lines.join('\n');
+        if (joined === this._lastMapPaint)
+            return;
+        this._lastMapPaint = joined;
+        this._mapBox.setContent(joined);
         // Coalesced -- see scheduleRender. A shared-run burst repaints once,
         // not once per event.
         this.scheduleRender();
@@ -4748,6 +4829,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             return;
         this._mapBox.hide();
         this.syncMapDock();
+        // A hide is a real visible change even when the content string
+        // would still match what's cached -- the NEXT show of that same
+        // content must repaint, not be skipped as "unchanged".
+        this._lastMapPaint = undefined;
         // Coalesced -- see scheduleRender. A shared-run burst repaints once,
         // not once per event.
         this.scheduleRender();
@@ -4766,9 +4851,14 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this.hideRoomOverlay();
             return;
         }
-        this._roomMapBox.setContent(lines.join('\n'));
         this._roomMapBox.show();
         this.syncMapDock();
+        // Same guard as setMapOverlay -- see its comment.
+        const joined = lines.join('\n');
+        if (joined === this._lastRoomPaint)
+            return;
+        this._lastRoomPaint = joined;
+        this._roomMapBox.setContent(joined);
         // Coalesced -- see scheduleRender. A shared-run burst repaints once,
         // not once per event.
         this.scheduleRender();
@@ -4778,6 +4868,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             return;
         this._roomMapBox.hide();
         this.syncMapDock();
+        // See hideMapOverlay: a hide invalidates the cache so the next
+        // show of matching content still repaints.
+        this._lastRoomPaint = undefined;
         // Coalesced -- see scheduleRender. A shared-run burst repaints once,
         // not once per event.
         this.scheduleRender();
@@ -4929,14 +5022,25 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // each under the picture it belongs to, so the HUD stops repeating
         // what two panels already show. The breadcrumb went with it -- the
         // district map draws the way you came far better than a text trail.
-        const stanceColor = player.autoStance === 'lethal' ? 'red' : player.autoStance === 'non-lethal' ? 'yellow' : 'white';
+        // THE STANCE THE HUD SHOWS IS THE ONE IN FORCE (uMQAhaAysgaKpWFkn,
+        // 2026-09-03). Jacked in, the fight autopilot is not what Tab
+        // moves and not what your next action obeys -- the Matrix stance
+        // is (Brute Force or Hack on the Fly). Showing the meat stance to
+        // a persona would be the same class of bug as the 2026-08-27
+        // report that the HUD did not follow Tab at all: a readout naming
+        // a setting the player cannot currently change.
+        const onMatrix = player.plane === 'matrix';
+        const stanceWord = onMatrix ? MATRIX_STANCE_ACTION[player.matrixStance] : player.autoStance;
+        const stanceColor = onMatrix
+            ? (player.matrixStance === 'attack' ? 'red' : 'yellow')
+            : player.autoStance === 'lethal' ? 'red' : player.autoStance === 'non-lethal' ? 'yellow' : 'white';
         // WHAT'S IN YOUR HANDS rides alongside the stance (player ruling
         // 2026-08-25). The two answer the same question -- how ready are you
         // -- and the stance line was left short and lonely once the location
         // moved out to the map captions, while the readiness line below ran
         // long. armedLine is built further down with the rest of the gear
         // read; only its placement moved.
-        lines.push(`{${stanceColor}-fg}⚔ ${player.autoStance.toUpperCase()}{/${stanceColor}-fg}  ${this.armedLine(player)}`);
+        lines.push(`{${stanceColor}-fg}${onMatrix ? '◈' : '⚔'} ${stanceWord.toUpperCase()}{/${stanceColor}-fg}  ${this.armedLine(player)}`);
         // Line 2: both condition monitors -- in a game where a fight can kill
         // you and casting can knock you out, current damage on either track is
         // never something a player should have to ask for. Colors shift as
@@ -5227,7 +5331,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             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.hasSoft('mapsoft') ? undefined /* Mapsoft (p.442): the district drawn and named */ : this.player.visitedRooms,
+                visited: this.player.hasCapability('no-fog') ? undefined /* Mapsoft (p.442): the district drawn and named -- its row's capability (catalog v13) */ : this.player.visitedRooms,
                 arEyes: this.player.hasMatrixEyes(),
             }, mapView, tallestRoomRows());
             // The captions the HUD used to carry: where you are under the
@@ -5640,7 +5744,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      */
     static HELP_CATEGORIES = [
         { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach'], ['run'], ['sprint'], ['climb', 'mantle', 'scale', 'clamber'], ['descend'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow'], ['unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
-        { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['open'], ['close'], ['put'], ['equip'], ['unequip'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
+        { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['open'], ['close'], ['put'], ['equip'], ['unequip'], ['fit'], ['unfit'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
         { title: 'combat', entries: [['attack'], ['kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest'], ['heal', 'firstaid', 'bandage', 'patch']] },
         // The party layer: everyone who walks (or flies, or manifests) at
         // your side answers to these.