Skip to content

Commit

Permalink
Merge pull request #4564 from NoahTheDuke/nb/catch-async-installs
Browse files Browse the repository at this point in the history 
Ensure all corp-install and runner-install calls are async
  • Loading branch information
@NoahTheDuke
NoahTheDuke authored Oct 16, 2019
2 parents e1dc01c + c111da7 commit 42147cd
Show file tree
Hide file tree
Showing 10 changed files with 388 additions and 299 deletions.
114 changes: 62 additions & 52 deletions src/clj/game/cards/agendas.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
:effect (effect (continue-ability
{:prompt "Install a card?"
:choices (filter corp-installable-type? (take 5 (:deck corp)))
:async true
:effect (effect (corp-install eid target nil
{:ignore-all-cost true
:install-state :rezzed-no-rez-cost}))
Expand Down Expand Up @@ -437,16 +438,16 @@
:choices {:req #(and (corp? %)
(not (operation? %))
(#{[:hand] [:discard]} (:zone %)))}
:effect (req (corp-install state side target server-name {:ignore-all-cost true})
(if (< n 2)
(continue-ability state side
(install-ability (last (get-remote-names state)) (inc n))
card nil)
(effect-completed state side eid)))
:msg (msg (corp-install-msg target)
(when (zero? n)
", creating a new remote server")
", ignoring all install costs")})]
", ignoring all install costs")
:async true
:effect (req (wait-for (corp-install state side target server-name {:ignore-all-cost true})
(continue-ability state side
(when (< n 2)
(install-ability (last (get-remote-names state)) (inc n)))
card nil)))})]
{:optional {:prompt "Install cards in a new remote server?"
:yes-ability (install-ability "New remote" 0)}})

Expand Down Expand Up @@ -781,6 +782,7 @@
(#{[:hand] [:discard]} (:zone %))
(corp? %))}
:msg (msg "install and rez " (:title target) ", ignoring all costs")
:async true
:effect (effect (corp-install eid target nil {:install-state :rezzed-no-cost}))}

"Mandatory Seed Replacement"
Expand Down Expand Up @@ -887,13 +889,13 @@
(corp? %)
(in-hand? %))}
:msg (msg "install a card from HQ"
(when (>= (get-counters (get-card state card) :advancement) 5)
(when (<= 5 (get-counters (get-card state card) :advancement))
" and rez it, ignoring all costs"))
:effect (req (if (>= (get-counters (get-card state card) :advancement) 5)
(do (corp-install state side target "New remote"
{:install-state :rezzed-no-cost})
(trigger-event state side :rez target))
(corp-install state side target "New remote")))}}}]}
:async true
:effect (effect (corp-install
eid target "New remote"
(when (<= 5 (get-counters (get-card state card) :advancement))
{:install-state :rezzed-no-cost})))}}}]}

"NEXT Wave 2"
{:not-when-scored true
Expand Down Expand Up @@ -1237,24 +1239,28 @@
:optional {:prompt "Search R&D for a piece of ice to install protecting a remote server?"
:yes-ability
{:async true
:effect (req (when (not-empty (filter ice? (:deck corp)))
(continue-ability
state side
{:async true
:prompt "Choose a piece of ice"
:choices (req (filter ice? (:deck corp)))
:effect (req (let [chosen-ice target]
(continue-ability
state side
{:async true
:prompt (str "Select a server to install " (:title chosen-ice) " on")
:choices (filter #(not (#{"HQ" "Archives" "R&D"} %))
(corp-install-list state chosen-ice))
:effect (effect (shuffle! :deck)
(corp-install eid chosen-ice target
{:install-state :rezzed-no-rez-cost}))}
card nil)))}
card nil)))}}}
:effect (effect
(continue-ability
(if (not-empty (filter ice? (:deck corp)))
{:async true
:prompt "Choose a piece of ice"
:choices (req (filter ice? (:deck corp)))
:effect (effect
(continue-ability
(let [chosen-ice target]
{:async true
:prompt (str "Select a server to install " (:title chosen-ice) " on")
:choices (filter #(not (#{"HQ" "Archives" "R&D"} %))
(corp-install-list state chosen-ice))
:effect (effect (shuffle! :deck)
(corp-install eid chosen-ice target
{:install-state :rezzed-no-rez-cost}))})
card nil))}
{:prompt "You have no ice in R&D"
:choices ["Carry on!"]
:prompt-type :bogus
:effect (effect (shuffle! :deck))})
card nil))}}}

"Research Grant"
{:interactive (req true)
Expand Down Expand Up @@ -1392,21 +1398,20 @@
:effect (effect (damage eid :net (inc (count-opp-stings state :runner)) {:card card}))}})

"Successful Field Test"
(letfn [(sft [n max] {:prompt "Select a card in HQ to install with Successful Field Test"
:priority -1
:async true
:choices {:req #(and (corp? %)
(not (operation? %))
(in-hand? %))}
:effect (req (wait-for
(corp-install state side target nil {:ignore-all-cost true})
(if (< n max)
(continue-ability state side (sft (inc n) max) card nil)
(effect-completed state side eid))))})]
(letfn [(sft [n max-ops]
{:prompt "Select a card in HQ to install with Successful Field Test"
:priority -1
:async true
:choices {:req #(and (corp? %)
(not (operation? %))
(in-hand? %))}
:effect (req (wait-for
(corp-install state side target nil {:ignore-all-cost true})
(continue-ability state side (when (< n max-ops) (sft (inc n) max-ops)) card nil)))})]
{:async true
:msg "install cards from HQ, ignoring all costs"
:effect (req (let [max (count (filter (complement operation?) (:hand corp)))]
(continue-ability state side (sft 1 max) card nil)))})
:effect (req (let [max-ops (count (filter (complement operation?) (:hand corp)))]
(continue-ability state side (sft 1 max-ops) card nil)))})

"Superior Cyberwalls"
(ice-boost-agenda "Barrier")
Expand Down Expand Up @@ -1460,26 +1465,31 @@
(:title target)
"ICE")
" from " (zone->name (:zone target)))
:async true
:effect (effect
(continue-ability
(let [chosen-ice target]
{:prompt "Choose a server"
:choices (req servers)
:async true
:effect (effect
(continue-ability
(let [chosen-server target
num-ice (count (get-in (:corp @state)
(conj (server->zone state target) :ices)))]
{:prompt "Which position to install in? (0 is innermost)"
:choices (vec (reverse (map str (range (inc num-ice)))))
:effect (req (corp-install state side chosen-ice chosen-server
{:ignore-all-cost true :index (Integer/parseInt target)})
(if (and run
(= (zone->name (first (:server run)))
chosen-server))
(let [curr-pos (get-in @state [:run :position])]
(if (>= curr-pos (Integer/parseInt target))
(swap! state assoc-in [:run :position] (inc curr-pos))))))})
:async true
:effect (req (wait-for (corp-install
state side chosen-ice chosen-server
{:ignore-all-cost true :index (Integer/parseInt target)})
(when (and run
(= (zone->name (first (:server run)))
chosen-server))
(let [curr-pos (get-in @state [:run :position])]
(when (>= curr-pos (Integer/parseInt target))
(swap! state assoc-in [:run :position] (inc curr-pos)))))
(effect-completed state side eid)))})
card nil))})
card nil))}]}

Expand Down
31 changes: 19 additions & 12 deletions src/clj/game/cards/assets.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
(corp? %))}
:msg (msg (corp-install-msg target))
:cost [:trash]
:effect (req (corp-install state side eid target nil nil))}]}
:effect (effect (corp-install eid target nil nil))}]}

"Aggressive Secretary"
(advance-ambush 2 {:req (req (pos? (get-counters (get-card state card) :advancement)))
Expand Down Expand Up @@ -247,7 +247,8 @@
(in-hand? %)
(corp? %))}
:cost [:trash]
:effect (effect (corp-install target nil))
:async true
:effect (effect (corp-install eid target nil nil))
:msg (msg (corp-install-msg target))}]}

"Blacklist"
Expand Down Expand Up @@ -776,7 +777,8 @@
(in-hand? %)
(corp? %))}
:msg "install and host an asset or agenda"
:effect (req (corp-install state side target card))}
:async true
:effect (effect (corp-install eid target card nil))}
{:label "Install a previously-installed asset or agenda on Full Immersion RecStudio (fixes only)"
:req (req (< (count (:hosted card)) 2))
:prompt "Select an installed asset or agenda to host on Full Immersion RecStudio"
Expand Down Expand Up @@ -1211,11 +1213,12 @@
" from R&D and "
(if (= (:type target) "Operation") "play" "install")
" it")
:async true
:effect (req (reveal state side target)
(shuffle! state side :deck)
(if (= (:type target) "Operation")
(play-instant state side target)
(corp-install state side target nil nil)))}]}
(if (operation? target)
(play-instant state side eid target nil)
(corp-install state side eid target nil nil)))}]}

"Mumbad Construction Co."
{:derezzed-events [corp-rez-toast]
Expand Down Expand Up @@ -1961,10 +1964,13 @@
:abilities [{:label "Install an asset from R&D"
:prompt "Choose an asset to install"
:msg (msg "install " (:title target))
:req (req (seq (filter asset? (:deck corp))))
:choices (req (filter asset? (:deck corp)))
:effect (effect (trash card)
(shuffle! :deck)
(corp-install target nil))}]}
:async true
:effect (req (wait-for (trash state side card nil)
(reveal state side target)
(shuffle! state side :deck)
(corp-install state side eid target nil nil)))}]}

"TechnoCo"
(letfn [(is-techno-target [card]
Expand Down Expand Up @@ -2196,9 +2202,10 @@
(in-hand? %)
(corp? %))}
:msg (msg "host " (:title target))
:effect (req (corp-install state side target card) ;; install target onto card
(rez state side eid (last (:hosted (get-card state card)))
{:cost-bonus -2}))}]}
:async true
:effect (req (wait-for (corp-install state side target card nil) ;; install target onto card
(rez state side eid (last (:hosted (get-card state card)))
{:cost-bonus -2})))}]}

"Zaibatsu Loyalty"
{:interactions {:prevent [{:type #{:expose}
Expand Down
Loading

0 comments on commit 42147cd

Please sign in to comment.