From b6284450872e0007edf6718fb29b1af63d61073f Mon Sep 17 00:00:00 2001 From: John Warwick Date: Sat, 8 May 2021 14:28:02 -0400 Subject: [PATCH 1/2] Fix Macrophage --- src/clj/game/cards/ice.clj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj index bad6766a12..bfc117b431 100644 --- a/src/clj/game/cards/ice.clj +++ b/src/clj/game/cards/ice.clj @@ -2128,8 +2128,7 @@ (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))) + {: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") From bec537e8b99d79e4b1153d5519d998de117cb098 Mon Sep 17 00:00:00 2001 From: John Warwick Date: Tue, 11 May 2021 14:36:28 -0400 Subject: [PATCH 2/2] Simplify Macrophage and Hailstorm --- src/clj/game/cards/ice.clj | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj index bfc117b431..250fe82404 100644 --- 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,15 +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 - {: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"