@maka/maka-cli 5.85.0 → 5.87.0

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

@@ -36,6 +36,7 @@ import { NPC } from './models/npc.js';
 import type { CompanionKind } from './models/npc.js';
 import { AutoFight } from './utilities/auto-fight.js';
 import { IMainGameConfig } from './ui.js';
+import type { RunType } from './factories/scene-chunks.js';
 import { PlayerEquipment } from './types/player-equipment.js';
 export default class Game {
     initialized: boolean;
@@ -928,7 +929,14 @@ export default class Game {
      * Public: called directly by call.ts when the player calls the fixer
      * after a job's done, not just from "continue" here in game.ts.
      */
-    draftNextSceneInBackground(): void;
+    /**
+     * `runType` forces the KIND of job drafted. Omitted, the generator
+     * rolls it as it always has (pickRunType: deck-gated, 30% data) --
+     * this parameter exists so a player who ASKS for data work gets data
+     * work (ruoedrMTA6kCRNmEN), and it changes nothing for every other
+     * caller, of which there are three.
+     */
+    draftNextSceneInBackground(runType?: RunType): void;
     /**
      * Drafts and loads the next job once the current scene's win condition
      * has been met. Reuses the same long-lived Player (and its inventory),
@@ -937,7 +945,7 @@ export default class Game {
      * canDraftNextScene() itself (callers are expected to check it first for
      * instant feedback, but this stays safe to call directly too).
      */
-    continueToNextScene(): Promise<string>;
+    continueToNextScene(runType?: RunType): Promise<string>;
     /**
      * Re-points the world at the preserved hub scene after a run: the hub's
      * whole state (NPCs, shop stock, anything dropped there) survived

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

@@ -2981,8 +2981,15 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * Public: called directly by call.ts when the player calls the fixer
      * after a job's done, not just from "continue" here in game.ts.
      */
-    draftNextSceneInBackground() {
-        void this.continueToNextScene()
+    /**
+     * `runType` forces the KIND of job drafted. Omitted, the generator
+     * rolls it as it always has (pickRunType: deck-gated, 30% data) --
+     * this parameter exists so a player who ASKS for data work gets data
+     * work (ruoedrMTA6kCRNmEN), and it changes nothing for every other
+     * caller, of which there are three.
+     */
+    draftNextSceneInBackground(runType) {
+        void this.continueToNextScene(runType)
             .then(nextJobText => {
             if (nextJobText) {
                 Logger.getInstance().logWithColor(`${CALL_ICON} ${nextJobText}`, CALL_COLOR);
@@ -3000,7 +3007,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * canDraftNextScene() itself (callers are expected to check it first for
      * instant feedback, but this stays safe to call directly too).
      */
-    async continueToNextScene() {
+    async continueToNextScene(runType) {
         // Hub sessions: a RUN doesn't chain into the next draft -- going
         // home is going home, and the next run is commissioned from there
         // (call the fixer). Deliberately NOT gated on completion: the taxi
@@ -3016,7 +3023,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         }
         this._draftInProgress = true;
         try {
-            return await this.draftNextScene();
+            return await this.draftNextScene(runType);
         }
         finally {
             this._draftInProgress = false;
@@ -3409,7 +3416,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * _draftInProgress -- every return path below (including the early
      * "couldn't draft" one) needs that cleanup to run.
      */
-    async draftNextScene() {
+    async draftNextScene(runType) {
         const nextTier = this._tier + 1;
         // Who the quote is FOR, snapshotted before any drafting starts. A live
         // seat accepted DURING the generation window (2-3 minutes of AI time)
@@ -3541,7 +3548,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // 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);
+        // runType rides the SAME generate() call rather than a parallel path
+        // -- one resolver. Undefined means "roll it", which is what every
+        // caller but the ask-for-data-work door passes.
+        const nextSeed = await SceneSeedGenerator.generate(this._logFilePath, nextTier, this.player, this.activeRumor, localCrew, undefined, runType);
         if (!nextSeed) {
             // NAME the cause when it's the PROVIDER, not luck (real session:
             // six Krow calls into an out-of-credits key, indistinguishable
@@ -3585,7 +3595,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             // so it only recurses while the party KEEPS changing.
             if (this.livePartyFingerprint() !== draftedForParty) {
                 Logger.getInstance().write(`Draft stale mid-generation (party "${draftedForParty}" -> "${this.livePartyFingerprint()}") -- redrafting.`);
-                return this.draftNextScene();
+                // The redraft keeps the KIND that was asked for -- a player who
+                // asked for data work and had the party shift under them still
+                // gets data work, not a silent downgrade to a rolled standard.
+                return this.draftNextScene(runType);
             }
             this._pendingRunSeed = nextSeed;
             this._pendingRunTier = nextTier;