@maka/maka-cli 5.15.2 → 5.16.0

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

@@ -7,7 +7,7 @@ import { Door } from './models/door.js';
 import { SAVE_VERSION } from './types/save-file.js';
 import { serializePlayer, restorePlayer, captureHubOverlay, applyHubOverlay, writeSaveAtomic, deleteSave, restoreItem, readSave, serializeItem, saveSlug, } from './utilities/persistence.js';
 import { appendCrewLedger } from './utilities/crew-ledger.js';
-import { heartbeatPresence, ghostHireable, syncCrewLedger, claimGhostEarnings } from './utilities/social.js';
+import { heartbeatPresence, heartbeatPresenceNow, ghostHireable, syncCrewLedger, claimGhostEarnings } from './utilities/social.js';
 import { pushSave, burnCloudSaveFor } from './utilities/cloud-saves.js';
 import { DOCWAGON_TIERS, RESUSC_FEE, DEATH_COMP } from './utilities/docwagon.js';
 import { isFence, LIFESTYLE_TIERS } from './utilities/commerce.js';
@@ -224,10 +224,8 @@ export default class Game {
     // IS the hub (the run is nobody's business); silent no-op logged out.
     _presenceTimer;
     static PRESENCE_TICK_MS = 60_000;
-    beatPresence() {
-        if (!this.hasHub || this.scene !== this._hubScene)
-            return;
-        void heartbeatPresence({
+    presencePayload() {
+        return {
             playerName: this.player.name,
             slug: saveSlug(this.player.name),
             hubName: this._hubName,
@@ -237,7 +235,28 @@ export default class Game {
                 karma: this.player.careerKarma,
                 streetCred: this.player.streetCred,
             },
-        });
+        };
+    }
+    beatPresence() {
+        if (!this.hasHub || this.scene !== this._hubScene)
+            return;
+        void heartbeatPresence(this.presencePayload());
+        // The hub link rides the same pulse: a failed connect at boot must
+        // not mean dead party notifications all session (ensure() no-ops
+        // when already connected). Lazy import -- the server never loads
+        // the client module.
+        void import('./utilities/shared-run.js')
+            .then(m => { m.ensureHubLink(this); m.HubLink.reconcileSeats(this); })
+            .catch(() => undefined);
+    }
+    /**
+     * An IMMEDIATE presence beat that reports how it went -- the answer
+     * to "why can't my friend see me": the regular heartbeat is silent
+     * and up to 60s behind, so "crew players" and the hireable toggle
+     * push one right now and say so.
+     */
+    async pushPresenceNow() {
+        return heartbeatPresenceNow(this.presencePayload());
     }
     startPresenceHeartbeat() {
         if (this._presenceTimer)
@@ -300,6 +319,9 @@ export default class Game {
     spawnCrew() {
         const lines = [];
         for (const member of this.crew) {
+            // Friend invites ride LIVE or not at all -- never as AI shells.
+            if (member.ghost?.liveOnly)
+                continue;
             const shell = this.spawnCompanionShell({
                 name: member.name,
                 description: `${member.description} Right now they run as ${this.player.name}'s crew: they fight beside them, follow their lead, and expect their ${member.cutPct}% of the take.`,
@@ -348,6 +370,9 @@ export default class Game {
         const lines = [];
         const fallen = [];
         for (const member of this.crew) {
+            // Friend invites never spawned -- no shell is not a death.
+            if (member.ghost?.liveOnly)
+                continue;
             const entry = this.companions.find(c => c.kind === 'ally' && c.npc.name === member.name);
             if (!entry || entry.npc.deathClaimed) {
                 fallen.push(member.name);
@@ -391,13 +416,18 @@ export default class Game {
      * line (empty crew: full amount, no line).
      */
     applyCrewCut(gross) {
-        if (this.crew.length === 0 || gross <= 0)
+        // Friend invites take no cut (live runs pay the canon team split
+        // through payRunner) -- and an all-invite crew must not divide by
+        // its own zero.
+        const payable = this.crew.filter(m => m.cutPct > 0 && !m.ghost?.liveOnly);
+        if (payable.length === 0 || gross <= 0)
             return { share: gross, line: '' };
-        const totalPct = Math.min(60, this.crew.reduce((s, m) => s + m.cutPct, 0));
-        const scale = totalPct / this.crew.reduce((s, m) => s + m.cutPct, 0);
+        const sumPct = payable.reduce((s, m) => s + m.cutPct, 0);
+        const totalPct = Math.min(60, sumPct);
+        const scale = totalPct / sumPct;
         const parts = [];
         let taken = 0;
-        for (const member of this.crew) {
+        for (const member of payable) {
             const cut = Math.floor(gross * (member.cutPct * scale) / 100);
             taken += cut;
             parts.push(`${member.name} ${member.cutPct}% (${cut}¥)`);
@@ -435,6 +465,8 @@ export default class Game {
         const contract = this.docwagon;
         if (!contract || !this.initialized || this._dead)
             return false;
+        // (Solo path: THE player, THE contract, hub medevac. Shared runs use
+        // tryDocwagonRescueFor below -- per-player contracts, no hub.)
         const tier = DOCWAGON_TIERS[contract.tier];
         const logger = Logger.getInstance();
         const bills = [];
@@ -476,6 +508,76 @@ export default class Game {
         void this.docwagonMedevac();
         return true;
     }
+    // ---------------- DocWagon in SHARED runs (per-player, ruling:
+    // "full permadeath, but the doc wagon still works if purchased") ----
+    /** Each human player's contract, loaded from their own save doc by
+     *  the headless boot (their `save.game.docwagon`). Solo play never
+     *  touches this map -- the legacy single-contract path above is the
+     *  solo behavior, byte for byte. */
+    docwagonByPlayer = new Map();
+    /** Shared-run hook: a player's HTR extraction (stabilized and carried
+     *  off the job). The hosting server writes their snapshot back and
+     *  marks them 'left'. */
+    onPlayerExtracted;
+    /**
+     * The per-player band (shared runs -- scene.players.length > 1):
+     * resolves the FALLEN player's own contract, bills THAT player
+     * (whatever their stick holds; a guest's shortfall is DocWagon's
+     * collections problem, not the rent tab's), and either stabilizes
+     * them in place ('resusc') or extracts them from the session ('htr'
+     * -- the member-leave flow, via onPlayerExtracted). Returns true when
+     * the rescue engages -- the caller must then NOT kill them.
+     */
+    tryDocwagonRescueFor(player, kind, opts = {}) {
+        const contract = this.docwagonByPlayer.get(player.name);
+        if (!contract || !this.initialized)
+            return false;
+        const tier = DOCWAGON_TIERS[contract.tier];
+        const logger = Logger.getInstance();
+        const bills = [];
+        const billPlayer = (amount, label) => {
+            if (amount <= 0)
+                return '';
+            const paid = Math.min(player.currency, amount);
+            if (paid > 0)
+                player.adjustCurrency(-paid);
+            const owed = amount - paid;
+            return owed === 0
+                ? `DocWagon bills ${player.name} ${amount} for ${label}.`
+                : `DocWagon bills ${player.name} ${amount} for ${label} -- ${paid} paid, ${owed} on account (they WILL collect).`;
+        };
+        if (kind === 'resusc') {
+            if (contract.resuscsLeft > 0) {
+                contract.resuscsLeft -= 1;
+                bills.push(`A contract resuscitation is burned for ${player.name} -- ${contract.resuscsLeft} left this year.`);
+            }
+            else {
+                bills.push(billPlayer(RESUSC_FEE, 'resuscitation'));
+            }
+            player.healDamage(Math.max(0, player.damageTaken - (player.maxConditionBoxes - 2)));
+            player.healStun(Math.max(0, player.stunTaken - Math.max(0, player.maxStunBoxes - 2)));
+            logger.logWithColor(`${CALL_ICON} ${player.name}'s wristband SCREAMS the flatline. Ten minutes later there is foam, light, and a trauma team refusing to let go.`, CALL_COLOR);
+        }
+        else {
+            bills.push(billPlayer(tier.htrFee, 'High Threat Response'));
+            const hostiles = opts.standingHostiles ?? [];
+            if (hostiles.length > 0 && tier.deathComp) {
+                const casualtyRoll = rollPool(Math.min(4, hostiles.length));
+                if (casualtyRoll.hits > 0) {
+                    bills.push(billPlayer(DEATH_COMP, 'employee death compensation -- a medic did not make it out'));
+                }
+            }
+            player.healStun(Math.max(0, player.stunTaken - Math.max(0, player.maxStunBoxes - 2)));
+            logger.logWithColor(`${CALL_ICON} ${player.name}'s band reads the flatline and howls -- a DocWagon HTR team storms the scene and carries them out behind riot shields.`, CALL_COLOR);
+            // Extraction: off the job, alive, gear on the stretcher with them.
+            this.scene.removeActorQuietly(player.name);
+            this.onPlayerExtracted?.(player);
+        }
+        for (const b of bills.filter(Boolean))
+            logger.logWithColor(b, 'yellow');
+        this.scene.addWorldEvent(`A DocWagon team ${kind === 'htr' ? 'extracted' : 'resuscitated'} ${player.name} under the ${contract.tier} contract.`);
+        return true;
+    }
     /** Where the wagon drops you (player ruling: the CLINIC, not your own
      *  cot): the district Street Doc's room, generically -- so generated
      *  hubs work too. Falls back to the hideout if the hub has no doc. */
@@ -1328,6 +1430,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('lead', LeadCommand);
         CommandFactory.registerCommand('command', RecruitCommand);
         CommandFactory.registerCommand('crew', CrewCommand);
+        // "party" is the same table by another name (user vocabulary --
+        // "basic party operations").
+        CommandFactory.registerCommand('party', CrewCommand);
         CommandFactory.registerCommand('hire', HireCommand);
         CommandFactory.registerCommand('dismiss', DismissCommand);
         CommandFactory.registerCommand('train', TrainCommand);
@@ -1605,6 +1710,14 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             }
         }
         this.initialized = true;
+        // FIRST-BEAT SAVE (M4.5, from a real incident): a fresh character
+        // had no cloud copy until their first rest/quit, so a friend's
+        // party invite bounced with "no living runner". A hub session is
+        // party-loadable within moments of launch now -- requestSave pushes
+        // the cloud mirror behind the local write.
+        if (this._hubScene && this.scene === this._hubScene) {
+            this.requestSave('hub-arrival');
+        }
         if (this._resume) {
             const pendingNote = this._pendingRunSeed
                 ? hint(`\n\n${FIXER_NAME}'s job is still on offer: "${this._pendingRunSeed.name}". "call taxi" when you're ready, or "call ${FIXER_NAME}" to hear it again.`)
@@ -1878,7 +1991,8 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // then the wrapped-run tally and the training window reset.
         const crewLines = this.scene !== hub ? this.settleCrewAfterRun() : [];
         for (const member of this.crew) {
-            if (wrappedRun)
+            // Friend invites weren't on this local run -- no tally for them.
+            if (wrappedRun && !member.ghost?.liveOnly)
                 member.jobsRun += 1;
             member.trainedThisCycle = false;
         }
@@ -2030,11 +2144,18 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // down), and locally we keep only Krow's pitch stub so the whole
         // offer flow (his call, accept/decline, the taxi) works unchanged.
         // Offline owners fall back to the Phase B ghost riders below.
+        let sharedDeclineNote = '';
         if (this.hasHub) {
             const shared = await import('./utilities/shared-run.js')
                 .then(m => m.tryCreateSharedSession(this))
                 .catch(() => undefined);
-            if (shared) {
+            if (shared && 'declined' in shared) {
+                // The crew was invited but the table couldn't seat them -- the
+                // job drafts locally and KROW SAYS WHY (a real playtest lost a
+                // run to this being silent).
+                sharedDeclineNote = ` "Couldn't raise the whole crew -- ${shared.declined} This one's quoted without them."`;
+            }
+            else if (shared) {
                 this.pendingSharedRun = { sessionID: shared.sessionID };
                 this._pendingRunSeed = {
                     name: shared.pitch.name,
@@ -2068,7 +2189,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         //
         // The player object rides along so the job is drafted FOR this runner
         // -- their archetype, stats, and toolkit (see buildPlayerDossier).
-        const nextSeed = await SceneSeedGenerator.generate(this._logFilePath, nextTier, this.player, this.activeRumor, this.crew);
+        // Friend invites don't ride local drafts (they're live players or
+        // nothing) -- the dossier scales to who'll actually show.
+        const localCrew = this.crew.filter(m => !m.ghost?.liveOnly);
+        const nextSeed = await SceneSeedGenerator.generate(this._logFilePath, nextTier, this.player, this.activeRumor, localCrew);
         if (!nextSeed) {
             return `Incoming call -- ${FIXER_NAME}: "Job fell through, chummer. Client got cold feet before the ink dried. Give me another call in a bit -- I'll shake something loose."`;
         }
@@ -2082,7 +2206,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this._pendingRunTier = nextTier;
             this._pendingRide = Game.RIDE_POOL[Math.floor(Math.random() * Game.RIDE_POOL.length)];
             this.pendingRunAccepted = false;
-            return `Your link pings -- 1 new message: ${FIXER_NAME}.${hint(` ("call ${FIXER_NAME}" to hear the job.)`)}`;
+            return `Your link pings -- 1 new message: ${FIXER_NAME}.${sharedDeclineNote}${hint(` ("call ${FIXER_NAME}" to hear the job.)`)}`;
         }
         // Classic sessions transition immediately, hideout-first, as always.
         return await this.activateRunScene(nextSeed, nextTier, { startInHideout: true });
@@ -2925,7 +3049,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         { title: 'combat', entries: [['attack', 'kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['stance'], ['surrender'], ['edge'], ['rest']] },
         // The party layer: everyone who walks (or flies, or manifests) at
         // your side answers to these.
-        { title: 'party', entries: [['crew'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
+        { 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'], ['pan'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
         { title: 'social', entries: [['say'], ['talk-to'], ['call'], ['end-call', 'end', 'hangup'], ['accept'], ['decline', 'deny', 'refuse'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },