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

fix move rules (stronger die)

Browse source
This commit is contained in:
Henri Bourcereau 2024-05-23 17:37:45 +02:00
parent 07ec82ae7c
commit b7255e9d16
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
store/src/game_rules_moves.rs
View file

@ -151,9 +151,15 @@ pub trait MoveRules {
// Si possible, les deux dés doivent être joués // Si possible, les deux dés doivent être joués
let possible_moves_sequences = self.get_possible_moves_sequences(color, true); let possible_moves_sequences = self.get_possible_moves_sequences(color, true);
if !possible_moves_sequences.contains(moves) && !possible_moves_sequences.is_empty() { if !possible_moves_sequences.contains(moves) && !possible_moves_sequences.is_empty() {
println!(">>{:?}<<", moves); // println!(">>{:?}<<", moves);
println!("{:?}", possible_moves_sequences); // println!("{:?}", possible_moves_sequences);
return Err(MoveError::MustPlayAllDice); let empty_removed = possible_moves_sequences
.iter()
.filter(|(c1, c2)| *c1 != EMPTY_MOVE && *c2 != EMPTY_MOVE);
if empty_removed.count() > 0 {
return Err(MoveError::MustPlayAllDice);
}
return Err(MoveError::MustPlayStrongerDie);
} }
// check exit rules // check exit rules
@ -267,10 +273,14 @@ pub trait MoveRules {
with_excedents: bool, with_excedents: bool,
) -> Vec<(CheckerMove, CheckerMove)> { ) -> Vec<(CheckerMove, CheckerMove)> {
let (dice1, dice2) = self.dice().values; let (dice1, dice2) = self.dice().values;
let (diceMax, diceMin) = if dice1 > dice2 { (dice1, dice2) } else { (dice2, dice1) };
let mut moves_seqs = let mut moves_seqs =
self.get_possible_moves_sequences_by_dices(color, dice1, dice2, with_excedents); self.get_possible_moves_sequences_by_dices(color, diceMax, diceMin, with_excedents, false);
// if we got valid sequences whith the highest die, we don't accept sequences using only the
// lowest die
let ignore_empty = !moves_seqs.is_empty();
let mut moves_seqs_order2 = let mut moves_seqs_order2 =
self.get_possible_moves_sequences_by_dices(color, dice2, dice1, with_excedents); self.get_possible_moves_sequences_by_dices(color, diceMin, diceMax, with_excedents, ignore_empty);
moves_seqs.append(&mut moves_seqs_order2); moves_seqs.append(&mut moves_seqs_order2);
let empty_removed = moves_seqs let empty_removed = moves_seqs
.iter() .iter()
@ -303,6 +313,7 @@ pub trait MoveRules {
dice1: u8, dice1: u8,
dice2: u8, dice2: u8,
with_excedents: bool, with_excedents: bool,
ignore_empty: bool,
) -> Vec<(CheckerMove, CheckerMove)> { ) -> Vec<(CheckerMove, CheckerMove)> {
let mut moves_seqs = Vec::new(); let mut moves_seqs = Vec::new();
for first_move in self for first_move in self
@ -320,7 +331,7 @@ pub trait MoveRules {
moves_seqs.push((first_move, second_move)); moves_seqs.push((first_move, second_move));
has_second_dice_move = true; has_second_dice_move = true;
} }
if !has_second_dice_move && with_excedents { if !has_second_dice_move && with_excedents && !ignore_empty {
// empty move // empty move
moves_seqs.push((first_move, EMPTY_MOVE)); moves_seqs.push((first_move, EMPTY_MOVE));
} }
@ -683,8 +694,8 @@ mod tests {
CheckerMove::new(12, 14).unwrap(), CheckerMove::new(12, 14).unwrap(),
CheckerMove::new(0, 0).unwrap(), CheckerMove::new(0, 0).unwrap(),
); );
let poss = state.get_possible_moves_sequences(&Color::White, true); // let poss = state.get_possible_moves_sequences(&Color::White, true);
println!("{:?}", poss); // println!("{:?}", poss);
assert_eq!( assert_eq!(
Err(MoveError::MustPlayStrongerDie), Err(MoveError::MustPlayStrongerDie),
state.moves_allowed(&Color::White, &moves) state.moves_allowed(&Color::White, &moves)