Skip to content

descent formats better, sanity checks for expend trashing face-up #8478

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

Draft
NBKelly wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

descent formats better, sanity checks for expend trashing face-up #8478

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
2 changes: 1 addition & 1 deletion src/clj/game/cards/ice.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
9 changes: 6 additions & 3 deletions test/clj/game/cards/ice_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Copy link
Contributor

@Cluedrew Cluedrew Jan 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not called Decent here.

(is (:seen (first (:discard (get-corp)))) "Trashed faceup")))

(deftest diviner
;; Diviner
Expand Down Expand Up @@ -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
Expand Down
Loading