Fix Heroic Sacrifice

crates/engine/src/game/ability_utils.rs

@@ -14948,6 +14948,7 @@ mod tests {
 
         let ability = ResolvedAbility::new(
             Effect::CreateDamageReplacement {
+                redirect_lifetime: crate::types::ability::RedirectionLifetime::OneOpportunity,
                 source_filter: Some(TargetFilter::SelfRef),
                 combat_scope: None,
                 target_filter: None,
@@ -15006,6 +15007,7 @@ mod tests {
 
         let ability = ResolvedAbility::new(
             Effect::CreateDamageReplacement {
+                redirect_lifetime: crate::types::ability::RedirectionLifetime::OneOpportunity,
                 source_filter: Some(TargetFilter::ChosenDamageSource { filter: None }),
                 combat_scope: None,
                 target_filter: None,
@@ -15058,6 +15060,7 @@ mod tests {
 
         let ability = ResolvedAbility::new(
             Effect::CreateDamageReplacement {
+                redirect_lifetime: crate::types::ability::RedirectionLifetime::OneOpportunity,
                 source_filter: Some(TargetFilter::SelfRef),
                 combat_scope: None,
                 target_filter: None,

crates/engine/src/game/coverage.rs

@@ -610,10 +610,21 @@ fn fmt_target(filter: &TargetFilter) -> String {
         TargetFilter::PostReplacementDamageSource => "prevented event's damage source".into(),
         TargetFilter::PostReplacementDamageTarget => "prevented damage target".into(),
         TargetFilter::PostReplacementDamageTargetOwner => "prevented damage target's owner".into(),
-        TargetFilter::ControllerAndControlledPermanents { permanent_type } => {
+        // CR 109.1: the "other" article is part of the human-readable scope — a
+        // change between "you and permanents you control" and "you and OTHER
+        // permanents you control" must be visible in the coverage/parse diff.
+        TargetFilter::ControllerAndControlledPermanents {
+            permanent_type,
+            source_scope,
+        } => {
+            let other = if source_scope.is_exclude() {
+                "other "
+            } else {
+                ""
+            };
             match permanent_type {
-                Some(ct) => format!("you and {ct:?}s you control"),
-                None => "you and permanents you control".into(),
+                Some(ct) => format!("you and {other}{ct:?}s you control"),
+                None => format!("you and {other}permanents you control"),
             }
         }
         TargetFilter::SpecificObject { id } => format!("object #{}", id.0),
@@ -3366,6 +3377,7 @@ fn effect_details(effect: &Effect) -> Vec<(String, String)> {
             target_filter,
             redirect_object_filter,
             recipient_object_filter,
+            redirect_lifetime,
             ..
         } => {
             if let Some(m) = modification {
@@ -3374,6 +3386,15 @@ fn effect_details(effect: &Effect) -> Vec<(String, String)> {
             if let Some(r) = redirect_to {
                 d.push(("redirect_to".into(), format!("{r:?}")));
             }
+            // CR 614.5 vs CR 611.2a: parser-alterable, and the difference between
+            // "protects one damage event" and "protects the rest of the turn" —
+            // omitting it would make that flip invisible to the parse diff.
+            if !redirect_lifetime.is_one_opportunity() {
+                d.push((
+                    "redirect_lifetime".into(),
+                    format!("{redirect_lifetime:?}"),
+                ));
+            }
             if let Some(a) = redirect_amount {
                 d.push(("redirect_amount".into(), format!("{a:?}")));
             }

crates/engine/src/game/effects/add_target_replacement.rs

@@ -2,7 +2,7 @@ use crate::game::targeting::{extract_source_from_event, resolve_event_context_ta
 use crate::types::ability::{
     AbilityDefinition, DamageTargetFilter, DamageTargetPlayerScope, Duration, Effect, EffectError,
     EffectKind, ReplacementCondition, ReplacementDefinition, ResolvedAbility, RestrictionExpiry,
-    TargetFilter, TargetRef,
+    SourceExclusion, TargetFilter, TargetRef,
 };
 use crate::types::events::GameEvent;
 use crate::types::game_state::GameState;
@@ -385,6 +385,10 @@ pub fn resolve(
                             Some(DamageTargetFilter::PlayerOrPermanentsControlledBy {
                                 player: DamageTargetPlayerScope::Specific(player),
                                 permanent_type: None,
+                                // CR 109.1: no "other" article in this class —
+                                // the granted shield covers every permanent the
+                                // targeted player controls.
+                                source_scope: SourceExclusion::Include,
                             });
                     }
                     state.pending_damage_replacements.push(replacement);
@@ -412,7 +416,8 @@ mod tests {
     use crate::game::zones::create_object;
     use crate::types::ability::{
         AbilityDefinition, DamageModification, DamageTargetPlayerScope, Duration,
-        ReplacementDefinition, RestrictionExpiry, TargetFilter, TypeFilter, TypedFilter,
+        ReplacementDefinition, RestrictionExpiry, SourceExclusion, TargetFilter, TypeFilter,
+        TypedFilter,
     };
     use crate::types::identifiers::{CardId, ObjectId};
     use crate::types::player::PlayerId;
@@ -662,6 +667,7 @@ mod tests {
             Some(DamageTargetFilter::PlayerOrPermanentsControlledBy {
                 player: DamageTargetPlayerScope::Specific(PlayerId(1)),
                 permanent_type: None,
+                source_scope: SourceExclusion::Include,
             })
         );
         assert_eq!(