Skip to content
Closed
Show file tree
Hide file tree
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
21 changes: 17 additions & 4 deletions crates/engine/src/game/trigger_matchers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1684,8 +1684,13 @@ pub(super) fn match_cycled(
source_id: ObjectId,
state: &GameState,
) -> bool {
if let GameEvent::Cycled { object_id, .. } = event {
valid_card_matches(trigger, state, *object_id, source_id)
if let GameEvent::Cycled {
player_id,
object_id,
} = event
{
valid_player_matches(trigger, state, *player_id, source_id)
&& valid_card_matches(trigger, state, *object_id, source_id)
} else {
false
}
Expand All @@ -1700,8 +1705,16 @@ pub(super) fn match_cycled_or_discarded(
state: &GameState,
) -> bool {
match event {
GameEvent::Cycled { object_id, .. } | GameEvent::Discarded { object_id, .. } => {
valid_card_matches(trigger, state, *object_id, source_id)
GameEvent::Cycled {
player_id,
object_id,
}
| GameEvent::Discarded {
player_id,
object_id,
} => {
valid_player_matches(trigger, state, *player_id, source_id)
&& valid_card_matches(trigger, state, *object_id, source_id)
}
_ => false,
}
Expand Down
32 changes: 31 additions & 1 deletion crates/engine/src/parser/oracle_trigger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5814,7 +5814,15 @@ fn try_parse_player_trigger(lower: &str) -> Option<(TriggerMode, TriggerDefiniti
return Some((TriggerMode::Cycled, def));
}

if matches!(lower, "whenever you cycle a card" | "when you cycle a card") {
if matches!(
lower,
"whenever you cycle a card"
| "when you cycle a card"
| "whenever you cycle"
| "when you cycle"
| "whenever you cycle discard a card"
| "when you cycle discard a card"
) {
let mut def = make_base();
def.mode = TriggerMode::Cycled;
def.valid_target = Some(TargetFilter::Controller);
Expand Down Expand Up @@ -17876,4 +17884,26 @@ mod snapshot_tests {
);
}
}

#[test]
fn trigger_you_cycle() {
let def = parse_trigger_line(
"Whenever you cycle, ~ gets +1/+0 until end of turn.",
"Flameblade Adept",
);
assert_eq!(def.mode, TriggerMode::Cycled);
assert_eq!(def.valid_target, Some(TargetFilter::Controller));
assert!(def.valid_card.is_none());
}

#[test]
fn trigger_you_cycle_discard_a_card() {
let def = parse_trigger_line(
"Whenever you cycle discard a card, ~ gets +1/+0 until end of turn.",
"Flameblade Adept",
);
assert_eq!(def.mode, TriggerMode::Cycled);
assert_eq!(def.valid_target, Some(TargetFilter::Controller));
assert!(def.valid_card.is_none());
}
}