Add system messages for Bacterial Programming and Spin Doctor

francescopellegrini · Apr 15, 2024 · 8bd9aa0 · 8bd9aa0
1 parent 9efa5ee
commit 8bd9aa0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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