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

fix: training_common::white_checker_moves_to_trictrac_action

Browse source
This commit is contained in:
Henri Bourcereau 2026-03-08 21:23:31 +01:00
parent db5c1ea4f4
commit 1c4c814417
1 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

55
store/src/training_common.rs
View file

@ -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()
);
}
}