From 48df8274b310670f1a15c1850d158b9eb86fa901 Mon Sep 17 00:00:00 2001 From: NB Kelly Date: Fri, 2 Jan 2026 11:42:26 +1300 Subject: [PATCH] descent formats better, sanity checks for expend trashing face-up --- src/clj/game/cards/ice.clj | 2 +- test/clj/game/cards/ice_test.clj | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj index c214404603..5ee420c54a 100644 --- a/src/clj/game/cards/ice.clj +++ b/src/clj/game/cards/ice.clj @@ -2194,7 +2194,7 @@ :async true :show-discard true :effect (req (wait-for - (reveal-loud state side card {:and-then "shuffle [them] into R&D"} + (reveal-loud state side {:title "Descent"} {:and-then " and shuffle [them] into R&D"} targets) (doseq [c targets] (move state :corp c :deck)) diff --git a/test/clj/game/cards/ice_test.clj b/test/clj/game/cards/ice_test.clj index 0ac6a11f8a..170b87b7cc 100644 --- a/test/clj/game/cards/ice_test.clj +++ b/test/clj/game/cards/ice_test.clj @@ -2068,14 +2068,16 @@ (is (changed? [(count (:hand (get-corp))) 2] (click-prompt state :corp "Yes") (is (nil? (refresh (get-ice state :hq 0))))) - "Hangman returned to HQ + corp mandatory drew") + "Descent returned to HQ + corp mandatory drew") (expend state :corp (find-card "Descent" (:hand (get-corp)))) (is (changed? [(count (:hand (get-corp))) -1 (count (:discard (get-corp))) -1 (count (:deck (get-corp))) 2] (click-card state :corp "Ikawah Project") - (click-card state :corp "Project Atlas")) - "The 2 agendas are shuffled into R&D and Hangman is expended")))) + (click-card state :corp "Project Atlas") + (is (last-log-contains? state ".*uses Descent to reveal Ikawah Project from Archives and Project Atlas from HQ and.*"))) + "The 2 agendas are shuffled into R&D and Hangman is expended")) + (is (:seen (first (:discard (get-corp)))) "Trashed faceup"))) (deftest diviner ;; Diviner @@ -8214,6 +8216,7 @@ (click-card state :corp enigma)) "Enigma got 3 advancement counters") (is (= 4 (:credit (get-corp))) "Expend cost was payed") + (is (:seen (first (:discard (get-corp)))) "Expended faceup") (is (= 1 (count (:discard (get-corp)))) "Tree Line discarded as cost")))) (deftest tributary