+ }
+}
+
+#[component]
+pub fn ScoringPanel(
+ event: ScoredEvent,
+ turn_stage: SerTurnStage,
+ #[prop(default = false)] is_opponent: bool,
+) -> impl IntoView {
+ let i18n = use_i18n();
+ let cmd_tx = use_context::>()
+ .expect("UnboundedSender not found in context");
+
+ let points_earned = event.points_earned;
+ let holes_gained = event.holes_gained;
+ let holes_total = event.holes_total;
+ let bredouille = event.bredouille;
+ let show_hold_go = !is_opponent && turn_stage == SerTurnStage::HoldOrGoChoice;
+ let panel_class = if is_opponent {
+ "scoring-panel scoring-panel-opp"
+ } else {
+ "scoring-panel"
+ };
+
+ // ── Lifecycle signals ──────────────────────────────────────────────────
+ // peeked: added after 3.4 s (slide to peek strip)
+ // revealed: added on first hover of the peek strip (stay open permanently)
+ let peeked = RwSignal::new(false);
+ let revealed = RwSignal::new(false);
+
+ // ── Collect all moves from all jans for automatic arrow display ────────
+ let all_moves: Vec<(CheckerMove, CheckerMove)> = event
+ .jans
+ .iter()
+ .flat_map(|e| e.moves.iter().cloned())
+ .collect();
+ let all_moves_click = all_moves.clone();
+ let all_moves_enter = all_moves.clone();
+
+ let hovered_ctx = use_context::>>();
+
+ // On mount: show all this event's moves as board arrows immediately,
+ // then after 3.4 s slide to peek and clear the arrows.
+ //
+ // Two important constraints:
+ // 1. The initial hm.set() must be deferred (spawn_local, not sync in body)
+ // to avoid writing a reactive signal mid-render while Board reads it —
+ // that triggers Leptos's cycle guard → `unreachable` WASM panic.
+ // 2. The cancellation flag must be Rc>, NOT RwSignal.
+ // RwSignal is a NodeId into Leptos's arena; the arena slot is freed
+ // when ScoringPanel's owner drops (on every GameScreen remount). If the
+ // 3.4 s future outlives the component and calls is_alive.get_untracked()
+ // on a freed slot, that also panics with `unreachable`. Rc>
+ // is reference-counted outside the arena and stays valid for as long as
+ // the future holds onto it.
+ #[cfg(target_arch = "wasm32")]
+ if let Some(hm) = hovered_ctx {
+ let is_alive = Arc::new(AtomicBool::new(true));
+ let is_alive_cleanup = is_alive.clone();
+ // on_cleanup requires Send + Sync; Arc satisfies both.
+ on_cleanup(move || is_alive_cleanup.store(false, Ordering::Relaxed));
+
+ spawn_local(async move {
+ // Show arrows (runs in the next microtask, after render settles).
+ hm.set(all_moves);
+
+ TimeoutFuture::new(3_400).await;
+ // Guard: component may have been destroyed while we were waiting.
+ // is_alive was set to false by on_cleanup, which runs before Leptos
+ // frees the signal arena slots — so peeked is still valid iff this
+ // returns true.
+ if !is_alive.load(Ordering::Relaxed) {
+ return;
+ }
+ hm.set(vec![]);
+ peeked.set(true);
+ });
+ }
+
+ let jan_rows: Vec<_> = event.jans.into_iter().map(scoring_jan_row).collect();
+
+ view! {
+ // ── Outer wrapper: owns the slide / peek / reveal animation ───────
+ // pointer-events are on by default (parent .side-panel sets none,
+ // and .scoring-panel-wrapper overrides back to auto in CSS).
+
+
+
+ {move || if is_opponent {
+ t_string!(i18n, opp_scored_pts, n = points_earned)
+ } else {
+ t_string!(i18n, scored_pts, n = points_earned)
+ }}
+
{move || {
@@ -478,11 +473,6 @@ pub fn GameScreen(state: GameUiState) -> impl IntoView {
// ── Game-over overlay ─────────────────────────────────────────────
{stage_is_ended.then(|| {
- if winner_is_me {
- crate::game::sound::play_victory();
- } else {
- crate::game::sound::play_defeat();
- }
let opp_name_end_clone = opp_name_end.clone();
let winner_text = move || if winner_is_me {
t_string!(i18n, you_win).to_owned()
diff --git a/clients/web/src/game/components/scoring.rs b/clients/web/src/game/components/scoring.rs
index a3f939b..79fd433 100644
--- a/clients/web/src/game/components/scoring.rs
+++ b/clients/web/src/game/components/scoring.rs
@@ -80,7 +80,8 @@ pub fn ScoringPanel(
"scoring-panel"
};
- // minimized: starts false (expanded)
+ // minimized: starts false (expanded), becomes true after 3.4 s unless
+ // the Hold/Go choice still needs the player's attention.
let minimized = RwSignal::new(false);
// Collect all moves from all jans for automatic arrow display.
@@ -96,43 +97,6 @@ pub fn ScoringPanel(
let hovered_ctx = use_context::>>();
let jan_rows: Vec<_> = event.jans.into_iter().map(scoring_jan_row).collect();
- // On mount: show all this event's moves as board arrows immediately,
- // then after 3.4 s slide to peek and clear the arrows.
- //
- // Two important constraints:
- // 1. The initial hm.set() must be deferred (spawn_local, not sync in body)
- // to avoid writing a reactive signal mid-render while Board reads it —
- // that triggers Leptos's cycle guard → `unreachable` WASM panic.
- // 2. The cancellation flag must be Rc>, NOT RwSignal.
- // RwSignal is a NodeId into Leptos's arena; the arena slot is freed
- // when ScoringPanel's owner drops (on every GameScreen remount). If the
- // 3.4 s future outlives the component and calls is_alive.get_untracked()
- // on a freed slot, that also panics with `unreachable`. Rc>
- // is reference-counted outside the arena and stays valid for as long as
- // the future holds onto it.
- #[cfg(target_arch = "wasm32")]
- if let Some(hm) = hovered_ctx {
- let is_alive = Arc::new(AtomicBool::new(true));
- let is_alive_cleanup = is_alive.clone();
- // on_cleanup requires Send + Sync; Arc satisfies both.
- on_cleanup(move || is_alive_cleanup.store(false, Ordering::Relaxed));
-
- spawn_local(async move {
- // Show arrows (runs in the next microtask, after render settles).
- hm.set(all_moves);
-
- TimeoutFuture::new(3_400).await;
- // Guard: component may have been destroyed while we were waiting.
- // is_alive was set to false by on_cleanup, which runs before Leptos
- // frees the signal arena slots — so peeked is still valid iff this
- // returns true.
- if !is_alive.load(Ordering::Relaxed) {
- return;
- }
- hm.set(vec![]);
- });
- }
-
view! {
for TrictracBackend
#[cfg(test)]
mod tests {
use super::*;
- use super::{SerStage, SerTurnStage};
+ use super::types::{SerStage, SerTurnStage};
use backbone_lib::traits::BackEndArchitecture;
fn make_backend() -> TrictracBackend {
diff --git a/clients/web/src/game/trictrac/bot_local.rs b/clients/web/src/game/trictrac/bot_local.rs
index 6161fe2..5543b07 100644
--- a/clients/web/src/game/trictrac/bot_local.rs
+++ b/clients/web/src/game/trictrac/bot_local.rs
@@ -1,4 +1,5 @@
-use trictrac_store::{Board, CheckerMove, Color, GameState, MoveRules, Stage, TurnStage};
+use rand::prelude::IndexedRandom;
+use trictrac_store::{CheckerMove, Color, GameState, MoveRules, Stage, TurnStage};
use super::types::{PlayerAction, PreGameRollState};
@@ -28,65 +29,15 @@ pub fn bot_decide(game: &GameState, pgr: Option<&PreGameRollState>) -> Option {
let rules = MoveRules::new(&Color::Black, &game.board, game.dice);
let sequences = rules.get_possible_moves_sequences(true, vec![]);
- // MoveRules with Color::Black mirrors the board internally, so
- // returned move coordinates are in mirrored (White) space — mirror back.
+ let mut rng = rand::rng();
let (m1, m2) = sequences
- .iter()
- .max_by(|(m1a, m2a), (m1b, m2b)| {
- score_seq(&game.board, m1a, m2a)
- .partial_cmp(&score_seq(&game.board, m1b, m2b))
- .unwrap_or(std::cmp::Ordering::Equal)
- })
+ .choose(&mut rng)
.cloned()
.unwrap_or((CheckerMove::default(), CheckerMove::default()));
+ // MoveRules with Color::Black mirrors the board internally, so
+ // returned move coordinates are in mirrored (White) space — mirror back.
Some(PlayerAction::Move(m1.mirror(), m2.mirror()))
}
_ => None,
}
}
-
-/// Score a candidate move sequence from the bot's (Black) perspective.
-/// `m1` and `m2` are in mirrored (White) space, as returned by MoveRules for Color::Black.
-fn score_seq(board: &Board, m1: &CheckerMove, m2: &CheckerMove) -> f32 {
- let mut b = board.mirror();
- let _ = b.move_checker(&Color::White, *m1);
- let _ = b.move_checker(&Color::White, *m2);
- evaluate(&b)
-}
-
-/// Evaluate a board position from White's perspective (call after mirroring for Black).
-fn evaluate(board: &Board) -> f32 {
- let mut score = 0.0f32;
-
- let white_fields = board.get_color_fields(Color::White);
- let black_fields = board.get_color_fields(Color::Black);
-
- // Quarter fill progress — quarters 1-6, 7-12, 19-24.
- // Quarter 13-18 is skipped: field 13 is the opponent's rest corner so White can never fill it.
- for &q in &[1usize, 7, 19] {
- if board.is_quarter_filled(Color::White, q) {
- score += 8.0;
- } else {
- let missing = board.get_quarter_filling_candidate(Color::White);
- score += (6 - missing.len().min(6)) as f32 * 0.3;
- }
- }
-
- // Singleton exposure: penalise a White singleton at field f only when there is at least
- // one Black checker at a field g > f (opponent can potentially threaten it).
- let max_black_field = black_fields.iter().map(|(f, _)| *f).max().unwrap_or(0);
- for (f, count) in &white_fields {
- if *count == 1 && *f < max_black_field {
- score -= 0.5;
- }
- }
-
- // Exit zone progress: reward checkers already in fields 19-24.
- for (field, count) in &white_fields {
- if *field >= 19 {
- score += count.abs() as f32 * 0.3;
- }
- }
-
- score
-}
diff --git a/justfile b/justfile
index b308095..507fe00 100644
--- a/justfile
+++ b/justfile
@@ -13,9 +13,6 @@ runcli:
dev:
trunk serve
-test-web:
- wasm-pack test --node clients/web
-
[working-directory: 'clients/web']
build:
trunk build --release
@@ -28,6 +25,31 @@ build:
run-relay:
./relay-server
+# Legacy targets kept for reference during transition
+[working-directory: 'clients/web-game']
+dev-game:
+ trunk serve
+
+[working-directory: 'clients/web-game']
+build-game:
+ trunk build --release
+ cp dist/index.html ../../deploy/trictrac.html
+ cp dist/*.wasm ../../deploy/
+ cp dist/*.js ../../deploy/
+ cp dist/*.css ../../deploy/
+
+[working-directory: 'clients/web-user-portal']
+dev-portal:
+ trunk serve
+
+[working-directory: 'clients/web-user-portal']
+build-portal:
+ trunk build --release
+ cp dist/index.html ../../deploy/portal.html
+ cp dist/*.wasm ../../deploy/
+ cp dist/*.js ../../deploy/
+ cp dist/*.css ../../deploy/
+
build-relay:
CARGO_PROFILE_RELEASE_OPT_LEVEL=3 cargo build -p relay-server --release
mkdir -p deploy
diff --git a/store/src/game_rules_moves.rs b/store/src/game_rules_moves.rs
index e5af72b..660acb7 100644
--- a/store/src/game_rules_moves.rs
+++ b/store/src/game_rules_moves.rs
@@ -260,7 +260,8 @@ impl MoveRules {
// A chained move (tout d'une): the first destination is a resting field.
// Exception: a resting field in the opponent's big jan (13-18) is allowed
// during a chained move to pass into the return jan.
- let is_chained = moves.1.get_from() != 0 && moves.0.get_to() == moves.1.get_from();
+ let is_chained =
+ moves.1.get_from() != 0 && moves.0.get_to() == moves.1.get_from();
if !is_chained {
let to0 = moves.0.get_to();
@@ -755,8 +756,6 @@ impl MoveRules {
#[cfg(test)]
mod tests {
- use anyhow::Ok;
-
use super::*;
#[test]
@@ -888,20 +887,6 @@ mod tests {
state.moves_allowed(&moves)
);
- // on peut sortir une dame avec un nombre exact, même si on peut en jouer une avec un nombre défaillant
- state.board.set_positions(
- &Color::White,
- [
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 2, 0,
- ],
- );
- state.dice.values = (2, 5);
- let moves = (
- CheckerMove::new(20, 0).unwrap(),
- CheckerMove::new(23, 0).unwrap(),
- );
- assert!(state.moves_allowed(&moves).is_ok());
-
// on doit jouer le nombre excédant le plus éloigné
state.board.set_positions(
&Color::White,
@@ -1504,6 +1489,22 @@ mod tests {
state.get_possible_moves_sequences(true, vec![])
);
+ state.board.set_positions(
+ &Color::White,
+ [
+ -8, -4, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 3, 2, 2, 2,
+ ],
+ );
+ state.dice.values = (1, 4);
+ let moves = (
+ CheckerMove::new(21, 22).unwrap(),
+ CheckerMove::new(22, 0).unwrap(),
+ );
+ assert_eq!(
+ vec![moves],
+ state.get_possible_moves_sequences(true, vec![])
+ );
+
state.dice.values = (5, 3);
state.board.set_positions(
&crate::Color::White,
diff --git a/store/src/game_rules_points.rs b/store/src/game_rules_points.rs
index cdc1e9c..062bf06 100644
--- a/store/src/game_rules_points.rs
+++ b/store/src/game_rules_points.rs
@@ -205,26 +205,24 @@ impl PointsRules {
let from0 = adv_corner_field - self.dice.values.0 as usize;
let from1 = adv_corner_field - self.dice.values.1 as usize;
- let (from0_count, from0_color) = board_ini.get_field_checkers(from0).unwrap();
- let (from1_count, from1_color) = board_ini.get_field_checkers(from1).unwrap();
+ let (from0_count, _from0_color) = board_ini.get_field_checkers(from0).unwrap();
+ let (from1_count, _from1_color) = board_ini.get_field_checkers(from1).unwrap();
let hit_moves = vec![(
CheckerMove::new(from0, adv_corner_field).unwrap(),
CheckerMove::new(from1, adv_corner_field).unwrap(),
)];
- if from0_color == Some(&Color::White) && from1_color == Some(&Color::White) {
- if from0 == from1 {
- // doublet
- if from0_count > if from0 == corner_field { 3 } else { 1 } {
- jans.insert(Jan::TrueHitOpponentCorner, hit_moves);
- }
- } else {
- // simple
- if from0_count > if from0 == corner_field { 2 } else { 0 }
- && from1_count > if from1 == corner_field { 2 } else { 0 }
- {
- jans.insert(Jan::TrueHitOpponentCorner, hit_moves);
- }
+ if from0 == from1 {
+ // doublet
+ if from0_count > if from0 == corner_field { 3 } else { 1 } {
+ jans.insert(Jan::TrueHitOpponentCorner, hit_moves);
+ }
+ } else {
+ // simple
+ if from0_count > if from0 == corner_field { 2 } else { 0 }
+ && from1_count > if from1 == corner_field { 2 } else { 0 }
+ {
+ jans.insert(Jan::TrueHitOpponentCorner, hit_moves);
}
}
}
@@ -701,16 +699,6 @@ mod tests {
rules.set_dice(Dice { values: (1, 1) });
assert_eq!(0, rules.get_points(5).0);
- // Battage du coin de repos adverse: check if we do it with our own checkers!
- rules.update_positions(
- &Color::White,
- [
- -4, 0, 0, -1, 0, 0, 0, 0, -1, 3, 2, 2, 0, -2, -2, 2, 1, 0, 4, -3, 1, 0, 0, 2,
- ],
- );
- rules.set_dice(Dice { values: (3, 4) });
- assert_eq!(0, rules.get_points(5).0);
-
// Cas de battage du coin de repos adverse impossible
// car son propre coin de repos n'est pas rempli
rules.update_positions(