From c63bca47b478217c9838a7634fddabffed3fe522 Mon Sep 17 00:00:00 2001
From: Thorsten Ehlers <thorsten.ehlers@googlemail.com>
Date: Sat, 1 Feb 2025 16:13:41 +0100
Subject: [PATCH] Use `Timer` as property of `DiplopodHead` for immunity

---
 src/game.rs                  |  3 +--
 src/game/components.rs       | 10 ++++++++
 src/game/resources.rs        |  3 ---
 src/game/systems/control.rs  | 45 ++++++++++++++++++++++--------------
 src/game/systems/graphics.rs |  9 ++++----
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/game.rs b/src/game.rs
index d66f71a..1e4acd2 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -62,7 +62,7 @@ impl Plugin for GamePlugin {
                         .after(Phase::Movement)
                         .run_if(in_state(GameState::Game)),
                     (
-                        control::limit_immunity.run_if(on_timer(Duration::from_secs(1))),
+                        control::limit_immunity,
                         graphics::fade_text.run_if(on_timer(Duration::from_millis(200))),
                     )
                         .run_if(in_state(GameState::Game)),
@@ -92,7 +92,6 @@ impl Plugin for GamePlugin {
             .add_systems(OnExit(GameState::Game), despawn_screen::<OnGameScreen>)
             .insert_resource(DiplopodSegments::default())
             .insert_resource(LastSpecialSpawn::default())
-            .insert_resource(ImmunityTime::default())
             .insert_resource(FreePositions::new(CONSUMABLE_WIDTH, CONSUMABLE_HEIGHT))
             .insert_resource(Time::<Fixed>::from_seconds(0.075))
             .add_event::<GameOver>()
diff --git a/src/game/components.rs b/src/game/components.rs
index 5b19f4e..59b10f2 100644
--- a/src/game/components.rs
+++ b/src/game/components.rs
@@ -10,6 +10,16 @@ use super::DiplopodSegments;
 #[derive(Component)]
 pub struct DiplopodHead {
     pub direction: Vec2,
+    pub immunity: Timer,
+}
+
+impl Default for DiplopodHead {
+    fn default() -> Self {
+        Self {
+            direction: Vec2::ZERO,
+            immunity: Timer::from_seconds(0.0, TimerMode::Once),
+        }
+    }
 }
 
 #[derive(Component)]
diff --git a/src/game/resources.rs b/src/game/resources.rs
index 9718f32..016f6fd 100644
--- a/src/game/resources.rs
+++ b/src/game/resources.rs
@@ -60,9 +60,6 @@ impl FreePositions {
 #[derive(Default, Resource)]
 pub struct LastSpecialSpawn(pub u32);
 
-#[derive(Default, Resource)]
-pub struct ImmunityTime(pub u8);
-
 #[derive(Resource)]
 pub struct Sounds {
     pub eat_food: Handle<AudioSource>,
diff --git a/src/game/systems/control.rs b/src/game/systems/control.rs
index af88f55..7642aec 100644
--- a/src/game/systems/control.rs
+++ b/src/game/systems/control.rs
@@ -39,7 +39,17 @@ impl Command for SpawnDiplopodSegment {
                 .unwrap()
         };
 
-        let color = if world.resource::<ImmunityTime>().0 > 0 {
+        let immune = if is_head {
+            false
+        } else {
+            !world
+                .get::<DiplopodHead>(*segments.first().unwrap())
+                .unwrap()
+                .immunity
+                .finished()
+        };
+
+        let color = if immune {
             ANTIDOTE_COLOR
         } else {
             DIPLOPOD_COLOR
@@ -59,9 +69,7 @@ impl Command for SpawnDiplopodSegment {
         ));
 
         if is_head {
-            segment.insert(DiplopodHead {
-                direction: Vec2::ZERO,
-            });
+            segment.insert(DiplopodHead::default());
         }
     }
 }
@@ -417,13 +425,12 @@ pub fn eat(
     superfood_positions: Query<(Entity, &Position), With<Superfood>>,
     poison_positions: Query<(Entity, &Position), With<Poison>>,
     antidote_positions: Query<(Entity, &Position), With<Antidote>>,
-    head_positions: Query<&DiplopodPosition, With<DiplopodHead>>,
+    mut heads: Query<(&mut DiplopodHead, &DiplopodPosition)>,
     wall_positions: Query<(Entity, &Position), With<Wall>>,
     mut free_positions: ResMut<FreePositions>,
-    mut immunity_time: ResMut<ImmunityTime>,
     sounds: Res<Sounds>,
 ) {
-    for head_pos in head_positions.iter() {
+    for (mut head, head_pos) in heads.iter_mut() {
         for (ent, food_pos) in food_positions.iter() {
             if *food_pos == head_pos.to_position() {
                 commands.entity(ent).despawn();
@@ -472,7 +479,9 @@ pub fn eat(
             if *antidote_pos == head_pos.to_position() {
                 commands.entity(ent).despawn();
                 free_positions.positions.push(*antidote_pos);
-                immunity_time.0 += 10;
+
+                let remaining = head.immunity.remaining_secs();
+                head.immunity = Timer::from_seconds(10.0 + remaining, TimerMode::Once);
 
                 commands.spawn((
                     AudioPlayer(sounds.antidote.clone()),
@@ -485,7 +494,7 @@ pub fn eat(
 
         for (ent, poison_pos) in poison_positions.iter() {
             if *poison_pos == head_pos.to_position() {
-                if immunity_time.0 > 0 {
+                if !head.immunity.finished() {
                     commands.entity(ent).despawn();
                     free_positions.positions.push(*poison_pos);
                     free_positions.shuffle();
@@ -550,20 +559,24 @@ pub fn move_antidote(
     }
 }
 
-pub fn limit_immunity(mut immunity_time: ResMut<ImmunityTime>) {
-    if immunity_time.0 > 0 {
-        immunity_time.0 -= 1;
+pub fn limit_immunity(mut heads: Query<&mut DiplopodHead>, time: Res<Time>) {
+    let mut head = heads.single_mut();
+
+    if !head.immunity.finished() {
+        head.immunity.tick(time.delta());
     }
 }
 
 pub fn control_antidote_sound(
     mut commands: Commands,
-    immunity_time: Res<ImmunityTime>,
+    heads: Query<&DiplopodHead>,
     antidote_sound: Query<(&AudioSink, Entity), With<AntidoteSound>>,
 ) {
-    if immunity_time.0 > 2 {
+    let head = heads.single();
+
+    if head.immunity.remaining_secs() > 2.0 {
         // keep the sound
-    } else if immunity_time.0 > 0 {
+    } else if !head.immunity.finished() {
         if let Ok(sound) = antidote_sound.get_single() {
             sound.0.toggle();
         }
@@ -580,7 +593,6 @@ pub fn game_over(
     mut segments: ResMut<DiplopodSegments>,
     mut free_positions: ResMut<FreePositions>,
     mut last_special_spawn: ResMut<LastSpecialSpawn>,
-    mut immunity_time: ResMut<ImmunityTime>,
     sounds: Res<Sounds>,
     mut game_state: ResMut<NextState<GameState>>,
     mut lastscore: ResMut<Lastscore>,
@@ -601,7 +613,6 @@ pub fn game_over(
         free_positions.reset();
 
         last_special_spawn.0 = 0;
-        immunity_time.0 = 0;
 
         segments.0 = Vec::new();
 
diff --git a/src/game/systems/graphics.rs b/src/game/systems/graphics.rs
index cc88ebe..e318015 100644
--- a/src/game/systems/graphics.rs
+++ b/src/game/systems/graphics.rs
@@ -4,7 +4,6 @@ use bevy_prototype_lyon::prelude::*;
 
 use crate::game::components::*;
 use crate::game::events::ShowMessage;
-use crate::game::resources::ImmunityTime;
 use crate::game::OnGameScreen;
 use crate::prelude::*;
 
@@ -49,14 +48,16 @@ pub fn rotate_superfood(mut query: Query<&mut Transform, With<Superfood>>, time:
 
 pub fn change_color(
     mut query: Query<(&mut Fill, &mut Stroke), With<DiplopodSegment>>,
-    immunity_time: Res<ImmunityTime>,
+    heads: Query<&DiplopodHead>,
 ) {
-    if immunity_time.0 > 2 {
+    let head = heads.single();
+
+    if head.immunity.remaining_secs() > 2.0 {
         for (mut fill, mut stroke) in query.iter_mut() {
             fill.color = DIPLOPOD_IMMUNE_COLOR;
             stroke.color = DIPLOPOD_IMMUNE_COLOR;
         }
-    } else if immunity_time.0 > 0 {
+    } else if !head.immunity.finished() {
         for (mut fill, mut stroke) in query.iter_mut() {
             if fill.color == DIPLOPOD_IMMUNE_COLOR {
                 fill.color = DIPLOPOD_COLOR;