Removed dynamic settings

It worked really well for round 2 to set constants

2 files changed, 10 insertions, 11 deletions

diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs
index 23beaec..5761454 100644
--- a/tests/live_comparison.rs
+++ b/tests/live_comparison.rs
@@ -3,8 +3,7 @@ extern crate zombot;
 use zombot::input::json;
 use zombot::engine::command::{Command, BuildingType};
 use zombot::engine::geometry::Point;
-use zombot::engine::settings::GameSettings;
-use zombot::engine::GameState;
+use zombot::engine::constants::*;
 
 use std::fs::File;
 use std::io::prelude::*;
@@ -20,14 +19,14 @@ fn it_successfully_simulates_replay_with_teslas() {
 }
 
 fn test_from_replay(replay_folder: &str, length: usize) {
-    let (settings, mut state) = json::read_bitwise_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap();
+    let  mut state = json::read_bitwise_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap();
     
     for i in 0..length {
         let player = read_player_command(&format!("{}/Round {:03}/PlayerCommand.txt", replay_folder, i));
-        let opponent = read_opponent_command(&format!("{}/Round {:03}/OpponentCommand.txt", replay_folder, i), &settings);
-        let (_, mut expected_state) = json::read_bitwise_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap();
+        let opponent = read_opponent_command(&format!("{}/Round {:03}/OpponentCommand.txt", replay_folder, i));
+        let mut expected_state = json::read_bitwise_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap();
         
-        state.simulate(&settings, player, opponent);
+        state.simulate(player, opponent);
         state.sort();
         expected_state.sort();
 
@@ -56,15 +55,15 @@ fn read_player_command(filename: &str) -> Command {
     }
 }
 
-fn read_opponent_command(filename: &str, settings: &GameSettings) -> Command {
+fn read_opponent_command(filename: &str) -> Command {
     match read_player_command(filename) {
         Command::Nothing => Command::Nothing,
         Command::Build(p, b) => Command::Build(Point::new(
-            settings.size.x - p.x - 1,
+            FULL_MAP_WIDTH - p.x - 1,
             p.y
         ), b),
         Command::Deconstruct(p) => Command::Deconstruct(Point::new(
-            settings.size.x - p.x - 1,
+            FULL_MAP_WIDTH - p.x - 1,
             p.y
         )),
     }
diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs
index 832cdb3..71e0b07 100644
--- a/tests/monte_carlo_test.rs
+++ b/tests/monte_carlo_test.rs
@@ -10,12 +10,12 @@ const STATE_PATH: &str = "tests/state0.json";
 #[test]
 fn it_does_a_normal_turn_successfully() {
     let start_time = PreciseTime::now();
-    let (settings, state) = match input::json::read_bitwise_state_from_file(STATE_PATH) {
+    let state = match input::json::read_bitwise_state_from_file(STATE_PATH) {
         Ok(ok) => ok,
         Err(error) => panic!("Error while parsing JSON file: {}", error)
     };
     let max_time = Duration::milliseconds(200);
-    strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time);
+    strategy::monte_carlo::choose_move(&state, &start_time, max_time);
 
     assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50))
 }