@maka/maka-cli 5.78.0 → 5.80.0

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

@@ -15,7 +15,7 @@ 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 } from './utilities/room-view.js';
+import { renderRoomLayoutCompact, crewOfTable, roomCaption } 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';
@@ -143,6 +143,7 @@ import { OverwatchCommand } from './commands/overwatch.js';
 import { MarkCommand } from './commands/mark.js';
 import { SnoopCommand } from './commands/snoop.js';
 import { TapCommand } from './commands/tap.js';
+import { JackPointCommand } from './commands/jackpoint.js';
 import { TimeCommand } from './commands/time.js';
 // The HUD's clock -- read in the engine so a shared run reads the
 // host's wall clock, never each client's own (item B).
@@ -2283,10 +2284,19 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('mark', MarkCommand);
         // Camera feeds you own (surveillance).
         CommandFactory.registerCommand('snoop', SnoopCommand);
-        // The cable into a slaved camera (canon p.232/233) -- "splice" and
-        // "jackpoint" are what players reach for when they mean the same act.
+        // The cable into a slaved camera (canon p.232/233) -- "splice" is
+        // what players reach for when they mean the same act.
+        //
+        // "jackpoint" USED TO BE LISTED HERE AS A THIRD SYNONYM AND NEVER
+        // WAS ONE: the word appeared only in this comment and was registered
+        // nowhere, so a player who typed it got the typo matcher reading it
+        // as `jack` and jacking them into the Matrix. The name belongs to
+        // the data haven (SR5 p.225-226) and is now a verb of its own; the
+        // comment that claimed otherwise is gone with it.
         CommandFactory.registerCommand('tap', TapCommand);
         CommandFactory.registerCommand('splice', TapCommand);
+        // The shadowrunners' data haven, invitation only (SR5 p.225-226).
+        CommandFactory.registerCommand('jackpoint', JackPointCommand);
         // The wall clock (item B). "clock" too -- half of us type that.
         CommandFactory.registerCommand('time', TimeCommand);
         CommandFactory.registerCommand('clock', TimeCommand);
@@ -3049,6 +3059,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.plane = 'meat';
         this.player.bodyRoom = undefined;
         this.player.simMode = undefined;
+        // This path leaves the Matrix WITHOUT going through leaveMatrix, so
+        // it has to drop the keep-alives itself. Found by enumerating every
+        // exit rather than trusting the choke point: a link-lock left set
+        // here would ride the cab home and the next jack-in would start
+        // already trapped, with nothing on the grid holding it.
+        this.player.linkLockedBy.clear();
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -3094,6 +3110,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         this.player.plane = 'meat';
         this.player.bodyRoom = undefined;
         this.player.simMode = undefined;
+        // Same reason as settleTravelState: an exit that bypasses
+        // leaveMatrix must drop the link-lock itself.
+        this.player.linkLockedBy.clear();
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -4530,8 +4549,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 isOtherPlayer: a => this.scene.isHumanControlled(a),
             });
             if (roomLines.length > 0) {
-                const spot = spotOf(this.player);
-                roomLines.push(caption(spot ? `@ ${spot}` : '(moving through)', boxWidth));
+                roomLines.push(caption(roomCaption(here, this.player), boxWidth));
             }
             this.setRoomOverlay(roomLines);
         }
@@ -4763,6 +4781,25 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 reason: `The host's ice burns your deck out from under you.`,
             }));
         }
+        else if (turn.scrambled) {
+            // SCRAMBLE IC (p.248): "you reboot immediately, taking dumpshock if
+            // you were in VR." A forced exit through the same door, which is
+            // what makes it a reboot rather than a graceful drop -- and the
+            // reboot is also what hands the reducers' damage back.
+            //
+            // `else if` on purpose: a deck already bricked this turn has been
+            // dumped, and dumping a persona twice would bill dumpshock twice.
+            turn.lines.push(...leaveMatrix(this.scene, actor, {
+                forced: true,
+                reason: `Scramble IC rips the connection out at the root --`,
+            }));
+        }
+        if (turn.traced) {
+            // TRACK IC (p.249): the location goes to the authorities. Routed
+            // into the heat the game already keeps for being made in the meat
+            // world, rather than a second parallel notion of "they know".
+            this.addHeat(4, `Track IC reported ${actor.name}'s location`);
+        }
         const body = turn.lines.join('\n');
         return result.length > 0 ? `${result}\n${body}` : body;
     }
@@ -4785,7 +4822,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'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['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).
         // `sustain` shelves here and not under magic: the command is