@maka/maka-cli 5.71.0 → 5.73.0

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

@@ -1774,6 +1774,36 @@ export default class Game {
         this._pendingRide = undefined;
         this.pendingRunAccepted = false;
     }
+    /**
+     * EVERYTHING THAT BELONGS TO AN OFFER, RESET TOGETHER
+     * (8jZMqtXmxbLiACo3E: "I haven't pushed the number yet").
+     *
+     * An offer carries its own haggle window at the hub -- "call <fixer>"
+     * delivers it and `haggle` works on the spot. Push on one, decline
+     * it, hear the NEXT one, and nothing cleared the flag: not
+     * refreshEdge (departure only, and no ride was called), not
+     * returnToHub (no run to come home from). The first push on the new
+     * offer was then refused with "you already pushed on the number once
+     * this job" -- about a job the runner had turned down.
+     *
+     * THE THIRD HOLE IN ONE BOOLEAN, which is why this is a method and
+     * not another line at a call site. `haggledThisJob` had already been
+     * patched twice, each time for its own report and each time at the
+     * one site that report happened to name: returnToHub for
+     * d4yoYPcRAtWpLtm9y, the headless boot for the shared-run arrival.
+     * There are TWO places a fresh offer is installed -- the solo draft
+     * and the shared-run quote -- and both had the same gap, so a third
+     * per-site patch would have fixed one and left the other reporting
+     * the same sentence.
+     *
+     * NOT called from restoreFromSave, deliberately: a resumed pendingRun
+     * is the SAME offer, and clearing there would forget a push the
+     * runner really did make before they quit.
+     */
+    resetForNewOffer() {
+        this.pendingRunAccepted = false;
+        this.player.haggledThisJob = false;
+    }
     get pendingRun() {
         return this._pendingRunSeed;
     }
@@ -3237,7 +3267,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
                 // a server draft doesn't survive a quit).
                 this._pendingRunTier = undefined;
                 this._pendingRide = Game.RIDE_POOL[Math.floor(Math.random() * Game.RIDE_POOL.length)];
-                this.pendingRunAccepted = false;
+                this.resetForNewOffer();
                 // Off-street seat-mates were dropped from tonight's quote by the
                 // server (their seats survive -- back on the street, back on the
                 // job). Krow NAMES them; silence here already cost one playtest.
@@ -3334,7 +3364,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             this._pendingRunSeed = nextSeed;
             this._pendingRunTier = nextTier;
             this._pendingRide = Game.RIDE_POOL[Math.floor(Math.random() * Game.RIDE_POOL.length)];
-            this.pendingRunAccepted = false;
+            this.resetForNewOffer();
             return `Your link pings -- 1 new message: ${FIXER_NAME}.${sharedDeclineNote}${hint(` ("call ${FIXER_NAME}" to hear the job -- "jobs" shows the board.)`)}`;
         }
         // Classic sessions transition immediately, hideout-first, as always.