ddidderr/tdkpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(render): restore timed record overlays

Browse Source 
Replace the shared bumper cooldown and synthetic circle outlines with the
original per-record countdown bytes. Bumpers 51-53 use five active callbacks,
side targets 140-147 use twenty, and top targets 150-152 use ten; countdowns
pause while the ball is idle and decrement once per active detail callback.

Render each active record by copying its exact inclusive binary render bounds
from overlay A at the same destination, then naturally fall back to overlay B
when the countdown reaches zero. This removes invented vector effects and keeps
visual lifetime tied to gameplay timer state.

Test Plan:
- `cargo test --all-targets` -- passed, 75 tests
- `cargo clippy --all-targets -- -D warnings` -- passed
- `rumdl check CHANGELOG.md RECONSTRUCTION.md` -- passed
- `git diff --cached --check` -- passed
This commit is contained in:
ddidderr
2026-08-23 17:55:59 +02:00
parent 096d923c79
commit f8292dc87e
4 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdkpin-rs/src/game.rs
+35 -15
View File
@@ -267,7 +267,6 @@ pub struct Game {
pub flippers: Flippers,
flipper_inputs: Flippers,
pub claw: Claw,
pub bumper_flash: [f32; 3],
pub target_rotation_state: Option<u8>,
pub panel_frame: Option<u16>,
pub nudge_shake: f32,
@@ -275,7 +274,7 @@ pub struct Game {
pub finished: bool,
pub last_collision_id: Option<u8>,
accumulator: f32,
bumper_cooldown: f32,
record_countdowns: [u8; 176],
tilt_counter: u16,
tilt_counter_accumulator: f32,
launcher_was_down: bool,
@@ -311,7 +310,6 @@ impl Game {
flippers: Flippers::default(),
flipper_inputs: Flippers::default(),
claw: Claw::default(),
bumper_flash: [0.0; 3],
target_rotation_state: None,
panel_frame: None,
nudge_shake: 0.0,
@@ -319,7 +317,7 @@ impl Game {
finished: false,
last_collision_id: None,
accumulator: 0.0,
bumper_cooldown: 0.0,
record_countdowns: [0; 176],
tilt_counter: 0,
tilt_counter_accumulator: 0.0,
launcher_was_down: false,
@@ -456,6 +454,9 @@ impl Game {
fn timer_tick(&mut self, elapsed: f32, substeps: u8, events: &mut Vec<Event>) {
self.update_claw(elapsed, events);
if !self.ball.in_launcher {
self.update_record_countdowns();
}
self.update_target_rotation(events);
let panel_active = self.update_panel_completion(events);
if !self.claw.ball_suspended && !panel_active {
@@ -494,6 +495,18 @@ impl Game {
self.apply_flipper_kicks();
}
fn update_record_countdowns(&mut self) {
for countdown in &mut self.record_countdowns[1..] {
if *countdown != 0 {
*countdown -= 1;
}
}
}
pub fn record_countdown(&self, record_id: usize) -> u8 {
self.record_countdowns[record_id]
}
fn update_target_rotation(&mut self, events: &mut Vec<Event>) {
let Some(state) = self.target_rotation_state else {
return;
@@ -614,11 +627,7 @@ impl Game {
#[allow(clippy::too_many_lines)]
fn fixed_update(&mut self, dt: f32, events: &mut Vec<Event>) {
self.bumper_cooldown = (self.bumper_cooldown - dt).max(0.0);
self.nudge_shake = (self.nudge_shake - dt).max(0.0);
for flash in &mut self.bumper_flash {
*flash = (*flash - dt).max(0.0);
}
if self.ball.in_launcher {
self.ball.position = LAUNCHER_POSITION;
self.ball.velocity = Vec2::ZERO;
@@ -701,11 +710,9 @@ impl Game {
if let Some(index) = hit_circle
.and_then(|circle_id| BUMPERS.iter().position(|bumper| bumper.id == circle_id))
&& !self.tilted
&& self.bumper_cooldown <= 0.0
{
self.add_score(self.player().bumper_value, events);
self.bumper_cooldown = 0.08;
self.bumper_flash[index] = 0.16;
self.record_countdowns[usize::from(BUMPERS[index].id)] = 5;
events.push(Event::Bumper);
events.push(Event::Sound(2006));
}
@@ -836,11 +843,9 @@ impl Game {
} else if let Some((object_id, false)) = hit
&& let Some(index) = BUMPERS.iter().position(|bumper| bumper.id == object_id)
&& !self.tilted
&& self.bumper_cooldown <= 0.0
{
self.add_score(self.player().bumper_value, events);
self.bumper_cooldown = 0.08;
self.bumper_flash[index] = 0.16;
self.record_countdowns[usize::from(BUMPERS[index].id)] = 5;
events.push(Event::Bumper);
events.push(Event::Sound(2006));
}
@@ -1196,6 +1201,7 @@ impl Game {
self.add_score(sensor.score, events);
events.push(Event::Target);
events.push(Event::Sound(2004));
self.record_countdowns[usize::from(sensor.id)] = if sensor.id <= 147 { 20 } else { 10 };
if (150..=152).contains(&sensor.id) {
self.top_targets[usize::from(sensor.id - 150)] = true;
let field_id = [153, 6, 154][usize::from(sensor.id - 150)];
@@ -1407,7 +1413,6 @@ impl Game {
self.tilted = false;
self.tilt_counter = 0;
self.tilt_counter_accumulator = 0.0;
self.bumper_flash.fill(0.0);
self.target_rotation_state = None;
self.panel_frame = None;
self.claw = Claw::default();
@@ -2519,6 +2524,21 @@ mod tests {
assert_eq!(game.target_rotation_state, None);
}
#[test]
fn record_countdowns_advance_once_per_active_timer_callback() {
let mut game = Game::new(1);
game.record_countdowns[51] = 5;
game.timer_tick(0.030, 0, &mut Vec::new());
assert_eq!(game.record_countdown(51), 5, "launcher idle pauses countdowns");
game.ball.in_launcher = false;
for expected in (0..5).rev() {
game.timer_tick(0.030, 0, &mut Vec::new());
assert_eq!(game.record_countdown(51), expected);
}
}
#[test]
fn claw_release_table_decodes_the_original_thousandth_pixel_coordinates() {
for (frame, expected_position, expected_velocity) in [