fix: reset code borrows

src/animation.rs

@@ -1,4 +1,4 @@
-//! This module provides a simple animation system for textures.
+//! This module provides a simple animation and atlas system for textures.
 use sdl2::{
     rect::Rect,
     render::{Canvas, Texture},
@@ -7,144 +7,75 @@ use sdl2::{
 
 use crate::direction::Direction;
 
-/// An animated texture, which is a texture that is rendered as a series of
+/// Trait for drawable atlas-based textures
-/// frames.
+pub trait FrameDrawn {
-///
+    fn render(
-/// This struct manages the state of an animated texture, including the current
+        &self,
-/// frame and the number of frames in the animation.
+        canvas: &mut Canvas<Window>,
-pub struct AnimatedTexture<'a> {
+        position: (i32, i32),
-    // Parameters
+        direction: Direction,
-    raw_texture: Texture<'a>,
+        frame: Option<u32>,
-    offset: (i32, i32),
+    );
-    ticks_per_frame: u32,
-    frame_count: u32,
-    width: u32,
-    height: u32,
-    // State
-    ticker: u32,
-    reversed: bool,
 }
 
-impl<'a> AnimatedTexture<'a> {
+/// A texture atlas abstraction for static (non-animated) rendering.
+pub struct AtlasTexture<'a> {
+    pub raw_texture: Texture<'a>,
+    pub offset: (i32, i32),
+    pub frame_count: u32,
+    pub frame_width: u32,
+    pub frame_height: u32,
+}
+
+impl<'a> AtlasTexture<'a> {
     pub fn new(
         texture: Texture<'a>,
-        ticks_per_frame: u32,
         frame_count: u32,
-        width: u32,
+        frame_width: u32,
-        height: u32,
+        frame_height: u32,
         offset: Option<(i32, i32)>,
     ) -> Self {
-        AnimatedTexture {
+        AtlasTexture {
             raw_texture: texture,
-            ticker: 0,
-            reversed: false,
-            ticks_per_frame,
             frame_count,
-            width,
+            frame_width,
-            height,
+            frame_height,
             offset: offset.unwrap_or((0, 0)),
         }
     }
 
-    fn current_frame(&self) -> u32 {
+    pub fn get_frame_rect(&self, frame: u32) -> Option<Rect> {
-        self.ticker / self.ticks_per_frame
-    }
-
-    /// Advances the animation by one tick.
-    ///
-    /// This method updates the internal ticker that tracks the current frame
-    /// of the animation. The animation automatically reverses direction when
-    /// it reaches the end, creating a ping-pong effect.
-    ///
-    /// When `reversed` is `false`, the ticker increments until it reaches
-    /// the total number of ticks for all frames, then reverses direction.
-    /// When `reversed` is `true`, the ticker decrements until it reaches 0,
-    /// then reverses direction again.
-    pub fn tick(&mut self) {
-        if self.reversed {
-            self.ticker -= 1;
-
-            if self.ticker == 0 {
-                self.reversed = !self.reversed;
-            }
-        } else {
-            self.ticker += 1;
-
-            if self.ticker + 1 == self.ticks_per_frame * self.frame_count {
-                self.reversed = !self.reversed;
-            }
-        }
-    }
-
-    /// Gets the source rectangle for a specific frame of the animated texture.
-    ///
-    /// This method calculates the position and dimensions of a frame within the
-    /// texture atlas. Frames are arranged horizontally in a single row, so the
-    /// rectangle's x-coordinate is calculated by multiplying the frame index
-    /// by the frame width.
-    ///
-    /// # Arguments
-    ///
-    /// * `frame` - The frame index to get the rectangle for (0-based)
-    ///
-    /// # Returns
-    ///
-    /// A `Rect` representing the source rectangle for the specified frame
-    fn get_frame_rect(&self, frame: u32) -> Option<Rect> {
         if frame >= self.frame_count {
             return None;
         }
-
         Some(Rect::new(
-            frame as i32 * self.width as i32,
+            frame as i32 * self.frame_width as i32,
             0,
-            self.width,
+            self.frame_width,
-            self.height,
+            self.frame_height,
         ))
     }
 
-    pub fn render(
+    pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
-        &mut self,
+        self.raw_texture.set_color_mod(r, g, b);
-        canvas: &mut Canvas<Window>,
-        position: (i32, i32),
-        direction: Direction,
-    ) {
-        self.render_static(canvas, position, direction, Some(self.current_frame()));
-        self.tick();
     }
+}
 
-    /// Renders a specific frame of the animated texture to the canvas.
+impl<'a> FrameDrawn for AtlasTexture<'a> {
-    ///
+    fn render(
-    /// This method renders a static frame without advancing the animation ticker.
+        &self,
-    /// It's useful for displaying a specific frame, such as when an entity is stopped
-    /// or when you want to manually control which frame is displayed.
-    ///
-    /// # Arguments
-    ///
-    /// * `canvas` - The SDL canvas to render to
-    /// * `position` - The pixel position where the texture should be rendered
-    /// * `direction` - The direction to rotate the texture based on entity facing
-    /// * `frame` - Optional specific frame to render. If `None`, uses the current frame
-    ///
-    /// # Panics
-    ///
-    /// Panics if the specified frame is out of bounds for this texture.
-    pub fn render_static(
-        &mut self,
         canvas: &mut Canvas<Window>,
         position: (i32, i32),
         direction: Direction,
         frame: Option<u32>,
     ) {
-        let texture_source_frame_rect =
+        let texture_source_frame_rect = self.get_frame_rect(frame.unwrap_or(0));
-            self.get_frame_rect(frame.unwrap_or_else(|| self.current_frame()));
         let canvas_destination_rect = Rect::new(
             position.0 + self.offset.0,
             position.1 + self.offset.1,
-            self.width,
+            self.frame_width,
-            self.height,
+            self.frame_height,
         );
-
         canvas
             .copy_ex(
                 &self.raw_texture,
@@ -157,9 +88,83 @@ impl<'a> AnimatedTexture<'a> {
             )
             .expect("Could not render texture on canvas");
     }
+}
+
+/// An animated texture using a texture atlas.
+pub struct AnimatedAtlasTexture<'a> {
+    pub atlas: AtlasTexture<'a>,
+    pub ticks_per_frame: u32,
+    pub ticker: u32,
+    pub reversed: bool,
+    pub paused: bool,
+}
+
+impl<'a> AnimatedAtlasTexture<'a> {
+    pub fn new(
+        texture: Texture<'a>,
+        ticks_per_frame: u32,
+        frame_count: u32,
+        width: u32,
+        height: u32,
+        offset: Option<(i32, i32)>,
+    ) -> Self {
+        AnimatedAtlasTexture {
+            atlas: AtlasTexture::new(texture, frame_count, width, height, offset),
+            ticks_per_frame,
+            ticker: 0,
+            reversed: false,
+            paused: false,
+        }
+    }
+
+    fn current_frame(&self) -> u32 {
+        self.ticker / self.ticks_per_frame
+    }
+
+    /// Advances the animation by one tick, unless paused.
+    pub fn tick(&mut self) {
+        if self.paused {
+            return;
+        }
+        if self.reversed {
+            if self.ticker > 0 {
+                self.ticker -= 1;
+            }
+            if self.ticker == 0 {
+                self.reversed = !self.reversed;
+            }
+        } else {
+            self.ticker += 1;
+            if self.ticker + 1 == self.ticks_per_frame * self.atlas.frame_count {
+                self.reversed = !self.reversed;
+            }
+        }
+    }
+
+    pub fn pause(&mut self) {
+        self.paused = true;
+    }
+    pub fn resume(&mut self) {
+        self.paused = false;
+    }
+    pub fn is_paused(&self) -> bool {
+        self.paused
+    }
 
-    /// Sets the color modulation for the texture.
     pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
-        self.raw_texture.set_color_mod(r, g, b);
+        self.atlas.set_color_modulation(r, g, b);
+    }
+}
+
+impl<'a> FrameDrawn for AnimatedAtlasTexture<'a> {
+    fn render(
+        &self,
+        canvas: &mut Canvas<Window>,
+        position: (i32, i32),
+        direction: Direction,
+        frame: Option<u32>,
+    ) {
+        let frame = frame.unwrap_or_else(|| self.current_frame());
+        self.atlas.render(canvas, position, direction, Some(frame));
     }
 }

src/constants.rs

@@ -32,6 +32,47 @@ pub enum MapTile {
     PowerPellet,
     /// A starting position for an entity.
     StartingPosition(u8),
+    /// A tunnel tile.
+    Tunnel,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[repr(u8)]
+pub enum FruitType {
+    Cherry,
+    Strawberry,
+    Orange,
+    Apple,
+    Melon,
+    Galaxian,
+    Bell,
+    Key,
+}
+
+impl FruitType {
+    pub const ALL: [FruitType; 8] = [
+        FruitType::Cherry,
+        FruitType::Strawberry,
+        FruitType::Orange,
+        FruitType::Apple,
+        FruitType::Melon,
+        FruitType::Galaxian,
+        FruitType::Bell,
+        FruitType::Key,
+    ];
+
+    pub fn score(self) -> u32 {
+        match self {
+            FruitType::Cherry => 100,
+            FruitType::Strawberry => 300,
+            FruitType::Orange => 500,
+            FruitType::Apple => 700,
+            FruitType::Melon => 1000,
+            FruitType::Galaxian => 2000,
+            FruitType::Bell => 3000,
+            FruitType::Key => 5000,
+        }
+    }
 }
 
 /// The raw layout of the game board, as a 2D array of characters.
@@ -50,7 +91,7 @@ pub const RAW_BOARD: [&str; BOARD_HEIGHT as usize] = [
     "     #.##    1     ##.#     ",
     "     #.## ###==### ##.#     ",
     "######.## #      # ##.######",
-    "      .   #2 3 4 #   .      ",
+    "T     .   #2 3 4 #   .     T",
     "######.## #      # ##.######",
     "     #.## ######## ##.#     ",
     "     #.##          ##.#     ",

src/debug.rs

@@ -0,0 +1,80 @@
+//! Debug rendering utilities for Pac-Man.
+use crate::{
+    constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH},
+    direction::Direction,
+    ghosts::blinky::Blinky,
+    map::Map,
+};
+use sdl2::{pixels::Color, render::Canvas, video::Window};
+
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub enum DebugMode {
+    None,
+    Grid,
+    Pathfinding,
+    ValidPositions,
+}
+
+pub struct DebugRenderer;
+
+impl DebugRenderer {
+    pub fn draw_cell(canvas: &mut Canvas<Window>, map: &Map, cell: (u32, u32), color: Color) {
+        let position = Map::cell_to_pixel(cell);
+        canvas.set_draw_color(color);
+        canvas
+            .draw_rect(sdl2::rect::Rect::new(
+                position.0 as i32,
+                position.1 as i32,
+                24,
+                24,
+            ))
+            .expect("Could not draw rectangle");
+    }
+
+    pub fn draw_debug_grid(canvas: &mut Canvas<Window>, map: &Map, pacman_cell: (u32, u32)) {
+        for x in 0..BOARD_WIDTH {
+            for y in 0..BOARD_HEIGHT {
+                let tile = map.get_tile((x as i32, y as i32)).unwrap_or(MapTile::Empty);
+                let mut color = None;
+                if (x, y) == pacman_cell {
+                    Self::draw_cell(canvas, map, (x, y), Color::CYAN);
+                } else {
+                    color = match tile {
+                        MapTile::Empty => None,
+                        MapTile::Wall => Some(Color::BLUE),
+                        MapTile::Pellet => Some(Color::RED),
+                        MapTile::PowerPellet => Some(Color::MAGENTA),
+                        MapTile::StartingPosition(_) => Some(Color::GREEN),
+                        MapTile::Tunnel => Some(Color::CYAN),
+                    };
+                }
+                if let Some(color) = color {
+                    Self::draw_cell(canvas, map, (x, y), color);
+                }
+            }
+        }
+    }
+
+    pub fn draw_next_cell(canvas: &mut Canvas<Window>, map: &Map, next_cell: (u32, u32)) {
+        Self::draw_cell(canvas, map, next_cell, Color::YELLOW);
+    }
+
+    pub fn draw_valid_positions(canvas: &mut Canvas<Window>, map: &mut Map) {
+        let valid_positions_vec = map.get_valid_playable_positions().clone();
+        for &pos in &valid_positions_vec {
+            Self::draw_cell(canvas, map, (pos.x, pos.y), Color::RGB(255, 140, 0));
+            // ORANGE
+        }
+    }
+
+    pub fn draw_pathfinding(canvas: &mut Canvas<Window>, blinky: &Blinky, map: &Map) {
+        if let Some((path, _)) = blinky.get_path_to_target({
+            let (tx, ty) = blinky.get_target_tile();
+            (tx as u32, ty as u32)
+        }) {
+            for &(x, y) in &path {
+                Self::draw_cell(canvas, map, (x, y), Color::YELLOW);
+            }
+        }
+    }
+}

src/edible.rs

@@ -0,0 +1,90 @@
+//! Edible entity for Pac-Man: pellets, power pellets, and fruits.
+use crate::animation::{AtlasTexture, FrameDrawn};
+use crate::constants::{FruitType, MapTile, BOARD_HEIGHT, BOARD_WIDTH};
+use crate::direction::Direction;
+use crate::entity::{Entity, Renderable};
+use crate::map::Map;
+use sdl2::{render::Canvas, video::Window};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum EdibleKind {
+    Pellet,
+    PowerPellet,
+    Fruit(FruitType),
+}
+
+pub struct Edible<'a> {
+    pub base: crate::entity::StaticEntity,
+    pub kind: EdibleKind,
+    pub sprite: std::rc::Rc<AtlasTexture<'a>>,
+}
+
+impl<'a> Edible<'a> {
+    pub fn new(
+        kind: EdibleKind,
+        cell_position: (u32, u32),
+        sprite: std::rc::Rc<AtlasTexture<'a>>,
+    ) -> Self {
+        let pixel_position = crate::map::Map::cell_to_pixel(cell_position);
+        Edible {
+            base: crate::entity::StaticEntity::new(pixel_position, cell_position),
+            kind,
+            sprite,
+        }
+    }
+
+    /// Checks collision with Pac-Man (or any entity)
+    pub fn collide(&self, pacman: &dyn crate::entity::Entity) -> bool {
+        self.base.is_colliding(pacman)
+    }
+}
+
+impl<'a> Entity for Edible<'a> {
+    fn base(&self) -> &crate::entity::StaticEntity {
+        &self.base
+    }
+}
+
+impl<'a> Renderable for Edible<'a> {
+    fn render(&self, canvas: &mut Canvas<Window>) {
+        self.sprite
+            .render(canvas, self.base.pixel_position, Direction::Right, Some(0));
+    }
+}
+
+/// Reconstruct all edibles from the original map layout
+pub fn reconstruct_edibles<'a>(
+    map: Rc<RefCell<Map>>,
+    pellet_sprite: std::rc::Rc<AtlasTexture<'a>>,
+    power_pellet_sprite: std::rc::Rc<AtlasTexture<'a>>,
+    fruit_sprite: std::rc::Rc<AtlasTexture<'a>>,
+) -> Vec<Edible<'a>> {
+    let mut edibles = Vec::new();
+    for x in 0..BOARD_WIDTH {
+        for y in 0..BOARD_HEIGHT {
+            let tile = map.borrow().get_tile((x as i32, y as i32));
+            let cell = (x, y);
+            match tile {
+                Some(MapTile::Pellet) => {
+                    edibles.push(Edible::new(
+                        EdibleKind::Pellet,
+                        cell,
+                        Rc::clone(&pellet_sprite),
+                    ));
+                }
+                Some(MapTile::PowerPellet) => {
+                    edibles.push(Edible::new(
+                        EdibleKind::PowerPellet,
+                        cell,
+                        Rc::clone(&power_pellet_sprite),
+                    ));
+                }
+                // Fruits can be added here if you have fruit positions
+                _ => {}
+            }
+        }
+    }
+    edibles
+}

src/entity.rs

@@ -1,16 +1,174 @@
-//! This module defines the `Entity` trait, which is implemented by all game
+use crate::{
-//! objects that can be moved and rendered.
+    constants::{MapTile, BOARD_OFFSET, BOARD_WIDTH, CELL_SIZE},
+    direction::Direction,
+    map::Map,
+    modulation::SimpleTickModulator,
+};
+use std::cell::RefCell;
+use std::rc::Rc;
 
 /// A trait for game objects that can be moved and rendered.
 pub trait Entity {
+    /// Returns a reference to the base entity (position, etc).
+    fn base(&self) -> &StaticEntity;
+
     /// Returns true if the entity is colliding with the other entity.
-    fn is_colliding(&self, other: &dyn Entity) -> bool;
+    fn is_colliding(&self, other: &dyn Entity) -> bool {
-    /// Returns the absolute position of the entity, in pixels.
+        let (x, y) = self.base().pixel_position;
-    fn position(&self) -> (i32, i32);
+        let (other_x, other_y) = other.base().pixel_position;
-    /// Returns the cell position of the entity, in grid coordinates.
+        x == other_x && y == other_y
-    fn cell_position(&self) -> (u32, u32);
+    }
-    /// Returns the position of the entity within its current cell, in pixels.
+}
-    fn internal_position(&self) -> (u32, u32);
+
-    /// Ticks the entity, which updates its state and position.
+/// A trait for entities that can move and interact with the map.
-    fn tick(&mut self);
+pub trait Moving {
+    fn move_forward(&mut self);
+    fn update_cell_position(&mut self);
+    fn next_cell(&self, direction: Option<Direction>) -> (i32, i32);
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool;
+    fn handle_tunnel(&mut self) -> bool;
+    fn is_grid_aligned(&self) -> bool;
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool;
+}
+
+/// A struct for static (non-moving) entities with position only.
+pub struct StaticEntity {
+    pub pixel_position: (i32, i32),
+    pub cell_position: (u32, u32),
+}
+
+impl StaticEntity {
+    pub fn new(pixel_position: (i32, i32), cell_position: (u32, u32)) -> Self {
+        Self {
+            pixel_position,
+            cell_position,
+        }
+    }
+}
+
+/// A struct for movable game entities with position, direction, speed, and modulation.
+pub struct MovableEntity {
+    pub base: StaticEntity,
+    pub direction: Direction,
+    pub speed: u32,
+    pub modulation: SimpleTickModulator,
+    pub in_tunnel: bool,
+    pub map: Rc<RefCell<Map>>,
+}
+
+impl MovableEntity {
+    pub fn new(
+        pixel_position: (i32, i32),
+        cell_position: (u32, u32),
+        direction: Direction,
+        speed: u32,
+        modulation: SimpleTickModulator,
+        map: Rc<RefCell<Map>>,
+    ) -> Self {
+        Self {
+            base: StaticEntity::new(pixel_position, cell_position),
+            direction,
+            speed,
+            modulation,
+            in_tunnel: false,
+            map,
+        }
+    }
+
+    /// Returns the position within the current cell, in pixels.
+    pub fn internal_position(&self) -> (u32, u32) {
+        (
+            self.base.pixel_position.0 as u32 % CELL_SIZE,
+            self.base.pixel_position.1 as u32 % CELL_SIZE,
+        )
+    }
+}
+
+impl Entity for MovableEntity {
+    fn base(&self) -> &StaticEntity {
+        &self.base
+    }
+}
+
+impl Moving for MovableEntity {
+    fn move_forward(&mut self) {
+        let speed = self.speed as i32;
+        match self.direction {
+            Direction::Right => self.base.pixel_position.0 += speed,
+            Direction::Left => self.base.pixel_position.0 -= speed,
+            Direction::Up => self.base.pixel_position.1 -= speed,
+            Direction::Down => self.base.pixel_position.1 += speed,
+        }
+    }
+    fn update_cell_position(&mut self) {
+        self.base.cell_position = (
+            (self.base.pixel_position.0 as u32 / CELL_SIZE) - BOARD_OFFSET.0,
+            (self.base.pixel_position.1 as u32 / CELL_SIZE) - BOARD_OFFSET.1,
+        );
+    }
+    fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
+        let (x, y) = direction.unwrap_or(self.direction).offset();
+        (
+            self.base.cell_position.0 as i32 + x,
+            self.base.cell_position.1 as i32 + y,
+        )
+    }
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        let next_cell = self.next_cell(direction);
+        matches!(self.map.borrow().get_tile(next_cell), Some(MapTile::Wall))
+    }
+    fn handle_tunnel(&mut self) -> bool {
+        if !self.in_tunnel {
+            let current_tile = self.map.borrow().get_tile((
+                self.base.cell_position.0 as i32,
+                self.base.cell_position.1 as i32,
+            ));
+            if matches!(current_tile, Some(MapTile::Tunnel)) {
+                self.in_tunnel = true;
+            }
+        }
+        if self.in_tunnel {
+            if self.base.cell_position.0 == 0 {
+                self.base.cell_position.0 = BOARD_WIDTH - 2;
+                self.base.pixel_position =
+                    Map::cell_to_pixel((self.base.cell_position.0, self.base.cell_position.1));
+                self.in_tunnel = false;
+                true
+            } else if self.base.cell_position.0 == BOARD_WIDTH - 1 {
+                self.base.cell_position.0 = 1;
+                self.base.pixel_position =
+                    Map::cell_to_pixel((self.base.cell_position.0, self.base.cell_position.1));
+                self.in_tunnel = false;
+                true
+            } else {
+                true
+            }
+        } else {
+            false
+        }
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.internal_position() == (0, 0)
+    }
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        if new_direction == self.direction {
+            return false;
+        }
+        if self.is_wall_ahead(Some(new_direction)) {
+            return false;
+        }
+        self.direction = new_direction;
+        true
+    }
+}
+
+impl Entity for StaticEntity {
+    fn base(&self) -> &StaticEntity {
+        self
+    }
+}
+
+/// A trait for entities that can be rendered to the screen.
+pub trait Renderable {
+    fn render(&self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>);
 }

src/game.rs

@@ -2,6 +2,7 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
+use rand::seq::IteratorRandom;
 use sdl2::image::LoadTexture;
 use sdl2::keyboard::Keycode;
 use sdl2::render::{Texture, TextureCreator};
@@ -12,12 +13,18 @@ use sdl2::{pixels::Color, render::Canvas, video::Window};
 use tracing::event;
 
 use crate::audio::Audio;
-use crate::constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD};
+use crate::{
-use crate::direction::Direction;
+    animation::{AtlasTexture, FrameDrawn},
-use crate::entity::Entity;
+    constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD},
-use crate::ghosts::Blinky;
+    direction::Direction,
-use crate::map::Map;
+    entity::{Entity, Renderable},
-use crate::pacman::Pacman;
+    ghosts::blinky::Blinky,
+    map::Map,
+    pacman::Pacman,
+};
+
+use crate::debug::{DebugMode, DebugRenderer};
+use crate::edible::{reconstruct_edibles, Edible, EdibleKind};
 
 // Embed texture data directly into the executable
 static PACMAN_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/pacman.png");
@@ -37,16 +44,16 @@ static GHOST_EYES_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/ghost_eyes.
 pub struct Game<'a> {
     canvas: &'a mut Canvas<Window>,
     map_texture: Texture<'a>,
-    pellet_texture: Texture<'a>,
+    pellet_texture: Rc<AtlasTexture<'a>>,
-    power_pellet_texture: Texture<'a>,
+    power_pellet_texture: Rc<AtlasTexture<'a>>,
     font: Font<'a, 'static>,
     pacman: Rc<RefCell<Pacman<'a>>>,
     map: Rc<std::cell::RefCell<Map>>,
-    debug: bool,
+    debug_mode: DebugMode,
     score: u32,
-    audio: Audio,
+    audio: crate::audio::Audio,
-    // Add ghost
     blinky: Blinky<'a>,
+    edibles: Vec<Edible<'a>>,
 }
 
 impl Game<'_> {
@@ -94,14 +101,24 @@ impl Game<'_> {
         );
 
         // Load pellet texture from embedded data
-        let pellet_texture = texture_creator
+        let pellet_texture = Rc::new(AtlasTexture::new(
-            .load_texture_bytes(PELLET_TEXTURE_DATA)
+            texture_creator
-            .expect("Could not load pellet texture from embedded data");
+                .load_texture_bytes(PELLET_TEXTURE_DATA)
-
+                .expect("Could not load pellet texture from embedded data"),
-        // Load power pellet texture from embedded data
+            1,
-        let power_pellet_texture = texture_creator
+            24,
-            .load_texture_bytes(POWER_PELLET_TEXTURE_DATA)
+            24,
-            .expect("Could not load power pellet texture from embedded data");
+            None,
+        ));
+        let power_pellet_texture = Rc::new(AtlasTexture::new(
+            texture_creator
+                .load_texture_bytes(POWER_PELLET_TEXTURE_DATA)
+                .expect("Could not load power pellet texture from embedded data"),
+            1,
+            24,
+            24,
+            None,
+        ));
 
         // Load font from embedded data
         let font_rwops = RWops::from_bytes(FONT_DATA).expect("Failed to create RWops for font");
@@ -117,10 +134,17 @@ impl Game<'_> {
             .expect("Could not load map texture from embedded data");
         map_texture.set_color_mod(0, 0, 255);
 
+        let edibles = reconstruct_edibles(
+            Rc::clone(&map),
+            Rc::clone(&pellet_texture),
+            Rc::clone(&power_pellet_texture),
+            Rc::clone(&pellet_texture), // placeholder for fruit sprite
+        );
+
         Game {
             canvas,
             pacman,
-            debug: false,
+            debug_mode: DebugMode::None,
             map,
             map_texture,
             pellet_texture,
@@ -129,6 +153,7 @@ impl Game<'_> {
             score: 0,
             audio,
             blinky,
+            edibles,
         }
     }
 
@@ -140,16 +165,26 @@ impl Game<'_> {
     pub fn keyboard_event(&mut self, keycode: Keycode) {
         // Change direction
         let direction = Direction::from_keycode(keycode);
-        self.pacman.borrow_mut().next_direction = direction;
+        if direction.is_some() {
+            self.pacman.borrow_mut().next_direction = direction;
+            return;
+        }
 
         // Toggle debug mode
         if keycode == Keycode::Space {
-            self.debug = !self.debug;
+            self.debug_mode = match self.debug_mode {
+                DebugMode::None => DebugMode::Grid,
+                DebugMode::Grid => DebugMode::Pathfinding,
+                DebugMode::Pathfinding => DebugMode::ValidPositions,
+                DebugMode::ValidPositions => DebugMode::None,
+            };
+            return;
         }
 
         // Reset game
         if keycode == Keycode::R {
             self.reset();
+            return;
         }
     }
 
@@ -173,60 +208,76 @@ impl Game<'_> {
         // Reset the score
         self.score = 0;
 
-        // Reset Pac-Man position
+        // Get valid positions from the cached flood fill and randomize positions in a single block
-        let mut pacman = self.pacman.borrow_mut();
+        {
-        pacman.pixel_position = Map::cell_to_pixel((1, 1));
+            let mut map = self.map.borrow_mut();
-        pacman.cell_position = (1, 1);
+            let valid_positions = map.get_valid_playable_positions();
+            let mut rng = rand::rng();
 
-        // Reset ghost positions
+            // Randomize Pac-Man position
-        self.blinky.set_mode(crate::ghost::GhostMode::House);
+            if let Some(pos) = valid_positions.iter().choose(&mut rng) {
-        self.blinky.pixel_position = Map::cell_to_pixel((13, 11));
+                let mut pacman = self.pacman.borrow_mut();
-        self.blinky.cell_position = (13, 11);
+                pacman.base.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
-        self.blinky.direction = Direction::Left;
+                pacman.base.base.cell_position = (pos.x, pos.y);
+                pacman.base.in_tunnel = false;
+                pacman.base.direction = Direction::Right;
+                pacman.next_direction = None;
+                pacman.stopped = false;
+            }
 
-        event!(tracing::Level::INFO, "Game reset - map and score cleared");
+            // Randomize ghost position
+            if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+                self.blinky.base.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
+                self.blinky.base.base.cell_position = (pos.x, pos.y);
+                self.blinky.base.in_tunnel = false;
+                self.blinky.base.direction = Direction::Left;
+                self.blinky.mode = crate::ghost::GhostMode::Chase;
+            }
+        }
+
+        self.edibles = reconstruct_edibles(
+            Rc::clone(&self.map),
+            Rc::clone(&self.pellet_texture),
+            Rc::clone(&self.power_pellet_texture),
+            Rc::clone(&self.pellet_texture), // placeholder for fruit sprite
+        );
     }
 
     /// Advances the game by one tick.
     pub fn tick(&mut self) {
-        self.check_pellet_eating();
+        // Advance animation frames for Pacman and Blinky
-        self.pacman.borrow_mut().tick();
+        self.pacman.borrow_mut().sprite.tick();
-        self.blinky.tick();
+        self.blinky.body_sprite.tick();
-    }
+        self.blinky.eyes_sprite.tick();
 
-    /// Checks if Pac-Man is currently eating a pellet and updates the game state
+        let pacman = self.pacman.borrow();
-    /// accordingly.
+        let mut eaten_indices = vec![];
-    fn check_pellet_eating(&mut self) {
+        for (i, edible) in self.edibles.iter().enumerate() {
-        let cell_pos = self.pacman.borrow().cell_position();
+            if edible.collide(&*pacman) {
-
+                eaten_indices.push(i);
-        // Check if there's a pellet at the current position
-        let tile = {
-            let map = self.map.borrow();
-            map.get_tile((cell_pos.0 as i32, cell_pos.1 as i32))
-        };
-
-        if let Some(tile) = tile {
-            let pellet_value = match tile {
-                MapTile::Pellet => Some(10),
-                MapTile::PowerPellet => Some(50),
-                _ => None,
-            };
-
-            if let Some(value) = pellet_value {
-                {
-                    let mut map = self.map.borrow_mut();
-                    map.set_tile((cell_pos.0 as i32, cell_pos.1 as i32), MapTile::Empty);
-                }
-                self.add_score(value);
-                self.audio.eat();
-                event!(
-                    tracing::Level::DEBUG,
-                    "Pellet eaten at ({}, {})",
-                    cell_pos.0,
-                    cell_pos.1
-                );
             }
         }
+        drop(pacman); // Release immutable borrow before mutably borrowing self
+        for &i in eaten_indices.iter().rev() {
+            let edible = &self.edibles[i];
+            match edible.kind {
+                EdibleKind::Pellet => {
+                    self.add_score(10);
+                    self.audio.eat();
+                }
+                EdibleKind::PowerPellet => {
+                    self.add_score(50);
+                    self.audio.eat();
+                }
+                EdibleKind::Fruit(_fruit) => {
+                    self.add_score(100);
+                    self.audio.eat();
+                }
+            }
+            self.edibles.remove(i);
+        }
+        self.pacman.borrow_mut().tick();
+        self.blinky.tick();
     }
 
     /// Draws the entire game to the canvas.
@@ -240,33 +291,13 @@ impl Game<'_> {
             .copy(&self.map_texture, None, None)
             .expect("Could not render texture on canvas");
 
-        // Render pellets
+        // Render all edibles
-        for x in 0..BOARD_WIDTH {
+        for edible in &self.edibles {
-            for y in 0..BOARD_HEIGHT {
+            edible.render(self.canvas);
-                let tile = self
-                    .map
-                    .borrow()
-                    .get_tile((x as i32, y as i32))
-                    .unwrap_or(MapTile::Empty);
-
-                let texture = match tile {
-                    MapTile::Pellet => Some(&self.pellet_texture),
-                    MapTile::PowerPellet => Some(&self.power_pellet_texture),
-                    _ => None,
-                };
-
-                if let Some(texture) = texture {
-                    let position = Map::cell_to_pixel((x, y));
-                    let dst_rect = sdl2::rect::Rect::new(position.0, position.1, 24, 24);
-                    self.canvas
-                        .copy(texture, None, Some(dst_rect))
-                        .expect("Could not render pellet");
-                }
-            }
         }
 
         // Render Pac-Man
-        self.pacman.borrow_mut().render(self.canvas);
+        self.pacman.borrow().render(self.canvas);
 
         // Render ghost
         self.blinky.render(self.canvas);
@@ -275,63 +306,34 @@ impl Game<'_> {
         self.render_ui();
 
         // Draw the debug grid
-        if self.debug {
+        match self.debug_mode {
-            for x in 0..BOARD_WIDTH {
+            DebugMode::Grid => {
-                for y in 0..BOARD_HEIGHT {
+                DebugRenderer::draw_debug_grid(
-                    let tile = self
+                    self.canvas,
-                        .map
+                    &self.map.borrow(),
-                        .borrow()
+                    self.pacman.borrow().base.base.cell_position,
-                        .get_tile((x as i32, y as i32))
+                );
-                        .unwrap_or(MapTile::Empty);
+                let next_cell =
-                    let mut color = None;
+                    <Pacman as crate::entity::Moving>::next_cell(&*self.pacman.borrow(), None);
-
+                DebugRenderer::draw_next_cell(
-                    if (x, y) == self.pacman.borrow().cell_position() {
+                    self.canvas,
-                        self.draw_cell((x, y), Color::CYAN);
+                    &self.map.borrow(),
-                    } else {
+                    (next_cell.0 as u32, next_cell.1 as u32),
-                        color = match tile {
+                );
-                            MapTile::Empty => None,
-                            MapTile::Wall => Some(Color::BLUE),
-                            MapTile::Pellet => Some(Color::RED),
-                            MapTile::PowerPellet => Some(Color::MAGENTA),
-                            MapTile::StartingPosition(_) => Some(Color::GREEN),
-                        };
-                    }
-
-                    if let Some(color) = color {
-                        self.draw_cell((x, y), color);
-                    }
-                }
             }
-
+            DebugMode::ValidPositions => {
-            // Draw the next cell
+                DebugRenderer::draw_valid_positions(self.canvas, &mut self.map.borrow_mut());
-            let next_cell = self.pacman.borrow().next_cell(None);
+            }
-            self.draw_cell((next_cell.0 as u32, next_cell.1 as u32), Color::YELLOW);
+            DebugMode::Pathfinding => {
+                DebugRenderer::draw_pathfinding(self.canvas, &self.blinky, &self.map.borrow());
+            }
+            DebugMode::None => {}
         }
 
         // Present the canvas
         self.canvas.present();
     }
 
-    /// Draws a single cell to the canvas with the given color.
-    ///
-    /// # Arguments
-    ///
-    /// * `cell` - The cell to draw, in grid coordinates.
-    /// * `color` - The color to draw the cell with.
-    fn draw_cell(&mut self, cell: (u32, u32), color: Color) {
-        let position = Map::cell_to_pixel(cell);
-
-        self.canvas.set_draw_color(color);
-        self.canvas
-            .draw_rect(sdl2::rect::Rect::new(
-                position.0 as i32,
-                position.1 as i32,
-                24,
-                24,
-            ))
-            .expect("Could not draw rectangle");
-    }
-
     /// Renders the user interface, including the score and lives.
     fn render_ui(&mut self) {
         let lives = 3;

src/ghost.rs

@@ -1,19 +1,11 @@
-use pathfinding::prelude::astar;
+use pathfinding::prelude::dijkstra;
-use sdl2::{
-    pixels::Color,
-    render::{Canvas, Texture},
-    video::Window,
-};
-use std::cell::RefCell;
-use std::rc::Rc;
-
 use rand::Rng;
 
 use crate::{
-    animation::AnimatedTexture,
+    animation::{AnimatedAtlasTexture, FrameDrawn},
-    constants::{MapTile, BOARD_OFFSET, CELL_SIZE},
+    constants::{MapTile, BOARD_WIDTH},
     direction::Direction,
-    entity::Entity,
+    entity::{Entity, MovableEntity, Moving, Renderable, StaticEntity},
     map::Map,
     modulation::{SimpleTickModulator, TickModulator},
     pacman::Pacman,
@@ -45,42 +37,28 @@ pub enum GhostType {
 
 impl GhostType {
     /// Returns the color of the ghost.
-    pub fn color(&self) -> Color {
+    pub fn color(&self) -> sdl2::pixels::Color {
         match self {
-            GhostType::Blinky => Color::RGB(255, 0, 0),
+            GhostType::Blinky => sdl2::pixels::Color::RGB(255, 0, 0),
-            GhostType::Pinky => Color::RGB(255, 184, 255),
+            GhostType::Pinky => sdl2::pixels::Color::RGB(255, 184, 255),
-            GhostType::Inky => Color::RGB(0, 255, 255),
+            GhostType::Inky => sdl2::pixels::Color::RGB(0, 255, 255),
-            GhostType::Clyde => Color::RGB(255, 184, 82),
+            GhostType::Clyde => sdl2::pixels::Color::RGB(255, 184, 82),
         }
     }
 }
 
 /// Base ghost struct that contains common functionality
 pub struct Ghost<'a> {
-    /// The absolute position of the ghost on the board, in pixels
+    /// Shared movement and position fields.
-    pub pixel_position: (i32, i32),
+    pub base: MovableEntity,
-    /// The position of the ghost on the board, in grid coordinates
-    pub cell_position: (u32, u32),
-    /// The current direction of the ghost
-    pub direction: Direction,
     /// The current mode of the ghost
     pub mode: GhostMode,
     /// The type/personality of this ghost
     pub ghost_type: GhostType,
-    /// Whether the ghost is currently blue (frightened)
-    pub is_blue: bool,
-    /// Reference to the game map
-    pub map: Rc<RefCell<Map>>,
     /// Reference to Pac-Man for targeting
-    pub pacman: Rc<RefCell<Pacman<'a>>>,
+    pub pacman: std::rc::Rc<std::cell::RefCell<Pacman<'a>>>,
-    /// Movement speed
+    pub body_sprite: AnimatedAtlasTexture<'a>,
-    speed: u32,
+    pub eyes_sprite: AnimatedAtlasTexture<'a>,
-    /// Movement modulator
-    modulation: SimpleTickModulator,
-    /// Ghost body sprite
-    body_sprite: AnimatedTexture<'a>,
-    /// Ghost eyes sprite
-    eyes_sprite: AnimatedTexture<'a>,
 }
 
 impl Ghost<'_> {
@@ -88,99 +66,32 @@ impl Ghost<'_> {
     pub fn new<'a>(
         ghost_type: GhostType,
         starting_position: (u32, u32),
-        body_texture: Texture<'a>,
+        body_texture: sdl2::render::Texture<'a>,
-        eyes_texture: Texture<'a>,
+        eyes_texture: sdl2::render::Texture<'a>,
-        map: Rc<RefCell<Map>>,
+        map: std::rc::Rc<std::cell::RefCell<Map>>,
-        pacman: Rc<RefCell<Pacman<'a>>>,
+        pacman: std::rc::Rc<std::cell::RefCell<Pacman<'a>>>,
     ) -> Ghost<'a> {
         let color = ghost_type.color();
-        let mut body_sprite = AnimatedTexture::new(body_texture, 8, 2, 32, 32, Some((-4, -4)));
+        let mut body_sprite = AnimatedAtlasTexture::new(body_texture, 8, 2, 32, 32, Some((-4, -4)));
         body_sprite.set_color_modulation(color.r, color.g, color.b);
-
+        let pixel_position = Map::cell_to_pixel(starting_position);
         Ghost {
-            pixel_position: Map::cell_to_pixel(starting_position),
+            base: MovableEntity::new(
-            cell_position: starting_position,
+                pixel_position,
-            direction: Direction::Left,
+                starting_position,
+                Direction::Left,
+                3,
+                SimpleTickModulator::new(1.0),
+                map,
+            ),
             mode: GhostMode::Chase,
             ghost_type,
-            is_blue: false,
-            map,
             pacman,
-            speed: 3,
-            modulation: SimpleTickModulator::new(1.0),
             body_sprite,
-            eyes_sprite: AnimatedTexture::new(eyes_texture, 1, 4, 32, 32, Some((-4, -4))),
+            eyes_sprite: AnimatedAtlasTexture::new(eyes_texture, 1, 4, 32, 32, Some((-4, -4))),
         }
     }
 
-    /// Renders the ghost to the canvas
-    pub fn render(&mut self, canvas: &mut Canvas<Window>) {
-        // Render body
-        if self.mode != GhostMode::Eyes {
-            let color = if self.mode == GhostMode::Frightened {
-                Color::RGB(0, 0, 255)
-            } else {
-                self.ghost_type.color()
-            };
-
-            self.body_sprite
-                .set_color_modulation(color.r, color.g, color.b);
-            self.body_sprite
-                .render(canvas, self.pixel_position, Direction::Right);
-        }
-
-        // Always render eyes on top
-        let eye_frame = if self.mode == GhostMode::Frightened {
-            4 // Frightened frame
-        } else {
-            match self.direction {
-                Direction::Right => 0,
-                Direction::Up => 1,
-                Direction::Left => 2,
-                Direction::Down => 3,
-            }
-        };
-
-        self.eyes_sprite.render_static(
-            canvas,
-            self.pixel_position,
-            Direction::Right,
-            Some(eye_frame),
-        );
-    }
-
-    /// Calculates the path to the target tile using the A* algorithm.
-    fn get_path_to_target(&self, target: (u32, u32)) -> Option<(Vec<(u32, u32)>, u32)> {
-        let start = self.cell_position;
-        let map = self.map.borrow();
-
-        astar(
-            &start,
-            |&p| {
-                let mut successors = vec![];
-                for dir in &[
-                    Direction::Up,
-                    Direction::Down,
-                    Direction::Left,
-                    Direction::Right,
-                ] {
-                    let (dx, dy) = dir.offset();
-                    let next_p = (p.0 as i32 + dx, p.1 as i32 + dy);
-                    if let Some(tile) = map.get_tile(next_p) {
-                        if tile != MapTile::Wall {
-                            successors.push(((next_p.0 as u32, next_p.1 as u32), 1));
-                        }
-                    }
-                }
-                successors
-            },
-            |&p| {
-                ((p.0 as i32 - target.0 as i32).abs() + (p.1 as i32 - target.1 as i32).abs()) as u32
-            },
-            |&p| p == target,
-        )
-    }
-
     /// Gets the target tile for this ghost based on its current mode
     pub fn get_target_tile(&self) -> (i32, i32) {
         match self.mode {
@@ -204,8 +115,7 @@ impl Ghost<'_> {
 
     /// Gets a random adjacent tile for frightened mode
     fn get_random_target(&self) -> (i32, i32) {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
-        let (x, y) = self.cell_position;
         let mut possible_moves = Vec::new();
 
         // Check all four directions
@@ -216,28 +126,26 @@ impl Ghost<'_> {
             Direction::Right,
         ] {
             // Don't allow reversing direction
-            if *dir == self.direction.opposite() {
+            if *dir == self.base.direction.opposite() {
                 continue;
             }
 
-            let (dx, dy) = dir.offset();
+            let next_cell = self.base.next_cell(Some(*dir));
-            let next_cell = (x as i32 + dx, y as i32 + dy);
+            if !matches!(
-            let tile = self.map.borrow().get_tile(next_cell);
+                self.base.map.borrow().get_tile(next_cell),
-            if let Some(MapTile::Wall) = tile {
+                Some(MapTile::Wall)
-                // It's a wall, not a valid move
+            ) {
-            } else {
                 possible_moves.push(next_cell);
             }
         }
 
         if possible_moves.is_empty() {
             // No valid moves, must reverse
-            let (dx, dy) = self.direction.opposite().offset();
+            self.base.next_cell(Some(self.base.direction.opposite()))
-            return (x as i32 + dx, y as i32 + dy);
+        } else {
+            // Choose a random valid move
+            possible_moves[rng.random_range(0..possible_moves.len())]
         }
-
-        // Choose a random valid move
-        possible_moves[rng.gen_range(0..possible_moves.len())]
     }
 
     /// Gets the ghost house target for returning eyes
@@ -252,9 +160,48 @@ impl Ghost<'_> {
 
     /// Gets this ghost's chase mode target (to be implemented by each ghost type)
     fn get_chase_target(&self) -> (i32, i32) {
-        // Default implementation just targets Pac-Man directly
         let pacman = self.pacman.borrow();
-        (pacman.cell_position.0 as i32, pacman.cell_position.1 as i32)
+        let cell = pacman.base().cell_position;
+        (cell.0 as i32, cell.1 as i32)
+    }
+
+    /// Calculates the path to the target tile using the A* algorithm.
+    pub fn get_path_to_target(&self, target: (u32, u32)) -> Option<(Vec<(u32, u32)>, u32)> {
+        let start = self.base.base.cell_position;
+        let map = self.base.map.borrow();
+
+        dijkstra(
+            &start,
+            |&p| {
+                let mut successors = vec![];
+                let tile = map.get_tile((p.0 as i32, p.1 as i32));
+                // Tunnel wrap: if currently in a tunnel, add the opposite exit as a neighbor
+                if let Some(MapTile::Tunnel) = tile {
+                    if p.0 == 0 {
+                        successors.push(((BOARD_WIDTH - 2, p.1), 1));
+                    } else if p.0 == BOARD_WIDTH - 1 {
+                        successors.push(((1, p.1), 1));
+                    }
+                }
+                for dir in &[
+                    Direction::Up,
+                    Direction::Down,
+                    Direction::Left,
+                    Direction::Right,
+                ] {
+                    let (dx, dy) = dir.offset();
+                    let next_p = (p.0 as i32 + dx, p.1 as i32 + dy);
+                    if let Some(tile) = map.get_tile(next_p) {
+                        if tile == MapTile::Wall {
+                            continue;
+                        }
+                        successors.push(((next_p.0 as u32, next_p.1 as u32), 1));
+                    }
+                }
+                successors
+            },
+            |&p| p == target,
+        )
     }
 
     /// Changes the ghost's mode and handles direction reversal
@@ -266,102 +213,110 @@ impl Ghost<'_> {
 
         self.mode = new_mode;
 
+        self.base.speed = match new_mode {
+            GhostMode::Chase => 3,
+            GhostMode::Scatter => 2,
+            GhostMode::Frightened => 2,
+            GhostMode::Eyes => 7,
+            GhostMode::House => 0,
+        };
+
         if should_reverse {
-            self.direction = self.direction.opposite();
+            self.base
+                .set_direction_if_valid(self.base.direction.opposite());
         }
     }
-}
 
-impl Entity for Ghost<'_> {
+    pub fn tick(&mut self) {
-    fn position(&self) -> (i32, i32) {
-        self.pixel_position
-    }
-
-    fn cell_position(&self) -> (u32, u32) {
-        self.cell_position
-    }
-
-    fn internal_position(&self) -> (u32, u32) {
-        let (x, y) = self.position();
-        (x as u32 % CELL_SIZE, y as u32 % CELL_SIZE)
-    }
-
-    fn is_colliding(&self, other: &dyn Entity) -> bool {
-        let (x, y) = self.position();
-        let (other_x, other_y) = other.position();
-        x == other_x && y == other_y
-    }
-
-    fn tick(&mut self) {
         if self.mode == GhostMode::House {
             // For now, do nothing in the house
             return;
         }
 
-        if self.internal_position() == (0, 0) {
+        if self.base.is_grid_aligned() {
-            self.cell_position = (
+            self.base.update_cell_position();
-                (self.pixel_position.0 as u32 / CELL_SIZE) - BOARD_OFFSET.0,
-                (self.pixel_position.1 as u32 / CELL_SIZE) - BOARD_OFFSET.1,
-            );
 
-            // Pathfinding logic
+            if !self.base.handle_tunnel() {
-            let target_tile = self.get_target_tile();
+                // Pathfinding logic (only if not in tunnel)
-            if let Some((path, _)) =
+                let target_tile = self.get_target_tile();
-                self.get_path_to_target((target_tile.0 as u32, target_tile.1 as u32))
+                if let Some((path, _)) =
-            {
+                    self.get_path_to_target((target_tile.0 as u32, target_tile.1 as u32))
-                if path.len() > 1 {
+                {
-                    let next_move = path[1];
+                    if path.len() > 1 {
-                    let (x, y) = self.cell_position;
+                        let next_move = path[1];
-                    let dx = next_move.0 as i32 - x as i32;
+                        let (x, y) = self.base.base.cell_position;
-                    let dy = next_move.1 as i32 - y as i32;
+                        let dx = next_move.0 as i32 - x as i32;
-                    self.direction = if dx > 0 {
+                        let dy = next_move.1 as i32 - y as i32;
-                        Direction::Right
+                        let new_direction = if dx > 0 {
-                    } else if dx < 0 {
+                            Direction::Right
-                        Direction::Left
+                        } else if dx < 0 {
-                    } else if dy > 0 {
+                            Direction::Left
-                        Direction::Down
+                        } else if dy > 0 {
-                    } else {
+                            Direction::Down
-                        Direction::Up
+                        } else {
-                    };
+                            Direction::Up
+                        };
+                        self.base.set_direction_if_valid(new_direction);
+                    }
                 }
             }
 
-            // Check if the next tile in the current direction is a wall
+            // Don't move if the next tile is a wall
-            let (dx, dy) = self.direction.offset();
+            if self.base.is_wall_ahead(None) {
-            let next_cell = (
-                self.cell_position.0 as i32 + dx,
-                self.cell_position.1 as i32 + dy,
-            );
-            let next_tile = self
-                .map
-                .borrow()
-                .get_tile(next_cell)
-                .unwrap_or(MapTile::Empty);
-            if next_tile == MapTile::Wall {
-                // Don't move if the next tile is a wall
                 return;
             }
         }
 
-        if !self.modulation.next() {
+        if self.base.modulation.next() {
-            return;
+            self.base.move_forward();
-        }
 
-        // Update position based on current direction and speed
+            if self.base.is_grid_aligned() {
-        let speed = self.speed as i32;
+                self.base.update_cell_position();
-        match self.direction {
+            }
-            Direction::Right => self.pixel_position.0 += speed,
-            Direction::Left => self.pixel_position.0 -= speed,
-            Direction::Up => self.pixel_position.1 -= speed,
-            Direction::Down => self.pixel_position.1 += speed,
-        }
-
-        // Update cell position when aligned with grid
-        if self.internal_position() == (0, 0) {
-            self.cell_position = (
-                (self.pixel_position.0 as u32 / CELL_SIZE) - BOARD_OFFSET.0,
-                (self.pixel_position.1 as u32 / CELL_SIZE) - BOARD_OFFSET.1,
-            );
         }
     }
 }
+
+impl<'a> Moving for Ghost<'a> {
+    fn move_forward(&mut self) {
+        self.base.move_forward();
+    }
+    fn update_cell_position(&mut self) {
+        self.base.update_cell_position();
+    }
+    fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
+        self.base.next_cell(direction)
+    }
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        self.base.is_wall_ahead(direction)
+    }
+    fn handle_tunnel(&mut self) -> bool {
+        self.base.handle_tunnel()
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.base.is_grid_aligned()
+    }
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        self.base.set_direction_if_valid(new_direction)
+    }
+}
+
+impl Renderable for Ghost<'_> {
+    fn render(&self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>) {
+        let pos = self.base.base.pixel_position;
+        self.body_sprite.render(canvas, pos, Direction::Right, None);
+        // Inline the eye_frame logic here
+        let eye_frame = if self.mode == GhostMode::Frightened {
+            4 // Frightened frame
+        } else {
+            match self.base.direction {
+                Direction::Right => 0,
+                Direction::Up => 1,
+                Direction::Left => 2,
+                Direction::Down => 3,
+            }
+        };
+        self.eyes_sprite
+            .render(canvas, pos, Direction::Right, Some(eye_frame));
+    }
+}

src/ghosts/blinky.rs

@@ -5,7 +5,7 @@ use sdl2::render::{Canvas, Texture};
 use sdl2::video::Window;
 
 use crate::{
-    entity::Entity,
+    entity::{Entity, MovableEntity, Renderable},
     ghost::{Ghost, GhostMode, GhostType},
     map::Map,
     pacman::Pacman,
@@ -38,37 +38,52 @@ impl<'a> Blinky<'a> {
     /// Gets Blinky's chase target - directly targets Pac-Man's current position
     fn get_chase_target(&self) -> (i32, i32) {
         let pacman = self.ghost.pacman.borrow();
-        (pacman.cell_position.0 as i32, pacman.cell_position.1 as i32)
+        let cell = pacman.base().cell_position;
+        (cell.0 as i32, cell.1 as i32)
     }
 
     pub fn set_mode(&mut self, mode: GhostMode) {
         self.ghost.set_mode(mode);
     }
 
-    pub fn render(&mut self, canvas: &mut Canvas<Window>) {
+    pub fn tick(&mut self) {
+        self.ghost.tick();
+    }
+}
+
+impl<'a> crate::entity::Entity for Blinky<'a> {
+    fn base(&self) -> &crate::entity::StaticEntity {
+        self.ghost.base.base()
+    }
+}
+
+impl<'a> crate::entity::Renderable for Blinky<'a> {
+    fn render(&self, canvas: &mut Canvas<Window>) {
         self.ghost.render(canvas);
     }
 }
 
-impl<'a> Entity for Blinky<'a> {
+impl<'a> crate::entity::Moving for Blinky<'a> {
-    fn position(&self) -> (i32, i32) {
+    fn move_forward(&mut self) {
-        self.ghost.position()
+        self.ghost.move_forward();
     }
-
+    fn update_cell_position(&mut self) {
-    fn cell_position(&self) -> (u32, u32) {
+        self.ghost.update_cell_position();
-        self.ghost.cell_position()
     }
-
+    fn next_cell(&self, direction: Option<crate::direction::Direction>) -> (i32, i32) {
-    fn internal_position(&self) -> (u32, u32) {
+        self.ghost.next_cell(direction)
-        self.ghost.internal_position()
     }
-
+    fn is_wall_ahead(&self, direction: Option<crate::direction::Direction>) -> bool {
-    fn is_colliding(&self, other: &dyn Entity) -> bool {
+        self.ghost.is_wall_ahead(direction)
-        self.ghost.is_colliding(other)
     }
-
+    fn handle_tunnel(&mut self) -> bool {
-    fn tick(&mut self) {
+        self.ghost.handle_tunnel()
-        self.ghost.tick()
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.ghost.is_grid_aligned()
+    }
+    fn set_direction_if_valid(&mut self, new_direction: crate::direction::Direction) -> bool {
+        self.ghost.set_direction_if_valid(new_direction)
     }
 }
 

src/ghosts/mod.rs

@@ -1,3 +1 @@
-mod blinky;
+pub mod blinky;
-
-pub use blinky::Blinky;

src/main.rs

@@ -64,6 +64,8 @@ mod helper;
 mod map;
 mod modulation;
 mod pacman;
+mod debug;
+mod edible;
 
 /// The main entry point of the application.
 ///
@@ -123,12 +125,7 @@ pub fn main() {
 
     // The target time for each frame of the game loop (60 FPS).
     let loop_time = Duration::from_secs(1) / 60;
-    let mut tick_no = 0u32;
 
-    // The start of a period of time over which we average the frame time.
-    let mut last_averaging_time = Instant::now();
-    // The total time spent sleeping during the current averaging period.
-    let mut sleep_time = Duration::ZERO;
     let mut paused = false;
     // Whether the window is currently shown.
     let mut shown = false;
@@ -203,7 +200,6 @@ pub fn main() {
                     std::thread::sleep(time);
                 }
             }
-            sleep_time += time;
         } else {
             event!(
                 tracing::Level::WARN,
@@ -212,20 +208,6 @@ pub fn main() {
             );
         }
 
-        tick_no += 1;
-
-        // Caclulate and display performance statistics every 60 seconds.
-        const PERIOD: u32 = 60 * 60;
-        let tick_mod = tick_no % PERIOD;
-        if tick_mod % PERIOD == 0 {
-            let average_fps = PERIOD as f32 / last_averaging_time.elapsed().as_secs_f32();
-            let average_sleep = sleep_time / PERIOD;
-            let average_process = loop_time - average_sleep;
-
-            sleep_time = Duration::ZERO;
-            last_averaging_time = Instant::now();
-        }
-
         true
     };
 

src/map.rs

@@ -1,6 +1,50 @@
 //! This module defines the game map and provides functions for interacting with it.
+use rand::seq::IteratorRandom;
+
 use crate::constants::{MapTile, BOARD_OFFSET, CELL_SIZE};
 use crate::constants::{BOARD_HEIGHT, BOARD_WIDTH};
+use std::collections::{HashSet, VecDeque};
+use std::ops::Add;
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct SignedPosition {
+    pub x: i32,
+    pub y: i32,
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Position {
+    pub x: u32,
+    pub y: u32,
+}
+
+impl Add<SignedPosition> for Position {
+    type Output = Position;
+    fn add(self, rhs: SignedPosition) -> Self::Output {
+        Position {
+            x: (self.x as i32 + rhs.x) as u32,
+            y: (self.y as i32 + rhs.y) as u32,
+        }
+    }
+}
+
+impl PartialEq<(u32, u32)> for Position {
+    fn eq(&self, other: &(u32, u32)) -> bool {
+        self.x == other.0 && self.y == other.1
+    }
+}
+
+impl Position {
+    pub fn as_i32(&self) -> (i32, i32) {
+        (self.x as i32, self.y as i32)
+    }
+    pub fn wrapping_add(&self, dx: i32, dy: i32) -> Position {
+        Position {
+            x: (self.x as i32 + dx) as u32,
+            y: (self.y as i32 + dy) as u32,
+        }
+    }
+}
 
 /// The game map.
 ///
@@ -41,6 +85,7 @@ impl Map {
                     '.' => MapTile::Pellet,
                     'o' => MapTile::PowerPellet,
                     ' ' => MapTile::Empty,
+                    'T' => MapTile::Tunnel,
                     c @ '0' | c @ '1' | c @ '2' | c @ '3' | c @ '4' => {
                         MapTile::StartingPosition(c.to_digit(10).unwrap() as u8)
                     }
@@ -113,4 +158,74 @@ impl Map {
             ((cell.1 + BOARD_OFFSET.1) * CELL_SIZE) as i32,
         )
     }
+
+    /// Returns a reference to a cached vector of all valid playable positions in the maze.
+    /// This is computed once using a flood fill from a random pellet, and then cached.
+    pub fn get_valid_playable_positions(&mut self) -> &Vec<Position> {
+        use MapTile::*;
+        static mut CACHE: Option<Vec<Position>> = None;
+        // SAFETY: This is only mutated once, and only in this function.
+        unsafe {
+            if let Some(ref cached) = CACHE {
+                return cached;
+            }
+        }
+        // Find a random starting pellet
+        let mut pellet_positions = vec![];
+        for x in 0..BOARD_WIDTH as u32 {
+            for y in 0..BOARD_HEIGHT as u32 {
+                match self.current[x as usize][y as usize] {
+                    Pellet | PowerPellet => pellet_positions.push(Position { x, y }),
+                    _ => {}
+                }
+            }
+        }
+        let mut rng = rand::rng();
+        let &start = pellet_positions
+            .iter()
+            .choose(&mut rng)
+            .expect("No pellet found for flood fill");
+        // Flood fill
+        let mut visited = HashSet::new();
+        let mut queue = VecDeque::new();
+
+        queue.push_back(start);
+        while let Some(pos) = queue.pop_front() {
+            // Mark visited, skip if already visited
+            if !visited.insert(pos) {
+                continue;
+            }
+
+            // Check if the current tile is valid
+            match self.current[pos.x as usize][pos.y as usize] {
+                Empty | Pellet | PowerPellet => {
+                    // Valid, continue flood
+                    for offset in [
+                        SignedPosition { x: -1, y: 0 },
+                        SignedPosition { x: 1, y: 0 },
+                        SignedPosition { x: 0, y: -1 },
+                        SignedPosition { x: 0, y: 1 },
+                    ] {
+                        let neighbor = pos + offset;
+                        if neighbor.x < BOARD_WIDTH as u32 && neighbor.y < BOARD_HEIGHT as u32 {
+                            let neighbor_tile =
+                                self.current[neighbor.x as usize][neighbor.y as usize];
+                            if matches!(neighbor_tile, Empty | Pellet | PowerPellet) {
+                                queue.push_back(neighbor);
+                            }
+                        }
+                    }
+                }
+                StartingPosition(_) | Wall | Tunnel => {
+                    // Not valid, do not continue
+                }
+            }
+        }
+        let mut result: Vec<Position> = visited.into_iter().collect();
+        result.sort_unstable();
+        unsafe {
+            CACHE = Some(result);
+            CACHE.as_ref().unwrap()
+        }
+    }
 }

src/pacman.rs

@@ -9,230 +9,127 @@ use sdl2::{
 use tracing::event;
 
 use crate::{
-    animation::AnimatedTexture,
+    animation::{AnimatedAtlasTexture, FrameDrawn},
-    constants::MapTile,
-    constants::{BOARD_OFFSET, CELL_SIZE},
     direction::Direction,
-    entity::Entity,
+    entity::{Entity, MovableEntity, Moving, Renderable, StaticEntity},
     map::Map,
     modulation::{SimpleTickModulator, TickModulator},
 };
 
 /// The Pac-Man entity.
 pub struct Pacman<'a> {
-    /// The absolute position of Pac-Man on the board, in pixels.
+    /// Shared movement and position fields.
-    pub pixel_position: (i32, i32),
+    pub base: MovableEntity,
-    /// The position of Pac-Man on the board, in grid coordinates.
-    /// This is only updated at the moment Pac-Man is aligned with the grid.
-    pub cell_position: (u32, u32),
-    /// The current direction of Pac-Man.
-    pub direction: Direction,
     /// The next direction of Pac-Man, which will be applied when Pac-Man is next aligned with the grid.
     pub next_direction: Option<Direction>,
     /// Whether Pac-Man is currently stopped.
     pub stopped: bool,
-    map: Rc<RefCell<Map>>,
+    pub sprite: AnimatedAtlasTexture<'a>,
-    speed: u32,
+}
-    modulation: SimpleTickModulator,
+
-    sprite: AnimatedTexture<'a>,
+impl<'a> Entity for Pacman<'a> {
+    fn base(&self) -> &StaticEntity {
+        &self.base.base
+    }
+}
+
+impl<'a> Moving for Pacman<'a> {
+    fn move_forward(&mut self) {
+        self.base.move_forward();
+    }
+    fn update_cell_position(&mut self) {
+        self.base.update_cell_position();
+    }
+    fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
+        self.base.next_cell(direction)
+    }
+    fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        self.base.is_wall_ahead(direction)
+    }
+    fn handle_tunnel(&mut self) -> bool {
+        self.base.handle_tunnel()
+    }
+    fn is_grid_aligned(&self) -> bool {
+        self.base.is_grid_aligned()
+    }
+    fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        self.base.set_direction_if_valid(new_direction)
+    }
 }
 
 impl Pacman<'_> {
     /// Creates a new `Pacman` instance.
-    ///
-    /// # Arguments
-    ///
-    /// * `starting_position` - The starting position of Pac-Man, in grid coordinates.
-    /// * `atlas` - The texture atlas containing the Pac-Man sprites.
-    /// * `map` - A reference to the game map.
     pub fn new<'a>(
         starting_position: (u32, u32),
         atlas: Texture<'a>,
         map: Rc<RefCell<Map>>,
     ) -> Pacman<'a> {
+        let pixel_position = Map::cell_to_pixel(starting_position);
         Pacman {
-            pixel_position: Map::cell_to_pixel(starting_position),
+            base: MovableEntity::new(
-            cell_position: starting_position,
+                pixel_position,
-            direction: Direction::Right,
+                starting_position,
+                Direction::Right,
+                3,
+                SimpleTickModulator::new(1.0),
+                map,
+            ),
             next_direction: None,
-            speed: 3,
-            map,
             stopped: false,
-            modulation: SimpleTickModulator::new(1.0),
+            sprite: AnimatedAtlasTexture::new(atlas, 2, 3, 32, 32, Some((-4, -4))),
-            sprite: AnimatedTexture::new(atlas, 2, 3, 32, 32, Some((-4, -4))),
         }
     }
 
-    /// Renders Pac-Man to the canvas.
-    ///
-    /// # Arguments
-    ///
-    /// * `canvas` - The SDL canvas to render to.
-    pub fn render(&mut self, canvas: &mut Canvas<Window>) {
-        if self.stopped {
-            self.sprite
-                .render_static(canvas, self.pixel_position, self.direction, Some(2));
-        } else {
-            self.sprite
-                .render(canvas, self.pixel_position, self.direction);
-        }
-    }
-
-    /// Calculates the next cell in the given direction.
-    ///
-    /// # Arguments
-    ///
-    /// * `direction` - The direction to check. If `None`, the current direction is used.
-    pub fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
-        let (x, y) = direction.unwrap_or(self.direction).offset();
-        let cell = self.cell_position;
-        (cell.0 as i32 + x, cell.1 as i32 + y)
-    }
-
     /// Handles a requested direction change.
-    ///
-    /// The direction change is only applied if the next tile in the requested
-    /// direction is not a wall.
     fn handle_direction_change(&mut self) -> bool {
         match self.next_direction {
-            // If there is no next direction, do nothing.
             None => return false,
-            // If the next direction is the same as the current direction, do nothing.
             Some(next_direction) => {
-                if next_direction == self.direction {
+                if <Pacman as Moving>::set_direction_if_valid(self, next_direction) {
                     self.next_direction = None;
-                    return false;
+                    return true;
                 }
             }
         }
-
+        false
-        // Get the next cell in the proposed direction.
-        let proposed_next_cell = self.next_cell(self.next_direction);
-        let proposed_next_tile = self
-            .map
-            .borrow()
-            .get_tile(proposed_next_cell)
-            .unwrap_or(MapTile::Empty);
-
-        // If the next tile is a wall, do nothing.
-        if proposed_next_tile == MapTile::Wall {
-            return false;
-        }
-
-        // If the next tile is not a wall, change direction.
-        event!(
-            tracing::Level::DEBUG,
-            "Direction change: {:?} -> {:?} at position ({}, {}) internal ({}, {})",
-            self.direction,
-            self.next_direction.unwrap(),
-            self.pixel_position.0,
-            self.pixel_position.1,
-            self.internal_position().0,
-            self.internal_position().1
-        );
-        self.direction = self.next_direction.unwrap();
-        self.next_direction = None;
-
-        true
     }
 
-    /// Returns the internal position of Pac-Man, rounded down to the nearest
+    /// Returns the internal position of Pac-Man, rounded down to the nearest even number.
-    /// even number.
-    ///
-    /// This is used to ensure that Pac-Man is aligned with the grid before
-    /// changing direction.
     fn internal_position_even(&self) -> (u32, u32) {
-        let (x, y) = self.internal_position();
+        let (x, y) = self.base.internal_position();
         ((x / 2u32) * 2u32, (y / 2u32) * 2u32)
     }
-}
 
-impl Entity for Pacman<'_> {
+    pub fn tick(&mut self) {
-    fn is_colliding(&self, other: &dyn Entity) -> bool {
-        let (x, y) = self.position();
-        let (other_x, other_y) = other.position();
-        x == other_x && y == other_y
-    }
-
-    fn position(&self) -> (i32, i32) {
-        self.pixel_position
-    }
-
-    fn cell_position(&self) -> (u32, u32) {
-        self.cell_position
-    }
-
-    fn internal_position(&self) -> (u32, u32) {
-        let (x, y) = self.position();
-        (x as u32 % CELL_SIZE, y as u32 % CELL_SIZE)
-    }
-
-    fn tick(&mut self) {
-        // Pac-Man can only change direction when he is perfectly aligned with the grid.
         let can_change = self.internal_position_even() == (0, 0);
-
-        if let Some(next_direction) = self.next_direction {
-            if next_direction == self.direction.opposite() {
-                let next_tile_position = self.next_cell(Some(next_direction));
-                let next_tile = self
-                    .map
-                    .borrow()
-                    .get_tile(next_tile_position)
-                    .unwrap_or(MapTile::Empty);
-
-                if next_tile != MapTile::Wall {
-                    self.direction = next_direction;
-                    self.next_direction = None;
-                }
-            }
-        }
-
         if can_change {
-            self.handle_direction_change();
+            <Pacman as Moving>::update_cell_position(self);
-
+            if !<Pacman as Moving>::handle_tunnel(self) {
-            // Check if the next tile in the current direction is a wall.
+                self.handle_direction_change();
-            let next_tile_position = self.next_cell(None);
+                if !self.stopped && <Pacman as Moving>::is_wall_ahead(self, None) {
-            let next_tile = self
+                    self.stopped = true;
-                .map
+                } else if self.stopped && !<Pacman as Moving>::is_wall_ahead(self, None) {
-                .borrow()
+                    self.stopped = false;
-                .get_tile(next_tile_position)
+                }
-                .unwrap_or(MapTile::Empty);
-
-            if !self.stopped && next_tile == MapTile::Wall {
-                event!(tracing::Level::DEBUG, "Wall collision. Stopping.");
-                self.stopped = true;
-            } else if self.stopped && next_tile != MapTile::Wall {
-                event!(tracing::Level::DEBUG, "Wall collision resolved. Moving.");
-                self.stopped = false;
             }
         }
-
+        if !self.stopped && self.base.modulation.next() {
-        if !self.stopped {
+            <Pacman as Moving>::move_forward(self);
-            if self.modulation.next() {
+            if self.internal_position_even() == (0, 0) {
-                let speed = self.speed as i32;
+                <Pacman as Moving>::update_cell_position(self);
-                match self.direction {
-                    Direction::Right => {
-                        self.pixel_position.0 += speed;
-                    }
-                    Direction::Left => {
-                        self.pixel_position.0 -= speed;
-                    }
-                    Direction::Up => {
-                        self.pixel_position.1 -= speed;
-                    }
-                    Direction::Down => {
-                        self.pixel_position.1 += speed;
-                    }
-                }
-
-                // Update the cell position if Pac-Man is aligned with the grid.
-                if self.internal_position_even() == (0, 0) {
-                    self.cell_position = (
-                        (self.pixel_position.0 as u32 / CELL_SIZE) - BOARD_OFFSET.0,
-                        (self.pixel_position.1 as u32 / CELL_SIZE) - BOARD_OFFSET.1,
-                    );
-                }
             }
         }
     }
 }
+
+impl Renderable for Pacman<'_> {
+    fn render(&self, canvas: &mut Canvas<Window>) {
+        let pos = self.base.base.pixel_position;
+        let dir = self.base.direction;
+        if self.stopped {
+            self.sprite.render(canvas, pos, dir, Some(2));
+        } else {
+            self.sprite.render(canvas, pos, dir, None);
+        }
+    }
+}