From 8bd9aa04cf9ed3bd8b2d71746b5b039207cd9c67 Mon Sep 17 00:00:00 2001 From: Dylan Simmer Date: Tue, 16 Apr 2024 00:22:45 +1000 Subject: [PATCH] Add system messages for Bacterial Programming and Spin Doctor --- src/clj/game/cards/agendas.clj | 17 +++++++++-------- src/clj/game/core/shuffling.clj | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/clj/game/cards/agendas.clj b/src/clj/game/cards/agendas.clj index 431f51a10b..ffa484ba6a 100644 --- a/src/clj/game/cards/agendas.clj +++ b/src/clj/game/cards/agendas.clj @@ -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 diff --git a/src/clj/game/core/shuffling.clj b/src/clj/game/core/shuffling.clj index 254398fcd1..b81905e928 100644 --- a/src/clj/game/core/shuffling.clj +++ b/src/clj/game/core/shuffling.clj @@ -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