@maka/maka-cli 5.78.0 → 5.79.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.78.0",
+  "version": "5.79.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",

package/bundle/typescript/src/commands/game/sideQuest/commands/jack.d.ts

@@ -13,5 +13,24 @@ import { Command, ICommand } from './command.js';
 export declare class JackCommand extends Command implements ICommand {
     protected static verb: string;
     protected static description: string;
+    /**
+     * THE JACK OUT ACTION (p.240): Hardware + Willpower [Firewall] v.
+     * Logic + Attack, rolled against the icon that locked your link.
+     *
+     * ONE ROLL, COMPARED TO EACH LOCKER SEPARATELY -- canon is explicit:
+     * "if more than one persona has you link-locked, you need to beat each
+     * of them individually: use a single roll and compare your hits to
+     * rolls from each opponent who had established a link-lock." So Black
+     * and Blaster both on you is not two attempts, it is one attempt
+     * against two defences, and failing either keeps you in.
+     *
+     * THE DEFENDER'S POOL IS THE ENGINE'S, and this is the same honesty
+     * the IC design has used throughout: canon writes "Logic + Attack",
+     * which is a PERSONA's pool, and IC has no Logic. The pool used here
+     * is the general IC rule (Host Rating x 2, p.247) limited by the
+     * host's Attack -- both halves cited, the combination ours, because
+     * the book never writes a link-lock defence for a program.
+     */
+    private breakLinkLock;
     execute(args?: string[]): Promise<string>;
 }

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

@@ -1,5 +1,6 @@
 import { Command } from './command.js';
 import { enterMatrix, leaveMatrix } from '../utilities/planes.js';
+import { rollPool, formatRoll } from '../utilities/dice.js';
 /**
  * The Matrix door, both directions: "jack in [hot|cold]" and "jack out".
  * Needs a working CYBERDECK carried (a commlink is calls and AR only) --
@@ -14,6 +15,53 @@ import { enterMatrix, leaveMatrix } from '../utilities/planes.js';
 export class JackCommand extends Command {
     static verb = 'jack';
     static description = 'Enter or leave the Matrix: "jack in" (cold-sim), "jack in hot" (faster, harder, biofeedback is real), "jack out". Takes a working cyberdeck -- or being a technomancer. Your body slumps where you leave it.';
+    /**
+     * THE JACK OUT ACTION (p.240): Hardware + Willpower [Firewall] v.
+     * Logic + Attack, rolled against the icon that locked your link.
+     *
+     * ONE ROLL, COMPARED TO EACH LOCKER SEPARATELY -- canon is explicit:
+     * "if more than one persona has you link-locked, you need to beat each
+     * of them individually: use a single roll and compare your hits to
+     * rolls from each opponent who had established a link-lock." So Black
+     * and Blaster both on you is not two attempts, it is one attempt
+     * against two defences, and failing either keeps you in.
+     *
+     * THE DEFENDER'S POOL IS THE ENGINE'S, and this is the same honesty
+     * the IC design has used throughout: canon writes "Logic + Attack",
+     * which is a PERSONA's pool, and IC has no Logic. The pool used here
+     * is the general IC rule (Host Rating x 2, p.247) limited by the
+     * host's Attack -- both halves cited, the combination ours, because
+     * the book never writes a link-lock defence for a program.
+     */
+    breakLinkLock() {
+        const actor = this.actor;
+        const room = actor.currentLocation;
+        const lockers = [...actor.linkLockedBy];
+        const attempt = rollPool(actor.skillRating('hardware') + actor.willpower, actor.matrixAttribute('firewall'));
+        const lines = [
+            `You throw everything at the disconnect --`,
+        ];
+        if (this.scene.isHumanControlled(actor)) {
+            this.logger.meta(`Jack Out -- Hardware + Willpower [Firewall]: ${formatRoll(attempt)}`);
+        }
+        const held = [];
+        for (const name of lockers) {
+            const hold = rollPool(room.hostRating * 2, room.hostAttributes().attack);
+            if (this.scene.isHumanControlled(actor)) {
+                this.logger.meta(`  v. ${name} keep-alive (Host Rating x2 [Attack]): ${formatRoll(hold)}`);
+            }
+            // Ties go to the locker: you need to BEAT each of them.
+            if (attempt.hits <= hold.hits)
+                held.push(name);
+        }
+        if (held.length > 0) {
+            lines.push(`  ${held.join(' and ')} hold${held.length === 1 ? 's' : ''} the line -- the keep-alive won't break and you're still in. You can try again.`);
+            return { freed: false, lines };
+        }
+        actor.linkLockedBy.clear();
+        lines.push(`  The hooks tear loose. You're free of the lock -- and going out the hard way.`);
+        return { freed: true, lines };
+    }
     async execute(args = []) {
         const actor = this.actor;
         const sub = args[0]?.toLowerCase();
@@ -24,6 +72,26 @@ export class JackCommand extends Command {
             if (actor.inExchange) {
                 return `The ice has your persona locked in the exchange -- survive it first, then jack out in the lull.`;
             }
+            // LINK-LOCKED: leaving stops being a decision and becomes a test
+            // (p.229/p.240). Everything below is the Jack Out action.
+            if (actor.linkLockedBy.size > 0) {
+                const fight = this.breakLinkLock();
+                if (!fight.freed)
+                    return fight.lines.join('\n');
+                // FORCED, not graceful. p.229: "successfully jacking out usually
+                // means suffering dumpshock, but at least you're free" -- the
+                // Jack Out action reboots the device you are riding (p.240),
+                // which is the ungraceful exit. The ordinary "jack out" below
+                // stays clean because that one IS the graceful drop; tearing off
+                // a keep-alive is not.
+                return [
+                    ...fight.lines,
+                    ...leaveMatrix(this.scene, actor, {
+                        forced: true,
+                        reason: `You rip the connection out by the roots --`,
+                    }),
+                ].join('\n');
+            }
             const lines = leaveMatrix(this.scene, actor);
             return lines.join('\n');
         }

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

@@ -1 +1 @@
-{"version":3,"file":"jack.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/jack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAY,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAElE;;;;;;;;;;GAUG;AACH,MAAM,OAAO,WAAY,SAAQ,OAAO;IAC5B,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;IACrB,MAAM,CAAC,WAAW,GAAG,8MAA8M,CAAC;IAE9O,KAAK,CAAC,OAAO,CAAC,OAAiB,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QAEnC,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;YAClB,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7B,OAAO,uBAAuB,CAAC;YACjC,CAAC;YACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACrB,OAAO,iGAAiG,CAAC;YAC3G,CAAC;YACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACzE,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7B,OAAO,yCAAyC,CAAC;YACnD,CAAC;YACD,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7B,OAAO,sFAAsF,CAAC;YAChG,CAAC;YACD,IAAI,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC5B,OAAO,8CAA8C,CAAC;YACxD,CAAC;YAED,2DAA2D;YAC3D,mEAAmE;YACnE,gEAAgE;YAChE,gEAAgE;YAChE,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;gBAClC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,MAAM,OAAO,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;oBACxC,OAAO,OAAO;wBACZ,CAAC,CAAC,QAAQ,OAAO,CAAC,IAAI,gBAAgB,OAAO,CAAC,WAAW,EAAE,mEAAmE;wBAC9H,CAAC,CAAC,iGAAiG,CAAC;gBACxG,CAAC;gBACD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;oBACxB,OAAO,6EAA6E,CAAC;gBACvF,CAAC;YACH,CAAC;YACD,IAAI,IAAI,GAAmB,CAAC,GAAG,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;YAChG,kEAAkE;YAClE,+DAA+D;YAC/D,yDAAyD;YACzD,iEAAiE;YACjE,kEAAkE;YAClE,yCAAyC;YACzC,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC3B,IAAI,GAAG,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;oBACxD,OAAO,uLAAuL,CAAC;gBACjM,CAAC;gBACD,IAAI,GAAG,KAAK,CAAC;YACf,CAAC;YACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,8CAA8C,CAAC;IACxD,CAAC"}
+{"version":3,"file":"jack.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/commands/jack.ts"],"names":[],"mappings":"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"}

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';
@@ -3049,6 +3049,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 +3100,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 +4539,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 +4771,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;
     }