From 07a13c589edb91dd356ca76802d5791b0427d473 Mon Sep 17 00:00:00 2001 From: Bryan Collazo Date: Sat, 26 Oct 2024 23:11:59 -0400 Subject: [PATCH] max_ticks in favor of max_turns --- catanatron_rust/src/enums.rs | 2 +- catanatron_rust/src/game.rs | 10 +++++----- catanatron_rust/src/main.rs | 2 +- catanatron_rust/src/state.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/catanatron_rust/src/enums.rs b/catanatron_rust/src/enums.rs index b9069cb9..7327891b 100644 --- a/catanatron_rust/src/enums.rs +++ b/catanatron_rust/src/enums.rs @@ -102,5 +102,5 @@ pub struct GameConfiguration { pub vps_to_win: u8, pub map_type: MapType, pub num_players: u8, - pub max_turns: u32, + pub max_ticks: u32, } diff --git a/catanatron_rust/src/game.rs b/catanatron_rust/src/game.rs index 54813c78..9413111a 100644 --- a/catanatron_rust/src/game.rs +++ b/catanatron_rust/src/game.rs @@ -20,11 +20,11 @@ pub fn play_game( let rc_config = Rc::new(config); println!("Playing game with configuration: {:?}", rc_config); let mut state = State::new(rc_config.clone(), Rc::new(map_instance)); - let mut num_turns = 0; - while state.winner().is_none() && num_turns < rc_config.max_turns { - println!("Playing turn {:?}", num_turns); + let mut num_ticks = 0; + while state.winner().is_none() && num_ticks < rc_config.max_ticks { + println!("Playing turn {:?}", num_ticks); play_tick(&players, &mut state); - num_turns += 1; + num_ticks += 1; } state.winner() } @@ -62,7 +62,7 @@ mod tests { vps_to_win: 10, map_type: MapType::Base, num_players: 4, - max_turns: 8, // TODO: Change! + max_ticks: 8, // TODO: Change! }; let mut players: HashMap> = HashMap::new(); players.insert(0, Box::new(RandomPlayer {})); diff --git a/catanatron_rust/src/main.rs b/catanatron_rust/src/main.rs index 6961cc96..339ed1c1 100644 --- a/catanatron_rust/src/main.rs +++ b/catanatron_rust/src/main.rs @@ -78,7 +78,7 @@ fn main() { vps_to_win: 10, map_type: MapType::Base, num_players: 2, - max_turns: 2, + max_ticks: 4, }; let mut players: HashMap> = HashMap::new(); players.insert(Color::Red as u8, Box::new(RandomPlayer {})); diff --git a/catanatron_rust/src/state.rs b/catanatron_rust/src/state.rs index 4267b024..d8e460a2 100644 --- a/catanatron_rust/src/state.rs +++ b/catanatron_rust/src/state.rs @@ -75,7 +75,7 @@ impl State { vps_to_win: 10, map_type: MapType::Base, num_players: 4, - max_turns: 10, + max_ticks: 10, }; let map_instance = MapInstance::new( &global_state.base_map_template,