Merge pull request #8572 from filipesilva/issue-8569

fix: baker effect should work if trashed

Author: NBKelly

src/clj/game/core/choose_one.clj

@@ -26,7 +26,7 @@
            apply-optional (and optional (not next-optional))
            xs (if-not apply-optional xs (conj xs {:option "Done"}))
            base-map (select-keys args [:action :player :once :unregister-once-resolved :event
-                                       :label :change-in-game-state :location :additional-cost])
+                                       :label :change-in-game-state :location :additional-cost :duration])
            ;; is a choice payable
            payable? (fn [x state side eid card targets]
                       (when (or (not (:cost x))

test/clj/game/cards/programs_test.clj

@@ -1051,6 +1051,24 @@
     (click-prompt state :runner "End the run")
     (is (not (:run @state)) "Skunkworks fired on HQ approach")))
 
+(deftest baker-trashed-mid-run-8569
+  (do-game
+    (new-game {:runner {:hand ["Baker" "\"Knickknack\" O'Brian" "Mantle"]
+                        :credits 10}
+               :corp {:hand [(qty "Rashida Jaheem" 3)]
+                      :deck ["Hostile Takeover"]}})
+    (take-credits state :corp)
+    (play-from-hand state :runner "Baker")
+    (play-from-hand state :runner "\"Knickknack\" O'Brian")
+    (play-from-hand state :runner "Mantle")
+    (card-ability state :runner (get-program state 0) 0)
+    (click-card state :runner (get-program state 0))
+    (is (is-discard? state :runner ["Baker"]))
+    (run-continue-until state :success)
+    (click-prompt state :runner "Pay 1 [Credits]: Switch to HQ")
+    (click-card state :runner "Mantle")
+    (do-trash-prompt state 1)))
+
 (deftest bankroll
   ;; Bankroll - Includes check for Issue #4334
   (do-game