Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/clj/game/core/installing.clj
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,7 @@
(corp-install-asset-agenda state side moved-card dest-zone server)
(wait-for
(corp-install-place-counters state side moved-card args)
(let [moved-card (get-card state moved-card)
eid (assoc eid :source moved-card)]
(let [moved-card (get-card state moved-card)]
(queue-event state :corp-install {:card (get-card state moved-card)
:install-state install-state})
(when-let [dre (:derezzed-events cdef)]
Expand Down Expand Up @@ -285,6 +284,7 @@
(checkpoint state nil (make-eid state eid))
(wait-for
(rez state side moved-card {:no-msg no-msg
:msg-keys (-> args :msg-keys :install-source)
:no-warning (:no-warning args)})
(reveal-if-unrezzed state side eid moved-card)))
:else
Expand Down Expand Up @@ -419,15 +419,16 @@
:index - which position for an installed piece of ice"
([state side eid card server] (corp-install state side eid card server nil))
([state side eid card server {:keys [host-card] :as args}]
(let [eid (assoc eid :source-type :corp-install)]
(let [eid (assoc eid :source-type :corp-install)
source (:source eid)]
(cond
;; No server selected; show prompt to select an install site (Interns, Lateral Growth, etc.)
(not server)
(continue-ability state side
{:prompt (str "Choose a location to install " (:title card))
:choices (installable-servers state card)
:async true
:effect (effect (corp-install state side eid card target args))}
:effect (effect (corp-install state side (assoc eid :source source) card target args))}
card nil)
;; A card was selected as the server; recurse, with the :host-card parameter set.
(and (map? server)
Expand Down
Loading