Add Vigor

[mike-theDude]

Summary

Adds engine support for Vigor (#1417). Two parser bugs combined to break Vigor on both sides of its damage-prevention replacement: the recipient valid_card filter was silently dropped at the ", prevent" clause boundary, and the rider's "that creature" anaphor dangled at runtime because passive replacements have no parent target slot. A third latent bug in the put-counter-for-each suffix path ignored the documented inherits_parent subject-application contract.

Files changed

• crates/engine/src/parser/oracle_replacement.rs
• crates/engine/src/parser/oracle_effect/mod.rs

CR references

• CR 614.1a — replacement-effect application
• CR 615.5 — damage prevention
• CR 608.2c — object anaphor resolution ("that creature")

Track

Developer

LLM

Model: Claude Opus 4.7
Thinking level: high

Verification

• cargo fmt --all -- --check clean
• cargo test -p engine green, including the new vigor_event_recipient_filter_and_counter_target_rewrite unit test
• Sibling test prevention_counter_followup_uses_prevented_amount_repeat (Test of Faith, spell-driven ParentTarget path) still passes — the rewrite is correctly gated on recipient_is_event_filter = valid_card_filter.is_some()

Scope Expansion

Fix #3 (honoring SubjectApplication::inherits_parent in the put-counter-for-each suffix path) is a class-wide latent fix beyond Vigor. It corrects at least 5 other cards (Dig Deep, Grave Strength, Mask of the Schemer, Raffine / Scheming Seer, Spymaster's Vault) that previously parsed "that creature" as a broad Typed filter. The fix follows the canonical contract already documented at subject.rs:1100-1102, so this is honoring an existing contract rather than introducing new infrastructure.

Follow-up Notes

The recipient-terminator combinator change uses peek(tag(", prevent")) to keep the recipient filter bound through the same-sentence imperative shape. If future replacement clauses introduce a different post-recipient continuation (e.g. ", that damage is dealt to ..."), the terminator alt list will need a corresponding peek arm — flagged here for the next reviewer touching parse_damage_recipient_valid_card_filter.

[gemini-code-assist]

Code Review

This pull request updates the damage prevention replacement parser to correctly handle event-driven static prevention replacements (such as Vigor) by capturing whether the recipient filter is event-driven and rewriting dangling parent targets to post-replacement damage targets. Feedback from the review highlights a missing recursion into mode_abilities within the target rewrite helpers to support modal abilities, as well as a missing mandatory CR annotation on rules-touching code.

[gemini-code-assist]

[HIGH] Missing recursion into mode_abilities in target rewrite helpers. Evidence: crates/engine/src/parser/oracle_replacement.rs:4949-4961.
Why it matters: If a follow-up ability is modal, any ParentTarget inside its mode_abilities will not be rewritten, leaving them dangling in passive replacement contexts.
Suggested fix: Recurse into def.mode_abilities in rewrite_parent_target_to_post_replacement_damage_target (and apply the same fix to its siblings rewrite_parent_target_controller_to_post_replacement_source and rewrite_damage_recipient_to_post_replacement_target).

fn rewrite_parent_target_to_post_replacement_damage_target(def: &mut AbilityDefinition) {
    super::oracle_effect::each_target_filter_mut(&mut def.effect, &mut |f| {
        if matches!(f, TargetFilter::ParentTarget) {
            *f = TargetFilter::PostReplacementDamageTarget;
        }
    });
    if let Some(sub) = def.sub_ability.as_mut() {
        rewrite_parent_target_to_post_replacement_damage_target(sub);
    }
    if let Some(else_branch) = def.else_ability.as_mut() {
        rewrite_parent_target_to_post_replacement_damage_target(else_branch);
    }
    for mode in &mut def.mode_abilities {
        rewrite_parent_target_to_post_replacement_damage_target(mode);
    }
}

References

1. L2. Sibling coverage: If a fix landed in one site of a class, did the siblings need the same fix? Name them in the finding. ^(link)

[gemini-code-assist]

[MEDIUM] Missing mandatory CR annotation on rules-touching code. Evidence: crates/engine/src/parser/oracle_replacement.rs:4773-4778.
Why it matters: The style guide requires all rules-touching engine code to carry a verified CR <number>: <description> comment.
Suggested fix: Add CR 615.5 + CR 608.2c: to the comment.

    // CR 615.5 + CR 608.2c: Capture whether the recipient filter was event-driven (typed
    // `valid_card`) before moving it onto `def` — the follow-up rewrite
    // below uses this signal to distinguish the Vigor cohort (rewrite
    // `ParentTarget` → `PostReplacementDamageTarget`) from the spell-driven
    // cohort (keep `ParentTarget` for the real spell target).
    let recipient_is_event_filter = valid_card_filter.is_some();

References

1. R6. CR annotations are mandatory and verified: Every rules-touching line of engine code must carry a comment of the form CR : . ^(link)

[matthewevans]

Approved: Vigor fixed at the correct seam — lowers 'that creature' to ParentTarget in try_parse_for_each_effect (fixes the whole 'counter on that for each X' class) + peek(", prevent") boundary scopes the prevention shield. Grafted #1426's pipeline integration tests. CR-verified.