feat: stage sequence, ghost collisions & energizer logic, text color method, scheduler ordering

This commit is contained in:
Ryan Walters
2025-08-28 12:40:02 -05:00
parent f14b3d38a4
commit 80ebf08dd3
12 changed files with 624 additions and 64 deletions

View File

@@ -177,9 +177,6 @@ pub struct ScoreResource(pub u32);
#[derive(Resource)]
pub struct DeltaTime(pub f32);
#[derive(Resource, Default)]
pub struct RenderDirty(pub bool);
/// Resource for tracking audio state
#[derive(Resource, Debug, Clone, Default)]
pub struct AudioState {
@@ -188,3 +185,228 @@ pub struct AudioState {
/// Current sound index for cycling through eat sounds
pub sound_index: usize,
}
/// Lifecycle state for the player entity.
#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
pub enum PlayerLifecycle {
Spawning,
Alive,
Dying,
Respawning,
}
impl PlayerLifecycle {
/// Returns true when gameplay input and movement should be active
pub fn is_interactive(self) -> bool {
matches!(self, PlayerLifecycle::Alive)
}
}
impl Default for PlayerLifecycle {
fn default() -> Self {
PlayerLifecycle::Spawning
}
}
/// Whether player input should be processed.
#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
pub enum ControlState {
InputEnabled,
InputLocked,
}
impl Default for ControlState {
fn default() -> Self {
Self::InputLocked
}
}
/// Combat-related state for Pac-Man. Tick-based energizer logic.
#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
pub enum CombatState {
Normal,
Energized {
/// Remaining energizer duration in ticks (frames)
remaining_ticks: u32,
/// Ticks until flashing begins (counts down to 0, then flashing is active)
flash_countdown_ticks: u32,
},
}
impl Default for CombatState {
fn default() -> Self {
CombatState::Normal
}
}
impl CombatState {
pub fn is_energized(&self) -> bool {
matches!(self, CombatState::Energized { .. })
}
pub fn is_flashing(&self) -> bool {
matches!(self, CombatState::Energized { flash_countdown_ticks, .. } if *flash_countdown_ticks == 0)
}
pub fn deactivate_energizer(&mut self) {
*self = CombatState::Normal;
}
/// Activate energizer using tick-based durations.
pub fn activate_energizer_ticks(&mut self, total_ticks: u32, flash_lead_ticks: u32) {
let flash_countdown_ticks = total_ticks.saturating_sub(flash_lead_ticks);
*self = CombatState::Energized {
remaining_ticks: total_ticks,
flash_countdown_ticks,
};
}
/// Advance one frame. When ticks reach zero, returns to Normal.
pub fn tick_frame(&mut self) {
if let CombatState::Energized {
remaining_ticks,
flash_countdown_ticks,
} = self
{
if *remaining_ticks > 0 {
*remaining_ticks -= 1;
if *flash_countdown_ticks > 0 {
*flash_countdown_ticks -= 1;
}
}
if *remaining_ticks == 0 {
*self = CombatState::Normal;
}
}
}
}
/// Movement modifiers that can affect Pac-Man's speed or handling.
#[derive(Component, Debug, Clone, Copy)]
pub struct MovementModifiers {
/// Multiplier applied to base speed (e.g., tunnels)
pub speed_multiplier: f32,
/// True when currently in a tunnel slowdown region
pub tunnel_slowdown_active: bool,
}
impl Default for MovementModifiers {
fn default() -> Self {
Self {
speed_multiplier: 1.0,
tunnel_slowdown_active: false,
}
}
}
/// Level-dependent timing configuration
#[derive(Resource, Debug, Clone, Copy)]
pub struct LevelTiming {
/// Duration of energizer effect in seconds
pub energizer_duration: f32,
/// Freeze duration at spawn/ready in seconds
pub spawn_freeze_duration: f32,
/// When to start flashing relative to energizer end (seconds)
pub energizer_flash_threshold: f32,
}
impl Default for LevelTiming {
fn default() -> Self {
Self {
energizer_duration: 6.0,
spawn_freeze_duration: 1.5,
energizer_flash_threshold: 2.0,
}
}
}
impl LevelTiming {
/// Returns timing configuration for a given level.
pub fn for_level(_level: u32) -> Self {
// Placeholder: tune per the Pac-Man Dossier tables
Self::default()
}
}
/// Tag component for entities that should be frozen during startup
#[derive(Component, Debug, Clone, Copy)]
pub struct Frozen;
/// Convenience bundle for attaching the hybrid FSM to the player entity
#[derive(Bundle, Default)]
pub struct PlayerStateBundle {
pub lifecycle: PlayerLifecycle,
pub control: ControlState,
pub combat: CombatState,
pub movement_modifiers: MovementModifiers,
}
#[derive(Resource, Debug, Clone, Copy)]
pub enum StartupSequence {
/// Stage 1: Text-only stage
/// - Player & ghosts are hidden
/// - READY! and PLAYER ONE text are shown
/// - Energizers do not blink
TextOnly {
/// Remaining ticks in this stage
remaining_ticks: u32,
},
/// Stage 2: Characters visible stage
/// - PLAYER ONE text is hidden, READY! text remains
/// - Ghosts and Pac-Man are now shown
CharactersVisible {
/// Remaining ticks in this stage
remaining_ticks: u32,
},
/// Stage 3: Game begins
/// - Final state, game is fully active
GameActive,
}
impl StartupSequence {
/// Creates a new StartupSequence with the specified duration in ticks
pub fn new(text_only_ticks: u32, _characters_visible_ticks: u32) -> Self {
Self::TextOnly {
remaining_ticks: text_only_ticks,
}
}
/// Returns true if the timer is still active (not in GameActive state)
pub fn is_active(&self) -> bool {
!matches!(self, StartupSequence::GameActive)
}
/// Returns true if we're in the game active stage
pub fn is_game_active(&self) -> bool {
matches!(self, StartupSequence::GameActive)
}
/// Ticks the timer by one frame, returning transition information if state changes
pub fn tick(&mut self) -> Option<(StartupSequence, StartupSequence)> {
match self {
StartupSequence::TextOnly { remaining_ticks } => {
if *remaining_ticks > 0 {
*remaining_ticks -= 1;
None
} else {
let from = *self;
*self = StartupSequence::CharactersVisible {
remaining_ticks: 60, // 1 second at 60 FPS
};
Some((from, *self))
}
}
StartupSequence::CharactersVisible { remaining_ticks } => {
if *remaining_ticks > 0 {
*remaining_ticks -= 1;
None
} else {
let from = *self;
*self = StartupSequence::GameActive;
Some((from, *self))
}
}
StartupSequence::GameActive => None,
}
}
}

View File

@@ -1,7 +1,15 @@
use bevy_ecs::system::{Query, Res};
use rand::prelude::*;
use bevy_ecs::entity::Entity;
use bevy_ecs::event::{EventReader, EventWriter};
use bevy_ecs::query::{With, Without};
use bevy_ecs::system::{Commands, Query, Res, ResMut};
use rand::rngs::SmallRng;
use rand::seq::IndexedRandom;
use rand::SeedableRng;
use smallvec::SmallVec;
use crate::events::GameEvent;
use crate::systems::audio::AudioEvent;
use crate::systems::components::{Frozen, GhostCollider, ScoreResource};
use crate::{
map::{
builder::Map,
@@ -9,7 +17,7 @@ use crate::{
graph::{Edge, TraversalFlags},
},
systems::{
components::{DeltaTime, Ghost},
components::{CombatState, DeltaTime, Ghost, PlayerControlled},
movement::{Position, Velocity},
},
};
@@ -18,7 +26,7 @@ use crate::{
pub fn ghost_movement_system(
map: Res<Map>,
delta_time: Res<DeltaTime>,
mut ghosts: Query<(&Ghost, &mut Velocity, &mut Position)>,
mut ghosts: Query<(&Ghost, &mut Velocity, &mut Position), Without<Frozen>>,
) {
for (_ghost, mut velocity, mut position) in ghosts.iter_mut() {
let mut distance = velocity.speed * 60.0 * delta_time.0;
@@ -65,3 +73,46 @@ pub fn ghost_movement_system(
}
}
}
pub fn ghost_collision_system(
mut commands: Commands,
mut collision_events: EventReader<GameEvent>,
mut score: ResMut<ScoreResource>,
pacman_query: Query<&CombatState, With<PlayerControlled>>,
ghost_query: Query<(Entity, &Ghost), With<GhostCollider>>,
mut events: EventWriter<AudioEvent>,
) {
for event in collision_events.read() {
if let GameEvent::Collision(entity1, entity2) = event {
// Check if one is Pacman and the other is a ghost
let (pacman_entity, ghost_entity) = if pacman_query.get(*entity1).is_ok() && ghost_query.get(*entity2).is_ok() {
(*entity1, *entity2)
} else if pacman_query.get(*entity2).is_ok() && ghost_query.get(*entity1).is_ok() {
(*entity2, *entity1)
} else {
continue;
};
// Check if Pac-Man is energized
if let Ok(combat_state) = pacman_query.get(pacman_entity) {
if combat_state.is_energized() {
// Pac-Man eats the ghost
if let Ok((ghost_ent, _ghost_type)) = ghost_query.get(ghost_entity) {
// Add score (200 points per ghost eaten)
score.0 += 200;
// Remove the ghost
commands.entity(ghost_ent).despawn();
// Play eat sound
events.write(AudioEvent::PlayEat);
}
} else {
// Pac-Man dies (this would need a death system)
// For now, just log it
tracing::warn!("Pac-Man collided with ghost while not energized!");
}
}
}
}
}

View File

@@ -4,7 +4,7 @@ use crate::{
events::GameEvent,
systems::{
audio::AudioEvent,
components::{EntityType, ItemCollider, PacmanCollider, ScoreResource},
components::{CombatState, EntityType, ItemCollider, LevelTiming, PacmanCollider, ScoreResource},
},
};
@@ -24,8 +24,10 @@ pub fn item_system(
mut collision_events: EventReader<GameEvent>,
mut score: ResMut<ScoreResource>,
pacman_query: Query<Entity, With<PacmanCollider>>,
mut combat_q: Query<&mut CombatState, With<PacmanCollider>>,
item_query: Query<(Entity, &EntityType), With<ItemCollider>>,
mut events: EventWriter<AudioEvent>,
level_timing: Res<LevelTiming>,
) {
for event in collision_events.read() {
if let GameEvent::Collision(entity1, entity2) = event {
@@ -50,6 +52,19 @@ pub fn item_system(
if entity_type.is_collectible() {
events.write(AudioEvent::PlayEat);
}
// Activate energizer on power pellet using tick-based durations
if *entity_type == EntityType::PowerPellet {
if let Ok(mut combat) = combat_q.single_mut() {
// Convert seconds to frames (assumes 60 FPS)
let total_ticks = (level_timing.energizer_duration * 60.0).round().clamp(0.0, u32::MAX as f32) as u32;
// Flash lead: e.g., 3 seconds (180 ticks) before end; ensure it doesn't underflow
let flash_lead_ticks = (level_timing.energizer_flash_threshold * 60.0)
.round()
.clamp(0.0, u32::MAX as f32) as u32;
combat.activate_energizer_ticks(total_ticks, flash_lead_ticks);
}
}
}
}
}

View File

@@ -16,3 +16,4 @@ pub mod movement;
pub mod player;
pub mod profiling;
pub mod render;
pub mod stage;

View File

@@ -1,6 +1,7 @@
use bevy_ecs::{
entity::Entity,
event::{EventReader, EventWriter},
prelude::ResMut,
prelude::{Commands, ResMut},
query::With,
system::{Query, Res},
};
@@ -11,7 +12,10 @@ use crate::{
map::builder::Map,
map::graph::Edge,
systems::{
components::{AudioState, DeltaTime, EntityType, GlobalState, PlayerControlled},
components::{
AudioState, ControlState, DeltaTime, EntityType, Frozen, GhostCollider, GlobalState, MovementModifiers,
PlayerControlled, PlayerLifecycle, StartupSequence,
},
debug::DebugState,
movement::{BufferedDirection, Position, Velocity},
},
@@ -28,12 +32,12 @@ pub fn player_control_system(
mut state: ResMut<GlobalState>,
mut debug_state: ResMut<DebugState>,
mut audio_state: ResMut<AudioState>,
mut players: Query<&mut BufferedDirection, With<PlayerControlled>>,
mut players: Query<(&PlayerLifecycle, &ControlState, &mut BufferedDirection), With<PlayerControlled>>,
mut errors: EventWriter<GameError>,
) {
// Get the player's movable component (ensuring there is only one player)
let mut buffered_direction = match players.single_mut() {
Ok(buffered_direction) => buffered_direction,
let (lifecycle, control, mut buffered_direction) = match players.single_mut() {
Ok(tuple) => tuple,
Err(e) => {
errors.write(GameError::InvalidState(format!(
"No/multiple entities queried for player system: {}",
@@ -43,15 +47,20 @@ pub fn player_control_system(
}
};
// If the player is not interactive or input is locked, ignore movement commands
let allow_input = lifecycle.is_interactive() && matches!(control, ControlState::InputEnabled);
// Handle events
for event in events.read() {
if let GameEvent::Command(command) = event {
match command {
GameCommand::MovePlayer(direction) => {
*buffered_direction = BufferedDirection::Some {
direction: *direction,
remaining_time: 0.25,
};
if allow_input {
*buffered_direction = BufferedDirection::Some {
direction: *direction,
remaining_time: 0.25,
};
}
}
GameCommand::Exit => {
state.exit = true;
@@ -82,10 +91,24 @@ pub fn can_traverse(entity_type: EntityType, edge: Edge) -> bool {
pub fn player_movement_system(
map: Res<Map>,
delta_time: Res<DeltaTime>,
mut entities: Query<(&mut Position, &mut Velocity, &mut BufferedDirection), With<PlayerControlled>>,
mut entities: Query<
(
&PlayerLifecycle,
&ControlState,
&MovementModifiers,
&mut Position,
&mut Velocity,
&mut BufferedDirection,
),
With<PlayerControlled>,
>,
// mut errors: EventWriter<GameError>,
) {
for (mut position, mut velocity, mut buffered_direction) in entities.iter_mut() {
for (lifecycle, control, modifiers, mut position, mut velocity, mut buffered_direction) in entities.iter_mut() {
if !lifecycle.is_interactive() || !matches!(control, ControlState::InputEnabled) {
continue;
}
// Decrement the buffered direction remaining time
if let BufferedDirection::Some {
direction,
@@ -102,7 +125,7 @@ pub fn player_movement_system(
}
}
let mut distance = velocity.speed * 60.0 * delta_time.0;
let mut distance = velocity.speed * modifiers.speed_multiplier * 60.0 * delta_time.0;
loop {
match *position {
@@ -151,3 +174,16 @@ pub fn player_movement_system(
}
}
}
/// Applies tunnel slowdown based on the current node tile
pub fn player_tunnel_slowdown_system(map: Res<Map>, mut q: Query<(&Position, &mut MovementModifiers), With<PlayerControlled>>) {
if let Ok((position, mut modifiers)) = q.single_mut() {
let node = position.current_node();
let in_tunnel = map
.tile_at_node(node)
.map(|t| t == crate::constants::MapTile::Tunnel)
.unwrap_or(false);
modifiers.tunnel_slowdown_active = in_tunnel;
modifiers.speed_multiplier = if in_tunnel { 0.6 } else { 1.0 };
}
}

View File

@@ -34,6 +34,8 @@ pub enum SystemId {
Collision,
Item,
PlayerMovement,
GhostCollision,
Stage,
}
impl Display for SystemId {

View File

@@ -1,17 +1,26 @@
use crate::constants::CANVAS_SIZE;
use crate::error::{GameError, TextureError};
use crate::map::builder::Map;
use crate::systems::components::{DeltaTime, DirectionalAnimated, RenderDirty, Renderable, ScoreResource};
use crate::systems::blinking::Blinking;
use crate::systems::components::{
DeltaTime, DirectionalAnimated, EntityType, GhostCollider, PlayerControlled, Renderable, ScoreResource, StartupSequence,
};
use crate::systems::movement::{Position, Velocity};
use crate::texture::sprite::SpriteAtlas;
use crate::texture::text::TextTexture;
use bevy_ecs::entity::Entity;
use bevy_ecs::event::EventWriter;
use bevy_ecs::prelude::{Changed, Or, RemovedComponents};
use bevy_ecs::prelude::{Changed, Or, RemovedComponents, With, Without};
use bevy_ecs::resource::Resource;
use bevy_ecs::system::{NonSendMut, Query, Res, ResMut};
use sdl2::pixels::Color;
use sdl2::rect::{Point, Rect};
use sdl2::render::{Canvas, Texture};
use sdl2::video::Window;
#[derive(Resource, Default)]
pub struct RenderDirty(pub bool);
#[allow(clippy::type_complexity)]
pub fn dirty_render_system(
mut dirty: ResMut<RenderDirty>,
@@ -62,16 +71,67 @@ pub struct MapTextureResource(pub Texture<'static>);
/// A non-send resource for the backbuffer texture. This just wraps the texture with a type so it can be differentiated when exposed as a resource.
pub struct BackbufferResource(pub Texture<'static>);
/// Updates entity visibility based on StartupSequence stages
pub fn ready_visibility_system(
startup: Res<StartupSequence>,
mut player_query: Query<&mut Renderable, (With<PlayerControlled>, Without<GhostCollider>)>,
mut ghost_query: Query<&mut Renderable, (With<GhostCollider>, Without<PlayerControlled>)>,
mut energizer_query: Query<(&mut Blinking, &EntityType)>,
) {
match *startup {
StartupSequence::TextOnly { .. } => {
// Hide player and ghosts, disable energizer blinking
if let Ok(mut renderable) = player_query.single_mut() {
renderable.visible = false;
}
for mut renderable in ghost_query.iter_mut() {
renderable.visible = false;
}
// Disable energizer blinking in text-only stage
for (mut blinking, entity_type) in energizer_query.iter_mut() {
if matches!(entity_type, EntityType::PowerPellet) {
blinking.timer = 0.0; // Reset timer to prevent blinking
}
}
}
StartupSequence::CharactersVisible { .. } => {
// Show player and ghosts, enable energizer blinking
if let Ok(mut renderable) = player_query.single_mut() {
renderable.visible = true;
}
for mut renderable in ghost_query.iter_mut() {
renderable.visible = true;
}
// Energizer blinking is handled by the blinking system
}
StartupSequence::GameActive => {
// All entities are visible and blinking is normal
if let Ok(mut renderable) = player_query.single_mut() {
renderable.visible = true;
}
for mut renderable in ghost_query.iter_mut() {
renderable.visible = true;
}
}
}
}
/// Renders the HUD (score, lives, etc.) on top of the game.
pub fn hud_render_system(
mut canvas: NonSendMut<&mut Canvas<Window>>,
mut atlas: NonSendMut<SpriteAtlas>,
score: Res<ScoreResource>,
startup: Res<StartupSequence>,
mut errors: EventWriter<GameError>,
) {
let mut text_renderer = TextTexture::new(1.0);
// Render lives and high score text
// Render lives and high score text in white
let lives = 3; // TODO: Get from actual lives resource
let lives_text = format!("{lives}UP HIGH SCORE ");
let lives_position = glam::UVec2::new(4 + 8 * 3, 2); // x_offset + lives_offset * 8, y_offset
@@ -80,7 +140,7 @@ pub fn hud_render_system(
errors.write(TextureError::RenderFailed(format!("Failed to render lives text: {}", e)).into());
}
// Render score text
// Render score text in yellow (Pac-Man's color)
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
@@ -88,6 +148,31 @@ pub fn hud_render_system(
if let Err(e) = text_renderer.render(&mut canvas, &mut atlas, &score_text, score_position) {
errors.write(TextureError::RenderFailed(format!("Failed to render score text: {}", e)).into());
}
// Render text based on StartupSequence stage
if matches!(
*startup,
StartupSequence::TextOnly { .. } | StartupSequence::CharactersVisible { .. }
) {
let ready_text = "READY!";
let ready_width = text_renderer.text_width(ready_text);
let ready_position = glam::UVec2::new((CANVAS_SIZE.x - ready_width) / 2, 160);
if let Err(e) = text_renderer.render_with_color(&mut canvas, &mut atlas, ready_text, ready_position, Color::YELLOW) {
errors.write(TextureError::RenderFailed(format!("Failed to render READY text: {}", e)).into());
}
if matches!(*startup, StartupSequence::TextOnly { .. }) {
let player_one_text = "PLAYER ONE";
let player_one_width = text_renderer.text_width(player_one_text);
let player_one_position = glam::UVec2::new((CANVAS_SIZE.x - player_one_width) / 2, 113);
if let Err(e) =
text_renderer.render_with_color(&mut canvas, &mut atlas, player_one_text, player_one_position, Color::CYAN)
{
errors.write(TextureError::RenderFailed(format!("Failed to render PLAYER ONE text: {}", e)).into());
}
}
}
}
#[allow(clippy::too_many_arguments)]

33
src/systems/stage.rs Normal file
View File

@@ -0,0 +1,33 @@
use bevy_ecs::{
prelude::{Commands, Entity, Query, With},
system::ResMut,
};
use crate::systems::components::{Frozen, GhostCollider, PlayerControlled, StartupSequence};
/// Handles startup sequence transitions and component management
pub fn startup_stage_system(
mut startup: ResMut<StartupSequence>,
mut commands: Commands,
mut player_query: Query<Entity, With<PlayerControlled>>,
mut ghost_query: Query<Entity, With<GhostCollider>>,
) {
if let Some((from, to)) = startup.tick() {
match (from, to) {
(StartupSequence::TextOnly { .. }, StartupSequence::CharactersVisible { .. }) => {
// TODO: Add TextOnly tag component to hide entities
// TODO: Add CharactersVisible tag component to show entities
// TODO: Remove TextOnly tag component
}
(StartupSequence::CharactersVisible { .. }, StartupSequence::GameActive) => {
// Remove Frozen tag from all entities
for entity in player_query.iter_mut().chain(ghost_query.iter_mut()) {
commands.entity(entity).remove::<Frozen>();
}
// TODO: Add GameActive tag component
// TODO: Remove CharactersVisible tag component
}
_ => {}
}
}
}