Merge pull request #7968 from NBKelly/waiting-prompts-for-some-ice-subs

added waiting prompts to some subs, added CIGS checks for some too

Author: NBKelly

src/clj/game/cards/ice.clj

@@ -152,7 +152,7 @@
 (def end-the-run-if-tagged
   "ETR subroutine if tagged"
   {:label "End the run if the Runner is tagged"
-   :req (req tagged)
+   :change-in-game-state (req tagged)
    :msg "end the run"
    :async true
    :effect (effect (end-run :corp eid card))})
@@ -179,14 +179,9 @@
 (defn runner-pays
   "Ability to pay to avoid a subroutine by paying a resource"
   [cost]
-  {:async true
-   :effect (req (wait-for (pay state :runner (make-eid state eid) card cost)
-                          (when-let [payment-str (:msg async-result)]
-                            (system-msg state :runner
-                                        (str payment-str
-                                             " due to " (:title card)
-                                             " subroutine")))
-                          (effect-completed state side eid)))})
+  {:display-side :runner
+   :cost cost
+   :msg :cost})
 
 (defn end-the-run-unless-runner-pays
   ([cost] (end-the-run-unless-runner-pays cost "subroutine"))
@@ -333,7 +328,7 @@
 (def add-runner-card-to-grip
   "Add 1 installed Runner card to the grip"
   {:label "Add an installed Runner card to the grip"
-   :req (req (not-empty (all-installed state :runner)))
+   :change-in-game-state (req (seq (all-installed state :runner)))
    :waiting-prompt true
    :prompt "Choose a card"
    :choices {:card #(and (installed? %)
@@ -347,6 +342,8 @@
   {:prompt "Choose a program to trash"
    :label "Trash a program"
    :msg (msg "trash " (:title target))
+   :waiting-prompt true
+   :change-in-game-state (req (seq (filter program? (all-installed state :runner))))
    :choices {:card #(and (installed? %)
                          (program? %))}
    :async true
@@ -358,6 +355,8 @@
    :label "Force the Runner to trash a program"
    :msg (msg "force the runner to trash " (:title target))
    :display-side :corp
+   :waiting-prompt true
+   :change-in-game-state (req (seq (filter program? (all-installed state :runner))))
    :choices {:card #(and (installed? %)
                          (program? %))}
    :async true
@@ -370,6 +369,8 @@
    :msg (msg "trash " (:title target))
    :choices {:card #(and (installed? %)
                          (hardware? %))}
+   :waiting-prompt true
+   :change-in-game-state (req (seq (filter hardware? (all-installed state :runner))))
    :async true
    :effect (effect (trash eid target {:cause :subroutine}))})
 
@@ -379,6 +380,8 @@
    :msg (msg "trash " (:title target))
    :choices {:card #(and (installed? %)
                          (resource? %))}
+   :waiting-prompt true
+   :change-in-game-state (req (seq (filter resource? (all-installed state :runner))))
    :async true
    :effect (effect (trash eid target {:cause :subroutine}))})
 
@@ -387,6 +390,8 @@
    :prompt "Choose an installed card to trash"
    :label "Trash an installed Runner card"
    :msg (msg "trash " (:title target))
+   :waiting-prompt true
+   :change-in-game-state (req (seq (all-installed state :runner)))
    :choices {:card #(and (installed? %)
                          (runner? %))}
    :effect (effect (trash eid target {:cause :subroutine}))})

test/clj/game/cards/ice_test.clj

@@ -506,7 +506,7 @@
         (rez state :corp ansel)
         (run-continue state :encounter-ice)
         (fire-subs state (refresh ansel))
-        (click-prompt state :corp "Done")
+        ;;(click-prompt state :corp "Done")
         (click-prompt state :corp "Done")
         (is (last-log-contains? state "cannot steal or trash"))
         (run-continue-until state :success)
@@ -2374,7 +2374,7 @@
       (card-subroutine state :corp fc1 1)
       (is (= 1 (count (:choices (prompt-map :runner)))) "Only 1 choice in prompt")
       (click-prompt state :runner "Trash an installed card")
-      (click-prompt state :runner "Done"))))
+      (is (no-prompt? state :runner) "no lingering prompt"))))
 
 (deftest fairchild-2-0
   ;; Fairchild 2.0
@@ -8572,10 +8572,8 @@
       (fire-subs state win)
       (click-prompt state :corp "0")
       (click-prompt state :runner "0")
-      (click-prompt state :corp "Done")
       (click-prompt state :corp "0")
       (click-prompt state :runner "0")
-      (click-prompt state :corp "Done")
       (run-continue state :movement)
       (run-jack-out state)
       ;Click 2 - Install Aumakua
@@ -8718,6 +8716,4 @@
       (run-on state :hq)
       (run-continue state)
       (fire-subs state zed)
-      (click-prompt state :corp "Done")
-      (click-prompt state :corp "Done")
       (is (= 0 (:brain-damage (get-runner))) "Runner took 0 core damage"))))

test/clj/game/cards/programs_test.clj

@@ -7892,7 +7892,6 @@
           (fire-subs state (refresh ichi))
           (is (= :select (prompt-type :corp)) "Corp has a prompt to choose program to delete")
           (click-card state :corp "Sneakdoor Beta")
-          (click-prompt state :corp "Done")
           (is (= "Sneakdoor Beta" (-> (get-runner) :discard first :title)) "Sneakdoor was trashed")
           (click-prompt state :corp "0")
           (click-prompt state :runner "1")