From 1c4c81441792b7bf6b603a6694314aac3e786e2b Mon Sep 17 00:00:00 2001
From: Henri Bourcereau <henri.bourcereau@gmail.com>
Date: Sun, 8 Mar 2026 21:23:31 +0100
Subject: [PATCH] fix: training_common::white_checker_moves_to_trictrac_action

---
 store/src/training_common.rs | 55 ++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/store/src/training_common.rs b/store/src/training_common.rs
index 6a5b537..69765fc 100644
--- a/store/src/training_common.rs
+++ b/store/src/training_common.rs
@@ -224,7 +224,10 @@ pub fn get_valid_actions(game_state: &GameState) -> anyhow::Result<Vec<TrictracA
                 let cum = rules.board.white_checker_cumulative();
                 for (move1, move2) in possible_moves {
                     valid_actions.push(white_checker_moves_to_trictrac_action(
-                        &move1, &move2, &game_state.dice, &cum,
+                        &move1,
+                        &move2,
+                        &game_state.dice,
+                        &cum,
                     )?);
                 }
             }
@@ -239,7 +242,10 @@ pub fn get_valid_actions(game_state: &GameState) -> anyhow::Result<Vec<TrictracA
                 let cum = rules.board.white_checker_cumulative();
                 for (move1, move2) in possible_moves {
                     valid_actions.push(white_checker_moves_to_trictrac_action(
-                        &move1, &move2, &game_state.dice, &cum,
+                        &move1,
+                        &move2,
+                        &game_state.dice,
+                        &cum,
                     )?);
                 }
             }
@@ -294,7 +300,7 @@ fn white_checker_moves_to_trictrac_action(
             }
         } else {
             // double sortie
-            if from1 < from2 {
+            if from1 < from2 || from2 == 0 {
                 max(dice.values.0, dice.values.1) as usize
             } else {
                 min(dice.values.0, dice.values.1) as usize
@@ -458,5 +464,48 @@ mod tests {
             }),
             ttaction.ok()
         );
+
+        // Black player
+        state.active_player_id = 2;
+        state.dice = Dice { values: (6, 3) };
+        state.board.set_positions(
+            &crate::Color::White,
+            [
+                2, -11, 0, -2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 6, 4,
+            ],
+        );
+        let ttaction = super::checker_moves_to_trictrac_action(
+            &CheckerMove::new(21, 0).unwrap(),
+            &CheckerMove::new(0, 0).unwrap(),
+            &crate::Color::Black,
+            &state,
+        );
+
+        assert_eq!(
+            Some(TrictracAction::Move {
+                dice_order: true,
+                checker1: 2,
+                checker2: 0, // blocked by white on last field
+            }),
+            ttaction.ok()
+        );
+
+        // same with dice order reversed
+        state.dice = Dice { values: (3, 6) };
+        let ttaction = super::checker_moves_to_trictrac_action(
+            &CheckerMove::new(21, 0).unwrap(),
+            &CheckerMove::new(0, 0).unwrap(),
+            &crate::Color::Black,
+            &state,
+        );
+
+        assert_eq!(
+            Some(TrictracAction::Move {
+                dice_order: false,
+                checker1: 2,
+                checker2: 0, // blocked by white on last field
+            }),
+            ttaction.ok()
+        );
     }
 }