Fix Frodo lifelink animation parsing

[mike-theDude]

Summary

Fixes Frodo, Sauron's Bane so its first activated ability parses the trailing lifelink grant in:

If Frodo is a Citizen, it becomes a Halfling Scout with base power and toughness 2/3 and lifelink.

The animation parser now preserves keyword text that appears after a fixed with base power and toughness N/N clause, so the exported continuous effect includes AddKeyword(Lifelink).

Fixes #952.

Files changed

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

CR references

• CR 608.2c
• CR 613.1d
• CR 613.1f

Track

Developer

Model: codex-5
Thinking: medium
Tier: Standard

Anchored on

• crates/engine/src/parser/oracle_effect/animation.rs:661 - existing animation keyword-tail extraction for with <keyword> clauses.
• crates/engine/src/parser/oracle_effect/token.rs:940 - existing shared keyword-list splitting and map_token_keyword delegation.

Gate A

./scripts/check-parser-combinators.sh

Output:

(no output; exit 0)

Verification

• cargo fmt --all
• cargo fmt --all -- --check
• ./scripts/check-parser-combinators.sh
• cargo test -p engine frodo_source_condition_preserves_lifelink_grant
• cargo test -p engine animation_base_pt_preserves_trailing_bare_keyword
• cargo clippy --all-targets -- -D warnings
• cargo test -p engine
• ./scripts/gen-card-data.sh

Notes

• ./scripts/gen-card-data.sh confirmed the regenerated Frodo export includes AddKeyword(Lifelink).

[gemini-code-assist]

Code Review

This pull request updates the animation parser in crates/engine/src/parser/oracle_effect/animation.rs to support parsing trailing keywords after a base power and toughness clause (e.g., "with base power and toughness 2/3 and lifelink"). It modifies split_animation_base_pt_clause to return parsed keywords and introduces helper functions to extract them, along with a corresponding unit test. The review feedback points out that the implementation relies on manual string parsing and splitting instead of idiomatic nom-based combinators, violating Rule R1. Additionally, the new rules-touching engine code lacks mandatory CR annotations as required by Rule R6.

[gemini-code-assist]

Avoid Manual String Parsing & Add CR Annotations

Avoid manual string splitting or verbatim string equality for parsing Oracle phrases, as it bypasses the robust nom-based parser and creates fragile matches. Instead, decompose compound phrases into modular, reusable parsers for constituent parts and compose them using idiomatic combinator aggregates (like nested alt and tag sequences) to prevent combinatorial explosion and improve maintainability.

Additionally, ensure that this rules-touching engine code carries the appropriate CR annotations (e.g., CR 613.1d and CR 613.1f) per Rule R6 of the repository style guide.

Suggested change

	fn split_animation_base_pt_clause(text: &str) -> Option<(&str, i32, i32, Vec<Keyword>)> {
	fn animation_base_pt_parser(input: &str) -> IResult<&str, (i32, i32, Vec<Keyword>)> {

References

1. Rule R6: Every rules-touching line of engine code must carry a comment of the form CR <number>: <description>. ^(link)
2. Avoid verbatim string equality for parsing Oracle phrases as it bypasses the robust nom-based parser and creates fragile matches. Instead, decompose compound phrases into modular, reusable parsers for constituent parts and compose them using idiomatic combinator aggregates.