henri/trictrac
1
1
Fork 0
Code Issues 10 Pull requests Projects 1 Releases Packages Wiki Activity Actions

fix(client_web): only animate 2nd checker on 2nd move

Browse source
This commit is contained in:
Henri Bourcereau 2026-04-18 17:11:47 +02:00
parent 00326cd645
commit 2838d59f30
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client_web/src/app.rs
View file

@ -270,6 +270,7 @@ pub fn App() -> impl IntoView {
view_state: Some(vs.clone()), view_state: Some(vs.clone()),
}); });
} }
let is_own_move = prev_vs.active_mp_player == Some(player_id);
push_or_show( push_or_show(
&prev_vs, &prev_vs,
GameUiState { GameUiState {
@ -281,7 +282,7 @@ pub fn App() -> impl IntoView {
pause_reason: None, pause_reason: None,
my_scored_event: None, my_scored_event: None,
opp_scored_event: None, opp_scored_event: None,
last_moves: compute_last_moves(&prev_vs, &vs), last_moves: compute_last_moves(&prev_vs, &vs, is_own_move),
}, },
pending, pending,
screen, screen,
@ -376,7 +377,7 @@ async fn run_local_bot_game(
pause_reason: None, pause_reason: None,
my_scored_event: scored, my_scored_event: scored,
opp_scored_event: opp_scored, opp_scored_event: opp_scored,
last_moves: compute_last_moves(&prev_vs, &vs), last_moves: compute_last_moves(&prev_vs, &vs, true),
})); }));
} }
Some(NetCommand::PlayVsBot) => return true, Some(NetCommand::PlayVsBot) => return true,
@ -406,7 +407,7 @@ async fn run_local_bot_game(
pause_reason: None, pause_reason: None,
my_scored_event: None, my_scored_event: None,
opp_scored_event: None, opp_scored_event: None,
last_moves: compute_last_moves(&delta_prev_vs, &vs), last_moves: compute_last_moves(&delta_prev_vs, &vs, false),
}, },
pending, pending,
screen, screen,
@ -421,7 +422,8 @@ async fn run_local_bot_game(
/// Returns the checker moves to animate when the board changed between two ViewStates. /// Returns the checker moves to animate when the board changed between two ViewStates.
/// Returns `None` when the board is unchanged or no real moves were recorded. /// Returns `None` when the board is unchanged or no real moves were recorded.
fn compute_last_moves(prev: &ViewState, next: &ViewState) -> Option<(CheckerMove, CheckerMove)> { /// `own_move`: when true, m1 was already shown via staged-moves UI, so only animate m2.
fn compute_last_moves(prev: &ViewState, next: &ViewState, own_move: bool) -> Option<(CheckerMove, CheckerMove)> {
if prev.board == next.board { if prev.board == next.board {
return None; return None;
} }
@ -432,6 +434,11 @@ fn compute_last_moves(prev: &ViewState, next: &ViewState) -> Option<(CheckerMove
// without setting dice_moves would bypass this guard and replay stale animation. // without setting dice_moves would bypass this guard and replay stale animation.
return None; return None;
} }
if own_move {
// m1 was already shown via the staged-moves overlay; only animate m2.
if m2 == CheckerMove::default() { return None; }
return Some((m2, CheckerMove::default()));
}
Some((m1, m2)) Some((m1, m2))
} }