Enrich events with context available at creation time - #530
Merged
Conversation
player.draw! already calls move_to_hand! internally. The library size increase (7→14) is sufficient to prevent lose! firing during the draw step. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
CardDraw gains card, SpellCast gains x_value/flashback/targets, and EnteredTheBattlefield gains kicked. All fields were already in scope at their respective creation sites; adding them removes the need for handlers to query live game state after the event fires. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
fz-ryanbigg
approved these changes
Apr 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Several events were created with only the minimum data needed at the time, forcing ability handlers to query live game state after the fact. This PR adds fields that were already in scope at each event's creation site.
Events::CardDrawgainscard— theCardobject drawn from the libraryEvents::SpellCastgainsx_value,flashback?, andtargetsEvents::EnteredTheBattlefieldgainskicked?Events::DamageDealtis left unchanged — enriching it with post-prevention damage requires a damage-prevention tracking system that doesn't exist yet.All new fields have safe defaults so no existing call sites break. The changes are purely additive; no existing handler reads the new fields yet.
Test plan
🤖 Generated with Claude Code