Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions crates/engine/src/parser/oracle_trigger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9189,6 +9189,7 @@ fn try_parse_one_or_more_combat_damage_to_player(
def.damage_kind = DamageKindFilter::CombatOnly;
def.valid_source = Some(filter);
def.valid_target = Some(TargetFilter::Player);
def.batched = true;
return Some((TriggerMode::DamageDoneOnceByController, def));
}

Expand Down Expand Up @@ -13801,6 +13802,20 @@ mod tests {
))
);
assert_eq!(def.valid_target, Some(TargetFilter::Player));
assert!(
def.batched,
"one-or-more combat damage triggers are batched"
);
}

#[test]
fn grim_hireling_combat_damage_trigger_is_batched() {
let def = parse_trigger_line(
"Whenever one or more creatures you control deal combat damage to a player, create two Treasure tokens.",
"Grim Hireling",
);
assert_eq!(def.mode, TriggerMode::DamageDoneOnceByController);
assert!(def.batched);
}

#[test]
Expand Down
Loading