Skip to content

fix: multiball scoring from WS event and not anymore from backend calcul #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArthurJenck merged 1 commit into from
Jun 1, 2026
Merged

fix: multiball scoring from WS event and not anymore from backend calcul #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions crates/game-logic/src/engine/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ impl GameEngine {
side: ButtonSide::Right,
},
"BallSaverReady" => GameEvent::BallSaverReady,
"MultiballTriggered" => GameEvent::MultiballTriggered,
unknown => {
tracing::debug!(event_type = unknown, "unhandled screen event type");
return vec![];
Expand Down Expand Up @@ -135,7 +136,6 @@ impl GameEngine {
return envelopes;
}
self.state.balls_lost_since_start += 1;
self.state.bumper_hit_count = 0;
self.state.lives = self.state.lives.saturating_sub(1);

let (pve_env, extra) = self.pve_engine.on_event(&event, &mut self.state);
Expand Down Expand Up @@ -207,20 +207,16 @@ impl GameEngine {
envelopes.extend(self.process(e));
}

self.state.bumper_hit_count += 1;
let bumper_count = self.state.bumper_hit_count;
envelopes.extend(self.check_timer_bonus(now));
envelopes.push(self.emit_score_delta(scored, "bumper"));
envelopes.push(self.emit_score_update());
envelopes.extend(self.process(GameEvent::BumperCombo {
count: bumper_count,
}));
}

GameEvent::BumperCombo { count } => {
if count >= crate::engine::config::MULTIBALL_RING_THRESHOLD {
envelopes.extend(self.process(GameEvent::MultiballWin));
GameEvent::MultiballTriggered => {
if self.state.phase != GamePhase::InGame {
return envelopes;
}
envelopes.extend(self.process(GameEvent::MultiballWin));
}

GameEvent::PortalUsed => {
Expand Down Expand Up @@ -272,7 +268,6 @@ impl GameEngine {
}

GameEvent::MultiballWin => {
self.state.bumper_hit_count = 0;
let pts = crate::engine::config::MULTIBALL_SCORE as u64;
self.state.add_score(pts);
envelopes.push(self.emit_score_delta(pts, "multiball"));
Expand Down
2 changes: 1 addition & 1 deletion crates/game-logic/src/engine/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ pub enum GameEvent {
ButtonPressed { side: ButtonSide },
BumperHit { pts: u32 },
BumperTriangleHit { pts: u32 },
BumperCombo { count: u32 },
PortalUsed,
BallSaverReady,
TiltDetected,
LifeUp,
MultiballTriggered,
MultiballWin,
ScoreMultiplierActivated,
UltimateActivated { player_id: String },
Expand Down
2 changes: 0 additions & 2 deletions crates/game-logic/src/engine/states.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ pub struct GameState {
pub multiplier_expires_at: Option<Instant>,
pub tilt_state: TiltState,
pub balls_lost_since_start: u32,
pub bumper_hit_count: u32,
pub session_start: Option<Instant>,
pub cheating_detected: bool,
pub extra_balls: u8,
Expand All @@ -66,7 +65,6 @@ impl GameState {
multiplier_expires_at: None,
tilt_state: TiltState::default(),
balls_lost_since_start: 0,
bumper_hit_count: 0,
session_start: None,
cheating_detected: false,
extra_balls: 0,
Expand Down
Loading