extended play-with-prompt to take arbitrary number of options

mtgred · Feb 4, 2025 · bf790bc · bf790bc
1 parent 3b7cb97
commit bf790bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/test/clj/game/cards/programs_test.clj b/test/clj/game/cards/programs_test.clj
@@ -1840,7 +1840,7 @@
                  :runner {:hand ["Chisel"]}})
       (play-from-hand state :corp "Ice Wall" "HQ")
       (take-credits state :corp)
-      (play-from-hand-with-prompt state :runner "Chisel" "Ice Wall")
+      (play-from-hand-with-prompts state :runner "Chisel" "Ice Wall")
       (let [iw (get-ice state :hq 0)
             chisel (first (:hosted (refresh iw)))]
         (run-on state "HQ")
@@ -1890,7 +1890,7 @@
                  :runner {:hand ["Chisel" "Devil Charm"]}})
       (play-from-hand state :corp "Ice Wall" "HQ")
       (take-credits state :corp)
-      (play-from-hand-with-prompt state :runner "Chisel" "Ice Wall")
+      (play-from-hand-with-prompts state :runner "Chisel" "Ice Wall")
       (play-from-hand state :runner "Devil Charm")
       (let [iw (get-ice state :hq 0)
             chisel (first (:hosted (refresh iw)))]

diff --git a/test/clj/game/test_framework.clj b/test/clj/game/test_framework.clj
@@ -576,8 +576,8 @@
   ([state side title server]
    `(error-wrapper (play-from-hand-impl ~state ~side ~title ~server))))
 
-(defn play-from-hand-with-prompt-impl
-  [state side title choice]
+(defn play-from-hand-with-prompts-impl
+  [state side title choices]
   (let [card (find-card title (get-in @state [side :hand]))]
     (ensure-no-prompts state)
     (is' (some? card) (str title "is in hand"))
@@ -587,14 +587,14 @@
               (println title " was instead found in the opposing hand - was the wrong side used?")))
           true)
       (when-let [played (core/process-action "play" state side {:card card})]
-        (click-prompts state side choice)))))
+        (click-prompts-impl state side choices)))))
 
-(defmacro play-from-hand-with-prompt
-  "Play a card from hand based on it's title, and then click a prompt
+(defmacro play-from-hand-with-prompts
+  "Play a card from hand based on it's title, and then click any number of prompts
    accepts for prompt: a string, a fn, a card object"
   ([state side title] `(play-from-hand ~state ~side ~title nil))
-  ([state side title prompt]
-   `(error-wrapper (play-from-hand-with-prompt-impl ~state ~side ~title ~prompt))))
+  ([state side title & prompts]
+   `(error-wrapper (play-from-hand-with-prompts-impl ~state ~side ~title ~(vec prompts)))))
 
 ;;; Run functions
 (defn run-on-impl