titaniumtown/othello
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix player order

Browse Source
This commit is contained in:
Simon Gardling 2025-02-12 11:50:57 -05:00
parent 993af2a191
commit dbd0a97602
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/game.rs
View File

@ -1,4 +1,4 @@
use crate::{agent::Agent, board::Board}; use crate::{agent::Agent, board::Board, piece::Piece};
pub struct Game { pub struct Game {
players: [Box<dyn Agent>; 2], players: [Box<dyn Agent>; 2],
@ -21,7 +21,19 @@ impl std::fmt::Display for Game {
} }
impl Game { impl Game {
pub const fn new(player1: Box<dyn Agent>, player2: Box<dyn Agent>) -> Self { pub fn new(player1: Box<dyn Agent>, player2: Box<dyn Agent>) -> Self {
let player1_color = player1.color();
let player2_color = player2.color();
assert_ne!(
player1_color,
player2_color,
"Both players cannot have the same color {}",
player1_color.text()
);
assert_eq!(player1_color, Piece::Black, "player 1 must playing black");
assert_eq!(player2_color, Piece::White, "player 2 must play white");
Self { Self {
players: [player1, player2], players: [player1, player2],
board: Board::new().starting_pos(), board: Board::new().starting_pos(),
@ -54,10 +66,13 @@ impl Game {
} else { } else {
println!("Player {} did not make a move!", player_i); println!("Player {} did not make a move!", player_i);
// players are able to skip a move if they have no valid moves to make // players are able to skip a move if they have no valid moves to make
assert!( if self.board.possible_moves(player_color).any(|_| true) {
!self.board.possible_moves(player_color).any(|_| true), println!(
"Player skipped a move, but they had a possible move to make" "Player {} has possible moves, but skipped (invalid)",
); player_i
);
continue;
}
return; // No valid move available return; // No valid move available
} }
} }
@ -69,7 +84,7 @@ impl Game {
loop { loop {
// alternate which player plays // alternate which player plays
current_player += 1;
current_player %= self.players.len(); current_player %= self.players.len();
println!("{}", self); println!("{}", self);
@ -82,6 +97,7 @@ impl Game {
} }
self.step(current_player); self.step(current_player);
current_player += 1;
} }
} }
} }

4
src/main.rs
View File

@ -12,8 +12,8 @@ mod piece;
fn main() { fn main() {
let player1 = complexagent::ComplexAgent::new(Piece::Black); let player1 = complexagent::ComplexAgent::new(Piece::Black);
// let player2 = complexagent::ComplexAgent::new(Piece::White); // let player2 = complexagent::ComplexAgent::new(Piece::White);
// let player2 = agent::ManualAgent::new(Piece::White); let player2 = agent::ManualAgent::new(Piece::White);
let player2 = agent::RandomAgent::new(Piece::White); // let player2 = agent::RandomAgent::new(Piece::White);
let mut game = Game::new(Box::new(player1), Box::new(player2)); let mut game = Game::new(Box::new(player1), Box::new(player2));
game.game_loop(); game.game_loop();
} }