More binary prompts

src/clj/game/cards/assets.clj

@@ -1951,8 +1951,7 @@
 (defcard "Rex Campaign"
   (let [payout-ab {:prompt "Choose one"
                    :choices ["Remove 1 bad publicity" "Gain 5 [Credits]"]
-                   :msg (msg (if (= target "Remove 1 bad publicity")
-                               "remove 1 bad publicity" "gain 5 [Credits]"))
+                   :msg (msg "to " (decapitalize target))
                    :async true
                    :effect (req (if (= target "Remove 1 bad publicity")
                                   (lose-bad-publicity state side eid 1)

src/clj/game/cards/events.clj

@@ -2316,9 +2316,7 @@
    {:play-cost-bonus (req (- (get-link state)))
     :prompt "Choose one"
     :choices ["Gain 4 [Credits]" "Draw 4 cards"]
-    :msg (msg (if (= target "Gain 4 [Credits]")
-                "gain 4 [Credits]"
-                "draw 4 cards"))
+    :msg (msg "to " (decapitalize target))
     :async true
     :effect (req (if (= target "Gain 4 [Credits]")
                    (gain-credits state :runner eid 4)

src/clj/game/cards/ice.clj

@@ -2222,7 +2222,7 @@
                       :duration :end-of-run
                       :req (req (same-card? card target))
                       :value (:subtypes target)})
-                   (system-msg state :corp (str "chooses " (card-str state target) " for Loki's ability"))
+                   (system-msg state :corp (str "uses Loki to choose " (card-str state target)))
                    (doseq [sub (:subroutines target)]
                      (add-sub! state side (get-card state card) sub (:cid target) {:front true}))
                    (register-events
@@ -2232,28 +2232,23 @@
                          :unregister-once-resolved true
                          :req (req (get-card state card))
                          :effect (effect (remove-subs! (get-card state card) #(= cid (:from-cid %))))}]))))}
-   :subroutines [{:label "End the run unless the Runner shuffles their Grip into the Stack"
+   :subroutines [{:label "End the run unless the Runner shuffles the grip into the stack"
+                  :player :runner
                   :async true
-                  :effect (req (if (and (zero? (count (:hand runner)))
-                                        (< (count (:deck runner)) 2)) ; UFAQ 24
-                                 (do (system-msg state :corp (str "uses Loki to end the run"))
-                                     (end-run state side eid card))
-                                 (continue-ability
-                                   state :runner
-                                   {:optional
-                                    {:waiting-prompt "Runner to choose an option"
-                                     :prompt "Shuffle your Grip into the Stack?"
-                                     :player :runner
-                                     :yes-ability
-                                     {:effect (req (doseq [c (:hand runner)]
-                                                     (move state :runner c :deck))
-                                                   (shuffle! state :runner :deck)
-                                                   (system-msg state :runner "shuffles their Grip into their Stack"))}
-                                     :no-ability
-                                     {:async true
-                                      :effect (effect (system-msg :runner "declines to shuffle their Grip into their Stack")
-                                                      (end-run eid card))}}}
-                                   card nil)))}]})
+                  :prompt "Choose one"
+                  :choices (req [(when-not (and (zero? (count (:hand runner)))
+                                                (< (count (:deck runner)) 2)) ; UFAQ 24
+                                   "Shuffle the grip into the stack")
+                                 "End the run"])
+                  :msg (req (msg (if (= target "End the run")
+                                   "to "
+                                   "to force the Runner to ")
+                                 (decapitalize target)))
+                  :effect (req (if (= target "End the run")
+                                 (end-run state :corp eid card)
+                                 (do (doseq [c (:hand runner)]
+                                        (move state :runner c :deck))
+                                      (shuffle! state :runner :deck))))}]})
 
 (defcard "Loot Box"
   (letfn [(top-3 [state] (take 3 (get-in @state [:runner :deck])))

src/clj/game/cards/identities.clj

@@ -1662,9 +1662,7 @@
   (let [ab {:prompt "Choose one"
             :player :corp
             :choices ["Gain 2 [Credits]" "Draw 2 cards"]
-            :msg (msg (if (= target "Gain 2 [Credits]")
-                        "gain 2 [Credits]"
-                        "draw 2 cards"))
+            :msg (msg "to " (decapitalize target))
             :async true
             :interactive (req true)
             :effect (req (if (= target "Gain 2 [Credits]")

src/clj/game/cards/operations.clj

@@ -1607,25 +1607,20 @@
 (defcard "O₂ Shortage"
   {:on-play
    {:async true
-    :effect (req (if (empty? (:hand runner))
-                   (do (gain-clicks state :corp 2)
-                       (system-msg state side "uses O₂ Shortage to gain [Click][Click]")
-                       (effect-completed state side eid))
-                   (continue-ability
-                     state side
-                     {:optional
-                      {:waiting-prompt "Runner to make a decision"
-                       :prompt "Trash 1 random card from your Grip?"
-                       :player :runner
-                       :yes-ability {:async true
-                                     :effect (req (let [c (take 1 (shuffle (:hand runner)))]
-                                                    (system-msg state :corp
-                                                                (str "uses O₂ Shortage to trash "
-                                                                     (:title (first c)) " from the Runner's Grip"))
-                                                    (trash-cards state :runner eid c {:cause-card card :cause :forced-to-trash})))}
-                       :no-ability {:msg "gain [Click][Click]"
-                                    :effect (effect (gain-clicks :corp 2))}}}
-                     card nil)))}})
+    :player :runner
+    :waiting-prompt "Runner to make a decision"
+    :prompt "Choose one"
+    :choices (req [(when-not (empty? (:hand runner))
+                     "Trash 1 random card from the grip")
+                   "The Corp gains [Click][Click]"])
+    :msg (req (if (= target "The Corp gains [Click][Click]")
+                 "gain [Click][Click]"
+                 (msg "to force the Runner to " (decapitalize target))))
+    :effect (req (if (= target "The Corp gains [Click][Click]")
+                   (gain-clicks state :corp 2)
+                   (do (let [c (take 1 (shuffle (:hand runner)))]
+                         (trash-cards state :runner eid c {:cause-card card :cause :forced-to-trash})
+                         (effect-completed state side eid)))))}})
 
 (defcard "Observe and Destroy"
   {:on-play
@@ -2112,17 +2107,18 @@
 (defcard "Riot Suppression"
   {:on-play
    {:rfg-instead-of-trashing true
-    :optional
-    {:req (req (last-turn? state :runner :trashed-card))
-     :waiting-prompt "Runner to choose an option"
-     :prompt "Take 1 brain damage to prevent having 3 fewer clicks next turn?"
-     :player :runner
-     :yes-ability
-     {:async true
-      :effect (effect (system-msg "suffers 1 brain damage to prevent losing 3[Click] to Riot Suppression")
-                      (damage eid :brain 1 {:card card}))}
-     :no-ability {:msg "give the Runner 3 fewer [Click] next turn"
-                  :effect (req (swap! state update-in [:runner :extra-click-temp] (fnil #(- % 3) 0)))}}}})
+    :req (req (last-turn? state :runner :trashed-card))
+    :player :runner
+    :async true
+    :waiting-prompt "Runner to choose an option"
+    :prompt "Choose one"
+    :msg (msg "force the Runner to " (decapitalize target))
+    :choices ["Suffer 1 brain damage" "Get 3 fewer [Click] on the next turn"]
+    :effect (req (if (= target "Suffer 1 brain damage")
+                   (do (damage state :runner eid :brain 1 {:card card})
+                       (effect-completed state side eid))
+                   (do (swap! state update-in [:runner :extra-click-temp] (fnil #(- % 3) 0))
+                       (effect-completed state side eid))))}})
 
 (defcard "Rolling Brownout"
   {:on-play {:msg "increase the play cost of operations and events by 1 [Credits]"}

src/clj/game/cards/programs.clj

@@ -2270,9 +2270,7 @@
                                   {:prompt "Choose one"
                                    :choices ["Gain 3 [Credits]" "Draw 2 cards"]
                                    :async true
-                                   :msg (msg (if (= target "Draw 2 cards")
-                                               "draw 2 cards"
-                                               "gain 3 [Credits]"))
+                                   :msg (msg "to " (decapitalize target))
                                    :effect (req (if (= target "Draw 2 cards")
                                                   (draw state :runner eid 2)
                                                   (gain-credits state :runner eid 3)))}))