Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add system messages for Bacterial Programming and Spin Doctor #7396

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Add system messages for Bacterial Programming and Spin Doctor #7396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions src/clj/game/cards/agendas.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,14 +296,15 @@
(wait-for (trash-cards state :corp to-trash {:unpreventable true :cause-card card})
(doseq [h to-hq]
(move state :corp h :hand))
(if (seq remaining)
(continue-ability state :corp (reorder-choice :corp (vec remaining)) card nil)
(do (system-msg state :corp
(str "uses " (:title card)
" to add " (quantify (count to-hq) "card")
" to HQ, discard " (count to-trash)
", and arrange the top cards of R&D"))
(effect-completed state :corp eid))))
(do
(system-msg state :corp
(str "uses " (:title card)
" to trash " (quantify (count to-trash) "card")
", add " (quantify (count to-hq) "card")
" to HQ, and arrange the top " (quantify (- 7 (count to-trash) (count to-hq)) "card") " of R&D"))
(if (seq remaining)
(continue-ability state :corp (reorder-choice :corp (vec remaining)) card nil)
(effect-completed state :corp eid))))
(continue-ability state :corp (hq-step
(set/difference (set remaining) (set [target]))
to-trash
Expand Down
4 changes: 3 additions & 1 deletion src/clj/game/core/shuffling.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
:effect (req (doseq [c targets]
(move state side c :deck))
(shuffle! state side :deck))
:cancel-effect (req (shuffle! state side :deck))}
:cancel-effect (req
(system-msg state side (str " uses " (:title card) " to shuffle their deck"))
(shuffle! state side :deck))}
card nil)))

(defn shuffle-deck
Expand Down
Loading