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

chore(web_client): refact

Browse source
This commit is contained in:
Henri Bourcereau 2026-04-12 21:03:43 +02:00
parent dd503b5288
commit 3539bcda0f
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client_web/src/trictrac/bot_local.rs
View file

@ -15,7 +15,7 @@ pub fn bot_decide(game: &GameState) -> Option<PlayerAction> {
} }
match game.turn_stage { match game.turn_stage {
TurnStage::RollDice => Some(PlayerAction::Roll), TurnStage::RollDice => Some(PlayerAction::Roll),
TurnStage::HoldOrGoChoice => Some(PlayerAction::Go), TurnStage::HoldOrGoChoice => Some(PlayerAction::Mark),
TurnStage::Move => { TurnStage::Move => {
let rules = MoveRules::new(&Color::Black, &game.board, game.dice); let rules = MoveRules::new(&Color::Black, &game.board, game.dice);
let sequences = rules.get_possible_moves_sequences(true, vec![]); let sequences = rules.get_possible_moves_sequences(true, vec![]);

13
store/src/game_rules_moves.rs
View file

@ -955,15 +955,15 @@ mod tests {
); );
state.board.set_positions( state.board.set_positions(
&Color::White, &Color::Black,
[ [
6, 0, 0, 0, 0, 0, 2, 2, 1, 2, 0, 2, 0, -5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, -1, 0, 2, 0, 0, 0, 1, 2, 0, -1, -1, 0, 2, 0, 0, 0, 0, 0, 0, -10,
], ],
); );
state.dice.values = (3, 3); state.dice.values = (4, 1);
let moves = ( let moves = (
CheckerMove::new(14, 11).unwrap(), CheckerMove::new(15, 14).unwrap().mirror(),
CheckerMove::new(14, 11).unwrap(), CheckerMove::new(14, 10).unwrap().mirror(),
); );
assert_eq!( assert_eq!(
Err(MoveError::OpponentCanFillQuarter), Err(MoveError::OpponentCanFillQuarter),
@ -1277,6 +1277,7 @@ mod tests {
); );
assert!(!state.moves_possible(&moves)); assert!(!state.moves_possible(&moves));
// Chaned moves: can't rest on a field occupied by one opponent's checker
state.board.set_positions( state.board.set_positions(
&Color::White, &Color::White,
[ [
@ -1288,7 +1289,7 @@ mod tests {
CheckerMove::new(10, 15).unwrap(), CheckerMove::new(10, 15).unwrap(),
CheckerMove::new(15, 20).unwrap(), CheckerMove::new(15, 20).unwrap(),
); );
assert!(state.moves_possible(&moves)); assert!(!state.moves_possible(&moves));
// black moves // black moves
let state = MoveRules::new(&Color::Black, &Board::default(), Dice::default()); let state = MoveRules::new(&Color::Black, &Board::default(), Dice::default());