fix: energizers don't change dead (eyes) ghosts

Cargo.lock

@@ -598,11 +598,9 @@ dependencies = [
  "bitflags 2.9.1",
  "circular-buffer",
  "glam 0.30.5",
- "lazy_static",
  "libc",
  "micromap",
  "num-width",
- "once_cell",
  "parking_lot",
  "pathfinding",
  "phf",

Cargo.toml

@@ -9,16 +9,13 @@ edition = "2021"
 tracing = { version = "0.1.41", features = ["max_level_debug", "release_max_level_debug"]}
 tracing-error = "0.2.0"
 tracing-subscriber = {version = "0.3.17", features = ["env-filter"]}
-lazy_static = "1.5.0"
 sdl2 = { version = "0.38.0", features = ["image", "ttf"] }
 spin_sleep = "1.3.2"
 rand = { version = "0.9.2", default-features = false, features = ["small_rng", "os_rng"] }
 pathfinding = "4.14"
-once_cell = "1.21.3"
 thiserror = "2.0.14"
 anyhow = "1.0"
 glam = "0.30.5"
-serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
 smallvec = "1.15.1"
 strum = "0.27.2"
@@ -71,3 +68,6 @@ libc = "0.2.175"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 phf = { version = "0.12.1", features = ["macros"] }
+
+[package.metadata.cargo-machete]
+ignored = ["phf"]

build.rs

@@ -19,6 +19,15 @@ struct MapperFrame {
     height: u16,
 }
 
+impl MapperFrame {
+    fn to_u16vec2_format(self) -> String {
+        format!(
+            "MapperFrame {{ pos: glam::U16Vec2::new({}, {}), size: glam::U16Vec2::new({}, {}) }}",
+            self.x, self.y, self.width, self.height
+        )
+    }
+}
+
 fn main() {
     let path = Path::new(&env::var("OUT_DIR").unwrap()).join("atlas_data.rs");
     let mut file = BufWriter::new(File::create(&path).unwrap());
@@ -37,12 +46,7 @@ fn main() {
     .unwrap();
 
     for (name, frame) in atlas_mapper.frames {
-        writeln!(
+        writeln!(&mut file, "    \"{}\" => {},", name, frame.to_u16vec2_format()).unwrap();
-            &mut file,
-            "    \"{}\" => MapperFrame {{ x: {}, y: {}, width: {}, height: {} }},",
-            name, frame.x, frame.y, frame.width, frame.height
-        )
-        .unwrap();
     }
 
     writeln!(&mut file, "}};").unwrap();

src/constants.rs

@@ -30,6 +30,19 @@ pub const BOARD_CELL_OFFSET: UVec2 = UVec2::new(0, 3);
 /// Automatically calculated from the cell offset to maintain consistency
 /// when the cell size changes. Used for positioning sprites and debug overlays.
 pub const BOARD_PIXEL_OFFSET: UVec2 = UVec2::new(BOARD_CELL_OFFSET.x * CELL_SIZE, BOARD_CELL_OFFSET.y * CELL_SIZE);
+
+/// Animation timing constants for ghost state management
+pub mod animation {
+    /// Normal ghost movement animation speed (ticks per frame at 60 ticks/sec)
+    pub const GHOST_NORMAL_SPEED: u16 = 12;
+    /// Eaten ghost (eyes) animation speed (ticks per frame at 60 ticks/sec)
+    pub const GHOST_EATEN_SPEED: u16 = 6;
+    /// Frightened ghost animation speed (ticks per frame at 60 ticks/sec)
+    pub const GHOST_FRIGHTENED_SPEED: u16 = 12;
+
+    /// Time in ticks when frightened ghosts start flashing (2 seconds at 60 FPS)
+    pub const FRIGHTENED_FLASH_START_TICKS: u32 = 120;
+}
 /// The size of the canvas, in pixels.
 pub const CANVAS_SIZE: UVec2 = UVec2::new(
     (BOARD_CELL_SIZE.x + BOARD_CELL_OFFSET.x) * CELL_SIZE,

src/error.rs

@@ -78,9 +78,6 @@ pub enum ParseError {
 /// Errors related to texture operations.
 #[derive(thiserror::Error, Debug)]
 pub enum TextureError {
-    #[error("Animated texture error: {0}")]
-    Animated(#[from] AnimatedTextureError),
-
     #[error("Failed to load texture: {0}")]
     LoadFailed(String),
 
@@ -94,12 +91,6 @@ pub enum TextureError {
     RenderFailed(String),
 }
 
-#[derive(thiserror::Error, Debug)]
-pub enum AnimatedTextureError {
-    #[error("Frame duration must be positive, got {0}")]
-    InvalidFrameDuration(f32),
-}
-
 /// Errors related to entity operations.
 #[derive(thiserror::Error, Debug)]
 pub enum EntityError {

src/game.rs

@@ -2,39 +2,43 @@
 
 include!(concat!(env!("OUT_DIR"), "/atlas_data.rs"));
 
-use crate::constants::CANVAS_SIZE;
+use std::collections::HashMap;
+
+use crate::constants::{self, animation, MapTile, CANVAS_SIZE};
 use crate::error::{GameError, GameResult, TextureError};
 use crate::events::GameEvent;
 use crate::map::builder::Map;
 use crate::map::direction::Direction;
 use crate::systems::blinking::Blinking;
-use crate::systems::{self, ghost_collision_system};
+use crate::systems::components::{GhostAnimation, GhostState, LastAnimationState};
-
 use crate::systems::movement::{BufferedDirection, Position, Velocity};
 use crate::systems::profiling::SystemId;
 use crate::systems::render::RenderDirty;
+use crate::systems::{self, ghost_collision_system, present_system, Hidden, LinearAnimation, MovementModifiers, NodeId};
 use crate::systems::{
     audio_system, blinking_system, collision_system, debug_render_system, directional_render_system, dirty_render_system,
-    ghost_movement_system, hud_render_system, item_system, profile, render_system, AudioEvent, AudioResource, AudioState,
+    eaten_ghost_system, ghost_movement_system, ghost_state_system, hud_render_system, item_system, linear_render_system, profile,
-    BackbufferResource, Collider, DebugFontResource, DebugState, DebugTextureResource, DeltaTime, DirectionalAnimated,
+    render_system, AudioEvent, AudioResource, AudioState, BackbufferResource, Collider, DebugFontResource, DebugState,
-    EntityType, Frozen, Ghost, GhostBundle, GhostCollider, GlobalState, ItemBundle, ItemCollider, MapTextureResource,
+    DebugTextureResource, DeltaTime, DirectionalAnimation, EntityType, Frozen, Ghost, GhostAnimations, GhostBundle,
-    PacmanCollider, PlayerBundle, PlayerControlled, PlayerStateBundle, Renderable, ScoreResource, StartupSequence, SystemTimings,
+    GhostCollider, GlobalState, ItemBundle, ItemCollider, MapTextureResource, PacmanCollider, PlayerBundle, PlayerControlled,
+    Renderable, ScoreResource, StartupSequence, SystemTimings,
 };
-use crate::texture::animated::AnimatedTexture;
+use crate::texture::animated::{DirectionalTiles, TileSequence};
+use crate::texture::sprite::AtlasTile;
 use bevy_ecs::event::EventRegistry;
 use bevy_ecs::observer::Trigger;
-use bevy_ecs::schedule::{IntoScheduleConfigs, Schedule, SystemSet};
+use bevy_ecs::schedule::common_conditions::resource_changed;
-use bevy_ecs::system::{NonSendMut, Res, ResMut};
+use bevy_ecs::schedule::{Condition, IntoScheduleConfigs, Schedule, SystemSet};
+use bevy_ecs::system::ResMut;
 use bevy_ecs::world::World;
 use sdl2::image::LoadTexture;
-use sdl2::render::{Canvas, ScaleMode, TextureCreator};
+use sdl2::render::{BlendMode, Canvas, ScaleMode, TextureCreator};
 use sdl2::rwops::RWops;
 use sdl2::video::{Window, WindowContext};
 use sdl2::EventPump;
 
 use crate::{
     asset::{get_asset_bytes, Asset},
-    constants,
     events::GameCommand,
     map::render::MapRenderer,
     systems::input::{Bindings, CursorPosition},
@@ -81,14 +85,7 @@ impl Game {
         texture_creator: &'static mut TextureCreator<WindowContext>,
         event_pump: &'static mut EventPump,
     ) -> GameResult<Game> {
-        let mut world = World::default();
-        let mut schedule = Schedule::default();
         let ttf_context = Box::leak(Box::new(sdl2::ttf::init().map_err(|e| GameError::Sdl(e.to_string()))?));
-
-        EventRegistry::register_event::<GameError>(&mut world);
-        EventRegistry::register_event::<GameEvent>(&mut world);
-        EventRegistry::register_event::<AudioEvent>(&mut world);
-
         let mut backbuffer = texture_creator
             .create_texture_target(None, CANVAS_SIZE.x, CANVAS_SIZE.y)
             .map_err(|e| GameError::Sdl(e.to_string()))?;
@@ -104,6 +101,9 @@ impl Game {
         let mut debug_texture = texture_creator
             .create_texture_target(None, output_size.0, output_size.1)
             .map_err(|e| GameError::Sdl(e.to_string()))?;
+
+        // Debug texture is copied over the backbuffer, it requires transparency abilities
+        debug_texture.set_blend_mode(BlendMode::Blend);
         debug_texture.set_scale_mode(ScaleMode::Nearest);
 
         let font_data = get_asset_bytes(Asset::Font)?;
@@ -149,51 +149,81 @@ impl Game {
             .map_err(|e| GameError::Sdl(e.to_string()))?;
 
         let map = Map::new(constants::RAW_BOARD)?;
-        let pacman_start_node = map.start_positions.pacman;
 
-        let mut textures = [None, None, None, None];
+        // Create directional animated textures for Pac-Man
-        let mut stopped_textures = [None, None, None, None];
+        let up_moving_tiles = [
-
+            SpriteAtlas::get_tile(&atlas, "pacman/up_a.png")
-        for direction in Direction::DIRECTIONS {
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/up_a.png".to_string())))?,
-            let moving_prefix = match direction {
+            SpriteAtlas::get_tile(&atlas, "pacman/up_b.png")
-                Direction::Up => "pacman/up",
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/up_b.png".to_string())))?,
-                Direction::Down => "pacman/down",
+            SpriteAtlas::get_tile(&atlas, "pacman/full.png")
-                Direction::Left => "pacman/left",
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
-                Direction::Right => "pacman/right",
+        ];
-            };
+        let down_moving_tiles = [
-            let moving_tiles = vec![
+            SpriteAtlas::get_tile(&atlas, "pacman/down_a.png")
-                SpriteAtlas::get_tile(&atlas, &format!("{moving_prefix}_a.png"))
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/down_a.png".to_string())))?,
-                    .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_a.png"))))?,
+            SpriteAtlas::get_tile(&atlas, "pacman/down_b.png")
-                SpriteAtlas::get_tile(&atlas, &format!("{moving_prefix}_b.png"))
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/down_b.png".to_string())))?,
-                    .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?,
+            SpriteAtlas::get_tile(&atlas, "pacman/full.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
+        ];
+        let left_moving_tiles = [
+            SpriteAtlas::get_tile(&atlas, "pacman/left_a.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/left_a.png".to_string())))?,
+            SpriteAtlas::get_tile(&atlas, "pacman/left_b.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/left_b.png".to_string())))?,
+            SpriteAtlas::get_tile(&atlas, "pacman/full.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
+        ];
+        let right_moving_tiles = [
+            SpriteAtlas::get_tile(&atlas, "pacman/right_a.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/right_a.png".to_string())))?,
+            SpriteAtlas::get_tile(&atlas, "pacman/right_b.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/right_b.png".to_string())))?,
             SpriteAtlas::get_tile(&atlas, "pacman/full.png")
                 .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
         ];
 
-            let stopped_tiles = vec![SpriteAtlas::get_tile(&atlas, &format!("{moving_prefix}_b.png"))
+        let moving_tiles = DirectionalTiles::new(
-                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?];
+            TileSequence::new(&up_moving_tiles),
+            TileSequence::new(&down_moving_tiles),
+            TileSequence::new(&left_moving_tiles),
+            TileSequence::new(&right_moving_tiles),
+        );
 
-            textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.08)?);
+        let up_stopped_tile = SpriteAtlas::get_tile(&atlas, "pacman/up_b.png")
-            stopped_textures[direction.as_usize()] = Some(AnimatedTexture::new(stopped_tiles, 0.1)?);
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/up_b.png".to_string())))?;
-        }
+        let down_stopped_tile = SpriteAtlas::get_tile(&atlas, "pacman/down_b.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/down_b.png".to_string())))?;
+        let left_stopped_tile = SpriteAtlas::get_tile(&atlas, "pacman/left_b.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/left_b.png".to_string())))?;
+        let right_stopped_tile = SpriteAtlas::get_tile(&atlas, "pacman/right_b.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/right_b.png".to_string())))?;
+
+        let stopped_tiles = DirectionalTiles::new(
+            TileSequence::new(&[up_stopped_tile]),
+            TileSequence::new(&[down_stopped_tile]),
+            TileSequence::new(&[left_stopped_tile]),
+            TileSequence::new(&[right_stopped_tile]),
+        );
 
         let player = PlayerBundle {
             player: PlayerControlled,
-            position: Position::Stopped { node: pacman_start_node },
+            position: Position::Stopped {
+                node: map.start_positions.pacman,
+            },
             velocity: Velocity {
                 speed: 1.15,
                 direction: Direction::Left,
             },
+            movement_modifiers: MovementModifiers::default(),
             buffered_direction: BufferedDirection::None,
             sprite: Renderable {
                 sprite: SpriteAtlas::get_tile(&atlas, "pacman/full.png")
                     .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("pacman/full.png".to_string())))?,
                 layer: 0,
             },
-            directional_animated: DirectionalAnimated {
+            directional_animation: DirectionalAnimation::new(moving_tiles, stopped_tiles, 5),
-                textures,
-                stopped_textures,
-            },
             entity_type: EntityType::Player,
             collider: Collider {
                 size: constants::CELL_SIZE as f32 * 1.375,
@@ -201,20 +231,14 @@ impl Game {
             pacman_collider: PacmanCollider,
         };
 
-        // Spawn player and attach initial state bundle
+        let mut world = World::default();
-        let player_entity = world.spawn(player).id();
+        let mut schedule = Schedule::default();
-        world.entity_mut(player_entity).insert(PlayerStateBundle::default());
-        world.entity_mut(player_entity).insert(Frozen);
 
-        world.insert_non_send_resource(atlas);
+        EventRegistry::register_event::<GameError>(&mut world);
-        world.insert_non_send_resource(event_pump);
+        EventRegistry::register_event::<GameEvent>(&mut world);
-        world.insert_non_send_resource(canvas);
+        EventRegistry::register_event::<AudioEvent>(&mut world);
-        world.insert_non_send_resource(BackbufferResource(backbuffer));
-        world.insert_non_send_resource(MapTextureResource(map_texture));
-        world.insert_non_send_resource(DebugTextureResource(debug_texture));
-        world.insert_non_send_resource(DebugFontResource(debug_font));
-        world.insert_non_send_resource(AudioResource(audio));
 
+        world.insert_resource(Self::create_ghost_animations(&atlas)?);
         world.insert_resource(map);
         world.insert_resource(GlobalState { exit: false });
         world.insert_resource(ScoreResource(0));
@@ -225,6 +249,16 @@ impl Game {
         world.insert_resource(DebugState::default());
         world.insert_resource(AudioState::default());
         world.insert_resource(CursorPosition::default());
+        world.insert_resource(StartupSequence::new(60 * 3, 60));
+
+        world.insert_non_send_resource(atlas);
+        world.insert_non_send_resource(event_pump);
+        world.insert_non_send_resource(canvas);
+        world.insert_non_send_resource(BackbufferResource(backbuffer));
+        world.insert_non_send_resource(MapTextureResource(map_texture));
+        world.insert_non_send_resource(DebugTextureResource(debug_texture));
+        world.insert_non_send_resource(DebugFontResource(debug_font));
+        world.insert_non_send_resource(AudioResource(audio));
 
         world.add_observer(
             |event: Trigger<GameEvent>, mut state: ResMut<GlobalState>, _score: ResMut<ScoreResource>| {
@@ -242,31 +276,25 @@ impl Game {
         let ghost_movement_system = profile(SystemId::Ghost, ghost_movement_system);
         let collision_system = profile(SystemId::Collision, collision_system);
         let ghost_collision_system = profile(SystemId::GhostCollision, ghost_collision_system);
-        let vulnerable_tick_system = profile(SystemId::Ghost, systems::vulnerable_tick_system);
+
         let item_system = profile(SystemId::Item, item_system);
         let audio_system = profile(SystemId::Audio, audio_system);
         let blinking_system = profile(SystemId::Blinking, blinking_system);
         let directional_render_system = profile(SystemId::DirectionalRender, directional_render_system);
+        let linear_render_system = profile(SystemId::LinearRender, linear_render_system);
         let dirty_render_system = profile(SystemId::DirtyRender, dirty_render_system);
-        let hud_render_system = profile(SystemId::HudRender, hud_render_system);
         let render_system = profile(SystemId::Render, render_system);
+        let hud_render_system = profile(SystemId::HudRender, hud_render_system);
         let debug_render_system = profile(SystemId::DebugRender, debug_render_system);
+        let present_system = profile(SystemId::Present, present_system);
+        let unified_ghost_state_system = profile(SystemId::GhostStateAnimation, ghost_state_system);
 
-        let present_system = profile(
+        let forced_dirty_system = |mut dirty: ResMut<RenderDirty>| {
-            SystemId::Present,
+            dirty.0 = true;
-            |mut canvas: NonSendMut<&mut Canvas<Window>>, debug_state: Res<DebugState>, mut dirty: ResMut<RenderDirty>| {
+        };
-                if dirty.0 || debug_state.enabled {
-                    // Only copy backbuffer to main canvas if debug rendering is off
-                    // (debug rendering draws directly to main canvas)
-                    if !debug_state.enabled {
-                        canvas.present();
-                    }
-                    dirty.0 = false;
-                }
-            },
-        );
 
         schedule.add_systems((
+            forced_dirty_system.run_if(resource_changed::<ScoreResource>.or(resource_changed::<StartupSequence>)),
             (
                 input_system,
                 player_control_system,
@@ -276,12 +304,14 @@ impl Game {
                 .chain(),
             player_tunnel_slowdown_system,
             ghost_movement_system,
-            vulnerable_tick_system,
+            profile(SystemId::EatenGhost, eaten_ghost_system),
+            unified_ghost_state_system,
             (collision_system, ghost_collision_system, item_system).chain(),
             audio_system,
             blinking_system,
             (
                 directional_render_system,
+                linear_render_system,
                 dirty_render_system,
                 render_system,
                 hud_render_system,
@@ -291,41 +321,46 @@ impl Game {
                 .chain(),
         ));
 
-        world.insert_resource(StartupSequence::new(60 * 3, 60));
+        // Spawn player and attach initial state bundle
+        world.spawn(player).insert((Frozen, Hidden));
 
         // Spawn ghosts
         Self::spawn_ghosts(&mut world)?;
 
-        // Spawn items
         let pellet_sprite = SpriteAtlas::get_tile(world.non_send_resource::<SpriteAtlas>(), "maze/pellet.png")
             .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("maze/pellet.png".to_string())))?;
         let energizer_sprite = SpriteAtlas::get_tile(world.non_send_resource::<SpriteAtlas>(), "maze/energizer.png")
             .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("maze/energizer.png".to_string())))?;
 
-        let nodes: Vec<_> = world.resource::<Map>().iter_nodes().map(|(id, tile)| (*id, *tile)).collect();
+        // Build a list of item entities to spawn from the map
-
+        let nodes: Vec<(NodeId, EntityType, AtlasTile, f32)> = world
-        for (node_id, tile) in nodes {
+            .resource::<Map>()
-            let (item_type, sprite, size) = match tile {
+            .iter_nodes()
-                crate::constants::MapTile::Pellet => (EntityType::Pellet, pellet_sprite, constants::CELL_SIZE as f32 * 0.4),
+            .filter_map(|(id, tile)| match tile {
-                crate::constants::MapTile::PowerPellet => {
+                MapTile::Pellet => Some((*id, EntityType::Pellet, pellet_sprite, constants::CELL_SIZE as f32 * 0.4)),
-                    (EntityType::PowerPellet, energizer_sprite, constants::CELL_SIZE as f32 * 0.95)
+                MapTile::PowerPellet => Some((
-                }
+                    *id,
-                _ => continue,
+                    EntityType::PowerPellet,
-            };
+                    energizer_sprite,
+                    constants::CELL_SIZE as f32 * 0.95,
+                )),
+                _ => None,
+            })
+            .collect();
 
+        // Construct and spawn the item entities
+        for (id, item_type, sprite, size) in nodes {
             let mut item = world.spawn(ItemBundle {
-                position: Position::Stopped { node: node_id },
+                position: Position::Stopped { node: id },
                 sprite: Renderable { sprite, layer: 1 },
                 entity_type: item_type,
                 collider: Collider { size },
                 item_collider: ItemCollider,
             });
 
+            // Make power pellets blink
             if item_type == EntityType::PowerPellet {
-                item.insert(Blinking {
+                item.insert((Frozen, Blinking::new(0.2)));
-                    timer: 0.0,
-                    interval: 0.2,
-                });
             }
         }
 
@@ -353,58 +388,9 @@ impl Game {
         for (ghost_type, start_node) in ghost_start_positions {
             // Create the ghost bundle in a separate scope to manage borrows
             let ghost = {
+                let animations = *world.resource::<GhostAnimations>().get_normal(&ghost_type).unwrap();
                 let atlas = world.non_send_resource::<SpriteAtlas>();
 
-                // Create directional animated textures for the ghost
-                let mut textures = [None, None, None, None];
-                let mut stopped_textures = [None, None, None, None];
-
-                for direction in Direction::DIRECTIONS {
-                    let moving_prefix = match direction {
-                        Direction::Up => "up",
-                        Direction::Down => "down",
-                        Direction::Left => "left",
-                        Direction::Right => "right",
-                    };
-
-                    let moving_tiles = vec![
-                        SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "a"))
-                            .ok_or_else(|| {
-                                GameError::Texture(TextureError::AtlasTileNotFound(format!(
-                                    "ghost/{}/{}_{}.png",
-                                    ghost_type.as_str(),
-                                    moving_prefix,
-                                    "a"
-                                )))
-                            })?,
-                        SpriteAtlas::get_tile(atlas, &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "b"))
-                            .ok_or_else(|| {
-                                GameError::Texture(TextureError::AtlasTileNotFound(format!(
-                                    "ghost/{}/{}_{}.png",
-                                    ghost_type.as_str(),
-                                    moving_prefix,
-                                    "b"
-                                )))
-                            })?,
-                    ];
-
-                    let stopped_tiles = vec![SpriteAtlas::get_tile(
-                        atlas,
-                        &format!("ghost/{}/{}_{}.png", ghost_type.as_str(), moving_prefix, "a"),
-                    )
-                    .ok_or_else(|| {
-                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
-                            "ghost/{}/{}_{}.png",
-                            ghost_type.as_str(),
-                            moving_prefix,
-                            "a"
-                        )))
-                    })?];
-
-                    textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.2)?);
-                    stopped_textures[direction.as_usize()] = Some(AnimatedTexture::new(stopped_tiles, 0.1)?);
-                }
-
                 GhostBundle {
                     ghost: ghost_type,
                     position: Position::Stopped { node: start_node },
@@ -423,24 +409,164 @@ impl Game {
                         )?,
                         layer: 0,
                     },
-                    directional_animated: DirectionalAnimated {
+                    directional_animation: animations,
-                        textures,
-                        stopped_textures,
-                    },
                     entity_type: EntityType::Ghost,
                     collider: Collider {
-                        size: crate::constants::CELL_SIZE as f32 * 1.375,
+                        size: constants::CELL_SIZE as f32 * 1.375,
                     },
                     ghost_collider: GhostCollider,
+                    ghost_state: GhostState::Normal,
+                    last_animation_state: LastAnimationState(GhostAnimation::Normal),
                 }
             };
 
-            world.spawn(ghost).insert(Frozen);
+            world.spawn(ghost).insert((Frozen, Hidden));
         }
 
         Ok(())
     }
 
+    fn create_ghost_animations(atlas: &SpriteAtlas) -> GameResult<GhostAnimations> {
+        // Eaten (eyes) animations - single tile per direction
+        let up_eye = atlas
+            .get_tile("ghost/eyes/up.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/eyes/up.png".to_string())))?;
+        let down_eye = atlas
+            .get_tile("ghost/eyes/down.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/eyes/down.png".to_string())))?;
+        let left_eye = atlas
+            .get_tile("ghost/eyes/left.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/eyes/left.png".to_string())))?;
+        let right_eye = atlas
+            .get_tile("ghost/eyes/right.png")
+            .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/eyes/right.png".to_string())))?;
+
+        let eyes_tiles = DirectionalTiles::new(
+            TileSequence::new(&[up_eye]),
+            TileSequence::new(&[down_eye]),
+            TileSequence::new(&[left_eye]),
+            TileSequence::new(&[right_eye]),
+        );
+        let eyes = DirectionalAnimation::new(eyes_tiles, eyes_tiles, animation::GHOST_EATEN_SPEED);
+
+        let mut animations = HashMap::new();
+
+        for ghost_type in [Ghost::Blinky, Ghost::Pinky, Ghost::Inky, Ghost::Clyde] {
+            // Normal animations - create directional tiles for each direction
+            let up_tiles = [
+                atlas
+                    .get_tile(&format!("ghost/{}/up_a.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/up_a.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+                atlas
+                    .get_tile(&format!("ghost/{}/up_b.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/up_b.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+            ];
+            let down_tiles = [
+                atlas
+                    .get_tile(&format!("ghost/{}/down_a.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/down_a.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+                atlas
+                    .get_tile(&format!("ghost/{}/down_b.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/down_b.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+            ];
+            let left_tiles = [
+                atlas
+                    .get_tile(&format!("ghost/{}/left_a.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/left_a.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+                atlas
+                    .get_tile(&format!("ghost/{}/left_b.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/left_b.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+            ];
+            let right_tiles = [
+                atlas
+                    .get_tile(&format!("ghost/{}/right_a.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/right_a.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+                atlas
+                    .get_tile(&format!("ghost/{}/right_b.png", ghost_type.as_str()))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/right_b.png",
+                            ghost_type.as_str()
+                        )))
+                    })?,
+            ];
+
+            let normal_moving = DirectionalTiles::new(
+                TileSequence::new(&up_tiles),
+                TileSequence::new(&down_tiles),
+                TileSequence::new(&left_tiles),
+                TileSequence::new(&right_tiles),
+            );
+            let normal = DirectionalAnimation::new(normal_moving, normal_moving, animation::GHOST_NORMAL_SPEED);
+
+            animations.insert(ghost_type, normal);
+        }
+
+        let (frightened, frightened_flashing) = {
+            // Load frightened animation tiles (same for all ghosts)
+            let frightened_blue_a = atlas
+                .get_tile("ghost/frightened/blue_a.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/frightened/blue_a.png".to_string())))?;
+            let frightened_blue_b = atlas
+                .get_tile("ghost/frightened/blue_b.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/frightened/blue_b.png".to_string())))?;
+            let frightened_white_a = atlas
+                .get_tile("ghost/frightened/white_a.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/frightened/white_a.png".to_string())))?;
+            let frightened_white_b = atlas
+                .get_tile("ghost/frightened/white_b.png")
+                .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("ghost/frightened/white_b.png".to_string())))?;
+
+            (
+                LinearAnimation::new(
+                    TileSequence::new(&[frightened_blue_a, frightened_blue_b]),
+                    animation::GHOST_NORMAL_SPEED,
+                ),
+                LinearAnimation::new(
+                    TileSequence::new(&[frightened_blue_a, frightened_white_a, frightened_blue_b, frightened_white_b]),
+                    animation::GHOST_FRIGHTENED_SPEED,
+                ),
+            )
+        };
+
+        Ok(GhostAnimations::new(animations, eyes, frightened, frightened_flashing))
+    }
+
     /// Executes one frame of game logic by running all scheduled ECS systems.
     ///
     /// Updates the world's delta time resource and runs the complete system pipeline:

src/map/builder.rs

@@ -5,7 +5,7 @@ use crate::map::graph::{Graph, Node, TraversalFlags};
 use crate::map::parser::MapTileParser;
 use crate::systems::movement::NodeId;
 use bevy_ecs::resource::Resource;
-use glam::{IVec2, Vec2};
+use glam::{I8Vec2, IVec2, Vec2};
 use std::collections::{HashMap, VecDeque};
 use tracing::debug;
 
@@ -38,7 +38,7 @@ pub struct Map {
     /// Connected graph of navigable positions.
     pub graph: Graph,
     /// Bidirectional mapping between 2D grid coordinates and graph node indices.
-    pub grid_to_node: HashMap<IVec2, NodeId>,
+    pub grid_to_node: HashMap<I8Vec2, NodeId>,
     /// Predetermined spawn locations for all game entities
     pub start_positions: NodePositions,
     /// 2D array of tile types for collision detection and rendering
@@ -76,8 +76,8 @@ impl Map {
         let mut queue = VecDeque::new();
         queue.push_back(start_pos);
         let pos = Vec2::new(
-            (start_pos.x * CELL_SIZE as i32) as f32,
+            (start_pos.x as i32 * CELL_SIZE as i32) as f32,
-            (start_pos.y * CELL_SIZE as i32) as f32,
+            (start_pos.y as i32 * CELL_SIZE as i32) as f32,
         ) + cell_offset;
         let node_id = graph.add_node(Node { position: pos });
         grid_to_node.insert(start_pos, node_id);
@@ -89,9 +89,9 @@ impl Map {
 
                 // Skip if the new position is out of bounds
                 if new_position.x < 0
-                    || new_position.x >= BOARD_CELL_SIZE.x as i32
+                    || new_position.x as i32 >= BOARD_CELL_SIZE.x as i32
                     || new_position.y < 0
-                    || new_position.y >= BOARD_CELL_SIZE.y as i32
+                    || new_position.y as i32 >= BOARD_CELL_SIZE.y as i32
                 {
                     continue;
                 }
@@ -108,8 +108,8 @@ impl Map {
                 ) {
                     // Add the new position to the graph/queue
                     let pos = Vec2::new(
-                        (new_position.x * CELL_SIZE as i32) as f32,
+                        (new_position.x as i32 * CELL_SIZE as i32) as f32,
-                        (new_position.y * CELL_SIZE as i32) as f32,
+                        (new_position.y as i32 * CELL_SIZE as i32) as f32,
                     ) + cell_offset;
                     let new_node_id = graph.add_node(Node { position: pos });
                     grid_to_node.insert(new_position, new_node_id);
@@ -132,7 +132,7 @@ impl Map {
         for (grid_pos, &node_id) in &grid_to_node {
             for dir in Direction::DIRECTIONS {
                 // If the node doesn't have an edge in this direction, look for a neighbor in that direction
-                if graph.adjacency_list[node_id].get(dir).is_none() {
+                if graph.adjacency_list[node_id as usize].get(dir).is_none() {
                     let neighbor = grid_pos + dir.as_ivec2();
                     // If the neighbor exists, connect the node to it
                     if let Some(&neighbor_id) = grid_to_node.get(&neighbor) {
@@ -199,9 +199,9 @@ impl Map {
     /// representing the four key positions within the ghost house structure.
     fn build_house(
         graph: &mut Graph,
-        grid_to_node: &HashMap<IVec2, NodeId>,
+        grid_to_node: &HashMap<I8Vec2, NodeId>,
-        house_door: &[Option<IVec2>; 2],
+        house_door: &[Option<I8Vec2>; 2],
-    ) -> GameResult<(usize, usize, usize, usize)> {
+    ) -> GameResult<(NodeId, NodeId, NodeId, NodeId)> {
         // Calculate the position of the house entrance node
         let (house_entrance_node_id, house_entrance_node_position) = {
             // Translate the grid positions to the actual node ids
@@ -222,10 +222,13 @@ impl Map {
 
             // Calculate the position of the house node
             let (node_id, node_position) = {
-                let left_pos = graph.get_node(*left_node).ok_or(MapError::NodeNotFound(*left_node))?.position;
+                let left_pos = graph
+                    .get_node(*left_node)
+                    .ok_or(MapError::NodeNotFound(*left_node as usize))?
+                    .position;
                 let right_pos = graph
                     .get_node(*right_node)
-                    .ok_or(MapError::NodeNotFound(*right_node))?
+                    .ok_or(MapError::NodeNotFound(*right_node as usize))?
                     .position;
                 let house_node = graph.add_node(Node {
                     position: left_pos.lerp(right_pos, 0.5),
@@ -249,10 +252,10 @@ impl Map {
             // Place the nodes at, above, and below the center position
             let center_node_id = graph.add_node(Node { position: center_pos });
             let top_node_id = graph.add_node(Node {
-                position: center_pos + (Direction::Up.as_ivec2() * (CELL_SIZE as i32 / 2)).as_vec2(),
+                position: center_pos + IVec2::from(Direction::Up.as_ivec2()).as_vec2() * (CELL_SIZE as f32 / 2.0),
             });
             let bottom_node_id = graph.add_node(Node {
-                position: center_pos + (Direction::Down.as_ivec2() * (CELL_SIZE as i32 / 2)).as_vec2(),
+                position: center_pos + IVec2::from(Direction::Down.as_ivec2()).as_vec2() * (CELL_SIZE as f32 / 2.0),
             });
 
             // Connect the center node to the top and bottom nodes
@@ -268,7 +271,7 @@ impl Map {
 
         // Calculate the position of the center line's center node
         let center_line_center_position =
-            house_entrance_node_position + (Direction::Down.as_ivec2() * (3 * CELL_SIZE as i32)).as_vec2();
+            house_entrance_node_position + IVec2::from(Direction::Down.as_ivec2()).as_vec2() * (3.0 * CELL_SIZE as f32);
 
         // Create the center line
         let (center_center_node_id, center_top_node_id) = create_house_line(graph, center_line_center_position)?;
@@ -300,13 +303,13 @@ impl Map {
         // Create the left line
         let (left_center_node_id, _) = create_house_line(
             graph,
-            center_line_center_position + (Direction::Left.as_ivec2() * (CELL_SIZE as i32 * 2)).as_vec2(),
+            center_line_center_position + IVec2::from(Direction::Left.as_ivec2()).as_vec2() * (CELL_SIZE as f32 * 2.0),
         )?;
 
         // Create the right line
         let (right_center_node_id, _) = create_house_line(
             graph,
-            center_line_center_position + (Direction::Right.as_ivec2() * (CELL_SIZE as i32 * 2)).as_vec2(),
+            center_line_center_position + IVec2::from(Direction::Right.as_ivec2()).as_vec2() * (CELL_SIZE as f32 * 2.0),
         )?;
 
         debug!("Left center node id: {left_center_node_id}");
@@ -336,8 +339,8 @@ impl Map {
     /// Creates hidden intermediate nodes beyond the visible tunnel entrances and connects them with zero-distance edges for instantaneous traversal.
     fn build_tunnels(
         graph: &mut Graph,
-        grid_to_node: &HashMap<IVec2, NodeId>,
+        grid_to_node: &HashMap<I8Vec2, NodeId>,
-        tunnel_ends: &[Option<IVec2>; 2],
+        tunnel_ends: &[Option<I8Vec2>; 2],
     ) -> GameResult<()> {
         // Create the hidden tunnel nodes
         let left_tunnel_hidden_node_id = {
@@ -353,7 +356,7 @@ impl Map {
                     Direction::Left,
                     Node {
                         position: left_tunnel_entrance_node.position
-                            + (Direction::Left.as_ivec2() * (CELL_SIZE as i32 * 2)).as_vec2(),
+                            + IVec2::from(Direction::Left.as_ivec2()).as_vec2() * (CELL_SIZE as f32 * 2.0),
                     },
                 )
                 .map_err(|e| {
@@ -378,7 +381,7 @@ impl Map {
                     Direction::Right,
                     Node {
                         position: right_tunnel_entrance_node.position
-                            + (Direction::Right.as_ivec2() * (CELL_SIZE as i32 * 2)).as_vec2(),
+                            + IVec2::from(Direction::Right.as_ivec2()).as_vec2() * (CELL_SIZE as f32 * 2.0),
                     },
                 )
                 .map_err(|e| {

src/map/direction.rs

@@ -1,8 +1,10 @@
-use glam::IVec2;
+use glam::I8Vec2;
+use strum_macros::AsRefStr;
 
 /// The four cardinal directions.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default, AsRefStr)]
 #[repr(usize)]
+#[strum(serialize_all = "lowercase")]
 pub enum Direction {
     Up,
     Down,
@@ -26,8 +28,8 @@ impl Direction {
         }
     }
 
-    /// Returns the direction as an IVec2.
+    /// Returns the direction as an I8Vec2.
-    pub fn as_ivec2(self) -> IVec2 {
+    pub fn as_ivec2(self) -> I8Vec2 {
         self.into()
     }
 
@@ -43,13 +45,13 @@ impl Direction {
     }
 }
 
-impl From<Direction> for IVec2 {
+impl From<Direction> for I8Vec2 {
     fn from(dir: Direction) -> Self {
         match dir {
-            Direction::Up => -IVec2::Y,
+            Direction::Up => -I8Vec2::Y,
-            Direction::Down => IVec2::Y,
+            Direction::Down => I8Vec2::Y,
-            Direction::Left => -IVec2::X,
+            Direction::Left => -I8Vec2::X,
-            Direction::Right => IVec2::X,
+            Direction::Right => I8Vec2::X,
         }
     }
 }

src/map/graph.rs

@@ -107,7 +107,7 @@ impl Graph {
 
     /// Adds a new node with the given data to the graph and returns its ID.
     pub fn add_node(&mut self, data: Node) -> NodeId {
-        let id = self.nodes.len();
+        let id = self.nodes.len() as NodeId;
         self.nodes.push(data);
         self.adjacency_list.push(Intersection::default());
         id
@@ -129,10 +129,10 @@ impl Graph {
         distance: Option<f32>,
         direction: Direction,
     ) -> Result<(), &'static str> {
-        if from >= self.adjacency_list.len() {
+        if from as usize >= self.adjacency_list.len() {
             return Err("From node does not exist.");
         }
-        if to >= self.adjacency_list.len() {
+        if to as usize >= self.adjacency_list.len() {
             return Err("To node does not exist.");
         }
 
@@ -178,8 +178,8 @@ impl Graph {
                 }
                 None => {
                     // If no distance is provided, calculate it based on the positions of the nodes
-                    let from_pos = self.nodes[from].position;
+                    let from_pos = self.nodes[from as usize].position;
-                    let to_pos = self.nodes[to].position;
+                    let to_pos = self.nodes[to as usize].position;
                     from_pos.distance(to_pos)
                 }
             },
@@ -187,11 +187,11 @@ impl Graph {
             traversal_flags,
         };
 
-        if from >= self.adjacency_list.len() {
+        if from as usize >= self.adjacency_list.len() {
             return Err("From node does not exist.");
         }
 
-        let adjacency_list = &mut self.adjacency_list[from];
+        let adjacency_list = &mut self.adjacency_list[from as usize];
 
         // Check if the edge already exists in this direction or to the same target
         if let Some(err) = adjacency_list.edges().find_map(|e| {
@@ -215,7 +215,7 @@ impl Graph {
 
     /// Retrieves an immutable reference to a node's data.
     pub fn get_node(&self, id: NodeId) -> Option<&Node> {
-        self.nodes.get(id)
+        self.nodes.get(id as usize)
     }
 
     /// Returns an iterator over all nodes in the graph.
@@ -228,17 +228,17 @@ impl Graph {
         self.adjacency_list
             .iter()
             .enumerate()
-            .flat_map(|(node_id, intersection)| intersection.edges().map(move |edge| (node_id, edge)))
+            .flat_map(|(node_id, intersection)| intersection.edges().map(move |edge| (node_id as NodeId, edge)))
     }
 
     /// Finds a specific edge from a source node to a target node.
     pub fn find_edge(&self, from: NodeId, to: NodeId) -> Option<Edge> {
-        self.adjacency_list.get(from)?.edges().find(|edge| edge.target == to)
+        self.adjacency_list.get(from as usize)?.edges().find(|edge| edge.target == to)
     }
 
     /// Finds an edge originating from a given node that follows a specific direction.
     pub fn find_edge_in_direction(&self, from: NodeId, direction: Direction) -> Option<Edge> {
-        self.adjacency_list.get(from)?.get(direction)
+        self.adjacency_list.get(from as usize)?.get(direction)
     }
 }
 

src/map/parser.rs

@@ -2,7 +2,7 @@
 
 use crate::constants::{MapTile, BOARD_CELL_SIZE};
 use crate::error::ParseError;
-use glam::IVec2;
+use glam::I8Vec2;
 
 /// Structured representation of parsed ASCII board layout with extracted special positions.
 ///
@@ -15,11 +15,11 @@ pub struct ParsedMap {
     /// 2D array of tiles converted from ASCII characters
     pub tiles: [[MapTile; BOARD_CELL_SIZE.y as usize]; BOARD_CELL_SIZE.x as usize],
     /// Two positions marking the ghost house entrance (represented by '=' characters)
-    pub house_door: [Option<IVec2>; 2],
+    pub house_door: [Option<I8Vec2>; 2],
     /// Two positions marking tunnel portals for wraparound teleportation ('T' characters)
-    pub tunnel_ends: [Option<IVec2>; 2],
+    pub tunnel_ends: [Option<I8Vec2>; 2],
     /// Starting position for Pac-Man (marked by 'X' character in the layout)
-    pub pacman_start: Option<IVec2>,
+    pub pacman_start: Option<I8Vec2>,
 }
 
 /// Parser for converting raw board layouts into structured map data.
@@ -88,7 +88,7 @@ impl MapTileParser {
         let mut tiles = [[MapTile::Empty; BOARD_CELL_SIZE.y as usize]; BOARD_CELL_SIZE.x as usize];
         let mut house_door = [None; 2];
         let mut tunnel_ends = [None; 2];
-        let mut pacman_start: Option<IVec2> = None;
+        let mut pacman_start: Option<I8Vec2> = None;
 
         for (y, line) in raw_board.iter().enumerate().take(BOARD_CELL_SIZE.y as usize) {
             for (x, character) in line.chars().enumerate().take(BOARD_CELL_SIZE.x as usize) {
@@ -98,16 +98,16 @@ impl MapTileParser {
                 match tile {
                     MapTile::Tunnel => {
                         if tunnel_ends[0].is_none() {
-                            tunnel_ends[0] = Some(IVec2::new(x as i32, y as i32));
+                            tunnel_ends[0] = Some(I8Vec2::new(x as i8, y as i8));
                         } else {
-                            tunnel_ends[1] = Some(IVec2::new(x as i32, y as i32));
+                            tunnel_ends[1] = Some(I8Vec2::new(x as i8, y as i8));
                         }
                     }
                     MapTile::Wall if character == '=' => {
                         if house_door[0].is_none() {
-                            house_door[0] = Some(IVec2::new(x as i32, y as i32));
+                            house_door[0] = Some(I8Vec2::new(x as i8, y as i8));
                         } else {
-                            house_door[1] = Some(IVec2::new(x as i32, y as i32));
+                            house_door[1] = Some(I8Vec2::new(x as i8, y as i8));
                         }
                     }
                     _ => {}
@@ -115,7 +115,7 @@ impl MapTileParser {
 
                 // Track Pac-Man's starting position
                 if character == 'X' {
-                    pacman_start = Some(IVec2::new(x as i32, y as i32));
+                    pacman_start = Some(I8Vec2::new(x as i8, y as i8));
                 }
 
                 tiles[x][y] = tile;

src/platform/desktop.rs

@@ -24,44 +24,6 @@ impl CommonPlatform for Platform {
     }
 
     fn init_console(&self) -> Result<(), PlatformError> {
-        #[cfg(windows)]
-        {
-            unsafe {
-                use winapi::{
-                    shared::ntdef::NULL,
-                    um::{
-                        fileapi::{CreateFileA, OPEN_EXISTING},
-                        handleapi::INVALID_HANDLE_VALUE,
-                        processenv::SetStdHandle,
-                        winbase::{STD_ERROR_HANDLE, STD_OUTPUT_HANDLE},
-                        wincon::{AttachConsole, GetConsoleWindow},
-                        winnt::{FILE_SHARE_READ, FILE_SHARE_WRITE, GENERIC_READ, GENERIC_WRITE},
-                    },
-                };
-
-                if !std::ptr::eq(GetConsoleWindow(), std::ptr::null_mut()) {
-                    return Ok(());
-                }
-
-                if AttachConsole(winapi::um::wincon::ATTACH_PARENT_PROCESS) != 0 {
-                    let handle = CreateFileA(
-                        c"CONOUT$".as_ptr(),
-                        GENERIC_READ | GENERIC_WRITE,
-                        FILE_SHARE_READ | FILE_SHARE_WRITE,
-                        std::ptr::null_mut(),
-                        OPEN_EXISTING,
-                        0,
-                        NULL,
-                    );
-
-                    if handle != INVALID_HANDLE_VALUE {
-                        SetStdHandle(STD_OUTPUT_HANDLE, handle);
-                        SetStdHandle(STD_ERROR_HANDLE, handle);
-                    }
-                }
-            }
-        }
-
         Ok(())
     }
 

src/systems/blinking.rs

@@ -7,31 +7,53 @@ use bevy_ecs::{
 
 use crate::systems::{
     components::{DeltaTime, Renderable},
-    Hidden,
+    Frozen, Hidden,
 };
 
-#[derive(Component)]
+#[derive(Component, Debug)]
 pub struct Blinking {
     pub timer: f32,
     pub interval: f32,
 }
 
+impl Blinking {
+    pub fn new(interval: f32) -> Self {
+        Self { timer: 0.0, interval }
+    }
+}
+
 /// Updates blinking entities by toggling their visibility at regular intervals.
 ///
 /// This system manages entities that have both `Blinking` and `Renderable` components,
 /// accumulating time and toggling visibility when the specified interval is reached.
+#[allow(clippy::type_complexity)]
 pub fn blinking_system(
     mut commands: Commands,
     time: Res<DeltaTime>,
-    mut query: Query<(Entity, &mut Blinking, Has<Hidden>), With<Renderable>>,
+    mut query: Query<(Entity, &mut Blinking, Has<Hidden>, Has<Frozen>), With<Renderable>>,
 ) {
-    for (entity, mut blinking, hidden) in query.iter_mut() {
+    for (entity, mut blinking, hidden, frozen) in query.iter_mut() {
+        // If the entity is frozen, blinking is disabled and the entity is unhidden (if it was hidden)
+        if frozen {
+            if hidden {
+                commands.entity(entity).remove::<Hidden>();
+            }
+
+            continue;
+        }
+
+        // Increase the timer by the delta time
         blinking.timer += time.0;
 
-        if blinking.timer >= blinking.interval {
+        // If the timer is less than the interval, there's nothing to do yet
-            blinking.timer = 0.0;
+        if blinking.timer < blinking.interval {
+            continue;
+        }
 
-            // Add or remove the Visible component based on whether it is currently in the query
+        // Subtract the interval (allows for the timer to retain partial interval progress)
+        blinking.timer -= blinking.interval;
+
+        // Toggle the Hidden component
         if hidden {
             commands.entity(entity).remove::<Hidden>();
         } else {
@@ -39,4 +61,3 @@ pub fn blinking_system(
         }
     }
 }
-}

src/systems/collision.rs

@@ -2,13 +2,13 @@ use bevy_ecs::component::Component;
 use bevy_ecs::entity::Entity;
 use bevy_ecs::event::{EventReader, EventWriter};
 use bevy_ecs::query::With;
-use bevy_ecs::system::{Commands, Query, Res, ResMut};
+use bevy_ecs::system::{Query, Res, ResMut};
 
 use crate::error::GameError;
 use crate::events::GameEvent;
 use crate::map::builder::Map;
 use crate::systems::movement::Position;
-use crate::systems::{AudioEvent, Ghost, PlayerControlled, ScoreResource, Vulnerable};
+use crate::systems::{AudioEvent, Ghost, GhostState, PlayerControlled, ScoreResource};
 
 #[derive(Component)]
 pub struct Collider {
@@ -108,12 +108,11 @@ pub fn collision_system(
 }
 
 pub fn ghost_collision_system(
-    mut commands: Commands,
     mut collision_events: EventReader<GameEvent>,
     mut score: ResMut<ScoreResource>,
     pacman_query: Query<(), With<PlayerControlled>>,
     ghost_query: Query<(Entity, &Ghost), With<GhostCollider>>,
-    vulnerable_query: Query<Entity, With<Vulnerable>>,
+    mut ghost_state_query: Query<&mut GhostState>,
     mut events: EventWriter<AudioEvent>,
 ) {
     for event in collision_events.read() {
@@ -127,23 +126,25 @@ pub fn ghost_collision_system(
                 continue;
             };
 
-            // Check if the ghost is vulnerable
+            // Check if the ghost is frightened
             if let Ok((ghost_ent, _ghost_type)) = ghost_query.get(ghost_entity) {
-                // Check if ghost has Vulnerable component
+                if let Ok(mut ghost_state) = ghost_state_query.get_mut(ghost_ent) {
-                if vulnerable_query.get(ghost_ent).is_ok() {
+                    // Check if ghost is in frightened state
+                    if matches!(*ghost_state, GhostState::Frightened { .. }) {
                         // Pac-Man eats the ghost
                         // Add score (200 points per ghost eaten)
                         score.0 += 200;
 
-                    // Remove the ghost
+                        // Set ghost state to Eyes
-                    commands.entity(ghost_ent).despawn();
+                        *ghost_state = GhostState::Eyes;
 
                         // Play eat sound
                         events.write(AudioEvent::PlayEat);
                     } else {
                         // Pac-Man dies (this would need a death system)
                         // For now, just log it
-                    tracing::warn!("Pac-Man collided with ghost while not vulnerable!");
+                        tracing::warn!("Pac-Man collided with ghost while not frightened!");
+                    }
                 }
             }
         }

src/systems/components.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use bevy_ecs::{bundle::Bundle, component::Component, resource::Resource};
 use bitflags::bitflags;
 
@@ -5,16 +7,19 @@ use crate::{
     map::graph::TraversalFlags,
     systems::{
         movement::{BufferedDirection, Position, Velocity},
-        Collider, GhostCollider, ItemCollider, PacmanCollider, PlayerLifecycle,
+        Collider, GhostCollider, ItemCollider, PacmanCollider,
+    },
+    texture::{
+        animated::{DirectionalTiles, TileSequence},
+        sprite::AtlasTile,
     },
-    texture::{animated::AnimatedTexture, sprite::AtlasTile},
 };
 
 /// A tag component for entities that are controlled by the player.
 #[derive(Default, Component)]
 pub struct PlayerControlled;
 
-#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Component, Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Ghost {
     Blinky,
     Pinky,
@@ -95,11 +100,48 @@ pub struct Renderable {
     pub layer: u8,
 }
 
-/// A component for entities that have a directional animated texture.
+/// Directional animation component with shared timing across all directions
-#[derive(Component)]
+#[derive(Component, Clone, Copy)]
-pub struct DirectionalAnimated {
+pub struct DirectionalAnimation {
-    pub textures: [Option<AnimatedTexture>; 4],
+    pub moving_tiles: DirectionalTiles,
-    pub stopped_textures: [Option<AnimatedTexture>; 4],
+    pub stopped_tiles: DirectionalTiles,
+    pub current_frame: usize,
+    pub time_bank: u16,
+    pub frame_duration: u16,
+}
+
+impl DirectionalAnimation {
+    /// Creates a new directional animation with the given tiles and frame duration
+    pub fn new(moving_tiles: DirectionalTiles, stopped_tiles: DirectionalTiles, frame_duration: u16) -> Self {
+        Self {
+            moving_tiles,
+            stopped_tiles,
+            current_frame: 0,
+            time_bank: 0,
+            frame_duration,
+        }
+    }
+}
+
+/// Linear animation component for non-directional animations (frightened ghosts)
+#[derive(Component, Clone, Copy)]
+pub struct LinearAnimation {
+    pub tiles: TileSequence,
+    pub current_frame: usize,
+    pub time_bank: u16,
+    pub frame_duration: u16,
+}
+
+impl LinearAnimation {
+    /// Creates a new linear animation with the given tiles and frame duration
+    pub fn new(tiles: TileSequence, frame_duration: u16) -> Self {
+        Self {
+            tiles,
+            current_frame: 0,
+            time_bank: 0,
+            frame_duration,
+        }
+    }
 }
 
 bitflags! {
@@ -144,10 +186,144 @@ impl Default for MovementModifiers {
 #[derive(Component, Debug, Clone, Copy)]
 pub struct Frozen;
 
-/// Component for ghosts that are vulnerable to Pac-Man
+/// Tag component for eaten ghosts
 #[derive(Component, Debug, Clone, Copy)]
-pub struct Vulnerable {
+pub struct Eaten;
-    pub remaining_ticks: u32,
+
+#[derive(Component, Debug, Clone, Copy)]
+pub enum GhostState {
+    /// Normal ghost behavior - chasing Pac-Man
+    Normal,
+    /// Frightened state after power pellet - ghost can be eaten
+    Frightened {
+        remaining_ticks: u32,
+        flash: bool,
+        remaining_flash_ticks: u32,
+    },
+    /// Eyes state - ghost has been eaten and is returning to ghost house
+    Eyes,
+}
+
+/// Component to track the last animation state for efficient change detection
+#[derive(Component, Debug, Clone, Copy, PartialEq)]
+pub struct LastAnimationState(pub GhostAnimation);
+
+impl GhostState {
+    /// Creates a new frightened state with the specified duration
+    pub fn new_frightened(total_ticks: u32, flash_start_ticks: u32) -> Self {
+        Self::Frightened {
+            remaining_ticks: total_ticks,
+            flash: false,
+            remaining_flash_ticks: flash_start_ticks, // Time until flashing starts
+        }
+    }
+
+    /// Ticks the ghost state, returning true if the state changed.
+    pub fn tick(&mut self) -> bool {
+        if let GhostState::Frightened {
+            remaining_ticks,
+            flash,
+            remaining_flash_ticks,
+        } = self
+        {
+            // Transition out of frightened state
+            if *remaining_ticks == 0 {
+                *self = GhostState::Normal;
+                return true;
+            }
+
+            *remaining_ticks -= 1;
+
+            if *remaining_flash_ticks > 0 {
+                *remaining_flash_ticks = remaining_flash_ticks.saturating_sub(1);
+                if *remaining_flash_ticks == 0 {
+                    *flash = true;
+                    true
+                } else {
+                    false
+                }
+            } else {
+                false
+            }
+        } else {
+            false
+        }
+    }
+
+    /// Returns the appropriate animation state for this ghost state
+    pub fn animation_state(&self) -> GhostAnimation {
+        match self {
+            GhostState::Normal => GhostAnimation::Normal,
+            GhostState::Eyes => GhostAnimation::Eyes,
+            GhostState::Frightened { flash: false, .. } => GhostAnimation::Frightened { flash: false },
+            GhostState::Frightened { flash: true, .. } => GhostAnimation::Frightened { flash: true },
+        }
+    }
+}
+
+/// Enumeration of different ghost animation states.
+/// Note that this is used in micromap which has a fixed size based on the number of variants,
+/// so extending this should be done with caution, and will require updating the micromap's capacity.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum GhostAnimation {
+    /// Normal ghost appearance with directional movement animations
+    Normal,
+    /// Blue ghost appearance when vulnerable (power pellet active)
+    Frightened { flash: bool },
+    /// Eyes-only animation when ghost has been consumed by Pac-Man (Eaten state)
+    Eyes,
+}
+
+/// Global resource containing pre-loaded animation sets for all ghost types.
+///
+/// This resource is initialized once during game startup and provides O(1) access
+/// to animation sets for each ghost type. The animation system uses this resource
+/// to efficiently switch between different ghost states without runtime asset loading.
+///
+/// The HashMap is keyed by `Ghost` enum variants (Blinky, Pinky, Inky, Clyde) and
+/// contains the normal directional animation for each ghost type.
+#[derive(Resource)]
+pub struct GhostAnimations {
+    pub normal: HashMap<Ghost, DirectionalAnimation>,
+    pub eyes: DirectionalAnimation,
+    pub frightened: LinearAnimation,
+    pub frightened_flashing: LinearAnimation,
+}
+
+impl GhostAnimations {
+    /// Creates a new GhostAnimations resource with the provided data.
+    pub fn new(
+        normal: HashMap<Ghost, DirectionalAnimation>,
+        eyes: DirectionalAnimation,
+        frightened: LinearAnimation,
+        frightened_flashing: LinearAnimation,
+    ) -> Self {
+        Self {
+            normal,
+            eyes,
+            frightened,
+            frightened_flashing,
+        }
+    }
+
+    /// Gets the normal directional animation for the specified ghost type.
+    pub fn get_normal(&self, ghost_type: &Ghost) -> Option<&DirectionalAnimation> {
+        self.normal.get(ghost_type)
+    }
+
+    /// Gets the eyes animation (shared across all ghosts).
+    pub fn eyes(&self) -> &DirectionalAnimation {
+        &self.eyes
+    }
+
+    /// Gets the frightened animations (shared across all ghosts).
+    pub fn frightened(&self, flash: bool) -> &LinearAnimation {
+        if flash {
+            &self.frightened_flashing
+        } else {
+            &self.frightened
+        }
+    }
 }
 
 #[derive(Bundle)]
@@ -157,17 +333,11 @@ pub struct PlayerBundle {
     pub velocity: Velocity,
     pub buffered_direction: BufferedDirection,
     pub sprite: Renderable,
-    pub directional_animated: DirectionalAnimated,
+    pub directional_animation: DirectionalAnimation,
     pub entity_type: EntityType,
     pub collider: Collider,
-    pub pacman_collider: PacmanCollider,
-}
-
-/// Convenience bundle for attaching the hybrid FSM to the player entity
-#[derive(Bundle, Default)]
-pub struct PlayerStateBundle {
-    pub lifecycle: PlayerLifecycle,
     pub movement_modifiers: MovementModifiers,
+    pub pacman_collider: PacmanCollider,
 }
 
 #[derive(Bundle)]
@@ -185,8 +355,10 @@ pub struct GhostBundle {
     pub position: Position,
     pub velocity: Velocity,
     pub sprite: Renderable,
-    pub directional_animated: DirectionalAnimated,
+    pub directional_animation: DirectionalAnimation,
     pub entity_type: EntityType,
     pub collider: Collider,
     pub ghost_collider: GhostCollider,
+    pub ghost_state: GhostState,
+    pub last_animation_state: LastAnimationState,
 }

src/systems/debug.rs

@@ -3,7 +3,7 @@ use std::cmp::Ordering;
 
 use crate::constants::BOARD_PIXEL_OFFSET;
 use crate::map::builder::Map;
-use crate::systems::{BackbufferResource, Collider, CursorPosition, Position, SystemTimings};
+use crate::systems::{Collider, CursorPosition, NodeId, Position, SystemTimings};
 use bevy_ecs::resource::Resource;
 use bevy_ecs::system::{NonSendMut, Query, Res};
 use glam::{IVec2, UVec2, Vec2};
@@ -54,8 +54,8 @@ fn render_timing_display(
         .unwrap_or(0);
 
     // Only draw background if there is text to display
-    if max_width > 0 {
     let total_height = (lines.len() as u32) * line_height as u32;
+    if max_width > 0 && total_height > 0 {
         let bg_padding = 5;
 
         // Draw background
@@ -89,7 +89,6 @@ fn render_timing_display(
 #[allow(clippy::too_many_arguments)]
 pub fn debug_render_system(
     mut canvas: NonSendMut<&mut Canvas<Window>>,
-    backbuffer: NonSendMut<BackbufferResource>,
     mut debug_texture: NonSendMut<DebugTextureResource>,
     debug_font: NonSendMut<DebugFontResource>,
     debug_state: Res<DebugState>,
@@ -104,18 +103,6 @@ pub fn debug_render_system(
     let scale =
         (UVec2::from(canvas.output_size().unwrap()).as_vec2() / UVec2::from(canvas.logical_size()).as_vec2()).min_element();
 
-    // Copy the current backbuffer to the debug texture
-    canvas
-        .with_texture_canvas(&mut debug_texture.0, |debug_canvas| {
-            // Clear the debug canvas
-            debug_canvas.set_draw_color(Color::BLACK);
-            debug_canvas.clear();
-
-            // Copy the backbuffer to the debug canvas
-            debug_canvas.copy(&backbuffer.0, None, None).unwrap();
-        })
-        .unwrap();
-
     // Get texture creator before entering the closure to avoid borrowing conflicts
     let mut texture_creator = canvas.texture_creator();
     let font = &debug_font.0;
@@ -128,8 +115,11 @@ pub fn debug_render_system(
     // Draw debug info on the high-resolution debug texture
     canvas
         .with_texture_canvas(&mut debug_texture.0, |debug_canvas| {
-            // Find the closest node to the cursor
+            // Clear the debug canvas
+            debug_canvas.set_draw_color(Color::RGBA(0, 0, 0, 0));
+            debug_canvas.clear();
 
+            // Find the closest node to the cursor
             let closest_node = if let Some(cursor_world_pos) = cursor_world_pos {
                 map.graph
                     .nodes()
@@ -195,7 +185,7 @@ pub fn debug_render_system(
 
             // Render node ID if a node is highlighted
             if let Some(closest_node_id) = closest_node {
-                let node = map.graph.get_node(closest_node_id).unwrap();
+                let node = map.graph.get_node(closest_node_id as NodeId).unwrap();
                 let pos = transform_position_with_offset(node.position, scale);
 
                 let surface = font
@@ -214,8 +204,4 @@ pub fn debug_render_system(
             render_timing_display(debug_canvas, &mut texture_creator, &timings, font);
         })
         .unwrap();
-
-    // Draw the debug texture directly onto the main canvas at full resolution
-    canvas.copy(&debug_texture.0, None, None).unwrap();
-    canvas.present();
 }

src/systems/ghost.rs

@@ -1,4 +1,4 @@
-use crate::systems::components::Frozen;
+use crate::systems::components::{DirectionalAnimation, Frozen, GhostAnimation, GhostState, LastAnimationState, LinearAnimation};
 use crate::{
     map::{
         builder::Map,
@@ -10,8 +10,10 @@ use crate::{
         movement::{Position, Velocity},
     },
 };
+
+use crate::systems::GhostAnimations;
 use bevy_ecs::query::Without;
-use bevy_ecs::system::{Query, Res};
+use bevy_ecs::system::{Commands, Query, Res};
 use rand::rngs::SmallRng;
 use rand::seq::IndexedRandom;
 use rand::SeedableRng;
@@ -28,7 +30,7 @@ pub fn ghost_movement_system(
         loop {
             match *position {
                 Position::Stopped { node: current_node } => {
-                    let intersection = &map.graph.adjacency_list[current_node];
+                    let intersection = &map.graph.adjacency_list[current_node as usize];
                     let opposite = velocity.direction.opposite();
 
                     let mut non_opposite_options: SmallVec<[Edge; 3]> = SmallVec::new();
@@ -68,3 +70,150 @@ pub fn ghost_movement_system(
         }
     }
 }
+
+/// System that handles eaten ghost behavior and respawn logic.
+///
+/// When a ghost is eaten by Pac-Man, it enters an "eaten" state where:
+/// 1. It displays eyes-only animation
+/// 2. It moves directly back to the ghost house at increased speed
+/// 3. Once it reaches the ghost house center, it respawns as a normal ghost
+///
+/// This system runs after the main movement system to override eaten ghost movement.
+pub fn eaten_ghost_system(
+    map: Res<Map>,
+    delta_time: Res<DeltaTime>,
+    mut eaten_ghosts: Query<(&Ghost, &mut Position, &mut Velocity, &mut GhostState)>,
+) {
+    for (ghost_type, mut position, mut velocity, mut ghost_state) in eaten_ghosts.iter_mut() {
+        // Only process ghosts that are in Eyes state
+        if !matches!(*ghost_state, GhostState::Eyes) {
+            continue;
+        }
+        // Set higher speed for eaten ghosts returning to ghost house
+        let original_speed = velocity.speed;
+        velocity.speed = ghost_type.base_speed() * 2.0; // Move twice as fast when eaten
+
+        // Calculate direction towards ghost house center (using Clyde's start position)
+        let ghost_house_center = map.start_positions.clyde;
+
+        match *position {
+            Position::Stopped { node: current_node } => {
+                // Find path to ghost house center and start moving
+                if let Some(direction) = find_direction_to_target(&map, current_node, ghost_house_center) {
+                    velocity.direction = direction;
+                    *position = Position::Moving {
+                        from: current_node,
+                        to: map.graph.adjacency_list[current_node as usize].get(direction).unwrap().target,
+                        remaining_distance: map.graph.adjacency_list[current_node as usize]
+                            .get(direction)
+                            .unwrap()
+                            .distance,
+                    };
+                }
+            }
+            Position::Moving { to, .. } => {
+                let distance = velocity.speed * 60.0 * delta_time.0;
+                if let Some(_overflow) = position.tick(distance) {
+                    // Reached target node, check if we're at ghost house center
+                    if to == ghost_house_center {
+                        // Respawn the ghost - set state back to normal
+                        *ghost_state = GhostState::Normal;
+                        // Reset to stopped at ghost house center
+                        *position = Position::Stopped {
+                            node: ghost_house_center,
+                        };
+                    } else {
+                        // Continue pathfinding to ghost house
+                        if let Some(next_direction) = find_direction_to_target(&map, to, ghost_house_center) {
+                            velocity.direction = next_direction;
+                            *position = Position::Moving {
+                                from: to,
+                                to: map.graph.adjacency_list[to as usize].get(next_direction).unwrap().target,
+                                remaining_distance: map.graph.adjacency_list[to as usize].get(next_direction).unwrap().distance,
+                            };
+                        }
+                    }
+                }
+            }
+        }
+
+        // Restore original speed
+        velocity.speed = original_speed;
+    }
+}
+
+/// Helper function to find the direction from a node towards a target node.
+/// Uses simple greedy pathfinding - prefers straight lines when possible.
+fn find_direction_to_target(
+    map: &Map,
+    from_node: crate::systems::movement::NodeId,
+    target_node: crate::systems::movement::NodeId,
+) -> Option<Direction> {
+    let from_pos = map.graph.get_node(from_node).unwrap().position;
+    let target_pos = map.graph.get_node(target_node).unwrap().position;
+
+    let dx = target_pos.x as i32 - from_pos.x as i32;
+    let dy = target_pos.y as i32 - from_pos.y as i32;
+
+    // Prefer horizontal movement first, then vertical
+    let preferred_dirs = if dx.abs() > dy.abs() {
+        if dx > 0 {
+            [Direction::Right, Direction::Up, Direction::Down, Direction::Left]
+        } else {
+            [Direction::Left, Direction::Up, Direction::Down, Direction::Right]
+        }
+    } else if dy > 0 {
+        [Direction::Down, Direction::Left, Direction::Right, Direction::Up]
+    } else {
+        [Direction::Up, Direction::Left, Direction::Right, Direction::Down]
+    };
+
+    // Return first available direction towards target
+    for direction in preferred_dirs {
+        if let Some(edge) = map.graph.adjacency_list[from_node as usize].get(direction) {
+            if edge.traversal_flags.contains(TraversalFlags::GHOST) {
+                return Some(direction);
+            }
+        }
+    }
+
+    None
+}
+
+/// Unified system that manages ghost state transitions and animations with component swapping
+pub fn ghost_state_system(
+    mut commands: Commands,
+    animations: Res<GhostAnimations>,
+    mut ghosts: Query<(bevy_ecs::entity::Entity, &Ghost, &mut GhostState, &mut LastAnimationState)>,
+) {
+    for (entity, ghost_type, mut ghost_state, mut last_animation_state) in ghosts.iter_mut() {
+        // Tick the ghost state to handle internal transitions (like flashing)
+        let _ = ghost_state.tick();
+
+        // Only update animation if the animation state actually changed
+        let current_animation_state = ghost_state.animation_state();
+        if last_animation_state.0 != current_animation_state {
+            match current_animation_state {
+                GhostAnimation::Frightened { flash } => {
+                    // Remove DirectionalAnimation, add LinearAnimation
+                    commands
+                        .entity(entity)
+                        .remove::<DirectionalAnimation>()
+                        .insert(*animations.frightened(flash));
+                }
+                GhostAnimation::Normal => {
+                    // Remove LinearAnimation, add DirectionalAnimation
+                    commands
+                        .entity(entity)
+                        .remove::<LinearAnimation>()
+                        .insert(*animations.get_normal(ghost_type).unwrap());
+                }
+                GhostAnimation::Eyes => {
+                    // Remove LinearAnimation, add DirectionalAnimation (eyes animation)
+                    commands.entity(entity).remove::<LinearAnimation>().insert(*animations.eyes());
+                }
+            }
+            last_animation_state.0 = current_animation_state;
+        }
+    }
+}

src/systems/item.rs

@@ -6,8 +6,9 @@ use bevy_ecs::{
 };
 
 use crate::{
+    constants::animation::FRIGHTENED_FLASH_START_TICKS,
     events::GameEvent,
-    systems::{AudioEvent, EntityType, GhostCollider, ItemCollider, PacmanCollider, ScoreResource, Vulnerable},
+    systems::{AudioEvent, EntityType, GhostCollider, GhostState, ItemCollider, PacmanCollider, ScoreResource},
 };
 
 /// Determines if a collision between two entity types should be handled by the item system.
@@ -27,7 +28,7 @@ pub fn item_system(
     mut score: ResMut<ScoreResource>,
     pacman_query: Query<Entity, With<PacmanCollider>>,
     item_query: Query<(Entity, &EntityType), With<ItemCollider>>,
-    ghost_query: Query<Entity, With<GhostCollider>>,
+    mut ghost_query: Query<&mut GhostState, With<GhostCollider>>,
     mut events: EventWriter<AudioEvent>,
 ) {
     for event in collision_events.read() {
@@ -54,16 +55,16 @@ pub fn item_system(
                         events.write(AudioEvent::PlayEat);
                     }
 
-                    // Make ghosts vulnerable when power pellet is collected
+                    // Make ghosts frightened when power pellet is collected
                     if *entity_type == EntityType::PowerPellet {
                         // Convert seconds to frames (assumes 60 FPS)
-                        let total_ticks = 60 * 5;
+                        let total_ticks = 60 * 5; // 5 seconds total
 
-                        // Add Vulnerable component to all ghosts
+                        // Set all ghosts to frightened state, except those in Eyes state
-                        for ghost_entity in ghost_query.iter() {
+                        for mut ghost_state in ghost_query.iter_mut() {
-                            commands.entity(ghost_entity).insert(Vulnerable {
+                            if !matches!(*ghost_state, GhostState::Eyes) {
-                                remaining_ticks: total_ticks,
+                                *ghost_state = GhostState::new_frightened(total_ticks, FRIGHTENED_FLASH_START_TICKS);
-                            });
+                            }
                         }
                     }
                 }

src/systems/mod.rs

@@ -16,7 +16,6 @@ pub mod player;
 pub mod profiling;
 pub mod render;
 pub mod stage;
-pub mod vulnerable;
 
 pub use self::audio::*;
 pub use self::blinking::*;
@@ -31,4 +30,3 @@ pub use self::player::*;
 pub use self::profiling::*;
 pub use self::render::*;
 pub use self::stage::*;
-pub use self::vulnerable::*;

src/systems/movement.rs

@@ -8,7 +8,7 @@ use glam::Vec2;
 ///
 /// Nodes represent discrete movement targets in the maze. The index directly corresponds to the node's position in the
 /// graph's internal storage arrays.
-pub type NodeId = usize;
+pub type NodeId = u16;
 
 /// A component that represents the speed and cardinal direction of an entity.
 /// Speed is static, only applied when the entity has an edge to traverse.
@@ -57,7 +57,7 @@ impl Position {
         let pos = match &self {
             Position::Stopped { node } => {
                 // Entity is stationary at a node
-                let node = graph.get_node(*node).ok_or(EntityError::NodeNotFound(*node))?;
+                let node = graph.get_node(*node).ok_or(EntityError::NodeNotFound(*node as usize))?;
                 node.position
             }
             Position::Moving {
@@ -66,11 +66,12 @@ impl Position {
                 remaining_distance,
             } => {
                 // Entity is traveling between nodes
-                let from_node = graph.get_node(*from).ok_or(EntityError::NodeNotFound(*from))?;
+                let from_node = graph.get_node(*from).ok_or(EntityError::NodeNotFound(*from as usize))?;
-                let to_node = graph.get_node(*to).ok_or(EntityError::NodeNotFound(*to))?;
+                let to_node = graph.get_node(*to).ok_or(EntityError::NodeNotFound(*to as usize))?;
-                let edge = graph
+                let edge = graph.find_edge(*from, *to).ok_or(EntityError::EdgeNotFound {
-                    .find_edge(*from, *to)
+                    from: *from as usize,
-                    .ok_or(EntityError::EdgeNotFound { from: *from, to: *to })?;
+                    to: *to as usize,
+                })?;
 
                 // For zero-distance edges (tunnels), progress >= 1.0 means we're at the target
                 if edge.distance == 0.0 {

src/systems/player.rs

@@ -1,5 +1,4 @@
 use bevy_ecs::{
-    component::Component,
     event::{EventReader, EventWriter},
     query::{With, Without},
     system::{Query, Res, ResMut},
@@ -17,28 +16,6 @@ use crate::{
     },
 };
 
-/// Lifecycle state for the player entity.
-#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
-pub enum PlayerLifecycle {
-    Spawning,
-    Alive,
-    Dying,
-    Respawning,
-}
-
-impl PlayerLifecycle {
-    /// Returns true when gameplay input and movement should be active
-    pub fn is_interactive(self) -> bool {
-        matches!(self, PlayerLifecycle::Alive)
-    }
-}
-
-impl Default for PlayerLifecycle {
-    fn default() -> Self {
-        PlayerLifecycle::Spawning
-    }
-}
-
 pub fn can_traverse(entity_type: EntityType, edge: Edge) -> bool {
     let entity_flags = entity_type.traversal_flags();
     edge.traversal_flags.contains(entity_flags)
@@ -64,7 +41,7 @@ pub fn player_control_system(
             match command {
                 GameCommand::MovePlayer(direction) => {
                     // Get the player's movable component (ensuring there is only one player)
-                    let (mut buffered_direction) = match players.single_mut() {
+                    let mut buffered_direction = match players.single_mut() {
                         Ok(tuple) => tuple,
                         Err(e) => {
                             errors.write(GameError::InvalidState(format!(
@@ -101,22 +78,16 @@ pub fn player_control_system(
 /// Handles movement logic including buffered direction changes, edge traversal validation, and continuous movement between nodes.
 /// When stopped, prioritizes buffered directions for responsive controls, falling back to current direction.
 /// Supports movement chaining within a single frame when traveling at high speeds.
+#[allow(clippy::type_complexity)]
 pub fn player_movement_system(
     map: Res<Map>,
     delta_time: Res<DeltaTime>,
     mut entities: Query<
-        (
+        (&MovementModifiers, &mut Position, &mut Velocity, &mut BufferedDirection),
-            &PlayerLifecycle,
-            &MovementModifiers,
-            &mut Position,
-            &mut Velocity,
-            &mut BufferedDirection,
-        ),
         (With<PlayerControlled>, Without<Frozen>),
     >,
-    // mut errors: EventWriter<GameError>,
 ) {
-    for (lifecycle, modifiers, mut position, mut velocity, mut buffered_direction) in entities.iter_mut() {
+    for (modifiers, mut position, mut velocity, mut buffered_direction) in entities.iter_mut() {
         // Decrement the buffered direction remaining time
         if let BufferedDirection::Some {
             direction,

src/systems/profiling.rs

@@ -25,6 +25,7 @@ pub enum SystemId {
     Audio,
     Blinking,
     DirectionalRender,
+    LinearRender,
     DirtyRender,
     HudRender,
     Render,
@@ -35,6 +36,8 @@ pub enum SystemId {
     PlayerMovement,
     GhostCollision,
     Stage,
+    GhostStateAnimation,
+    EatenGhost,
 }
 
 impl Display for SystemId {
@@ -109,28 +112,26 @@ impl SystemTimings {
     }
 
     pub fn get_total_stats(&self) -> (Duration, Duration) {
+        let duration_sums = {
             let timings = self.timings.read();
-        let mut all_durations = Vec::new();
+            timings
+                .iter()
+                .map(|(_, queue)| queue.lock().iter().sum::<Duration>())
+                .collect::<Vec<_>>()
+        };
 
-        for queue in timings.values() {
+        let mean = duration_sums.iter().sum::<Duration>() / duration_sums.len() as u32;
-            all_durations.extend(queue.lock().iter().map(|d| d.as_secs_f64() * 1000.0));
+        let variance = duration_sums
-        }
+            .iter()
+            .map(|x| {
+                let diff_secs = x.as_secs_f64() - mean.as_secs_f64();
+                diff_secs * diff_secs
+            })
+            .sum::<f64>()
+            / duration_sums.len() as f64;
+        let std_dev_secs = variance.sqrt();
 
-        if all_durations.is_empty() {
+        (mean, Duration::from_secs_f64(std_dev_secs))
-            return (Duration::ZERO, Duration::ZERO);
-        }
-
-        let count = all_durations.len() as f64;
-        let sum: f64 = all_durations.iter().sum();
-        let mean = sum / count;
-
-        let variance = all_durations.iter().map(|x| (x - mean).powi(2)).sum::<f64>() / count;
-        let std_dev = variance.sqrt();
-
-        (
-            Duration::from_secs_f64(mean / 1000.0),
-            Duration::from_secs_f64(std_dev / 1000.0),
-        )
     }
 
     pub fn format_timing_display(&self) -> SmallVec<[String; SystemId::COUNT]> {
@@ -144,16 +145,14 @@ impl SystemTimings {
         };
 
         // Collect timing data for formatting
-        let mut timing_data = Vec::new();
+        let mut timing_data = vec![(effective_fps, total_avg, total_std)];
 
-        // Add total stats
+        // Sort the stats by average duration
-        timing_data.push((effective_fps, total_avg, total_std));
-
-        // Add top 5 most expensive systems
         let mut sorted_stats: Vec<_> = stats.iter().collect();
         sorted_stats.sort_by(|a, b| b.1 .0.cmp(&a.1 .0));
 
-        for (name, (avg, std_dev)) in sorted_stats.iter().take(5) {
+        // Add the top 5 most expensive systems
+        for (name, (avg, std_dev)) in sorted_stats.iter().take(7) {
             timing_data.push((name.to_string(), *avg, *std_dev));
         }
 

src/systems/render.rs

@@ -2,7 +2,7 @@ use crate::constants::CANVAS_SIZE;
 use crate::error::{GameError, TextureError};
 use crate::map::builder::Map;
 use crate::systems::{
-    Blinking, DeltaTime, DirectionalAnimated, EntityType, GhostCollider, PlayerControlled, Position, Renderable, ScoreResource,
+    DebugState, DebugTextureResource, DeltaTime, DirectionalAnimation, LinearAnimation, Position, Renderable, ScoreResource,
     StartupSequence, Velocity,
 };
 use crate::texture::sprite::SpriteAtlas;
@@ -10,13 +10,13 @@ use crate::texture::text::TextTexture;
 use bevy_ecs::component::Component;
 use bevy_ecs::entity::Entity;
 use bevy_ecs::event::EventWriter;
-use bevy_ecs::query::{Changed, Or, With, Without};
+use bevy_ecs::query::{Changed, Or, Without};
 use bevy_ecs::removal_detection::RemovedComponents;
 use bevy_ecs::resource::Resource;
 use bevy_ecs::system::{NonSendMut, Query, Res, ResMut};
 use sdl2::pixels::Color;
 use sdl2::rect::{Point, Rect};
-use sdl2::render::{Canvas, Texture};
+use sdl2::render::{BlendMode, Canvas, Texture};
 use sdl2::video::Window;
 
 #[derive(Resource, Default)]
@@ -28,43 +28,73 @@ pub struct Hidden;
 #[allow(clippy::type_complexity)]
 pub fn dirty_render_system(
     mut dirty: ResMut<RenderDirty>,
-    changed_renderables: Query<(), Or<(Changed<Renderable>, Changed<Position>)>>,
+    changed: Query<(), Or<(Changed<Renderable>, Changed<Position>)>>,
+    removed_hidden: RemovedComponents<Hidden>,
     removed_renderables: RemovedComponents<Renderable>,
 ) {
-    if !changed_renderables.is_empty() || !removed_renderables.is_empty() {
+    if !changed.is_empty() || !removed_hidden.is_empty() || !removed_renderables.is_empty() {
         dirty.0 = true;
     }
 }
 
-/// Updates the directional animated texture of an entity.
+/// Updates directional animated entities with synchronized timing across directions.
 ///
-/// This runs before the render system so it can update the sprite based on the current direction of travel, as well as whether the entity is moving.
+/// This runs before the render system to update sprites based on current direction and movement state.
+/// All directions share the same frame timing to ensure perfect synchronization.
 pub fn directional_render_system(
     dt: Res<DeltaTime>,
-    mut renderables: Query<(&Position, &Velocity, &mut DirectionalAnimated, &mut Renderable)>,
+    mut query: Query<(&Position, &Velocity, &mut DirectionalAnimation, &mut Renderable)>,
-    mut errors: EventWriter<GameError>,
 ) {
-    for (position, velocity, mut texture, mut renderable) in renderables.iter_mut() {
+    let ticks = (dt.0 * 60.0).round() as u16; // Convert from seconds to ticks at 60 ticks/sec
-        let stopped = matches!(position, Position::Stopped { .. });
-        let current_direction = velocity.direction;
 
-        let texture = if stopped {
+    for (position, velocity, mut anim, mut renderable) in query.iter_mut() {
-            texture.stopped_textures[current_direction.as_usize()].as_mut()
+        let stopped = matches!(position, Position::Stopped { .. });
+
+        // Only tick animation when moving to preserve stopped frame
+        if !stopped {
+            // Tick shared animation state
+            anim.time_bank += ticks;
+            while anim.time_bank >= anim.frame_duration {
+                anim.time_bank -= anim.frame_duration;
+                anim.current_frame += 1;
+            }
+        }
+
+        // Get tiles for current direction and movement state
+        let tiles = if stopped {
+            anim.stopped_tiles.get(velocity.direction)
         } else {
-            texture.textures[current_direction.as_usize()].as_mut()
+            anim.moving_tiles.get(velocity.direction)
         };
 
-        if let Some(texture) = texture {
+        if !tiles.is_empty() {
-            if !stopped {
+            let new_tile = tiles.get_tile(anim.current_frame);
-                texture.tick(dt.0);
+            if renderable.sprite != new_tile {
-            }
+                renderable.sprite = new_tile;
-            let new_tile = *texture.current_tile();
+            }
+        }
+    }
+}
+
+/// Updates linear animated entities (used for non-directional animations like frightened ghosts).
+///
+/// This system handles entities that use LinearAnimation component for simple frame cycling.
+pub fn linear_render_system(dt: Res<DeltaTime>, mut query: Query<(&mut LinearAnimation, &mut Renderable)>) {
+    let ticks = (dt.0 * 60.0).round() as u16; // Convert from seconds to ticks at 60 ticks/sec
+
+    for (mut anim, mut renderable) in query.iter_mut() {
+        // Tick animation
+        anim.time_bank += ticks;
+        while anim.time_bank >= anim.frame_duration {
+            anim.time_bank -= anim.frame_duration;
+            anim.current_frame += 1;
+        }
+
+        if !anim.tiles.is_empty() {
+            let new_tile = anim.tiles.get_tile(anim.current_frame);
             if renderable.sprite != new_tile {
                 renderable.sprite = new_tile;
             }
-        } else {
-            errors.write(TextureError::RenderFailed("Entity has no texture".to_string()).into());
-            continue;
         }
     }
 }
@@ -77,12 +107,14 @@ pub struct BackbufferResource(pub Texture<'static>);
 
 /// Renders the HUD (score, lives, etc.) on top of the game.
 pub fn hud_render_system(
+    mut backbuffer: NonSendMut<BackbufferResource>,
     mut canvas: NonSendMut<&mut Canvas<Window>>,
     mut atlas: NonSendMut<SpriteAtlas>,
     score: Res<ScoreResource>,
     startup: Res<StartupSequence>,
     mut errors: EventWriter<GameError>,
 ) {
+    let _ = canvas.with_texture_canvas(&mut backbuffer.0, |canvas| {
         let mut text_renderer = TextTexture::new(1.0);
 
         // Render lives and high score text in white
@@ -90,19 +122,27 @@ pub fn hud_render_system(
         let lives_text = format!("{lives}UP   HIGH SCORE   ");
         let lives_position = glam::UVec2::new(4 + 8 * 3, 2); // x_offset + lives_offset * 8, y_offset
 
-    if let Err(e) = text_renderer.render(&mut canvas, &mut atlas, &lives_text, lives_position) {
+        if let Err(e) = text_renderer.render(canvas, &mut atlas, &lives_text, lives_position) {
             errors.write(TextureError::RenderFailed(format!("Failed to render lives text: {}", e)).into());
         }
 
-    // Render score text in yellow (Pac-Man's color)
+        // Render score text
         let score_text = format!("{:02}", score.0);
         let score_offset = 7 - (score_text.len() as i32);
         let score_position = glam::UVec2::new(4 + 8 * score_offset as u32, 10); // x_offset + score_offset * 8, 8 + y_offset
 
-    if let Err(e) = text_renderer.render(&mut canvas, &mut atlas, &score_text, score_position) {
+        if let Err(e) = text_renderer.render(canvas, &mut atlas, &score_text, score_position) {
             errors.write(TextureError::RenderFailed(format!("Failed to render score text: {}", e)).into());
         }
 
+        // Render high score text
+        let high_score_text = format!("{:02}", score.0);
+        let high_score_offset = 17 - (high_score_text.len() as i32);
+        let high_score_position = glam::UVec2::new(4 + 8 * high_score_offset as u32, 10); // x_offset + score_offset * 8, 8 + y_offset
+        if let Err(e) = text_renderer.render(canvas, &mut atlas, &high_score_text, high_score_position) {
+            errors.write(TextureError::RenderFailed(format!("Failed to render high score text: {}", e)).into());
+        }
+
         // Render text based on StartupSequence stage
         if matches!(
             *startup,
@@ -111,7 +151,7 @@ pub fn hud_render_system(
             let ready_text = "READY!";
             let ready_width = text_renderer.text_width(ready_text);
             let ready_position = glam::UVec2::new((CANVAS_SIZE.x - ready_width) / 2, 160);
-        if let Err(e) = text_renderer.render_with_color(&mut canvas, &mut atlas, ready_text, ready_position, Color::YELLOW) {
+            if let Err(e) = text_renderer.render_with_color(canvas, &mut atlas, ready_text, ready_position, Color::YELLOW) {
                 errors.write(TextureError::RenderFailed(format!("Failed to render READY text: {}", e)).into());
             }
 
@@ -121,12 +161,13 @@ pub fn hud_render_system(
                 let player_one_position = glam::UVec2::new((CANVAS_SIZE.x - player_one_width) / 2, 113);
 
                 if let Err(e) =
-                text_renderer.render_with_color(&mut canvas, &mut atlas, player_one_text, player_one_position, Color::CYAN)
+                    text_renderer.render_with_color(canvas, &mut atlas, player_one_text, player_one_position, Color::CYAN)
                 {
                     errors.write(TextureError::RenderFailed(format!("Failed to render PLAYER ONE text: {}", e)).into());
                 }
             }
         }
+    });
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -187,3 +228,25 @@ pub fn render_system(
 
     canvas.copy(&backbuffer.0, None, None).unwrap();
 }
+
+pub fn present_system(
+    mut canvas: NonSendMut<&mut Canvas<Window>>,
+    mut dirty: ResMut<RenderDirty>,
+    backbuffer: NonSendMut<BackbufferResource>,
+    debug_texture: NonSendMut<DebugTextureResource>,
+    debug_state: Res<DebugState>,
+) {
+    if dirty.0 {
+        // Copy the backbuffer to the main canvas
+        canvas.copy(&backbuffer.0, None, None).unwrap();
+
+        // Copy the debug texture to the canvas
+        if debug_state.enabled {
+            canvas.set_blend_mode(BlendMode::Blend);
+            canvas.copy(&debug_texture.0, None, None).unwrap();
+        }
+
+        canvas.present();
+        dirty.0 = false;
+    }
+}

src/systems/stage.rs

@@ -6,7 +6,7 @@ use bevy_ecs::{
 };
 use tracing::debug;
 
-use crate::systems::{Frozen, GhostCollider, Hidden, PlayerControlled};
+use crate::systems::{Blinking, Frozen, GhostCollider, Hidden, PlayerControlled};
 
 #[derive(Resource, Debug, Clone, Copy)]
 pub enum StartupSequence {
@@ -72,17 +72,27 @@ impl StartupSequence {
 pub fn startup_stage_system(
     mut startup: ResMut<StartupSequence>,
     mut commands: Commands,
+    mut blinking_query: Query<Entity, With<Blinking>>,
     mut player_query: Query<Entity, With<PlayerControlled>>,
     mut ghost_query: Query<Entity, With<GhostCollider>>,
 ) {
     if let Some((from, to)) = startup.tick() {
         debug!("StartupSequence transition from {from:?} to {to:?}");
         match (from, to) {
-            // (StartupSequence::TextOnly { .. }, StartupSequence::CharactersVisible { .. }) => {}
+            (StartupSequence::TextOnly { .. }, StartupSequence::CharactersVisible { .. }) => {
-            (StartupSequence::CharactersVisible { .. }, StartupSequence::GameActive) => {
+                // Unhide the player & ghosts
-                // Remove Frozen/Hidden tags from all entities and enable player input
                 for entity in player_query.iter_mut().chain(ghost_query.iter_mut()) {
-                    commands.entity(entity).remove::<(Frozen, Hidden)>();
+                    commands.entity(entity).remove::<Hidden>();
+                }
+            }
+            (StartupSequence::CharactersVisible { .. }, StartupSequence::GameActive) => {
+                // Unfreeze the player & ghosts & pellet blinking
+                for entity in player_query
+                    .iter_mut()
+                    .chain(ghost_query.iter_mut())
+                    .chain(blinking_query.iter_mut())
+                {
+                    commands.entity(entity).remove::<Frozen>();
                 }
             }
             _ => {}

src/systems/vulnerable.rs

@@ -1,20 +0,0 @@
-use bevy_ecs::query::With;
-use bevy_ecs::system::{Commands, Query};
-
-use crate::systems::{GhostCollider, Vulnerable};
-
-/// System that decrements the remaining_ticks on Vulnerable components and removes them when they reach zero
-pub fn vulnerable_tick_system(
-    mut commands: Commands,
-    mut vulnerable_query: Query<(bevy_ecs::entity::Entity, &mut Vulnerable), With<GhostCollider>>,
-) {
-    for (entity, mut vulnerable) in vulnerable_query.iter_mut() {
-        if vulnerable.remaining_ticks > 0 {
-            vulnerable.remaining_ticks -= 1;
-        }
-
-        if vulnerable.remaining_ticks == 0 {
-            commands.entity(entity).remove::<Vulnerable>();
-        }
-    }
-}

src/texture/animated.rs

@@ -1,81 +1,73 @@
-use crate::error::{AnimatedTextureError, GameError, GameResult, TextureError};
+use crate::map::direction::Direction;
 use crate::texture::sprite::AtlasTile;
 
-/// Frame-based animation system for cycling through multiple sprite tiles.
+/// Fixed-size tile sequence that avoids heap allocation
-///
+#[derive(Clone, Copy, Debug)]
-/// Manages automatic frame progression based on elapsed time.
+pub struct TileSequence {
-/// Uses a time banking system to ensure consistent animation speed regardless of frame rate variations.
+    tiles: [AtlasTile; 4], // Fixed array, max 4 frames
-#[derive(Debug, Clone)]
+    count: usize,          // Actual number of frames used
-pub struct AnimatedTexture {
-    /// Sequence of sprite tiles that make up the animation frames
-    tiles: Vec<AtlasTile>,
-    /// Duration each frame should be displayed (in seconds)
-    frame_duration: f32,
-    /// Index of the currently active frame in the tiles vector
-    current_frame: usize,
-    /// Accumulated time since the last frame change (for smooth timing)
-    time_bank: f32,
 }
 
-impl AnimatedTexture {
+impl TileSequence {
-    pub fn new(tiles: Vec<AtlasTile>, frame_duration: f32) -> GameResult<Self> {
+    /// Creates a new tile sequence from a slice of tiles
-        if frame_duration <= 0.0 {
+    pub fn new(tiles: &[AtlasTile]) -> Self {
-            return Err(GameError::Texture(TextureError::Animated(
+        let mut tile_array = [AtlasTile {
-                AnimatedTextureError::InvalidFrameDuration(frame_duration),
+            pos: glam::U16Vec2::ZERO,
-            )));
+            size: glam::U16Vec2::ZERO,
-        }
+            color: None,
+        }; 4];
 
-        Ok(Self {
+        let count = tiles.len().min(4);
-            tiles,
+        tile_array[..count].copy_from_slice(&tiles[..count]);
-            frame_duration,
-            current_frame: 0,
-            time_bank: 0.0,
-        })
-    }
 
-    /// Advances the animation by the specified time delta with automatic frame cycling.
+        Self {
-    ///
+            tiles: tile_array,
-    /// Accumulates time in the time bank and progresses through frames when enough
+            count,
-    /// time has elapsed. Supports frame rates independent of game frame rate by
-    /// potentially advancing multiple frames in a single call if `dt` is large.
-    /// Animation loops automatically when reaching the final frame.
-    ///
-    /// # Arguments
-    ///
-    /// * `dt` - Time elapsed since the last tick (typically frame delta time)
-    pub fn tick(&mut self, dt: f32) {
-        self.time_bank += dt;
-        while self.time_bank >= self.frame_duration {
-            self.time_bank -= self.frame_duration;
-            self.current_frame = (self.current_frame + 1) % self.tiles.len();
         }
     }
 
-    pub fn current_tile(&self) -> &AtlasTile {
+    /// Returns the tile at the given frame index, wrapping if necessary
-        &self.tiles[self.current_frame]
+    pub fn get_tile(&self, frame: usize) -> AtlasTile {
+        if self.count == 0 {
+            // Return a default empty tile if no tiles
+            AtlasTile {
+                pos: glam::U16Vec2::ZERO,
+                size: glam::U16Vec2::ZERO,
+                color: None,
+            }
+        } else {
+            self.tiles[frame % self.count]
+        }
     }
 
-    /// Returns the current frame index.
+    /// Returns true if this sequence has no tiles
-    #[allow(dead_code)]
+    pub fn is_empty(&self) -> bool {
-    pub fn current_frame(&self) -> usize {
+        self.count == 0
-        self.current_frame
+    }
 }
 
-    /// Returns the time bank.
+/// Type-safe directional tile storage with named fields
-    #[allow(dead_code)]
+#[derive(Clone, Copy, Debug)]
-    pub fn time_bank(&self) -> f32 {
+pub struct DirectionalTiles {
-        self.time_bank
+    pub up: TileSequence,
+    pub down: TileSequence,
+    pub left: TileSequence,
+    pub right: TileSequence,
 }
 
-    /// Returns the frame duration.
+impl DirectionalTiles {
-    #[allow(dead_code)]
+    /// Creates a new DirectionalTiles with different sequences per direction
-    pub fn frame_duration(&self) -> f32 {
+    pub fn new(up: TileSequence, down: TileSequence, left: TileSequence, right: TileSequence) -> Self {
-        self.frame_duration
+        Self { up, down, left, right }
     }
 
-    /// Returns the number of tiles in the animation.
+    /// Gets the tile sequence for the given direction
-    #[allow(dead_code)]
+    pub fn get(&self, direction: Direction) -> &TileSequence {
-    pub fn tiles_len(&self) -> usize {
+        match direction {
-        self.tiles.len()
+            Direction::Up => &self.up,
+            Direction::Down => &self.down,
+            Direction::Left => &self.left,
+            Direction::Right => &self.right,
+        }
     }
 }

src/texture/sprite.rs

@@ -3,24 +3,21 @@ use glam::U16Vec2;
 use sdl2::pixels::Color;
 use sdl2::rect::Rect;
 use sdl2::render::{Canvas, RenderTarget, Texture};
-use serde::Deserialize;
 use std::collections::HashMap;
 
 use crate::error::TextureError;
 
 /// Atlas frame mapping data loaded from JSON metadata files.
-#[derive(Clone, Debug, Deserialize)]
+#[derive(Clone, Debug)]
 pub struct AtlasMapper {
     /// Mapping from sprite name to frame bounds within the atlas texture
     pub frames: HashMap<String, MapperFrame>,
 }
 
-#[derive(Copy, Clone, Debug, Deserialize)]
+#[derive(Copy, Clone, Debug)]
 pub struct MapperFrame {
-    pub x: u16,
+    pub pos: U16Vec2,
-    pub y: u16,
+    pub size: U16Vec2,
-    pub width: u16,
-    pub height: u16,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -108,8 +105,8 @@ impl SpriteAtlas {
     /// for repeated use in animations and entity sprites.
     pub fn get_tile(&self, name: &str) -> Option<AtlasTile> {
         self.tiles.get(name).map(|frame| AtlasTile {
-            pos: U16Vec2::new(frame.x, frame.y),
+            pos: frame.pos,
-            size: U16Vec2::new(frame.width, frame.height),
+            size: frame.size,
             color: None,
         })
     }

tests/animated.rs

@@ -1,62 +1,57 @@
-use glam::U16Vec2;
+// use glam::U16Vec2;
-use pacman::error::{AnimatedTextureError, GameError, TextureError};
+// use pacman::error::{AnimatedTextureError, GameError, TextureError};
-use pacman::texture::animated::AnimatedTexture;
+// use pacman::texture::sprite::AtlasTile;
-use pacman::texture::sprite::AtlasTile;
+// use sdl2::pixels::Color;
-use sdl2::pixels::Color;
+// use smallvec::smallvec;
 
-fn mock_atlas_tile(id: u32) -> AtlasTile {
+// fn mock_atlas_tile(id: u32) -> AtlasTile {
-    AtlasTile {
+//     AtlasTile {
-        pos: U16Vec2::new(0, 0),
+//         pos: U16Vec2::new(0, 0),
-        size: U16Vec2::new(16, 16),
+//         size: U16Vec2::new(16, 16),
-        color: Some(Color::RGB(id as u8, 0, 0)),
+//         color: Some(Color::RGB(id as u8, 0, 0)),
-    }
+//     }
-}
+// }
 
-#[test]
+// #[test]
-fn test_animated_texture_creation_errors() {
+// fn test_animated_texture_creation_errors() {
-    let tiles = vec![mock_atlas_tile(1), mock_atlas_tile(2)];
+//     let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
 
-    assert!(matches!(
+//     assert!(matches!(
-        AnimatedTexture::new(tiles.clone(), 0.0).unwrap_err(),
+//         AnimatedTexture::new(tiles.clone(), 0).unwrap_err(),
-        GameError::Texture(TextureError::Animated(AnimatedTextureError::InvalidFrameDuration(0.0)))
+//         GameError::Texture(TextureError::Animated(AnimatedTextureError::InvalidFrameDuration(0)))
-    ));
+//     ));
+// }
 
-    assert!(matches!(
+// #[test]
-        AnimatedTexture::new(tiles, -0.1).unwrap_err(),
+// fn test_animated_texture_advancement() {
-        GameError::Texture(TextureError::Animated(AnimatedTextureError::InvalidFrameDuration(-0.1)))
+//     let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2), mock_atlas_tile(3)];
-    ));
+//     let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
-}
 
-#[test]
+//     assert_eq!(texture.current_frame(), 0);
-fn test_animated_texture_advancement() {
-    let tiles = vec![mock_atlas_tile(1), mock_atlas_tile(2), mock_atlas_tile(3)];
-    let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
 
-    assert_eq!(texture.current_frame(), 0);
+//     texture.tick(25);
+//     assert_eq!(texture.current_frame(), 2);
+//     assert_eq!(texture.time_bank(), 5);
+// }
 
-    texture.tick(0.25);
+// #[test]
-    assert_eq!(texture.current_frame(), 2);
+// fn test_animated_texture_wrap_around() {
-    assert!((texture.time_bank() - 0.05).abs() < 0.001);
+//     let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
-}
+//     let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
 
-#[test]
+//     texture.tick(10);
-fn test_animated_texture_wrap_around() {
+//     assert_eq!(texture.current_frame(), 1);
-    let tiles = vec![mock_atlas_tile(1), mock_atlas_tile(2)];
-    let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
 
-    texture.tick(0.1);
+//     texture.tick(10);
-    assert_eq!(texture.current_frame(), 1);
+//     assert_eq!(texture.current_frame(), 0);
+// }
 
-    texture.tick(0.1);
+// #[test]
-    assert_eq!(texture.current_frame(), 0);
+// fn test_animated_texture_single_frame() {
-}
+//     let tiles = smallvec![mock_atlas_tile(1)];
+//     let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
 
-#[test]
+//     texture.tick(10);
-fn test_animated_texture_single_frame() {
+//     assert_eq!(texture.current_frame(), 0);
-    let tiles = vec![mock_atlas_tile(1)];
+//     assert_eq!(texture.current_tile().color.unwrap().r, 1);
-    let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
+// }
-
-    texture.tick(0.1);
-    assert_eq!(texture.current_frame(), 0);
-    assert_eq!(texture.current_tile().color.unwrap().r, 1);
-}

tests/collision.rs

@@ -5,7 +5,8 @@ use pacman::{
     events::GameEvent,
     map::builder::Map,
     systems::{
-        check_collision, collision_system, Collider, EntityType, Ghost, GhostCollider, ItemCollider, PacmanCollider, Position,
+        check_collision, collision_system, Collider, EntityType, Ghost, GhostCollider, ItemCollider, NodeId, PacmanCollider,
+        Position,
     },
 };
 
@@ -59,7 +60,7 @@ fn spawn_test_ghost(world: &mut World) -> Entity {
 fn spawn_test_ghost_at_node(world: &mut World, node: usize) -> Entity {
     world
         .spawn((
-            Position::Stopped { node },
+            Position::Stopped { node: node as NodeId },
             Collider { size: 12.0 },
             GhostCollider,
             Ghost::Blinky,

tests/direction.rs

@@ -1,4 +1,4 @@
-use glam::IVec2;
+use glam::I8Vec2;
 use pacman::map::direction::*;
 
 #[test]
@@ -18,14 +18,14 @@ fn test_direction_opposite() {
 #[test]
 fn test_direction_as_ivec2() {
     let test_cases = [
-        (Direction::Up, -IVec2::Y),
+        (Direction::Up, -I8Vec2::Y),
-        (Direction::Down, IVec2::Y),
+        (Direction::Down, I8Vec2::Y),
-        (Direction::Left, -IVec2::X),
+        (Direction::Left, -I8Vec2::X),
-        (Direction::Right, IVec2::X),
+        (Direction::Right, I8Vec2::X),
     ];
 
     for (dir, expected) in test_cases {
         assert_eq!(dir.as_ivec2(), expected);
-        assert_eq!(IVec2::from(dir), expected);
+        assert_eq!(I8Vec2::from(dir), expected);
     }
 }

tests/error.rs

@@ -1,6 +1,5 @@
 use pacman::error::{
-    AnimatedTextureError, AssetError, EntityError, GameError, GameResult, IntoGameError, MapError, OptionExt, ParseError,
+    AssetError, EntityError, GameError, GameResult, IntoGameError, MapError, OptionExt, ParseError, ResultExt, TextureError,
-    ResultExt, TextureError,
 };
 use std::io;
 
@@ -46,13 +45,6 @@ fn test_game_error_from_io_error() {
     assert!(matches!(game_error, GameError::Io(_)));
 }
 
-#[test]
-fn test_texture_error_from_animated_error() {
-    let animated_error = AnimatedTextureError::InvalidFrameDuration(-1.0);
-    let texture_error: TextureError = animated_error.into();
-    assert!(matches!(texture_error, TextureError::Animated(_)));
-}
-
 #[test]
 fn test_asset_error_from_io_error() {
     let io_error = io::Error::new(io::ErrorKind::PermissionDenied, "Permission denied");
@@ -78,12 +70,6 @@ fn test_entity_error_display() {
     assert_eq!(error.to_string(), "Edge not found: from 1 to 2");
 }
 
-#[test]
-fn test_animated_texture_error_display() {
-    let error = AnimatedTextureError::InvalidFrameDuration(0.0);
-    assert_eq!(error.to_string(), "Frame duration must be positive, got 0");
-}
-
 #[test]
 fn test_into_game_error_trait() {
     let result: Result<i32, io::Error> = Err(io::Error::new(io::ErrorKind::Other, "test error"));
@@ -146,13 +132,3 @@ fn test_result_ext_error() {
         panic!("Expected InvalidState error");
     }
 }
-
-#[test]
-fn test_error_chain_conversions() {
-    // Test that we can convert through multiple levels
-    let animated_error = AnimatedTextureError::InvalidFrameDuration(-5.0);
-    let texture_error: TextureError = animated_error.into();
-    let game_error: GameError = texture_error.into();
-
-    assert!(matches!(game_error, GameError::Texture(TextureError::Animated(_))));
-}

tests/item.rs

@@ -4,8 +4,8 @@ use pacman::{
     events::GameEvent,
     map::builder::Map,
     systems::{
-        is_valid_item_collision, item_system, AudioEvent, AudioState, EntityType, ItemCollider, PacmanCollider, Position,
+        is_valid_item_collision, item_system, AudioEvent, AudioState, EntityType, Ghost, GhostCollider, GhostState, ItemCollider,
-        ScoreResource,
+        PacmanCollider, Position, ScoreResource,
     },
 };
 
@@ -75,6 +75,18 @@ fn spawn_test_item(world: &mut World, item_type: EntityType) -> Entity {
     world.spawn((Position::Stopped { node: 1 }, item_type, ItemCollider)).id()
 }
 
+fn spawn_test_ghost(world: &mut World, ghost_state: GhostState) -> Entity {
+    world
+        .spawn((
+            Position::Stopped { node: 2 },
+            Ghost::Blinky,
+            EntityType::Ghost,
+            GhostCollider,
+            ghost_state,
+        ))
+        .id()
+}
+
 fn send_collision_event(world: &mut World, entity1: Entity, entity2: Entity) {
     let mut events = world.resource_mut::<Events<GameEvent>>();
     events.send(GameEvent::Collision(entity1, entity2));
@@ -251,3 +263,40 @@ fn test_item_system_preserves_existing_score() {
     let score = world.resource::<ScoreResource>();
     assert_eq!(score.0, 110);
 }
+
+#[test]
+fn test_power_pellet_does_not_affect_ghosts_in_eyes_state() {
+    let mut world = create_test_world();
+    let pacman = spawn_test_pacman(&mut world);
+    let power_pellet = spawn_test_item(&mut world, EntityType::PowerPellet);
+
+    // Spawn a ghost in Eyes state (returning to ghost house)
+    let eyes_ghost = spawn_test_ghost(&mut world, GhostState::Eyes);
+
+    // Spawn a ghost in Normal state
+    let normal_ghost = spawn_test_ghost(&mut world, GhostState::Normal);
+
+    send_collision_event(&mut world, pacman, power_pellet);
+
+    world.run_system_once(item_system).expect("System should run successfully");
+
+    // Check that the power pellet was collected and score updated
+    let score = world.resource::<ScoreResource>();
+    assert_eq!(score.0, 50);
+
+    // Check that the power pellet was despawned
+    let power_pellet_count = world
+        .query::<&EntityType>()
+        .iter(&world)
+        .filter(|&entity_type| matches!(entity_type, EntityType::PowerPellet))
+        .count();
+    assert_eq!(power_pellet_count, 0);
+
+    // Check that the Eyes ghost state was not changed
+    let eyes_ghost_state = world.entity(eyes_ghost).get::<GhostState>().unwrap();
+    assert!(matches!(*eyes_ghost_state, GhostState::Eyes));
+
+    // Check that the Normal ghost state was changed to Frightened
+    let normal_ghost_state = world.entity(normal_ghost).get::<GhostState>().unwrap();
+    assert!(matches!(*normal_ghost_state, GhostState::Frightened { .. }));
+}

tests/map_builder.rs

@@ -26,8 +26,10 @@ fn test_map_node_positions() {
 
     for (grid_pos, &node_id) in &map.grid_to_node {
         let node = map.graph.get_node(node_id).unwrap();
-        let expected_pos = Vec2::new((grid_pos.x * CELL_SIZE as i32) as f32, (grid_pos.y * CELL_SIZE as i32) as f32)
+        let expected_pos = Vec2::new(
-            + Vec2::splat(CELL_SIZE as f32 / 2.0);
+            (grid_pos.x as i32 * CELL_SIZE as i32) as f32,
+            (grid_pos.y as i32 * CELL_SIZE as i32) as f32,
+        ) + Vec2::splat(CELL_SIZE as f32 / 2.0);
 
         assert_eq!(node.position, expected_pos);
     }

tests/player.rs

@@ -9,7 +9,7 @@ use pacman::{
     },
     systems::{
         can_traverse, player_control_system, player_movement_system, AudioState, BufferedDirection, DebugState, DeltaTime,
-        EntityType, GlobalState, PlayerControlled, Position, Velocity,
+        EntityType, GlobalState, MovementModifiers, PlayerControlled, Position, Velocity,
     },
 };
 
@@ -49,6 +49,7 @@ fn spawn_test_player(world: &mut World) -> Entity {
             },
             BufferedDirection::None,
             EntityType::Player,
+            MovementModifiers::default(),
         ))
         .id()
 }

tests/profiling.rs

@@ -5,21 +5,41 @@ use std::time::Duration;
 fn test_timing_statistics() {
     let timings = SystemTimings::default();
 
-    // Add some test data
+    // 10ms average, 2ms std dev
     timings.add_timing(SystemId::PlayerControls, Duration::from_millis(10));
     timings.add_timing(SystemId::PlayerControls, Duration::from_millis(12));
     timings.add_timing(SystemId::PlayerControls, Duration::from_millis(8));
 
+    // 2ms average, 1ms std dev
+    timings.add_timing(SystemId::Blinking, Duration::from_millis(3));
+    timings.add_timing(SystemId::Blinking, Duration::from_millis(2));
+    timings.add_timing(SystemId::Blinking, Duration::from_millis(1));
+    fn close_enough(a: Duration, b: Duration) -> bool {
+        if a > b {
+            a - b < Duration::from_micros(500) // 0.1ms
+        } else {
+            b - a < Duration::from_micros(500)
+        }
+    }
+
     let stats = timings.get_stats();
     let (avg, std_dev) = stats.get(&SystemId::PlayerControls).unwrap();
 
     // Average should be 10ms, standard deviation should be small
-    assert!((avg.as_millis() as f64 - 10.0).abs() < 1.0);
+    assert!(close_enough(*avg, Duration::from_millis(10)), "avg: {:?}", avg);
-    assert!(std_dev.as_millis() > 0);
+    assert!(close_enough(*std_dev, Duration::from_millis(2)), "std_dev: {:?}", std_dev);
 
     let (total_avg, total_std) = timings.get_total_stats();
-    assert!((total_avg.as_millis() as f64 - 10.0).abs() < 1.0);
+    assert!(
-    assert!(total_std.as_millis() > 0);
+        close_enough(total_avg, Duration::from_millis(18)),
+        "total_avg: {:?}",
+        total_avg
+    );
+    assert!(
+        close_enough(total_std, Duration::from_millis(12)),
+        "total_std: {:?}",
+        total_std
+    );
 }
 
 // #[test]

tests/sprite.rs

@@ -13,10 +13,8 @@ fn test_sprite_atlas_basic() {
     frames.insert(
         "test".to_string(),
         MapperFrame {
-            x: 10,
+            pos: U16Vec2::new(10, 20),
-            y: 20,
+            size: U16Vec2::new(32, 64),
-            width: 32,
-            height: 64,
         },
     );
 
@@ -38,19 +36,15 @@ fn test_sprite_atlas_multiple_tiles() {
     frames.insert(
         "tile1".to_string(),
         MapperFrame {
-            x: 0,
+            pos: U16Vec2::new(0, 0),
-            y: 0,
+            size: U16Vec2::new(32, 32),
-            width: 32,
-            height: 32,
         },
     );
     frames.insert(
         "tile2".to_string(),
         MapperFrame {
-            x: 32,
+            pos: U16Vec2::new(32, 0),
-            y: 0,
+            size: U16Vec2::new(64, 64),
-            width: 64,
-            height: 64,
         },
     );