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

Fix Jackpot triggering on forfeit #7207

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Fix Jackpot triggering on forfeit #7207

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
5 changes: 3 additions & 2 deletions src/clj/game/cards/resources.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
all-installed-runner card->server server->zone]]
[game.core.card :refer [agenda? asset? assoc-host-zones card-index corp?
event? facedown? get-agenda-points get-card get-counters
get-title get-zone hardware? has-subtype? ice? identity? in-discard? in-hand?
get-title get-zone hardware? has-subtype? ice? identity? in-discard? in-hand? in-scored?
installed? is-type? program? resource? rezzed? runner? upgrade? virus-program?]]
[game.core.card-defs :refer [card-def]]
[game.core.charge :refer [can-charge charge-ability]]
Expand Down Expand Up @@ -1698,7 +1698,8 @@
{:event :card-moved
:interactive (req true)
:optional
{:req (req (= :runner (:scored-side (second targets))))
{:req (req (and (in-scored? (second targets))
(= :runner (:scored-side (second targets)))))
:waiting-prompt true
:prompt (msg "Trash " (:title card) "?")
:yes-ability
Expand Down