fix: avoid switching ghost back to normal during eyes animation

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!(
-            &mut file,
-            "    \"{}\" => MapperFrame {{ x: {}, y: {}, width: {}, height: {} }},",
-            name, frame.x, frame.y, frame.width, frame.height
-        )
-        .unwrap();
+        writeln!(&mut file, "    \"{}\" => {},", name, frame.to_u16vec2_format()).unwrap();
     }
 
     writeln!(&mut file, "}};").unwrap();

src/constants.rs

@@ -30,6 +30,21 @@ 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 (frames per second)
+    pub const GHOST_NORMAL_SPEED: f32 = 0.2;
+    /// Eaten ghost (eyes) animation speed (frames per second)
+    pub const GHOST_EATEN_SPEED: f32 = 0.1;
+    /// Frightened ghost animation speed (frames per second)
+    pub const GHOST_FRIGHTENED_SPEED: f32 = 0.2;
+    /// Frightened ghost flashing animation speed (frames per second)
+    pub const GHOST_FLASHING_SPEED: f32 = 0.15;
+
+    /// 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/game.rs

@@ -2,23 +2,23 @@
 
 include!(concat!(env!("OUT_DIR"), "/atlas_data.rs"));
 
-use crate::constants::{MapTile, CANVAS_SIZE};
+use crate::constants::{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, present_system, Hidden, MovementModifiers};
-
 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, 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,
-    BackbufferResource, Collider, DebugFontResource, DebugState, DebugTextureResource, DeltaTime, DirectionalAnimated,
-    EntityType, Frozen, Ghost, GhostBundle, GhostCollider, GlobalState, ItemBundle, ItemCollider, MapTextureResource,
-    PacmanCollider, PlayerBundle, PlayerControlled, Renderable, ScoreResource, StartupSequence, SystemTimings,
+    eaten_ghost_system, ghost_movement_system, ghost_state_animation_system, hud_render_system, item_system, profile,
+    render_system, AudioEvent, AudioResource, AudioState, BackbufferResource, Collider, DebugFontResource, DebugState,
+    DebugTextureResource, DeltaTime, DirectionalAnimated, EntityType, Frozen, Ghost, GhostAnimationSet, GhostAnimations,
+    GhostBundle, GhostCollider, GlobalState, ItemBundle, ItemCollider, MapTextureResource, PacmanCollider, PlayerBundle,
+    PlayerControlled, Renderable, ScoreResource, StartupSequence, SystemTimings,
 };
 use crate::texture::animated::AnimatedTexture;
 use crate::texture::sprite::AtlasTile;
@@ -33,6 +33,7 @@ use sdl2::render::{BlendMode, Canvas, ScaleMode, TextureCreator};
 use sdl2::rwops::RWops;
 use sdl2::video::{Window, WindowContext};
 use sdl2::EventPump;
+use smallvec::smallvec;
 
 use crate::{
     asset::{get_asset_bytes, Asset},
@@ -158,7 +159,7 @@ impl Game {
                 Direction::Left => "pacman/left",
                 Direction::Right => "pacman/right",
             };
-            let moving_tiles = vec![
+            let moving_tiles = smallvec![
                 SpriteAtlas::get_tile(&atlas, &format!("{moving_prefix}_a.png"))
                     .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_a.png"))))?,
                 SpriteAtlas::get_tile(&atlas, &format!("{moving_prefix}_b.png"))
@@ -167,7 +168,7 @@ impl Game {
                     .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 stopped_tiles = smallvec![SpriteAtlas::get_tile(&atlas, &format!("{moving_prefix}_b.png"))
                 .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("{moving_prefix}_b.png"))))?];
 
             textures[direction.as_usize()] = Some(AnimatedTexture::new(moving_tiles, 0.08)?);
@@ -208,15 +209,7 @@ impl Game {
         EventRegistry::register_event::<GameEvent>(&mut world);
         EventRegistry::register_event::<AudioEvent>(&mut world);
 
-        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.insert_resource(Self::create_ghost_animations(&atlas)?);
         world.insert_resource(map);
         world.insert_resource(GlobalState { exit: false });
         world.insert_resource(ScoreResource(0));
@@ -229,6 +222,15 @@ impl Game {
         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>| {
                 if matches!(*event, GameEvent::Command(GameCommand::Exit)) {
@@ -255,6 +257,7 @@ impl Game {
         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 ghost_state_animation_system = profile(SystemId::GhostStateAnimation, ghost_state_animation_system);
 
         let forced_dirty_system = |mut dirty: ResMut<RenderDirty>| {
             dirty.0 = true;
@@ -271,7 +274,9 @@ impl Game {
                 .chain(),
             player_tunnel_slowdown_system,
             ghost_movement_system,
+            profile(SystemId::EatenGhost, eaten_ghost_system),
             vulnerable_tick_system,
+            ghost_state_animation_system,
             (collision_system, ghost_collision_system, item_system).chain(),
             audio_system,
             blinking_system,
@@ -298,7 +303,7 @@ impl Game {
             .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound("maze/energizer.png".to_string())))?;
 
         // Build a list of item entities to spawn from the map
-        let nodes: Vec<(usize, EntityType, AtlasTile, f32)> = world
+        let nodes: Vec<(NodeId, EntityType, AtlasTile, f32)> = world
             .resource::<Map>()
             .iter_nodes()
             .filter_map(|(id, tile)| match tile {
@@ -353,58 +358,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>().0.get(&ghost_type).unwrap().clone();
                 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,10 +379,7 @@ impl Game {
                         )?,
                         layer: 0,
                     },
-                    directional_animated: DirectionalAnimated {
-                        textures,
-                        stopped_textures,
-                    },
+                    directional_animated: animations.normal().unwrap().clone(),
                     entity_type: EntityType::Ghost,
                     collider: Collider {
                         size: crate::constants::CELL_SIZE as f32 * 1.375,
@@ -441,6 +394,106 @@ impl Game {
         Ok(())
     }
 
+    fn create_ghost_animations(atlas: &SpriteAtlas) -> GameResult<GhostAnimations> {
+        let mut animations = std::collections::HashMap::new();
+
+        for ghost_type in [Ghost::Blinky, Ghost::Pinky, Ghost::Inky, Ghost::Clyde] {
+            // Normal animations
+            let mut normal_textures = [None, None, None, None];
+            for direction in Direction::DIRECTIONS {
+                let dir_str = direction.as_ref();
+                let tile_a = atlas
+                    .get_tile(&format!("ghost/{}/{}_a.png", ghost_type.as_str(), dir_str))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/{}_a.png",
+                            ghost_type.as_str(),
+                            dir_str
+                        )))
+                    })?;
+                let tile_b = atlas
+                    .get_tile(&format!("ghost/{}/{}_b.png", ghost_type.as_str(), dir_str))
+                    .ok_or_else(|| {
+                        GameError::Texture(TextureError::AtlasTileNotFound(format!(
+                            "ghost/{}/{}_b.png",
+                            ghost_type.as_str(),
+                            dir_str
+                        )))
+                    })?;
+                let tiles = smallvec![tile_a, tile_b];
+                normal_textures[direction.as_usize()] = Some(AnimatedTexture::new(tiles, animation::GHOST_NORMAL_SPEED)?);
+            }
+            let normal = DirectionalAnimated {
+                textures: normal_textures.clone(),
+                stopped_textures: normal_textures,
+            };
+
+            // Eaten (eyes) animations
+            let mut eaten_textures = [None, None, None, None];
+            for direction in Direction::DIRECTIONS {
+                let dir_str = direction.as_ref();
+                let tile = atlas
+                    .get_tile(&format!("ghost/eyes/{}.png", dir_str))
+                    .ok_or_else(|| GameError::Texture(TextureError::AtlasTileNotFound(format!("ghost/eyes/{}.png", dir_str))))?;
+                eaten_textures[direction.as_usize()] = Some(AnimatedTexture::new(smallvec![tile], animation::GHOST_EATEN_SPEED)?);
+            }
+            let eaten = DirectionalAnimated {
+                textures: eaten_textures.clone(),
+                stopped_textures: eaten_textures,
+            };
+
+            animations.insert(
+                ghost_type,
+                GhostAnimationSet::new(
+                    normal,
+                    DirectionalAnimated::default(), // Placeholder for frightened
+                    DirectionalAnimated::default(), // Placeholder for frightened_flashing
+                    eaten,
+                ),
+            );
+        }
+
+        // Frightened animations (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())))?;
+
+        let frightened_anim = AnimatedTexture::new(
+            smallvec![frightened_blue_a, frightened_blue_b],
+            animation::GHOST_FRIGHTENED_SPEED,
+        )?;
+        let flashing_anim = AnimatedTexture::new(
+            smallvec![frightened_blue_a, frightened_white_a, frightened_blue_b, frightened_white_b],
+            animation::GHOST_FLASHING_SPEED,
+        )?;
+
+        let frightened_da = DirectionalAnimated::from_animation(frightened_anim);
+        let frightened_flashing_da = DirectionalAnimated::from_animation(flashing_anim);
+
+        for ghost_type in [Ghost::Blinky, Ghost::Pinky, Ghost::Inky, Ghost::Clyde] {
+            let entry = animations.get_mut(&ghost_type).unwrap();
+            entry.animations.insert(
+                crate::systems::GhostAnimation::Frightened { flash: false },
+                frightened_da.clone(),
+            );
+            entry.animations.insert(
+                crate::systems::GhostAnimation::Frightened { flash: true },
+                frightened_flashing_da.clone(),
+            );
+        }
+
+        Ok(GhostAnimations(animations))
+    }
+
     /// 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.y * CELL_SIZE as i32) as f32,
+            (start_pos.x as i32 * 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.y * CELL_SIZE as i32) as f32,
+                        (new_position.x as i32 * 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>,
-        house_door: &[Option<IVec2>; 2],
-    ) -> GameResult<(usize, usize, usize, usize)> {
+        grid_to_node: &HashMap<I8Vec2, NodeId>,
+        house_door: &[Option<I8Vec2>; 2],
+    ) -> 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>,
-        tunnel_ends: &[Option<IVec2>; 2],
+        grid_to_node: &HashMap<I8Vec2, NodeId>,
+        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.
-    pub fn as_ivec2(self) -> IVec2 {
+    /// Returns the direction as an I8Vec2.
+    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::Down => IVec2::Y,
-            Direction::Left => -IVec2::X,
-            Direction::Right => IVec2::X,
+            Direction::Up => -I8Vec2::Y,
+            Direction::Down => I8Vec2::Y,
+            Direction::Left => -I8Vec2::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 to_pos = self.nodes[to].position;
+                    let from_pos = self.nodes[from as usize].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/systems/collision.rs

@@ -8,7 +8,7 @@ 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, Eaten, Ghost, PlayerControlled, ScoreResource, Vulnerable};
 
 #[derive(Component)]
 pub struct Collider {
@@ -136,7 +136,7 @@ pub fn ghost_collision_system(
                     score.0 += 200;
 
                     // Remove the ghost
-                    commands.entity(ghost_ent).despawn();
+                    commands.entity(ghost_ent).remove::<Vulnerable>().insert(Eaten);
 
                     // Play eat sound
                     events.write(AudioEvent::PlayEat);

src/systems/components.rs

@@ -9,12 +9,13 @@ use crate::{
     },
     texture::{animated::AnimatedTexture, sprite::AtlasTile},
 };
+use micromap::Map;
 
 /// 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,
@@ -96,12 +97,33 @@ pub struct Renderable {
 }
 
 /// A component for entities that have a directional animated texture.
-#[derive(Component)]
+#[derive(Component, Clone, Default)]
 pub struct DirectionalAnimated {
     pub textures: [Option<AnimatedTexture>; 4],
     pub stopped_textures: [Option<AnimatedTexture>; 4],
 }
 
+impl DirectionalAnimated {
+    pub fn from_animation(animation: AnimatedTexture) -> Self {
+        // Create 4 copies of the animation - necessary for independent state per direction
+        // This is initialization-time only, so the cloning cost is acceptable
+        Self {
+            textures: [
+                Some(animation.clone()),
+                Some(animation.clone()),
+                Some(animation.clone()),
+                Some(animation.clone()),
+            ],
+            stopped_textures: [
+                Some(animation.clone()),
+                Some(animation.clone()),
+                Some(animation.clone()),
+                Some(animation),
+            ],
+        }
+    }
+}
+
 bitflags! {
     #[derive(Component, Default, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct CollisionLayer: u8 {
@@ -144,12 +166,92 @@ impl Default for MovementModifiers {
 #[derive(Component, Debug, Clone, Copy)]
 pub struct Frozen;
 
+/// Tag component for eaten ghosts
+#[derive(Component, Debug, Clone, Copy)]
+pub struct Eaten;
+
 /// Component for ghosts that are vulnerable to Pac-Man
 #[derive(Component, Debug, Clone, Copy)]
 pub struct Vulnerable {
     pub remaining_ticks: u32,
 }
 
+/// 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,
+}
+
+/// A complete set of animations for a ghost in different behavioral states.
+///
+/// Each ghost maintains animations mapped by their current gameplay state.
+/// The animation system automatically switches between these states based on
+/// the presence of `Vulnerable` and `Eaten` components on the ghost entity.
+#[derive(Component, Clone)]
+pub struct GhostAnimationSet {
+    pub animations: Map<GhostAnimation, DirectionalAnimated, 4>,
+}
+
+impl GhostAnimationSet {
+    /// Creates a new GhostAnimationSet with the provided animations.
+    pub fn new(
+        normal: DirectionalAnimated,
+        frightened: DirectionalAnimated,
+        frightened_flashing: DirectionalAnimated,
+        eyes: DirectionalAnimated,
+    ) -> Self {
+        let mut animations = Map::new();
+        animations.insert(GhostAnimation::Normal, normal);
+        animations.insert(GhostAnimation::Frightened { flash: false }, frightened);
+        animations.insert(GhostAnimation::Frightened { flash: true }, frightened_flashing);
+        animations.insert(GhostAnimation::Eyes, eyes);
+        Self { animations }
+    }
+
+    /// Gets the animation for the specified ghost animation state.
+    pub fn get(&self, animation: GhostAnimation) -> Option<&DirectionalAnimated> {
+        self.animations.get(&animation)
+    }
+
+    /// Gets the normal animation state.
+    pub fn normal(&self) -> Option<&DirectionalAnimated> {
+        self.get(GhostAnimation::Normal)
+    }
+
+    /// Gets the frightened animation state (non-flashing).
+    pub fn frightened(&self) -> Option<&DirectionalAnimated> {
+        self.get(GhostAnimation::Frightened { flash: false })
+    }
+
+    /// Gets the frightened flashing animation state.
+    pub fn frightened_flashing(&self) -> Option<&DirectionalAnimated> {
+        self.get(GhostAnimation::Frightened { flash: true })
+    }
+
+    /// Gets the eyes animation state (for eaten ghosts).
+    pub fn eyes(&self) -> Option<&DirectionalAnimated> {
+        self.get(GhostAnimation::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 complete animation sets mapped by GhostAnimation states.
+#[derive(Resource)]
+pub struct GhostAnimations(pub std::collections::HashMap<Ghost, GhostAnimationSet>);
+
 #[derive(Bundle)]
 pub struct PlayerBundle {
     pub player: PlayerControlled,

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::{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
@@ -185,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

src/systems/ghost.rs

@@ -10,8 +10,16 @@ use crate::{
         movement::{Position, Velocity},
     },
 };
-use bevy_ecs::query::Without;
-use bevy_ecs::system::{Query, Res};
+
+use bevy_ecs::{
+    query::Added,
+    removal_detection::RemovedComponents,
+    system::{Commands, Query, Res},
+};
+
+use crate::systems::{Eaten, GhostAnimations, Vulnerable};
+
+use bevy_ecs::query::{With, Without};
 use rand::rngs::SmallRng;
 use rand::seq::IndexedRandom;
 use rand::SeedableRng;
@@ -28,7 +36,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 +76,173 @@ pub fn ghost_movement_system(
         }
     }
 }
+
+/// System that manages ghost animation state transitions based on ghost behavior.
+///
+/// This system handles the following animation state changes:
+/// - When a ghost becomes vulnerable (power pellet eaten): switches to frightened animation
+/// - When a ghost is eaten by Pac-Man: switches to eaten (eyes) animation
+/// - When vulnerability ends: switches back to normal animation
+///
+/// The system uses ECS change detection to efficiently track state transitions:
+/// - `Added<Vulnerable>` detects when ghosts become frightened
+/// - `Added<Eaten>` detects when ghosts are consumed
+/// - `RemovedComponents<Vulnerable>` detects when fright period ends
+///
+/// This ensures smooth visual feedback for gameplay state changes while maintaining
+/// separation between game logic and animation state.
+pub fn ghost_state_animation_system(
+    mut commands: Commands,
+    animations: Res<GhostAnimations>,
+    mut vulnerable_added: Query<(bevy_ecs::entity::Entity, &Ghost), Added<Vulnerable>>,
+    mut eaten_added: Query<(bevy_ecs::entity::Entity, &Ghost), Added<Eaten>>,
+    mut vulnerable_removed: RemovedComponents<Vulnerable>,
+    ghosts: Query<&Ghost>,
+    eaten_ghosts: Query<&Ghost, With<Eaten>>,
+) {
+    // When a ghost becomes vulnerable, switch to the frightened animation
+    for (entity, ghost_type) in vulnerable_added.iter_mut() {
+        if let Some(animation_set) = animations.0.get(ghost_type) {
+            if let Some(animation) = animation_set.frightened() {
+                commands.entity(entity).insert(animation.clone());
+            }
+        }
+    }
+
+    // When a ghost is eaten, switch to the eaten animation
+    for (entity, ghost_type) in eaten_added.iter_mut() {
+        if let Some(animation_set) = animations.0.get(ghost_type) {
+            if let Some(animation) = animation_set.eyes() {
+                commands.entity(entity).insert(animation.clone());
+            }
+        }
+    }
+
+    // When a ghost is no longer vulnerable, switch back to the normal animation
+    // But don't switch if the ghost is currently eaten (should keep eyes animation)
+    for entity in vulnerable_removed.read() {
+        if let Ok(ghost_type) = ghosts.get(entity) {
+            // Check if this ghost is currently eaten - if so, don't switch to normal animation
+            let is_eaten = eaten_ghosts.get(entity).is_ok();
+            if !is_eaten {
+                if let Some(animation_set) = animations.0.get(ghost_type) {
+                    if let Some(animation) = animation_set.normal() {
+                        commands.entity(entity).insert(animation.clone());
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// 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>,
+    animations: Res<GhostAnimations>,
+    mut commands: Commands,
+    mut eaten_ghosts: Query<(bevy_ecs::entity::Entity, &Ghost, &mut Position, &mut Velocity), With<Eaten>>,
+) {
+    for (entity, ghost_type, mut position, mut velocity) in eaten_ghosts.iter_mut() {
+        // 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 - remove Eaten component and switch to normal animation
+                        commands.entity(entity).remove::<Eaten>();
+                        if let Some(animation_set) = animations.0.get(ghost_type) {
+                            if let Some(animation) = animation_set.normal() {
+                                commands.entity(entity).insert(animation.clone());
+                            }
+                        }
+                        // 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
+}

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 to_node = graph.get_node(*to).ok_or(EntityError::NodeNotFound(*to))?;
-                let edge = graph
-                    .find_edge(*from, *to)
-                    .ok_or(EntityError::EdgeNotFound { from: *from, to: *to })?;
+                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 as usize))?;
+                let edge = graph.find_edge(*from, *to).ok_or(EntityError::EdgeNotFound {
+                    from: *from as usize,
+                    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/profiling.rs

@@ -35,6 +35,8 @@ pub enum SystemId {
     PlayerMovement,
     GhostCollision,
     Stage,
+    GhostStateAnimation,
+    EatenGhost,
 }
 
 impl Display for SystemId {
@@ -109,28 +111,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() {
-            all_durations.extend(queue.lock().iter().map(|d| d.as_secs_f64() * 1000.0));
-        }
+        let mean = duration_sums.iter().sum::<Duration>() / duration_sums.len() as u32;
+        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() {
-            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),
-        )
+        (mean, Duration::from_secs_f64(std_dev_secs))
     }
 
     pub fn format_timing_display(&self) -> SmallVec<[String; SystemId::COUNT]> {
@@ -144,16 +144,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
-        timing_data.push((effective_fps, total_avg, total_std));
-
-        // Add top 5 most expensive systems
+        // Sort the stats by average duration
         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

@@ -97,7 +97,7 @@ pub fn hud_render_system(
             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
@@ -106,6 +106,14 @@ pub fn hud_render_system(
             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,

src/systems/vulnerable.rs

@@ -1,18 +1,31 @@
-use bevy_ecs::query::With;
-use bevy_ecs::system::{Commands, Query};
+use bevy_ecs::{
+    query::With,
+    system::{Commands, Query, Res},
+};
 
-use crate::systems::{GhostCollider, Vulnerable};
+use crate::constants::animation::FRIGHTENED_FLASH_START_TICKS;
+use crate::systems::{Ghost, GhostAnimations, 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>>,
+    animations: Res<GhostAnimations>,
+    mut vulnerable_query: Query<(bevy_ecs::entity::Entity, &mut Vulnerable, &Ghost), With<GhostCollider>>,
 ) {
-    for (entity, mut vulnerable) in vulnerable_query.iter_mut() {
+    for (entity, mut vulnerable, ghost_type) in vulnerable_query.iter_mut() {
         if vulnerable.remaining_ticks > 0 {
             vulnerable.remaining_ticks -= 1;
         }
 
+        // When 2 seconds are remaining, start flashing
+        if vulnerable.remaining_ticks == FRIGHTENED_FLASH_START_TICKS {
+            if let Some(animation_set) = animations.0.get(ghost_type) {
+                if let Some(animation) = animation_set.frightened_flashing() {
+                    commands.entity(entity).insert(animation.clone());
+                }
+            }
+        }
+
         if vulnerable.remaining_ticks == 0 {
             commands.entity(entity).remove::<Vulnerable>();
         }

src/texture/animated.rs

@@ -1,3 +1,5 @@
+use smallvec::SmallVec;
+
 use crate::error::{AnimatedTextureError, GameError, GameResult, TextureError};
 use crate::texture::sprite::AtlasTile;
 
@@ -8,7 +10,7 @@ use crate::texture::sprite::AtlasTile;
 #[derive(Debug, Clone)]
 pub struct AnimatedTexture {
     /// Sequence of sprite tiles that make up the animation frames
-    tiles: Vec<AtlasTile>,
+    tiles: SmallVec<[AtlasTile; 4]>,
     /// Duration each frame should be displayed (in seconds)
     frame_duration: f32,
     /// Index of the currently active frame in the tiles vector
@@ -18,7 +20,7 @@ pub struct AnimatedTexture {
 }
 
 impl AnimatedTexture {
-    pub fn new(tiles: Vec<AtlasTile>, frame_duration: f32) -> GameResult<Self> {
+    pub fn new(tiles: SmallVec<[AtlasTile; 4]>, frame_duration: f32) -> GameResult<Self> {
         if frame_duration <= 0.0 {
             return Err(GameError::Texture(TextureError::Animated(
                 AnimatedTextureError::InvalidFrameDuration(frame_duration),

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 y: u16,
-    pub width: u16,
-    pub height: u16,
+    pub pos: U16Vec2,
+    pub size: U16Vec2,
 }
 
 #[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),
-            size: U16Vec2::new(frame.width, frame.height),
+            pos: frame.pos,
+            size: frame.size,
             color: None,
         })
     }

tests/animated.rs

@@ -3,6 +3,7 @@ use pacman::error::{AnimatedTextureError, GameError, TextureError};
 use pacman::texture::animated::AnimatedTexture;
 use pacman::texture::sprite::AtlasTile;
 use sdl2::pixels::Color;
+use smallvec::smallvec;
 
 fn mock_atlas_tile(id: u32) -> AtlasTile {
     AtlasTile {
@@ -14,7 +15,7 @@ fn mock_atlas_tile(id: u32) -> AtlasTile {
 
 #[test]
 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!(
         AnimatedTexture::new(tiles.clone(), 0.0).unwrap_err(),
@@ -29,7 +30,7 @@ fn test_animated_texture_creation_errors() {
 
 #[test]
 fn test_animated_texture_advancement() {
-    let tiles = vec![mock_atlas_tile(1), mock_atlas_tile(2), mock_atlas_tile(3)];
+    let tiles = smallvec![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);
@@ -41,7 +42,7 @@ fn test_animated_texture_advancement() {
 
 #[test]
 fn test_animated_texture_wrap_around() {
-    let tiles = vec![mock_atlas_tile(1), mock_atlas_tile(2)];
+    let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
     let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
 
     texture.tick(0.1);
@@ -53,7 +54,7 @@ fn test_animated_texture_wrap_around() {
 
 #[test]
 fn test_animated_texture_single_frame() {
-    let tiles = vec![mock_atlas_tile(1)];
+    let tiles = smallvec![mock_atlas_tile(1)];
     let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
 
     texture.tick(0.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::Down, IVec2::Y),
-        (Direction::Left, -IVec2::X),
-        (Direction::Right, IVec2::X),
+        (Direction::Up, -I8Vec2::Y),
+        (Direction::Down, I8Vec2::Y),
+        (Direction::Left, -I8Vec2::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/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)
-            + Vec2::splat(CELL_SIZE as f32 / 2.0);
+        let expected_pos = Vec2::new(
+            (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/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!(std_dev.as_millis() > 0);
+    assert!(close_enough(*avg, Duration::from_millis(10)), "avg: {:?}", avg);
+    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!(total_std.as_millis() > 0);
+    assert!(
+        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,
-            y: 20,
-            width: 32,
-            height: 64,
+            pos: U16Vec2::new(10, 20),
+            size: U16Vec2::new(32, 64),
         },
     );
 
@@ -38,19 +36,15 @@ fn test_sprite_atlas_multiple_tiles() {
     frames.insert(
         "tile1".to_string(),
         MapperFrame {
-            x: 0,
-            y: 0,
-            width: 32,
-            height: 32,
+            pos: U16Vec2::new(0, 0),
+            size: U16Vec2::new(32, 32),
         },
     );
     frames.insert(
         "tile2".to_string(),
         MapperFrame {
-            x: 32,
-            y: 0,
-            width: 64,
-            height: 64,
+            pos: U16Vec2::new(32, 0),
+            size: U16Vec2::new(64, 64),
         },
     );