Skip to content

Daniella fix - #8759

Open
NBKelly wants to merge 9 commits into
mtgred:masterfrom
NBKelly:daniella-fix
Open

NBKelly wants to merge 9 commits into
mtgred:masterfrom
NBKelly:daniella-fix

Conversation

@NBKelly

@NBKelly NBKelly commented Jun 20, 2026 •

Copy link
Copy Markdown
Collaborator

This adds support for additional trash costs.

Daniella now applies one of these. This also adds support for hidden info in payment messages.

Closes #8754

@NBKelly
NBKelly marked this pull request as ready for review June 20, 2026 07:06
[game.utils :refer [enumerate-cards enumerate-str quantify same-card?]]))

(defn- can-forfeit? [card] (not (get-in card [:flags :cannot-forfeit])))
(defn- side-paid-msg [side] (keyword (str "paid/" (name side) "-msg")))

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

One of my goals with namespacing the keywords is to improve searching, so this should be explicit (even tho it's not "DRY"):

(if (= :corp side) :paid/corp-msg :paid/runner-msg)

@NoahTheDuke

Copy link
Copy Markdown
Collaborator

hmm actually, on second thought, i don't think we need the :paid/corp-msg stuff, my work in #8748 should cover that already. i really gotta finish that up, to stop blocking these other PRs.

@NoahTheDuke

Copy link
Copy Markdown
Collaborator

which is to say, the daniella fix is good, the engine changes shouldn't be necessary, but don't do anything just yet.

@NBKelly

NBKelly commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

Your changes will allow for payment messages (potentially) having hidden info?

That's the last block for side-specific messages before I can go through the old card pool and fix up all the old cards, and what I'm hoping to get here.

@NoahTheDuke

Copy link
Copy Markdown
Collaborator

sort of. the work i did converts all of the costs to use the new message maps, which includes the ability for side-dependent rendering, and i think we can put them there.


(defn- can-forfeit? [card] (not (get-in card [:flags :cannot-forfeit])))
(defn- side-paid-msg [side] (keyword (str "paid/" (name side) "-msg")))
(defn- side-zone [side zone]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There isn't a helper for this? It seems like there should be. (Yes, this is just a clean-up thing.)

@NoahTheDuke

Copy link
Copy Markdown
Collaborator

i've opened this PR locally and i'm making it work with #8748 and then i'll merge it locally and push, so you don't have to do anything extra.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug for Daniela Jorge Inácio & René “Loup” Arcemont: Party Animal

3 participants