Merge pull request #5876 from jwarwick/macrophage

Fix Macrophage
mtgred · May 12, 2021 · 61a3dee · 61a3dee
2 parents 203a460 + bec537e
commit 61a3dee
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj
@@ -1545,18 +1545,13 @@
                                           (all-active-installed state :runner)))))})
 
 (defcard "Hailstorm"
-         {:subroutines [{:label  "Remove a card in the Heap from the game"
-                         :async  true
-                         :effect (effect (continue-ability
-                                           {:async   true
-                                            :req     (req (not (zone-locked? state :runner :discard)))
-                                            :prompt  "Choose a card in the Runner's Heap"
-                                            :choices (req (:discard runner))
-                                            :msg     (msg "remove " (:title target) " from the game")
-                                            :effect  (effect (move :runner target :rfg))
-                                            }
-                                           card nil))}
-                        end-the-run]})
+  {:subroutines [{:label  "Remove a card in the Heap from the game"
+                  :req     (req (not (zone-locked? state :runner :discard)))
+                  :prompt  "Choose a card in the Runner's Heap"
+                  :choices (req (cancellable (:discard runner) :sorted))
+                  :msg     (msg "remove " (:title target) " from the game")
+                  :effect  (effect (move :runner target :rfg))}
+                 end-the-run]})
 
 (defcard "Harvester"
   (let [sub {:label "Runner draws 3 cards and discards down to maximum hand size"
@@ -2125,16 +2120,12 @@
                                    :async   true
                                    :effect  (effect (clear-wait-prompt :runner)
                                                     (trash eid target {:cause :subroutine}))})
-                 (trace-ability 2 {:label  "Remove a virus in the Heap from the game"
-                                   :async  true
-                                   :effect (effect (continue-ability
-                                                     {:async   true
-                                                      :req     (req (not (zone-locked? state :runner :discard)))
-                                                      :prompt "Choose a virus in the Heap to remove from the game"
-                                                      :choices (req (cancellable (filter #(has-subtype? % "Virus") (:discard runner)) :sorted))
-                                                      :msg     (msg "remove " (:title target) " from the game")
-                                                      :effect  (effect (move :runner target :rfg))}
-                                                     card nil))})
+                 (trace-ability 2 {:label   "Remove a virus in the Heap from the game"
+                                   :req     (req (not (zone-locked? state :runner :discard)))
+                                   :prompt  "Choose a virus in the Heap to remove from the game"
+                                   :choices (req (cancellable (filter #(has-subtype? % "Virus") (:discard runner)) :sorted))
+                                   :msg     (msg "remove " (:title target) " from the game")
+                                   :effect  (effect (move :runner target :rfg))})
                  (trace-ability 1 end-the-run)]})
 
 (defcard "Magnet"