@maka/maka-cli 5.10.0 → 5.11.0

package/bundle/typescript/src/commands/game/sideQuest/scenes/scene2.json

@@ -12,7 +12,9 @@
   ],
   "currency": {
     "type": "nuyen",
-    "authorityRoomTags": ["Bank"]
+    "authorityRoomTags": [
+      "Bank"
+    ]
   },
   "rumors": [
     "The Haze Dragons doubled their watch on the Smuggler's Tunnel -- something's moving under the district that even Brick won't name.",
@@ -143,7 +145,7 @@
         "color": "Black",
         "texture": "Rugged",
         "rating": "Common",
-        "weight": 2.0
+        "weight": 2
       },
       {
         "name": "Knockoff Smart Glasses",
@@ -158,22 +160,38 @@
       }
     ]
   },
-
   "rooms": [
     {
       "name": "Neon Strip",
       "description": "The spine of the Purple Haze district: rain-slick pavement under a canopy of violet neon, food smoke, and AR graffiti three layers deep. Everyone you need is a block away in some direction.",
       "roomType": "Street",
-      "tags": ["residence"],
+      "tags": [
+        "residence"
+      ],
       "supportedLifestyles": {
-        "residenceTypes": ["Street", "Squatter"]
+        "residenceTypes": [
+          "Street",
+          "Squatter"
+        ]
       },
       "isStartRoom": true,
       "exits": [
-        { "direction": "north", "targetRoom": "Purple Haze Bar" },
-        { "direction": "east", "targetRoom": "Night Market" },
-        { "direction": "south", "targetRoom": "Rain-Chewed Alley" },
-        { "direction": "west", "targetRoom": "Mama Wu's Noodles" }
+        {
+          "direction": "north",
+          "targetRoom": "Purple Haze Bar"
+        },
+        {
+          "direction": "east",
+          "targetRoom": "Night Market"
+        },
+        {
+          "direction": "south",
+          "targetRoom": "Rain-Chewed Alley"
+        },
+        {
+          "direction": "west",
+          "targetRoom": "Mama Wu's Noodles"
+        }
       ]
     },
     {
@@ -182,13 +200,32 @@
       "roomType": "Bar",
       "size": "large",
       "spots": [
-        { "name": "door", "description": "The street door, where the neon bleeds in." },
-        { "name": "bar", "description": "The long counter, sticky with decades." },
-        { "name": "booths", "description": "High-backed booths built for quiet deals.", "tags": ["cover-partial"] },
-        { "name": "back corner", "description": "The dim table nobody chooses by accident." }
+        {
+          "name": "door",
+          "description": "The street door, where the neon bleeds in."
+        },
+        {
+          "name": "bar",
+          "description": "The long counter, sticky with decades."
+        },
+        {
+          "name": "booths",
+          "description": "High-backed booths built for quiet deals.",
+          "tags": [
+            "cover-partial"
+          ]
+        },
+        {
+          "name": "back corner",
+          "description": "The dim table nobody chooses by accident."
+        }
       ],
       "exits": [
-        { "direction": "north", "targetRoom": "Bar Backroom", "atSpot": "back corner" }
+        {
+          "direction": "north",
+          "targetRoom": "Bar Backroom",
+          "atSpot": "back corner"
+        }
       ]
     },
     {
@@ -197,9 +234,15 @@
       "roomType": "Bar",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "card table" },
-        { "name": "crates" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "card table"
+        },
+        {
+          "name": "crates"
+        }
       ]
     },
     {
@@ -208,8 +251,14 @@
       "roomType": "Restaurant",
       "size": "small",
       "spots": [
-        { "name": "door", "description": "A bead curtain and a blast of chili-scented steam." },
-        { "name": "counter", "description": "Six stools and the pot that never empties." }
+        {
+          "name": "door",
+          "description": "A bead curtain and a blast of chili-scented steam."
+        },
+        {
+          "name": "counter",
+          "description": "Six stools and the pot that never empties."
+        }
       ]
     },
     {
@@ -218,14 +267,35 @@
       "roomType": "Market",
       "size": "large",
       "spots": [
-        { "name": "entrance" },
-        { "name": "stalls" },
-        { "name": "shadowed edge", "tags": ["cover-partial"] }
+        {
+          "name": "entrance"
+        },
+        {
+          "name": "stalls"
+        },
+        {
+          "name": "shadowed edge",
+          "tags": [
+            "cover-partial"
+          ]
+        }
       ],
       "exits": [
-        { "direction": "north", "targetRoom": "Ironmonger's Arms", "atSpot": "stalls" },
-        { "direction": "east", "targetRoom": "Circuit Bazaar", "atSpot": "stalls" },
-        { "direction": "south", "targetRoom": "Doc Halloran's Clinic", "atSpot": "stalls" }
+        {
+          "direction": "north",
+          "targetRoom": "Ironmonger's Arms",
+          "atSpot": "stalls"
+        },
+        {
+          "direction": "east",
+          "targetRoom": "Circuit Bazaar",
+          "atSpot": "stalls"
+        },
+        {
+          "direction": "south",
+          "targetRoom": "Doc Halloran's Clinic",
+          "atSpot": "stalls"
+        }
       ]
     },
     {
@@ -235,9 +305,15 @@
       "owner": "Torque",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "counter" },
-        { "name": "racks" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "counter"
+        },
+        {
+          "name": "racks"
+        }
       ]
     },
     {
@@ -248,12 +324,21 @@
       "hasNode": true,
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "counter" },
-        { "name": "workbenches" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "counter"
+        },
+        {
+          "name": "workbenches"
+        }
       ],
       "exits": [
-        { "direction": "east", "targetRoom": "Talismonger's Hut" }
+        {
+          "direction": "east",
+          "targetRoom": "Talismonger's Hut"
+        }
       ]
     },
     {
@@ -264,8 +349,12 @@
       "warded": true,
       "size": "small",
       "spots": [
-        { "name": "doorway" },
-        { "name": "altar table" }
+        {
+          "name": "doorway"
+        },
+        {
+          "name": "altar table"
+        }
       ]
     },
     {
@@ -275,9 +364,15 @@
       "owner": "Doc Halloran",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "cots" },
-        { "name": "supply shelf" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "cots"
+        },
+        {
+          "name": "supply shelf"
+        }
       ]
     },
     {
@@ -285,8 +380,14 @@
       "description": "The way down: an alley chewed ragged by decades of acid rain, its storm drains breathing cold air up from the undermarket below.",
       "roomType": "Street",
       "exits": [
-        { "direction": "south", "targetRoom": "Flooded Undermarket" },
-        { "direction": "east", "targetRoom": "Union Pawnshop" }
+        {
+          "direction": "south",
+          "targetRoom": "Flooded Undermarket"
+        },
+        {
+          "direction": "east",
+          "targetRoom": "Union Pawnshop"
+        }
       ]
     },
     {
@@ -296,9 +397,15 @@
       "owner": "Whisper",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "counter" },
-        { "name": "back shelves" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "counter"
+        },
+        {
+          "name": "back shelves"
+        }
       ]
     },
     {
@@ -307,13 +414,27 @@
       "roomType": "Market",
       "size": "large",
       "spots": [
-        { "name": "entrance stair" },
-        { "name": "stilted stalls" },
-        { "name": "dry platforms" }
+        {
+          "name": "entrance stair"
+        },
+        {
+          "name": "stilted stalls"
+        },
+        {
+          "name": "dry platforms"
+        }
       ],
       "exits": [
-        { "direction": "south", "targetRoom": "Smuggler's Tunnel", "atSpot": "stilted stalls" },
-        { "direction": "west", "targetRoom": "Condemned Chapel", "atSpot": "dry platforms" }
+        {
+          "direction": "south",
+          "targetRoom": "Smuggler's Tunnel",
+          "atSpot": "stilted stalls"
+        },
+        {
+          "direction": "west",
+          "targetRoom": "Condemned Chapel",
+          "atSpot": "dry platforms"
+        }
       ]
     },
     {
@@ -321,8 +442,14 @@
       "description": "A bore of cracked ferrocrete running under the district, lit by chemlights and lined with cargo that never saw customs.",
       "roomType": "Tunnel",
       "exits": [
-        { "direction": "east", "targetRoom": "Haze Dragons Turf" },
-        { "direction": "south", "targetRoom": "Sim Den" }
+        {
+          "direction": "east",
+          "targetRoom": "Haze Dragons Turf"
+        },
+        {
+          "direction": "south",
+          "targetRoom": "Sim Den"
+        }
       ]
     },
     {
@@ -332,9 +459,18 @@
       "owner": "Brick",
       "size": "medium",
       "spots": [
-        { "name": "gate" },
-        { "name": "fire barrel" },
-        { "name": "stacked crates", "tags": ["cover-partial"] }
+        {
+          "name": "gate"
+        },
+        {
+          "name": "fire barrel"
+        },
+        {
+          "name": "stacked crates",
+          "tags": [
+            "cover-partial"
+          ]
+        }
       ]
     },
     {
@@ -343,12 +479,23 @@
       "roomType": "Chapel",
       "size": "medium",
       "spots": [
-        { "name": "doorway" },
-        { "name": "nave" },
-        { "name": "altar" }
+        {
+          "name": "doorway"
+        },
+        {
+          "name": "nave"
+        },
+        {
+          "name": "altar"
+        }
       ],
       "exits": [
-        { "direction": "down", "targetRoom": "Chapel Crypt", "puzzle": "Crypt Grate", "atSpot": "altar" }
+        {
+          "direction": "down",
+          "targetRoom": "Chapel Crypt",
+          "puzzle": "Crypt Grate",
+          "atSpot": "altar"
+        }
       ]
     },
     {
@@ -357,8 +504,12 @@
       "roomType": "Crypt",
       "size": "small",
       "spots": [
-        { "name": "entry stairs" },
-        { "name": "reliquary niches" }
+        {
+          "name": "entry stairs"
+        },
+        {
+          "name": "reliquary niches"
+        }
       ]
     },
     {
@@ -369,8 +520,12 @@
       "nodeAccess": "wired",
       "size": "small",
       "spots": [
-        { "name": "door" },
-        { "name": "couch rows" }
+        {
+          "name": "door"
+        },
+        {
+          "name": "couch rows"
+        }
       ]
     },
     {
@@ -1208,6 +1363,90 @@
       "currencyAmount": 300,
       "room": "Chapel Crypt",
       "atSpot": "reliquary niches"
+    },
+    {
+      "name": "Torque's Commlink",
+      "description": "A ruggedized shop commlink, speed-dial worn down to the metal -- Torque answers for paying customers.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Gunmetal",
+      "texture": "Scarred Polymer",
+      "rating": "Standard",
+      "weight": 0.2,
+      "heldBy": "Torque",
+      "owner": "Torque",
+      "transferable": false
+    },
+    {
+      "name": "Ratchet's Commlink",
+      "description": "A franken-link of three generations of parts that somehow outperforms all of them.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Circuit Green",
+      "texture": "Taped Seams",
+      "rating": "Rare",
+      "weight": 0.2,
+      "heldBy": "Ratchet",
+      "owner": "Ratchet",
+      "transferable": false
+    },
+    {
+      "name": "Halloran's Commlink",
+      "description": "A clinic-grade commlink with a triage tone nobody in the district ignores.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Bone White",
+      "texture": "Antiseptic Plastic",
+      "rating": "Standard",
+      "weight": 0.2,
+      "heldBy": "Doc Halloran",
+      "owner": "Doc Halloran",
+      "transferable": false
+    },
+    {
+      "name": "Cray's Commlink",
+      "description": "An ancient rigger deck stripped down to a talk-box -- the dead datajack port still blinks.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Faded Orange",
+      "texture": "Worn Rubber",
+      "rating": "Common",
+      "weight": 0.2,
+      "heldBy": "Old Cray",
+      "owner": "Old Cray",
+      "transferable": false
+    },
+    {
+      "name": "Skitter's Commlink",
+      "description": "A knockoff commlink under three cracked screen protectors, ringtone set to a jingle.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Neon Pink",
+      "texture": "Sticker-Covered",
+      "rating": "Common",
+      "weight": 0.2,
+      "heldBy": "Skitter",
+      "owner": "Skitter",
+      "transferable": false
+    },
+    {
+      "name": "Whisper's Commlink",
+      "description": "A pawned-and-reclaimed executive commlink, call log encrypted twice.",
+      "size": "Small",
+      "category": "Commlink",
+      "shape": "Slab",
+      "color": "Silver",
+      "texture": "Polished Glass",
+      "rating": "Standard",
+      "weight": 0.2,
+      "heldBy": "Whisper",
+      "owner": "Whisper",
+      "transferable": false
     }
   ],
   "puzzles": [

package/bundle/typescript/src/commands/game/sideQuest/types/save-file.d.ts

@@ -155,7 +155,29 @@ export interface ISavedGameState {
         spent: number;
         gigs: number;
         asked: boolean;
+        role?: string;
     }][];
+    /** SWAG orders in flight (commands/source.ts): paid, awaiting the
+     *  next homecoming. Optional -- absent in pre-swag v1 saves. */
+    procurements?: {
+        contact: string;
+        itemConfig: ISavedItem;
+        price: number;
+    }[];
+    /** DocWagon contract (utilities/docwagon.ts). Optional -- uninsured. */
+    docwagon?: {
+        tier: string;
+        resuscsLeft: number;
+        homecomingsLeft: number;
+    };
+    /** Leadership's Command action (commands/lead.ts): the recruit riding
+     *  the next run, and who refused you at what loyalty. */
+    enlistedAlly?: {
+        name: string;
+        description: string;
+        combat: Record<string, unknown>;
+    };
+    commandRefusals?: Record<string, number>;
     fencedCategories: string[];
     /** Rumor pool stays seed-sourced; only the cursor + active persist. */
     rumorIndex: number;

package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.d.ts

@@ -21,6 +21,9 @@ export interface IStrikeProfile {
      * physical -- knockouts, not kills (though stun overflow still bleeds
      * into the body). */
     dealStun?: boolean;
+    /** A SPELL strike (cast.ts): an Awakened defender's COUNTERSPELLING
+     * (canon: its own Magic skill) rides their defense against it. */
+    isSpell?: boolean;
 }
 /**
  * The shared combat-exchange engine, extracted from AttackCommand so spell

package/bundle/typescript/src/commands/game/sideQuest/utilities/combat-exchange.js

@@ -162,14 +162,26 @@ export class CombatExchange {
             freezeLines.push(`  ${c.name} FREEZES as it starts -- initiative halved this exchange.`);
             return Math.ceil(pool / 2);
         };
+        // RALLY (SR5e p.141-142, commands/lead.ts): a banked +score bonus,
+        // consumed on this contest -- initiative SCORE maps to hits here.
+        const rallyOf = (c) => {
+            const bonus = c.rallyInitBonus ?? 0;
+            if (bonus > 0)
+                c.rallyInitBonus = 0;
+            return bonus;
+        };
         const aggRoll = rollPool(initiativePool(aggressor));
         const defRoll = rollPool(initiativePool(defender));
-        const aggressorFirst = aggRoll.hits >= defRoll.hits;
+        const aggRally = rallyOf(aggressor);
+        const defRally = rallyOf(defender);
+        const aggHits = aggRoll.hits + aggRally;
+        const defHits = defRoll.hits + defRally;
+        const aggressorFirst = aggHits >= defHits;
         const first = aggressorFirst ? aggressor : defender;
         const second = aggressorFirst ? defender : aggressor;
-        const net = Math.abs(aggRoll.hits - defRoll.hits);
+        const net = Math.abs(aggHits - defHits);
         const extraStriker = net >= 3 ? first : null;
-        this.logger.write(`Initiative: ${aggressor.name} ${aggRoll.hits} vs ${defender.name} ${defRoll.hits} -- ${first.name} first${extraStriker ? ' with an extra strike' : ''}.`);
+        this.logger.write(`Initiative: ${aggressor.name} ${aggHits} vs ${defender.name} ${defHits} -- ${first.name} first${extraStriker ? ' with an extra strike' : ''}.`);
         // Readability split: the dice anatomy is Mechanics-ticker material
         // (metaLines); the world log keeps only what the player FEELS --
         // who froze, who moves first (lines). Callers rebuild AI-history
@@ -178,8 +190,8 @@ export class CombatExchange {
         // hard to read) -- each carries its own right-justified wave.
         const metaLines = [
             `Initiative:`,
-            `  ${aggressor.name}: ${formatRoll(aggRoll)}`,
-            `  ${defender.name}: ${formatRoll(defRoll)}`,
+            `  ${aggressor.name}: ${formatRoll(aggRoll)}${aggRally > 0 ? ` +${aggRally} rally` : ''}`,
+            `  ${defender.name}: ${formatRoll(defRoll)}${defRally > 0 ? ` +${defRally} rally` : ''}`,
         ];
         const lines = [
             ...freezeLines,
@@ -298,12 +310,25 @@ export class CombatExchange {
             strike.weaponItem.fireRound();
             this.logger.write(`${attacker.name} fired ${strike.weaponItem.name} (${strike.weaponItem.ammo} rounds left).`);
         }
-        const attack = rollPool(strike.pool);
-        const defense = rollPool(defender.getDefensePool());
+        // DIRECT / INSPIRE (SR5e p.141-142, commands/lead.ts): banked
+        // teamwork dice, consumed on this roll.
+        const directed = attacker.directedDice ?? 0;
+        if (directed > 0)
+            attacker.directedDice = 0;
+        const inspired = defender.inspiredGuardDice ?? 0;
+        if (inspired > 0)
+            defender.inspiredGuardDice = 0;
+        // COUNTERSPELLING (canon: the Awakened parry): only against spell
+        // strikes, only for a caster defender.
+        const counterspell = strike.isSpell && typeof defender.isCaster === 'function' && defender.isCaster()
+            ? defender.skillRating('counterspelling')
+            : 0;
+        const attack = rollPool(strike.pool + directed);
+        const defense = rollPool(defender.getDefensePool() + inspired + counterspell);
         const header = `${attacker.name} attacks ${defender.name} ${strike.label}`;
         meta.push(`${header}:`);
-        meta.push(`  Attack:  ${formatRoll(attack)}`);
-        meta.push(`  Defense: ${formatRoll(defense)}`);
+        meta.push(`  Attack:  ${formatRoll(attack)}${directed > 0 ? ` (+${directed} directed)` : ''}`);
+        meta.push(`  Defense: ${formatRoll(defense)}${inspired > 0 ? ` (+${inspired} inspired)` : ''}${counterspell > 0 ? ` (+${counterspell} counterspell)` : ''}`);
         const dryWarning = strike.weaponItem?.isFirearm() && strike.weaponItem.ammo === 0
             ? [`  ${attacker.name}'s ${strike.weaponItem.name} clicks empty -- that was the last round.`]
             : [];
@@ -480,6 +505,13 @@ export class CombatExchange {
         if (isPlayer) {
             const lines = [opts?.fallLine ?? `You collapse. The last thing you see is ${killer.name} standing over you.`];
             await this.announce(lines);
+            // DOCWAGON RESUSCITATION (SR5e p.450, Game.tryDocwagonRescue): the
+            // sanctioned carve-out to permadeath (player ruling) -- a contract
+            // holder's death is a billing event, not a game over. The rescue
+            // narrates, bills, and medevacs; we just don't end the game.
+            if ((opts?.fatal ?? true) && this.scene.ownerGame?.tryDocwagonRescue('resusc')) {
+                return ['', ...lines];
+            }
             // Same flow as kill.ts and a fatal bypass: freeze input, self-announce
             // so the reason stays on screen, and wait for ctrl-c ("You died!").
             const gameOverLine = opts?.gameOverLine ?? `💀 GAME OVER: ${fallen.name} was gunned down by ${killer.name}.`;