From 057a4fe886848322adf4e48ad9709a289434dc1b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 5 May 2018 20:37:53 +0200 Subject: Initial commit with sample bot and embedded game engine --- .gitignore | 10 +++ Cargo.toml | 8 ++ README.md | 38 +++++++++ bot.json | 8 ++ src/engine/command.rs | 27 ++++++ src/engine/geometry.rs | 24 ++++++ src/engine/mod.rs | 220 +++++++++++++++++++++++++++++++++++++++++++++++++ src/engine/settings.rs | 10 +++ src/main.rs | 53 ++++++++++++ src/state_json.rs | 86 +++++++++++++++++++ 10 files changed, 484 insertions(+) create mode 100644 .gitignore create mode 100644 Cargo.toml create mode 100644 README.md create mode 100644 bot.json create mode 100644 src/engine/command.rs create mode 100644 src/engine/geometry.rs create mode 100644 src/engine/mod.rs create mode 100644 src/engine/settings.rs create mode 100644 src/main.rs create mode 100644 src/state_json.rs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..44ba2ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +target +command.txt +state.json + +# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries +# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html +Cargo.lock + +# These are backup files generated by rustfmt +**/*.rs.bk \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..7628f0f --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "zombot" +version = "1.0.0" + +[dependencies] +serde_derive = "1.0.43" +serde = "1.0.43" +serde_json = "1.0.16" diff --git a/README.md b/README.md new file mode 100644 index 0000000..0b97c14 --- /dev/null +++ b/README.md @@ -0,0 +1,38 @@ +# Rust Sample Bot + +Rust is a systems programming language, giving programmers the low +level control that they would usually associate with a programming +langauge like C or C++, but modern high level programming features. + +Rust is a compiled language, which compiles to an +architecture-specific binary. + +For getting started with this bot in particular, I've done a write up +about [writing a Rust bot for the Entelect challenge](https://www.worthe-it.co.za/programming/2018/05/02/writing-an-entelect-challenge-bot-in-rust.html). + +## Environment Setup + +The Rust compiler toolchain can be downloaded from the Rust project +website. + +https://www.rust-lang.org/en-US/install.html + +## Compilation + +The bot can be built using the Rust build tool, Cargo. For the sake of +the competition, the `--release` flag should be used. + +``` +cargo build --release +``` + +## Running + +After compilation, there will be an executable in +`target/release/`. + +For example, this sample bot's name is +`entelect_challenge_rust_sample`, so the executable to be run is +`target/release/entelect_challenge_rust_sample` on Linux or +`target/release/entelect_challenge_rust_sample.exe` on Windows. + diff --git a/bot.json b/bot.json new file mode 100644 index 0000000..14ed686 --- /dev/null +++ b/bot.json @@ -0,0 +1,8 @@ +{ + "author": "Justin Worthe", + "email": "justin@worthe-it.co.za", + "nickName": "Justin", + "botLocation": "/target/release/", + "botFileName": "zombot", + "botLanguage": "rust" +} diff --git a/src/engine/command.rs b/src/engine/command.rs new file mode 100644 index 0000000..603ee42 --- /dev/null +++ b/src/engine/command.rs @@ -0,0 +1,27 @@ +use std::fmt; +use super::geometry::Point; + +#[derive(Debug, Clone, Copy)] +pub enum Command { + Nothing, + Build(Point, BuildingType), +} + +impl fmt::Display for Command { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + use Command::*; + + match self { + &Nothing => write!(f, ""), + &Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), + } + } +} + +#[repr(u8)] +#[derive(Debug, Clone, Copy)] +pub enum BuildingType { + Defense = 0, + Attack = 1, + Energy = 2, +} diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs new file mode 100644 index 0000000..f2a2522 --- /dev/null +++ b/src/engine/geometry.rs @@ -0,0 +1,24 @@ +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct Point { + pub x: u8, + pub y: u8 +} + +impl Point { + pub fn move_left(&self) -> Option { + self.x.checked_sub(1).map(|x| Point { + x: x, + ..*self + }) + } + pub fn move_right(&self, size: &Point) -> Option { + if self.x + 1 >= size.x { + None + } else { + Some(Point { + x: self.x + 1, + ..*self + }) + } + } +} diff --git a/src/engine/mod.rs b/src/engine/mod.rs new file mode 100644 index 0000000..d321572 --- /dev/null +++ b/src/engine/mod.rs @@ -0,0 +1,220 @@ +pub mod command; +pub mod geometry; +pub mod settings; + +use self::command::{BuildingType, Command}; +use self::geometry::Point; +use self::settings::GameSettings; + +use std::ops::Fn; +use std::cmp; + +#[derive(Debug, Clone)] +struct GameState { + status: GameStatus, + player: Player, + opponent: Player, + player_buildings: Vec, + opponent_buildings: Vec, + player_missiles: Vec, + opponent_missiles: Vec +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum GameStatus { + Continue, + PlayerWon, + OpponentWon, + Draw, + InvalidMove +} + +impl GameStatus { + fn is_complete(&self) -> bool { + *self != GameStatus::Continue + } +} + +#[derive(Debug, Clone)] +pub struct Player { + energy: u16, + health: u16 +} + +#[derive(Debug, Clone)] +struct Building { + pos: Point, + health: u16, + construction_time_left: u8, + weapon_damage: u16, + weapon_speed: u8, + weapon_cooldown_time_left: u8, + weapon_cooldown_period: u8, + energy_generated_per_turn: u16 +} + +impl Building { + fn new(pos: Point, building: BuildingType) -> Building { + match building { + BuildingType::Defense => Building { + pos: pos, + health: 20, + construction_time_left: 3, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 0 + }, + BuildingType::Attack => Building { + pos: pos, + health: 5, + construction_time_left: 1, + weapon_damage: 5, + weapon_speed: 1, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: 3, + energy_generated_per_turn: 0 + }, + BuildingType::Energy => Building { + pos: pos, + health: 5, + construction_time_left: 1, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 3 + } + } + + } + + fn is_constructed(&self) -> bool { + self.construction_time_left == 0 + } + + fn is_shooty(&self) -> bool { + self.is_constructed() && self.weapon_damage >= 0 + } +} + +#[derive(Debug, Clone)] +struct Missile { + pos: Point, + damage: u16, + speed: u8, +} + +impl Missile { + fn is_stopped(&self) -> bool { + self.speed == 0 + } +} + +impl GameState { + pub fn simulate(&self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameState { + if self.status.is_complete() { + return self.clone(); + } + + let mut state = self.clone(); + GameState::perform_command(&mut state.player_buildings, player_command, &settings.size); + GameState::perform_command(&mut state.opponent_buildings, opponent_command, &settings.size); + + GameState::update_construction(&mut state.player_buildings); + GameState::update_construction(&mut state.opponent_buildings); + + GameState::add_missiles(&mut state.player_buildings, &mut state.player_missiles); + GameState::add_missiles(&mut state.opponent_buildings, &mut state.opponent_missiles); + + GameState::move_missiles(&mut state.player_missiles, |p| p.move_right(&settings.size), + &mut state.opponent_buildings, &mut state.opponent); + GameState::move_missiles(&mut state.opponent_missiles, |p| p.move_left(), + &mut state.player_buildings, &mut state.player); + + GameState::add_energy(&mut state.player, settings, &state.player_buildings); + GameState::add_energy(&mut state.opponent, settings, &state.opponent_buildings); + + GameState::update_status(&mut state); + state + } + + fn perform_command(buildings: &mut Vec, command: Command, size: &Point) -> bool { + match command { + Command::Nothing => { true }, + Command::Build(p, b) => { + let occupied = buildings.iter().any(|b| b.pos == p); + let in_range = p.x < size.x && p.y < size.y; + buildings.push(Building::new(p, b)); + !occupied && in_range + }, + } + } + + fn update_construction(buildings: &mut Vec) { + for building in buildings.iter_mut().filter(|b| !b.is_constructed()) { + building.construction_time_left -= 1; + } + } + + fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { + for building in buildings.iter_mut().filter(|b| b.is_shooty()) { + if building.weapon_cooldown_time_left > 0 { + building.weapon_cooldown_time_left -= 1; + } else { + missiles.push(Missile { + pos: building.pos, + speed: building.weapon_speed, + damage: building.weapon_damage, + }); + building.weapon_cooldown_time_left = building.weapon_cooldown_period; + } + } + } + + fn move_missiles(missiles: &mut Vec, move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player) + where F: Fn(Point) -> Option { + for missile in missiles.iter_mut() { + for _ in 0..missile.speed { + match move_fn(missile.pos) { + None => { + let damage = cmp::min(missile.damage, opponent.health); + opponent.health -= damage; + missile.speed = 0; + }, + Some(point) => { + missile.pos = point; + for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point && b.health > 0) { + let damage = cmp::min(missile.damage, hit.health); + hit.health -= damage; + missile.speed = 0; + } + } + } + + if missile.speed == 0 { + break; + } + } + } + missiles.retain(|m| m.speed > 0); + opponent_buildings.retain(|b| b.health > 0); + } + + fn add_energy(player: &mut Player, settings: &GameSettings, buildings: &Vec) { + player.energy += settings.energy_income; + player.energy += buildings.iter().map(|b| b.energy_generated_per_turn).sum::(); + } + + fn update_status(state: &mut GameState) { + let player_dead = state.player.health == 0; + let opponent_dead = state.player.health == 0; + state.status = match (player_dead, opponent_dead) { + (true, true) => GameStatus::Draw, + (true, false) => GameStatus::PlayerWon, + (false, true) => GameStatus::OpponentWon, + (false, false) => GameStatus::Continue, + }; + } +} diff --git a/src/engine/settings.rs b/src/engine/settings.rs new file mode 100644 index 0000000..a6691d7 --- /dev/null +++ b/src/engine/settings.rs @@ -0,0 +1,10 @@ +use super::geometry::Point; + +#[derive(Debug)] +pub struct GameSettings { + pub size: Point, + pub energy_income: u16, + pub energy_price: u16, + pub defence_price: u16, + pub attack_price: u16 +} diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..d964fee --- /dev/null +++ b/src/main.rs @@ -0,0 +1,53 @@ +extern crate serde; +extern crate serde_json; + +#[macro_use] +extern crate serde_derive; + +use std::error::Error; + +const STATE_PATH: &str = "state.json"; + +const COMMAND_PATH: &str = "command.txt"; + +use std::fs::File; +use std::io::prelude::*; +use std::process; + +mod state_json; +mod engine; +use engine::command::Command; + +fn choose_move(_state: &state_json::State) -> Option { + None +} + + +fn write_command(filename: &str, command: Option) -> Result<(), Box > { + let mut file = File::create(filename)?; + if let Some(command) = command { + write!(file, "{}", command)?; + } + + Ok(()) +} + + +fn main() { + let state = match state_json::read_state_from_file(STATE_PATH) { + Ok(state) => state, + Err(error) => { + eprintln!("Failed to read the {} file. {}", STATE_PATH, error); + process::exit(1); + } + }; + let command = choose_move(&state); + + match write_command(COMMAND_PATH, command) { + Ok(()) => {} + Err(error) => { + eprintln!("Failed to write the {} file. {}", COMMAND_PATH, error); + process::exit(1); + } + } +} diff --git a/src/state_json.rs b/src/state_json.rs new file mode 100644 index 0000000..429db6d --- /dev/null +++ b/src/state_json.rs @@ -0,0 +1,86 @@ +use std::fs::File; +use std::io::prelude::*; +use serde_json; +use std::error::Error; + +pub fn read_state_from_file(filename: &str) -> Result> { + let mut file = File::open(filename)?; + let mut content = String::new(); + file.read_to_string(&mut content)?; + let state = serde_json::from_str(content.as_ref())?; + Ok(state) +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct State { + pub game_details: GameDetails, + pub players: Vec, + pub game_map: Vec>, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct GameDetails { + pub round: u32, + pub map_width: u32, + pub map_height: u32, + pub building_prices: BuildingPrices +} + +#[derive(Deserialize)] +#[serde(rename_all = "SCREAMING_SNAKE_CASE")] +pub struct BuildingPrices { + pub energy: u32, + pub defense: u32, + pub attack: u32 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct Player { + pub player_type: char, + pub energy: u32, + pub health: u32, + pub hits_taken: u32, + pub score: u32 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct GameCell { + pub x: u32, + pub y: u32, + pub buildings: Vec, + pub missiles: Vec, + pub cell_owner: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct BuildingState { + pub health: u32, + pub construction_time_left: i32, + pub price: u32, + pub weapon_damage: u32, + pub weapon_speed: u32, + pub weapon_cooldown_time_left: u32, + pub weapon_cooldown_period: u32, + pub destroy_multiplier: u32, + pub construction_score: u32, + pub energy_generated_per_turn: u32, + pub building_type: String, + pub x: u32, + pub y: u32, + pub player_type: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct MissileState { + pub damage: u32, + pub speed: u32, + pub x: u32, + pub y: u32, + pub player_type: char +} -- cgit v1.2.3 From 11c791a59ac60241f253cdfb4e8765039d15edff Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 9 May 2018 22:51:38 +0200 Subject: Added converting from JSON code to game engine representation --- src/engine/geometry.rs | 3 + src/engine/mod.rs | 64 +++++++++-------- src/json.rs | 185 +++++++++++++++++++++++++++++++++++++++++++++++++ src/main.rs | 19 +++-- src/state_json.rs | 86 ----------------------- 5 files changed, 228 insertions(+), 129 deletions(-) create mode 100644 src/json.rs delete mode 100644 src/state_json.rs diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index f2a2522..a946bf9 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -5,6 +5,9 @@ pub struct Point { } impl Point { + pub fn new(x: u8, y: u8) -> Point { + Point { x, y } + } pub fn move_left(&self) -> Option { self.x.checked_sub(1).map(|x| Point { x: x, diff --git a/src/engine/mod.rs b/src/engine/mod.rs index d321572..4ea63a3 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -10,14 +10,14 @@ use std::ops::Fn; use std::cmp; #[derive(Debug, Clone)] -struct GameState { - status: GameStatus, - player: Player, - opponent: Player, - player_buildings: Vec, - opponent_buildings: Vec, - player_missiles: Vec, - opponent_missiles: Vec +pub struct GameState { + pub status: GameStatus, + pub player: Player, + pub opponent: Player, + pub player_buildings: Vec, + pub opponent_buildings: Vec, + pub player_missiles: Vec, + pub opponent_missiles: Vec } #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -37,20 +37,20 @@ impl GameStatus { #[derive(Debug, Clone)] pub struct Player { - energy: u16, - health: u16 + pub energy: u16, + pub health: u16 } #[derive(Debug, Clone)] -struct Building { - pos: Point, - health: u16, - construction_time_left: u8, - weapon_damage: u16, - weapon_speed: u8, - weapon_cooldown_time_left: u8, - weapon_cooldown_period: u8, - energy_generated_per_turn: u16 +pub struct Building { + pub pos: Point, + pub health: u16, + pub construction_time_left: u8, + pub weapon_damage: u16, + pub weapon_speed: u8, + pub weapon_cooldown_time_left: u8, + pub weapon_cooldown_period: u8, + pub energy_generated_per_turn: u16 } impl Building { @@ -87,7 +87,6 @@ impl Building { energy_generated_per_turn: 3 } } - } fn is_constructed(&self) -> bool { @@ -95,21 +94,15 @@ impl Building { } fn is_shooty(&self) -> bool { - self.is_constructed() && self.weapon_damage >= 0 + self.is_constructed() && self.weapon_damage > 0 } } #[derive(Debug, Clone)] -struct Missile { - pos: Point, - damage: u16, - speed: u8, -} - -impl Missile { - fn is_stopped(&self) -> bool { - self.speed == 0 - } +pub struct Missile { + pub pos: Point, + pub damage: u16, + pub speed: u8, } impl GameState { @@ -119,8 +112,13 @@ impl GameState { } let mut state = self.clone(); - GameState::perform_command(&mut state.player_buildings, player_command, &settings.size); - GameState::perform_command(&mut state.opponent_buildings, opponent_command, &settings.size); + let player_valid = GameState::perform_command(&mut state.player_buildings, player_command, &settings.size); + let opponent_valid = GameState::perform_command(&mut state.opponent_buildings, opponent_command, &settings.size); + + if !player_valid || !opponent_valid { + state.status = GameStatus::InvalidMove; + return state; + } GameState::update_construction(&mut state.player_buildings); GameState::update_construction(&mut state.opponent_buildings); diff --git a/src/json.rs b/src/json.rs new file mode 100644 index 0000000..18e13fb --- /dev/null +++ b/src/json.rs @@ -0,0 +1,185 @@ +use std::fs::File; +use std::io::prelude::*; +use serde_json; +use std::error::Error; +use std::cmp; + +use ::engine; + + +pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, engine::GameState), Box> { + let mut file = File::open(filename)?; + let mut content = String::new(); + file.read_to_string(&mut content)?; + let state: State = serde_json::from_str(content.as_ref())?; + Ok((state.to_engine_settings(), state.to_engine())) +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct State { + game_details: GameDetails, + players: Vec, + game_map: Vec>, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameDetails { + //round: u32, + map_width: u8, + map_height: u8, + building_prices: BuildingPrices +} + +#[derive(Deserialize)] +#[serde(rename_all = "SCREAMING_SNAKE_CASE")] +struct BuildingPrices { + energy: u16, + defense: u16, + attack: u16 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct Player { + player_type: char, + energy: u16, + health: u16, + //hits_taken: u32, + //score: u32 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameCell { + //x: u8, + //y: u8, + buildings: Vec, + missiles: Vec, + //cell_owner: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct BuildingState { + health: u16, + construction_time_left: i8, + //price: u16, + weapon_damage: u16, + weapon_speed: u8, + weapon_cooldown_time_left: u8, + weapon_cooldown_period: u8, + //destroy_multiplier: u32, + //construction_score: u32, + energy_generated_per_turn: u16, + //building_type: String, + x: u8, + y: u8, + player_type: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct MissileState { + damage: u16, + speed: u8, + x: u8, + y: u8, + player_type: char +} + + +impl State { + fn to_engine_settings(&self) -> engine::settings::GameSettings { + engine::settings::GameSettings { + size: engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), + energy_income: 5, + energy_price: self.game_details.building_prices.energy, + defence_price: self.game_details.building_prices.defense, + attack_price: self.game_details.building_prices.attack, + } + } + + fn to_engine(&self) -> engine::GameState { + engine::GameState { + status: engine::GameStatus::Continue, + player: self.player().to_engine(), + opponent: self.opponent().to_engine(), + player_buildings: self.buildings_to_engine('A'), + opponent_buildings: self.buildings_to_engine('B'), + player_missiles: self.missiles_to_engine('A'), + opponent_missiles: self.missiles_to_engine('B'), + } + } + + fn player(&self) -> &Player { + self.players.iter() + .filter(|p| p.player_type == 'A') + .next() + .expect("Player character did not appear in state.json") + } + + fn opponent(&self) -> &Player { + self.players.iter() + .filter(|p| p.player_type != 'B') + .next() + .expect("Opponent character did not appear in state.json") + } + + fn buildings_to_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.buildings.iter() + .filter(|b| b.player_type == player_type) + .map(|b| b.to_engine()) + ) + ) + .collect() + } + + fn missiles_to_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.missiles.iter() + .filter(|b| b.player_type == player_type) + .map(|b| b.to_engine()) + ) + ) + .collect() + } +} + +impl Player { + fn to_engine(&self) -> engine::Player { + engine::Player { + energy: self.energy, + health: self.health, + } + } +} + +impl BuildingState { + fn to_engine(&self) -> engine::Building { + engine::Building { + pos: engine::geometry::Point::new(self.x, self.y), + health: self.health, + construction_time_left: cmp::max(0, self.construction_time_left) as u8, + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_time_left: self.weapon_cooldown_time_left, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn, + } + } +} + +impl MissileState { + fn to_engine(&self) -> engine::Missile { + engine::Missile { + pos: engine::geometry::Point::new(self.x, self.y), + damage: self.damage, + speed: self.speed, + } + } +} diff --git a/src/main.rs b/src/main.rs index d964fee..4e18c48 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,34 +14,33 @@ use std::fs::File; use std::io::prelude::*; use std::process; -mod state_json; +mod json; mod engine; use engine::command::Command; -fn choose_move(_state: &state_json::State) -> Option { - None +fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { + state.simulate(&settings, Command::Nothing, Command::Nothing); + Command::Nothing } -fn write_command(filename: &str, command: Option) -> Result<(), Box > { +fn write_command(filename: &str, command: Command) -> Result<(), Box > { let mut file = File::create(filename)?; - if let Some(command) = command { - write!(file, "{}", command)?; - } + write!(file, "{}", command)?; Ok(()) } fn main() { - let state = match state_json::read_state_from_file(STATE_PATH) { - Ok(state) => state, + let (settings, state) = match json::read_state_from_file(STATE_PATH) { + Ok(ok) => ok, Err(error) => { eprintln!("Failed to read the {} file. {}", STATE_PATH, error); process::exit(1); } }; - let command = choose_move(&state); + let command = choose_move(&settings, &state); match write_command(COMMAND_PATH, command) { Ok(()) => {} diff --git a/src/state_json.rs b/src/state_json.rs deleted file mode 100644 index 429db6d..0000000 --- a/src/state_json.rs +++ /dev/null @@ -1,86 +0,0 @@ -use std::fs::File; -use std::io::prelude::*; -use serde_json; -use std::error::Error; - -pub fn read_state_from_file(filename: &str) -> Result> { - let mut file = File::open(filename)?; - let mut content = String::new(); - file.read_to_string(&mut content)?; - let state = serde_json::from_str(content.as_ref())?; - Ok(state) -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct State { - pub game_details: GameDetails, - pub players: Vec, - pub game_map: Vec>, -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct GameDetails { - pub round: u32, - pub map_width: u32, - pub map_height: u32, - pub building_prices: BuildingPrices -} - -#[derive(Deserialize)] -#[serde(rename_all = "SCREAMING_SNAKE_CASE")] -pub struct BuildingPrices { - pub energy: u32, - pub defense: u32, - pub attack: u32 -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct Player { - pub player_type: char, - pub energy: u32, - pub health: u32, - pub hits_taken: u32, - pub score: u32 -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct GameCell { - pub x: u32, - pub y: u32, - pub buildings: Vec, - pub missiles: Vec, - pub cell_owner: char -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct BuildingState { - pub health: u32, - pub construction_time_left: i32, - pub price: u32, - pub weapon_damage: u32, - pub weapon_speed: u32, - pub weapon_cooldown_time_left: u32, - pub weapon_cooldown_period: u32, - pub destroy_multiplier: u32, - pub construction_score: u32, - pub energy_generated_per_turn: u32, - pub building_type: String, - pub x: u32, - pub y: u32, - pub player_type: char -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct MissileState { - pub damage: u32, - pub speed: u32, - pub x: u32, - pub y: u32, - pub player_type: char -} -- cgit v1.2.3 From 4755702ef08d70961b5248cb706a592a406d0556 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 10 May 2018 23:01:22 +0200 Subject: Split to library. Reimplemented sample strategy in new state. --- src/engine/command.rs | 6 +- src/engine/mod.rs | 147 ++++++++++++++++++++++++++++++++----------------- src/lib.rs | 9 +++ src/main.rs | 18 ++---- src/strategy/mod.rs | 1 + src/strategy/sample.rs | 38 +++++++++++++ 6 files changed, 150 insertions(+), 69 deletions(-) create mode 100644 src/lib.rs create mode 100644 src/strategy/mod.rs create mode 100644 src/strategy/sample.rs diff --git a/src/engine/command.rs b/src/engine/command.rs index 603ee42..eab98c1 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -9,11 +9,9 @@ pub enum Command { impl fmt::Display for Command { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - use Command::*; - match self { - &Nothing => write!(f, ""), - &Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), + &Command::Nothing => write!(f, ""), + &Command::Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), } } } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 4ea63a3..be95c03 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -29,12 +29,6 @@ pub enum GameStatus { InvalidMove } -impl GameStatus { - fn is_complete(&self) -> bool { - *self != GameStatus::Continue - } -} - #[derive(Debug, Clone)] pub struct Player { pub energy: u16, @@ -53,51 +47,6 @@ pub struct Building { pub energy_generated_per_turn: u16 } -impl Building { - fn new(pos: Point, building: BuildingType) -> Building { - match building { - BuildingType::Defense => Building { - pos: pos, - health: 20, - construction_time_left: 3, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 0 - }, - BuildingType::Attack => Building { - pos: pos, - health: 5, - construction_time_left: 1, - weapon_damage: 5, - weapon_speed: 1, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: 3, - energy_generated_per_turn: 0 - }, - BuildingType::Energy => Building { - pos: pos, - health: 5, - construction_time_left: 1, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 3 - } - } - } - - fn is_constructed(&self) -> bool { - self.construction_time_left == 0 - } - - fn is_shooty(&self) -> bool { - self.is_constructed() && self.weapon_damage > 0 - } -} - #[derive(Debug, Clone)] pub struct Missile { pub pos: Point, @@ -215,4 +164,100 @@ impl GameState { (false, false) => GameStatus::Continue, }; } + + pub fn unoccupied_player_cells_in_row(&self, settings: &GameSettings, y: u8) -> Vec { + (0..settings.size.x/2) + .map(|x| Point::new(x, y)) + .filter(|&p| !self.player_buildings.iter().any(|b| b.pos == p)) + .collect() + } + + pub fn unoccupied_player_cells(&self, settings: &GameSettings) -> Vec { + (0..settings.size.y) + .flat_map(|y| (0..settings.size.x/2).map(|x| Point::new(x, y)).collect::>()) + .filter(|&p| !self.player_buildings.iter().any(|b| b.pos == p)) + .collect() + } +} + +impl GameStatus { + fn is_complete(&self) -> bool { + *self != GameStatus::Continue + } +} + +impl Player { + pub fn can_afford_all_buildings(&self, settings: &GameSettings) -> bool { + self.can_afford_attack_buildings(settings) && + self.can_afford_defence_buildings(settings) && + self.can_afford_energy_buildings(settings) + } + + pub fn can_afford_attack_buildings(&self, settings: &GameSettings) -> bool { + self.energy >= settings.attack_price + } + pub fn can_afford_defence_buildings(&self, settings: &GameSettings) -> bool { + self.energy >= settings.defence_price + } + pub fn can_afford_energy_buildings(&self, settings: &GameSettings) -> bool { + self.energy >= settings.energy_price + } + +} + +impl Building { + fn new(pos: Point, building: BuildingType) -> Building { + match building { + BuildingType::Defense => Building { + pos: pos, + health: 20, + construction_time_left: 3, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 0 + }, + BuildingType::Attack => Building { + pos: pos, + health: 5, + construction_time_left: 1, + weapon_damage: 5, + weapon_speed: 1, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: 3, + energy_generated_per_turn: 0 + }, + BuildingType::Energy => Building { + pos: pos, + health: 5, + construction_time_left: 1, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 3 + } + } + } + + fn is_constructed(&self) -> bool { + self.construction_time_left == 0 + } + + fn is_shooty(&self) -> bool { + self.is_constructed() && self.weapon_damage > 0 + } +} + +#[test] +fn how_big() { + use std::mem; + assert_eq!(4, mem::size_of::()); + assert_eq!(12, mem::size_of::()); + assert_eq!(6, mem::size_of::()); + assert_eq!(112, mem::size_of::()); + assert_eq!(24, mem::size_of::>()); + assert_eq!(24, mem::size_of::>()); + } diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..158805a --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,9 @@ +extern crate serde; +extern crate serde_json; + +#[macro_use] +extern crate serde_derive; + +pub mod json; +pub mod engine; +pub mod strategy; diff --git a/src/main.rs b/src/main.rs index 4e18c48..22f698d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,6 @@ -extern crate serde; -extern crate serde_json; - -#[macro_use] -extern crate serde_derive; +extern crate zombot; +use zombot::*; +use zombot::engine::command::Command; use std::error::Error; @@ -14,20 +12,14 @@ use std::fs::File; use std::io::prelude::*; use std::process; -mod json; -mod engine; -use engine::command::Command; - fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { - state.simulate(&settings, Command::Nothing, Command::Nothing); - Command::Nothing + strategy::sample::choose_move(settings, state) } fn write_command(filename: &str, command: Command) -> Result<(), Box > { let mut file = File::create(filename)?; write!(file, "{}", command)?; - Ok(()) } @@ -36,7 +28,6 @@ fn main() { let (settings, state) = match json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { - eprintln!("Failed to read the {} file. {}", STATE_PATH, error); process::exit(1); } }; @@ -45,7 +36,6 @@ fn main() { match write_command(COMMAND_PATH, command) { Ok(()) => {} Err(error) => { - eprintln!("Failed to write the {} file. {}", COMMAND_PATH, error); process::exit(1); } } diff --git a/src/strategy/mod.rs b/src/strategy/mod.rs new file mode 100644 index 0000000..ce8e751 --- /dev/null +++ b/src/strategy/mod.rs @@ -0,0 +1 @@ +pub mod sample; diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs new file mode 100644 index 0000000..bd23916 --- /dev/null +++ b/src/strategy/sample.rs @@ -0,0 +1,38 @@ +use engine; +use engine::command::*; + + +pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { + if state.player.can_afford_defence_buildings(settings) { + for y in 0..settings.size.y { + if is_under_attack(state, y) { + let p_options = state.unoccupied_player_cells_in_row(settings, y); + if let Some(&p) = p_options.first() { + return Command::Build(p, BuildingType::Defense); + } + } + } + } + + if state.player.can_afford_all_buildings(settings) { + let options = state.unoccupied_player_cells(settings); + let option = options.first(); + let buildings = [BuildingType::Attack, BuildingType::Defense, BuildingType::Energy]; + let building = buildings.first(); + match (option, building) { + (Some(&p), Some(&building)) => Command::Build(p, building), + _ => Command::Nothing + } + } + else { + Command::Nothing + } +} + +fn is_under_attack(state: &engine::GameState, y: u8) -> bool { + let attack = state.opponent_buildings.iter() + .any(|b| b.pos.y == y && b.weapon_damage > 0); + let defences = state.player_buildings.iter() + .any(|b| b.pos.y == y && b.health > 5); + attack && !defences +} -- cgit v1.2.3 From 2d6ee1dddda6a51692adff10160bb93a76430b0b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 12 May 2018 15:10:35 +0200 Subject: Added new building specifications --- src/engine/command.rs | 2 +- src/engine/mod.rs | 60 ++++++++++++++++---------------------------------- src/engine/settings.rs | 29 +++++++++++++++++++++--- src/json.rs | 47 +++++++++++++++++++++++++++++++-------- src/main.rs | 2 ++ src/strategy/sample.rs | 4 ++-- 6 files changed, 88 insertions(+), 56 deletions(-) diff --git a/src/engine/command.rs b/src/engine/command.rs index eab98c1..b5cf528 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -19,7 +19,7 @@ impl fmt::Display for Command { #[repr(u8)] #[derive(Debug, Clone, Copy)] pub enum BuildingType { - Defense = 0, + Defence = 0, Attack = 1, Energy = 2, } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index be95c03..f05d985 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -2,9 +2,9 @@ pub mod command; pub mod geometry; pub mod settings; -use self::command::{BuildingType, Command}; +use self::command::Command; use self::geometry::Point; -use self::settings::GameSettings; +use self::settings::{GameSettings, BuildingSettings}; use std::ops::Fn; use std::cmp; @@ -61,8 +61,8 @@ impl GameState { } let mut state = self.clone(); - let player_valid = GameState::perform_command(&mut state.player_buildings, player_command, &settings.size); - let opponent_valid = GameState::perform_command(&mut state.opponent_buildings, opponent_command, &settings.size); + let player_valid = GameState::perform_command(&mut state.player_buildings, settings, player_command, &settings.size); + let opponent_valid = GameState::perform_command(&mut state.opponent_buildings, settings, opponent_command, &settings.size); if !player_valid || !opponent_valid { state.status = GameStatus::InvalidMove; @@ -87,13 +87,13 @@ impl GameState { state } - fn perform_command(buildings: &mut Vec, command: Command, size: &Point) -> bool { + fn perform_command(buildings: &mut Vec, settings: &GameSettings, command: Command, size: &Point) -> bool { match command { Command::Nothing => { true }, Command::Build(p, b) => { let occupied = buildings.iter().any(|b| b.pos == p); let in_range = p.x < size.x && p.y < size.y; - buildings.push(Building::new(p, b)); + buildings.push(Building::new(p, settings.building_settings(b))); !occupied && in_range }, } @@ -194,50 +194,28 @@ impl Player { } pub fn can_afford_attack_buildings(&self, settings: &GameSettings) -> bool { - self.energy >= settings.attack_price + self.energy >= settings.attack.price } pub fn can_afford_defence_buildings(&self, settings: &GameSettings) -> bool { - self.energy >= settings.defence_price + self.energy >= settings.defence.price } pub fn can_afford_energy_buildings(&self, settings: &GameSettings) -> bool { - self.energy >= settings.energy_price + self.energy >= settings.energy.price } } impl Building { - fn new(pos: Point, building: BuildingType) -> Building { - match building { - BuildingType::Defense => Building { - pos: pos, - health: 20, - construction_time_left: 3, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 0 - }, - BuildingType::Attack => Building { - pos: pos, - health: 5, - construction_time_left: 1, - weapon_damage: 5, - weapon_speed: 1, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: 3, - energy_generated_per_turn: 0 - }, - BuildingType::Energy => Building { - pos: pos, - health: 5, - construction_time_left: 1, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 3 - } + fn new(pos: Point, blueprint: &BuildingSettings) -> Building { + Building { + pos: pos, + health: blueprint.health, + construction_time_left: blueprint.construction_time, + weapon_damage: blueprint.weapon_damage, + weapon_speed: blueprint.weapon_speed, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: blueprint.weapon_cooldown_period, + energy_generated_per_turn: blueprint.energy_generated_per_turn } } diff --git a/src/engine/settings.rs b/src/engine/settings.rs index a6691d7..b23d6bd 100644 --- a/src/engine/settings.rs +++ b/src/engine/settings.rs @@ -1,10 +1,33 @@ use super::geometry::Point; +use super::command::BuildingType; #[derive(Debug)] pub struct GameSettings { pub size: Point, pub energy_income: u16, - pub energy_price: u16, - pub defence_price: u16, - pub attack_price: u16 + pub energy: BuildingSettings, + pub defence: BuildingSettings, + pub attack: BuildingSettings +} + +#[derive(Debug)] +pub struct BuildingSettings { + pub price: u16, + pub health: u16, + pub construction_time: u8, + pub weapon_damage: u16, + pub weapon_speed: u8, + pub weapon_cooldown_period: u8, + pub energy_generated_per_turn: u16 +} + +impl GameSettings { + pub fn building_settings(&self, building: BuildingType) -> &BuildingSettings { + match building { + BuildingType::Defence => &self.defence, + BuildingType::Attack => &self.attack, + BuildingType::Energy => &self.energy + } + } + } diff --git a/src/json.rs b/src/json.rs index 18e13fb..541b479 100644 --- a/src/json.rs +++ b/src/json.rs @@ -29,15 +29,30 @@ struct GameDetails { //round: u32, map_width: u8, map_height: u8, - building_prices: BuildingPrices + round_income_energy: u16, + building_stats: BuildingStats } #[derive(Deserialize)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] -struct BuildingPrices { - energy: u16, - defense: u16, - attack: u16 +struct BuildingStats { + energy: BuildingBlueprint, + defense: BuildingBlueprint, + attack: BuildingBlueprint +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct BuildingBlueprint { + price: u16, + health: u16, + construction_time: u8, + weapon_damage: u16, + weapon_speed: u8, + weapon_cooldown_period: u8, + energy_generated_per_turn: u16, +// destroy_multiplier: u16, +// construction_score: u16 } #[derive(Deserialize)] @@ -94,10 +109,10 @@ impl State { fn to_engine_settings(&self) -> engine::settings::GameSettings { engine::settings::GameSettings { size: engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), - energy_income: 5, - energy_price: self.game_details.building_prices.energy, - defence_price: self.game_details.building_prices.defense, - attack_price: self.game_details.building_prices.attack, + energy_income: self.game_details.round_income_energy, + energy: self.game_details.building_stats.energy.to_engine(), + defence: self.game_details.building_stats.defense.to_engine(), + attack: self.game_details.building_stats.attack.to_engine(), } } @@ -150,6 +165,20 @@ impl State { } } +impl BuildingBlueprint { + fn to_engine(&self) -> engine::settings::BuildingSettings { + engine::settings::BuildingSettings { + price: self.price, + health: self.health, + construction_time: self.construction_time, + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn, + } + } +} + impl Player { fn to_engine(&self) -> engine::Player { engine::Player { diff --git a/src/main.rs b/src/main.rs index 22f698d..7b3a62c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,6 +28,7 @@ fn main() { let (settings, state) = match json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { + eprintln!("Error while parsing JSON file: {}", error); process::exit(1); } }; @@ -36,6 +37,7 @@ fn main() { match write_command(COMMAND_PATH, command) { Ok(()) => {} Err(error) => { + eprintln!("Error while writing command file: {}", error); process::exit(1); } } diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs index bd23916..3a311e0 100644 --- a/src/strategy/sample.rs +++ b/src/strategy/sample.rs @@ -8,7 +8,7 @@ pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::Ga if is_under_attack(state, y) { let p_options = state.unoccupied_player_cells_in_row(settings, y); if let Some(&p) = p_options.first() { - return Command::Build(p, BuildingType::Defense); + return Command::Build(p, BuildingType::Defence); } } } @@ -17,7 +17,7 @@ pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::Ga if state.player.can_afford_all_buildings(settings) { let options = state.unoccupied_player_cells(settings); let option = options.first(); - let buildings = [BuildingType::Attack, BuildingType::Defense, BuildingType::Energy]; + let buildings = [BuildingType::Attack, BuildingType::Defence, BuildingType::Energy]; let building = buildings.first(); match (option, building) { (Some(&p), Some(&building)) => Command::Build(p, building), -- cgit v1.2.3 From d6bec472109806eea2ad86741edd3eb1571b872c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 12 May 2018 15:14:35 +0200 Subject: Brought random crate back --- Cargo.toml | 2 ++ src/lib.rs | 2 ++ src/strategy/sample.rs | 9 ++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7628f0f..12a5214 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,5 @@ version = "1.0.0" serde_derive = "1.0.43" serde = "1.0.43" serde_json = "1.0.16" + +rand = "0.4.2" diff --git a/src/lib.rs b/src/lib.rs index 158805a..a09f999 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,6 +4,8 @@ extern crate serde_json; #[macro_use] extern crate serde_derive; +extern crate rand; + pub mod json; pub mod engine; pub mod strategy; diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs index 3a311e0..2dad924 100644 --- a/src/strategy/sample.rs +++ b/src/strategy/sample.rs @@ -1,13 +1,16 @@ use engine; use engine::command::*; +use rand::{thread_rng, Rng}; pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { + let mut rng = thread_rng(); + if state.player.can_afford_defence_buildings(settings) { for y in 0..settings.size.y { if is_under_attack(state, y) { let p_options = state.unoccupied_player_cells_in_row(settings, y); - if let Some(&p) = p_options.first() { + if let Some(&p) = rng.choose(&p_options) { return Command::Build(p, BuildingType::Defence); } } @@ -16,9 +19,9 @@ pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::Ga if state.player.can_afford_all_buildings(settings) { let options = state.unoccupied_player_cells(settings); - let option = options.first(); + let option = rng.choose(&options); let buildings = [BuildingType::Attack, BuildingType::Defence, BuildingType::Energy]; - let building = buildings.first(); + let building = rng.choose(&buildings); match (option, building) { (Some(&p), Some(&building)) => Command::Build(p, building), _ => Command::Nothing -- cgit v1.2.3 From f43fa101538c6b4ae2531bb8d27c793e6b7579ec Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 12 May 2018 15:19:31 +0200 Subject: Fixed engine not paying for new buildings --- src/engine/mod.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index f05d985..11dd5ed 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -61,8 +61,8 @@ impl GameState { } let mut state = self.clone(); - let player_valid = GameState::perform_command(&mut state.player_buildings, settings, player_command, &settings.size); - let opponent_valid = GameState::perform_command(&mut state.opponent_buildings, settings, opponent_command, &settings.size); + let player_valid = GameState::perform_command(&mut state.player_buildings, &mut state.player, settings, player_command, &settings.size); + let opponent_valid = GameState::perform_command(&mut state.opponent_buildings, &mut state.opponent, settings, opponent_command, &settings.size); if !player_valid || !opponent_valid { state.status = GameStatus::InvalidMove; @@ -87,14 +87,22 @@ impl GameState { state } - fn perform_command(buildings: &mut Vec, settings: &GameSettings, command: Command, size: &Point) -> bool { + fn perform_command(buildings: &mut Vec, player: &mut Player, settings: &GameSettings, command: Command, size: &Point) -> bool { match command { Command::Nothing => { true }, Command::Build(p, b) => { + let blueprint = settings.building_settings(b); + let occupied = buildings.iter().any(|b| b.pos == p); let in_range = p.x < size.x && p.y < size.y; - buildings.push(Building::new(p, settings.building_settings(b))); - !occupied && in_range + let has_energy = player.energy >= blueprint.price; + + let valid = !occupied && in_range && has_energy; + if valid { + player.energy -= blueprint.price; + buildings.push(Building::new(p, blueprint)); + } + valid }, } } -- cgit v1.2.3 From 97880f6a368085e9a409f1fb0030791a4a65005c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 12 May 2018 17:39:06 +0200 Subject: Initial stab at monte carlo implementation Doesn't seem to be working quite right... just sits there accumulating energy. --- src/engine/command.rs | 7 +++ src/engine/mod.rs | 66 ++++++++++++++++------- src/json.rs | 8 +-- src/main.rs | 7 +-- src/strategy/mod.rs | 1 + src/strategy/monte_carlo.rs | 124 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+), 27 deletions(-) create mode 100644 src/strategy/monte_carlo.rs diff --git a/src/engine/command.rs b/src/engine/command.rs index b5cf528..c2edb81 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -23,3 +23,10 @@ pub enum BuildingType { Attack = 1, Energy = 2, } + +impl BuildingType { + pub fn all() -> [BuildingType; 3] { + use self::BuildingType::*; + [Defence, Attack, Energy] + } +} diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 11dd5ed..a1a85ce 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -2,7 +2,7 @@ pub mod command; pub mod geometry; pub mod settings; -use self::command::Command; +use self::command::{Command, BuildingType}; use self::geometry::Point; use self::settings::{GameSettings, BuildingSettings}; @@ -56,35 +56,39 @@ pub struct Missile { impl GameState { pub fn simulate(&self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameState { + let mut state = self.clone(); + state.simulate_mut(settings, player_command, opponent_command); + state + } + + pub fn simulate_mut(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) { if self.status.is_complete() { - return self.clone(); + return; } - - let mut state = self.clone(); - let player_valid = GameState::perform_command(&mut state.player_buildings, &mut state.player, settings, player_command, &settings.size); - let opponent_valid = GameState::perform_command(&mut state.opponent_buildings, &mut state.opponent, settings, opponent_command, &settings.size); + + let player_valid = GameState::perform_command(&mut self.player_buildings, &mut self.player, settings, player_command, &settings.size); + let opponent_valid = GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, settings, opponent_command, &settings.size); if !player_valid || !opponent_valid { - state.status = GameStatus::InvalidMove; - return state; + self.status = GameStatus::InvalidMove; + return; } - GameState::update_construction(&mut state.player_buildings); - GameState::update_construction(&mut state.opponent_buildings); + GameState::update_construction(&mut self.player_buildings); + GameState::update_construction(&mut self.opponent_buildings); - GameState::add_missiles(&mut state.player_buildings, &mut state.player_missiles); - GameState::add_missiles(&mut state.opponent_buildings, &mut state.opponent_missiles); + GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); + GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); - GameState::move_missiles(&mut state.player_missiles, |p| p.move_right(&settings.size), - &mut state.opponent_buildings, &mut state.opponent); - GameState::move_missiles(&mut state.opponent_missiles, |p| p.move_left(), - &mut state.player_buildings, &mut state.player); + GameState::move_missiles(&mut self.player_missiles, |p| p.move_right(&settings.size), + &mut self.opponent_buildings, &mut self.opponent); + GameState::move_missiles(&mut self.opponent_missiles, |p| p.move_left(), + &mut self.player_buildings, &mut self.player); - GameState::add_energy(&mut state.player, settings, &state.player_buildings); - GameState::add_energy(&mut state.opponent, settings, &state.opponent_buildings); + GameState::add_energy(&mut self.player, settings, &self.player_buildings); + GameState::add_energy(&mut self.opponent, settings, &self.opponent_buildings); - GameState::update_status(&mut state); - state + GameState::update_status(self); } fn perform_command(buildings: &mut Vec, player: &mut Player, settings: &GameSettings, command: Command, size: &Point) -> bool { @@ -186,6 +190,28 @@ impl GameState { .filter(|&p| !self.player_buildings.iter().any(|b| b.pos == p)) .collect() } + + pub fn unoccupied_opponent_cells(&self, settings: &GameSettings) -> Vec { + (0..settings.size.y) + .flat_map(|y| (settings.size.x/2..settings.size.x).map(|x| Point::new(x, y)).collect::>()) + .filter(|&p| !self.opponent_buildings.iter().any(|b| b.pos == p)) + .collect() + } + + pub fn player_affordable_buildings(&self, settings: &GameSettings) -> Vec { + GameState::affordable_buildings(self.player.energy, settings) + } + + pub fn opponent_affordable_buildings(&self, settings: &GameSettings) -> Vec { + GameState::affordable_buildings(self.opponent.energy, settings) + } + + fn affordable_buildings(energy: u16, settings: &GameSettings) -> Vec { + BuildingType::all().iter() + .filter(|&b| settings.building_settings(*b).price <= energy) + .cloned() + .collect() + } } impl GameStatus { diff --git a/src/json.rs b/src/json.rs index 541b479..10c3ab8 100644 --- a/src/json.rs +++ b/src/json.rs @@ -30,7 +30,7 @@ struct GameDetails { map_width: u8, map_height: u8, round_income_energy: u16, - building_stats: BuildingStats + buildings_stats: BuildingStats } #[derive(Deserialize)] @@ -110,9 +110,9 @@ impl State { engine::settings::GameSettings { size: engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), energy_income: self.game_details.round_income_energy, - energy: self.game_details.building_stats.energy.to_engine(), - defence: self.game_details.building_stats.defense.to_engine(), - attack: self.game_details.building_stats.attack.to_engine(), + energy: self.game_details.buildings_stats.energy.to_engine(), + defence: self.game_details.buildings_stats.defense.to_engine(), + attack: self.game_details.buildings_stats.attack.to_engine(), } } diff --git a/src/main.rs b/src/main.rs index 7b3a62c..e5dc3aa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ use std::io::prelude::*; use std::process; fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { - strategy::sample::choose_move(settings, state) + strategy::monte_carlo::choose_move(settings, state) } @@ -25,10 +25,11 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { fn main() { + println!("Reading in state.json file"); let (settings, state) = match json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { - eprintln!("Error while parsing JSON file: {}", error); + println!("Error while parsing JSON file: {}", error); process::exit(1); } }; @@ -37,7 +38,7 @@ fn main() { match write_command(COMMAND_PATH, command) { Ok(()) => {} Err(error) => { - eprintln!("Error while writing command file: {}", error); + println!("Error while writing command file: {}", error); process::exit(1); } } diff --git a/src/strategy/mod.rs b/src/strategy/mod.rs index ce8e751..9630c48 100644 --- a/src/strategy/mod.rs +++ b/src/strategy/mod.rs @@ -1 +1,2 @@ pub mod sample; +pub mod monte_carlo; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs new file mode 100644 index 0000000..8fbf0a3 --- /dev/null +++ b/src/strategy/monte_carlo.rs @@ -0,0 +1,124 @@ +use engine::settings::GameSettings; +use engine::command::*; +use engine::{GameState, GameStatus}; + +use rand::{thread_rng, Rng}; + +const MAX_MOVES: u16 = 400; + +// TODO Round start time here +pub fn choose_move(settings: &GameSettings, state: &GameState) -> Command { + println!("Using MONTE_CARLO strategy"); + + let mut rng = thread_rng(); + let mut command_scores = CommandScore::init_command_scores(settings, state); + + // TODO Repeat this until time is out + for _ in 0..1000 { + for mut score in &mut command_scores { + if simulate_to_endstate(settings, state, score.command, &mut rng) { + score.add_victory(); + } else { + score.add_defeat(); + } + } + } + + let command = command_scores.iter().max_by_key(|&c| c.win_ratio()); + + match command { + Some(ref command) => command.command, + _ => Command::Nothing + } +} + +fn simulate_to_endstate(settings: &GameSettings, state: &GameState, command: Command, rng: &mut R) -> bool { + let opponent_first = random_opponent_move(settings, state, rng); + let mut state_mut = state.simulate(settings, command, opponent_first); + + for _ in 0..MAX_MOVES { + if state_mut.status != GameStatus::Continue { + break; + } + + let player_command = random_player_move(settings, state, rng); + let opponent_command = random_opponent_move(settings, state, rng); + state_mut.simulate_mut(settings, player_command, opponent_command); + + } + + state_mut.status == GameStatus::PlayerWon +} + +fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { + let all_commands = enumerate_player_commands(settings, state); + rng.choose(&all_commands).cloned().unwrap_or(Command::Nothing) +} +fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { + let all_commands = enumerate_opponent_commands(settings, state); + rng.choose(&all_commands).cloned().unwrap_or(Command::Nothing) +} + + +struct CommandScore { + command: Command, + victories: u32, + attempts: u32 +} + +impl CommandScore { + fn new(command: Command) -> CommandScore { + CommandScore { + command: command, + victories: 0, + attempts: 0 + } + } + + fn add_victory(&mut self) { + self.victories += 1; + self.attempts += 1; + } + + fn add_defeat(&mut self) { + self.attempts += 1; + } + + fn win_ratio(&self) -> u32 { + self.victories * 1000 / self.attempts + } + + fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { + enumerate_player_commands(settings, state).iter() + .map(|&c| CommandScore::new(c)) + .collect() + } +} + +fn enumerate_player_commands(settings: &GameSettings, state: &GameState) -> Vec { + let all_positions = state.unoccupied_player_cells(settings); + let all_buildings = state.player_affordable_buildings(settings); + + let build_commands = all_positions.iter() + .flat_map(|&pos| all_buildings.iter() + .map(|&building| Command::Build(pos, building)).collect::>() + ); + let other_commands = vec!(Command::Nothing); + + build_commands.chain(other_commands) + .collect() +} + +fn enumerate_opponent_commands(settings: &GameSettings, state: &GameState) -> Vec { + let all_positions = state.unoccupied_opponent_cells(settings); + let all_buildings = state.opponent_affordable_buildings(settings); + + let build_commands = all_positions.iter() + .flat_map(|&pos| all_buildings.iter() + .map(|&building| Command::Build(pos, building)).collect::>() + ); + let other_commands = vec!(Command::Nothing); + + build_commands.chain(other_commands) + .collect() +} -- cgit v1.2.3 From d14ec12e30852f8a93f310f5c53fce6ab6f1c6c5 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 12 May 2018 21:48:42 +0200 Subject: Debugged and fixed the errors that had the monte carlo not working Monte carlo now beats sample bot, if given plenty of time. I still need to put the max time tracking and enforcement in. --- src/engine/mod.rs | 18 ++++------------ src/strategy/monte_carlo.rs | 50 ++++++++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index a1a85ce..41acb23 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -168,11 +168,11 @@ impl GameState { fn update_status(state: &mut GameState) { let player_dead = state.player.health == 0; - let opponent_dead = state.player.health == 0; + let opponent_dead = state.opponent.health == 0; state.status = match (player_dead, opponent_dead) { (true, true) => GameStatus::Draw, - (true, false) => GameStatus::PlayerWon, - (false, true) => GameStatus::OpponentWon, + (false, true) => GameStatus::PlayerWon, + (true, false) => GameStatus::OpponentWon, (false, false) => GameStatus::Continue, }; } @@ -262,14 +262,4 @@ impl Building { } } -#[test] -fn how_big() { - use std::mem; - assert_eq!(4, mem::size_of::()); - assert_eq!(12, mem::size_of::()); - assert_eq!(6, mem::size_of::()); - assert_eq!(112, mem::size_of::()); - assert_eq!(24, mem::size_of::>()); - assert_eq!(24, mem::size_of::>()); - -} + diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 8fbf0a3..ba66d48 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -3,7 +3,7 @@ use engine::command::*; use engine::{GameState, GameStatus}; use rand::{thread_rng, Rng}; - +use std::process; const MAX_MOVES: u16 = 400; // TODO Round start time here @@ -16,14 +16,11 @@ pub fn choose_move(settings: &GameSettings, state: &GameState) -> Command { // TODO Repeat this until time is out for _ in 0..1000 { for mut score in &mut command_scores { - if simulate_to_endstate(settings, state, score.command, &mut rng) { - score.add_victory(); - } else { - score.add_defeat(); - } + simulate_to_endstate(score, settings, state, &mut rng); } } + println!("{:?}", command_scores); let command = command_scores.iter().max_by_key(|&c| c.win_ratio()); match command { @@ -32,22 +29,30 @@ pub fn choose_move(settings: &GameSettings, state: &GameState) -> Command { } } -fn simulate_to_endstate(settings: &GameSettings, state: &GameState, command: Command, rng: &mut R) -> bool { +fn simulate_to_endstate(command_score: &mut CommandScore, settings: &GameSettings, state: &GameState, rng: &mut R) { let opponent_first = random_opponent_move(settings, state, rng); - let mut state_mut = state.simulate(settings, command, opponent_first); + let mut state_mut = state.simulate(settings, command_score.command, opponent_first); for _ in 0..MAX_MOVES { if state_mut.status != GameStatus::Continue { break; } - let player_command = random_player_move(settings, state, rng); - let opponent_command = random_opponent_move(settings, state, rng); + let player_command = random_player_move(settings, &state_mut, rng); + let opponent_command = random_opponent_move(settings, &state_mut, rng); state_mut.simulate_mut(settings, player_command, opponent_command); - } - - state_mut.status == GameStatus::PlayerWon + + match state_mut.status { + GameStatus::PlayerWon => command_score.add_victory(), + GameStatus::OpponentWon => command_score.add_defeat(), + GameStatus::Continue => command_score.add_stalemate(), + GameStatus::Draw => command_score.add_draw(), + GameStatus::InvalidMove => { + println!("Invalid move made while performing simulation"); + process::exit(0); + } + } } fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { @@ -59,10 +64,13 @@ fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: rng.choose(&all_commands).cloned().unwrap_or(Command::Nothing) } - +#[derive(Debug)] struct CommandScore { command: Command, victories: u32, + defeats: u32, + draws: u32, + stalemates: u32, attempts: u32 } @@ -71,6 +79,9 @@ impl CommandScore { CommandScore { command: command, victories: 0, + defeats: 0, + draws: 0, + stalemates: 0, attempts: 0 } } @@ -81,6 +92,17 @@ impl CommandScore { } fn add_defeat(&mut self) { + self.defeats += 1; + self.attempts += 1; + } + + fn add_draw(&mut self) { + self.draws += 1; + self.attempts += 1; + } + + fn add_stalemate(&mut self) { + self.stalemates += 1; self.attempts += 1; } -- cgit v1.2.3 From 02256124fbd57d88effd02c046093ecaf73b77e3 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 12 May 2018 22:37:48 +0200 Subject: Limited bot to run within the 2 second window --- Cargo.toml | 1 + src/lib.rs | 1 + src/main.rs | 13 ++++++++++--- src/strategy/monte_carlo.rs | 15 +++++++++++---- src/strategy/sample.rs | 4 +++- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 12a5214..7703fc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,4 @@ serde = "1.0.43" serde_json = "1.0.16" rand = "0.4.2" +time = "0.1.4" \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index a09f999..728f747 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,7 @@ extern crate serde_json; extern crate serde_derive; extern crate rand; +extern crate time; pub mod json; pub mod engine; diff --git a/src/main.rs b/src/main.rs index e5dc3aa..3d3d980 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,7 @@ extern crate zombot; +extern crate time; +use time::PreciseTime; + use zombot::*; use zombot::engine::command::Command; @@ -12,8 +15,8 @@ use std::fs::File; use std::io::prelude::*; use std::process; -fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { - strategy::monte_carlo::choose_move(settings, state) +fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { + strategy::monte_carlo::choose_move(settings, state, start_time) } @@ -25,6 +28,8 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { fn main() { + let start_time = PreciseTime::now(); + println!("Reading in state.json file"); let (settings, state) = match json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, @@ -33,7 +38,7 @@ fn main() { process::exit(1); } }; - let command = choose_move(&settings, &state); + let command = choose_move(&settings, &state, &start_time); match write_command(COMMAND_PATH, command) { Ok(()) => {} @@ -42,4 +47,6 @@ fn main() { process::exit(1); } } + + println!("Elapsed time: {}", start_time.to(PreciseTime::now())); } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index ba66d48..86960eb 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -6,21 +6,28 @@ use rand::{thread_rng, Rng}; use std::process; const MAX_MOVES: u16 = 400; +use time::{Duration, PreciseTime}; + // TODO Round start time here -pub fn choose_move(settings: &GameSettings, state: &GameState) -> Command { +pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime) -> Command { println!("Using MONTE_CARLO strategy"); + + //just under the max of 2 seconds, to avoid issues like overhead in the bot being run, and we still need to write the result of this to file + let max_time = Duration::milliseconds(1950); let mut rng = thread_rng(); let mut command_scores = CommandScore::init_command_scores(settings, state); - // TODO Repeat this until time is out - for _ in 0..1000 { + loop { for mut score in &mut command_scores { simulate_to_endstate(score, settings, state, &mut rng); } + if start_time.to(PreciseTime::now()) > max_time { + break; + } } - println!("{:?}", command_scores); + println!("{:#?}", command_scores); let command = command_scores.iter().max_by_key(|&c| c.win_ratio()); match command { diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs index 2dad924..72ab66c 100644 --- a/src/strategy/sample.rs +++ b/src/strategy/sample.rs @@ -1,9 +1,11 @@ use engine; use engine::command::*; +use time::PreciseTime; + use rand::{thread_rng, Rng}; -pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { +pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, _start_time: &PreciseTime) -> Command { let mut rng = thread_rng(); if state.player.can_afford_defence_buildings(settings) { -- cgit v1.2.3 From dd78789f242814bc750d886cc2d0c8f0877ade7c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 13 May 2018 19:09:26 +0200 Subject: Added initial benchmarks There's a lot of room for improvement here. Specifically, I should separate the internal representation from the test interface. Have it provide functionality for creating random valid states. --- Cargo.toml | 10 ++++- benches/engine.rs | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/engine/mod.rs | 2 +- 3 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 benches/engine.rs diff --git a/Cargo.toml b/Cargo.toml index 7703fc6..01abf5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,4 +8,12 @@ serde = "1.0.43" serde_json = "1.0.16" rand = "0.4.2" -time = "0.1.4" \ No newline at end of file +time = "0.1.4" + +[dev-dependencies] +criterion = "0.2" +lazy_static = "1.0" + +[[bench]] +name = "engine" +harness = false \ No newline at end of file diff --git a/benches/engine.rs b/benches/engine.rs new file mode 100644 index 0000000..129d687 --- /dev/null +++ b/benches/engine.rs @@ -0,0 +1,130 @@ +#[macro_use] +extern crate criterion; +use criterion::Criterion; + +#[macro_use] +extern crate lazy_static; + +extern crate zombot; +use zombot::engine::{GameState, Player, GameStatus, Building}; +use zombot::engine::settings::{GameSettings, BuildingSettings}; +use zombot::engine::geometry::Point; +use zombot::engine::command::{Command, BuildingType}; + +extern crate rand; +use rand::{thread_rng, Rng}; + +fn create_example_state(settings: &GameSettings, + player_buildings: usize, opponent_buildings: usize, + _player_missiles: usize, _opponent_missiles: usize +) -> GameState { + GameState { + status: GameStatus::Continue, + player: Player { + energy: 30, + health: 100 + }, + opponent: Player { + energy: 30, + health: 100 + }, + player_buildings: (0..player_buildings).map(|_| create_player_building(settings)).collect(), + opponent_buildings: (0..opponent_buildings).map(|_| create_player_building(settings)).collect(), + player_missiles: Vec::new(), + opponent_missiles: Vec::new() + } +} + +fn create_example_settings() -> GameSettings { + GameSettings { + size: Point::new(10,10), + energy_income: 5, + energy: BuildingSettings { + price: 20, + health: 5, + construction_time: 1, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 3 + }, + defence: BuildingSettings { + price: 20, + health: 5, + construction_time: 1, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 3 + }, + attack: BuildingSettings { + price: 20, + health: 5, + construction_time: 1, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 3 + } + } +} + +fn create_player_building(settings: &GameSettings) -> Building { + let all_positions = (0..settings.size.y) + .flat_map(|y| (0..settings.size.x/2).map(|x| Point::new(x, y)).collect::>()) + .collect::>(); + let all_buildings = BuildingType::all(); + + let mut rng = thread_rng(); + let position = rng.choose(&all_positions).unwrap(); + let building = rng.choose(&all_buildings).unwrap(); + let blueprint = settings.building_settings(*building); + + Building::new(*position, blueprint) +} + +fn create_opponent_building(settings: &GameSettings) -> Building { + let all_positions = (0..settings.size.y) + .flat_map(|y| (settings.size.x/2..settings.size.x).map(|x| Point::new(x, y)).collect::>()) + .collect::>(); + let all_buildings = BuildingType::all(); + + let mut rng = thread_rng(); + let position = rng.choose(&all_positions).unwrap(); + let building = rng.choose(&all_buildings).unwrap(); + let blueprint = settings.building_settings(*building); + + Building::new(*position, blueprint) +} + + + +fn full_simulation_benchmark(c: &mut Criterion) { + let settings = create_example_settings(); + let state = create_example_state(&settings, 5, 5, 0, 0); + + let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); + let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); + c.bench_function("full simulation", move |b| b.iter(|| state.simulate(&settings, player_command, opponent_command))); +} + +fn full_simulation_benchmark_against_number_of_buildings(c: &mut Criterion) { + let settings = create_example_settings(); + + lazy_static! { + static ref STATES: Vec = { + let settings = create_example_settings(); + (0..10) + .map(|i| create_example_state(&settings, i*2, 0, 0, 0)) + .collect::>() + }; + } + + let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); + let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); + + c.bench_function_over_inputs("player buildings variable", move |b, &state_index| b.iter(|| STATES[state_index].simulate(&settings, player_command, opponent_command)), (0..STATES.len())); +} + +criterion_group!(benches, full_simulation_benchmark, full_simulation_benchmark_against_number_of_buildings); +criterion_main!(benches); diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 41acb23..7b6db30 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -240,7 +240,7 @@ impl Player { } impl Building { - fn new(pos: Point, blueprint: &BuildingSettings) -> Building { + pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { Building { pos: pos, health: blueprint.health, -- cgit v1.2.3 From 01a4728977ed49429dd0f9e41dbdbd51a6fc3274 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 13 May 2018 19:58:16 +0200 Subject: Added benchmark that touches missiles --- benches/engine.rs | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/benches/engine.rs b/benches/engine.rs index 129d687..1f6c125 100644 --- a/benches/engine.rs +++ b/benches/engine.rs @@ -6,7 +6,7 @@ use criterion::Criterion; extern crate lazy_static; extern crate zombot; -use zombot::engine::{GameState, Player, GameStatus, Building}; +use zombot::engine::{GameState, Player, GameStatus, Building, Missile}; use zombot::engine::settings::{GameSettings, BuildingSettings}; use zombot::engine::geometry::Point; use zombot::engine::command::{Command, BuildingType}; @@ -16,7 +16,7 @@ use rand::{thread_rng, Rng}; fn create_example_state(settings: &GameSettings, player_buildings: usize, opponent_buildings: usize, - _player_missiles: usize, _opponent_missiles: usize + player_missiles: usize, opponent_missiles: usize ) -> GameState { GameState { status: GameStatus::Continue, @@ -30,8 +30,8 @@ fn create_example_state(settings: &GameSettings, }, player_buildings: (0..player_buildings).map(|_| create_player_building(settings)).collect(), opponent_buildings: (0..opponent_buildings).map(|_| create_player_building(settings)).collect(), - player_missiles: Vec::new(), - opponent_missiles: Vec::new() + player_missiles: (0..player_missiles).map(|_| create_missile(settings)).collect(), + opponent_missiles: (0..opponent_missiles).map(|_| create_missile(settings)).collect() } } @@ -97,11 +97,24 @@ fn create_opponent_building(settings: &GameSettings) -> Building { Building::new(*position, blueprint) } +fn create_missile(settings: &GameSettings) -> Missile { + let all_positions = (0..settings.size.y) + .flat_map(|y| (settings.size.x/2..settings.size.x).map(|x| Point::new(x, y)).collect::>()) + .collect::>(); + let mut rng = thread_rng(); + let position = rng.choose(&all_positions).unwrap(); + + Missile { + pos: *position, + damage: 5, + speed: 1 + } +} fn full_simulation_benchmark(c: &mut Criterion) { let settings = create_example_settings(); - let state = create_example_state(&settings, 5, 5, 0, 0); + let state = create_example_state(&settings, 5, 5, 5, 5); let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); @@ -126,5 +139,26 @@ fn full_simulation_benchmark_against_number_of_buildings(c: &mut Criterion) { c.bench_function_over_inputs("player buildings variable", move |b, &state_index| b.iter(|| STATES[state_index].simulate(&settings, player_command, opponent_command)), (0..STATES.len())); } -criterion_group!(benches, full_simulation_benchmark, full_simulation_benchmark_against_number_of_buildings); +fn full_simulation_benchmark_against_number_of_missiles(c: &mut Criterion) { + let settings = create_example_settings(); + + lazy_static! { + static ref STATES: Vec = { + let settings = create_example_settings(); + (0..10) + .map(|i| create_example_state(&settings, 2, 5, i*2, i*2)) + .collect::>() + }; + } + + let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); + let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); + + c.bench_function_over_inputs("player missiles variable", move |b, &state_index| b.iter(|| STATES[state_index].simulate(&settings, player_command, opponent_command)), (0..STATES.len())); +} + +criterion_group!(benches, + full_simulation_benchmark, + full_simulation_benchmark_against_number_of_buildings, + full_simulation_benchmark_against_number_of_missiles); criterion_main!(benches); -- cgit v1.2.3 From 91c5c52431c894315d5ef72a7c9480b3b09d1745 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 13 May 2018 20:17:54 +0200 Subject: Removed unnecessary check on missile updates Unnecessary for now. It might become necessary later. --- src/engine/mod.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 7b6db30..b80a53c 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -151,10 +151,13 @@ impl GameState { } } } - + + /* + check is necessary if speed could be > 1, which isn't the case yet if missile.speed == 0 { break; } + */ } } missiles.retain(|m| m.speed > 0); -- cgit v1.2.3 From 6c7eac5e5fc166759dbbf22f0ca28fd1b636de52 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 14 May 2018 21:51:36 +0200 Subject: Added profiling target with perf --- Cargo.toml | 8 ++++++- Makefile | 18 +++++++++++++++ src/bin/perf-test.rs | 53 +++++++++++++++++++++++++++++++++++++++++++++ src/main.rs | 5 +++-- src/strategy/monte_carlo.rs | 13 ++++++----- src/strategy/sample.rs | 4 +--- 6 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 Makefile create mode 100644 src/bin/perf-test.rs diff --git a/Cargo.toml b/Cargo.toml index 01abf5d..86a4b95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,10 @@ lazy_static = "1.0" [[bench]] name = "engine" -harness = false \ No newline at end of file +harness = false + +[profile.release] +debug = true + +[features] +benchmarking = [] \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..10aff98 --- /dev/null +++ b/Makefile @@ -0,0 +1,18 @@ +build: + cargo build --release + +test: + cargo test --release + +profile: + cargo build --release --features "benchmarking" + sudo perf record -F 99 -a -g target/release/perf-test + sudo perf script > out.perf + ../FlameGraph/stackcollapse-perf.pl out.perf > out.folded + ../FlameGraph/flamegraph.pl out.folded > flamegraph.svg + +clean: + cargo clean + + +.PHONY: build test profile clean diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs new file mode 100644 index 0000000..1397cc3 --- /dev/null +++ b/src/bin/perf-test.rs @@ -0,0 +1,53 @@ +extern crate zombot; +extern crate time; +use time::{PreciseTime, Duration}; + +use zombot::*; +use zombot::engine::command::Command; + +use std::error::Error; + +const STATE_PATH: &str = "init_state.json"; + +const COMMAND_PATH: &str = "command.txt"; + +use std::fs::File; +use std::io::prelude::*; +use std::process; + +fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { + let max_time = Duration::milliseconds(9950); + strategy::monte_carlo::choose_move(settings, state, start_time, max_time) +} + + +fn write_command(filename: &str, command: Command) -> Result<(), Box > { + let mut file = File::create(filename)?; + write!(file, "{}", command)?; + Ok(()) +} + + +fn main() { + let start_time = PreciseTime::now(); + + println!("Reading in state.json file"); + let (settings, state) = match json::read_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => { + println!("Error while parsing JSON file: {}", error); + process::exit(1); + } + }; + let command = choose_move(&settings, &state, &start_time); + + match write_command(COMMAND_PATH, command) { + Ok(()) => {} + Err(error) => { + println!("Error while writing command file: {}", error); + process::exit(1); + } + } + + println!("Elapsed time: {}", start_time.to(PreciseTime::now())); +} diff --git a/src/main.rs b/src/main.rs index 3d3d980..651df35 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ extern crate zombot; extern crate time; -use time::PreciseTime; +use time::{PreciseTime, Duration}; use zombot::*; use zombot::engine::command::Command; @@ -16,7 +16,8 @@ use std::io::prelude::*; use std::process; fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { - strategy::monte_carlo::choose_move(settings, state, start_time) + let max_time = Duration::milliseconds(1950); + strategy::monte_carlo::choose_move(settings, state, start_time, max_time) } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 86960eb..7e62cae 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -8,12 +8,8 @@ const MAX_MOVES: u16 = 400; use time::{Duration, PreciseTime}; -// TODO Round start time here -pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime) -> Command { +pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime, max_time: Duration) -> Command { println!("Using MONTE_CARLO strategy"); - - //just under the max of 2 seconds, to avoid issues like overhead in the bot being run, and we still need to write the result of this to file - let max_time = Duration::milliseconds(1950); let mut rng = thread_rng(); let mut command_scores = CommandScore::init_command_scores(settings, state); @@ -27,8 +23,13 @@ pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &Prec } } - println!("{:#?}", command_scores); let command = command_scores.iter().max_by_key(|&c| c.win_ratio()); + + #[cfg(feature = "benchmarking")] + { + let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); + println!("Iterations: {}", total_iterations); + } match command { Some(ref command) => command.command, diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs index 72ab66c..2dad924 100644 --- a/src/strategy/sample.rs +++ b/src/strategy/sample.rs @@ -1,11 +1,9 @@ use engine; use engine::command::*; -use time::PreciseTime; - use rand::{thread_rng, Rng}; -pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, _start_time: &PreciseTime) -> Command { +pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { let mut rng = thread_rng(); if state.player.can_afford_defence_buildings(settings) { -- cgit v1.2.3 From b0455769297964f0b82ef0df78dad8da74e9bca9 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 14 May 2018 22:12:05 +0200 Subject: Reduced number of needless allocations to improve perf Current iterations: 26486 in 10 seconds --- src/engine/mod.rs | 28 +++++++++++++++------- src/strategy/monte_carlo.rs | 58 +++++++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 34 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index b80a53c..446d3bf 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -188,17 +188,29 @@ impl GameState { } pub fn unoccupied_player_cells(&self, settings: &GameSettings) -> Vec { - (0..settings.size.y) - .flat_map(|y| (0..settings.size.x/2).map(|x| Point::new(x, y)).collect::>()) - .filter(|&p| !self.player_buildings.iter().any(|b| b.pos == p)) - .collect() + let mut result = Vec::with_capacity(settings.size.y as usize *settings.size.x as usize / 2); + for y in 0..settings.size.y { + for x in 0..settings.size.x/2 { + let pos = Point::new(x, y); + if !self.player_buildings.iter().any(|b| b.pos == pos) { + result.push(pos); + } + } + } + result } pub fn unoccupied_opponent_cells(&self, settings: &GameSettings) -> Vec { - (0..settings.size.y) - .flat_map(|y| (settings.size.x/2..settings.size.x).map(|x| Point::new(x, y)).collect::>()) - .filter(|&p| !self.opponent_buildings.iter().any(|b| b.pos == p)) - .collect() + let mut result = Vec::with_capacity(settings.size.y as usize *settings.size.x as usize / 2); + for y in 0..settings.size.y { + for x in settings.size.x/2..settings.size.x { + let pos = Point::new(x, y); + if !self.opponent_buildings.iter().any(|b| b.pos == pos) { + result.push(pos); + } + } + } + result } pub fn player_affordable_buildings(&self, settings: &GameSettings) -> Vec { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 7e62cae..83627b0 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,5 +1,6 @@ use engine::settings::GameSettings; use engine::command::*; +use engine::geometry::*; use engine::{GameState, GameStatus}; use rand::{thread_rng, Rng}; @@ -64,12 +65,29 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam } fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_commands = enumerate_player_commands(settings, state); - rng.choose(&all_commands).cloned().unwrap_or(Command::Nothing) + let all_positions = state.unoccupied_player_cells(settings); + let all_buildings = state.player_affordable_buildings(settings); + random_move(&all_positions, &all_buildings, rng) } + fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_commands = enumerate_opponent_commands(settings, state); - rng.choose(&all_commands).cloned().unwrap_or(Command::Nothing) + let all_positions = state.unoccupied_opponent_cells(settings); + let all_buildings = state.opponent_affordable_buildings(settings); + random_move(&all_positions, &all_buildings, rng) +} + +fn random_move(all_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { + let number_of_commands = all_positions.len()*all_buildings.len()+1; + let choice_index = rng.gen_range(0, number_of_commands); + + if choice_index == number_of_commands - 1 { + Command::Nothing + } else { + Command::Build( + all_positions[choice_index/all_buildings.len()], + all_buildings[choice_index%all_buildings.len()] + ) + } } #[derive(Debug)] @@ -128,27 +146,15 @@ impl CommandScore { fn enumerate_player_commands(settings: &GameSettings, state: &GameState) -> Vec { let all_positions = state.unoccupied_player_cells(settings); let all_buildings = state.player_affordable_buildings(settings); - - let build_commands = all_positions.iter() - .flat_map(|&pos| all_buildings.iter() - .map(|&building| Command::Build(pos, building)).collect::>() - ); - let other_commands = vec!(Command::Nothing); - - build_commands.chain(other_commands) - .collect() -} -fn enumerate_opponent_commands(settings: &GameSettings, state: &GameState) -> Vec { - let all_positions = state.unoccupied_opponent_cells(settings); - let all_buildings = state.opponent_affordable_buildings(settings); - - let build_commands = all_positions.iter() - .flat_map(|&pos| all_buildings.iter() - .map(|&building| Command::Build(pos, building)).collect::>() - ); - let other_commands = vec!(Command::Nothing); - - build_commands.chain(other_commands) - .collect() + let mut commands = Vec::with_capacity(all_positions.len()*all_buildings.len()+1); + commands.push(Command::Nothing); + + for position in all_positions { + for &building in &all_buildings { + commands.push(Command::Build(position, building)); + } + } + + commands } -- cgit v1.2.3 From e762eda31ffa8e722737eba2583154ec038a068f Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 14 May 2018 22:18:52 +0200 Subject: Changed invalid move checking to be a debug assertion --- src/bin/perf-test.rs | 2 +- src/engine/mod.rs | 38 +++++++++++++++----------------------- src/strategy/monte_carlo.rs | 7 +------ 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 1397cc3..62c323c 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -16,7 +16,7 @@ use std::io::prelude::*; use std::process; fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { - let max_time = Duration::milliseconds(9950); + let max_time = Duration::milliseconds(1950); strategy::monte_carlo::choose_move(settings, state, start_time, max_time) } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 446d3bf..090d9af 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -25,8 +25,7 @@ pub enum GameStatus { Continue, PlayerWon, OpponentWon, - Draw, - InvalidMove + Draw } #[derive(Debug, Clone)] @@ -66,13 +65,8 @@ impl GameState { return; } - let player_valid = GameState::perform_command(&mut self.player_buildings, &mut self.player, settings, player_command, &settings.size); - let opponent_valid = GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, settings, opponent_command, &settings.size); - - if !player_valid || !opponent_valid { - self.status = GameStatus::InvalidMove; - return; - } + GameState::perform_command(&mut self.player_buildings, &mut self.player, settings, player_command, &settings.size); + GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, settings, opponent_command, &settings.size); GameState::update_construction(&mut self.player_buildings); GameState::update_construction(&mut self.opponent_buildings); @@ -91,22 +85,20 @@ impl GameState { GameState::update_status(self); } - fn perform_command(buildings: &mut Vec, player: &mut Player, settings: &GameSettings, command: Command, size: &Point) -> bool { + fn perform_command(buildings: &mut Vec, player: &mut Player, settings: &GameSettings, command: Command, size: &Point) { match command { - Command::Nothing => { true }, + Command::Nothing => { }, Command::Build(p, b) => { let blueprint = settings.building_settings(b); - - let occupied = buildings.iter().any(|b| b.pos == p); - let in_range = p.x < size.x && p.y < size.y; - let has_energy = player.energy >= blueprint.price; - - let valid = !occupied && in_range && has_energy; - if valid { - player.energy -= blueprint.price; - buildings.push(Building::new(p, blueprint)); - } - valid + + // This is used internally. I should not be making + // invalid moves! + debug_assert!(!buildings.iter().any(|b| b.pos == p)); + debug_assert!(p.x < size.x && p.y < size.y); + debug_assert!(player.energy >= blueprint.price); + + player.energy -= blueprint.price; + buildings.push(Building::new(p, blueprint)); }, } } @@ -144,7 +136,7 @@ impl GameState { }, Some(point) => { missile.pos = point; - for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point && b.health > 0) { + for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point/* && b.health > 0*/) { //TODO surely this health>0 belongs? Not what the real game engine is doing unfortunately let damage = cmp::min(missile.damage, hit.health); hit.health -= damage; missile.speed = 0; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 83627b0..59e86a6 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -4,7 +4,6 @@ use engine::geometry::*; use engine::{GameState, GameStatus}; use rand::{thread_rng, Rng}; -use std::process; const MAX_MOVES: u16 = 400; use time::{Duration, PreciseTime}; @@ -56,11 +55,7 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam GameStatus::PlayerWon => command_score.add_victory(), GameStatus::OpponentWon => command_score.add_defeat(), GameStatus::Continue => command_score.add_stalemate(), - GameStatus::Draw => command_score.add_draw(), - GameStatus::InvalidMove => { - println!("Invalid move made while performing simulation"); - process::exit(0); - } + GameStatus::Draw => command_score.add_draw() } } -- cgit v1.2.3 From d9bf3dbdaeab077e7b27565d1c59a4e8faff9313 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 14 May 2018 22:26:31 +0200 Subject: Increased profiler sampling frequency --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 10aff98..5f2e069 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ test: profile: cargo build --release --features "benchmarking" - sudo perf record -F 99 -a -g target/release/perf-test + sudo perf record -F 1000 -a -g target/release/perf-test sudo perf script > out.perf ../FlameGraph/stackcollapse-perf.pl out.perf > out.folded ../FlameGraph/flamegraph.pl out.folded > flamegraph.svg -- cgit v1.2.3 From eacb65f120ca0fcbd920f14160404cb6c709b4ef Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 14 May 2018 23:31:07 +0200 Subject: Added running total of unoccupied cells --- src/engine/mod.rs | 73 ++++++++++++++++++++++++++------------------- src/json.rs | 25 +++++++++------- src/strategy/monte_carlo.rs | 11 +++---- src/strategy/sample.rs | 5 ++-- 4 files changed, 63 insertions(+), 51 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 090d9af..24a5a7e 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -15,7 +15,9 @@ pub struct GameState { pub player: Player, pub opponent: Player, pub player_buildings: Vec, + pub unoccupied_player_cells: Vec, pub opponent_buildings: Vec, + pub unoccupied_opponent_cells: Vec, pub player_missiles: Vec, pub opponent_missiles: Vec } @@ -54,6 +56,26 @@ pub struct Missile { } impl GameState { + pub fn new(player: Player, opponent: Player, player_buildings: Vec, opponent_buildings: Vec, player_missiles: Vec, opponent_missiles: Vec, settings: &GameSettings) -> GameState { + let unoccupied_player_cells = GameState::unoccupied_cells( + &player_buildings, Point::new(0, settings.size.x/2), Point::new(0, settings.size.y) + ); + let unoccupied_opponent_cells = GameState::unoccupied_cells( + &opponent_buildings, Point::new(settings.size.x/2, settings.size.x), Point::new(0, settings.size.y) + ); + GameState { + status: GameStatus::Continue, + player: player, + opponent: opponent, + player_buildings: player_buildings, + unoccupied_player_cells: unoccupied_player_cells, + opponent_buildings: opponent_buildings, + unoccupied_opponent_cells: unoccupied_opponent_cells, + player_missiles: player_missiles, + opponent_missiles: opponent_missiles + } + } + pub fn simulate(&self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameState { let mut state = self.clone(); state.simulate_mut(settings, player_command, opponent_command); @@ -65,8 +87,8 @@ impl GameState { return; } - GameState::perform_command(&mut self.player_buildings, &mut self.player, settings, player_command, &settings.size); - GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, settings, opponent_command, &settings.size); + GameState::perform_command(&mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); + GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); GameState::update_construction(&mut self.player_buildings); GameState::update_construction(&mut self.opponent_buildings); @@ -75,9 +97,11 @@ impl GameState { GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); GameState::move_missiles(&mut self.player_missiles, |p| p.move_right(&settings.size), - &mut self.opponent_buildings, &mut self.opponent); + &mut self.opponent_buildings, &mut self.opponent, + &mut self.unoccupied_opponent_cells); GameState::move_missiles(&mut self.opponent_missiles, |p| p.move_left(), - &mut self.player_buildings, &mut self.player); + &mut self.player_buildings, &mut self.player, + &mut self.unoccupied_player_cells); GameState::add_energy(&mut self.player, settings, &self.player_buildings); GameState::add_energy(&mut self.opponent, settings, &self.opponent_buildings); @@ -85,7 +109,7 @@ impl GameState { GameState::update_status(self); } - fn perform_command(buildings: &mut Vec, player: &mut Player, settings: &GameSettings, command: Command, size: &Point) { + fn perform_command(buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { match command { Command::Nothing => { }, Command::Build(p, b) => { @@ -99,6 +123,7 @@ impl GameState { player.energy -= blueprint.price; buildings.push(Building::new(p, blueprint)); + unoccupied_cells.retain(|&pos| pos != p); }, } } @@ -124,7 +149,7 @@ impl GameState { } } - fn move_missiles(missiles: &mut Vec, move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player) + fn move_missiles(missiles: &mut Vec, move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec,) where F: Fn(Point) -> Option { for missile in missiles.iter_mut() { for _ in 0..missile.speed { @@ -139,7 +164,7 @@ impl GameState { for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point/* && b.health > 0*/) { //TODO surely this health>0 belongs? Not what the real game engine is doing unfortunately let damage = cmp::min(missile.damage, hit.health); hit.health -= damage; - missile.speed = 0; + missile.speed = 0; } } } @@ -153,6 +178,10 @@ impl GameState { } } missiles.retain(|m| m.speed > 0); + + for b in opponent_buildings.iter().filter(|b| b.health == 0) { + unoccupied_cells.push(b.pos); + } opponent_buildings.retain(|b| b.health > 0); } @@ -172,32 +201,16 @@ impl GameState { }; } - pub fn unoccupied_player_cells_in_row(&self, settings: &GameSettings, y: u8) -> Vec { - (0..settings.size.x/2) - .map(|x| Point::new(x, y)) - .filter(|&p| !self.player_buildings.iter().any(|b| b.pos == p)) - .collect() - } - - pub fn unoccupied_player_cells(&self, settings: &GameSettings) -> Vec { - let mut result = Vec::with_capacity(settings.size.y as usize *settings.size.x as usize / 2); - for y in 0..settings.size.y { - for x in 0..settings.size.x/2 { - let pos = Point::new(x, y); - if !self.player_buildings.iter().any(|b| b.pos == pos) { - result.push(pos); - } - } - } - result + pub fn unoccupied_player_cells_in_row(&self, y: u8) -> Vec { + self.unoccupied_player_cells.iter().filter(|p| p.y == y).cloned().collect() } - pub fn unoccupied_opponent_cells(&self, settings: &GameSettings) -> Vec { - let mut result = Vec::with_capacity(settings.size.y as usize *settings.size.x as usize / 2); - for y in 0..settings.size.y { - for x in settings.size.x/2..settings.size.x { + fn unoccupied_cells(buildings: &[Building], bl: Point, tr: Point) -> Vec { + let mut result = Vec::with_capacity((tr.y-bl.y) as usize * (tr.x-bl.x) as usize); + for y in bl.y..tr.y { + for x in bl.x..tr.x { let pos = Point::new(x, y); - if !self.opponent_buildings.iter().any(|b| b.pos == pos) { + if !buildings.iter().any(|b| b.pos == pos) { result.push(pos); } } diff --git a/src/json.rs b/src/json.rs index 10c3ab8..4253a19 100644 --- a/src/json.rs +++ b/src/json.rs @@ -12,7 +12,10 @@ pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSet let mut content = String::new(); file.read_to_string(&mut content)?; let state: State = serde_json::from_str(content.as_ref())?; - Ok((state.to_engine_settings(), state.to_engine())) + + let engine_settings = state.to_engine_settings(); + let engine_state = state.to_engine(&engine_settings); + Ok((engine_settings, engine_state)) } #[derive(Deserialize)] @@ -116,16 +119,16 @@ impl State { } } - fn to_engine(&self) -> engine::GameState { - engine::GameState { - status: engine::GameStatus::Continue, - player: self.player().to_engine(), - opponent: self.opponent().to_engine(), - player_buildings: self.buildings_to_engine('A'), - opponent_buildings: self.buildings_to_engine('B'), - player_missiles: self.missiles_to_engine('A'), - opponent_missiles: self.missiles_to_engine('B'), - } + fn to_engine(&self, settings: &engine::settings::GameSettings) -> engine::GameState { + engine::GameState::new( + self.player().to_engine(), + self.opponent().to_engine(), + self.buildings_to_engine('A'), + self.buildings_to_engine('B'), + self.missiles_to_engine('A'), + self.missiles_to_engine('B'), + settings + ) } fn player(&self) -> &Player { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 59e86a6..6f0f681 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -60,15 +60,13 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam } fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_positions = state.unoccupied_player_cells(settings); let all_buildings = state.player_affordable_buildings(settings); - random_move(&all_positions, &all_buildings, rng) + random_move(&state.unoccupied_player_cells, &all_buildings, rng) } fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_positions = state.unoccupied_opponent_cells(settings); let all_buildings = state.opponent_affordable_buildings(settings); - random_move(&all_positions, &all_buildings, rng) + random_move(&state.unoccupied_opponent_cells, &all_buildings, rng) } fn random_move(all_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { @@ -139,13 +137,12 @@ impl CommandScore { } fn enumerate_player_commands(settings: &GameSettings, state: &GameState) -> Vec { - let all_positions = state.unoccupied_player_cells(settings); let all_buildings = state.player_affordable_buildings(settings); - let mut commands = Vec::with_capacity(all_positions.len()*all_buildings.len()+1); + let mut commands = Vec::with_capacity(state.unoccupied_player_cells.len()*all_buildings.len()+1); commands.push(Command::Nothing); - for position in all_positions { + for &position in &state.unoccupied_player_cells { for &building in &all_buildings { commands.push(Command::Build(position, building)); } diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs index 2dad924..370df2f 100644 --- a/src/strategy/sample.rs +++ b/src/strategy/sample.rs @@ -9,7 +9,7 @@ pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::Ga if state.player.can_afford_defence_buildings(settings) { for y in 0..settings.size.y { if is_under_attack(state, y) { - let p_options = state.unoccupied_player_cells_in_row(settings, y); + let p_options = state.unoccupied_player_cells_in_row(y); if let Some(&p) = rng.choose(&p_options) { return Command::Build(p, BuildingType::Defence); } @@ -18,8 +18,7 @@ pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::Ga } if state.player.can_afford_all_buildings(settings) { - let options = state.unoccupied_player_cells(settings); - let option = rng.choose(&options); + let option = rng.choose(&state.unoccupied_player_cells); let buildings = [BuildingType::Attack, BuildingType::Defence, BuildingType::Energy]; let building = rng.choose(&buildings); match (option, building) { -- cgit v1.2.3 From 1ee2a8c0edf506e50587b6b5cfe90077c9f5d8ae Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 14 May 2018 23:38:47 +0200 Subject: Fixed bug in unoccupied cell implementation This optimization lead to a 50% speedup. --- src/engine/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 24a5a7e..f8a456f 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -58,10 +58,10 @@ pub struct Missile { impl GameState { pub fn new(player: Player, opponent: Player, player_buildings: Vec, opponent_buildings: Vec, player_missiles: Vec, opponent_missiles: Vec, settings: &GameSettings) -> GameState { let unoccupied_player_cells = GameState::unoccupied_cells( - &player_buildings, Point::new(0, settings.size.x/2), Point::new(0, settings.size.y) + &player_buildings, Point::new(0, 0), Point::new(settings.size.x/2, settings.size.y) ); let unoccupied_opponent_cells = GameState::unoccupied_cells( - &opponent_buildings, Point::new(settings.size.x/2, settings.size.x), Point::new(0, settings.size.y) + &opponent_buildings, Point::new(settings.size.x/2, 0), Point::new(settings.size.x, settings.size.y) ); GameState { status: GameStatus::Continue, -- cgit v1.2.3 From 0ebebeccd72ba76a2a9a9ad94c38feaed9b6ab1c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 15 May 2018 23:14:32 +0200 Subject: Added end to end tests, comparing against actual game engine --- tests/live-comparison.rs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/state0.json | 1 + tests/state1.json | 1 + tests/state10.json | 1 + tests/state11.json | 1 + tests/state12.json | 1 + tests/state13.json | 1 + tests/state14.json | 1 + tests/state15.json | 1 + tests/state16.json | 1 + tests/state17.json | 1 + tests/state18.json | 1 + tests/state19.json | 1 + tests/state2.json | 1 + tests/state20.json | 1 + tests/state21.json | 1 + tests/state22.json | 1 + tests/state23.json | 1 + tests/state24.json | 1 + tests/state25.json | 1 + tests/state26.json | 1 + tests/state27.json | 1 + tests/state28.json | 1 + tests/state29.json | 1 + tests/state3.json | 1 + tests/state30.json | 1 + tests/state4.json | 1 + tests/state5.json | 1 + tests/state6.json | 1 + tests/state7.json | 1 + tests/state8.json | 1 + tests/state9.json | 1 + 32 files changed, 85 insertions(+) create mode 100644 tests/live-comparison.rs create mode 100644 tests/state0.json create mode 100644 tests/state1.json create mode 100644 tests/state10.json create mode 100644 tests/state11.json create mode 100644 tests/state12.json create mode 100644 tests/state13.json create mode 100644 tests/state14.json create mode 100644 tests/state15.json create mode 100644 tests/state16.json create mode 100644 tests/state17.json create mode 100644 tests/state18.json create mode 100644 tests/state19.json create mode 100644 tests/state2.json create mode 100644 tests/state20.json create mode 100644 tests/state21.json create mode 100644 tests/state22.json create mode 100644 tests/state23.json create mode 100644 tests/state24.json create mode 100644 tests/state25.json create mode 100644 tests/state26.json create mode 100644 tests/state27.json create mode 100644 tests/state28.json create mode 100644 tests/state29.json create mode 100644 tests/state3.json create mode 100644 tests/state30.json create mode 100644 tests/state4.json create mode 100644 tests/state5.json create mode 100644 tests/state6.json create mode 100644 tests/state7.json create mode 100644 tests/state8.json create mode 100644 tests/state9.json diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs new file mode 100644 index 0000000..e090907 --- /dev/null +++ b/tests/live-comparison.rs @@ -0,0 +1,54 @@ +extern crate zombot; + +use zombot::json; +use zombot::engine::command::{Command, BuildingType}; +use zombot::engine::geometry::Point; + +#[test] +fn it_successfully_simulates_moves() { + let (settings, mut state) = json::read_state_from_file("tests/state0.json").expect("Failed to read state0.json"); + + let all_commands = [ + (Command::Build(Point::new(3,2),BuildingType::Energy), Command::Nothing), + (Command::Nothing, Command::Nothing), + (Command::Nothing, Command::Build(Point::new(4,3),BuildingType::Energy)), + (Command::Build(Point::new(3,1),BuildingType::Energy), Command::Nothing), + (Command::Nothing, Command::Nothing), + (Command::Build(Point::new(3,0),BuildingType::Energy),Command::Build(Point::new(6,0),BuildingType::Energy)), + (Command::Nothing,Command::Nothing), + (Command::Build(Point::new(3,3),BuildingType::Energy),Command::Build(Point::new(7,1),BuildingType::Attack)), + (Command::Nothing,Command::Nothing), + (Command::Build(Point::new(2,3),BuildingType::Attack),Command::Nothing), + + (Command::Build(Point::new(2,1),BuildingType::Energy),Command::Build(Point::new(5,3),BuildingType::Defence)), + (Command::Nothing,Command::Nothing), + (Command::Build(Point::new(1,0),BuildingType::Attack),Command::Nothing), + (Command::Nothing,Command::Build(Point::new(5,0),BuildingType::Defence)), + (Command::Build(Point::new(0,2),BuildingType::Attack),Command::Nothing), + (Command::Build(Point::new(3,1),BuildingType::Energy),Command::Nothing), + (Command::Nothing,Command::Nothing), + (Command::Build(Point::new(0,1),BuildingType::Attack),Command::Build(Point::new(7,2),BuildingType::Defence)), + (Command::Build(Point::new(2,1),BuildingType::Energy),Command::Nothing), + (Command::Nothing,Command::Nothing), + + (Command::Build(Point::new(0,0),BuildingType::Attack),Command::Nothing), + (Command::Build(Point::new(0,3),BuildingType::Attack),Command::Build(Point::new(4,1),BuildingType::Defence)), + (Command::Nothing,Command::Nothing), + (Command::Build(Point::new(1,3),BuildingType::Attack),Command::Nothing), + (Command::Build(Point::new(3,1),BuildingType::Energy),Command::Nothing), + (Command::Nothing,Command::Build(Point::new(6,1),BuildingType::Defence)), + (Command::Build(Point::new(2,2),BuildingType::Energy),Command::Nothing), + (Command::Build(Point::new(1,2),BuildingType::Energy),Command::Nothing), + (Command::Build(Point::new(3,1),BuildingType::Energy),Command::Build(Point::new(7,0),BuildingType::Defence)), + (Command::Build(Point::new(2,1),BuildingType::Energy),Command::Nothing) + ]; + + for (i, &(player, opponent)) in all_commands.iter().enumerate() { + let file = format!("tests/state{}.json", i+1); + state.simulate_mut(&settings, player, opponent); + let (_, mut actual_state) = json::read_state_from_file(&file).unwrap(); + state.sort(); + actual_state.sort(); + assert_eq!(state, actual_state, "\nFailed on state {}\n", i+1); + } +} diff --git a/tests/state0.json b/tests/state0.json new file mode 100644 index 0000000..fa41459 --- /dev/null +++ b/tests/state0.json @@ -0,0 +1 @@ +{"gameDetails":{"round":0,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state1.json b/tests/state1.json new file mode 100644 index 0000000..164a6bd --- /dev/null +++ b/tests/state1.json @@ -0,0 +1 @@ +{"gameDetails":{"round":1,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":5,"health":100,"hitsTaken":0,"score":6},{"playerType":"B","energy":25,"health":100,"hitsTaken":0,"score":5}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state10.json b/tests/state10.json new file mode 100644 index 0000000..42c53c4 --- /dev/null +++ b/tests/state10.json @@ -0,0 +1 @@ +{"gameDetails":{"round":10,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":23,"health":100,"hitsTaken":0,"score":118},{"playerType":"B","energy":33,"health":100,"hitsTaken":0,"score":86}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state11.json b/tests/state11.json new file mode 100644 index 0000000..bc3aa6a --- /dev/null +++ b/tests/state11.json @@ -0,0 +1 @@ +{"gameDetails":{"round":11,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":141},{"playerType":"B","energy":14,"health":100,"hitsTaken":0,"score":98}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state12.json b/tests/state12.json new file mode 100644 index 0000000..b025cba --- /dev/null +++ b/tests/state12.json @@ -0,0 +1 @@ +{"gameDetails":{"round":12,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":37,"health":100,"hitsTaken":0,"score":164},{"playerType":"B","energy":22,"health":100,"hitsTaken":0,"score":112}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state13.json b/tests/state13.json new file mode 100644 index 0000000..4cc26c3 --- /dev/null +++ b/tests/state13.json @@ -0,0 +1 @@ +{"gameDetails":{"round":13,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":24,"health":100,"hitsTaken":0,"score":182},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":120}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state14.json b/tests/state14.json new file mode 100644 index 0000000..1a85e19 --- /dev/null +++ b/tests/state14.json @@ -0,0 +1 @@ +{"gameDetails":{"round":14,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":41,"health":100,"hitsTaken":0,"score":199},{"playerType":"B","energy":8,"health":100,"hitsTaken":0,"score":129}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state15.json b/tests/state15.json new file mode 100644 index 0000000..3eb21c5 --- /dev/null +++ b/tests/state15.json @@ -0,0 +1 @@ +{"gameDetails":{"round":15,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":28,"health":100,"hitsTaken":0,"score":227},{"playerType":"B","energy":16,"health":100,"hitsTaken":0,"score":137}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state16.json b/tests/state16.json new file mode 100644 index 0000000..d05993c --- /dev/null +++ b/tests/state16.json @@ -0,0 +1 @@ +{"gameDetails":{"round":16,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":25,"health":100,"hitsTaken":0,"score":245},{"playerType":"B","energy":24,"health":100,"hitsTaken":0,"score":145}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"B"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state17.json b/tests/state17.json new file mode 100644 index 0000000..b4824ea --- /dev/null +++ b/tests/state17.json @@ -0,0 +1 @@ +{"gameDetails":{"round":17,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":42,"health":100,"hitsTaken":0,"score":272},{"playerType":"B","energy":32,"health":100,"hitsTaken":0,"score":159}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state18.json b/tests/state18.json new file mode 100644 index 0000000..c0d175c --- /dev/null +++ b/tests/state18.json @@ -0,0 +1 @@ +{"gameDetails":{"round":18,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":29,"health":100,"hitsTaken":0,"score":295},{"playerType":"B","energy":10,"health":100,"hitsTaken":0,"score":168}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state19.json b/tests/state19.json new file mode 100644 index 0000000..1e82db4 --- /dev/null +++ b/tests/state19.json @@ -0,0 +1 @@ +{"gameDetails":{"round":19,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":26,"health":100,"hitsTaken":0,"score":323},{"playerType":"B","energy":18,"health":100,"hitsTaken":0,"score":176}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state2.json b/tests/state2.json new file mode 100644 index 0000000..323ea8e --- /dev/null +++ b/tests/state2.json @@ -0,0 +1 @@ +{"gameDetails":{"round":2,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":13,"health":100,"hitsTaken":0,"score":14},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":10}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state20.json b/tests/state20.json new file mode 100644 index 0000000..9f306c2 --- /dev/null +++ b/tests/state20.json @@ -0,0 +1 @@ +{"gameDetails":{"round":20,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":43,"health":100,"hitsTaken":0,"score":345},{"playerType":"B","energy":26,"health":100,"hitsTaken":0,"score":190}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state21.json b/tests/state21.json new file mode 100644 index 0000000..e75a3cc --- /dev/null +++ b/tests/state21.json @@ -0,0 +1 @@ +{"gameDetails":{"round":21,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":30,"health":100,"hitsTaken":0,"score":373},{"playerType":"B","energy":34,"health":100,"hitsTaken":0,"score":198}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state22.json b/tests/state22.json new file mode 100644 index 0000000..72bcadb --- /dev/null +++ b/tests/state22.json @@ -0,0 +1 @@ +{"gameDetails":{"round":22,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":17,"health":100,"hitsTaken":0,"score":406},{"playerType":"B","energy":12,"health":100,"hitsTaken":0,"score":207}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state23.json b/tests/state23.json new file mode 100644 index 0000000..6e8bb03 --- /dev/null +++ b/tests/state23.json @@ -0,0 +1 @@ +{"gameDetails":{"round":23,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":34,"health":100,"hitsTaken":0,"score":433},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":215}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state24.json b/tests/state24.json new file mode 100644 index 0000000..d4ee007 --- /dev/null +++ b/tests/state24.json @@ -0,0 +1 @@ +{"gameDetails":{"round":24,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":21,"health":100,"hitsTaken":0,"score":466},{"playerType":"B","energy":28,"health":100,"hitsTaken":0,"score":223}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"B"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state25.json b/tests/state25.json new file mode 100644 index 0000000..faaeca0 --- /dev/null +++ b/tests/state25.json @@ -0,0 +1 @@ +{"gameDetails":{"round":25,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":15,"health":100,"hitsTaken":0,"score":507},{"playerType":"B","energy":36,"health":100,"hitsTaken":0,"score":237}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state26.json b/tests/state26.json new file mode 100644 index 0000000..4abfc72 --- /dev/null +++ b/tests/state26.json @@ -0,0 +1 @@ +{"gameDetails":{"round":26,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":32,"health":100,"hitsTaken":0,"score":555},{"playerType":"B","energy":14,"health":100,"hitsTaken":0,"score":246}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state27.json b/tests/state27.json new file mode 100644 index 0000000..0d36c79 --- /dev/null +++ b/tests/state27.json @@ -0,0 +1 @@ +{"gameDetails":{"round":27,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":29,"health":100,"hitsTaken":0,"score":594},{"playerType":"B","energy":22,"health":100,"hitsTaken":0,"score":259}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state28.json b/tests/state28.json new file mode 100644 index 0000000..303ecbf --- /dev/null +++ b/tests/state28.json @@ -0,0 +1 @@ +{"gameDetails":{"round":28,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":26,"health":100,"hitsTaken":0,"score":622},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":273}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":1,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state29.json b/tests/state29.json new file mode 100644 index 0000000..c41b1fc --- /dev/null +++ b/tests/state29.json @@ -0,0 +1 @@ +{"gameDetails":{"round":29,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":26,"health":100,"hitsTaken":0,"score":658},{"playerType":"B","energy":8,"health":100,"hitsTaken":0,"score":282}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":1,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state3.json b/tests/state3.json new file mode 100644 index 0000000..98bdc66 --- /dev/null +++ b/tests/state3.json @@ -0,0 +1 @@ +{"gameDetails":{"round":3,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":21,"health":100,"hitsTaken":0,"score":22},{"playerType":"B","energy":15,"health":100,"hitsTaken":0,"score":16}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state30.json b/tests/state30.json new file mode 100644 index 0000000..5527c6d --- /dev/null +++ b/tests/state30.json @@ -0,0 +1 @@ +{"gameDetails":{"round":30,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":29,"health":100,"hitsTaken":0,"score":713},{"playerType":"B","energy":13,"health":100,"hitsTaken":0,"score":287}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":1,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":7,"y":3,"playerType":"A"}],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state4.json b/tests/state4.json new file mode 100644 index 0000000..29f3b2c --- /dev/null +++ b/tests/state4.json @@ -0,0 +1 @@ +{"gameDetails":{"round":4,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":9,"health":100,"hitsTaken":0,"score":31},{"playerType":"B","energy":23,"health":100,"hitsTaken":0,"score":24}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state5.json b/tests/state5.json new file mode 100644 index 0000000..02b654c --- /dev/null +++ b/tests/state5.json @@ -0,0 +1 @@ +{"gameDetails":{"round":5,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":42},{"playerType":"B","energy":31,"health":100,"hitsTaken":0,"score":32}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state6.json b/tests/state6.json new file mode 100644 index 0000000..f4b6f46 --- /dev/null +++ b/tests/state6.json @@ -0,0 +1 @@ +{"gameDetails":{"round":6,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":11,"health":100,"hitsTaken":0,"score":54},{"playerType":"B","energy":19,"health":100,"hitsTaken":0,"score":41}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state7.json b/tests/state7.json new file mode 100644 index 0000000..3f27bcf --- /dev/null +++ b/tests/state7.json @@ -0,0 +1 @@ +{"gameDetails":{"round":7,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":25,"health":100,"hitsTaken":0,"score":68},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":52}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state8.json b/tests/state8.json new file mode 100644 index 0000000..d5d82ab --- /dev/null +++ b/tests/state8.json @@ -0,0 +1 @@ +{"gameDetails":{"round":8,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":19,"health":100,"hitsTaken":0,"score":83},{"playerType":"B","energy":11,"health":100,"hitsTaken":0,"score":64}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state9.json b/tests/state9.json new file mode 100644 index 0000000..686a011 --- /dev/null +++ b/tests/state9.json @@ -0,0 +1 @@ +{"gameDetails":{"round":9,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":36,"health":100,"hitsTaken":0,"score":100},{"playerType":"B","energy":22,"health":100,"hitsTaken":0,"score":75}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file -- cgit v1.2.3 From 4c0eed0ed7e7cc0fcec60624c0a0251a9e525fb1 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 15 May 2018 23:15:02 +0200 Subject: Rayon for threading --- Cargo.toml | 1 + src/lib.rs | 2 ++ src/strategy/monte_carlo.rs | 11 +++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 86a4b95..264b2a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ serde_json = "1.0.16" rand = "0.4.2" time = "0.1.4" +rayon = "1.0.1" [dev-dependencies] criterion = "0.2" diff --git a/src/lib.rs b/src/lib.rs index 728f747..6bcfc00 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,6 +7,8 @@ extern crate serde_derive; extern crate rand; extern crate time; +extern crate rayon; + pub mod json; pub mod engine; pub mod strategy; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 6f0f681..b7025c5 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -8,16 +8,19 @@ const MAX_MOVES: u16 = 400; use time::{Duration, PreciseTime}; +use rayon::prelude::*; + pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime, max_time: Duration) -> Command { println!("Using MONTE_CARLO strategy"); - let mut rng = thread_rng(); let mut command_scores = CommandScore::init_command_scores(settings, state); loop { - for mut score in &mut command_scores { - simulate_to_endstate(score, settings, state, &mut rng); - } + command_scores.par_iter_mut() + .for_each(|score| { + let mut rng = thread_rng(); + simulate_to_endstate(score, settings, state, &mut rng); + }); if start_time.to(PreciseTime::now()) > max_time { break; } -- cgit v1.2.3 From 27499d0f466e0405dba10f8f5b98533beead1c9e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 15 May 2018 23:15:36 +0200 Subject: Additional code and bug fixes to help end to end tests --- src/engine/geometry.rs | 14 ++++++++++++++ src/engine/mod.rs | 31 ++++++++++++++++++++++--------- src/json.rs | 4 ++-- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index a946bf9..23e0433 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -25,3 +25,17 @@ impl Point { } } } + +use std::cmp::Ord; +use std::cmp::Ordering; + +impl PartialOrd for Point { + fn partial_cmp(&self, other: &Point) -> Option { + Some(self.cmp(other)) + } +} +impl Ord for Point { + fn cmp(&self, other: &Point) -> Ordering { + self.x.cmp(&other.x).then(self.y.cmp(&other.y)) + } +} diff --git a/src/engine/mod.rs b/src/engine/mod.rs index f8a456f..6bc200c 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -9,7 +9,7 @@ use self::settings::{GameSettings, BuildingSettings}; use std::ops::Fn; use std::cmp; -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq)] pub struct GameState { pub status: GameStatus, pub player: Player, @@ -30,13 +30,13 @@ pub enum GameStatus { Draw } -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq)] pub struct Player { pub energy: u16, pub health: u16 } -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq)] pub struct Building { pub pos: Point, pub health: u16, @@ -48,7 +48,7 @@ pub struct Building { pub energy_generated_per_turn: u16 } -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq)] pub struct Missile { pub pos: Point, pub damage: u16, @@ -76,6 +76,19 @@ impl GameState { } } + /** + * Sorts the various arrays. Generally not necessary, but useful + * for tests that check equality between states. + */ + pub fn sort(&mut self) { + self.player_buildings.sort_by_key(|b| b.pos); + self.unoccupied_player_cells.sort(); + self.opponent_buildings.sort_by_key(|b| b.pos); + self.unoccupied_opponent_cells.sort(); + self.player_missiles.sort_by_key(|b| b.pos); + self.opponent_missiles.sort_by_key(|b| b.pos); + } + pub fn simulate(&self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameState { let mut state = self.clone(); state.simulate_mut(settings, player_command, opponent_command); @@ -87,9 +100,6 @@ impl GameState { return; } - GameState::perform_command(&mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); - GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); - GameState::update_construction(&mut self.player_buildings); GameState::update_construction(&mut self.opponent_buildings); @@ -106,6 +116,9 @@ impl GameState { GameState::add_energy(&mut self.player, settings, &self.player_buildings); GameState::add_energy(&mut self.opponent, settings, &self.opponent_buildings); + GameState::perform_command(&mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); + GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); + GameState::update_status(self); } @@ -161,7 +174,7 @@ impl GameState { }, Some(point) => { missile.pos = point; - for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point/* && b.health > 0*/) { //TODO surely this health>0 belongs? Not what the real game engine is doing unfortunately + for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point) { let damage = cmp::min(missile.damage, hit.health); hit.health -= damage; missile.speed = 0; @@ -187,7 +200,7 @@ impl GameState { fn add_energy(player: &mut Player, settings: &GameSettings, buildings: &Vec) { player.energy += settings.energy_income; - player.energy += buildings.iter().map(|b| b.energy_generated_per_turn).sum::(); + player.energy += buildings.iter().filter(|b| b.is_constructed()).map(|b| b.energy_generated_per_turn).sum::(); } fn update_status(state: &mut GameState) { diff --git a/src/json.rs b/src/json.rs index 4253a19..239a351 100644 --- a/src/json.rs +++ b/src/json.rs @@ -140,7 +140,7 @@ impl State { fn opponent(&self) -> &Player { self.players.iter() - .filter(|p| p.player_type != 'B') + .filter(|p| p.player_type == 'B') .next() .expect("Opponent character did not appear in state.json") } @@ -173,7 +173,7 @@ impl BuildingBlueprint { engine::settings::BuildingSettings { price: self.price, health: self.health, - construction_time: self.construction_time, + construction_time: self.construction_time-2, weapon_damage: self.weapon_damage, weapon_speed: self.weapon_speed, weapon_cooldown_period: self.weapon_cooldown_period, -- cgit v1.2.3 From 29fb64e557e40afc8d58ae34c65650da9ea3c511 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 15 May 2018 23:19:31 +0200 Subject: Moved perf intermediary files to target folder --- .gitignore | 3 ++- Makefile | 7 ++++--- src/bin/perf-test.rs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 44ba2ac..cadf2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ state.json Cargo.lock # These are backup files generated by rustfmt -**/*.rs.bk \ No newline at end of file +**/*.rs.bk +/perf.data diff --git a/Makefile b/Makefile index 5f2e069..a87c095 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,11 @@ test: profile: cargo build --release --features "benchmarking" + mkdir -p target/profile sudo perf record -F 1000 -a -g target/release/perf-test - sudo perf script > out.perf - ../FlameGraph/stackcollapse-perf.pl out.perf > out.folded - ../FlameGraph/flamegraph.pl out.folded > flamegraph.svg + sudo perf script > target/profile/out.perf + ../FlameGraph/stackcollapse-perf.pl target/profile/out.perf > target/profile/out.folded + ../FlameGraph/flamegraph.pl target/profile/out.folded > target/profile/flamegraph.svg clean: cargo clean diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 62c323c..835267e 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -7,7 +7,7 @@ use zombot::engine::command::Command; use std::error::Error; -const STATE_PATH: &str = "init_state.json"; +const STATE_PATH: &str = "tests/state0.json"; const COMMAND_PATH: &str = "command.txt"; -- cgit v1.2.3 From c6a7a3154b7ba59f3abc7581b35dd460023cc8f9 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 16 May 2018 00:01:27 +0200 Subject: Moved away from special benchmarking suite Just using normal monte carlo. More iterations -> better. --- .gitignore | 1 + Cargo.toml | 11 +-- Makefile | 7 +- benches/engine.rs | 164 -------------------------------------------- src/bin/perf-test.rs | 46 +++++-------- src/strategy/monte_carlo.rs | 24 +++++-- tests/bigstate.json | 1 + 7 files changed, 44 insertions(+), 210 deletions(-) delete mode 100644 benches/engine.rs create mode 100644 tests/bigstate.json diff --git a/.gitignore b/.gitignore index cadf2dd..93caa35 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk /perf.data +/perf.data.old diff --git a/Cargo.toml b/Cargo.toml index 264b2a9..92a7ad4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,16 +11,9 @@ rand = "0.4.2" time = "0.1.4" rayon = "1.0.1" -[dev-dependencies] -criterion = "0.2" -lazy_static = "1.0" - -[[bench]] -name = "engine" -harness = false - [profile.release] debug = true [features] -benchmarking = [] \ No newline at end of file +benchmarking = [] +single-threaded = [] diff --git a/Makefile b/Makefile index a87c095..6391c1f 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,11 @@ build: test: cargo test --release +bench: + cargo run --release --features "benchmarking" --bin perf-test + profile: - cargo build --release --features "benchmarking" + cargo build --release --features "benchmarking single-threaded" mkdir -p target/profile sudo perf record -F 1000 -a -g target/release/perf-test sudo perf script > target/profile/out.perf @@ -16,4 +19,4 @@ clean: cargo clean -.PHONY: build test profile clean +.PHONY: build test bench profile clean diff --git a/benches/engine.rs b/benches/engine.rs deleted file mode 100644 index 1f6c125..0000000 --- a/benches/engine.rs +++ /dev/null @@ -1,164 +0,0 @@ -#[macro_use] -extern crate criterion; -use criterion::Criterion; - -#[macro_use] -extern crate lazy_static; - -extern crate zombot; -use zombot::engine::{GameState, Player, GameStatus, Building, Missile}; -use zombot::engine::settings::{GameSettings, BuildingSettings}; -use zombot::engine::geometry::Point; -use zombot::engine::command::{Command, BuildingType}; - -extern crate rand; -use rand::{thread_rng, Rng}; - -fn create_example_state(settings: &GameSettings, - player_buildings: usize, opponent_buildings: usize, - player_missiles: usize, opponent_missiles: usize -) -> GameState { - GameState { - status: GameStatus::Continue, - player: Player { - energy: 30, - health: 100 - }, - opponent: Player { - energy: 30, - health: 100 - }, - player_buildings: (0..player_buildings).map(|_| create_player_building(settings)).collect(), - opponent_buildings: (0..opponent_buildings).map(|_| create_player_building(settings)).collect(), - player_missiles: (0..player_missiles).map(|_| create_missile(settings)).collect(), - opponent_missiles: (0..opponent_missiles).map(|_| create_missile(settings)).collect() - } -} - -fn create_example_settings() -> GameSettings { - GameSettings { - size: Point::new(10,10), - energy_income: 5, - energy: BuildingSettings { - price: 20, - health: 5, - construction_time: 1, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 3 - }, - defence: BuildingSettings { - price: 20, - health: 5, - construction_time: 1, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 3 - }, - attack: BuildingSettings { - price: 20, - health: 5, - construction_time: 1, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 3 - } - } -} - -fn create_player_building(settings: &GameSettings) -> Building { - let all_positions = (0..settings.size.y) - .flat_map(|y| (0..settings.size.x/2).map(|x| Point::new(x, y)).collect::>()) - .collect::>(); - let all_buildings = BuildingType::all(); - - let mut rng = thread_rng(); - let position = rng.choose(&all_positions).unwrap(); - let building = rng.choose(&all_buildings).unwrap(); - let blueprint = settings.building_settings(*building); - - Building::new(*position, blueprint) -} - -fn create_opponent_building(settings: &GameSettings) -> Building { - let all_positions = (0..settings.size.y) - .flat_map(|y| (settings.size.x/2..settings.size.x).map(|x| Point::new(x, y)).collect::>()) - .collect::>(); - let all_buildings = BuildingType::all(); - - let mut rng = thread_rng(); - let position = rng.choose(&all_positions).unwrap(); - let building = rng.choose(&all_buildings).unwrap(); - let blueprint = settings.building_settings(*building); - - Building::new(*position, blueprint) -} - -fn create_missile(settings: &GameSettings) -> Missile { - let all_positions = (0..settings.size.y) - .flat_map(|y| (settings.size.x/2..settings.size.x).map(|x| Point::new(x, y)).collect::>()) - .collect::>(); - let mut rng = thread_rng(); - let position = rng.choose(&all_positions).unwrap(); - - Missile { - pos: *position, - damage: 5, - speed: 1 - } -} - - -fn full_simulation_benchmark(c: &mut Criterion) { - let settings = create_example_settings(); - let state = create_example_state(&settings, 5, 5, 5, 5); - - let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); - let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); - c.bench_function("full simulation", move |b| b.iter(|| state.simulate(&settings, player_command, opponent_command))); -} - -fn full_simulation_benchmark_against_number_of_buildings(c: &mut Criterion) { - let settings = create_example_settings(); - - lazy_static! { - static ref STATES: Vec = { - let settings = create_example_settings(); - (0..10) - .map(|i| create_example_state(&settings, i*2, 0, 0, 0)) - .collect::>() - }; - } - - let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); - let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); - - c.bench_function_over_inputs("player buildings variable", move |b, &state_index| b.iter(|| STATES[state_index].simulate(&settings, player_command, opponent_command)), (0..STATES.len())); -} - -fn full_simulation_benchmark_against_number_of_missiles(c: &mut Criterion) { - let settings = create_example_settings(); - - lazy_static! { - static ref STATES: Vec = { - let settings = create_example_settings(); - (0..10) - .map(|i| create_example_state(&settings, 2, 5, i*2, i*2)) - .collect::>() - }; - } - - let player_command = Command::Build(Point::new(0,0),BuildingType::Defence); - let opponent_command = Command::Build(Point::new(4,4),BuildingType::Energy); - - c.bench_function_over_inputs("player missiles variable", move |b, &state_index| b.iter(|| STATES[state_index].simulate(&settings, player_command, opponent_command)), (0..STATES.len())); -} - -criterion_group!(benches, - full_simulation_benchmark, - full_simulation_benchmark_against_number_of_buildings, - full_simulation_benchmark_against_number_of_missiles); -criterion_main!(benches); diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 835267e..03da160 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -3,35 +3,20 @@ extern crate time; use time::{PreciseTime, Duration}; use zombot::*; -use zombot::engine::command::Command; - -use std::error::Error; const STATE_PATH: &str = "tests/state0.json"; +const STATE_BIG_PATH: &str = "tests/bigstate.json"; -const COMMAND_PATH: &str = "command.txt"; - -use std::fs::File; -use std::io::prelude::*; use std::process; -fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { - let max_time = Duration::milliseconds(1950); - strategy::monte_carlo::choose_move(settings, state, start_time, max_time) -} - - -fn write_command(filename: &str, command: Command) -> Result<(), Box > { - let mut file = File::create(filename)?; - write!(file, "{}", command)?; - Ok(()) +fn main() { + normal_state(); + big_state(); } - -fn main() { +fn normal_state() { + println!("Normal size state file"); let start_time = PreciseTime::now(); - - println!("Reading in state.json file"); let (settings, state) = match json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { @@ -39,15 +24,20 @@ fn main() { process::exit(1); } }; - let command = choose_move(&settings, &state, &start_time); + let max_time = Duration::milliseconds(1950); + strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); +} - match write_command(COMMAND_PATH, command) { - Ok(()) => {} +fn big_state() { + println!("Big state file"); + let start_time = PreciseTime::now(); + let (settings, state) = match json::read_state_from_file(STATE_BIG_PATH) { + Ok(ok) => ok, Err(error) => { - println!("Error while writing command file: {}", error); + println!("Error while parsing JSON file: {}", error); process::exit(1); } - } - - println!("Elapsed time: {}", start_time.to(PreciseTime::now())); + }; + let max_time = Duration::milliseconds(1950); + strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index b7025c5..fe0462f 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -8,19 +8,29 @@ const MAX_MOVES: u16 = 400; use time::{Duration, PreciseTime}; +#[cfg(not(feature = "single-threaded"))] use rayon::prelude::*; pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime, max_time: Duration) -> Command { - println!("Using MONTE_CARLO strategy"); - let mut command_scores = CommandScore::init_command_scores(settings, state); loop { - command_scores.par_iter_mut() - .for_each(|score| { - let mut rng = thread_rng(); - simulate_to_endstate(score, settings, state, &mut rng); - }); + #[cfg(feature = "single-threaded")] + { + command_scores.iter_mut() + .for_each(|score| { + let mut rng = thread_rng(); + simulate_to_endstate(score, settings, state, &mut rng); + }); + } + #[cfg(not(feature = "single-threaded"))] + { + command_scores.par_iter_mut() + .for_each(|score| { + let mut rng = thread_rng(); + simulate_to_endstate(score, settings, state, &mut rng); + }); + } if start_time.to(PreciseTime::now()) > max_time { break; } diff --git a/tests/bigstate.json b/tests/bigstate.json new file mode 100644 index 0000000..dd15670 --- /dev/null +++ b/tests/bigstate.json @@ -0,0 +1 @@ +{"gameDetails":{"round":0,"mapWidth":20,"mapHeight":10,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"}]]} -- cgit v1.2.3 From d5165efe843b7a1543f425087703266fd09501f4 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 16 May 2018 22:47:17 +0200 Subject: Changed types to assume health can't be more than the hundred in the first round --- src/engine/mod.rs | 8 ++++---- src/engine/settings.rs | 4 ++-- src/json.rs | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 6bc200c..b03eda1 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -33,15 +33,15 @@ pub enum GameStatus { #[derive(Debug, Clone, PartialEq)] pub struct Player { pub energy: u16, - pub health: u16 + pub health: u8 } #[derive(Debug, Clone, PartialEq)] pub struct Building { pub pos: Point, - pub health: u16, + pub health: u8, pub construction_time_left: u8, - pub weapon_damage: u16, + pub weapon_damage: u8, pub weapon_speed: u8, pub weapon_cooldown_time_left: u8, pub weapon_cooldown_period: u8, @@ -51,7 +51,7 @@ pub struct Building { #[derive(Debug, Clone, PartialEq)] pub struct Missile { pub pos: Point, - pub damage: u16, + pub damage: u8, pub speed: u8, } diff --git a/src/engine/settings.rs b/src/engine/settings.rs index b23d6bd..40256d9 100644 --- a/src/engine/settings.rs +++ b/src/engine/settings.rs @@ -13,9 +13,9 @@ pub struct GameSettings { #[derive(Debug)] pub struct BuildingSettings { pub price: u16, - pub health: u16, + pub health: u8, pub construction_time: u8, - pub weapon_damage: u16, + pub weapon_damage: u8, pub weapon_speed: u8, pub weapon_cooldown_period: u8, pub energy_generated_per_turn: u16 diff --git a/src/json.rs b/src/json.rs index 239a351..2eb2278 100644 --- a/src/json.rs +++ b/src/json.rs @@ -48,9 +48,9 @@ struct BuildingStats { #[serde(rename_all = "camelCase")] struct BuildingBlueprint { price: u16, - health: u16, + health: u8, construction_time: u8, - weapon_damage: u16, + weapon_damage: u8, weapon_speed: u8, weapon_cooldown_period: u8, energy_generated_per_turn: u16, @@ -63,7 +63,7 @@ struct BuildingBlueprint { struct Player { player_type: char, energy: u16, - health: u16, + health: u8, //hits_taken: u32, //score: u32 } @@ -81,10 +81,10 @@ struct GameCell { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct BuildingState { - health: u16, + health: u8, construction_time_left: i8, //price: u16, - weapon_damage: u16, + weapon_damage: u8, weapon_speed: u8, weapon_cooldown_time_left: u8, weapon_cooldown_period: u8, @@ -100,7 +100,7 @@ struct BuildingState { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct MissileState { - damage: u16, + damage: u8, speed: u8, x: u8, y: u8, -- cgit v1.2.3 From 484310110410f26dc0de538855c8a9c20f03d5bf Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 16 May 2018 23:31:36 +0200 Subject: Moved unconstructed buildings to their own list --- src/engine/mod.rs | 99 ++++++++++++++++++++++++++++++++++++++++++------------- src/json.rs | 29 ++++++++++++++-- 2 files changed, 103 insertions(+), 25 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index b03eda1..415a467 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -14,8 +14,10 @@ pub struct GameState { pub status: GameStatus, pub player: Player, pub opponent: Player, + pub player_unconstructed_buildings: Vec, pub player_buildings: Vec, pub unoccupied_player_cells: Vec, + pub opponent_unconstructed_buildings: Vec, pub opponent_buildings: Vec, pub unoccupied_opponent_cells: Vec, pub player_missiles: Vec, @@ -37,12 +39,22 @@ pub struct Player { } #[derive(Debug, Clone, PartialEq)] -pub struct Building { +pub struct UnconstructedBuilding { pub pos: Point, pub health: u8, pub construction_time_left: u8, pub weapon_damage: u8, pub weapon_speed: u8, + pub weapon_cooldown_period: u8, + pub energy_generated_per_turn: u16 +} + +#[derive(Debug, Clone, PartialEq)] +pub struct Building { + pub pos: Point, + pub health: u8, + pub weapon_damage: u8, + pub weapon_speed: u8, pub weapon_cooldown_time_left: u8, pub weapon_cooldown_period: u8, pub energy_generated_per_turn: u16 @@ -56,19 +68,27 @@ pub struct Missile { } impl GameState { - pub fn new(player: Player, opponent: Player, player_buildings: Vec, opponent_buildings: Vec, player_missiles: Vec, opponent_missiles: Vec, settings: &GameSettings) -> GameState { + pub fn new( + player: Player, opponent: Player, + player_unconstructed_buildings: Vec, player_buildings: Vec, + opponent_unconstructed_buildings: Vec, opponent_buildings: Vec, + player_missiles: Vec, opponent_missiles: Vec, + settings: &GameSettings) -> GameState { + let unoccupied_player_cells = GameState::unoccupied_cells( - &player_buildings, Point::new(0, 0), Point::new(settings.size.x/2, settings.size.y) + &player_buildings, &player_unconstructed_buildings, Point::new(0, 0), Point::new(settings.size.x/2, settings.size.y) ); let unoccupied_opponent_cells = GameState::unoccupied_cells( - &opponent_buildings, Point::new(settings.size.x/2, 0), Point::new(settings.size.x, settings.size.y) + &opponent_buildings, &opponent_unconstructed_buildings, Point::new(settings.size.x/2, 0), Point::new(settings.size.x, settings.size.y) ); GameState { status: GameStatus::Continue, player: player, opponent: opponent, + player_unconstructed_buildings: player_unconstructed_buildings, player_buildings: player_buildings, unoccupied_player_cells: unoccupied_player_cells, + opponent_unconstructed_buildings: opponent_unconstructed_buildings, opponent_buildings: opponent_buildings, unoccupied_opponent_cells: unoccupied_opponent_cells, player_missiles: player_missiles, @@ -81,8 +101,10 @@ impl GameState { * for tests that check equality between states. */ pub fn sort(&mut self) { + self.player_unconstructed_buildings.sort_by_key(|b| b.pos); self.player_buildings.sort_by_key(|b| b.pos); self.unoccupied_player_cells.sort(); + self.opponent_unconstructed_buildings.sort_by_key(|b| b.pos); self.opponent_buildings.sort_by_key(|b| b.pos); self.unoccupied_opponent_cells.sort(); self.player_missiles.sort_by_key(|b| b.pos); @@ -100,8 +122,8 @@ impl GameState { return; } - GameState::update_construction(&mut self.player_buildings); - GameState::update_construction(&mut self.opponent_buildings); + GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings); + GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings); GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); @@ -116,13 +138,13 @@ impl GameState { GameState::add_energy(&mut self.player, settings, &self.player_buildings); GameState::add_energy(&mut self.opponent, settings, &self.opponent_buildings); - GameState::perform_command(&mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); - GameState::perform_command(&mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); + GameState::perform_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); + GameState::perform_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); GameState::update_status(self); } - fn perform_command(buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { + fn perform_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { match command { Command::Nothing => { }, Command::Build(p, b) => { @@ -135,16 +157,24 @@ impl GameState { debug_assert!(player.energy >= blueprint.price); player.energy -= blueprint.price; - buildings.push(Building::new(p, blueprint)); + if blueprint.construction_time > 0 { + unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); + } else { + buildings.push(Building::new(p, blueprint)); + } unoccupied_cells.retain(|&pos| pos != p); }, } } - fn update_construction(buildings: &mut Vec) { - for building in buildings.iter_mut().filter(|b| !b.is_constructed()) { + fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec) { + for building in unconstructed_buildings.iter_mut() { building.construction_time_left -= 1; + if building.is_constructed() { + buildings.push(building.to_building()); + } } + unconstructed_buildings.retain(|b| !b.is_constructed()); } fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { @@ -174,7 +204,7 @@ impl GameState { }, Some(point) => { missile.pos = point; - for hit in opponent_buildings.iter_mut().filter(|b| b.is_constructed() && b.pos == point) { + for hit in opponent_buildings.iter_mut().filter(|b| b.pos == point) { let damage = cmp::min(missile.damage, hit.health); hit.health -= damage; missile.speed = 0; @@ -200,7 +230,7 @@ impl GameState { fn add_energy(player: &mut Player, settings: &GameSettings, buildings: &Vec) { player.energy += settings.energy_income; - player.energy += buildings.iter().filter(|b| b.is_constructed()).map(|b| b.energy_generated_per_turn).sum::(); + player.energy += buildings.iter().map(|b| b.energy_generated_per_turn).sum::(); } fn update_status(state: &mut GameState) { @@ -218,12 +248,12 @@ impl GameState { self.unoccupied_player_cells.iter().filter(|p| p.y == y).cloned().collect() } - fn unoccupied_cells(buildings: &[Building], bl: Point, tr: Point) -> Vec { + fn unoccupied_cells(buildings: &[Building], unconstructed_buildings: &[UnconstructedBuilding], bl: Point, tr: Point) -> Vec { let mut result = Vec::with_capacity((tr.y-bl.y) as usize * (tr.x-bl.x) as usize); for y in bl.y..tr.y { for x in bl.x..tr.x { let pos = Point::new(x, y); - if !buildings.iter().any(|b| b.pos == pos) { + if !buildings.iter().any(|b| b.pos == pos) && !unconstructed_buildings.iter().any(|b| b.pos == pos) { result.push(pos); } } @@ -272,26 +302,51 @@ impl Player { } -impl Building { - pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { - Building { +impl UnconstructedBuilding { + pub fn new(pos: Point, blueprint: &BuildingSettings) -> UnconstructedBuilding { + UnconstructedBuilding { pos: pos, health: blueprint.health, construction_time_left: blueprint.construction_time, weapon_damage: blueprint.weapon_damage, weapon_speed: blueprint.weapon_speed, - weapon_cooldown_time_left: 0, weapon_cooldown_period: blueprint.weapon_cooldown_period, energy_generated_per_turn: blueprint.energy_generated_per_turn } } - + fn is_constructed(&self) -> bool { self.construction_time_left == 0 } + fn to_building(&self) -> Building { + Building { + pos: self.pos, + health: self.health, + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn + } + } +} + +impl Building { + pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { + Building { + pos: pos, + health: blueprint.health, + weapon_damage: blueprint.weapon_damage, + weapon_speed: blueprint.weapon_speed, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: blueprint.weapon_cooldown_period, + energy_generated_per_turn: blueprint.energy_generated_per_turn + } + } + fn is_shooty(&self) -> bool { - self.is_constructed() && self.weapon_damage > 0 + self.weapon_damage > 0 } } diff --git a/src/json.rs b/src/json.rs index 2eb2278..5dc65f6 100644 --- a/src/json.rs +++ b/src/json.rs @@ -2,7 +2,6 @@ use std::fs::File; use std::io::prelude::*; use serde_json; use std::error::Error; -use std::cmp; use ::engine; @@ -123,7 +122,9 @@ impl State { engine::GameState::new( self.player().to_engine(), self.opponent().to_engine(), + self.unconstructed_buildings_to_engine('A'), self.buildings_to_engine('A'), + self.unconstructed_buildings_to_engine('B'), self.buildings_to_engine('B'), self.missiles_to_engine('A'), self.missiles_to_engine('B'), @@ -145,11 +146,22 @@ impl State { .expect("Opponent character did not appear in state.json") } + fn unconstructed_buildings_to_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.buildings.iter() + .filter(|b| b.player_type == player_type && b.construction_time_left > 0) + .map(|b| b.to_engine_unconstructed()) + ) + ) + .collect() + } + fn buildings_to_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type) + .filter(|b| b.player_type == player_type && b.construction_time_left <= 0) .map(|b| b.to_engine()) ) ) @@ -196,7 +208,6 @@ impl BuildingState { engine::Building { pos: engine::geometry::Point::new(self.x, self.y), health: self.health, - construction_time_left: cmp::max(0, self.construction_time_left) as u8, weapon_damage: self.weapon_damage, weapon_speed: self.weapon_speed, weapon_cooldown_time_left: self.weapon_cooldown_time_left, @@ -204,6 +215,18 @@ impl BuildingState { energy_generated_per_turn: self.energy_generated_per_turn, } } + + fn to_engine_unconstructed(&self) -> engine::UnconstructedBuilding { + engine::UnconstructedBuilding { + pos: engine::geometry::Point::new(self.x, self.y), + health: self.health, + construction_time_left: self.construction_time_left as u8, // > 0 check already happened + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn, + } + } } impl MissileState { -- cgit v1.2.3 From 8c611df4d8bc412588b25ca09577827cc32971e9 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 16 May 2018 23:45:36 +0200 Subject: Tracked energy production on the player This cuts out an iteration over the buildings each turn. --- src/engine/mod.rs | 32 ++++++++++++++++++++++---------- src/json.rs | 17 ++++++++--------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 415a467..227a7f6 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -35,7 +35,8 @@ pub enum GameStatus { #[derive(Debug, Clone, PartialEq)] pub struct Player { pub energy: u16, - pub health: u8 + pub health: u8, + pub energy_generated: u16, } #[derive(Debug, Clone, PartialEq)] @@ -122,8 +123,8 @@ impl GameState { return; } - GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings); - GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings); + GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); + GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); @@ -135,8 +136,8 @@ impl GameState { &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells); - GameState::add_energy(&mut self.player, settings, &self.player_buildings); - GameState::add_energy(&mut self.opponent, settings, &self.opponent_buildings); + GameState::add_energy(&mut self.player); + GameState::add_energy(&mut self.opponent); GameState::perform_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); GameState::perform_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); @@ -160,17 +161,20 @@ impl GameState { if blueprint.construction_time > 0 { unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); } else { - buildings.push(Building::new(p, blueprint)); + let building = Building::new(p, blueprint); + player.energy_generated += building.energy_generated_per_turn; + buildings.push(building); } unoccupied_cells.retain(|&pos| pos != p); }, } } - fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec) { + fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player) { for building in unconstructed_buildings.iter_mut() { building.construction_time_left -= 1; if building.is_constructed() { + player.energy_generated += building.energy_generated_per_turn; buildings.push(building.to_building()); } } @@ -224,13 +228,13 @@ impl GameState { for b in opponent_buildings.iter().filter(|b| b.health == 0) { unoccupied_cells.push(b.pos); + opponent.energy_generated -= b.energy_generated_per_turn; } opponent_buildings.retain(|b| b.health > 0); } - fn add_energy(player: &mut Player, settings: &GameSettings, buildings: &Vec) { - player.energy += settings.energy_income; - player.energy += buildings.iter().map(|b| b.energy_generated_per_turn).sum::(); + fn add_energy(player: &mut Player) { + player.energy += player.energy_generated; } fn update_status(state: &mut GameState) { @@ -284,6 +288,14 @@ impl GameStatus { } impl Player { + pub fn new(energy: u16, health: u8, settings: &GameSettings, buildings: &[Building]) -> Player { + Player { + energy: energy, + health: health, + energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() + } + } + pub fn can_afford_all_buildings(&self, settings: &GameSettings) -> bool { self.can_afford_attack_buildings(settings) && self.can_afford_defence_buildings(settings) && diff --git a/src/json.rs b/src/json.rs index 5dc65f6..02dbe1b 100644 --- a/src/json.rs +++ b/src/json.rs @@ -119,13 +119,15 @@ impl State { } fn to_engine(&self, settings: &engine::settings::GameSettings) -> engine::GameState { + let player_buildings = self.buildings_to_engine('A'); + let opponent_buildings = self.buildings_to_engine('B'); engine::GameState::new( - self.player().to_engine(), - self.opponent().to_engine(), + self.player().to_engine(settings, &player_buildings), + self.opponent().to_engine(settings, &opponent_buildings), self.unconstructed_buildings_to_engine('A'), - self.buildings_to_engine('A'), + player_buildings, self.unconstructed_buildings_to_engine('B'), - self.buildings_to_engine('B'), + opponent_buildings, self.missiles_to_engine('A'), self.missiles_to_engine('B'), settings @@ -195,11 +197,8 @@ impl BuildingBlueprint { } impl Player { - fn to_engine(&self) -> engine::Player { - engine::Player { - energy: self.energy, - health: self.health, - } + fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[engine::Building]) -> engine::Player { + engine::Player::new(self.energy, self.health, settings, buildings) } } -- cgit v1.2.3 From ac2951451cc1fc26b6d8a7a0aa1267535b36b3d1 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 17 May 2018 00:01:52 +0200 Subject: Improved perf of removing item from unoccupied cells list --- src/engine/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 227a7f6..6626c0d 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -165,7 +165,9 @@ impl GameState { player.energy_generated += building.energy_generated_per_turn; buildings.push(building); } - unoccupied_cells.retain(|&pos| pos != p); + + let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); + unoccupied_cells.swap_remove(to_remove_index); }, } } -- cgit v1.2.3 From 0f8c247f24c110e542862f8c6e96662ca94c5dae Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 19 May 2018 13:08:03 +0200 Subject: Removed dependency on OS randomness for seeding I'm convinced that the cloud servers they're running on will be out of entropy, especially towards the end of the tournament. Rather have a less random initial seed than take that blocking performance hit. --- src/strategy/monte_carlo.rs | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index fe0462f..df84cb7 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -3,7 +3,8 @@ use engine::command::*; use engine::geometry::*; use engine::{GameState, GameStatus}; -use rand::{thread_rng, Rng}; +use rand::{Rng, XorShiftRng, SeedableRng}; + const MAX_MOVES: u16 = 400; use time::{Duration, PreciseTime}; @@ -13,13 +14,13 @@ use rayon::prelude::*; pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(settings, state); - + loop { #[cfg(feature = "single-threaded")] { command_scores.iter_mut() .for_each(|score| { - let mut rng = thread_rng(); + let mut rng = XorShiftRng::from_seed(score.next_seed); simulate_to_endstate(score, settings, state, &mut rng); }); } @@ -27,7 +28,7 @@ pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &Prec { command_scores.par_iter_mut() .for_each(|score| { - let mut rng = thread_rng(); + let mut rng = XorShiftRng::from_seed(score.next_seed); simulate_to_endstate(score, settings, state, &mut rng); }); } @@ -64,11 +65,12 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam state_mut.simulate_mut(settings, player_command, opponent_command); } + let next_seed = [rng.next_u32(), rng.next_u32(), rng.next_u32(), rng.next_u32()]; match state_mut.status { - GameStatus::PlayerWon => command_score.add_victory(), - GameStatus::OpponentWon => command_score.add_defeat(), - GameStatus::Continue => command_score.add_stalemate(), - GameStatus::Draw => command_score.add_draw() + GameStatus::PlayerWon => command_score.add_victory(next_seed), + GameStatus::OpponentWon => command_score.add_defeat(next_seed), + GameStatus::Continue => command_score.add_stalemate(next_seed), + GameStatus::Draw => command_score.add_draw(next_seed) } } @@ -103,7 +105,8 @@ struct CommandScore { defeats: u32, draws: u32, stalemates: u32, - attempts: u32 + attempts: u32, + next_seed: [u32; 4] } impl CommandScore { @@ -114,28 +117,33 @@ impl CommandScore { defeats: 0, draws: 0, stalemates: 0, - attempts: 0 + attempts: 0, + next_seed: [0x7b6ae1f4, 0x413ce90f, 0x67816799, 0x770a6bda] } } - fn add_victory(&mut self) { + fn add_victory(&mut self, next_seed: [u32; 4]) { self.victories += 1; self.attempts += 1; + self.next_seed = next_seed; } - fn add_defeat(&mut self) { + fn add_defeat(&mut self, next_seed: [u32; 4]) { self.defeats += 1; self.attempts += 1; + self.next_seed = next_seed; } - fn add_draw(&mut self) { + fn add_draw(&mut self, next_seed: [u32; 4]) { self.draws += 1; self.attempts += 1; + self.next_seed = next_seed; } - fn add_stalemate(&mut self) { + fn add_stalemate(&mut self, next_seed: [u32; 4]) { self.stalemates += 1; self.attempts += 1; + self.next_seed = next_seed; } fn win_ratio(&self) -> u32 { -- cgit v1.2.3 From 693d503953e2199cc9a64beda21e4f1d9db9a26e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 19 May 2018 13:14:30 +0200 Subject: Inlined unnecessary map --- src/strategy/monte_carlo.rs | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index df84cb7..ab13d87 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -151,23 +151,17 @@ impl CommandScore { } fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { - enumerate_player_commands(settings, state).iter() - .map(|&c| CommandScore::new(c)) - .collect() - } -} - -fn enumerate_player_commands(settings: &GameSettings, state: &GameState) -> Vec { - let all_buildings = state.player_affordable_buildings(settings); + let all_buildings = state.player_affordable_buildings(settings); - let mut commands = Vec::with_capacity(state.unoccupied_player_cells.len()*all_buildings.len()+1); - commands.push(Command::Nothing); + let mut commands = Vec::with_capacity(state.unoccupied_player_cells.len()*all_buildings.len()+1); + commands.push(CommandScore::new(Command::Nothing)); - for &position in &state.unoccupied_player_cells { - for &building in &all_buildings { - commands.push(Command::Build(position, building)); + for &position in &state.unoccupied_player_cells { + for &building in &all_buildings { + commands.push(CommandScore::new(Command::Build(position, building))); + } } - } - commands + commands + } } -- cgit v1.2.3 From 7b95465d47af0c1e74f1d2e4c76fdb7a9b6e960c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 31 May 2018 21:00:22 +0200 Subject: Clippy suggested changes --- src/engine/command.rs | 6 +++--- src/engine/geometry.rs | 2 +- src/engine/mod.rs | 23 +++++++++-------------- src/json.rs | 6 ++---- src/strategy/monte_carlo.rs | 6 +++--- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/engine/command.rs b/src/engine/command.rs index c2edb81..17dbd5a 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -9,9 +9,9 @@ pub enum Command { impl fmt::Display for Command { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - &Command::Nothing => write!(f, ""), - &Command::Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), + match *self { + Command::Nothing => write!(f, ""), + Command::Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), } } } diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 23e0433..bd0ae25 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -10,7 +10,7 @@ impl Point { } pub fn move_left(&self) -> Option { self.x.checked_sub(1).map(|x| Point { - x: x, + x, ..*self }) } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 6626c0d..e9cafa4 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -84,16 +84,10 @@ impl GameState { ); GameState { status: GameStatus::Continue, - player: player, - opponent: opponent, - player_unconstructed_buildings: player_unconstructed_buildings, - player_buildings: player_buildings, - unoccupied_player_cells: unoccupied_player_cells, - opponent_unconstructed_buildings: opponent_unconstructed_buildings, - opponent_buildings: opponent_buildings, - unoccupied_opponent_cells: unoccupied_opponent_cells, - player_missiles: player_missiles, - opponent_missiles: opponent_missiles + player, opponent, + player_unconstructed_buildings, player_buildings, unoccupied_player_cells, + opponent_unconstructed_buildings, opponent_buildings, unoccupied_opponent_cells, + player_missiles, opponent_missiles } } @@ -210,6 +204,7 @@ impl GameState { }, Some(point) => { missile.pos = point; + // TODO latest game engine may be checking building health here for hit in opponent_buildings.iter_mut().filter(|b| b.pos == point) { let damage = cmp::min(missile.damage, hit.health); hit.health -= damage; @@ -292,8 +287,8 @@ impl GameStatus { impl Player { pub fn new(energy: u16, health: u8, settings: &GameSettings, buildings: &[Building]) -> Player { Player { - energy: energy, - health: health, + energy, + health, energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() } } @@ -319,7 +314,7 @@ impl Player { impl UnconstructedBuilding { pub fn new(pos: Point, blueprint: &BuildingSettings) -> UnconstructedBuilding { UnconstructedBuilding { - pos: pos, + pos, health: blueprint.health, construction_time_left: blueprint.construction_time, weapon_damage: blueprint.weapon_damage, @@ -349,7 +344,7 @@ impl UnconstructedBuilding { impl Building { pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { Building { - pos: pos, + pos, health: blueprint.health, weapon_damage: blueprint.weapon_damage, weapon_speed: blueprint.weapon_speed, diff --git a/src/json.rs b/src/json.rs index 02dbe1b..5830bd9 100644 --- a/src/json.rs +++ b/src/json.rs @@ -136,15 +136,13 @@ impl State { fn player(&self) -> &Player { self.players.iter() - .filter(|p| p.player_type == 'A') - .next() + .find(|p| p.player_type == 'A') .expect("Player character did not appear in state.json") } fn opponent(&self) -> &Player { self.players.iter() - .filter(|p| p.player_type == 'B') - .next() + .find(|p| p.player_type == 'B') .expect("Opponent character did not appear in state.json") } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index ab13d87..cd4dc35 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -46,7 +46,7 @@ pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &Prec } match command { - Some(ref command) => command.command, + Some(command) => command.command, _ => Command::Nothing } } @@ -112,13 +112,13 @@ struct CommandScore { impl CommandScore { fn new(command: Command) -> CommandScore { CommandScore { - command: command, + command, victories: 0, defeats: 0, draws: 0, stalemates: 0, attempts: 0, - next_seed: [0x7b6ae1f4, 0x413ce90f, 0x67816799, 0x770a6bda] + next_seed: [0x7b6a_e1f4, 0x413c_e90f, 0x6781_6799, 0x770a_6bda] } } -- cgit v1.2.3 From a2207673af2da6121544aecd2d5370e98926041e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 31 May 2018 21:25:14 +0200 Subject: Change to finding affordable buildings to avoid a resize --- src/engine/mod.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index e9cafa4..75583e3 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -271,10 +271,13 @@ impl GameState { } fn affordable_buildings(energy: u16, settings: &GameSettings) -> Vec { - BuildingType::all().iter() - .filter(|&b| settings.building_settings(*b).price <= energy) - .cloned() - .collect() + let mut result = Vec::with_capacity(3); + for b in BuildingType::all().iter() { + if settings.building_settings(*b).price <= energy { + result.push(*b); + } + } + result } } -- cgit v1.2.3 From b26fc5909197094acb6ef85f3d1f17eb13e11f4a Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 31 May 2018 21:59:21 +0200 Subject: Profile driven optimization of missile moving --- src/engine/mod.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 75583e3..2ad9a73 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -205,7 +205,7 @@ impl GameState { Some(point) => { missile.pos = point; // TODO latest game engine may be checking building health here - for hit in opponent_buildings.iter_mut().filter(|b| b.pos == point) { + if let Some(mut hit) = opponent_buildings.iter_mut().find(|b| b.pos == point) { let damage = cmp::min(missile.damage, hit.health); hit.health -= damage; missile.speed = 0; @@ -213,12 +213,9 @@ impl GameState { } } - /* - check is necessary if speed could be > 1, which isn't the case yet if missile.speed == 0 { break; } - */ } } missiles.retain(|m| m.speed > 0); -- cgit v1.2.3 From d41a080a2c9de8d9cb46c5b9ef91270d2981a4a3 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 31 May 2018 22:43:05 +0200 Subject: Tweaking move missiles to be more efficient --- src/engine/geometry.rs | 7 ++++++ src/engine/mod.rs | 58 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index bd0ae25..44ce9fe 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -24,6 +24,13 @@ impl Point { }) } } + + pub fn wrapping_move_left(&mut self) { + self.x = self.x.wrapping_sub(1); + } + pub fn wrapping_move_right(&mut self) { + self.x = self.x.wrapping_add(1); + } } use std::cmp::Ord; diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 2ad9a73..13cb596 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -6,7 +6,7 @@ use self::command::{Command, BuildingType}; use self::geometry::Point; use self::settings::{GameSettings, BuildingSettings}; -use std::ops::Fn; +use std::ops::FnMut; use std::cmp; #[derive(Debug, Clone, PartialEq)] @@ -123,12 +123,14 @@ impl GameState { GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); - GameState::move_missiles(&mut self.player_missiles, |p| p.move_right(&settings.size), + GameState::move_missiles(&mut self.player_missiles, |p| p.wrapping_move_right(), &mut self.opponent_buildings, &mut self.opponent, - &mut self.unoccupied_opponent_cells); - GameState::move_missiles(&mut self.opponent_missiles, |p| p.move_left(), + &mut self.unoccupied_opponent_cells, + &settings); + GameState::move_missiles(&mut self.opponent_missiles, |p| p.wrapping_move_left(), &mut self.player_buildings, &mut self.player, - &mut self.unoccupied_player_cells); + &mut self.unoccupied_player_cells, + &settings); GameState::add_energy(&mut self.player); GameState::add_energy(&mut self.opponent); @@ -192,39 +194,37 @@ impl GameState { } } - fn move_missiles(missiles: &mut Vec, move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec,) - where F: Fn(Point) -> Option { + fn move_missiles(missiles: &mut Vec, mut wrapping_move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings) + where F: FnMut(&mut Point) { for missile in missiles.iter_mut() { for _ in 0..missile.speed { - match move_fn(missile.pos) { - None => { - let damage = cmp::min(missile.damage, opponent.health); - opponent.health -= damage; + wrapping_move_fn(&mut missile.pos); + if missile.pos.x >= settings.size.x { + let damage = cmp::min(missile.damage, opponent.health); + opponent.health -= damage; + missile.speed = 0; + } + else { + // TODO latest game engine may be checking building health here + if let Some(mut hit) = opponent_buildings.iter_mut().find(|b| b.pos == missile.pos) { + let damage = cmp::min(missile.damage, hit.health); + hit.health -= damage; missile.speed = 0; - }, - Some(point) => { - missile.pos = point; - // TODO latest game engine may be checking building health here - if let Some(mut hit) = opponent_buildings.iter_mut().find(|b| b.pos == point) { - let damage = cmp::min(missile.damage, hit.health); - hit.health -= damage; - missile.speed = 0; - } } } - + if missile.speed == 0 { break; } } } - missiles.retain(|m| m.speed > 0); + swap_retain(missiles, |m| m.speed > 0); for b in opponent_buildings.iter().filter(|b| b.health == 0) { unoccupied_cells.push(b.pos); opponent.energy_generated -= b.energy_generated_per_turn; } - opponent_buildings.retain(|b| b.health > 0); + swap_retain(opponent_buildings, |b| b.health > 0); } fn add_energy(player: &mut Player) { @@ -360,3 +360,15 @@ impl Building { } +fn swap_retain(v: &mut Vec, mut pred: F) + where F: FnMut(&T) -> bool +{ + let mut new_len = v.len(); + for i in (0..v.len()).rev() { + if !pred(&v[i]) { + new_len -= 1; + v.swap(i, new_len); + } + } + v.truncate(new_len); +} -- cgit v1.2.3 From 58753f08d5b12670625184c81f95122f356c6f9b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 31 May 2018 22:53:19 +0200 Subject: Tighter loop for removing destroyed buildings --- src/engine/mod.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 13cb596..bd8922f 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -205,11 +205,19 @@ impl GameState { missile.speed = 0; } else { - // TODO latest game engine may be checking building health here - if let Some(mut hit) = opponent_buildings.iter_mut().find(|b| b.pos == missile.pos) { - let damage = cmp::min(missile.damage, hit.health); - hit.health -= damage; - missile.speed = 0; + for b in 0..opponent_buildings.len() { + // TODO latest game engine may be checking building health here + if opponent_buildings[b].pos == missile.pos { + let damage = cmp::min(missile.damage, opponent_buildings[b].health); + opponent_buildings[b].health -= damage; + missile.speed = 0; + if opponent_buildings[b].health == 0 { + unoccupied_cells.push(opponent_buildings[b].pos); + opponent.energy_generated -= opponent_buildings[b].energy_generated_per_turn; + opponent_buildings.swap_remove(b); + break; + } + } } } @@ -219,12 +227,6 @@ impl GameState { } } swap_retain(missiles, |m| m.speed > 0); - - for b in opponent_buildings.iter().filter(|b| b.health == 0) { - unoccupied_cells.push(b.pos); - opponent.energy_generated -= b.energy_generated_per_turn; - } - swap_retain(opponent_buildings, |b| b.health > 0); } fn add_energy(player: &mut Player) { -- cgit v1.2.3 From aaa7b679a1b4ca48cc443cb4de921fff8800cc33 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 31 May 2018 23:04:00 +0200 Subject: Made move_missiles even tighter on iterating and cleaning up --- src/engine/mod.rs | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index bd8922f..064aac2 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -196,37 +196,38 @@ impl GameState { fn move_missiles(missiles: &mut Vec, mut wrapping_move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings) where F: FnMut(&mut Point) { - for missile in missiles.iter_mut() { - for _ in 0..missile.speed { - wrapping_move_fn(&mut missile.pos); - if missile.pos.x >= settings.size.x { - let damage = cmp::min(missile.damage, opponent.health); + let mut missiles_len = missiles.len(); + 'missile_loop: for m in (0..missiles.len()).rev() { + //for _ in 0..missiles[m].speed { // only speed of 1 in round 1 + wrapping_move_fn(&mut missiles[m].pos); + if missiles[m].pos.x >= settings.size.x { + let damage = cmp::min(missiles[m].damage, opponent.health); opponent.health -= damage; - missile.speed = 0; + missiles_len -= 1; + missiles.swap(m, missiles_len); + continue 'missile_loop; } else { for b in 0..opponent_buildings.len() { // TODO latest game engine may be checking building health here - if opponent_buildings[b].pos == missile.pos { - let damage = cmp::min(missile.damage, opponent_buildings[b].health); + if opponent_buildings[b].pos == missiles[m].pos { + let damage = cmp::min(missiles[m].damage, opponent_buildings[b].health); opponent_buildings[b].health -= damage; - missile.speed = 0; + missiles_len -= 1; + missiles.swap(m, missiles_len); + if opponent_buildings[b].health == 0 { unoccupied_cells.push(opponent_buildings[b].pos); opponent.energy_generated -= opponent_buildings[b].energy_generated_per_turn; opponent_buildings.swap_remove(b); - break; } + continue 'missile_loop; } } } - - if missile.speed == 0 { - break; - } - } + //} } - swap_retain(missiles, |m| m.speed > 0); + missiles.truncate(missiles_len); } fn add_energy(player: &mut Player) { @@ -361,16 +362,3 @@ impl Building { } } - -fn swap_retain(v: &mut Vec, mut pred: F) - where F: FnMut(&T) -> bool -{ - let mut new_len = v.len(); - for i in (0..v.len()).rev() { - if !pred(&v[i]) { - new_len -= 1; - v.swap(i, new_len); - } - } - v.truncate(new_len); -} -- cgit v1.2.3 From a81a55fd129b947c347284e271d4c6b214c51068 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Fri, 1 Jun 2018 23:36:08 +0200 Subject: Put multispeed missiles back in --- src/engine/mod.rs | 4 ++-- src/json.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 064aac2..beb6fb4 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -198,7 +198,7 @@ impl GameState { where F: FnMut(&mut Point) { let mut missiles_len = missiles.len(); 'missile_loop: for m in (0..missiles.len()).rev() { - //for _ in 0..missiles[m].speed { // only speed of 1 in round 1 + for _ in 0..missiles[m].speed { wrapping_move_fn(&mut missiles[m].pos); if missiles[m].pos.x >= settings.size.x { let damage = cmp::min(missiles[m].damage, opponent.health); @@ -225,7 +225,7 @@ impl GameState { } } } - //} + } } missiles.truncate(missiles_len); } diff --git a/src/json.rs b/src/json.rs index 5830bd9..a8eb012 100644 --- a/src/json.rs +++ b/src/json.rs @@ -28,7 +28,8 @@ struct State { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct GameDetails { - //round: u32, + //round: u16, + //max_rounds: u16, map_width: u8, map_height: u8, round_income_energy: u16, -- cgit v1.2.3 From bb208dfdebb7dead0e7d68e837c37972498c22d5 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 2 Jun 2018 13:09:13 +0200 Subject: Moved replay-based test to have convenience import from game engine replay --- import-replay.sh | 21 +++++++ src/engine/command.rs | 7 +++ src/strategy/monte_carlo.rs | 4 +- tests/after_112/Round 000/OpponentCommand.txt | 1 + tests/after_112/Round 000/PlayerCommand.txt | 1 + tests/after_112/Round 001/OpponentCommand.txt | 1 + tests/after_112/Round 001/PlayerCommand.txt | 1 + tests/after_112/Round 002/OpponentCommand.txt | 1 + tests/after_112/Round 002/PlayerCommand.txt | 1 + tests/after_112/Round 003/OpponentCommand.txt | 1 + tests/after_112/Round 003/PlayerCommand.txt | 1 + tests/after_112/Round 004/OpponentCommand.txt | 1 + tests/after_112/Round 004/PlayerCommand.txt | 1 + tests/after_112/Round 005/OpponentCommand.txt | 1 + tests/after_112/Round 005/PlayerCommand.txt | 1 + tests/after_112/Round 006/OpponentCommand.txt | 1 + tests/after_112/Round 006/PlayerCommand.txt | 1 + tests/after_112/Round 007/OpponentCommand.txt | 1 + tests/after_112/Round 007/PlayerCommand.txt | 1 + tests/after_112/Round 008/OpponentCommand.txt | 1 + tests/after_112/Round 008/PlayerCommand.txt | 1 + tests/after_112/Round 009/OpponentCommand.txt | 1 + tests/after_112/Round 009/PlayerCommand.txt | 1 + tests/after_112/Round 010/OpponentCommand.txt | 1 + tests/after_112/Round 010/PlayerCommand.txt | 1 + tests/after_112/Round 011/OpponentCommand.txt | 1 + tests/after_112/Round 011/PlayerCommand.txt | 1 + tests/after_112/Round 012/OpponentCommand.txt | 1 + tests/after_112/Round 012/PlayerCommand.txt | 1 + tests/after_112/Round 013/OpponentCommand.txt | 1 + tests/after_112/Round 013/PlayerCommand.txt | 1 + tests/after_112/Round 014/OpponentCommand.txt | 1 + tests/after_112/Round 014/PlayerCommand.txt | 1 + tests/after_112/Round 015/OpponentCommand.txt | 1 + tests/after_112/Round 015/PlayerCommand.txt | 1 + tests/after_112/Round 016/OpponentCommand.txt | 1 + tests/after_112/Round 016/PlayerCommand.txt | 1 + tests/after_112/Round 017/OpponentCommand.txt | 1 + tests/after_112/Round 017/PlayerCommand.txt | 1 + tests/after_112/Round 018/OpponentCommand.txt | 1 + tests/after_112/Round 018/PlayerCommand.txt | 1 + tests/after_112/Round 019/OpponentCommand.txt | 1 + tests/after_112/Round 019/PlayerCommand.txt | 1 + tests/after_112/Round 020/OpponentCommand.txt | 1 + tests/after_112/Round 020/PlayerCommand.txt | 1 + tests/after_112/Round 021/OpponentCommand.txt | 1 + tests/after_112/Round 021/PlayerCommand.txt | 1 + tests/after_112/Round 022/OpponentCommand.txt | 1 + tests/after_112/Round 022/PlayerCommand.txt | 1 + tests/after_112/Round 023/OpponentCommand.txt | 1 + tests/after_112/Round 023/PlayerCommand.txt | 1 + tests/after_112/Round 024/OpponentCommand.txt | 1 + tests/after_112/Round 024/PlayerCommand.txt | 1 + tests/after_112/Round 025/OpponentCommand.txt | 1 + tests/after_112/Round 025/PlayerCommand.txt | 1 + tests/after_112/Round 026/OpponentCommand.txt | 1 + tests/after_112/Round 026/PlayerCommand.txt | 1 + tests/after_112/Round 027/OpponentCommand.txt | 1 + tests/after_112/Round 027/PlayerCommand.txt | 1 + tests/after_112/Round 028/OpponentCommand.txt | 1 + tests/after_112/Round 028/PlayerCommand.txt | 1 + tests/after_112/Round 029/OpponentCommand.txt | 1 + tests/after_112/Round 029/PlayerCommand.txt | 1 + tests/after_112/Round 030/OpponentCommand.txt | 1 + tests/after_112/Round 030/PlayerCommand.txt | 1 + tests/after_112/Round 031/OpponentCommand.txt | 1 + tests/after_112/Round 031/PlayerCommand.txt | 1 + tests/after_112/Round 032/OpponentCommand.txt | 1 + tests/after_112/Round 032/PlayerCommand.txt | 1 + tests/after_112/Round 033/OpponentCommand.txt | 1 + tests/after_112/Round 033/PlayerCommand.txt | 1 + tests/after_112/Round 034/OpponentCommand.txt | 1 + tests/after_112/Round 034/PlayerCommand.txt | 1 + tests/after_112/Round 035/OpponentCommand.txt | 1 + tests/after_112/Round 035/PlayerCommand.txt | 1 + tests/after_112/Round 036/OpponentCommand.txt | 1 + tests/after_112/Round 036/PlayerCommand.txt | 1 + tests/after_112/Round 037/OpponentCommand.txt | 1 + tests/after_112/Round 037/PlayerCommand.txt | 1 + tests/after_112/Round 038/OpponentCommand.txt | 1 + tests/after_112/Round 038/PlayerCommand.txt | 1 + tests/after_112/Round 039/OpponentCommand.txt | 1 + tests/after_112/Round 039/PlayerCommand.txt | 1 + tests/after_112/Round 040/OpponentCommand.txt | 1 + tests/after_112/Round 040/PlayerCommand.txt | 1 + tests/after_112/Round 041/OpponentCommand.txt | 1 + tests/after_112/Round 041/PlayerCommand.txt | 1 + tests/after_112/Round 042/OpponentCommand.txt | 1 + tests/after_112/Round 042/PlayerCommand.txt | 1 + tests/after_112/Round 043/OpponentCommand.txt | 1 + tests/after_112/Round 043/PlayerCommand.txt | 1 + tests/after_112/Round 044/OpponentCommand.txt | 1 + tests/after_112/Round 044/PlayerCommand.txt | 1 + tests/after_112/Round 045/OpponentCommand.txt | 1 + tests/after_112/Round 045/PlayerCommand.txt | 1 + tests/after_112/Round 046/OpponentCommand.txt | 1 + tests/after_112/Round 046/PlayerCommand.txt | 1 + tests/after_112/Round 047/OpponentCommand.txt | 1 + tests/after_112/Round 047/PlayerCommand.txt | 1 + tests/after_112/Round 048/OpponentCommand.txt | 1 + tests/after_112/Round 048/PlayerCommand.txt | 1 + tests/after_112/Round 049/OpponentCommand.txt | 1 + tests/after_112/Round 049/PlayerCommand.txt | 1 + tests/after_112/Round 050/OpponentCommand.txt | 1 + tests/after_112/Round 050/PlayerCommand.txt | 1 + tests/after_112/Round 051/OpponentCommand.txt | 1 + tests/after_112/Round 051/PlayerCommand.txt | 1 + tests/after_112/Round 052/OpponentCommand.txt | 1 + tests/after_112/Round 052/PlayerCommand.txt | 1 + tests/after_112/Round 053/OpponentCommand.txt | 1 + tests/after_112/Round 053/PlayerCommand.txt | 1 + tests/after_112/Round 054/OpponentCommand.txt | 1 + tests/after_112/Round 054/PlayerCommand.txt | 1 + tests/live-comparison.rs | 85 ++++++++++++++------------- tests/state1.json | 1 - tests/state10.json | 1 - tests/state11.json | 1 - tests/state12.json | 1 - tests/state13.json | 1 - tests/state14.json | 1 - tests/state15.json | 1 - tests/state16.json | 1 - tests/state17.json | 1 - tests/state18.json | 1 - tests/state19.json | 1 - tests/state2.json | 1 - tests/state20.json | 1 - tests/state21.json | 1 - tests/state22.json | 1 - tests/state23.json | 1 - tests/state24.json | 1 - tests/state25.json | 1 - tests/state26.json | 1 - tests/state27.json | 1 - tests/state28.json | 1 - tests/state29.json | 1 - tests/state3.json | 1 - tests/state30.json | 1 - tests/state4.json | 1 - tests/state5.json | 1 - tests/state6.json | 1 - tests/state7.json | 1 - tests/state8.json | 1 - tests/state9.json | 1 - 144 files changed, 183 insertions(+), 74 deletions(-) create mode 100755 import-replay.sh create mode 100644 tests/after_112/Round 000/OpponentCommand.txt create mode 100644 tests/after_112/Round 000/PlayerCommand.txt create mode 100644 tests/after_112/Round 001/OpponentCommand.txt create mode 100644 tests/after_112/Round 001/PlayerCommand.txt create mode 100644 tests/after_112/Round 002/OpponentCommand.txt create mode 100644 tests/after_112/Round 002/PlayerCommand.txt create mode 100644 tests/after_112/Round 003/OpponentCommand.txt create mode 100644 tests/after_112/Round 003/PlayerCommand.txt create mode 100644 tests/after_112/Round 004/OpponentCommand.txt create mode 100644 tests/after_112/Round 004/PlayerCommand.txt create mode 100644 tests/after_112/Round 005/OpponentCommand.txt create mode 100644 tests/after_112/Round 005/PlayerCommand.txt create mode 100644 tests/after_112/Round 006/OpponentCommand.txt create mode 100644 tests/after_112/Round 006/PlayerCommand.txt create mode 100644 tests/after_112/Round 007/OpponentCommand.txt create mode 100644 tests/after_112/Round 007/PlayerCommand.txt create mode 100644 tests/after_112/Round 008/OpponentCommand.txt create mode 100644 tests/after_112/Round 008/PlayerCommand.txt create mode 100644 tests/after_112/Round 009/OpponentCommand.txt create mode 100644 tests/after_112/Round 009/PlayerCommand.txt create mode 100644 tests/after_112/Round 010/OpponentCommand.txt create mode 100644 tests/after_112/Round 010/PlayerCommand.txt create mode 100644 tests/after_112/Round 011/OpponentCommand.txt create mode 100644 tests/after_112/Round 011/PlayerCommand.txt create mode 100644 tests/after_112/Round 012/OpponentCommand.txt create mode 100644 tests/after_112/Round 012/PlayerCommand.txt create mode 100644 tests/after_112/Round 013/OpponentCommand.txt create mode 100644 tests/after_112/Round 013/PlayerCommand.txt create mode 100644 tests/after_112/Round 014/OpponentCommand.txt create mode 100644 tests/after_112/Round 014/PlayerCommand.txt create mode 100644 tests/after_112/Round 015/OpponentCommand.txt create mode 100644 tests/after_112/Round 015/PlayerCommand.txt create mode 100644 tests/after_112/Round 016/OpponentCommand.txt create mode 100644 tests/after_112/Round 016/PlayerCommand.txt create mode 100644 tests/after_112/Round 017/OpponentCommand.txt create mode 100644 tests/after_112/Round 017/PlayerCommand.txt create mode 100644 tests/after_112/Round 018/OpponentCommand.txt create mode 100644 tests/after_112/Round 018/PlayerCommand.txt create mode 100644 tests/after_112/Round 019/OpponentCommand.txt create mode 100644 tests/after_112/Round 019/PlayerCommand.txt create mode 100644 tests/after_112/Round 020/OpponentCommand.txt create mode 100644 tests/after_112/Round 020/PlayerCommand.txt create mode 100644 tests/after_112/Round 021/OpponentCommand.txt create mode 100644 tests/after_112/Round 021/PlayerCommand.txt create mode 100644 tests/after_112/Round 022/OpponentCommand.txt create mode 100644 tests/after_112/Round 022/PlayerCommand.txt create mode 100644 tests/after_112/Round 023/OpponentCommand.txt create mode 100644 tests/after_112/Round 023/PlayerCommand.txt create mode 100644 tests/after_112/Round 024/OpponentCommand.txt create mode 100644 tests/after_112/Round 024/PlayerCommand.txt create mode 100644 tests/after_112/Round 025/OpponentCommand.txt create mode 100644 tests/after_112/Round 025/PlayerCommand.txt create mode 100644 tests/after_112/Round 026/OpponentCommand.txt create mode 100644 tests/after_112/Round 026/PlayerCommand.txt create mode 100644 tests/after_112/Round 027/OpponentCommand.txt create mode 100644 tests/after_112/Round 027/PlayerCommand.txt create mode 100644 tests/after_112/Round 028/OpponentCommand.txt create mode 100644 tests/after_112/Round 028/PlayerCommand.txt create mode 100644 tests/after_112/Round 029/OpponentCommand.txt create mode 100644 tests/after_112/Round 029/PlayerCommand.txt create mode 100644 tests/after_112/Round 030/OpponentCommand.txt create mode 100644 tests/after_112/Round 030/PlayerCommand.txt create mode 100644 tests/after_112/Round 031/OpponentCommand.txt create mode 100644 tests/after_112/Round 031/PlayerCommand.txt create mode 100644 tests/after_112/Round 032/OpponentCommand.txt create mode 100644 tests/after_112/Round 032/PlayerCommand.txt create mode 100644 tests/after_112/Round 033/OpponentCommand.txt create mode 100644 tests/after_112/Round 033/PlayerCommand.txt create mode 100644 tests/after_112/Round 034/OpponentCommand.txt create mode 100644 tests/after_112/Round 034/PlayerCommand.txt create mode 100644 tests/after_112/Round 035/OpponentCommand.txt create mode 100644 tests/after_112/Round 035/PlayerCommand.txt create mode 100644 tests/after_112/Round 036/OpponentCommand.txt create mode 100644 tests/after_112/Round 036/PlayerCommand.txt create mode 100644 tests/after_112/Round 037/OpponentCommand.txt create mode 100644 tests/after_112/Round 037/PlayerCommand.txt create mode 100644 tests/after_112/Round 038/OpponentCommand.txt create mode 100644 tests/after_112/Round 038/PlayerCommand.txt create mode 100644 tests/after_112/Round 039/OpponentCommand.txt create mode 100644 tests/after_112/Round 039/PlayerCommand.txt create mode 100644 tests/after_112/Round 040/OpponentCommand.txt create mode 100644 tests/after_112/Round 040/PlayerCommand.txt create mode 100644 tests/after_112/Round 041/OpponentCommand.txt create mode 100644 tests/after_112/Round 041/PlayerCommand.txt create mode 100644 tests/after_112/Round 042/OpponentCommand.txt create mode 100644 tests/after_112/Round 042/PlayerCommand.txt create mode 100644 tests/after_112/Round 043/OpponentCommand.txt create mode 100644 tests/after_112/Round 043/PlayerCommand.txt create mode 100644 tests/after_112/Round 044/OpponentCommand.txt create mode 100644 tests/after_112/Round 044/PlayerCommand.txt create mode 100644 tests/after_112/Round 045/OpponentCommand.txt create mode 100644 tests/after_112/Round 045/PlayerCommand.txt create mode 100644 tests/after_112/Round 046/OpponentCommand.txt create mode 100644 tests/after_112/Round 046/PlayerCommand.txt create mode 100644 tests/after_112/Round 047/OpponentCommand.txt create mode 100644 tests/after_112/Round 047/PlayerCommand.txt create mode 100644 tests/after_112/Round 048/OpponentCommand.txt create mode 100644 tests/after_112/Round 048/PlayerCommand.txt create mode 100644 tests/after_112/Round 049/OpponentCommand.txt create mode 100644 tests/after_112/Round 049/PlayerCommand.txt create mode 100644 tests/after_112/Round 050/OpponentCommand.txt create mode 100644 tests/after_112/Round 050/PlayerCommand.txt create mode 100644 tests/after_112/Round 051/OpponentCommand.txt create mode 100644 tests/after_112/Round 051/PlayerCommand.txt create mode 100644 tests/after_112/Round 052/OpponentCommand.txt create mode 100644 tests/after_112/Round 052/PlayerCommand.txt create mode 100644 tests/after_112/Round 053/OpponentCommand.txt create mode 100644 tests/after_112/Round 053/PlayerCommand.txt create mode 100644 tests/after_112/Round 054/OpponentCommand.txt create mode 100644 tests/after_112/Round 054/PlayerCommand.txt delete mode 100644 tests/state1.json delete mode 100644 tests/state10.json delete mode 100644 tests/state11.json delete mode 100644 tests/state12.json delete mode 100644 tests/state13.json delete mode 100644 tests/state14.json delete mode 100644 tests/state15.json delete mode 100644 tests/state16.json delete mode 100644 tests/state17.json delete mode 100644 tests/state18.json delete mode 100644 tests/state19.json delete mode 100644 tests/state2.json delete mode 100644 tests/state20.json delete mode 100644 tests/state21.json delete mode 100644 tests/state22.json delete mode 100644 tests/state23.json delete mode 100644 tests/state24.json delete mode 100644 tests/state25.json delete mode 100644 tests/state26.json delete mode 100644 tests/state27.json delete mode 100644 tests/state28.json delete mode 100644 tests/state29.json delete mode 100644 tests/state3.json delete mode 100644 tests/state30.json delete mode 100644 tests/state4.json delete mode 100644 tests/state5.json delete mode 100644 tests/state6.json delete mode 100644 tests/state7.json delete mode 100644 tests/state8.json delete mode 100644 tests/state9.json diff --git a/import-replay.sh b/import-replay.sh new file mode 100755 index 0000000..2a1b27e --- /dev/null +++ b/import-replay.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +REPLAY_FOLDER=$1 +OUTPUT_FOLDER=$2 + +mkdir -p $OUTPUT_FOLDER + +for round_folder in $REPLAY_FOLDER/*; do + round_name=`basename "$round_folder"` + mkdir -p "$OUTPUT_FOLDER/$round_name" + + player_folders=( "$round_folder"/* ) + player_folder=${player_folders[0]} + cp "$player_folder/JsonMap.json" "$OUTPUT_FOLDER/$round_name/state.json" + cp "$player_folder/PlayerCommand.txt" "$OUTPUT_FOLDER/$round_name/PlayerCommand.txt" + + opponent_folder=${player_folders[1]} + cp "$opponent_folder/PlayerCommand.txt" "$OUTPUT_FOLDER/$round_name/OpponentCommand.txt" +done diff --git a/src/engine/command.rs b/src/engine/command.rs index 17dbd5a..b350d65 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -29,4 +29,11 @@ impl BuildingType { use self::BuildingType::*; [Defence, Attack, Energy] } + + fn count() -> u8 { BuildingType::Energy as u8 + 1 } + pub fn from_u8(id: u8) -> Option { + use std::mem; + if id < Self::count() { Some(unsafe { mem::transmute(id) }) } else { None } + } + } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index cd4dc35..c2f3561 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -146,8 +146,8 @@ impl CommandScore { self.next_seed = next_seed; } - fn win_ratio(&self) -> u32 { - self.victories * 1000 / self.attempts + fn win_ratio(&self) -> i32 { + (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) } fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { diff --git a/tests/after_112/Round 000/OpponentCommand.txt b/tests/after_112/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_112/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 000/PlayerCommand.txt b/tests/after_112/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_112/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 001/OpponentCommand.txt b/tests/after_112/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 001/PlayerCommand.txt b/tests/after_112/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 002/OpponentCommand.txt b/tests/after_112/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 002/PlayerCommand.txt b/tests/after_112/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 003/OpponentCommand.txt b/tests/after_112/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/after_112/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 003/PlayerCommand.txt b/tests/after_112/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_112/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 004/OpponentCommand.txt b/tests/after_112/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 004/PlayerCommand.txt b/tests/after_112/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 005/OpponentCommand.txt b/tests/after_112/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_112/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 005/PlayerCommand.txt b/tests/after_112/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_112/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 006/OpponentCommand.txt b/tests/after_112/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 006/PlayerCommand.txt b/tests/after_112/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 007/OpponentCommand.txt b/tests/after_112/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/tests/after_112/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 007/PlayerCommand.txt b/tests/after_112/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..9033ecb --- /dev/null +++ b/tests/after_112/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 008/OpponentCommand.txt b/tests/after_112/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 008/PlayerCommand.txt b/tests/after_112/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 009/OpponentCommand.txt b/tests/after_112/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..93ec9b2 --- /dev/null +++ b/tests/after_112/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,1 \ No newline at end of file diff --git a/tests/after_112/Round 009/PlayerCommand.txt b/tests/after_112/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..7d93635 --- /dev/null +++ b/tests/after_112/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,1 \ No newline at end of file diff --git a/tests/after_112/Round 010/OpponentCommand.txt b/tests/after_112/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_112/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 010/PlayerCommand.txt b/tests/after_112/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..8a842f9 --- /dev/null +++ b/tests/after_112/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 011/OpponentCommand.txt b/tests/after_112/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_112/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_112/Round 011/PlayerCommand.txt b/tests/after_112/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 012/OpponentCommand.txt b/tests/after_112/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 012/PlayerCommand.txt b/tests/after_112/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..b209272 --- /dev/null +++ b/tests/after_112/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +1,5,1 \ No newline at end of file diff --git a/tests/after_112/Round 013/OpponentCommand.txt b/tests/after_112/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/after_112/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 013/PlayerCommand.txt b/tests/after_112/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/after_112/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 014/OpponentCommand.txt b/tests/after_112/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..ea08612 --- /dev/null +++ b/tests/after_112/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 014/PlayerCommand.txt b/tests/after_112/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 015/OpponentCommand.txt b/tests/after_112/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_112/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 015/PlayerCommand.txt b/tests/after_112/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/after_112/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 016/OpponentCommand.txt b/tests/after_112/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 016/PlayerCommand.txt b/tests/after_112/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 017/OpponentCommand.txt b/tests/after_112/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/after_112/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 017/PlayerCommand.txt b/tests/after_112/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 018/OpponentCommand.txt b/tests/after_112/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 018/PlayerCommand.txt b/tests/after_112/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..9033ecb --- /dev/null +++ b/tests/after_112/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 019/OpponentCommand.txt b/tests/after_112/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_112/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 019/PlayerCommand.txt b/tests/after_112/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..601aa29 --- /dev/null +++ b/tests/after_112/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +2,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 020/OpponentCommand.txt b/tests/after_112/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/after_112/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 020/PlayerCommand.txt b/tests/after_112/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 021/OpponentCommand.txt b/tests/after_112/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/after_112/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 021/PlayerCommand.txt b/tests/after_112/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/after_112/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 022/OpponentCommand.txt b/tests/after_112/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 022/PlayerCommand.txt b/tests/after_112/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_112/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 023/OpponentCommand.txt b/tests/after_112/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/tests/after_112/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 023/PlayerCommand.txt b/tests/after_112/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112/Round 024/OpponentCommand.txt b/tests/after_112/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_112/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 024/PlayerCommand.txt b/tests/after_112/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/after_112/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 025/OpponentCommand.txt b/tests/after_112/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/after_112/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 025/PlayerCommand.txt b/tests/after_112/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_112/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 026/OpponentCommand.txt b/tests/after_112/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_112/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 026/PlayerCommand.txt b/tests/after_112/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_112/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_112/Round 027/OpponentCommand.txt b/tests/after_112/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 027/PlayerCommand.txt b/tests/after_112/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/after_112/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 028/OpponentCommand.txt b/tests/after_112/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_112/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 028/PlayerCommand.txt b/tests/after_112/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_112/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 029/OpponentCommand.txt b/tests/after_112/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/tests/after_112/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 029/PlayerCommand.txt b/tests/after_112/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_112/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 030/OpponentCommand.txt b/tests/after_112/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/after_112/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 030/PlayerCommand.txt b/tests/after_112/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/after_112/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 031/OpponentCommand.txt b/tests/after_112/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/tests/after_112/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/tests/after_112/Round 031/PlayerCommand.txt b/tests/after_112/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/tests/after_112/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 032/OpponentCommand.txt b/tests/after_112/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_112/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_112/Round 032/PlayerCommand.txt b/tests/after_112/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_112/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 033/OpponentCommand.txt b/tests/after_112/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/after_112/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 033/PlayerCommand.txt b/tests/after_112/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/after_112/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 034/OpponentCommand.txt b/tests/after_112/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/tests/after_112/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 034/PlayerCommand.txt b/tests/after_112/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/after_112/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 035/OpponentCommand.txt b/tests/after_112/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..674d299 --- /dev/null +++ b/tests/after_112/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 035/PlayerCommand.txt b/tests/after_112/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..95a4cf3 --- /dev/null +++ b/tests/after_112/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,0 \ No newline at end of file diff --git a/tests/after_112/Round 036/OpponentCommand.txt b/tests/after_112/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/after_112/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/after_112/Round 036/PlayerCommand.txt b/tests/after_112/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/tests/after_112/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/tests/after_112/Round 037/OpponentCommand.txt b/tests/after_112/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/after_112/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/after_112/Round 037/PlayerCommand.txt b/tests/after_112/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..3ab3f32 --- /dev/null +++ b/tests/after_112/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 038/OpponentCommand.txt b/tests/after_112/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/after_112/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 038/PlayerCommand.txt b/tests/after_112/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..4f716a1 --- /dev/null +++ b/tests/after_112/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,0 \ No newline at end of file diff --git a/tests/after_112/Round 039/OpponentCommand.txt b/tests/after_112/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/after_112/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 039/PlayerCommand.txt b/tests/after_112/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/after_112/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 040/OpponentCommand.txt b/tests/after_112/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/tests/after_112/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 040/PlayerCommand.txt b/tests/after_112/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/tests/after_112/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/tests/after_112/Round 041/OpponentCommand.txt b/tests/after_112/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..d9e32bb --- /dev/null +++ b/tests/after_112/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,0 \ No newline at end of file diff --git a/tests/after_112/Round 041/PlayerCommand.txt b/tests/after_112/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/after_112/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/after_112/Round 042/OpponentCommand.txt b/tests/after_112/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/after_112/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/after_112/Round 042/PlayerCommand.txt b/tests/after_112/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..7ca2987 --- /dev/null +++ b/tests/after_112/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 043/OpponentCommand.txt b/tests/after_112/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/after_112/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 043/PlayerCommand.txt b/tests/after_112/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_112/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_112/Round 044/OpponentCommand.txt b/tests/after_112/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..226a1f4 --- /dev/null +++ b/tests/after_112/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,0 \ No newline at end of file diff --git a/tests/after_112/Round 044/PlayerCommand.txt b/tests/after_112/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/tests/after_112/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/tests/after_112/Round 045/OpponentCommand.txt b/tests/after_112/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..9033ecb --- /dev/null +++ b/tests/after_112/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 045/PlayerCommand.txt b/tests/after_112/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_112/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 046/OpponentCommand.txt b/tests/after_112/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/after_112/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 046/PlayerCommand.txt b/tests/after_112/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/after_112/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 047/OpponentCommand.txt b/tests/after_112/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_112/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 047/PlayerCommand.txt b/tests/after_112/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..f238916 --- /dev/null +++ b/tests/after_112/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 048/OpponentCommand.txt b/tests/after_112/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/after_112/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 048/PlayerCommand.txt b/tests/after_112/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_112/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 049/OpponentCommand.txt b/tests/after_112/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/after_112/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 049/PlayerCommand.txt b/tests/after_112/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..58897af --- /dev/null +++ b/tests/after_112/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,0 \ No newline at end of file diff --git a/tests/after_112/Round 050/OpponentCommand.txt b/tests/after_112/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..9033ecb --- /dev/null +++ b/tests/after_112/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 050/PlayerCommand.txt b/tests/after_112/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..b87efa8 --- /dev/null +++ b/tests/after_112/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,2 \ No newline at end of file diff --git a/tests/after_112/Round 051/OpponentCommand.txt b/tests/after_112/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/tests/after_112/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/tests/after_112/Round 051/PlayerCommand.txt b/tests/after_112/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_112/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 052/OpponentCommand.txt b/tests/after_112/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/tests/after_112/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/tests/after_112/Round 052/PlayerCommand.txt b/tests/after_112/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 053/OpponentCommand.txt b/tests/after_112/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/after_112/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 053/PlayerCommand.txt b/tests/after_112/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_112/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 054/OpponentCommand.txt b/tests/after_112/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/after_112/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 054/PlayerCommand.txt b/tests/after_112/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/after_112/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index e090907..e8f2b3a 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -3,52 +3,53 @@ extern crate zombot; use zombot::json; use zombot::engine::command::{Command, BuildingType}; use zombot::engine::geometry::Point; +use zombot::engine::settings::GameSettings; -#[test] -fn it_successfully_simulates_moves() { - let (settings, mut state) = json::read_state_from_file("tests/state0.json").expect("Failed to read state0.json"); +use std::fs::File; +use std::io::prelude::*; - let all_commands = [ - (Command::Build(Point::new(3,2),BuildingType::Energy), Command::Nothing), - (Command::Nothing, Command::Nothing), - (Command::Nothing, Command::Build(Point::new(4,3),BuildingType::Energy)), - (Command::Build(Point::new(3,1),BuildingType::Energy), Command::Nothing), - (Command::Nothing, Command::Nothing), - (Command::Build(Point::new(3,0),BuildingType::Energy),Command::Build(Point::new(6,0),BuildingType::Energy)), - (Command::Nothing,Command::Nothing), - (Command::Build(Point::new(3,3),BuildingType::Energy),Command::Build(Point::new(7,1),BuildingType::Attack)), - (Command::Nothing,Command::Nothing), - (Command::Build(Point::new(2,3),BuildingType::Attack),Command::Nothing), - - (Command::Build(Point::new(2,1),BuildingType::Energy),Command::Build(Point::new(5,3),BuildingType::Defence)), - (Command::Nothing,Command::Nothing), - (Command::Build(Point::new(1,0),BuildingType::Attack),Command::Nothing), - (Command::Nothing,Command::Build(Point::new(5,0),BuildingType::Defence)), - (Command::Build(Point::new(0,2),BuildingType::Attack),Command::Nothing), - (Command::Build(Point::new(3,1),BuildingType::Energy),Command::Nothing), - (Command::Nothing,Command::Nothing), - (Command::Build(Point::new(0,1),BuildingType::Attack),Command::Build(Point::new(7,2),BuildingType::Defence)), - (Command::Build(Point::new(2,1),BuildingType::Energy),Command::Nothing), - (Command::Nothing,Command::Nothing), +#[test] +fn it_successfully_simulates_replay() { + let replay_folder = "tests/after_112"; + let (settings, mut state) = json::read_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); + + for i in 0..54 { + 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_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); - (Command::Build(Point::new(0,0),BuildingType::Attack),Command::Nothing), - (Command::Build(Point::new(0,3),BuildingType::Attack),Command::Build(Point::new(4,1),BuildingType::Defence)), - (Command::Nothing,Command::Nothing), - (Command::Build(Point::new(1,3),BuildingType::Attack),Command::Nothing), - (Command::Build(Point::new(3,1),BuildingType::Energy),Command::Nothing), - (Command::Nothing,Command::Build(Point::new(6,1),BuildingType::Defence)), - (Command::Build(Point::new(2,2),BuildingType::Energy),Command::Nothing), - (Command::Build(Point::new(1,2),BuildingType::Energy),Command::Nothing), - (Command::Build(Point::new(3,1),BuildingType::Energy),Command::Build(Point::new(7,0),BuildingType::Defence)), - (Command::Build(Point::new(2,1),BuildingType::Energy),Command::Nothing) - ]; - - for (i, &(player, opponent)) in all_commands.iter().enumerate() { - let file = format!("tests/state{}.json", i+1); state.simulate_mut(&settings, player, opponent); - let (_, mut actual_state) = json::read_state_from_file(&file).unwrap(); state.sort(); - actual_state.sort(); - assert_eq!(state, actual_state, "\nFailed on state {}\n", i+1); + expected_state.sort(); + assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); + } +} + +fn read_player_command(filename: &str) -> Command { + let mut file = File::open(filename).unwrap(); + let mut content = String::new(); + file.read_to_string(&mut content).unwrap(); + if content.trim() == "No Command" { + Command::Nothing + } + else { + let mut components = content.split(','); + Command::Build( + Point::new(components.next().unwrap().trim().parse().unwrap(), + components.next().unwrap().trim().parse().unwrap() + ), + BuildingType::from_u8(components.next().unwrap().trim().parse().unwrap()).unwrap() + ) + } +} + +fn read_opponent_command(filename: &str, settings: &GameSettings) -> Command { + match read_player_command(filename) { + Command::Nothing => Command::Nothing, + Command::Build(p, b) => Command::Build(Point::new( + settings.size.x - p.x - 1, + p.y + ), b) } + } diff --git a/tests/state1.json b/tests/state1.json deleted file mode 100644 index 164a6bd..0000000 --- a/tests/state1.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":1,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":5,"health":100,"hitsTaken":0,"score":6},{"playerType":"B","energy":25,"health":100,"hitsTaken":0,"score":5}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state10.json b/tests/state10.json deleted file mode 100644 index 42c53c4..0000000 --- a/tests/state10.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":10,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":23,"health":100,"hitsTaken":0,"score":118},{"playerType":"B","energy":33,"health":100,"hitsTaken":0,"score":86}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state11.json b/tests/state11.json deleted file mode 100644 index bc3aa6a..0000000 --- a/tests/state11.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":11,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":141},{"playerType":"B","energy":14,"health":100,"hitsTaken":0,"score":98}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state12.json b/tests/state12.json deleted file mode 100644 index b025cba..0000000 --- a/tests/state12.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":12,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":37,"health":100,"hitsTaken":0,"score":164},{"playerType":"B","energy":22,"health":100,"hitsTaken":0,"score":112}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state13.json b/tests/state13.json deleted file mode 100644 index 4cc26c3..0000000 --- a/tests/state13.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":13,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":24,"health":100,"hitsTaken":0,"score":182},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":120}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state14.json b/tests/state14.json deleted file mode 100644 index 1a85e19..0000000 --- a/tests/state14.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":14,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":41,"health":100,"hitsTaken":0,"score":199},{"playerType":"B","energy":8,"health":100,"hitsTaken":0,"score":129}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state15.json b/tests/state15.json deleted file mode 100644 index 3eb21c5..0000000 --- a/tests/state15.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":15,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":28,"health":100,"hitsTaken":0,"score":227},{"playerType":"B","energy":16,"health":100,"hitsTaken":0,"score":137}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state16.json b/tests/state16.json deleted file mode 100644 index d05993c..0000000 --- a/tests/state16.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":16,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":25,"health":100,"hitsTaken":0,"score":245},{"playerType":"B","energy":24,"health":100,"hitsTaken":0,"score":145}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"B"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state17.json b/tests/state17.json deleted file mode 100644 index b4824ea..0000000 --- a/tests/state17.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":17,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":42,"health":100,"hitsTaken":0,"score":272},{"playerType":"B","energy":32,"health":100,"hitsTaken":0,"score":159}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state18.json b/tests/state18.json deleted file mode 100644 index c0d175c..0000000 --- a/tests/state18.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":18,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":29,"health":100,"hitsTaken":0,"score":295},{"playerType":"B","energy":10,"health":100,"hitsTaken":0,"score":168}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state19.json b/tests/state19.json deleted file mode 100644 index 1e82db4..0000000 --- a/tests/state19.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":19,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":26,"health":100,"hitsTaken":0,"score":323},{"playerType":"B","energy":18,"health":100,"hitsTaken":0,"score":176}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state2.json b/tests/state2.json deleted file mode 100644 index 323ea8e..0000000 --- a/tests/state2.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":2,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":13,"health":100,"hitsTaken":0,"score":14},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":10}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state20.json b/tests/state20.json deleted file mode 100644 index 9f306c2..0000000 --- a/tests/state20.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":20,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":43,"health":100,"hitsTaken":0,"score":345},{"playerType":"B","energy":26,"health":100,"hitsTaken":0,"score":190}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state21.json b/tests/state21.json deleted file mode 100644 index e75a3cc..0000000 --- a/tests/state21.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":21,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":30,"health":100,"hitsTaken":0,"score":373},{"playerType":"B","energy":34,"health":100,"hitsTaken":0,"score":198}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state22.json b/tests/state22.json deleted file mode 100644 index 72bcadb..0000000 --- a/tests/state22.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":22,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":17,"health":100,"hitsTaken":0,"score":406},{"playerType":"B","energy":12,"health":100,"hitsTaken":0,"score":207}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state23.json b/tests/state23.json deleted file mode 100644 index 6e8bb03..0000000 --- a/tests/state23.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":23,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":34,"health":100,"hitsTaken":0,"score":433},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":215}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state24.json b/tests/state24.json deleted file mode 100644 index d4ee007..0000000 --- a/tests/state24.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":24,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":21,"health":100,"hitsTaken":0,"score":466},{"playerType":"B","energy":28,"health":100,"hitsTaken":0,"score":223}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"B"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state25.json b/tests/state25.json deleted file mode 100644 index faaeca0..0000000 --- a/tests/state25.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":25,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":15,"health":100,"hitsTaken":0,"score":507},{"playerType":"B","energy":36,"health":100,"hitsTaken":0,"score":237}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state26.json b/tests/state26.json deleted file mode 100644 index 4abfc72..0000000 --- a/tests/state26.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":26,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":32,"health":100,"hitsTaken":0,"score":555},{"playerType":"B","energy":14,"health":100,"hitsTaken":0,"score":246}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":5,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state27.json b/tests/state27.json deleted file mode 100644 index 0d36c79..0000000 --- a/tests/state27.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":27,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":29,"health":100,"hitsTaken":0,"score":594},{"playerType":"B","energy":22,"health":100,"hitsTaken":0,"score":259}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":1,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[{"damage":5,"speed":1,"x":4,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state28.json b/tests/state28.json deleted file mode 100644 index 303ecbf..0000000 --- a/tests/state28.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":28,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":26,"health":100,"hitsTaken":0,"score":622},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":273}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":0,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":1,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state29.json b/tests/state29.json deleted file mode 100644 index c41b1fc..0000000 --- a/tests/state29.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":29,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":26,"health":100,"hitsTaken":0,"score":658},{"playerType":"B","energy":8,"health":100,"hitsTaken":0,"score":282}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[{"health":20,"constructionTimeLeft":2,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":1,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":15,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":1,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":2,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":2,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state3.json b/tests/state3.json deleted file mode 100644 index 98bdc66..0000000 --- a/tests/state3.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":3,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":21,"health":100,"hitsTaken":0,"score":22},{"playerType":"B","energy":15,"health":100,"hitsTaken":0,"score":16}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state30.json b/tests/state30.json deleted file mode 100644 index 5527c6d..0000000 --- a/tests/state30.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":30,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":29,"health":100,"hitsTaken":0,"score":713},{"playerType":"B","energy":13,"health":100,"hitsTaken":0,"score":287}],"gameMap":[[{"x":0,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":0,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":1,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":2,"y":0,"playerType":"A"}],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":5,"y":0,"playerType":"A"}],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[{"health":20,"constructionTimeLeft":1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[{"health":10,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":4,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[{"health":20,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":6,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":1,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":1,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":2,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":2,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"DEFENSE","x":7,"y":2,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":0,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":2,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":1,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":2,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[{"damage":5,"speed":1,"x":3,"y":3,"playerType":"A"}],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":4,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":3,"playerType":"A"}],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":7,"y":3,"playerType":"A"}],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state4.json b/tests/state4.json deleted file mode 100644 index 29f3b2c..0000000 --- a/tests/state4.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":4,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":9,"health":100,"hitsTaken":0,"score":31},{"playerType":"B","energy":23,"health":100,"hitsTaken":0,"score":24}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state5.json b/tests/state5.json deleted file mode 100644 index 02b654c..0000000 --- a/tests/state5.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":5,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":42},{"playerType":"B","energy":31,"health":100,"hitsTaken":0,"score":32}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} diff --git a/tests/state6.json b/tests/state6.json deleted file mode 100644 index f4b6f46..0000000 --- a/tests/state6.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":6,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":11,"health":100,"hitsTaken":0,"score":54},{"playerType":"B","energy":19,"health":100,"hitsTaken":0,"score":41}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state7.json b/tests/state7.json deleted file mode 100644 index 3f27bcf..0000000 --- a/tests/state7.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":7,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":25,"health":100,"hitsTaken":0,"score":68},{"playerType":"B","energy":30,"health":100,"hitsTaken":0,"score":52}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state8.json b/tests/state8.json deleted file mode 100644 index d5d82ab..0000000 --- a/tests/state8.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":8,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":19,"health":100,"hitsTaken":0,"score":83},{"playerType":"B","energy":11,"health":100,"hitsTaken":0,"score":64}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":0,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":0,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file diff --git a/tests/state9.json b/tests/state9.json deleted file mode 100644 index 686a011..0000000 --- a/tests/state9.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":9,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":36,"health":100,"hitsTaken":0,"score":100},{"playerType":"B","energy":22,"health":100,"hitsTaken":0,"score":75}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":0,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":6,"y":0,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":1,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[{"damage":5,"speed":1,"x":6,"y":1,"playerType":"B"}],"cellOwner":"B"},{"x":7,"y":1,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownTimeLeft":3,"weaponCooldownPeriod":3,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":0,"buildingType":"ATTACK","x":7,"y":1,"playerType":"B"}],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":2,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":3,"y":3,"playerType":"A"}],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[{"health":5,"constructionTimeLeft":-1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownTimeLeft":0,"weaponCooldownPeriod":0,"destroyMultiplier":1,"constructionScore":1,"energyGeneratedPerTurn":3,"buildingType":"ENERGY","x":4,"y":3,"playerType":"B"}],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} \ No newline at end of file -- cgit v1.2.3 From b39b6c077b3df677eb877d723e279e29b2973128 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 2 Jun 2018 14:04:06 +0200 Subject: Made my game engine match theirs What the hell is up with their building logic? There's +1s and dodgy indirection everywhere! --- src/engine/mod.rs | 52 ++++++++++++++++++++++++++++++---------------------- src/json.rs | 4 ++-- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index beb6fb4..361744b 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -154,14 +154,8 @@ impl GameState { debug_assert!(player.energy >= blueprint.price); player.energy -= blueprint.price; - if blueprint.construction_time > 0 { - unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); - } else { - let building = Building::new(p, blueprint); - player.energy_generated += building.energy_generated_per_turn; - buildings.push(building); - } - + unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); + let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); unoccupied_cells.swap_remove(to_remove_index); }, @@ -169,14 +163,18 @@ impl GameState { } fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player) { - for building in unconstructed_buildings.iter_mut() { - building.construction_time_left -= 1; - if building.is_constructed() { - player.energy_generated += building.energy_generated_per_turn; - buildings.push(building.to_building()); + let mut buildings_len = unconstructed_buildings.len(); + for i in (0..buildings_len).rev() { + if unconstructed_buildings[i].is_constructed() { + player.energy_generated += unconstructed_buildings[i].energy_generated_per_turn; + buildings.push(unconstructed_buildings[i].to_building()); + buildings_len -= 1; + unconstructed_buildings.swap(i, buildings_len); + } else { + unconstructed_buildings[i].construction_time_left -= 1 } } - unconstructed_buildings.retain(|b| !b.is_constructed()); + unconstructed_buildings.truncate(buildings_len); } fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { @@ -198,34 +196,44 @@ impl GameState { where F: FnMut(&mut Point) { let mut missiles_len = missiles.len(); 'missile_loop: for m in (0..missiles.len()).rev() { - for _ in 0..missiles[m].speed { + let mut missile_hit = false; + 'speed_loop: for _ in 0..missiles[m].speed { wrapping_move_fn(&mut missiles[m].pos); if missiles[m].pos.x >= settings.size.x { let damage = cmp::min(missiles[m].damage, opponent.health); opponent.health -= damage; - missiles_len -= 1; - missiles.swap(m, missiles_len); - continue 'missile_loop; + + missile_hit = true; + //missiles_len -= 1; + //missiles.swap(m, missiles_len); + + continue 'speed_loop; } else { for b in 0..opponent_buildings.len() { - // TODO latest game engine may be checking building health here if opponent_buildings[b].pos == missiles[m].pos { let damage = cmp::min(missiles[m].damage, opponent_buildings[b].health); opponent_buildings[b].health -= damage; - missiles_len -= 1; - missiles.swap(m, missiles_len); + + missile_hit = true; + //missiles_len -= 1; + //missiles.swap(m, missiles_len); if opponent_buildings[b].health == 0 { unoccupied_cells.push(opponent_buildings[b].pos); opponent.energy_generated -= opponent_buildings[b].energy_generated_per_turn; opponent_buildings.swap_remove(b); } - continue 'missile_loop; + //after game engine bug fix, this should go back to missile_loop + continue 'speed_loop; } } } } + if missile_hit { + missiles_len -= 1; + missiles.swap(m, missiles_len); + } } missiles.truncate(missiles_len); } diff --git a/src/json.rs b/src/json.rs index a8eb012..3a3fbf2 100644 --- a/src/json.rs +++ b/src/json.rs @@ -151,7 +151,7 @@ impl State { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left > 0) + .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) .map(|b| b.to_engine_unconstructed()) ) ) @@ -162,7 +162,7 @@ impl State { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left <= 0) + .filter(|b| b.player_type == player_type && b.construction_time_left < 0) .map(|b| b.to_engine()) ) ) -- cgit v1.2.3 From 6f328fbe981b2bfb231b3e29db4a48ca98a9968a Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 2 Jun 2018 23:54:35 +0200 Subject: Added engine run with failing test example --- tests/after_112_2/Round 000/OpponentCommand.txt | 1 + tests/after_112_2/Round 000/PlayerCommand.txt | 1 + tests/after_112_2/Round 001/OpponentCommand.txt | 1 + tests/after_112_2/Round 001/PlayerCommand.txt | 1 + tests/after_112_2/Round 002/OpponentCommand.txt | 1 + tests/after_112_2/Round 002/PlayerCommand.txt | 1 + tests/after_112_2/Round 003/OpponentCommand.txt | 1 + tests/after_112_2/Round 003/PlayerCommand.txt | 1 + tests/after_112_2/Round 004/OpponentCommand.txt | 1 + tests/after_112_2/Round 004/PlayerCommand.txt | 1 + tests/after_112_2/Round 005/OpponentCommand.txt | 1 + tests/after_112_2/Round 005/PlayerCommand.txt | 1 + tests/after_112_2/Round 006/OpponentCommand.txt | 1 + tests/after_112_2/Round 006/PlayerCommand.txt | 1 + tests/after_112_2/Round 007/OpponentCommand.txt | 1 + tests/after_112_2/Round 007/PlayerCommand.txt | 1 + tests/after_112_2/Round 008/OpponentCommand.txt | 1 + tests/after_112_2/Round 008/PlayerCommand.txt | 1 + tests/after_112_2/Round 009/OpponentCommand.txt | 1 + tests/after_112_2/Round 009/PlayerCommand.txt | 1 + tests/after_112_2/Round 010/OpponentCommand.txt | 1 + tests/after_112_2/Round 010/PlayerCommand.txt | 1 + tests/after_112_2/Round 011/OpponentCommand.txt | 1 + tests/after_112_2/Round 011/PlayerCommand.txt | 1 + tests/after_112_2/Round 012/OpponentCommand.txt | 1 + tests/after_112_2/Round 012/PlayerCommand.txt | 1 + tests/after_112_2/Round 013/OpponentCommand.txt | 1 + tests/after_112_2/Round 013/PlayerCommand.txt | 1 + tests/after_112_2/Round 014/OpponentCommand.txt | 1 + tests/after_112_2/Round 014/PlayerCommand.txt | 1 + tests/after_112_2/Round 015/OpponentCommand.txt | 1 + tests/after_112_2/Round 015/PlayerCommand.txt | 1 + tests/after_112_2/Round 016/OpponentCommand.txt | 1 + tests/after_112_2/Round 016/PlayerCommand.txt | 1 + tests/after_112_2/Round 017/OpponentCommand.txt | 1 + tests/after_112_2/Round 017/PlayerCommand.txt | 1 + tests/after_112_2/Round 018/OpponentCommand.txt | 1 + tests/after_112_2/Round 018/PlayerCommand.txt | 1 + tests/after_112_2/Round 019/OpponentCommand.txt | 1 + tests/after_112_2/Round 019/PlayerCommand.txt | 1 + tests/after_112_2/Round 020/OpponentCommand.txt | 1 + tests/after_112_2/Round 020/PlayerCommand.txt | 1 + tests/after_112_2/Round 021/OpponentCommand.txt | 1 + tests/after_112_2/Round 021/PlayerCommand.txt | 1 + tests/after_112_2/Round 022/OpponentCommand.txt | 1 + tests/after_112_2/Round 022/PlayerCommand.txt | 1 + tests/after_112_2/Round 023/OpponentCommand.txt | 1 + tests/after_112_2/Round 023/PlayerCommand.txt | 1 + tests/after_112_2/Round 024/OpponentCommand.txt | 1 + tests/after_112_2/Round 024/PlayerCommand.txt | 1 + tests/after_112_2/Round 025/OpponentCommand.txt | 1 + tests/after_112_2/Round 025/PlayerCommand.txt | 1 + tests/after_112_2/Round 026/OpponentCommand.txt | 1 + tests/after_112_2/Round 026/PlayerCommand.txt | 1 + tests/after_112_2/Round 027/OpponentCommand.txt | 1 + tests/after_112_2/Round 027/PlayerCommand.txt | 1 + tests/after_112_2/Round 028/OpponentCommand.txt | 1 + tests/after_112_2/Round 028/PlayerCommand.txt | 1 + tests/after_112_2/Round 029/OpponentCommand.txt | 1 + tests/after_112_2/Round 029/PlayerCommand.txt | 1 + tests/after_112_2/Round 030/OpponentCommand.txt | 1 + tests/after_112_2/Round 030/PlayerCommand.txt | 1 + tests/after_112_2/Round 031/OpponentCommand.txt | 1 + tests/after_112_2/Round 031/PlayerCommand.txt | 1 + tests/after_112_2/Round 032/OpponentCommand.txt | 1 + tests/after_112_2/Round 032/PlayerCommand.txt | 1 + tests/after_112_2/Round 033/OpponentCommand.txt | 1 + tests/after_112_2/Round 033/PlayerCommand.txt | 1 + tests/after_112_2/Round 034/OpponentCommand.txt | 1 + tests/after_112_2/Round 034/PlayerCommand.txt | 1 + tests/after_112_2/Round 035/OpponentCommand.txt | 1 + tests/after_112_2/Round 035/PlayerCommand.txt | 1 + tests/after_112_2/Round 036/OpponentCommand.txt | 1 + tests/after_112_2/Round 036/PlayerCommand.txt | 1 + tests/after_112_2/Round 037/OpponentCommand.txt | 1 + tests/after_112_2/Round 037/PlayerCommand.txt | 1 + tests/after_112_2/Round 038/OpponentCommand.txt | 1 + tests/after_112_2/Round 038/PlayerCommand.txt | 1 + tests/after_112_2/Round 039/OpponentCommand.txt | 1 + tests/after_112_2/Round 039/PlayerCommand.txt | 1 + tests/after_112_2/Round 040/OpponentCommand.txt | 1 + tests/after_112_2/Round 040/PlayerCommand.txt | 1 + tests/after_112_2/Round 041/OpponentCommand.txt | 1 + tests/after_112_2/Round 041/PlayerCommand.txt | 1 + tests/after_112_2/Round 042/OpponentCommand.txt | 1 + tests/after_112_2/Round 042/PlayerCommand.txt | 1 + tests/after_112_2/Round 043/OpponentCommand.txt | 1 + tests/after_112_2/Round 043/PlayerCommand.txt | 1 + tests/after_112_2/Round 044/OpponentCommand.txt | 1 + tests/after_112_2/Round 044/PlayerCommand.txt | 1 + tests/after_112_2/Round 045/OpponentCommand.txt | 1 + tests/after_112_2/Round 045/PlayerCommand.txt | 1 + tests/after_112_2/Round 046/OpponentCommand.txt | 1 + tests/after_112_2/Round 046/PlayerCommand.txt | 1 + tests/after_112_2/Round 047/OpponentCommand.txt | 1 + tests/after_112_2/Round 047/PlayerCommand.txt | 1 + tests/after_112_2/Round 048/OpponentCommand.txt | 1 + tests/after_112_2/Round 048/PlayerCommand.txt | 1 + tests/after_112_2/Round 049/OpponentCommand.txt | 1 + tests/after_112_2/Round 049/PlayerCommand.txt | 1 + tests/after_112_2/Round 050/OpponentCommand.txt | 1 + tests/after_112_2/Round 050/PlayerCommand.txt | 1 + tests/after_112_2/Round 051/OpponentCommand.txt | 1 + tests/after_112_2/Round 051/PlayerCommand.txt | 1 + tests/after_112_2/Round 052/OpponentCommand.txt | 1 + tests/after_112_2/Round 052/PlayerCommand.txt | 1 + tests/after_112_2/Round 053/OpponentCommand.txt | 1 + tests/after_112_2/Round 053/PlayerCommand.txt | 1 + tests/after_112_2/Round 054/OpponentCommand.txt | 1 + tests/after_112_2/Round 054/PlayerCommand.txt | 1 + tests/after_112_2/Round 055/OpponentCommand.txt | 1 + tests/after_112_2/Round 055/PlayerCommand.txt | 1 + tests/after_112_2/Round 056/OpponentCommand.txt | 1 + tests/after_112_2/Round 056/PlayerCommand.txt | 1 + tests/after_112_2/Round 057/OpponentCommand.txt | 1 + tests/after_112_2/Round 057/PlayerCommand.txt | 1 + tests/after_112_2/Round 058/OpponentCommand.txt | 1 + tests/after_112_2/Round 058/PlayerCommand.txt | 1 + tests/after_112_2/Round 059/OpponentCommand.txt | 1 + tests/after_112_2/Round 059/PlayerCommand.txt | 1 + tests/after_112_2/Round 060/OpponentCommand.txt | 1 + tests/after_112_2/Round 060/PlayerCommand.txt | 1 + tests/after_112_2/Round 061/OpponentCommand.txt | 1 + tests/after_112_2/Round 061/PlayerCommand.txt | 1 + tests/after_112_2/Round 062/OpponentCommand.txt | 1 + tests/after_112_2/Round 062/PlayerCommand.txt | 1 + tests/after_112_2/Round 063/OpponentCommand.txt | 1 + tests/after_112_2/Round 063/PlayerCommand.txt | 1 + tests/after_112_2/Round 064/OpponentCommand.txt | 1 + tests/after_112_2/Round 064/PlayerCommand.txt | 1 + tests/after_112_2/Round 065/OpponentCommand.txt | 1 + tests/after_112_2/Round 065/PlayerCommand.txt | 1 + tests/after_112_2/Round 066/OpponentCommand.txt | 1 + tests/after_112_2/Round 066/PlayerCommand.txt | 1 + tests/after_112_2/Round 067/OpponentCommand.txt | 1 + tests/after_112_2/Round 067/PlayerCommand.txt | 1 + tests/after_112_2/Round 068/OpponentCommand.txt | 1 + tests/after_112_2/Round 068/PlayerCommand.txt | 1 + tests/after_112_2/Round 069/OpponentCommand.txt | 1 + tests/after_112_2/Round 069/PlayerCommand.txt | 1 + tests/after_112_2/Round 070/OpponentCommand.txt | 1 + tests/after_112_2/Round 070/PlayerCommand.txt | 1 + tests/after_112_2/Round 071/OpponentCommand.txt | 1 + tests/after_112_2/Round 071/PlayerCommand.txt | 1 + tests/after_112_2/Round 072/OpponentCommand.txt | 1 + tests/after_112_2/Round 072/PlayerCommand.txt | 1 + tests/after_112_2/Round 073/OpponentCommand.txt | 1 + tests/after_112_2/Round 073/PlayerCommand.txt | 1 + tests/after_112_2/Round 074/OpponentCommand.txt | 1 + tests/after_112_2/Round 074/PlayerCommand.txt | 1 + tests/after_112_2/Round 075/OpponentCommand.txt | 1 + tests/after_112_2/Round 075/PlayerCommand.txt | 1 + tests/after_112_2/Round 076/OpponentCommand.txt | 1 + tests/after_112_2/Round 076/PlayerCommand.txt | 1 + tests/live-comparison.rs | 12 ++++++++++-- 155 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 tests/after_112_2/Round 000/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 000/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 001/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 001/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 002/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 002/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 003/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 003/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 004/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 004/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 005/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 005/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 006/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 006/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 007/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 007/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 008/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 008/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 009/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 009/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 010/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 010/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 011/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 011/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 012/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 012/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 013/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 013/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 014/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 014/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 015/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 015/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 016/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 016/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 017/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 017/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 018/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 018/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 019/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 019/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 020/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 020/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 021/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 021/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 022/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 022/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 023/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 023/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 024/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 024/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 025/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 025/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 026/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 026/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 027/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 027/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 028/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 028/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 029/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 029/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 030/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 030/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 031/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 031/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 032/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 032/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 033/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 033/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 034/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 034/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 035/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 035/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 036/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 036/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 037/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 037/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 038/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 038/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 039/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 039/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 040/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 040/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 041/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 041/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 042/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 042/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 043/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 043/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 044/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 044/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 045/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 045/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 046/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 046/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 047/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 047/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 048/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 048/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 049/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 049/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 050/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 050/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 051/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 051/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 052/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 052/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 053/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 053/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 054/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 054/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 055/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 055/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 056/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 056/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 057/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 057/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 058/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 058/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 059/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 059/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 060/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 060/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 061/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 061/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 062/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 062/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 063/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 063/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 064/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 064/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 065/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 065/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 066/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 066/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 067/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 067/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 068/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 068/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 069/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 069/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 070/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 070/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 071/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 071/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 072/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 072/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 073/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 073/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 074/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 074/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 075/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 075/PlayerCommand.txt create mode 100644 tests/after_112_2/Round 076/OpponentCommand.txt create mode 100644 tests/after_112_2/Round 076/PlayerCommand.txt diff --git a/tests/after_112_2/Round 000/OpponentCommand.txt b/tests/after_112_2/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_112_2/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 000/PlayerCommand.txt b/tests/after_112_2/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_112_2/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 001/OpponentCommand.txt b/tests/after_112_2/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 001/PlayerCommand.txt b/tests/after_112_2/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 002/OpponentCommand.txt b/tests/after_112_2/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 002/PlayerCommand.txt b/tests/after_112_2/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 003/OpponentCommand.txt b/tests/after_112_2/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112_2/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 003/PlayerCommand.txt b/tests/after_112_2/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_112_2/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 004/OpponentCommand.txt b/tests/after_112_2/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 004/PlayerCommand.txt b/tests/after_112_2/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 005/OpponentCommand.txt b/tests/after_112_2/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_112_2/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 005/PlayerCommand.txt b/tests/after_112_2/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_112_2/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 006/OpponentCommand.txt b/tests/after_112_2/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 006/PlayerCommand.txt b/tests/after_112_2/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 007/OpponentCommand.txt b/tests/after_112_2/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..9408cb0 --- /dev/null +++ b/tests/after_112_2/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 007/PlayerCommand.txt b/tests/after_112_2/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..9408cb0 --- /dev/null +++ b/tests/after_112_2/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 008/OpponentCommand.txt b/tests/after_112_2/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 008/PlayerCommand.txt b/tests/after_112_2/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 009/OpponentCommand.txt b/tests/after_112_2/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/tests/after_112_2/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 009/PlayerCommand.txt b/tests/after_112_2/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/tests/after_112_2/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 010/OpponentCommand.txt b/tests/after_112_2/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_112_2/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 010/PlayerCommand.txt b/tests/after_112_2/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_112_2/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 011/OpponentCommand.txt b/tests/after_112_2/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_112_2/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 011/PlayerCommand.txt b/tests/after_112_2/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_112_2/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 012/OpponentCommand.txt b/tests/after_112_2/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_112_2/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 012/PlayerCommand.txt b/tests/after_112_2/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_112_2/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 013/OpponentCommand.txt b/tests/after_112_2/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..8c5ef78 --- /dev/null +++ b/tests/after_112_2/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 013/PlayerCommand.txt b/tests/after_112_2/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/tests/after_112_2/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 014/OpponentCommand.txt b/tests/after_112_2/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/after_112_2/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 014/PlayerCommand.txt b/tests/after_112_2/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/after_112_2/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 015/OpponentCommand.txt b/tests/after_112_2/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/tests/after_112_2/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 015/PlayerCommand.txt b/tests/after_112_2/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/after_112_2/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 016/OpponentCommand.txt b/tests/after_112_2/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/tests/after_112_2/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 016/PlayerCommand.txt b/tests/after_112_2/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/tests/after_112_2/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 017/OpponentCommand.txt b/tests/after_112_2/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 017/PlayerCommand.txt b/tests/after_112_2/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 018/OpponentCommand.txt b/tests/after_112_2/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..bd4deea --- /dev/null +++ b/tests/after_112_2/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 018/PlayerCommand.txt b/tests/after_112_2/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..bd4deea --- /dev/null +++ b/tests/after_112_2/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 019/OpponentCommand.txt b/tests/after_112_2/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..37bfbbd --- /dev/null +++ b/tests/after_112_2/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 019/PlayerCommand.txt b/tests/after_112_2/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..2a21cf5 --- /dev/null +++ b/tests/after_112_2/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +3,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 020/OpponentCommand.txt b/tests/after_112_2/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_112_2/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 020/PlayerCommand.txt b/tests/after_112_2/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_112_2/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 021/OpponentCommand.txt b/tests/after_112_2/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/tests/after_112_2/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 021/PlayerCommand.txt b/tests/after_112_2/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..c37c6f4 --- /dev/null +++ b/tests/after_112_2/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +1,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 022/OpponentCommand.txt b/tests/after_112_2/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/tests/after_112_2/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 022/PlayerCommand.txt b/tests/after_112_2/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/after_112_2/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 023/OpponentCommand.txt b/tests/after_112_2/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_112_2/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 023/PlayerCommand.txt b/tests/after_112_2/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_112_2/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 024/OpponentCommand.txt b/tests/after_112_2/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_112_2/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 024/PlayerCommand.txt b/tests/after_112_2/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/after_112_2/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 025/OpponentCommand.txt b/tests/after_112_2/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 025/PlayerCommand.txt b/tests/after_112_2/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 026/OpponentCommand.txt b/tests/after_112_2/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/tests/after_112_2/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 026/PlayerCommand.txt b/tests/after_112_2/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 027/OpponentCommand.txt b/tests/after_112_2/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/tests/after_112_2/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 027/PlayerCommand.txt b/tests/after_112_2/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/after_112_2/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 028/OpponentCommand.txt b/tests/after_112_2/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/after_112_2/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 028/PlayerCommand.txt b/tests/after_112_2/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_112_2/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 029/OpponentCommand.txt b/tests/after_112_2/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..ebfc684 --- /dev/null +++ b/tests/after_112_2/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 029/PlayerCommand.txt b/tests/after_112_2/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..c742585 --- /dev/null +++ b/tests/after_112_2/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 030/OpponentCommand.txt b/tests/after_112_2/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..e2634f0 --- /dev/null +++ b/tests/after_112_2/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 030/PlayerCommand.txt b/tests/after_112_2/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/tests/after_112_2/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 031/OpponentCommand.txt b/tests/after_112_2/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_112_2/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 031/PlayerCommand.txt b/tests/after_112_2/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_112_2/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 032/OpponentCommand.txt b/tests/after_112_2/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_112_2/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 032/PlayerCommand.txt b/tests/after_112_2/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/after_112_2/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 033/OpponentCommand.txt b/tests/after_112_2/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/after_112_2/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 033/PlayerCommand.txt b/tests/after_112_2/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/after_112_2/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 034/OpponentCommand.txt b/tests/after_112_2/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..4b87d86 --- /dev/null +++ b/tests/after_112_2/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 034/PlayerCommand.txt b/tests/after_112_2/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..10532f2 --- /dev/null +++ b/tests/after_112_2/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 035/OpponentCommand.txt b/tests/after_112_2/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_112_2/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 035/PlayerCommand.txt b/tests/after_112_2/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..7ca2987 --- /dev/null +++ b/tests/after_112_2/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 036/OpponentCommand.txt b/tests/after_112_2/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 036/PlayerCommand.txt b/tests/after_112_2/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 037/OpponentCommand.txt b/tests/after_112_2/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/after_112_2/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 037/PlayerCommand.txt b/tests/after_112_2/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/after_112_2/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 038/OpponentCommand.txt b/tests/after_112_2/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/after_112_2/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 038/PlayerCommand.txt b/tests/after_112_2/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 039/OpponentCommand.txt b/tests/after_112_2/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/tests/after_112_2/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 039/PlayerCommand.txt b/tests/after_112_2/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/after_112_2/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 040/OpponentCommand.txt b/tests/after_112_2/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..5ee21e6 --- /dev/null +++ b/tests/after_112_2/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 040/PlayerCommand.txt b/tests/after_112_2/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..722ec58 --- /dev/null +++ b/tests/after_112_2/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 041/OpponentCommand.txt b/tests/after_112_2/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..4763908 --- /dev/null +++ b/tests/after_112_2/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 041/PlayerCommand.txt b/tests/after_112_2/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/after_112_2/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 042/OpponentCommand.txt b/tests/after_112_2/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_112_2/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 042/PlayerCommand.txt b/tests/after_112_2/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_112_2/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 043/OpponentCommand.txt b/tests/after_112_2/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_112_2/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 043/PlayerCommand.txt b/tests/after_112_2/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/after_112_2/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 044/OpponentCommand.txt b/tests/after_112_2/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_112_2/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 044/PlayerCommand.txt b/tests/after_112_2/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_112_2/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 045/OpponentCommand.txt b/tests/after_112_2/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 045/PlayerCommand.txt b/tests/after_112_2/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/after_112_2/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 046/OpponentCommand.txt b/tests/after_112_2/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_112_2/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 046/PlayerCommand.txt b/tests/after_112_2/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/after_112_2/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 047/OpponentCommand.txt b/tests/after_112_2/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/after_112_2/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 047/PlayerCommand.txt b/tests/after_112_2/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/after_112_2/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 048/OpponentCommand.txt b/tests/after_112_2/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..ad5a4bc --- /dev/null +++ b/tests/after_112_2/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 048/PlayerCommand.txt b/tests/after_112_2/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_112_2/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 049/OpponentCommand.txt b/tests/after_112_2/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..8c5ef78 --- /dev/null +++ b/tests/after_112_2/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 049/PlayerCommand.txt b/tests/after_112_2/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/tests/after_112_2/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 050/OpponentCommand.txt b/tests/after_112_2/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..e2634f0 --- /dev/null +++ b/tests/after_112_2/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 050/PlayerCommand.txt b/tests/after_112_2/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/after_112_2/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 051/OpponentCommand.txt b/tests/after_112_2/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/after_112_2/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 051/PlayerCommand.txt b/tests/after_112_2/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/after_112_2/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 052/OpponentCommand.txt b/tests/after_112_2/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_112_2/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 052/PlayerCommand.txt b/tests/after_112_2/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 053/OpponentCommand.txt b/tests/after_112_2/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..2a21cf5 --- /dev/null +++ b/tests/after_112_2/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 053/PlayerCommand.txt b/tests/after_112_2/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_112_2/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 054/OpponentCommand.txt b/tests/after_112_2/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_112_2/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 054/PlayerCommand.txt b/tests/after_112_2/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 055/OpponentCommand.txt b/tests/after_112_2/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/after_112_2/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 055/PlayerCommand.txt b/tests/after_112_2/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_112_2/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 056/OpponentCommand.txt b/tests/after_112_2/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_112_2/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 056/PlayerCommand.txt b/tests/after_112_2/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_112_2/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 057/OpponentCommand.txt b/tests/after_112_2/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 057/PlayerCommand.txt b/tests/after_112_2/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_112_2/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 058/OpponentCommand.txt b/tests/after_112_2/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/after_112_2/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 058/PlayerCommand.txt b/tests/after_112_2/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..c4e7948 --- /dev/null +++ b/tests/after_112_2/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 059/OpponentCommand.txt b/tests/after_112_2/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 059/PlayerCommand.txt b/tests/after_112_2/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/after_112_2/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 060/OpponentCommand.txt b/tests/after_112_2/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_112_2/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 060/PlayerCommand.txt b/tests/after_112_2/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 061/OpponentCommand.txt b/tests/after_112_2/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_112_2/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 061/PlayerCommand.txt b/tests/after_112_2/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..a7c241f --- /dev/null +++ b/tests/after_112_2/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 062/OpponentCommand.txt b/tests/after_112_2/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/after_112_2/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 062/PlayerCommand.txt b/tests/after_112_2/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/after_112_2/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 063/OpponentCommand.txt b/tests/after_112_2/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/after_112_2/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 063/PlayerCommand.txt b/tests/after_112_2/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..1818e31 --- /dev/null +++ b/tests/after_112_2/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 064/OpponentCommand.txt b/tests/after_112_2/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/tests/after_112_2/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 064/PlayerCommand.txt b/tests/after_112_2/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/tests/after_112_2/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 065/OpponentCommand.txt b/tests/after_112_2/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/tests/after_112_2/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 065/PlayerCommand.txt b/tests/after_112_2/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_112_2/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 066/OpponentCommand.txt b/tests/after_112_2/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 066/PlayerCommand.txt b/tests/after_112_2/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_112_2/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 067/OpponentCommand.txt b/tests/after_112_2/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/after_112_2/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 067/PlayerCommand.txt b/tests/after_112_2/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_112_2/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 068/OpponentCommand.txt b/tests/after_112_2/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/tests/after_112_2/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 068/PlayerCommand.txt b/tests/after_112_2/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..4f716a1 --- /dev/null +++ b/tests/after_112_2/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 069/OpponentCommand.txt b/tests/after_112_2/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_112_2/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 069/PlayerCommand.txt b/tests/after_112_2/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/tests/after_112_2/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 070/OpponentCommand.txt b/tests/after_112_2/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_112_2/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 070/PlayerCommand.txt b/tests/after_112_2/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_112_2/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 071/OpponentCommand.txt b/tests/after_112_2/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..7ae2a9c --- /dev/null +++ b/tests/after_112_2/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 071/PlayerCommand.txt b/tests/after_112_2/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_112_2/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 072/OpponentCommand.txt b/tests/after_112_2/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_112_2/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 072/PlayerCommand.txt b/tests/after_112_2/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_112_2/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 073/OpponentCommand.txt b/tests/after_112_2/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..4f8f464 --- /dev/null +++ b/tests/after_112_2/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +5,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 073/PlayerCommand.txt b/tests/after_112_2/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_112_2/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 074/OpponentCommand.txt b/tests/after_112_2/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..9033ecb --- /dev/null +++ b/tests/after_112_2/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +4,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 074/PlayerCommand.txt b/tests/after_112_2/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_112_2/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 075/OpponentCommand.txt b/tests/after_112_2/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/after_112_2/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 075/PlayerCommand.txt b/tests/after_112_2/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_112_2/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 076/OpponentCommand.txt b/tests/after_112_2/Round 076/OpponentCommand.txt new file mode 100644 index 0000000..601aa29 --- /dev/null +++ b/tests/after_112_2/Round 076/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 076/PlayerCommand.txt b/tests/after_112_2/Round 076/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_112_2/Round 076/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index e8f2b3a..72358a7 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -10,10 +10,18 @@ use std::io::prelude::*; #[test] fn it_successfully_simulates_replay() { - let replay_folder = "tests/after_112"; + test_from_replay("tests/after_112", 54); +} + +#[test] +fn it_successfully_simulates_replay_two() { + test_from_replay("tests/after_112_2", 76); +} + +fn test_from_replay(replay_folder: &str, length: usize) { let (settings, mut state) = json::read_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); - for i in 0..54 { + 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_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); -- cgit v1.2.3 From 9d7d406107998c87525852032495f33f37155294 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 3 Jun 2018 16:37:41 +0200 Subject: Added makefile for creating submission --- .gitignore | 1 + Makefile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 93caa35..54a07fd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Cargo.lock **/*.rs.bk /perf.data /perf.data.old +/submission.zip diff --git a/Makefile b/Makefile index 6391c1f..7b46d01 100644 --- a/Makefile +++ b/Makefile @@ -18,5 +18,7 @@ profile: clean: cargo clean +submission.zip: + zip -r9 submission.zip bot.json Cargo.lock Cargo.toml src .PHONY: build test bench profile clean -- cgit v1.2.3 From 34c87bf04a9b70809eda125ca180de1d993d410e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 3 Jun 2018 17:22:22 +0200 Subject: Moved json parsing to be part of a module, with textmap equivalence --- src/bin/perf-test.rs | 4 +- src/input/json.rs | 238 +++++++++++++++++++++++++++++++++++++++++++++++ src/input/mod.rs | 2 + src/input/textmap.rs | 67 +++++++++++++ src/json.rs | 238 ----------------------------------------------- src/lib.rs | 2 +- src/main.rs | 2 +- tests/live-comparison.rs | 2 +- 8 files changed, 312 insertions(+), 243 deletions(-) create mode 100644 src/input/json.rs create mode 100644 src/input/mod.rs create mode 100644 src/input/textmap.rs delete mode 100644 src/json.rs diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 03da160..71044ad 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -17,7 +17,7 @@ fn main() { fn normal_state() { println!("Normal size state file"); let start_time = PreciseTime::now(); - let (settings, state) = match json::read_state_from_file(STATE_PATH) { + let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { println!("Error while parsing JSON file: {}", error); @@ -31,7 +31,7 @@ fn normal_state() { fn big_state() { println!("Big state file"); let start_time = PreciseTime::now(); - let (settings, state) = match json::read_state_from_file(STATE_BIG_PATH) { + let (settings, state) = match input::json::read_state_from_file(STATE_BIG_PATH) { Ok(ok) => ok, Err(error) => { println!("Error while parsing JSON file: {}", error); diff --git a/src/input/json.rs b/src/input/json.rs new file mode 100644 index 0000000..3a3fbf2 --- /dev/null +++ b/src/input/json.rs @@ -0,0 +1,238 @@ +use std::fs::File; +use std::io::prelude::*; +use serde_json; +use std::error::Error; + +use ::engine; + + +pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, engine::GameState), Box> { + let mut file = File::open(filename)?; + let mut content = String::new(); + file.read_to_string(&mut content)?; + let state: State = serde_json::from_str(content.as_ref())?; + + let engine_settings = state.to_engine_settings(); + let engine_state = state.to_engine(&engine_settings); + Ok((engine_settings, engine_state)) +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct State { + game_details: GameDetails, + players: Vec, + game_map: Vec>, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameDetails { + //round: u16, + //max_rounds: u16, + map_width: u8, + map_height: u8, + round_income_energy: u16, + buildings_stats: BuildingStats +} + +#[derive(Deserialize)] +#[serde(rename_all = "SCREAMING_SNAKE_CASE")] +struct BuildingStats { + energy: BuildingBlueprint, + defense: BuildingBlueprint, + attack: BuildingBlueprint +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct BuildingBlueprint { + price: u16, + health: u8, + construction_time: u8, + weapon_damage: u8, + weapon_speed: u8, + weapon_cooldown_period: u8, + energy_generated_per_turn: u16, +// destroy_multiplier: u16, +// construction_score: u16 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct Player { + player_type: char, + energy: u16, + health: u8, + //hits_taken: u32, + //score: u32 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameCell { + //x: u8, + //y: u8, + buildings: Vec, + missiles: Vec, + //cell_owner: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct BuildingState { + health: u8, + construction_time_left: i8, + //price: u16, + weapon_damage: u8, + weapon_speed: u8, + weapon_cooldown_time_left: u8, + weapon_cooldown_period: u8, + //destroy_multiplier: u32, + //construction_score: u32, + energy_generated_per_turn: u16, + //building_type: String, + x: u8, + y: u8, + player_type: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct MissileState { + damage: u8, + speed: u8, + x: u8, + y: u8, + player_type: char +} + + +impl State { + fn to_engine_settings(&self) -> engine::settings::GameSettings { + engine::settings::GameSettings { + size: engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), + energy_income: self.game_details.round_income_energy, + energy: self.game_details.buildings_stats.energy.to_engine(), + defence: self.game_details.buildings_stats.defense.to_engine(), + attack: self.game_details.buildings_stats.attack.to_engine(), + } + } + + fn to_engine(&self, settings: &engine::settings::GameSettings) -> engine::GameState { + let player_buildings = self.buildings_to_engine('A'); + let opponent_buildings = self.buildings_to_engine('B'); + engine::GameState::new( + self.player().to_engine(settings, &player_buildings), + self.opponent().to_engine(settings, &opponent_buildings), + self.unconstructed_buildings_to_engine('A'), + player_buildings, + self.unconstructed_buildings_to_engine('B'), + opponent_buildings, + self.missiles_to_engine('A'), + self.missiles_to_engine('B'), + settings + ) + } + + fn player(&self) -> &Player { + self.players.iter() + .find(|p| p.player_type == 'A') + .expect("Player character did not appear in state.json") + } + + fn opponent(&self) -> &Player { + self.players.iter() + .find(|p| p.player_type == 'B') + .expect("Opponent character did not appear in state.json") + } + + fn unconstructed_buildings_to_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.buildings.iter() + .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) + .map(|b| b.to_engine_unconstructed()) + ) + ) + .collect() + } + + fn buildings_to_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.buildings.iter() + .filter(|b| b.player_type == player_type && b.construction_time_left < 0) + .map(|b| b.to_engine()) + ) + ) + .collect() + } + + fn missiles_to_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.missiles.iter() + .filter(|b| b.player_type == player_type) + .map(|b| b.to_engine()) + ) + ) + .collect() + } +} + +impl BuildingBlueprint { + fn to_engine(&self) -> engine::settings::BuildingSettings { + engine::settings::BuildingSettings { + price: self.price, + health: self.health, + construction_time: self.construction_time-2, + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn, + } + } +} + +impl Player { + fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[engine::Building]) -> engine::Player { + engine::Player::new(self.energy, self.health, settings, buildings) + } +} + +impl BuildingState { + fn to_engine(&self) -> engine::Building { + engine::Building { + pos: engine::geometry::Point::new(self.x, self.y), + health: self.health, + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_time_left: self.weapon_cooldown_time_left, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn, + } + } + + fn to_engine_unconstructed(&self) -> engine::UnconstructedBuilding { + engine::UnconstructedBuilding { + pos: engine::geometry::Point::new(self.x, self.y), + health: self.health, + construction_time_left: self.construction_time_left as u8, // > 0 check already happened + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn, + } + } +} + +impl MissileState { + fn to_engine(&self) -> engine::Missile { + engine::Missile { + pos: engine::geometry::Point::new(self.x, self.y), + damage: self.damage, + speed: self.speed, + } + } +} diff --git a/src/input/mod.rs b/src/input/mod.rs new file mode 100644 index 0000000..47f359a --- /dev/null +++ b/src/input/mod.rs @@ -0,0 +1,2 @@ +pub mod json; +pub mod textmap; diff --git a/src/input/textmap.rs b/src/input/textmap.rs new file mode 100644 index 0000000..dbee60a --- /dev/null +++ b/src/input/textmap.rs @@ -0,0 +1,67 @@ +use std::fs::File; +use std::io::prelude::*; +use std::error::Error; + +use ::engine::*; +use ::engine::settings::*; +use ::engine::geometry::*; + + +pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), Box> { + let mut file = File::open(filename)?; + let mut content = String::new(); + file.read_to_string(&mut content)?; + + let engine_settings = GameSettings { + size: Point::new(8,4), + energy_income: 5, + energy: BuildingSettings { + price: 20, + health: 5, + construction_time: 2-2, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 3 + }, + defence: BuildingSettings { + price: 30, + health: 20, + construction_time: 4-2, + weapon_damage: 0, + weapon_speed: 0, + weapon_cooldown_period: 0, + energy_generated_per_turn: 0 + }, + attack: BuildingSettings { + price: 30, + health: 5, + construction_time: 2-2, + weapon_damage: 5, + weapon_speed: 2, + weapon_cooldown_period: 3, + energy_generated_per_turn: 0 + } + }; + let engine_state = GameState::new( + Player { + energy: 20, + health: 5, + energy_generated: 5 + }, + Player { + energy: 20, + health: 5, + energy_generated: 5 + }, + Vec::new(), + Vec::new(), + Vec::new(), + Vec::new(), + Vec::new(), + Vec::new(), + &engine_settings + ); + + Ok((engine_settings, engine_state)) +} diff --git a/src/json.rs b/src/json.rs deleted file mode 100644 index 3a3fbf2..0000000 --- a/src/json.rs +++ /dev/null @@ -1,238 +0,0 @@ -use std::fs::File; -use std::io::prelude::*; -use serde_json; -use std::error::Error; - -use ::engine; - - -pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, engine::GameState), Box> { - let mut file = File::open(filename)?; - let mut content = String::new(); - file.read_to_string(&mut content)?; - let state: State = serde_json::from_str(content.as_ref())?; - - let engine_settings = state.to_engine_settings(); - let engine_state = state.to_engine(&engine_settings); - Ok((engine_settings, engine_state)) -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct State { - game_details: GameDetails, - players: Vec, - game_map: Vec>, -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct GameDetails { - //round: u16, - //max_rounds: u16, - map_width: u8, - map_height: u8, - round_income_energy: u16, - buildings_stats: BuildingStats -} - -#[derive(Deserialize)] -#[serde(rename_all = "SCREAMING_SNAKE_CASE")] -struct BuildingStats { - energy: BuildingBlueprint, - defense: BuildingBlueprint, - attack: BuildingBlueprint -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct BuildingBlueprint { - price: u16, - health: u8, - construction_time: u8, - weapon_damage: u8, - weapon_speed: u8, - weapon_cooldown_period: u8, - energy_generated_per_turn: u16, -// destroy_multiplier: u16, -// construction_score: u16 -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct Player { - player_type: char, - energy: u16, - health: u8, - //hits_taken: u32, - //score: u32 -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct GameCell { - //x: u8, - //y: u8, - buildings: Vec, - missiles: Vec, - //cell_owner: char -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct BuildingState { - health: u8, - construction_time_left: i8, - //price: u16, - weapon_damage: u8, - weapon_speed: u8, - weapon_cooldown_time_left: u8, - weapon_cooldown_period: u8, - //destroy_multiplier: u32, - //construction_score: u32, - energy_generated_per_turn: u16, - //building_type: String, - x: u8, - y: u8, - player_type: char -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct MissileState { - damage: u8, - speed: u8, - x: u8, - y: u8, - player_type: char -} - - -impl State { - fn to_engine_settings(&self) -> engine::settings::GameSettings { - engine::settings::GameSettings { - size: engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), - energy_income: self.game_details.round_income_energy, - energy: self.game_details.buildings_stats.energy.to_engine(), - defence: self.game_details.buildings_stats.defense.to_engine(), - attack: self.game_details.buildings_stats.attack.to_engine(), - } - } - - fn to_engine(&self, settings: &engine::settings::GameSettings) -> engine::GameState { - let player_buildings = self.buildings_to_engine('A'); - let opponent_buildings = self.buildings_to_engine('B'); - engine::GameState::new( - self.player().to_engine(settings, &player_buildings), - self.opponent().to_engine(settings, &opponent_buildings), - self.unconstructed_buildings_to_engine('A'), - player_buildings, - self.unconstructed_buildings_to_engine('B'), - opponent_buildings, - self.missiles_to_engine('A'), - self.missiles_to_engine('B'), - settings - ) - } - - fn player(&self) -> &Player { - self.players.iter() - .find(|p| p.player_type == 'A') - .expect("Player character did not appear in state.json") - } - - fn opponent(&self) -> &Player { - self.players.iter() - .find(|p| p.player_type == 'B') - .expect("Opponent character did not appear in state.json") - } - - fn unconstructed_buildings_to_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) - .map(|b| b.to_engine_unconstructed()) - ) - ) - .collect() - } - - fn buildings_to_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left < 0) - .map(|b| b.to_engine()) - ) - ) - .collect() - } - - fn missiles_to_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.missiles.iter() - .filter(|b| b.player_type == player_type) - .map(|b| b.to_engine()) - ) - ) - .collect() - } -} - -impl BuildingBlueprint { - fn to_engine(&self) -> engine::settings::BuildingSettings { - engine::settings::BuildingSettings { - price: self.price, - health: self.health, - construction_time: self.construction_time-2, - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - } - } -} - -impl Player { - fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[engine::Building]) -> engine::Player { - engine::Player::new(self.energy, self.health, settings, buildings) - } -} - -impl BuildingState { - fn to_engine(&self) -> engine::Building { - engine::Building { - pos: engine::geometry::Point::new(self.x, self.y), - health: self.health, - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_time_left: self.weapon_cooldown_time_left, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - } - } - - fn to_engine_unconstructed(&self) -> engine::UnconstructedBuilding { - engine::UnconstructedBuilding { - pos: engine::geometry::Point::new(self.x, self.y), - health: self.health, - construction_time_left: self.construction_time_left as u8, // > 0 check already happened - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - } - } -} - -impl MissileState { - fn to_engine(&self) -> engine::Missile { - engine::Missile { - pos: engine::geometry::Point::new(self.x, self.y), - damage: self.damage, - speed: self.speed, - } - } -} diff --git a/src/lib.rs b/src/lib.rs index 6bcfc00..7b15502 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,6 +9,6 @@ extern crate time; extern crate rayon; -pub mod json; +pub mod input; pub mod engine; pub mod strategy; diff --git a/src/main.rs b/src/main.rs index 651df35..e84e207 100644 --- a/src/main.rs +++ b/src/main.rs @@ -32,7 +32,7 @@ fn main() { let start_time = PreciseTime::now(); println!("Reading in state.json file"); - let (settings, state) = match json::read_state_from_file(STATE_PATH) { + let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { println!("Error while parsing JSON file: {}", error); diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 72358a7..8d619db 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -1,6 +1,6 @@ extern crate zombot; -use zombot::json; +use zombot::input::json; use zombot::engine::command::{Command, BuildingType}; use zombot::engine::geometry::Point; use zombot::engine::settings::GameSettings; -- cgit v1.2.3 From 5a6badb2b5c706d37732ff914838658424e15131 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 3 Jun 2018 18:48:40 +0200 Subject: Added todo --- src/input/textmap.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/input/textmap.rs b/src/input/textmap.rs index dbee60a..79fbe7f 100644 --- a/src/input/textmap.rs +++ b/src/input/textmap.rs @@ -12,6 +12,8 @@ pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), let mut content = String::new(); file.read_to_string(&mut content)?; + //TODO actually read the right file and parse it? + let engine_settings = GameSettings { size: Point::new(8,4), energy_income: 5, @@ -46,12 +48,12 @@ pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), let engine_state = GameState::new( Player { energy: 20, - health: 5, + health: 100, energy_generated: 5 }, Player { energy: 20, - health: 5, + health: 100, energy_generated: 5 }, Vec::new(), -- cgit v1.2.3 From b1a7c75f9d563a3f913f44e0a5bb93269487de1f Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 4 Jun 2018 23:21:02 +0200 Subject: Moved to replays that have missile position fix --- src/engine/mod.rs | 19 ++++++------------- tests/after_112/Round 000/OpponentCommand.txt | 1 - tests/after_112/Round 000/PlayerCommand.txt | 1 - tests/after_112/Round 001/OpponentCommand.txt | 1 - tests/after_112/Round 001/PlayerCommand.txt | 1 - tests/after_112/Round 002/OpponentCommand.txt | 1 - tests/after_112/Round 002/PlayerCommand.txt | 1 - tests/after_112/Round 003/OpponentCommand.txt | 1 - tests/after_112/Round 003/PlayerCommand.txt | 1 - tests/after_112/Round 004/OpponentCommand.txt | 1 - tests/after_112/Round 004/PlayerCommand.txt | 1 - tests/after_112/Round 005/OpponentCommand.txt | 1 - tests/after_112/Round 005/PlayerCommand.txt | 1 - tests/after_112/Round 006/OpponentCommand.txt | 1 - tests/after_112/Round 006/PlayerCommand.txt | 1 - tests/after_112/Round 007/OpponentCommand.txt | 1 - tests/after_112/Round 007/PlayerCommand.txt | 1 - tests/after_112/Round 008/OpponentCommand.txt | 1 - tests/after_112/Round 008/PlayerCommand.txt | 1 - tests/after_112/Round 009/OpponentCommand.txt | 1 - tests/after_112/Round 009/PlayerCommand.txt | 1 - tests/after_112/Round 010/OpponentCommand.txt | 1 - tests/after_112/Round 010/PlayerCommand.txt | 1 - tests/after_112/Round 011/OpponentCommand.txt | 1 - tests/after_112/Round 011/PlayerCommand.txt | 1 - tests/after_112/Round 012/OpponentCommand.txt | 1 - tests/after_112/Round 012/PlayerCommand.txt | 1 - tests/after_112/Round 013/OpponentCommand.txt | 1 - tests/after_112/Round 013/PlayerCommand.txt | 1 - tests/after_112/Round 014/OpponentCommand.txt | 1 - tests/after_112/Round 014/PlayerCommand.txt | 1 - tests/after_112/Round 015/OpponentCommand.txt | 1 - tests/after_112/Round 015/PlayerCommand.txt | 1 - tests/after_112/Round 016/OpponentCommand.txt | 1 - tests/after_112/Round 016/PlayerCommand.txt | 1 - tests/after_112/Round 017/OpponentCommand.txt | 1 - tests/after_112/Round 017/PlayerCommand.txt | 1 - tests/after_112/Round 018/OpponentCommand.txt | 1 - tests/after_112/Round 018/PlayerCommand.txt | 1 - tests/after_112/Round 019/OpponentCommand.txt | 1 - tests/after_112/Round 019/PlayerCommand.txt | 1 - tests/after_112/Round 020/OpponentCommand.txt | 1 - tests/after_112/Round 020/PlayerCommand.txt | 1 - tests/after_112/Round 021/OpponentCommand.txt | 1 - tests/after_112/Round 021/PlayerCommand.txt | 1 - tests/after_112/Round 022/OpponentCommand.txt | 1 - tests/after_112/Round 022/PlayerCommand.txt | 1 - tests/after_112/Round 023/OpponentCommand.txt | 1 - tests/after_112/Round 023/PlayerCommand.txt | 1 - tests/after_112/Round 024/OpponentCommand.txt | 1 - tests/after_112/Round 024/PlayerCommand.txt | 1 - tests/after_112/Round 025/OpponentCommand.txt | 1 - tests/after_112/Round 025/PlayerCommand.txt | 1 - tests/after_112/Round 026/OpponentCommand.txt | 1 - tests/after_112/Round 026/PlayerCommand.txt | 1 - tests/after_112/Round 027/OpponentCommand.txt | 1 - tests/after_112/Round 027/PlayerCommand.txt | 1 - tests/after_112/Round 028/OpponentCommand.txt | 1 - tests/after_112/Round 028/PlayerCommand.txt | 1 - tests/after_112/Round 029/OpponentCommand.txt | 1 - tests/after_112/Round 029/PlayerCommand.txt | 1 - tests/after_112/Round 030/OpponentCommand.txt | 1 - tests/after_112/Round 030/PlayerCommand.txt | 1 - tests/after_112/Round 031/OpponentCommand.txt | 1 - tests/after_112/Round 031/PlayerCommand.txt | 1 - tests/after_112/Round 032/OpponentCommand.txt | 1 - tests/after_112/Round 032/PlayerCommand.txt | 1 - tests/after_112/Round 033/OpponentCommand.txt | 1 - tests/after_112/Round 033/PlayerCommand.txt | 1 - tests/after_112/Round 034/OpponentCommand.txt | 1 - tests/after_112/Round 034/PlayerCommand.txt | 1 - tests/after_112/Round 035/OpponentCommand.txt | 1 - tests/after_112/Round 035/PlayerCommand.txt | 1 - tests/after_112/Round 036/OpponentCommand.txt | 1 - tests/after_112/Round 036/PlayerCommand.txt | 1 - tests/after_112/Round 037/OpponentCommand.txt | 1 - tests/after_112/Round 037/PlayerCommand.txt | 1 - tests/after_112/Round 038/OpponentCommand.txt | 1 - tests/after_112/Round 038/PlayerCommand.txt | 1 - tests/after_112/Round 039/OpponentCommand.txt | 1 - tests/after_112/Round 039/PlayerCommand.txt | 1 - tests/after_112/Round 040/OpponentCommand.txt | 1 - tests/after_112/Round 040/PlayerCommand.txt | 1 - tests/after_112/Round 041/OpponentCommand.txt | 1 - tests/after_112/Round 041/PlayerCommand.txt | 1 - tests/after_112/Round 042/OpponentCommand.txt | 1 - tests/after_112/Round 042/PlayerCommand.txt | 1 - tests/after_112/Round 043/OpponentCommand.txt | 1 - tests/after_112/Round 043/PlayerCommand.txt | 1 - tests/after_112/Round 044/OpponentCommand.txt | 1 - tests/after_112/Round 044/PlayerCommand.txt | 1 - tests/after_112/Round 045/OpponentCommand.txt | 1 - tests/after_112/Round 045/PlayerCommand.txt | 1 - tests/after_112/Round 046/OpponentCommand.txt | 1 - tests/after_112/Round 046/PlayerCommand.txt | 1 - tests/after_112/Round 047/OpponentCommand.txt | 1 - tests/after_112/Round 047/PlayerCommand.txt | 1 - tests/after_112/Round 048/OpponentCommand.txt | 1 - tests/after_112/Round 048/PlayerCommand.txt | 1 - tests/after_112/Round 049/OpponentCommand.txt | 1 - tests/after_112/Round 049/PlayerCommand.txt | 1 - tests/after_112/Round 050/OpponentCommand.txt | 1 - tests/after_112/Round 050/PlayerCommand.txt | 1 - tests/after_112/Round 051/OpponentCommand.txt | 1 - tests/after_112/Round 051/PlayerCommand.txt | 1 - tests/after_112/Round 052/OpponentCommand.txt | 1 - tests/after_112/Round 052/PlayerCommand.txt | 1 - tests/after_112/Round 053/OpponentCommand.txt | 1 - tests/after_112/Round 053/PlayerCommand.txt | 1 - tests/after_112/Round 054/OpponentCommand.txt | 1 - tests/after_112/Round 054/PlayerCommand.txt | 1 - tests/after_112_2/Round 000/OpponentCommand.txt | 1 - tests/after_112_2/Round 000/PlayerCommand.txt | 1 - tests/after_112_2/Round 001/OpponentCommand.txt | 1 - tests/after_112_2/Round 001/PlayerCommand.txt | 1 - tests/after_112_2/Round 002/OpponentCommand.txt | 1 - tests/after_112_2/Round 002/PlayerCommand.txt | 1 - tests/after_112_2/Round 003/OpponentCommand.txt | 1 - tests/after_112_2/Round 003/PlayerCommand.txt | 1 - tests/after_112_2/Round 004/OpponentCommand.txt | 1 - tests/after_112_2/Round 004/PlayerCommand.txt | 1 - tests/after_112_2/Round 005/OpponentCommand.txt | 1 - tests/after_112_2/Round 005/PlayerCommand.txt | 1 - tests/after_112_2/Round 006/OpponentCommand.txt | 1 - tests/after_112_2/Round 006/PlayerCommand.txt | 1 - tests/after_112_2/Round 007/OpponentCommand.txt | 1 - tests/after_112_2/Round 007/PlayerCommand.txt | 1 - tests/after_112_2/Round 008/OpponentCommand.txt | 1 - tests/after_112_2/Round 008/PlayerCommand.txt | 1 - tests/after_112_2/Round 009/OpponentCommand.txt | 1 - tests/after_112_2/Round 009/PlayerCommand.txt | 1 - tests/after_112_2/Round 010/OpponentCommand.txt | 1 - tests/after_112_2/Round 010/PlayerCommand.txt | 1 - tests/after_112_2/Round 011/OpponentCommand.txt | 1 - tests/after_112_2/Round 011/PlayerCommand.txt | 1 - tests/after_112_2/Round 012/OpponentCommand.txt | 1 - tests/after_112_2/Round 012/PlayerCommand.txt | 1 - tests/after_112_2/Round 013/OpponentCommand.txt | 1 - tests/after_112_2/Round 013/PlayerCommand.txt | 1 - tests/after_112_2/Round 014/OpponentCommand.txt | 1 - tests/after_112_2/Round 014/PlayerCommand.txt | 1 - tests/after_112_2/Round 015/OpponentCommand.txt | 1 - tests/after_112_2/Round 015/PlayerCommand.txt | 1 - tests/after_112_2/Round 016/OpponentCommand.txt | 1 - tests/after_112_2/Round 016/PlayerCommand.txt | 1 - tests/after_112_2/Round 017/OpponentCommand.txt | 1 - tests/after_112_2/Round 017/PlayerCommand.txt | 1 - tests/after_112_2/Round 018/OpponentCommand.txt | 1 - tests/after_112_2/Round 018/PlayerCommand.txt | 1 - tests/after_112_2/Round 019/OpponentCommand.txt | 1 - tests/after_112_2/Round 019/PlayerCommand.txt | 1 - tests/after_112_2/Round 020/OpponentCommand.txt | 1 - tests/after_112_2/Round 020/PlayerCommand.txt | 1 - tests/after_112_2/Round 021/OpponentCommand.txt | 1 - tests/after_112_2/Round 021/PlayerCommand.txt | 1 - tests/after_112_2/Round 022/OpponentCommand.txt | 1 - tests/after_112_2/Round 022/PlayerCommand.txt | 1 - tests/after_112_2/Round 023/OpponentCommand.txt | 1 - tests/after_112_2/Round 023/PlayerCommand.txt | 1 - tests/after_112_2/Round 024/OpponentCommand.txt | 1 - tests/after_112_2/Round 024/PlayerCommand.txt | 1 - tests/after_112_2/Round 025/OpponentCommand.txt | 1 - tests/after_112_2/Round 025/PlayerCommand.txt | 1 - tests/after_112_2/Round 026/OpponentCommand.txt | 1 - tests/after_112_2/Round 026/PlayerCommand.txt | 1 - tests/after_112_2/Round 027/OpponentCommand.txt | 1 - tests/after_112_2/Round 027/PlayerCommand.txt | 1 - tests/after_112_2/Round 028/OpponentCommand.txt | 1 - tests/after_112_2/Round 028/PlayerCommand.txt | 1 - tests/after_112_2/Round 029/OpponentCommand.txt | 1 - tests/after_112_2/Round 029/PlayerCommand.txt | 1 - tests/after_112_2/Round 030/OpponentCommand.txt | 1 - tests/after_112_2/Round 030/PlayerCommand.txt | 1 - tests/after_112_2/Round 031/OpponentCommand.txt | 1 - tests/after_112_2/Round 031/PlayerCommand.txt | 1 - tests/after_112_2/Round 032/OpponentCommand.txt | 1 - tests/after_112_2/Round 032/PlayerCommand.txt | 1 - tests/after_112_2/Round 033/OpponentCommand.txt | 1 - tests/after_112_2/Round 033/PlayerCommand.txt | 1 - tests/after_112_2/Round 034/OpponentCommand.txt | 1 - tests/after_112_2/Round 034/PlayerCommand.txt | 1 - tests/after_112_2/Round 035/OpponentCommand.txt | 1 - tests/after_112_2/Round 035/PlayerCommand.txt | 1 - tests/after_112_2/Round 036/OpponentCommand.txt | 1 - tests/after_112_2/Round 036/PlayerCommand.txt | 1 - tests/after_112_2/Round 037/OpponentCommand.txt | 1 - tests/after_112_2/Round 037/PlayerCommand.txt | 1 - tests/after_112_2/Round 038/OpponentCommand.txt | 1 - tests/after_112_2/Round 038/PlayerCommand.txt | 1 - tests/after_112_2/Round 039/OpponentCommand.txt | 1 - tests/after_112_2/Round 039/PlayerCommand.txt | 1 - tests/after_112_2/Round 040/OpponentCommand.txt | 1 - tests/after_112_2/Round 040/PlayerCommand.txt | 1 - tests/after_112_2/Round 041/OpponentCommand.txt | 1 - tests/after_112_2/Round 041/PlayerCommand.txt | 1 - tests/after_112_2/Round 042/OpponentCommand.txt | 1 - tests/after_112_2/Round 042/PlayerCommand.txt | 1 - tests/after_112_2/Round 043/OpponentCommand.txt | 1 - tests/after_112_2/Round 043/PlayerCommand.txt | 1 - tests/after_112_2/Round 044/OpponentCommand.txt | 1 - tests/after_112_2/Round 044/PlayerCommand.txt | 1 - tests/after_112_2/Round 045/OpponentCommand.txt | 1 - tests/after_112_2/Round 045/PlayerCommand.txt | 1 - tests/after_112_2/Round 046/OpponentCommand.txt | 1 - tests/after_112_2/Round 046/PlayerCommand.txt | 1 - tests/after_112_2/Round 047/OpponentCommand.txt | 1 - tests/after_112_2/Round 047/PlayerCommand.txt | 1 - tests/after_112_2/Round 048/OpponentCommand.txt | 1 - tests/after_112_2/Round 048/PlayerCommand.txt | 1 - tests/after_112_2/Round 049/OpponentCommand.txt | 1 - tests/after_112_2/Round 049/PlayerCommand.txt | 1 - tests/after_112_2/Round 050/OpponentCommand.txt | 1 - tests/after_112_2/Round 050/PlayerCommand.txt | 1 - tests/after_112_2/Round 051/OpponentCommand.txt | 1 - tests/after_112_2/Round 051/PlayerCommand.txt | 1 - tests/after_112_2/Round 052/OpponentCommand.txt | 1 - tests/after_112_2/Round 052/PlayerCommand.txt | 1 - tests/after_112_2/Round 053/OpponentCommand.txt | 1 - tests/after_112_2/Round 053/PlayerCommand.txt | 1 - tests/after_112_2/Round 054/OpponentCommand.txt | 1 - tests/after_112_2/Round 054/PlayerCommand.txt | 1 - tests/after_112_2/Round 055/OpponentCommand.txt | 1 - tests/after_112_2/Round 055/PlayerCommand.txt | 1 - tests/after_112_2/Round 056/OpponentCommand.txt | 1 - tests/after_112_2/Round 056/PlayerCommand.txt | 1 - tests/after_112_2/Round 057/OpponentCommand.txt | 1 - tests/after_112_2/Round 057/PlayerCommand.txt | 1 - tests/after_112_2/Round 058/OpponentCommand.txt | 1 - tests/after_112_2/Round 058/PlayerCommand.txt | 1 - tests/after_112_2/Round 059/OpponentCommand.txt | 1 - tests/after_112_2/Round 059/PlayerCommand.txt | 1 - tests/after_112_2/Round 060/OpponentCommand.txt | 1 - tests/after_112_2/Round 060/PlayerCommand.txt | 1 - tests/after_112_2/Round 061/OpponentCommand.txt | 1 - tests/after_112_2/Round 061/PlayerCommand.txt | 1 - tests/after_112_2/Round 062/OpponentCommand.txt | 1 - tests/after_112_2/Round 062/PlayerCommand.txt | 1 - tests/after_112_2/Round 063/OpponentCommand.txt | 1 - tests/after_112_2/Round 063/PlayerCommand.txt | 1 - tests/after_112_2/Round 064/OpponentCommand.txt | 1 - tests/after_112_2/Round 064/PlayerCommand.txt | 1 - tests/after_112_2/Round 065/OpponentCommand.txt | 1 - tests/after_112_2/Round 065/PlayerCommand.txt | 1 - tests/after_112_2/Round 066/OpponentCommand.txt | 1 - tests/after_112_2/Round 066/PlayerCommand.txt | 1 - tests/after_112_2/Round 067/OpponentCommand.txt | 1 - tests/after_112_2/Round 067/PlayerCommand.txt | 1 - tests/after_112_2/Round 068/OpponentCommand.txt | 1 - tests/after_112_2/Round 068/PlayerCommand.txt | 1 - tests/after_112_2/Round 069/OpponentCommand.txt | 1 - tests/after_112_2/Round 069/PlayerCommand.txt | 1 - tests/after_112_2/Round 070/OpponentCommand.txt | 1 - tests/after_112_2/Round 070/PlayerCommand.txt | 1 - tests/after_112_2/Round 071/OpponentCommand.txt | 1 - tests/after_112_2/Round 071/PlayerCommand.txt | 1 - tests/after_112_2/Round 072/OpponentCommand.txt | 1 - tests/after_112_2/Round 072/PlayerCommand.txt | 1 - tests/after_112_2/Round 073/OpponentCommand.txt | 1 - tests/after_112_2/Round 073/PlayerCommand.txt | 1 - tests/after_112_2/Round 074/OpponentCommand.txt | 1 - tests/after_112_2/Round 074/PlayerCommand.txt | 1 - tests/after_112_2/Round 075/OpponentCommand.txt | 1 - tests/after_112_2/Round 075/PlayerCommand.txt | 1 - tests/after_112_2/Round 076/OpponentCommand.txt | 1 - tests/after_112_2/Round 076/PlayerCommand.txt | 1 - tests/after_113/Round 000/OpponentCommand.txt | 1 + tests/after_113/Round 000/PlayerCommand.txt | 1 + tests/after_113/Round 001/OpponentCommand.txt | 1 + tests/after_113/Round 001/PlayerCommand.txt | 1 + tests/after_113/Round 002/OpponentCommand.txt | 1 + tests/after_113/Round 002/PlayerCommand.txt | 1 + tests/after_113/Round 003/OpponentCommand.txt | 1 + tests/after_113/Round 003/PlayerCommand.txt | 1 + tests/after_113/Round 004/OpponentCommand.txt | 1 + tests/after_113/Round 004/PlayerCommand.txt | 1 + tests/after_113/Round 005/OpponentCommand.txt | 1 + tests/after_113/Round 005/PlayerCommand.txt | 1 + tests/after_113/Round 006/OpponentCommand.txt | 1 + tests/after_113/Round 006/PlayerCommand.txt | 1 + tests/after_113/Round 007/OpponentCommand.txt | 1 + tests/after_113/Round 007/PlayerCommand.txt | 1 + tests/after_113/Round 008/OpponentCommand.txt | 1 + tests/after_113/Round 008/PlayerCommand.txt | 1 + tests/after_113/Round 009/OpponentCommand.txt | 1 + tests/after_113/Round 009/PlayerCommand.txt | 1 + tests/after_113/Round 010/OpponentCommand.txt | 1 + tests/after_113/Round 010/PlayerCommand.txt | 1 + tests/after_113/Round 011/OpponentCommand.txt | 1 + tests/after_113/Round 011/PlayerCommand.txt | 1 + tests/after_113/Round 012/OpponentCommand.txt | 1 + tests/after_113/Round 012/PlayerCommand.txt | 1 + tests/after_113/Round 013/OpponentCommand.txt | 1 + tests/after_113/Round 013/PlayerCommand.txt | 1 + tests/after_113/Round 014/OpponentCommand.txt | 1 + tests/after_113/Round 014/PlayerCommand.txt | 1 + tests/after_113/Round 015/OpponentCommand.txt | 1 + tests/after_113/Round 015/PlayerCommand.txt | 1 + tests/after_113/Round 016/OpponentCommand.txt | 1 + tests/after_113/Round 016/PlayerCommand.txt | 1 + tests/after_113/Round 017/OpponentCommand.txt | 1 + tests/after_113/Round 017/PlayerCommand.txt | 1 + tests/after_113/Round 018/OpponentCommand.txt | 1 + tests/after_113/Round 018/PlayerCommand.txt | 1 + tests/after_113/Round 019/OpponentCommand.txt | 1 + tests/after_113/Round 019/PlayerCommand.txt | 1 + tests/after_113/Round 020/OpponentCommand.txt | 1 + tests/after_113/Round 020/PlayerCommand.txt | 1 + tests/after_113/Round 021/OpponentCommand.txt | 1 + tests/after_113/Round 021/PlayerCommand.txt | 1 + tests/after_113/Round 022/OpponentCommand.txt | 1 + tests/after_113/Round 022/PlayerCommand.txt | 1 + tests/after_113/Round 023/OpponentCommand.txt | 1 + tests/after_113/Round 023/PlayerCommand.txt | 1 + tests/after_113/Round 024/OpponentCommand.txt | 1 + tests/after_113/Round 024/PlayerCommand.txt | 1 + tests/after_113/Round 025/OpponentCommand.txt | 1 + tests/after_113/Round 025/PlayerCommand.txt | 1 + tests/after_113/Round 026/OpponentCommand.txt | 1 + tests/after_113/Round 026/PlayerCommand.txt | 1 + tests/after_113/Round 027/OpponentCommand.txt | 1 + tests/after_113/Round 027/PlayerCommand.txt | 1 + tests/after_113/Round 028/OpponentCommand.txt | 1 + tests/after_113/Round 028/PlayerCommand.txt | 1 + tests/after_113/Round 029/OpponentCommand.txt | 1 + tests/after_113/Round 029/PlayerCommand.txt | 1 + tests/after_113/Round 030/OpponentCommand.txt | 1 + tests/after_113/Round 030/PlayerCommand.txt | 1 + tests/after_113/Round 031/OpponentCommand.txt | 1 + tests/after_113/Round 031/PlayerCommand.txt | 1 + tests/after_113/Round 032/OpponentCommand.txt | 1 + tests/after_113/Round 032/PlayerCommand.txt | 1 + tests/after_113/Round 033/OpponentCommand.txt | 1 + tests/after_113/Round 033/PlayerCommand.txt | 1 + tests/after_113/Round 034/OpponentCommand.txt | 1 + tests/after_113/Round 034/PlayerCommand.txt | 1 + tests/after_113/Round 035/OpponentCommand.txt | 1 + tests/after_113/Round 035/PlayerCommand.txt | 1 + tests/after_113/Round 036/OpponentCommand.txt | 1 + tests/after_113/Round 036/PlayerCommand.txt | 1 + tests/after_113/Round 037/OpponentCommand.txt | 1 + tests/after_113/Round 037/PlayerCommand.txt | 1 + tests/after_113/Round 038/OpponentCommand.txt | 1 + tests/after_113/Round 038/PlayerCommand.txt | 1 + tests/after_113/Round 039/OpponentCommand.txt | 1 + tests/after_113/Round 039/PlayerCommand.txt | 1 + tests/after_113/Round 040/OpponentCommand.txt | 1 + tests/after_113/Round 040/PlayerCommand.txt | 1 + tests/after_113/Round 041/OpponentCommand.txt | 1 + tests/after_113/Round 041/PlayerCommand.txt | 1 + tests/after_113/Round 042/OpponentCommand.txt | 1 + tests/after_113/Round 042/PlayerCommand.txt | 1 + tests/after_113/Round 043/OpponentCommand.txt | 1 + tests/after_113/Round 043/PlayerCommand.txt | 1 + tests/after_113/Round 044/OpponentCommand.txt | 1 + tests/after_113/Round 044/PlayerCommand.txt | 1 + tests/after_113/Round 045/OpponentCommand.txt | 1 + tests/after_113/Round 045/PlayerCommand.txt | 1 + tests/after_113/Round 046/OpponentCommand.txt | 1 + tests/after_113/Round 046/PlayerCommand.txt | 1 + tests/after_113/Round 047/OpponentCommand.txt | 1 + tests/after_113/Round 047/PlayerCommand.txt | 1 + tests/after_113/Round 048/OpponentCommand.txt | 1 + tests/after_113/Round 048/PlayerCommand.txt | 1 + tests/after_113/Round 049/OpponentCommand.txt | 1 + tests/after_113/Round 049/PlayerCommand.txt | 1 + tests/after_113/Round 050/OpponentCommand.txt | 1 + tests/after_113/Round 050/PlayerCommand.txt | 1 + tests/after_113/Round 051/OpponentCommand.txt | 1 + tests/after_113/Round 051/PlayerCommand.txt | 1 + tests/after_113/Round 052/OpponentCommand.txt | 1 + tests/after_113/Round 052/PlayerCommand.txt | 1 + tests/after_113/Round 053/OpponentCommand.txt | 1 + tests/after_113/Round 053/PlayerCommand.txt | 1 + tests/after_113/Round 054/OpponentCommand.txt | 1 + tests/after_113/Round 054/PlayerCommand.txt | 1 + tests/after_113/Round 055/OpponentCommand.txt | 1 + tests/after_113/Round 055/PlayerCommand.txt | 1 + tests/after_113/Round 056/OpponentCommand.txt | 1 + tests/after_113/Round 056/PlayerCommand.txt | 1 + tests/after_113/Round 057/OpponentCommand.txt | 1 + tests/after_113/Round 057/PlayerCommand.txt | 1 + tests/after_113/Round 058/OpponentCommand.txt | 1 + tests/after_113/Round 058/PlayerCommand.txt | 1 + tests/after_113/Round 059/OpponentCommand.txt | 1 + tests/after_113/Round 059/PlayerCommand.txt | 1 + tests/after_113/Round 060/OpponentCommand.txt | 1 + tests/after_113/Round 060/PlayerCommand.txt | 1 + tests/after_113/Round 061/OpponentCommand.txt | 1 + tests/after_113/Round 061/PlayerCommand.txt | 1 + tests/after_113/Round 062/OpponentCommand.txt | 1 + tests/after_113/Round 062/PlayerCommand.txt | 1 + tests/after_113/Round 063/OpponentCommand.txt | 1 + tests/after_113/Round 063/PlayerCommand.txt | 1 + tests/after_113/Round 064/OpponentCommand.txt | 1 + tests/after_113/Round 064/PlayerCommand.txt | 1 + tests/after_113/Round 065/OpponentCommand.txt | 1 + tests/after_113/Round 065/PlayerCommand.txt | 1 + tests/after_113/Round 066/OpponentCommand.txt | 1 + tests/after_113/Round 066/PlayerCommand.txt | 1 + tests/after_113/Round 067/OpponentCommand.txt | 1 + tests/after_113/Round 067/PlayerCommand.txt | 1 + tests/after_113/Round 068/OpponentCommand.txt | 1 + tests/after_113/Round 068/PlayerCommand.txt | 1 + tests/after_113/Round 069/OpponentCommand.txt | 1 + tests/after_113/Round 069/PlayerCommand.txt | 1 + tests/after_113/Round 070/OpponentCommand.txt | 1 + tests/after_113/Round 070/PlayerCommand.txt | 1 + tests/after_113_2/Round 000/OpponentCommand.txt | 1 + tests/after_113_2/Round 000/PlayerCommand.txt | 1 + tests/after_113_2/Round 001/OpponentCommand.txt | 1 + tests/after_113_2/Round 001/PlayerCommand.txt | 1 + tests/after_113_2/Round 002/OpponentCommand.txt | 1 + tests/after_113_2/Round 002/PlayerCommand.txt | 1 + tests/after_113_2/Round 003/OpponentCommand.txt | 1 + tests/after_113_2/Round 003/PlayerCommand.txt | 1 + tests/after_113_2/Round 004/OpponentCommand.txt | 1 + tests/after_113_2/Round 004/PlayerCommand.txt | 1 + tests/after_113_2/Round 005/OpponentCommand.txt | 1 + tests/after_113_2/Round 005/PlayerCommand.txt | 1 + tests/after_113_2/Round 006/OpponentCommand.txt | 1 + tests/after_113_2/Round 006/PlayerCommand.txt | 1 + tests/after_113_2/Round 007/OpponentCommand.txt | 1 + tests/after_113_2/Round 007/PlayerCommand.txt | 1 + tests/after_113_2/Round 008/OpponentCommand.txt | 1 + tests/after_113_2/Round 008/PlayerCommand.txt | 1 + tests/after_113_2/Round 009/OpponentCommand.txt | 1 + tests/after_113_2/Round 009/PlayerCommand.txt | 1 + tests/after_113_2/Round 010/OpponentCommand.txt | 1 + tests/after_113_2/Round 010/PlayerCommand.txt | 1 + tests/after_113_2/Round 011/OpponentCommand.txt | 1 + tests/after_113_2/Round 011/PlayerCommand.txt | 1 + tests/after_113_2/Round 012/OpponentCommand.txt | 1 + tests/after_113_2/Round 012/PlayerCommand.txt | 1 + tests/after_113_2/Round 013/OpponentCommand.txt | 1 + tests/after_113_2/Round 013/PlayerCommand.txt | 1 + tests/after_113_2/Round 014/OpponentCommand.txt | 1 + tests/after_113_2/Round 014/PlayerCommand.txt | 1 + tests/after_113_2/Round 015/OpponentCommand.txt | 1 + tests/after_113_2/Round 015/PlayerCommand.txt | 1 + tests/after_113_2/Round 016/OpponentCommand.txt | 1 + tests/after_113_2/Round 016/PlayerCommand.txt | 1 + tests/after_113_2/Round 017/OpponentCommand.txt | 1 + tests/after_113_2/Round 017/PlayerCommand.txt | 1 + tests/after_113_2/Round 018/OpponentCommand.txt | 1 + tests/after_113_2/Round 018/PlayerCommand.txt | 1 + tests/after_113_2/Round 019/OpponentCommand.txt | 1 + tests/after_113_2/Round 019/PlayerCommand.txt | 1 + tests/after_113_2/Round 020/OpponentCommand.txt | 1 + tests/after_113_2/Round 020/PlayerCommand.txt | 1 + tests/after_113_2/Round 021/OpponentCommand.txt | 1 + tests/after_113_2/Round 021/PlayerCommand.txt | 1 + tests/after_113_2/Round 022/OpponentCommand.txt | 1 + tests/after_113_2/Round 022/PlayerCommand.txt | 1 + tests/after_113_2/Round 023/OpponentCommand.txt | 1 + tests/after_113_2/Round 023/PlayerCommand.txt | 1 + tests/after_113_2/Round 024/OpponentCommand.txt | 1 + tests/after_113_2/Round 024/PlayerCommand.txt | 1 + tests/after_113_2/Round 025/OpponentCommand.txt | 1 + tests/after_113_2/Round 025/PlayerCommand.txt | 1 + tests/after_113_2/Round 026/OpponentCommand.txt | 1 + tests/after_113_2/Round 026/PlayerCommand.txt | 1 + tests/after_113_2/Round 027/OpponentCommand.txt | 1 + tests/after_113_2/Round 027/PlayerCommand.txt | 1 + tests/after_113_2/Round 028/OpponentCommand.txt | 1 + tests/after_113_2/Round 028/PlayerCommand.txt | 1 + tests/after_113_2/Round 029/OpponentCommand.txt | 1 + tests/after_113_2/Round 029/PlayerCommand.txt | 1 + tests/after_113_2/Round 030/OpponentCommand.txt | 1 + tests/after_113_2/Round 030/PlayerCommand.txt | 1 + tests/after_113_2/Round 031/OpponentCommand.txt | 1 + tests/after_113_2/Round 031/PlayerCommand.txt | 1 + tests/after_113_2/Round 032/OpponentCommand.txt | 1 + tests/after_113_2/Round 032/PlayerCommand.txt | 1 + tests/after_113_2/Round 033/OpponentCommand.txt | 1 + tests/after_113_2/Round 033/PlayerCommand.txt | 1 + tests/after_113_2/Round 034/OpponentCommand.txt | 1 + tests/after_113_2/Round 034/PlayerCommand.txt | 1 + tests/after_113_2/Round 035/OpponentCommand.txt | 1 + tests/after_113_2/Round 035/PlayerCommand.txt | 1 + tests/after_113_2/Round 036/OpponentCommand.txt | 1 + tests/after_113_2/Round 036/PlayerCommand.txt | 1 + tests/after_113_2/Round 037/OpponentCommand.txt | 1 + tests/after_113_2/Round 037/PlayerCommand.txt | 1 + tests/after_113_2/Round 038/OpponentCommand.txt | 1 + tests/after_113_2/Round 038/PlayerCommand.txt | 1 + tests/after_113_2/Round 039/OpponentCommand.txt | 1 + tests/after_113_2/Round 039/PlayerCommand.txt | 1 + tests/after_113_2/Round 040/OpponentCommand.txt | 1 + tests/after_113_2/Round 040/PlayerCommand.txt | 1 + tests/after_113_2/Round 041/OpponentCommand.txt | 1 + tests/after_113_2/Round 041/PlayerCommand.txt | 1 + tests/after_113_2/Round 042/OpponentCommand.txt | 1 + tests/after_113_2/Round 042/PlayerCommand.txt | 1 + tests/after_113_2/Round 043/OpponentCommand.txt | 1 + tests/after_113_2/Round 043/PlayerCommand.txt | 1 + tests/after_113_2/Round 044/OpponentCommand.txt | 1 + tests/after_113_2/Round 044/PlayerCommand.txt | 1 + tests/after_113_2/Round 045/OpponentCommand.txt | 1 + tests/after_113_2/Round 045/PlayerCommand.txt | 1 + tests/after_113_2/Round 046/OpponentCommand.txt | 1 + tests/after_113_2/Round 046/PlayerCommand.txt | 1 + tests/after_113_2/Round 047/OpponentCommand.txt | 1 + tests/after_113_2/Round 047/PlayerCommand.txt | 1 + tests/after_113_2/Round 048/OpponentCommand.txt | 1 + tests/after_113_2/Round 048/PlayerCommand.txt | 1 + tests/after_113_2/Round 049/OpponentCommand.txt | 1 + tests/after_113_2/Round 049/PlayerCommand.txt | 1 + tests/after_113_2/Round 050/OpponentCommand.txt | 1 + tests/after_113_2/Round 050/PlayerCommand.txt | 1 + tests/after_113_2/Round 051/OpponentCommand.txt | 1 + tests/after_113_2/Round 051/PlayerCommand.txt | 1 + tests/after_113_2/Round 052/OpponentCommand.txt | 1 + tests/after_113_2/Round 052/PlayerCommand.txt | 1 + tests/after_113_2/Round 053/OpponentCommand.txt | 1 + tests/after_113_2/Round 053/PlayerCommand.txt | 1 + tests/after_113_2/Round 054/OpponentCommand.txt | 1 + tests/after_113_2/Round 054/PlayerCommand.txt | 1 + tests/after_113_2/Round 055/OpponentCommand.txt | 1 + tests/after_113_2/Round 055/PlayerCommand.txt | 1 + tests/after_113_2/Round 056/OpponentCommand.txt | 1 + tests/after_113_2/Round 056/PlayerCommand.txt | 1 + tests/after_113_2/Round 057/OpponentCommand.txt | 1 + tests/after_113_2/Round 057/PlayerCommand.txt | 1 + tests/after_113_2/Round 058/OpponentCommand.txt | 1 + tests/after_113_2/Round 058/PlayerCommand.txt | 1 + tests/after_113_2/Round 059/OpponentCommand.txt | 1 + tests/after_113_2/Round 059/PlayerCommand.txt | 1 + tests/after_113_2/Round 060/OpponentCommand.txt | 1 + tests/after_113_2/Round 060/PlayerCommand.txt | 1 + tests/after_113_2/Round 061/OpponentCommand.txt | 1 + tests/after_113_2/Round 061/PlayerCommand.txt | 1 + tests/after_113_2/Round 062/OpponentCommand.txt | 1 + tests/after_113_2/Round 062/PlayerCommand.txt | 1 + tests/after_113_2/Round 063/OpponentCommand.txt | 1 + tests/after_113_2/Round 063/PlayerCommand.txt | 1 + tests/after_113_2/Round 064/OpponentCommand.txt | 1 + tests/after_113_2/Round 064/PlayerCommand.txt | 1 + tests/after_113_2/Round 065/OpponentCommand.txt | 1 + tests/after_113_2/Round 065/PlayerCommand.txt | 1 + tests/live-comparison.rs | 6 +++--- 540 files changed, 283 insertions(+), 280 deletions(-) delete mode 100644 tests/after_112/Round 000/OpponentCommand.txt delete mode 100644 tests/after_112/Round 000/PlayerCommand.txt delete mode 100644 tests/after_112/Round 001/OpponentCommand.txt delete mode 100644 tests/after_112/Round 001/PlayerCommand.txt delete mode 100644 tests/after_112/Round 002/OpponentCommand.txt delete mode 100644 tests/after_112/Round 002/PlayerCommand.txt delete mode 100644 tests/after_112/Round 003/OpponentCommand.txt delete mode 100644 tests/after_112/Round 003/PlayerCommand.txt delete mode 100644 tests/after_112/Round 004/OpponentCommand.txt delete mode 100644 tests/after_112/Round 004/PlayerCommand.txt delete mode 100644 tests/after_112/Round 005/OpponentCommand.txt delete mode 100644 tests/after_112/Round 005/PlayerCommand.txt delete mode 100644 tests/after_112/Round 006/OpponentCommand.txt delete mode 100644 tests/after_112/Round 006/PlayerCommand.txt delete mode 100644 tests/after_112/Round 007/OpponentCommand.txt delete mode 100644 tests/after_112/Round 007/PlayerCommand.txt delete mode 100644 tests/after_112/Round 008/OpponentCommand.txt delete mode 100644 tests/after_112/Round 008/PlayerCommand.txt delete mode 100644 tests/after_112/Round 009/OpponentCommand.txt delete mode 100644 tests/after_112/Round 009/PlayerCommand.txt delete mode 100644 tests/after_112/Round 010/OpponentCommand.txt delete mode 100644 tests/after_112/Round 010/PlayerCommand.txt delete mode 100644 tests/after_112/Round 011/OpponentCommand.txt delete mode 100644 tests/after_112/Round 011/PlayerCommand.txt delete mode 100644 tests/after_112/Round 012/OpponentCommand.txt delete mode 100644 tests/after_112/Round 012/PlayerCommand.txt delete mode 100644 tests/after_112/Round 013/OpponentCommand.txt delete mode 100644 tests/after_112/Round 013/PlayerCommand.txt delete mode 100644 tests/after_112/Round 014/OpponentCommand.txt delete mode 100644 tests/after_112/Round 014/PlayerCommand.txt delete mode 100644 tests/after_112/Round 015/OpponentCommand.txt delete mode 100644 tests/after_112/Round 015/PlayerCommand.txt delete mode 100644 tests/after_112/Round 016/OpponentCommand.txt delete mode 100644 tests/after_112/Round 016/PlayerCommand.txt delete mode 100644 tests/after_112/Round 017/OpponentCommand.txt delete mode 100644 tests/after_112/Round 017/PlayerCommand.txt delete mode 100644 tests/after_112/Round 018/OpponentCommand.txt delete mode 100644 tests/after_112/Round 018/PlayerCommand.txt delete mode 100644 tests/after_112/Round 019/OpponentCommand.txt delete mode 100644 tests/after_112/Round 019/PlayerCommand.txt delete mode 100644 tests/after_112/Round 020/OpponentCommand.txt delete mode 100644 tests/after_112/Round 020/PlayerCommand.txt delete mode 100644 tests/after_112/Round 021/OpponentCommand.txt delete mode 100644 tests/after_112/Round 021/PlayerCommand.txt delete mode 100644 tests/after_112/Round 022/OpponentCommand.txt delete mode 100644 tests/after_112/Round 022/PlayerCommand.txt delete mode 100644 tests/after_112/Round 023/OpponentCommand.txt delete mode 100644 tests/after_112/Round 023/PlayerCommand.txt delete mode 100644 tests/after_112/Round 024/OpponentCommand.txt delete mode 100644 tests/after_112/Round 024/PlayerCommand.txt delete mode 100644 tests/after_112/Round 025/OpponentCommand.txt delete mode 100644 tests/after_112/Round 025/PlayerCommand.txt delete mode 100644 tests/after_112/Round 026/OpponentCommand.txt delete mode 100644 tests/after_112/Round 026/PlayerCommand.txt delete mode 100644 tests/after_112/Round 027/OpponentCommand.txt delete mode 100644 tests/after_112/Round 027/PlayerCommand.txt delete mode 100644 tests/after_112/Round 028/OpponentCommand.txt delete mode 100644 tests/after_112/Round 028/PlayerCommand.txt delete mode 100644 tests/after_112/Round 029/OpponentCommand.txt delete mode 100644 tests/after_112/Round 029/PlayerCommand.txt delete mode 100644 tests/after_112/Round 030/OpponentCommand.txt delete mode 100644 tests/after_112/Round 030/PlayerCommand.txt delete mode 100644 tests/after_112/Round 031/OpponentCommand.txt delete mode 100644 tests/after_112/Round 031/PlayerCommand.txt delete mode 100644 tests/after_112/Round 032/OpponentCommand.txt delete mode 100644 tests/after_112/Round 032/PlayerCommand.txt delete mode 100644 tests/after_112/Round 033/OpponentCommand.txt delete mode 100644 tests/after_112/Round 033/PlayerCommand.txt delete mode 100644 tests/after_112/Round 034/OpponentCommand.txt delete mode 100644 tests/after_112/Round 034/PlayerCommand.txt delete mode 100644 tests/after_112/Round 035/OpponentCommand.txt delete mode 100644 tests/after_112/Round 035/PlayerCommand.txt delete mode 100644 tests/after_112/Round 036/OpponentCommand.txt delete mode 100644 tests/after_112/Round 036/PlayerCommand.txt delete mode 100644 tests/after_112/Round 037/OpponentCommand.txt delete mode 100644 tests/after_112/Round 037/PlayerCommand.txt delete mode 100644 tests/after_112/Round 038/OpponentCommand.txt delete mode 100644 tests/after_112/Round 038/PlayerCommand.txt delete mode 100644 tests/after_112/Round 039/OpponentCommand.txt delete mode 100644 tests/after_112/Round 039/PlayerCommand.txt delete mode 100644 tests/after_112/Round 040/OpponentCommand.txt delete mode 100644 tests/after_112/Round 040/PlayerCommand.txt delete mode 100644 tests/after_112/Round 041/OpponentCommand.txt delete mode 100644 tests/after_112/Round 041/PlayerCommand.txt delete mode 100644 tests/after_112/Round 042/OpponentCommand.txt delete mode 100644 tests/after_112/Round 042/PlayerCommand.txt delete mode 100644 tests/after_112/Round 043/OpponentCommand.txt delete mode 100644 tests/after_112/Round 043/PlayerCommand.txt delete mode 100644 tests/after_112/Round 044/OpponentCommand.txt delete mode 100644 tests/after_112/Round 044/PlayerCommand.txt delete mode 100644 tests/after_112/Round 045/OpponentCommand.txt delete mode 100644 tests/after_112/Round 045/PlayerCommand.txt delete mode 100644 tests/after_112/Round 046/OpponentCommand.txt delete mode 100644 tests/after_112/Round 046/PlayerCommand.txt delete mode 100644 tests/after_112/Round 047/OpponentCommand.txt delete mode 100644 tests/after_112/Round 047/PlayerCommand.txt delete mode 100644 tests/after_112/Round 048/OpponentCommand.txt delete mode 100644 tests/after_112/Round 048/PlayerCommand.txt delete mode 100644 tests/after_112/Round 049/OpponentCommand.txt delete mode 100644 tests/after_112/Round 049/PlayerCommand.txt delete mode 100644 tests/after_112/Round 050/OpponentCommand.txt delete mode 100644 tests/after_112/Round 050/PlayerCommand.txt delete mode 100644 tests/after_112/Round 051/OpponentCommand.txt delete mode 100644 tests/after_112/Round 051/PlayerCommand.txt delete mode 100644 tests/after_112/Round 052/OpponentCommand.txt delete mode 100644 tests/after_112/Round 052/PlayerCommand.txt delete mode 100644 tests/after_112/Round 053/OpponentCommand.txt delete mode 100644 tests/after_112/Round 053/PlayerCommand.txt delete mode 100644 tests/after_112/Round 054/OpponentCommand.txt delete mode 100644 tests/after_112/Round 054/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 000/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 000/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 001/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 001/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 002/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 002/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 003/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 003/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 004/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 004/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 005/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 005/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 006/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 006/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 007/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 007/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 008/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 008/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 009/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 009/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 010/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 010/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 011/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 011/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 012/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 012/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 013/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 013/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 014/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 014/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 015/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 015/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 016/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 016/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 017/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 017/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 018/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 018/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 019/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 019/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 020/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 020/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 021/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 021/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 022/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 022/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 023/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 023/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 024/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 024/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 025/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 025/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 026/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 026/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 027/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 027/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 028/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 028/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 029/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 029/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 030/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 030/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 031/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 031/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 032/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 032/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 033/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 033/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 034/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 034/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 035/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 035/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 036/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 036/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 037/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 037/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 038/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 038/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 039/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 039/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 040/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 040/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 041/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 041/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 042/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 042/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 043/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 043/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 044/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 044/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 045/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 045/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 046/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 046/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 047/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 047/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 048/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 048/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 049/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 049/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 050/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 050/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 051/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 051/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 052/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 052/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 053/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 053/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 054/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 054/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 055/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 055/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 056/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 056/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 057/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 057/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 058/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 058/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 059/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 059/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 060/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 060/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 061/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 061/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 062/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 062/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 063/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 063/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 064/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 064/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 065/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 065/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 066/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 066/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 067/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 067/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 068/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 068/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 069/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 069/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 070/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 070/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 071/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 071/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 072/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 072/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 073/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 073/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 074/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 074/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 075/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 075/PlayerCommand.txt delete mode 100644 tests/after_112_2/Round 076/OpponentCommand.txt delete mode 100644 tests/after_112_2/Round 076/PlayerCommand.txt create mode 100644 tests/after_113/Round 000/OpponentCommand.txt create mode 100644 tests/after_113/Round 000/PlayerCommand.txt create mode 100644 tests/after_113/Round 001/OpponentCommand.txt create mode 100644 tests/after_113/Round 001/PlayerCommand.txt create mode 100644 tests/after_113/Round 002/OpponentCommand.txt create mode 100644 tests/after_113/Round 002/PlayerCommand.txt create mode 100644 tests/after_113/Round 003/OpponentCommand.txt create mode 100644 tests/after_113/Round 003/PlayerCommand.txt create mode 100644 tests/after_113/Round 004/OpponentCommand.txt create mode 100644 tests/after_113/Round 004/PlayerCommand.txt create mode 100644 tests/after_113/Round 005/OpponentCommand.txt create mode 100644 tests/after_113/Round 005/PlayerCommand.txt create mode 100644 tests/after_113/Round 006/OpponentCommand.txt create mode 100644 tests/after_113/Round 006/PlayerCommand.txt create mode 100644 tests/after_113/Round 007/OpponentCommand.txt create mode 100644 tests/after_113/Round 007/PlayerCommand.txt create mode 100644 tests/after_113/Round 008/OpponentCommand.txt create mode 100644 tests/after_113/Round 008/PlayerCommand.txt create mode 100644 tests/after_113/Round 009/OpponentCommand.txt create mode 100644 tests/after_113/Round 009/PlayerCommand.txt create mode 100644 tests/after_113/Round 010/OpponentCommand.txt create mode 100644 tests/after_113/Round 010/PlayerCommand.txt create mode 100644 tests/after_113/Round 011/OpponentCommand.txt create mode 100644 tests/after_113/Round 011/PlayerCommand.txt create mode 100644 tests/after_113/Round 012/OpponentCommand.txt create mode 100644 tests/after_113/Round 012/PlayerCommand.txt create mode 100644 tests/after_113/Round 013/OpponentCommand.txt create mode 100644 tests/after_113/Round 013/PlayerCommand.txt create mode 100644 tests/after_113/Round 014/OpponentCommand.txt create mode 100644 tests/after_113/Round 014/PlayerCommand.txt create mode 100644 tests/after_113/Round 015/OpponentCommand.txt create mode 100644 tests/after_113/Round 015/PlayerCommand.txt create mode 100644 tests/after_113/Round 016/OpponentCommand.txt create mode 100644 tests/after_113/Round 016/PlayerCommand.txt create mode 100644 tests/after_113/Round 017/OpponentCommand.txt create mode 100644 tests/after_113/Round 017/PlayerCommand.txt create mode 100644 tests/after_113/Round 018/OpponentCommand.txt create mode 100644 tests/after_113/Round 018/PlayerCommand.txt create mode 100644 tests/after_113/Round 019/OpponentCommand.txt create mode 100644 tests/after_113/Round 019/PlayerCommand.txt create mode 100644 tests/after_113/Round 020/OpponentCommand.txt create mode 100644 tests/after_113/Round 020/PlayerCommand.txt create mode 100644 tests/after_113/Round 021/OpponentCommand.txt create mode 100644 tests/after_113/Round 021/PlayerCommand.txt create mode 100644 tests/after_113/Round 022/OpponentCommand.txt create mode 100644 tests/after_113/Round 022/PlayerCommand.txt create mode 100644 tests/after_113/Round 023/OpponentCommand.txt create mode 100644 tests/after_113/Round 023/PlayerCommand.txt create mode 100644 tests/after_113/Round 024/OpponentCommand.txt create mode 100644 tests/after_113/Round 024/PlayerCommand.txt create mode 100644 tests/after_113/Round 025/OpponentCommand.txt create mode 100644 tests/after_113/Round 025/PlayerCommand.txt create mode 100644 tests/after_113/Round 026/OpponentCommand.txt create mode 100644 tests/after_113/Round 026/PlayerCommand.txt create mode 100644 tests/after_113/Round 027/OpponentCommand.txt create mode 100644 tests/after_113/Round 027/PlayerCommand.txt create mode 100644 tests/after_113/Round 028/OpponentCommand.txt create mode 100644 tests/after_113/Round 028/PlayerCommand.txt create mode 100644 tests/after_113/Round 029/OpponentCommand.txt create mode 100644 tests/after_113/Round 029/PlayerCommand.txt create mode 100644 tests/after_113/Round 030/OpponentCommand.txt create mode 100644 tests/after_113/Round 030/PlayerCommand.txt create mode 100644 tests/after_113/Round 031/OpponentCommand.txt create mode 100644 tests/after_113/Round 031/PlayerCommand.txt create mode 100644 tests/after_113/Round 032/OpponentCommand.txt create mode 100644 tests/after_113/Round 032/PlayerCommand.txt create mode 100644 tests/after_113/Round 033/OpponentCommand.txt create mode 100644 tests/after_113/Round 033/PlayerCommand.txt create mode 100644 tests/after_113/Round 034/OpponentCommand.txt create mode 100644 tests/after_113/Round 034/PlayerCommand.txt create mode 100644 tests/after_113/Round 035/OpponentCommand.txt create mode 100644 tests/after_113/Round 035/PlayerCommand.txt create mode 100644 tests/after_113/Round 036/OpponentCommand.txt create mode 100644 tests/after_113/Round 036/PlayerCommand.txt create mode 100644 tests/after_113/Round 037/OpponentCommand.txt create mode 100644 tests/after_113/Round 037/PlayerCommand.txt create mode 100644 tests/after_113/Round 038/OpponentCommand.txt create mode 100644 tests/after_113/Round 038/PlayerCommand.txt create mode 100644 tests/after_113/Round 039/OpponentCommand.txt create mode 100644 tests/after_113/Round 039/PlayerCommand.txt create mode 100644 tests/after_113/Round 040/OpponentCommand.txt create mode 100644 tests/after_113/Round 040/PlayerCommand.txt create mode 100644 tests/after_113/Round 041/OpponentCommand.txt create mode 100644 tests/after_113/Round 041/PlayerCommand.txt create mode 100644 tests/after_113/Round 042/OpponentCommand.txt create mode 100644 tests/after_113/Round 042/PlayerCommand.txt create mode 100644 tests/after_113/Round 043/OpponentCommand.txt create mode 100644 tests/after_113/Round 043/PlayerCommand.txt create mode 100644 tests/after_113/Round 044/OpponentCommand.txt create mode 100644 tests/after_113/Round 044/PlayerCommand.txt create mode 100644 tests/after_113/Round 045/OpponentCommand.txt create mode 100644 tests/after_113/Round 045/PlayerCommand.txt create mode 100644 tests/after_113/Round 046/OpponentCommand.txt create mode 100644 tests/after_113/Round 046/PlayerCommand.txt create mode 100644 tests/after_113/Round 047/OpponentCommand.txt create mode 100644 tests/after_113/Round 047/PlayerCommand.txt create mode 100644 tests/after_113/Round 048/OpponentCommand.txt create mode 100644 tests/after_113/Round 048/PlayerCommand.txt create mode 100644 tests/after_113/Round 049/OpponentCommand.txt create mode 100644 tests/after_113/Round 049/PlayerCommand.txt create mode 100644 tests/after_113/Round 050/OpponentCommand.txt create mode 100644 tests/after_113/Round 050/PlayerCommand.txt create mode 100644 tests/after_113/Round 051/OpponentCommand.txt create mode 100644 tests/after_113/Round 051/PlayerCommand.txt create mode 100644 tests/after_113/Round 052/OpponentCommand.txt create mode 100644 tests/after_113/Round 052/PlayerCommand.txt create mode 100644 tests/after_113/Round 053/OpponentCommand.txt create mode 100644 tests/after_113/Round 053/PlayerCommand.txt create mode 100644 tests/after_113/Round 054/OpponentCommand.txt create mode 100644 tests/after_113/Round 054/PlayerCommand.txt create mode 100644 tests/after_113/Round 055/OpponentCommand.txt create mode 100644 tests/after_113/Round 055/PlayerCommand.txt create mode 100644 tests/after_113/Round 056/OpponentCommand.txt create mode 100644 tests/after_113/Round 056/PlayerCommand.txt create mode 100644 tests/after_113/Round 057/OpponentCommand.txt create mode 100644 tests/after_113/Round 057/PlayerCommand.txt create mode 100644 tests/after_113/Round 058/OpponentCommand.txt create mode 100644 tests/after_113/Round 058/PlayerCommand.txt create mode 100644 tests/after_113/Round 059/OpponentCommand.txt create mode 100644 tests/after_113/Round 059/PlayerCommand.txt create mode 100644 tests/after_113/Round 060/OpponentCommand.txt create mode 100644 tests/after_113/Round 060/PlayerCommand.txt create mode 100644 tests/after_113/Round 061/OpponentCommand.txt create mode 100644 tests/after_113/Round 061/PlayerCommand.txt create mode 100644 tests/after_113/Round 062/OpponentCommand.txt create mode 100644 tests/after_113/Round 062/PlayerCommand.txt create mode 100644 tests/after_113/Round 063/OpponentCommand.txt create mode 100644 tests/after_113/Round 063/PlayerCommand.txt create mode 100644 tests/after_113/Round 064/OpponentCommand.txt create mode 100644 tests/after_113/Round 064/PlayerCommand.txt create mode 100644 tests/after_113/Round 065/OpponentCommand.txt create mode 100644 tests/after_113/Round 065/PlayerCommand.txt create mode 100644 tests/after_113/Round 066/OpponentCommand.txt create mode 100644 tests/after_113/Round 066/PlayerCommand.txt create mode 100644 tests/after_113/Round 067/OpponentCommand.txt create mode 100644 tests/after_113/Round 067/PlayerCommand.txt create mode 100644 tests/after_113/Round 068/OpponentCommand.txt create mode 100644 tests/after_113/Round 068/PlayerCommand.txt create mode 100644 tests/after_113/Round 069/OpponentCommand.txt create mode 100644 tests/after_113/Round 069/PlayerCommand.txt create mode 100644 tests/after_113/Round 070/OpponentCommand.txt create mode 100644 tests/after_113/Round 070/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 000/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 000/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 001/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 001/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 002/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 002/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 003/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 003/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 004/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 004/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 005/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 005/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 006/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 006/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 007/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 007/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 008/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 008/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 009/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 009/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 010/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 010/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 011/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 011/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 012/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 012/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 013/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 013/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 014/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 014/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 015/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 015/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 016/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 016/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 017/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 017/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 018/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 018/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 019/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 019/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 020/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 020/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 021/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 021/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 022/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 022/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 023/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 023/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 024/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 024/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 025/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 025/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 026/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 026/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 027/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 027/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 028/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 028/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 029/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 029/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 030/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 030/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 031/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 031/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 032/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 032/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 033/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 033/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 034/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 034/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 035/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 035/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 036/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 036/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 037/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 037/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 038/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 038/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 039/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 039/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 040/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 040/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 041/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 041/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 042/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 042/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 043/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 043/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 044/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 044/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 045/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 045/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 046/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 046/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 047/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 047/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 048/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 048/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 049/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 049/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 050/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 050/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 051/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 051/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 052/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 052/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 053/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 053/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 054/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 054/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 055/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 055/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 056/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 056/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 057/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 057/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 058/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 058/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 059/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 059/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 060/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 060/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 061/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 061/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 062/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 062/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 063/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 063/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 064/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 064/PlayerCommand.txt create mode 100644 tests/after_113_2/Round 065/OpponentCommand.txt create mode 100644 tests/after_113_2/Round 065/PlayerCommand.txt diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 361744b..a4334f5 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -196,18 +196,16 @@ impl GameState { where F: FnMut(&mut Point) { let mut missiles_len = missiles.len(); 'missile_loop: for m in (0..missiles.len()).rev() { - let mut missile_hit = false; 'speed_loop: for _ in 0..missiles[m].speed { wrapping_move_fn(&mut missiles[m].pos); if missiles[m].pos.x >= settings.size.x { let damage = cmp::min(missiles[m].damage, opponent.health); opponent.health -= damage; - missile_hit = true; - //missiles_len -= 1; - //missiles.swap(m, missiles_len); + missiles_len -= 1; + missiles.swap(m, missiles_len); - continue 'speed_loop; + continue 'missile_loop; } else { for b in 0..opponent_buildings.len() { @@ -215,9 +213,8 @@ impl GameState { let damage = cmp::min(missiles[m].damage, opponent_buildings[b].health); opponent_buildings[b].health -= damage; - missile_hit = true; - //missiles_len -= 1; - //missiles.swap(m, missiles_len); + missiles_len -= 1; + missiles.swap(m, missiles_len); if opponent_buildings[b].health == 0 { unoccupied_cells.push(opponent_buildings[b].pos); @@ -225,15 +222,11 @@ impl GameState { opponent_buildings.swap_remove(b); } //after game engine bug fix, this should go back to missile_loop - continue 'speed_loop; + continue 'missile_loop; } } } } - if missile_hit { - missiles_len -= 1; - missiles.swap(m, missiles_len); - } } missiles.truncate(missiles_len); } diff --git a/tests/after_112/Round 000/OpponentCommand.txt b/tests/after_112/Round 000/OpponentCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_112/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 000/PlayerCommand.txt b/tests/after_112/Round 000/PlayerCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_112/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 001/OpponentCommand.txt b/tests/after_112/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 001/PlayerCommand.txt b/tests/after_112/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 002/OpponentCommand.txt b/tests/after_112/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 002/PlayerCommand.txt b/tests/after_112/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 003/OpponentCommand.txt b/tests/after_112/Round 003/OpponentCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/after_112/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 003/PlayerCommand.txt b/tests/after_112/Round 003/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_112/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 004/OpponentCommand.txt b/tests/after_112/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 004/PlayerCommand.txt b/tests/after_112/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 005/OpponentCommand.txt b/tests/after_112/Round 005/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_112/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 005/PlayerCommand.txt b/tests/after_112/Round 005/PlayerCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_112/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 006/OpponentCommand.txt b/tests/after_112/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 006/PlayerCommand.txt b/tests/after_112/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 007/OpponentCommand.txt b/tests/after_112/Round 007/OpponentCommand.txt deleted file mode 100644 index 22d278e..0000000 --- a/tests/after_112/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 007/PlayerCommand.txt b/tests/after_112/Round 007/PlayerCommand.txt deleted file mode 100644 index 9033ecb..0000000 --- a/tests/after_112/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 008/OpponentCommand.txt b/tests/after_112/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 008/PlayerCommand.txt b/tests/after_112/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 009/OpponentCommand.txt b/tests/after_112/Round 009/OpponentCommand.txt deleted file mode 100644 index 93ec9b2..0000000 --- a/tests/after_112/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,1 \ No newline at end of file diff --git a/tests/after_112/Round 009/PlayerCommand.txt b/tests/after_112/Round 009/PlayerCommand.txt deleted file mode 100644 index 7d93635..0000000 --- a/tests/after_112/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,1 \ No newline at end of file diff --git a/tests/after_112/Round 010/OpponentCommand.txt b/tests/after_112/Round 010/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_112/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 010/PlayerCommand.txt b/tests/after_112/Round 010/PlayerCommand.txt deleted file mode 100644 index 8a842f9..0000000 --- a/tests/after_112/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 011/OpponentCommand.txt b/tests/after_112/Round 011/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_112/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_112/Round 011/PlayerCommand.txt b/tests/after_112/Round 011/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 012/OpponentCommand.txt b/tests/after_112/Round 012/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 012/PlayerCommand.txt b/tests/after_112/Round 012/PlayerCommand.txt deleted file mode 100644 index b209272..0000000 --- a/tests/after_112/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,1 \ No newline at end of file diff --git a/tests/after_112/Round 013/OpponentCommand.txt b/tests/after_112/Round 013/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/after_112/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 013/PlayerCommand.txt b/tests/after_112/Round 013/PlayerCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/after_112/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 014/OpponentCommand.txt b/tests/after_112/Round 014/OpponentCommand.txt deleted file mode 100644 index ea08612..0000000 --- a/tests/after_112/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 014/PlayerCommand.txt b/tests/after_112/Round 014/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 015/OpponentCommand.txt b/tests/after_112/Round 015/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_112/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 015/PlayerCommand.txt b/tests/after_112/Round 015/PlayerCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/after_112/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 016/OpponentCommand.txt b/tests/after_112/Round 016/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 016/PlayerCommand.txt b/tests/after_112/Round 016/PlayerCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 017/OpponentCommand.txt b/tests/after_112/Round 017/OpponentCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/after_112/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 017/PlayerCommand.txt b/tests/after_112/Round 017/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 018/OpponentCommand.txt b/tests/after_112/Round 018/OpponentCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 018/PlayerCommand.txt b/tests/after_112/Round 018/PlayerCommand.txt deleted file mode 100644 index 9033ecb..0000000 --- a/tests/after_112/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 019/OpponentCommand.txt b/tests/after_112/Round 019/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_112/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 019/PlayerCommand.txt b/tests/after_112/Round 019/PlayerCommand.txt deleted file mode 100644 index 601aa29..0000000 --- a/tests/after_112/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 020/OpponentCommand.txt b/tests/after_112/Round 020/OpponentCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/after_112/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 020/PlayerCommand.txt b/tests/after_112/Round 020/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 021/OpponentCommand.txt b/tests/after_112/Round 021/OpponentCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/after_112/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 021/PlayerCommand.txt b/tests/after_112/Round 021/PlayerCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/after_112/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 022/OpponentCommand.txt b/tests/after_112/Round 022/OpponentCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 022/PlayerCommand.txt b/tests/after_112/Round 022/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_112/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 023/OpponentCommand.txt b/tests/after_112/Round 023/OpponentCommand.txt deleted file mode 100644 index e02c049..0000000 --- a/tests/after_112/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 023/PlayerCommand.txt b/tests/after_112/Round 023/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112/Round 024/OpponentCommand.txt b/tests/after_112/Round 024/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_112/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 024/PlayerCommand.txt b/tests/after_112/Round 024/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/after_112/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 025/OpponentCommand.txt b/tests/after_112/Round 025/OpponentCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/after_112/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 025/PlayerCommand.txt b/tests/after_112/Round 025/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_112/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 026/OpponentCommand.txt b/tests/after_112/Round 026/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_112/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 026/PlayerCommand.txt b/tests/after_112/Round 026/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_112/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_112/Round 027/OpponentCommand.txt b/tests/after_112/Round 027/OpponentCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 027/PlayerCommand.txt b/tests/after_112/Round 027/PlayerCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/after_112/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 028/OpponentCommand.txt b/tests/after_112/Round 028/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_112/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 028/PlayerCommand.txt b/tests/after_112/Round 028/PlayerCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_112/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 029/OpponentCommand.txt b/tests/after_112/Round 029/OpponentCommand.txt deleted file mode 100644 index 8a6627b..0000000 --- a/tests/after_112/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 029/PlayerCommand.txt b/tests/after_112/Round 029/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_112/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 030/OpponentCommand.txt b/tests/after_112/Round 030/OpponentCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/after_112/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 030/PlayerCommand.txt b/tests/after_112/Round 030/PlayerCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/after_112/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 031/OpponentCommand.txt b/tests/after_112/Round 031/OpponentCommand.txt deleted file mode 100644 index 1571d81..0000000 --- a/tests/after_112/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,0 \ No newline at end of file diff --git a/tests/after_112/Round 031/PlayerCommand.txt b/tests/after_112/Round 031/PlayerCommand.txt deleted file mode 100644 index 3177984..0000000 --- a/tests/after_112/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 032/OpponentCommand.txt b/tests/after_112/Round 032/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_112/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_112/Round 032/PlayerCommand.txt b/tests/after_112/Round 032/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_112/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 033/OpponentCommand.txt b/tests/after_112/Round 033/OpponentCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/after_112/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 033/PlayerCommand.txt b/tests/after_112/Round 033/PlayerCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/after_112/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 034/OpponentCommand.txt b/tests/after_112/Round 034/OpponentCommand.txt deleted file mode 100644 index 16ddcd7..0000000 --- a/tests/after_112/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 034/PlayerCommand.txt b/tests/after_112/Round 034/PlayerCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/after_112/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 035/OpponentCommand.txt b/tests/after_112/Round 035/OpponentCommand.txt deleted file mode 100644 index 674d299..0000000 --- a/tests/after_112/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 035/PlayerCommand.txt b/tests/after_112/Round 035/PlayerCommand.txt deleted file mode 100644 index 95a4cf3..0000000 --- a/tests/after_112/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,0 \ No newline at end of file diff --git a/tests/after_112/Round 036/OpponentCommand.txt b/tests/after_112/Round 036/OpponentCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/after_112/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/after_112/Round 036/PlayerCommand.txt b/tests/after_112/Round 036/PlayerCommand.txt deleted file mode 100644 index d51905f..0000000 --- a/tests/after_112/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,0 \ No newline at end of file diff --git a/tests/after_112/Round 037/OpponentCommand.txt b/tests/after_112/Round 037/OpponentCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/after_112/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/after_112/Round 037/PlayerCommand.txt b/tests/after_112/Round 037/PlayerCommand.txt deleted file mode 100644 index 3ab3f32..0000000 --- a/tests/after_112/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,1 \ No newline at end of file diff --git a/tests/after_112/Round 038/OpponentCommand.txt b/tests/after_112/Round 038/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/after_112/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 038/PlayerCommand.txt b/tests/after_112/Round 038/PlayerCommand.txt deleted file mode 100644 index 4f716a1..0000000 --- a/tests/after_112/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,0 \ No newline at end of file diff --git a/tests/after_112/Round 039/OpponentCommand.txt b/tests/after_112/Round 039/OpponentCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/after_112/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/after_112/Round 039/PlayerCommand.txt b/tests/after_112/Round 039/PlayerCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/after_112/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 040/OpponentCommand.txt b/tests/after_112/Round 040/OpponentCommand.txt deleted file mode 100644 index 72ca43d..0000000 --- a/tests/after_112/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 040/PlayerCommand.txt b/tests/after_112/Round 040/PlayerCommand.txt deleted file mode 100644 index 1c0a0b0..0000000 --- a/tests/after_112/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,1 \ No newline at end of file diff --git a/tests/after_112/Round 041/OpponentCommand.txt b/tests/after_112/Round 041/OpponentCommand.txt deleted file mode 100644 index d9e32bb..0000000 --- a/tests/after_112/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,0 \ No newline at end of file diff --git a/tests/after_112/Round 041/PlayerCommand.txt b/tests/after_112/Round 041/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/after_112/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/after_112/Round 042/OpponentCommand.txt b/tests/after_112/Round 042/OpponentCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/after_112/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/after_112/Round 042/PlayerCommand.txt b/tests/after_112/Round 042/PlayerCommand.txt deleted file mode 100644 index 7ca2987..0000000 --- a/tests/after_112/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 043/OpponentCommand.txt b/tests/after_112/Round 043/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/after_112/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 043/PlayerCommand.txt b/tests/after_112/Round 043/PlayerCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_112/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_112/Round 044/OpponentCommand.txt b/tests/after_112/Round 044/OpponentCommand.txt deleted file mode 100644 index 226a1f4..0000000 --- a/tests/after_112/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,0 \ No newline at end of file diff --git a/tests/after_112/Round 044/PlayerCommand.txt b/tests/after_112/Round 044/PlayerCommand.txt deleted file mode 100644 index b4e7071..0000000 --- a/tests/after_112/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,0 \ No newline at end of file diff --git a/tests/after_112/Round 045/OpponentCommand.txt b/tests/after_112/Round 045/OpponentCommand.txt deleted file mode 100644 index 9033ecb..0000000 --- a/tests/after_112/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 045/PlayerCommand.txt b/tests/after_112/Round 045/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_112/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 046/OpponentCommand.txt b/tests/after_112/Round 046/OpponentCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/after_112/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 046/PlayerCommand.txt b/tests/after_112/Round 046/PlayerCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/after_112/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 047/OpponentCommand.txt b/tests/after_112/Round 047/OpponentCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_112/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_112/Round 047/PlayerCommand.txt b/tests/after_112/Round 047/PlayerCommand.txt deleted file mode 100644 index f238916..0000000 --- a/tests/after_112/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 048/OpponentCommand.txt b/tests/after_112/Round 048/OpponentCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/after_112/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 048/PlayerCommand.txt b/tests/after_112/Round 048/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_112/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 049/OpponentCommand.txt b/tests/after_112/Round 049/OpponentCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/after_112/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 049/PlayerCommand.txt b/tests/after_112/Round 049/PlayerCommand.txt deleted file mode 100644 index 58897af..0000000 --- a/tests/after_112/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,0 \ No newline at end of file diff --git a/tests/after_112/Round 050/OpponentCommand.txt b/tests/after_112/Round 050/OpponentCommand.txt deleted file mode 100644 index 9033ecb..0000000 --- a/tests/after_112/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,2 \ No newline at end of file diff --git a/tests/after_112/Round 050/PlayerCommand.txt b/tests/after_112/Round 050/PlayerCommand.txt deleted file mode 100644 index b87efa8..0000000 --- a/tests/after_112/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,2 \ No newline at end of file diff --git a/tests/after_112/Round 051/OpponentCommand.txt b/tests/after_112/Round 051/OpponentCommand.txt deleted file mode 100644 index dd03d6a..0000000 --- a/tests/after_112/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,0 \ No newline at end of file diff --git a/tests/after_112/Round 051/PlayerCommand.txt b/tests/after_112/Round 051/PlayerCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_112/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_112/Round 052/OpponentCommand.txt b/tests/after_112/Round 052/OpponentCommand.txt deleted file mode 100644 index 816366d..0000000 --- a/tests/after_112/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,0 \ No newline at end of file diff --git a/tests/after_112/Round 052/PlayerCommand.txt b/tests/after_112/Round 052/PlayerCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112/Round 053/OpponentCommand.txt b/tests/after_112/Round 053/OpponentCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/after_112/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/after_112/Round 053/PlayerCommand.txt b/tests/after_112/Round 053/PlayerCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_112/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_112/Round 054/OpponentCommand.txt b/tests/after_112/Round 054/OpponentCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/after_112/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/after_112/Round 054/PlayerCommand.txt b/tests/after_112/Round 054/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/after_112/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 000/OpponentCommand.txt b/tests/after_112_2/Round 000/OpponentCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_112_2/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 000/PlayerCommand.txt b/tests/after_112_2/Round 000/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_112_2/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 001/OpponentCommand.txt b/tests/after_112_2/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 001/PlayerCommand.txt b/tests/after_112_2/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 002/OpponentCommand.txt b/tests/after_112_2/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 002/PlayerCommand.txt b/tests/after_112_2/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 003/OpponentCommand.txt b/tests/after_112_2/Round 003/OpponentCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112_2/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 003/PlayerCommand.txt b/tests/after_112_2/Round 003/PlayerCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_112_2/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 004/OpponentCommand.txt b/tests/after_112_2/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 004/PlayerCommand.txt b/tests/after_112_2/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 005/OpponentCommand.txt b/tests/after_112_2/Round 005/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_112_2/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 005/PlayerCommand.txt b/tests/after_112_2/Round 005/PlayerCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_112_2/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 006/OpponentCommand.txt b/tests/after_112_2/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 006/PlayerCommand.txt b/tests/after_112_2/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 007/OpponentCommand.txt b/tests/after_112_2/Round 007/OpponentCommand.txt deleted file mode 100644 index 9408cb0..0000000 --- a/tests/after_112_2/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 007/PlayerCommand.txt b/tests/after_112_2/Round 007/PlayerCommand.txt deleted file mode 100644 index 9408cb0..0000000 --- a/tests/after_112_2/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 008/OpponentCommand.txt b/tests/after_112_2/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 008/PlayerCommand.txt b/tests/after_112_2/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 009/OpponentCommand.txt b/tests/after_112_2/Round 009/OpponentCommand.txt deleted file mode 100644 index a943cb9..0000000 --- a/tests/after_112_2/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 009/PlayerCommand.txt b/tests/after_112_2/Round 009/PlayerCommand.txt deleted file mode 100644 index a943cb9..0000000 --- a/tests/after_112_2/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 010/OpponentCommand.txt b/tests/after_112_2/Round 010/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_112_2/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 010/PlayerCommand.txt b/tests/after_112_2/Round 010/PlayerCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_112_2/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 011/OpponentCommand.txt b/tests/after_112_2/Round 011/OpponentCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_112_2/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 011/PlayerCommand.txt b/tests/after_112_2/Round 011/PlayerCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_112_2/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 012/OpponentCommand.txt b/tests/after_112_2/Round 012/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_112_2/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 012/PlayerCommand.txt b/tests/after_112_2/Round 012/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_112_2/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 013/OpponentCommand.txt b/tests/after_112_2/Round 013/OpponentCommand.txt deleted file mode 100644 index 8c5ef78..0000000 --- a/tests/after_112_2/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 013/PlayerCommand.txt b/tests/after_112_2/Round 013/PlayerCommand.txt deleted file mode 100644 index 22d278e..0000000 --- a/tests/after_112_2/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 014/OpponentCommand.txt b/tests/after_112_2/Round 014/OpponentCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/after_112_2/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 014/PlayerCommand.txt b/tests/after_112_2/Round 014/PlayerCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/after_112_2/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 015/OpponentCommand.txt b/tests/after_112_2/Round 015/OpponentCommand.txt deleted file mode 100644 index d05a714..0000000 --- a/tests/after_112_2/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 015/PlayerCommand.txt b/tests/after_112_2/Round 015/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/after_112_2/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 016/OpponentCommand.txt b/tests/after_112_2/Round 016/OpponentCommand.txt deleted file mode 100644 index d9a0acb..0000000 --- a/tests/after_112_2/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 016/PlayerCommand.txt b/tests/after_112_2/Round 016/PlayerCommand.txt deleted file mode 100644 index d9a0acb..0000000 --- a/tests/after_112_2/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 017/OpponentCommand.txt b/tests/after_112_2/Round 017/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 017/PlayerCommand.txt b/tests/after_112_2/Round 017/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 018/OpponentCommand.txt b/tests/after_112_2/Round 018/OpponentCommand.txt deleted file mode 100644 index bd4deea..0000000 --- a/tests/after_112_2/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 018/PlayerCommand.txt b/tests/after_112_2/Round 018/PlayerCommand.txt deleted file mode 100644 index bd4deea..0000000 --- a/tests/after_112_2/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 019/OpponentCommand.txt b/tests/after_112_2/Round 019/OpponentCommand.txt deleted file mode 100644 index 37bfbbd..0000000 --- a/tests/after_112_2/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 019/PlayerCommand.txt b/tests/after_112_2/Round 019/PlayerCommand.txt deleted file mode 100644 index 2a21cf5..0000000 --- a/tests/after_112_2/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 020/OpponentCommand.txt b/tests/after_112_2/Round 020/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_112_2/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 020/PlayerCommand.txt b/tests/after_112_2/Round 020/PlayerCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_112_2/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 021/OpponentCommand.txt b/tests/after_112_2/Round 021/OpponentCommand.txt deleted file mode 100644 index 1c0a0b0..0000000 --- a/tests/after_112_2/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 021/PlayerCommand.txt b/tests/after_112_2/Round 021/PlayerCommand.txt deleted file mode 100644 index c37c6f4..0000000 --- a/tests/after_112_2/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 022/OpponentCommand.txt b/tests/after_112_2/Round 022/OpponentCommand.txt deleted file mode 100644 index 0a612db..0000000 --- a/tests/after_112_2/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 022/PlayerCommand.txt b/tests/after_112_2/Round 022/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/after_112_2/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 023/OpponentCommand.txt b/tests/after_112_2/Round 023/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_112_2/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 023/PlayerCommand.txt b/tests/after_112_2/Round 023/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_112_2/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 024/OpponentCommand.txt b/tests/after_112_2/Round 024/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_112_2/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 024/PlayerCommand.txt b/tests/after_112_2/Round 024/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/after_112_2/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 025/OpponentCommand.txt b/tests/after_112_2/Round 025/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 025/PlayerCommand.txt b/tests/after_112_2/Round 025/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 026/OpponentCommand.txt b/tests/after_112_2/Round 026/OpponentCommand.txt deleted file mode 100644 index 22d278e..0000000 --- a/tests/after_112_2/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 026/PlayerCommand.txt b/tests/after_112_2/Round 026/PlayerCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 027/OpponentCommand.txt b/tests/after_112_2/Round 027/OpponentCommand.txt deleted file mode 100644 index 0a612db..0000000 --- a/tests/after_112_2/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 027/PlayerCommand.txt b/tests/after_112_2/Round 027/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/after_112_2/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 028/OpponentCommand.txt b/tests/after_112_2/Round 028/OpponentCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/after_112_2/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 028/PlayerCommand.txt b/tests/after_112_2/Round 028/PlayerCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_112_2/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 029/OpponentCommand.txt b/tests/after_112_2/Round 029/OpponentCommand.txt deleted file mode 100644 index ebfc684..0000000 --- a/tests/after_112_2/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 029/PlayerCommand.txt b/tests/after_112_2/Round 029/PlayerCommand.txt deleted file mode 100644 index c742585..0000000 --- a/tests/after_112_2/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 030/OpponentCommand.txt b/tests/after_112_2/Round 030/OpponentCommand.txt deleted file mode 100644 index e2634f0..0000000 --- a/tests/after_112_2/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 030/PlayerCommand.txt b/tests/after_112_2/Round 030/PlayerCommand.txt deleted file mode 100644 index 22d278e..0000000 --- a/tests/after_112_2/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 031/OpponentCommand.txt b/tests/after_112_2/Round 031/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_112_2/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 031/PlayerCommand.txt b/tests/after_112_2/Round 031/PlayerCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_112_2/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 032/OpponentCommand.txt b/tests/after_112_2/Round 032/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_112_2/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 032/PlayerCommand.txt b/tests/after_112_2/Round 032/PlayerCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/after_112_2/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 033/OpponentCommand.txt b/tests/after_112_2/Round 033/OpponentCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/after_112_2/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 033/PlayerCommand.txt b/tests/after_112_2/Round 033/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/after_112_2/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 034/OpponentCommand.txt b/tests/after_112_2/Round 034/OpponentCommand.txt deleted file mode 100644 index 4b87d86..0000000 --- a/tests/after_112_2/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 034/PlayerCommand.txt b/tests/after_112_2/Round 034/PlayerCommand.txt deleted file mode 100644 index 10532f2..0000000 --- a/tests/after_112_2/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 035/OpponentCommand.txt b/tests/after_112_2/Round 035/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_112_2/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 035/PlayerCommand.txt b/tests/after_112_2/Round 035/PlayerCommand.txt deleted file mode 100644 index 7ca2987..0000000 --- a/tests/after_112_2/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 036/OpponentCommand.txt b/tests/after_112_2/Round 036/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 036/PlayerCommand.txt b/tests/after_112_2/Round 036/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 037/OpponentCommand.txt b/tests/after_112_2/Round 037/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/after_112_2/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 037/PlayerCommand.txt b/tests/after_112_2/Round 037/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/after_112_2/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 038/OpponentCommand.txt b/tests/after_112_2/Round 038/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/after_112_2/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 038/PlayerCommand.txt b/tests/after_112_2/Round 038/PlayerCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 039/OpponentCommand.txt b/tests/after_112_2/Round 039/OpponentCommand.txt deleted file mode 100644 index d05a714..0000000 --- a/tests/after_112_2/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 039/PlayerCommand.txt b/tests/after_112_2/Round 039/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/after_112_2/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 040/OpponentCommand.txt b/tests/after_112_2/Round 040/OpponentCommand.txt deleted file mode 100644 index 5ee21e6..0000000 --- a/tests/after_112_2/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 040/PlayerCommand.txt b/tests/after_112_2/Round 040/PlayerCommand.txt deleted file mode 100644 index 722ec58..0000000 --- a/tests/after_112_2/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 041/OpponentCommand.txt b/tests/after_112_2/Round 041/OpponentCommand.txt deleted file mode 100644 index 4763908..0000000 --- a/tests/after_112_2/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 041/PlayerCommand.txt b/tests/after_112_2/Round 041/PlayerCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/after_112_2/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 042/OpponentCommand.txt b/tests/after_112_2/Round 042/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_112_2/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 042/PlayerCommand.txt b/tests/after_112_2/Round 042/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_112_2/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 043/OpponentCommand.txt b/tests/after_112_2/Round 043/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_112_2/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 043/PlayerCommand.txt b/tests/after_112_2/Round 043/PlayerCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/after_112_2/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 044/OpponentCommand.txt b/tests/after_112_2/Round 044/OpponentCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_112_2/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 044/PlayerCommand.txt b/tests/after_112_2/Round 044/PlayerCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_112_2/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 045/OpponentCommand.txt b/tests/after_112_2/Round 045/OpponentCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 045/PlayerCommand.txt b/tests/after_112_2/Round 045/PlayerCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/after_112_2/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 046/OpponentCommand.txt b/tests/after_112_2/Round 046/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_112_2/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 046/PlayerCommand.txt b/tests/after_112_2/Round 046/PlayerCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/after_112_2/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 047/OpponentCommand.txt b/tests/after_112_2/Round 047/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/after_112_2/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 047/PlayerCommand.txt b/tests/after_112_2/Round 047/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/after_112_2/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 048/OpponentCommand.txt b/tests/after_112_2/Round 048/OpponentCommand.txt deleted file mode 100644 index ad5a4bc..0000000 --- a/tests/after_112_2/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 048/PlayerCommand.txt b/tests/after_112_2/Round 048/PlayerCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_112_2/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 049/OpponentCommand.txt b/tests/after_112_2/Round 049/OpponentCommand.txt deleted file mode 100644 index 8c5ef78..0000000 --- a/tests/after_112_2/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 049/PlayerCommand.txt b/tests/after_112_2/Round 049/PlayerCommand.txt deleted file mode 100644 index 77bf522..0000000 --- a/tests/after_112_2/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 050/OpponentCommand.txt b/tests/after_112_2/Round 050/OpponentCommand.txt deleted file mode 100644 index e2634f0..0000000 --- a/tests/after_112_2/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 050/PlayerCommand.txt b/tests/after_112_2/Round 050/PlayerCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/after_112_2/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 051/OpponentCommand.txt b/tests/after_112_2/Round 051/OpponentCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/after_112_2/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 051/PlayerCommand.txt b/tests/after_112_2/Round 051/PlayerCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/after_112_2/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 052/OpponentCommand.txt b/tests/after_112_2/Round 052/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_112_2/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 052/PlayerCommand.txt b/tests/after_112_2/Round 052/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 053/OpponentCommand.txt b/tests/after_112_2/Round 053/OpponentCommand.txt deleted file mode 100644 index 2a21cf5..0000000 --- a/tests/after_112_2/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 053/PlayerCommand.txt b/tests/after_112_2/Round 053/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_112_2/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 054/OpponentCommand.txt b/tests/after_112_2/Round 054/OpponentCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_112_2/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 054/PlayerCommand.txt b/tests/after_112_2/Round 054/PlayerCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 055/OpponentCommand.txt b/tests/after_112_2/Round 055/OpponentCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/after_112_2/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 055/PlayerCommand.txt b/tests/after_112_2/Round 055/PlayerCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_112_2/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 056/OpponentCommand.txt b/tests/after_112_2/Round 056/OpponentCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_112_2/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 056/PlayerCommand.txt b/tests/after_112_2/Round 056/PlayerCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_112_2/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 057/OpponentCommand.txt b/tests/after_112_2/Round 057/OpponentCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 057/PlayerCommand.txt b/tests/after_112_2/Round 057/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_112_2/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 058/OpponentCommand.txt b/tests/after_112_2/Round 058/OpponentCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/after_112_2/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 058/PlayerCommand.txt b/tests/after_112_2/Round 058/PlayerCommand.txt deleted file mode 100644 index c4e7948..0000000 --- a/tests/after_112_2/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 059/OpponentCommand.txt b/tests/after_112_2/Round 059/OpponentCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 059/PlayerCommand.txt b/tests/after_112_2/Round 059/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/after_112_2/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 060/OpponentCommand.txt b/tests/after_112_2/Round 060/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_112_2/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 060/PlayerCommand.txt b/tests/after_112_2/Round 060/PlayerCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 061/OpponentCommand.txt b/tests/after_112_2/Round 061/OpponentCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_112_2/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 061/PlayerCommand.txt b/tests/after_112_2/Round 061/PlayerCommand.txt deleted file mode 100644 index a7c241f..0000000 --- a/tests/after_112_2/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 062/OpponentCommand.txt b/tests/after_112_2/Round 062/OpponentCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/after_112_2/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 062/PlayerCommand.txt b/tests/after_112_2/Round 062/PlayerCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/after_112_2/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 063/OpponentCommand.txt b/tests/after_112_2/Round 063/OpponentCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/after_112_2/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 063/PlayerCommand.txt b/tests/after_112_2/Round 063/PlayerCommand.txt deleted file mode 100644 index 1818e31..0000000 --- a/tests/after_112_2/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 064/OpponentCommand.txt b/tests/after_112_2/Round 064/OpponentCommand.txt deleted file mode 100644 index e02c049..0000000 --- a/tests/after_112_2/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 064/PlayerCommand.txt b/tests/after_112_2/Round 064/PlayerCommand.txt deleted file mode 100644 index e638283..0000000 --- a/tests/after_112_2/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 065/OpponentCommand.txt b/tests/after_112_2/Round 065/OpponentCommand.txt deleted file mode 100644 index a6f3f91..0000000 --- a/tests/after_112_2/Round 065/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,1 \ No newline at end of file diff --git a/tests/after_112_2/Round 065/PlayerCommand.txt b/tests/after_112_2/Round 065/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_112_2/Round 065/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 066/OpponentCommand.txt b/tests/after_112_2/Round 066/OpponentCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 066/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 066/PlayerCommand.txt b/tests/after_112_2/Round 066/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_112_2/Round 066/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 067/OpponentCommand.txt b/tests/after_112_2/Round 067/OpponentCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/after_112_2/Round 067/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 067/PlayerCommand.txt b/tests/after_112_2/Round 067/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_112_2/Round 067/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_112_2/Round 068/OpponentCommand.txt b/tests/after_112_2/Round 068/OpponentCommand.txt deleted file mode 100644 index b7adddf..0000000 --- a/tests/after_112_2/Round 068/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 068/PlayerCommand.txt b/tests/after_112_2/Round 068/PlayerCommand.txt deleted file mode 100644 index 4f716a1..0000000 --- a/tests/after_112_2/Round 068/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 069/OpponentCommand.txt b/tests/after_112_2/Round 069/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_112_2/Round 069/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 069/PlayerCommand.txt b/tests/after_112_2/Round 069/PlayerCommand.txt deleted file mode 100644 index 77bf522..0000000 --- a/tests/after_112_2/Round 069/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 070/OpponentCommand.txt b/tests/after_112_2/Round 070/OpponentCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_112_2/Round 070/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 070/PlayerCommand.txt b/tests/after_112_2/Round 070/PlayerCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_112_2/Round 070/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 071/OpponentCommand.txt b/tests/after_112_2/Round 071/OpponentCommand.txt deleted file mode 100644 index 7ae2a9c..0000000 --- a/tests/after_112_2/Round 071/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,0 \ No newline at end of file diff --git a/tests/after_112_2/Round 071/PlayerCommand.txt b/tests/after_112_2/Round 071/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_112_2/Round 071/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 072/OpponentCommand.txt b/tests/after_112_2/Round 072/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_112_2/Round 072/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 072/PlayerCommand.txt b/tests/after_112_2/Round 072/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_112_2/Round 072/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 073/OpponentCommand.txt b/tests/after_112_2/Round 073/OpponentCommand.txt deleted file mode 100644 index 4f8f464..0000000 --- a/tests/after_112_2/Round 073/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 073/PlayerCommand.txt b/tests/after_112_2/Round 073/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_112_2/Round 073/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 074/OpponentCommand.txt b/tests/after_112_2/Round 074/OpponentCommand.txt deleted file mode 100644 index 9033ecb..0000000 --- a/tests/after_112_2/Round 074/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 074/PlayerCommand.txt b/tests/after_112_2/Round 074/PlayerCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_112_2/Round 074/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 075/OpponentCommand.txt b/tests/after_112_2/Round 075/OpponentCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/after_112_2/Round 075/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 075/PlayerCommand.txt b/tests/after_112_2/Round 075/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_112_2/Round 075/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 076/OpponentCommand.txt b/tests/after_112_2/Round 076/OpponentCommand.txt deleted file mode 100644 index 601aa29..0000000 --- a/tests/after_112_2/Round 076/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,2 \ No newline at end of file diff --git a/tests/after_112_2/Round 076/PlayerCommand.txt b/tests/after_112_2/Round 076/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_112_2/Round 076/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 000/OpponentCommand.txt b/tests/after_113/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_113/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 000/PlayerCommand.txt b/tests/after_113/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_113/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 001/OpponentCommand.txt b/tests/after_113/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 001/PlayerCommand.txt b/tests/after_113/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 002/OpponentCommand.txt b/tests/after_113/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 002/PlayerCommand.txt b/tests/after_113/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 003/OpponentCommand.txt b/tests/after_113/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 003/PlayerCommand.txt b/tests/after_113/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/tests/after_113/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 004/OpponentCommand.txt b/tests/after_113/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 004/PlayerCommand.txt b/tests/after_113/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 005/OpponentCommand.txt b/tests/after_113/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_113/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 005/PlayerCommand.txt b/tests/after_113/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 006/OpponentCommand.txt b/tests/after_113/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 006/PlayerCommand.txt b/tests/after_113/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 007/OpponentCommand.txt b/tests/after_113/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 007/PlayerCommand.txt b/tests/after_113/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/after_113/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 008/OpponentCommand.txt b/tests/after_113/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 008/PlayerCommand.txt b/tests/after_113/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113/Round 009/OpponentCommand.txt b/tests/after_113/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..bd4deea --- /dev/null +++ b/tests/after_113/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 009/PlayerCommand.txt b/tests/after_113/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/tests/after_113/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 010/OpponentCommand.txt b/tests/after_113/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 010/PlayerCommand.txt b/tests/after_113/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/after_113/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 011/OpponentCommand.txt b/tests/after_113/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_113/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 011/PlayerCommand.txt b/tests/after_113/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_113/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 012/OpponentCommand.txt b/tests/after_113/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_113/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 012/PlayerCommand.txt b/tests/after_113/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 013/OpponentCommand.txt b/tests/after_113/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 013/PlayerCommand.txt b/tests/after_113/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/tests/after_113/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 014/OpponentCommand.txt b/tests/after_113/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/after_113/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 014/PlayerCommand.txt b/tests/after_113/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 015/OpponentCommand.txt b/tests/after_113/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/tests/after_113/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 015/PlayerCommand.txt b/tests/after_113/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..055ca5b --- /dev/null +++ b/tests/after_113/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 016/OpponentCommand.txt b/tests/after_113/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/tests/after_113/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 016/PlayerCommand.txt b/tests/after_113/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..1fcc509 --- /dev/null +++ b/tests/after_113/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +0,5,1 \ No newline at end of file diff --git a/tests/after_113/Round 017/OpponentCommand.txt b/tests/after_113/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 017/PlayerCommand.txt b/tests/after_113/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_113/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 018/OpponentCommand.txt b/tests/after_113/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..055ca5b --- /dev/null +++ b/tests/after_113/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 018/PlayerCommand.txt b/tests/after_113/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/after_113/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 019/OpponentCommand.txt b/tests/after_113/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/after_113/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 019/PlayerCommand.txt b/tests/after_113/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/tests/after_113/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 020/OpponentCommand.txt b/tests/after_113/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/after_113/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 020/PlayerCommand.txt b/tests/after_113/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/after_113/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 021/OpponentCommand.txt b/tests/after_113/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 021/PlayerCommand.txt b/tests/after_113/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_113/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 022/OpponentCommand.txt b/tests/after_113/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_113/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 022/PlayerCommand.txt b/tests/after_113/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/after_113/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 023/OpponentCommand.txt b/tests/after_113/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_113/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 023/PlayerCommand.txt b/tests/after_113/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..4763908 --- /dev/null +++ b/tests/after_113/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 024/OpponentCommand.txt b/tests/after_113/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_113/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 024/PlayerCommand.txt b/tests/after_113/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_113/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 025/OpponentCommand.txt b/tests/after_113/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 025/PlayerCommand.txt b/tests/after_113/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 026/OpponentCommand.txt b/tests/after_113/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/tests/after_113/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 026/PlayerCommand.txt b/tests/after_113/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..bd4deea --- /dev/null +++ b/tests/after_113/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 027/OpponentCommand.txt b/tests/after_113/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/after_113/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 027/PlayerCommand.txt b/tests/after_113/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_113/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 028/OpponentCommand.txt b/tests/after_113/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_113/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 028/PlayerCommand.txt b/tests/after_113/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/tests/after_113/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 029/OpponentCommand.txt b/tests/after_113/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/after_113/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 029/PlayerCommand.txt b/tests/after_113/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/tests/after_113/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 030/OpponentCommand.txt b/tests/after_113/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..ac6c42a --- /dev/null +++ b/tests/after_113/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 030/PlayerCommand.txt b/tests/after_113/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..26912c7 --- /dev/null +++ b/tests/after_113/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 031/OpponentCommand.txt b/tests/after_113/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..8ac3a56 --- /dev/null +++ b/tests/after_113/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 031/PlayerCommand.txt b/tests/after_113/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/after_113/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 032/OpponentCommand.txt b/tests/after_113/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 032/PlayerCommand.txt b/tests/after_113/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/after_113/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 033/OpponentCommand.txt b/tests/after_113/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/after_113/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 033/PlayerCommand.txt b/tests/after_113/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/tests/after_113/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 034/OpponentCommand.txt b/tests/after_113/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 034/PlayerCommand.txt b/tests/after_113/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 035/OpponentCommand.txt b/tests/after_113/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_113/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 035/PlayerCommand.txt b/tests/after_113/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/after_113/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 036/OpponentCommand.txt b/tests/after_113/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/after_113/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 036/PlayerCommand.txt b/tests/after_113/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..a825030 --- /dev/null +++ b/tests/after_113/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 037/OpponentCommand.txt b/tests/after_113/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/after_113/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 037/PlayerCommand.txt b/tests/after_113/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_113/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 038/OpponentCommand.txt b/tests/after_113/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/after_113/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 038/PlayerCommand.txt b/tests/after_113/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_113/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 039/OpponentCommand.txt b/tests/after_113/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..79e2fd9 --- /dev/null +++ b/tests/after_113/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 039/PlayerCommand.txt b/tests/after_113/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..58897af --- /dev/null +++ b/tests/after_113/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 040/OpponentCommand.txt b/tests/after_113/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/after_113/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 040/PlayerCommand.txt b/tests/after_113/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_113/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 041/OpponentCommand.txt b/tests/after_113/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 041/PlayerCommand.txt b/tests/after_113/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/after_113/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 042/OpponentCommand.txt b/tests/after_113/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/tests/after_113/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 042/PlayerCommand.txt b/tests/after_113/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/after_113/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 043/OpponentCommand.txt b/tests/after_113/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..1818e31 --- /dev/null +++ b/tests/after_113/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 043/PlayerCommand.txt b/tests/after_113/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_113/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 044/OpponentCommand.txt b/tests/after_113/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/tests/after_113/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 044/PlayerCommand.txt b/tests/after_113/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_113/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 045/OpponentCommand.txt b/tests/after_113/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/tests/after_113/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 045/PlayerCommand.txt b/tests/after_113/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 046/OpponentCommand.txt b/tests/after_113/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/after_113/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 046/PlayerCommand.txt b/tests/after_113/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 047/OpponentCommand.txt b/tests/after_113/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/after_113/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 047/PlayerCommand.txt b/tests/after_113/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..ac6c42a --- /dev/null +++ b/tests/after_113/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 048/OpponentCommand.txt b/tests/after_113/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/after_113/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 048/PlayerCommand.txt b/tests/after_113/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/after_113/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 049/OpponentCommand.txt b/tests/after_113/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..7ae20d1 --- /dev/null +++ b/tests/after_113/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +5,5,0 \ No newline at end of file diff --git a/tests/after_113/Round 049/PlayerCommand.txt b/tests/after_113/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_113/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 050/OpponentCommand.txt b/tests/after_113/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/after_113/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 050/PlayerCommand.txt b/tests/after_113/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 051/OpponentCommand.txt b/tests/after_113/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_113/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 051/PlayerCommand.txt b/tests/after_113/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 052/OpponentCommand.txt b/tests/after_113/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..4763908 --- /dev/null +++ b/tests/after_113/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 052/PlayerCommand.txt b/tests/after_113/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/after_113/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 053/OpponentCommand.txt b/tests/after_113/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/after_113/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/after_113/Round 053/PlayerCommand.txt b/tests/after_113/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_113/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 054/OpponentCommand.txt b/tests/after_113/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/after_113/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 054/PlayerCommand.txt b/tests/after_113/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 055/OpponentCommand.txt b/tests/after_113/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_113/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 055/PlayerCommand.txt b/tests/after_113/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/after_113/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 056/OpponentCommand.txt b/tests/after_113/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_113/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 056/PlayerCommand.txt b/tests/after_113/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/after_113/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 057/OpponentCommand.txt b/tests/after_113/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..c4e7948 --- /dev/null +++ b/tests/after_113/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 057/PlayerCommand.txt b/tests/after_113/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_113/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 058/OpponentCommand.txt b/tests/after_113/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_113/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 058/PlayerCommand.txt b/tests/after_113/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/after_113/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 059/OpponentCommand.txt b/tests/after_113/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..aa178b0 --- /dev/null +++ b/tests/after_113/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 059/PlayerCommand.txt b/tests/after_113/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 060/OpponentCommand.txt b/tests/after_113/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_113/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 060/PlayerCommand.txt b/tests/after_113/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_113/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 061/OpponentCommand.txt b/tests/after_113/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..a7c241f --- /dev/null +++ b/tests/after_113/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 061/PlayerCommand.txt b/tests/after_113/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/after_113/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 062/OpponentCommand.txt b/tests/after_113/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..9033ecb --- /dev/null +++ b/tests/after_113/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +4,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 062/PlayerCommand.txt b/tests/after_113/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 063/OpponentCommand.txt b/tests/after_113/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..455ac78 --- /dev/null +++ b/tests/after_113/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,1 \ No newline at end of file diff --git a/tests/after_113/Round 063/PlayerCommand.txt b/tests/after_113/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_113/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 064/OpponentCommand.txt b/tests/after_113/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 064/PlayerCommand.txt b/tests/after_113/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 065/OpponentCommand.txt b/tests/after_113/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 065/PlayerCommand.txt b/tests/after_113/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..b87efa8 --- /dev/null +++ b/tests/after_113/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 066/OpponentCommand.txt b/tests/after_113/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 066/PlayerCommand.txt b/tests/after_113/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/tests/after_113/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 067/OpponentCommand.txt b/tests/after_113/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_113/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 067/PlayerCommand.txt b/tests/after_113/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_113/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 068/OpponentCommand.txt b/tests/after_113/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 068/PlayerCommand.txt b/tests/after_113/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_113/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 069/OpponentCommand.txt b/tests/after_113/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 069/PlayerCommand.txt b/tests/after_113/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 070/OpponentCommand.txt b/tests/after_113/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 070/PlayerCommand.txt b/tests/after_113/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_113/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 000/OpponentCommand.txt b/tests/after_113_2/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_113_2/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 000/PlayerCommand.txt b/tests/after_113_2/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_113_2/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 001/OpponentCommand.txt b/tests/after_113_2/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 001/PlayerCommand.txt b/tests/after_113_2/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 002/OpponentCommand.txt b/tests/after_113_2/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 002/PlayerCommand.txt b/tests/after_113_2/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 003/OpponentCommand.txt b/tests/after_113_2/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113_2/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 003/PlayerCommand.txt b/tests/after_113_2/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113_2/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 004/OpponentCommand.txt b/tests/after_113_2/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 004/PlayerCommand.txt b/tests/after_113_2/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 005/OpponentCommand.txt b/tests/after_113_2/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 005/PlayerCommand.txt b/tests/after_113_2/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 006/OpponentCommand.txt b/tests/after_113_2/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 006/PlayerCommand.txt b/tests/after_113_2/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 007/OpponentCommand.txt b/tests/after_113_2/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/tests/after_113_2/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 007/PlayerCommand.txt b/tests/after_113_2/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/tests/after_113_2/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 008/OpponentCommand.txt b/tests/after_113_2/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 008/PlayerCommand.txt b/tests/after_113_2/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 009/OpponentCommand.txt b/tests/after_113_2/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..117d6c2 --- /dev/null +++ b/tests/after_113_2/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 009/PlayerCommand.txt b/tests/after_113_2/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..117d6c2 --- /dev/null +++ b/tests/after_113_2/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 010/OpponentCommand.txt b/tests/after_113_2/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_113_2/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 010/PlayerCommand.txt b/tests/after_113_2/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_113_2/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 011/OpponentCommand.txt b/tests/after_113_2/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113_2/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 011/PlayerCommand.txt b/tests/after_113_2/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113_2/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 012/OpponentCommand.txt b/tests/after_113_2/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_113_2/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 012/PlayerCommand.txt b/tests/after_113_2/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_113_2/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 013/OpponentCommand.txt b/tests/after_113_2/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 013/PlayerCommand.txt b/tests/after_113_2/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 014/OpponentCommand.txt b/tests/after_113_2/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/after_113_2/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 014/PlayerCommand.txt b/tests/after_113_2/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/after_113_2/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 015/OpponentCommand.txt b/tests/after_113_2/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_113_2/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 015/PlayerCommand.txt b/tests/after_113_2/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_113_2/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 016/OpponentCommand.txt b/tests/after_113_2/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..ea08612 --- /dev/null +++ b/tests/after_113_2/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 016/PlayerCommand.txt b/tests/after_113_2/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..ea08612 --- /dev/null +++ b/tests/after_113_2/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 017/OpponentCommand.txt b/tests/after_113_2/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..a68deb8 --- /dev/null +++ b/tests/after_113_2/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 017/PlayerCommand.txt b/tests/after_113_2/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..a68deb8 --- /dev/null +++ b/tests/after_113_2/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 018/OpponentCommand.txt b/tests/after_113_2/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..4371338 --- /dev/null +++ b/tests/after_113_2/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 018/PlayerCommand.txt b/tests/after_113_2/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..4371338 --- /dev/null +++ b/tests/after_113_2/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 019/OpponentCommand.txt b/tests/after_113_2/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/after_113_2/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 019/PlayerCommand.txt b/tests/after_113_2/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/after_113_2/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 020/OpponentCommand.txt b/tests/after_113_2/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..a825030 --- /dev/null +++ b/tests/after_113_2/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 020/PlayerCommand.txt b/tests/after_113_2/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..93ec9b2 --- /dev/null +++ b/tests/after_113_2/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 021/OpponentCommand.txt b/tests/after_113_2/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..50688ac --- /dev/null +++ b/tests/after_113_2/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 021/PlayerCommand.txt b/tests/after_113_2/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/tests/after_113_2/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 022/OpponentCommand.txt b/tests/after_113_2/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_113_2/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 022/PlayerCommand.txt b/tests/after_113_2/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_113_2/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 023/OpponentCommand.txt b/tests/after_113_2/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_113_2/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 023/PlayerCommand.txt b/tests/after_113_2/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..0b12f52 --- /dev/null +++ b/tests/after_113_2/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +2,4,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 024/OpponentCommand.txt b/tests/after_113_2/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_113_2/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 024/PlayerCommand.txt b/tests/after_113_2/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..a825030 --- /dev/null +++ b/tests/after_113_2/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 025/OpponentCommand.txt b/tests/after_113_2/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/tests/after_113_2/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 025/PlayerCommand.txt b/tests/after_113_2/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_113_2/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 026/OpponentCommand.txt b/tests/after_113_2/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/tests/after_113_2/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 026/PlayerCommand.txt b/tests/after_113_2/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/after_113_2/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 027/OpponentCommand.txt b/tests/after_113_2/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_113_2/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 027/PlayerCommand.txt b/tests/after_113_2/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/after_113_2/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 028/OpponentCommand.txt b/tests/after_113_2/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/after_113_2/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 028/PlayerCommand.txt b/tests/after_113_2/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/after_113_2/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 029/OpponentCommand.txt b/tests/after_113_2/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/after_113_2/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 029/PlayerCommand.txt b/tests/after_113_2/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/after_113_2/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 030/OpponentCommand.txt b/tests/after_113_2/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_113_2/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 030/PlayerCommand.txt b/tests/after_113_2/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..50688ac --- /dev/null +++ b/tests/after_113_2/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 031/OpponentCommand.txt b/tests/after_113_2/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/tests/after_113_2/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 031/PlayerCommand.txt b/tests/after_113_2/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 032/OpponentCommand.txt b/tests/after_113_2/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/tests/after_113_2/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 032/PlayerCommand.txt b/tests/after_113_2/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..455ac78 --- /dev/null +++ b/tests/after_113_2/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +2,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 033/OpponentCommand.txt b/tests/after_113_2/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..50688ac --- /dev/null +++ b/tests/after_113_2/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 033/PlayerCommand.txt b/tests/after_113_2/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..3d765f0 --- /dev/null +++ b/tests/after_113_2/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +5,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 034/OpponentCommand.txt b/tests/after_113_2/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113_2/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 034/PlayerCommand.txt b/tests/after_113_2/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113_2/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 035/OpponentCommand.txt b/tests/after_113_2/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_113_2/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 035/PlayerCommand.txt b/tests/after_113_2/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_113_2/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 036/OpponentCommand.txt b/tests/after_113_2/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_113_2/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 036/PlayerCommand.txt b/tests/after_113_2/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..08ceedf --- /dev/null +++ b/tests/after_113_2/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 037/OpponentCommand.txt b/tests/after_113_2/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113_2/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 037/PlayerCommand.txt b/tests/after_113_2/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/after_113_2/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 038/OpponentCommand.txt b/tests/after_113_2/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..6628f95 --- /dev/null +++ b/tests/after_113_2/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 038/PlayerCommand.txt b/tests/after_113_2/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..c4321a0 --- /dev/null +++ b/tests/after_113_2/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +3,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 039/OpponentCommand.txt b/tests/after_113_2/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..1e7a5f9 --- /dev/null +++ b/tests/after_113_2/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 039/PlayerCommand.txt b/tests/after_113_2/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/tests/after_113_2/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 040/OpponentCommand.txt b/tests/after_113_2/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 040/PlayerCommand.txt b/tests/after_113_2/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/after_113_2/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 041/OpponentCommand.txt b/tests/after_113_2/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..b209272 --- /dev/null +++ b/tests/after_113_2/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 041/PlayerCommand.txt b/tests/after_113_2/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_113_2/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 042/OpponentCommand.txt b/tests/after_113_2/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..1fcc509 --- /dev/null +++ b/tests/after_113_2/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 042/PlayerCommand.txt b/tests/after_113_2/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_113_2/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 043/OpponentCommand.txt b/tests/after_113_2/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_113_2/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 043/PlayerCommand.txt b/tests/after_113_2/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_113_2/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 044/OpponentCommand.txt b/tests/after_113_2/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..6628f95 --- /dev/null +++ b/tests/after_113_2/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 044/PlayerCommand.txt b/tests/after_113_2/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_113_2/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 045/OpponentCommand.txt b/tests/after_113_2/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..b58ed80 --- /dev/null +++ b/tests/after_113_2/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 045/PlayerCommand.txt b/tests/after_113_2/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/after_113_2/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 046/OpponentCommand.txt b/tests/after_113_2/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_113_2/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 046/PlayerCommand.txt b/tests/after_113_2/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113_2/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 047/OpponentCommand.txt b/tests/after_113_2/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/after_113_2/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 047/PlayerCommand.txt b/tests/after_113_2/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/tests/after_113_2/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 048/OpponentCommand.txt b/tests/after_113_2/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/after_113_2/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 048/PlayerCommand.txt b/tests/after_113_2/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/tests/after_113_2/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 049/OpponentCommand.txt b/tests/after_113_2/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_113_2/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 049/PlayerCommand.txt b/tests/after_113_2/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_113_2/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 050/OpponentCommand.txt b/tests/after_113_2/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..4f8f464 --- /dev/null +++ b/tests/after_113_2/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +5,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 050/PlayerCommand.txt b/tests/after_113_2/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_113_2/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 051/OpponentCommand.txt b/tests/after_113_2/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/after_113_2/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 051/PlayerCommand.txt b/tests/after_113_2/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/tests/after_113_2/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 052/OpponentCommand.txt b/tests/after_113_2/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..8c5ef78 --- /dev/null +++ b/tests/after_113_2/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 052/PlayerCommand.txt b/tests/after_113_2/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_113_2/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 053/OpponentCommand.txt b/tests/after_113_2/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/after_113_2/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 053/PlayerCommand.txt b/tests/after_113_2/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_113_2/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 054/OpponentCommand.txt b/tests/after_113_2/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113_2/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 054/PlayerCommand.txt b/tests/after_113_2/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_113_2/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 055/OpponentCommand.txt b/tests/after_113_2/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113_2/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 055/PlayerCommand.txt b/tests/after_113_2/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/after_113_2/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 056/OpponentCommand.txt b/tests/after_113_2/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_113_2/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 056/PlayerCommand.txt b/tests/after_113_2/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_113_2/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 057/OpponentCommand.txt b/tests/after_113_2/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/after_113_2/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 057/PlayerCommand.txt b/tests/after_113_2/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..117d6c2 --- /dev/null +++ b/tests/after_113_2/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 058/OpponentCommand.txt b/tests/after_113_2/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113_2/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 058/PlayerCommand.txt b/tests/after_113_2/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_113_2/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 059/OpponentCommand.txt b/tests/after_113_2/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/after_113_2/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 059/PlayerCommand.txt b/tests/after_113_2/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 060/OpponentCommand.txt b/tests/after_113_2/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_113_2/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 060/PlayerCommand.txt b/tests/after_113_2/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/tests/after_113_2/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 061/OpponentCommand.txt b/tests/after_113_2/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/after_113_2/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 061/PlayerCommand.txt b/tests/after_113_2/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 062/OpponentCommand.txt b/tests/after_113_2/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/after_113_2/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 062/PlayerCommand.txt b/tests/after_113_2/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/after_113_2/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 063/OpponentCommand.txt b/tests/after_113_2/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_113_2/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 063/PlayerCommand.txt b/tests/after_113_2/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 064/OpponentCommand.txt b/tests/after_113_2/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_113_2/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 064/PlayerCommand.txt b/tests/after_113_2/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_113_2/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 065/OpponentCommand.txt b/tests/after_113_2/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/after_113_2/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 065/PlayerCommand.txt b/tests/after_113_2/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_113_2/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 8d619db..6e10ea8 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -10,12 +10,12 @@ use std::io::prelude::*; #[test] fn it_successfully_simulates_replay() { - test_from_replay("tests/after_112", 54); + test_from_replay("tests/after_113", 32); } -#[test] +//#[test] fn it_successfully_simulates_replay_two() { - test_from_replay("tests/after_112_2", 76); + test_from_replay("tests/after_113_2", 65); } fn test_from_replay(replay_folder: &str, length: usize) { -- cgit v1.2.3 From fd65ae62fba9a14e5f7f9ba3b0f9969a1d199f0d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 4 Jun 2018 23:22:08 +0200 Subject: Cleaned out second test case --- tests/after_113_2/Round 000/OpponentCommand.txt | 1 - tests/after_113_2/Round 000/PlayerCommand.txt | 1 - tests/after_113_2/Round 001/OpponentCommand.txt | 1 - tests/after_113_2/Round 001/PlayerCommand.txt | 1 - tests/after_113_2/Round 002/OpponentCommand.txt | 1 - tests/after_113_2/Round 002/PlayerCommand.txt | 1 - tests/after_113_2/Round 003/OpponentCommand.txt | 1 - tests/after_113_2/Round 003/PlayerCommand.txt | 1 - tests/after_113_2/Round 004/OpponentCommand.txt | 1 - tests/after_113_2/Round 004/PlayerCommand.txt | 1 - tests/after_113_2/Round 005/OpponentCommand.txt | 1 - tests/after_113_2/Round 005/PlayerCommand.txt | 1 - tests/after_113_2/Round 006/OpponentCommand.txt | 1 - tests/after_113_2/Round 006/PlayerCommand.txt | 1 - tests/after_113_2/Round 007/OpponentCommand.txt | 1 - tests/after_113_2/Round 007/PlayerCommand.txt | 1 - tests/after_113_2/Round 008/OpponentCommand.txt | 1 - tests/after_113_2/Round 008/PlayerCommand.txt | 1 - tests/after_113_2/Round 009/OpponentCommand.txt | 1 - tests/after_113_2/Round 009/PlayerCommand.txt | 1 - tests/after_113_2/Round 010/OpponentCommand.txt | 1 - tests/after_113_2/Round 010/PlayerCommand.txt | 1 - tests/after_113_2/Round 011/OpponentCommand.txt | 1 - tests/after_113_2/Round 011/PlayerCommand.txt | 1 - tests/after_113_2/Round 012/OpponentCommand.txt | 1 - tests/after_113_2/Round 012/PlayerCommand.txt | 1 - tests/after_113_2/Round 013/OpponentCommand.txt | 1 - tests/after_113_2/Round 013/PlayerCommand.txt | 1 - tests/after_113_2/Round 014/OpponentCommand.txt | 1 - tests/after_113_2/Round 014/PlayerCommand.txt | 1 - tests/after_113_2/Round 015/OpponentCommand.txt | 1 - tests/after_113_2/Round 015/PlayerCommand.txt | 1 - tests/after_113_2/Round 016/OpponentCommand.txt | 1 - tests/after_113_2/Round 016/PlayerCommand.txt | 1 - tests/after_113_2/Round 017/OpponentCommand.txt | 1 - tests/after_113_2/Round 017/PlayerCommand.txt | 1 - tests/after_113_2/Round 018/OpponentCommand.txt | 1 - tests/after_113_2/Round 018/PlayerCommand.txt | 1 - tests/after_113_2/Round 019/OpponentCommand.txt | 1 - tests/after_113_2/Round 019/PlayerCommand.txt | 1 - tests/after_113_2/Round 020/OpponentCommand.txt | 1 - tests/after_113_2/Round 020/PlayerCommand.txt | 1 - tests/after_113_2/Round 021/OpponentCommand.txt | 1 - tests/after_113_2/Round 021/PlayerCommand.txt | 1 - tests/after_113_2/Round 022/OpponentCommand.txt | 1 - tests/after_113_2/Round 022/PlayerCommand.txt | 1 - tests/after_113_2/Round 023/OpponentCommand.txt | 1 - tests/after_113_2/Round 023/PlayerCommand.txt | 1 - tests/after_113_2/Round 024/OpponentCommand.txt | 1 - tests/after_113_2/Round 024/PlayerCommand.txt | 1 - tests/after_113_2/Round 025/OpponentCommand.txt | 1 - tests/after_113_2/Round 025/PlayerCommand.txt | 1 - tests/after_113_2/Round 026/OpponentCommand.txt | 1 - tests/after_113_2/Round 026/PlayerCommand.txt | 1 - tests/after_113_2/Round 027/OpponentCommand.txt | 1 - tests/after_113_2/Round 027/PlayerCommand.txt | 1 - tests/after_113_2/Round 028/OpponentCommand.txt | 1 - tests/after_113_2/Round 028/PlayerCommand.txt | 1 - tests/after_113_2/Round 029/OpponentCommand.txt | 1 - tests/after_113_2/Round 029/PlayerCommand.txt | 1 - tests/after_113_2/Round 030/OpponentCommand.txt | 1 - tests/after_113_2/Round 030/PlayerCommand.txt | 1 - tests/after_113_2/Round 031/OpponentCommand.txt | 1 - tests/after_113_2/Round 031/PlayerCommand.txt | 1 - tests/after_113_2/Round 032/OpponentCommand.txt | 1 - tests/after_113_2/Round 032/PlayerCommand.txt | 1 - tests/after_113_2/Round 033/OpponentCommand.txt | 1 - tests/after_113_2/Round 033/PlayerCommand.txt | 1 - tests/after_113_2/Round 034/OpponentCommand.txt | 1 - tests/after_113_2/Round 034/PlayerCommand.txt | 1 - tests/after_113_2/Round 035/OpponentCommand.txt | 1 - tests/after_113_2/Round 035/PlayerCommand.txt | 1 - tests/after_113_2/Round 036/OpponentCommand.txt | 1 - tests/after_113_2/Round 036/PlayerCommand.txt | 1 - tests/after_113_2/Round 037/OpponentCommand.txt | 1 - tests/after_113_2/Round 037/PlayerCommand.txt | 1 - tests/after_113_2/Round 038/OpponentCommand.txt | 1 - tests/after_113_2/Round 038/PlayerCommand.txt | 1 - tests/after_113_2/Round 039/OpponentCommand.txt | 1 - tests/after_113_2/Round 039/PlayerCommand.txt | 1 - tests/after_113_2/Round 040/OpponentCommand.txt | 1 - tests/after_113_2/Round 040/PlayerCommand.txt | 1 - tests/after_113_2/Round 041/OpponentCommand.txt | 1 - tests/after_113_2/Round 041/PlayerCommand.txt | 1 - tests/after_113_2/Round 042/OpponentCommand.txt | 1 - tests/after_113_2/Round 042/PlayerCommand.txt | 1 - tests/after_113_2/Round 043/OpponentCommand.txt | 1 - tests/after_113_2/Round 043/PlayerCommand.txt | 1 - tests/after_113_2/Round 044/OpponentCommand.txt | 1 - tests/after_113_2/Round 044/PlayerCommand.txt | 1 - tests/after_113_2/Round 045/OpponentCommand.txt | 1 - tests/after_113_2/Round 045/PlayerCommand.txt | 1 - tests/after_113_2/Round 046/OpponentCommand.txt | 1 - tests/after_113_2/Round 046/PlayerCommand.txt | 1 - tests/after_113_2/Round 047/OpponentCommand.txt | 1 - tests/after_113_2/Round 047/PlayerCommand.txt | 1 - tests/after_113_2/Round 048/OpponentCommand.txt | 1 - tests/after_113_2/Round 048/PlayerCommand.txt | 1 - tests/after_113_2/Round 049/OpponentCommand.txt | 1 - tests/after_113_2/Round 049/PlayerCommand.txt | 1 - tests/after_113_2/Round 050/OpponentCommand.txt | 1 - tests/after_113_2/Round 050/PlayerCommand.txt | 1 - tests/after_113_2/Round 051/OpponentCommand.txt | 1 - tests/after_113_2/Round 051/PlayerCommand.txt | 1 - tests/after_113_2/Round 052/OpponentCommand.txt | 1 - tests/after_113_2/Round 052/PlayerCommand.txt | 1 - tests/after_113_2/Round 053/OpponentCommand.txt | 1 - tests/after_113_2/Round 053/PlayerCommand.txt | 1 - tests/after_113_2/Round 054/OpponentCommand.txt | 1 - tests/after_113_2/Round 054/PlayerCommand.txt | 1 - tests/after_113_2/Round 055/OpponentCommand.txt | 1 - tests/after_113_2/Round 055/PlayerCommand.txt | 1 - tests/after_113_2/Round 056/OpponentCommand.txt | 1 - tests/after_113_2/Round 056/PlayerCommand.txt | 1 - tests/after_113_2/Round 057/OpponentCommand.txt | 1 - tests/after_113_2/Round 057/PlayerCommand.txt | 1 - tests/after_113_2/Round 058/OpponentCommand.txt | 1 - tests/after_113_2/Round 058/PlayerCommand.txt | 1 - tests/after_113_2/Round 059/OpponentCommand.txt | 1 - tests/after_113_2/Round 059/PlayerCommand.txt | 1 - tests/after_113_2/Round 060/OpponentCommand.txt | 1 - tests/after_113_2/Round 060/PlayerCommand.txt | 1 - tests/after_113_2/Round 061/OpponentCommand.txt | 1 - tests/after_113_2/Round 061/PlayerCommand.txt | 1 - tests/after_113_2/Round 062/OpponentCommand.txt | 1 - tests/after_113_2/Round 062/PlayerCommand.txt | 1 - tests/after_113_2/Round 063/OpponentCommand.txt | 1 - tests/after_113_2/Round 063/PlayerCommand.txt | 1 - tests/after_113_2/Round 064/OpponentCommand.txt | 1 - tests/after_113_2/Round 064/PlayerCommand.txt | 1 - tests/after_113_2/Round 065/OpponentCommand.txt | 1 - tests/after_113_2/Round 065/PlayerCommand.txt | 1 - tests/live-comparison.rs | 5 ----- 133 files changed, 137 deletions(-) delete mode 100644 tests/after_113_2/Round 000/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 000/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 001/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 001/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 002/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 002/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 003/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 003/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 004/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 004/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 005/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 005/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 006/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 006/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 007/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 007/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 008/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 008/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 009/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 009/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 010/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 010/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 011/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 011/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 012/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 012/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 013/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 013/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 014/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 014/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 015/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 015/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 016/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 016/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 017/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 017/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 018/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 018/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 019/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 019/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 020/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 020/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 021/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 021/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 022/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 022/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 023/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 023/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 024/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 024/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 025/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 025/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 026/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 026/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 027/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 027/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 028/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 028/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 029/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 029/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 030/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 030/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 031/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 031/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 032/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 032/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 033/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 033/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 034/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 034/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 035/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 035/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 036/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 036/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 037/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 037/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 038/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 038/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 039/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 039/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 040/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 040/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 041/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 041/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 042/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 042/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 043/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 043/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 044/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 044/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 045/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 045/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 046/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 046/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 047/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 047/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 048/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 048/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 049/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 049/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 050/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 050/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 051/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 051/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 052/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 052/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 053/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 053/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 054/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 054/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 055/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 055/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 056/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 056/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 057/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 057/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 058/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 058/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 059/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 059/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 060/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 060/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 061/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 061/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 062/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 062/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 063/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 063/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 064/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 064/PlayerCommand.txt delete mode 100644 tests/after_113_2/Round 065/OpponentCommand.txt delete mode 100644 tests/after_113_2/Round 065/PlayerCommand.txt diff --git a/tests/after_113_2/Round 000/OpponentCommand.txt b/tests/after_113_2/Round 000/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_113_2/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 000/PlayerCommand.txt b/tests/after_113_2/Round 000/PlayerCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_113_2/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 001/OpponentCommand.txt b/tests/after_113_2/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 001/PlayerCommand.txt b/tests/after_113_2/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 002/OpponentCommand.txt b/tests/after_113_2/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 002/PlayerCommand.txt b/tests/after_113_2/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 003/OpponentCommand.txt b/tests/after_113_2/Round 003/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113_2/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 003/PlayerCommand.txt b/tests/after_113_2/Round 003/PlayerCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113_2/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 004/OpponentCommand.txt b/tests/after_113_2/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 004/PlayerCommand.txt b/tests/after_113_2/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 005/OpponentCommand.txt b/tests/after_113_2/Round 005/OpponentCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 005/PlayerCommand.txt b/tests/after_113_2/Round 005/PlayerCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 006/OpponentCommand.txt b/tests/after_113_2/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 006/PlayerCommand.txt b/tests/after_113_2/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 007/OpponentCommand.txt b/tests/after_113_2/Round 007/OpponentCommand.txt deleted file mode 100644 index d05a714..0000000 --- a/tests/after_113_2/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 007/PlayerCommand.txt b/tests/after_113_2/Round 007/PlayerCommand.txt deleted file mode 100644 index d05a714..0000000 --- a/tests/after_113_2/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 008/OpponentCommand.txt b/tests/after_113_2/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 008/PlayerCommand.txt b/tests/after_113_2/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 009/OpponentCommand.txt b/tests/after_113_2/Round 009/OpponentCommand.txt deleted file mode 100644 index 117d6c2..0000000 --- a/tests/after_113_2/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 009/PlayerCommand.txt b/tests/after_113_2/Round 009/PlayerCommand.txt deleted file mode 100644 index 117d6c2..0000000 --- a/tests/after_113_2/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 010/OpponentCommand.txt b/tests/after_113_2/Round 010/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_113_2/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 010/PlayerCommand.txt b/tests/after_113_2/Round 010/PlayerCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_113_2/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 011/OpponentCommand.txt b/tests/after_113_2/Round 011/OpponentCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113_2/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 011/PlayerCommand.txt b/tests/after_113_2/Round 011/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113_2/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 012/OpponentCommand.txt b/tests/after_113_2/Round 012/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_113_2/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 012/PlayerCommand.txt b/tests/after_113_2/Round 012/PlayerCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_113_2/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 013/OpponentCommand.txt b/tests/after_113_2/Round 013/OpponentCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 013/PlayerCommand.txt b/tests/after_113_2/Round 013/PlayerCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 014/OpponentCommand.txt b/tests/after_113_2/Round 014/OpponentCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/after_113_2/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 014/PlayerCommand.txt b/tests/after_113_2/Round 014/PlayerCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/after_113_2/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 015/OpponentCommand.txt b/tests/after_113_2/Round 015/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_113_2/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 015/PlayerCommand.txt b/tests/after_113_2/Round 015/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_113_2/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 016/OpponentCommand.txt b/tests/after_113_2/Round 016/OpponentCommand.txt deleted file mode 100644 index ea08612..0000000 --- a/tests/after_113_2/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 016/PlayerCommand.txt b/tests/after_113_2/Round 016/PlayerCommand.txt deleted file mode 100644 index ea08612..0000000 --- a/tests/after_113_2/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 017/OpponentCommand.txt b/tests/after_113_2/Round 017/OpponentCommand.txt deleted file mode 100644 index a68deb8..0000000 --- a/tests/after_113_2/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 017/PlayerCommand.txt b/tests/after_113_2/Round 017/PlayerCommand.txt deleted file mode 100644 index a68deb8..0000000 --- a/tests/after_113_2/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 018/OpponentCommand.txt b/tests/after_113_2/Round 018/OpponentCommand.txt deleted file mode 100644 index 4371338..0000000 --- a/tests/after_113_2/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 018/PlayerCommand.txt b/tests/after_113_2/Round 018/PlayerCommand.txt deleted file mode 100644 index 4371338..0000000 --- a/tests/after_113_2/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 019/OpponentCommand.txt b/tests/after_113_2/Round 019/OpponentCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/after_113_2/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 019/PlayerCommand.txt b/tests/after_113_2/Round 019/PlayerCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/after_113_2/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 020/OpponentCommand.txt b/tests/after_113_2/Round 020/OpponentCommand.txt deleted file mode 100644 index a825030..0000000 --- a/tests/after_113_2/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 020/PlayerCommand.txt b/tests/after_113_2/Round 020/PlayerCommand.txt deleted file mode 100644 index 93ec9b2..0000000 --- a/tests/after_113_2/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 021/OpponentCommand.txt b/tests/after_113_2/Round 021/OpponentCommand.txt deleted file mode 100644 index 50688ac..0000000 --- a/tests/after_113_2/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 021/PlayerCommand.txt b/tests/after_113_2/Round 021/PlayerCommand.txt deleted file mode 100644 index d51905f..0000000 --- a/tests/after_113_2/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 022/OpponentCommand.txt b/tests/after_113_2/Round 022/OpponentCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_113_2/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 022/PlayerCommand.txt b/tests/after_113_2/Round 022/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_113_2/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 023/OpponentCommand.txt b/tests/after_113_2/Round 023/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_113_2/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 023/PlayerCommand.txt b/tests/after_113_2/Round 023/PlayerCommand.txt deleted file mode 100644 index 0b12f52..0000000 --- a/tests/after_113_2/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 024/OpponentCommand.txt b/tests/after_113_2/Round 024/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_113_2/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 024/PlayerCommand.txt b/tests/after_113_2/Round 024/PlayerCommand.txt deleted file mode 100644 index a825030..0000000 --- a/tests/after_113_2/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 025/OpponentCommand.txt b/tests/after_113_2/Round 025/OpponentCommand.txt deleted file mode 100644 index 0a612db..0000000 --- a/tests/after_113_2/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 025/PlayerCommand.txt b/tests/after_113_2/Round 025/PlayerCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_113_2/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 026/OpponentCommand.txt b/tests/after_113_2/Round 026/OpponentCommand.txt deleted file mode 100644 index e02c049..0000000 --- a/tests/after_113_2/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 026/PlayerCommand.txt b/tests/after_113_2/Round 026/PlayerCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/after_113_2/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 027/OpponentCommand.txt b/tests/after_113_2/Round 027/OpponentCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_113_2/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 027/PlayerCommand.txt b/tests/after_113_2/Round 027/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/after_113_2/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 028/OpponentCommand.txt b/tests/after_113_2/Round 028/OpponentCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/after_113_2/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 028/PlayerCommand.txt b/tests/after_113_2/Round 028/PlayerCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/after_113_2/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 029/OpponentCommand.txt b/tests/after_113_2/Round 029/OpponentCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/after_113_2/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 029/PlayerCommand.txt b/tests/after_113_2/Round 029/PlayerCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/after_113_2/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 030/OpponentCommand.txt b/tests/after_113_2/Round 030/OpponentCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113_2/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 030/PlayerCommand.txt b/tests/after_113_2/Round 030/PlayerCommand.txt deleted file mode 100644 index 50688ac..0000000 --- a/tests/after_113_2/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 031/OpponentCommand.txt b/tests/after_113_2/Round 031/OpponentCommand.txt deleted file mode 100644 index 16ddcd7..0000000 --- a/tests/after_113_2/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 031/PlayerCommand.txt b/tests/after_113_2/Round 031/PlayerCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 032/OpponentCommand.txt b/tests/after_113_2/Round 032/OpponentCommand.txt deleted file mode 100644 index 22d278e..0000000 --- a/tests/after_113_2/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 032/PlayerCommand.txt b/tests/after_113_2/Round 032/PlayerCommand.txt deleted file mode 100644 index 455ac78..0000000 --- a/tests/after_113_2/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 033/OpponentCommand.txt b/tests/after_113_2/Round 033/OpponentCommand.txt deleted file mode 100644 index 50688ac..0000000 --- a/tests/after_113_2/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 033/PlayerCommand.txt b/tests/after_113_2/Round 033/PlayerCommand.txt deleted file mode 100644 index 3d765f0..0000000 --- a/tests/after_113_2/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 034/OpponentCommand.txt b/tests/after_113_2/Round 034/OpponentCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113_2/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 034/PlayerCommand.txt b/tests/after_113_2/Round 034/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113_2/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 035/OpponentCommand.txt b/tests/after_113_2/Round 035/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_113_2/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 035/PlayerCommand.txt b/tests/after_113_2/Round 035/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_113_2/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 036/OpponentCommand.txt b/tests/after_113_2/Round 036/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_113_2/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 036/PlayerCommand.txt b/tests/after_113_2/Round 036/PlayerCommand.txt deleted file mode 100644 index 08ceedf..0000000 --- a/tests/after_113_2/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 037/OpponentCommand.txt b/tests/after_113_2/Round 037/OpponentCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113_2/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 037/PlayerCommand.txt b/tests/after_113_2/Round 037/PlayerCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/after_113_2/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 038/OpponentCommand.txt b/tests/after_113_2/Round 038/OpponentCommand.txt deleted file mode 100644 index 6628f95..0000000 --- a/tests/after_113_2/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 038/PlayerCommand.txt b/tests/after_113_2/Round 038/PlayerCommand.txt deleted file mode 100644 index c4321a0..0000000 --- a/tests/after_113_2/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 039/OpponentCommand.txt b/tests/after_113_2/Round 039/OpponentCommand.txt deleted file mode 100644 index 1e7a5f9..0000000 --- a/tests/after_113_2/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 039/PlayerCommand.txt b/tests/after_113_2/Round 039/PlayerCommand.txt deleted file mode 100644 index d51905f..0000000 --- a/tests/after_113_2/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 040/OpponentCommand.txt b/tests/after_113_2/Round 040/OpponentCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 040/PlayerCommand.txt b/tests/after_113_2/Round 040/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/after_113_2/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 041/OpponentCommand.txt b/tests/after_113_2/Round 041/OpponentCommand.txt deleted file mode 100644 index b209272..0000000 --- a/tests/after_113_2/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 041/PlayerCommand.txt b/tests/after_113_2/Round 041/PlayerCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_113_2/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 042/OpponentCommand.txt b/tests/after_113_2/Round 042/OpponentCommand.txt deleted file mode 100644 index 1fcc509..0000000 --- a/tests/after_113_2/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 042/PlayerCommand.txt b/tests/after_113_2/Round 042/PlayerCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_113_2/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 043/OpponentCommand.txt b/tests/after_113_2/Round 043/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_113_2/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 043/PlayerCommand.txt b/tests/after_113_2/Round 043/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_113_2/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 044/OpponentCommand.txt b/tests/after_113_2/Round 044/OpponentCommand.txt deleted file mode 100644 index 6628f95..0000000 --- a/tests/after_113_2/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 044/PlayerCommand.txt b/tests/after_113_2/Round 044/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113_2/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 045/OpponentCommand.txt b/tests/after_113_2/Round 045/OpponentCommand.txt deleted file mode 100644 index b58ed80..0000000 --- a/tests/after_113_2/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 045/PlayerCommand.txt b/tests/after_113_2/Round 045/PlayerCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/after_113_2/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 046/OpponentCommand.txt b/tests/after_113_2/Round 046/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_113_2/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 046/PlayerCommand.txt b/tests/after_113_2/Round 046/PlayerCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113_2/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 047/OpponentCommand.txt b/tests/after_113_2/Round 047/OpponentCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/after_113_2/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 047/PlayerCommand.txt b/tests/after_113_2/Round 047/PlayerCommand.txt deleted file mode 100644 index 72ca43d..0000000 --- a/tests/after_113_2/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 048/OpponentCommand.txt b/tests/after_113_2/Round 048/OpponentCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/after_113_2/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 048/PlayerCommand.txt b/tests/after_113_2/Round 048/PlayerCommand.txt deleted file mode 100644 index 94d7b0a..0000000 --- a/tests/after_113_2/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 049/OpponentCommand.txt b/tests/after_113_2/Round 049/OpponentCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_113_2/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 049/PlayerCommand.txt b/tests/after_113_2/Round 049/PlayerCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_113_2/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 050/OpponentCommand.txt b/tests/after_113_2/Round 050/OpponentCommand.txt deleted file mode 100644 index 4f8f464..0000000 --- a/tests/after_113_2/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 050/PlayerCommand.txt b/tests/after_113_2/Round 050/PlayerCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_113_2/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 051/OpponentCommand.txt b/tests/after_113_2/Round 051/OpponentCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/after_113_2/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 051/PlayerCommand.txt b/tests/after_113_2/Round 051/PlayerCommand.txt deleted file mode 100644 index f24e83b..0000000 --- a/tests/after_113_2/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,0 \ No newline at end of file diff --git a/tests/after_113_2/Round 052/OpponentCommand.txt b/tests/after_113_2/Round 052/OpponentCommand.txt deleted file mode 100644 index 8c5ef78..0000000 --- a/tests/after_113_2/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 052/PlayerCommand.txt b/tests/after_113_2/Round 052/PlayerCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_113_2/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 053/OpponentCommand.txt b/tests/after_113_2/Round 053/OpponentCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/after_113_2/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 053/PlayerCommand.txt b/tests/after_113_2/Round 053/PlayerCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_113_2/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 054/OpponentCommand.txt b/tests/after_113_2/Round 054/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113_2/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 054/PlayerCommand.txt b/tests/after_113_2/Round 054/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_113_2/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 055/OpponentCommand.txt b/tests/after_113_2/Round 055/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113_2/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 055/PlayerCommand.txt b/tests/after_113_2/Round 055/PlayerCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/after_113_2/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 056/OpponentCommand.txt b/tests/after_113_2/Round 056/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_113_2/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 056/PlayerCommand.txt b/tests/after_113_2/Round 056/PlayerCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_113_2/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 057/OpponentCommand.txt b/tests/after_113_2/Round 057/OpponentCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/after_113_2/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 057/PlayerCommand.txt b/tests/after_113_2/Round 057/PlayerCommand.txt deleted file mode 100644 index 117d6c2..0000000 --- a/tests/after_113_2/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 058/OpponentCommand.txt b/tests/after_113_2/Round 058/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113_2/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 058/PlayerCommand.txt b/tests/after_113_2/Round 058/PlayerCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113_2/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 059/OpponentCommand.txt b/tests/after_113_2/Round 059/OpponentCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/after_113_2/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 059/PlayerCommand.txt b/tests/after_113_2/Round 059/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 060/OpponentCommand.txt b/tests/after_113_2/Round 060/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113_2/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 060/PlayerCommand.txt b/tests/after_113_2/Round 060/PlayerCommand.txt deleted file mode 100644 index 4a8cf07..0000000 --- a/tests/after_113_2/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,1 \ No newline at end of file diff --git a/tests/after_113_2/Round 061/OpponentCommand.txt b/tests/after_113_2/Round 061/OpponentCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/after_113_2/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 061/PlayerCommand.txt b/tests/after_113_2/Round 061/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 062/OpponentCommand.txt b/tests/after_113_2/Round 062/OpponentCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/after_113_2/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 062/PlayerCommand.txt b/tests/after_113_2/Round 062/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113_2/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 063/OpponentCommand.txt b/tests/after_113_2/Round 063/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_113_2/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 063/PlayerCommand.txt b/tests/after_113_2/Round 063/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113_2/Round 064/OpponentCommand.txt b/tests/after_113_2/Round 064/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_113_2/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 064/PlayerCommand.txt b/tests/after_113_2/Round 064/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_113_2/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 065/OpponentCommand.txt b/tests/after_113_2/Round 065/OpponentCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/after_113_2/Round 065/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/after_113_2/Round 065/PlayerCommand.txt b/tests/after_113_2/Round 065/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113_2/Round 065/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 6e10ea8..301f8fc 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -13,11 +13,6 @@ fn it_successfully_simulates_replay() { test_from_replay("tests/after_113", 32); } -//#[test] -fn it_successfully_simulates_replay_two() { - test_from_replay("tests/after_113_2", 65); -} - fn test_from_replay(replay_folder: &str, length: usize) { let (settings, mut state) = json::read_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); -- cgit v1.2.3 From 243a42b1fb8959e740aa21a79df78e78262e683c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 4 Jun 2018 23:33:55 +0200 Subject: Saturating sub. Marginal speed improvement. Clearer logic. --- src/engine/mod.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index a4334f5..a649453 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -7,7 +7,6 @@ use self::geometry::Point; use self::settings::{GameSettings, BuildingSettings}; use std::ops::FnMut; -use std::cmp; #[derive(Debug, Clone, PartialEq)] pub struct GameState { @@ -199,8 +198,7 @@ impl GameState { 'speed_loop: for _ in 0..missiles[m].speed { wrapping_move_fn(&mut missiles[m].pos); if missiles[m].pos.x >= settings.size.x { - let damage = cmp::min(missiles[m].damage, opponent.health); - opponent.health -= damage; + opponent.health = opponent.health.saturating_sub(missiles[m].damage); missiles_len -= 1; missiles.swap(m, missiles_len); @@ -210,8 +208,7 @@ impl GameState { else { for b in 0..opponent_buildings.len() { if opponent_buildings[b].pos == missiles[m].pos { - let damage = cmp::min(missiles[m].damage, opponent_buildings[b].health); - opponent_buildings[b].health -= damage; + opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(missiles[m].damage); missiles_len -= 1; missiles.swap(m, missiles_len); -- cgit v1.2.3 From 9f0838006905fd039c4e0d87a69338f33e75246d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 9 Jun 2018 10:04:47 +0200 Subject: Added max building price to game settings --- Cargo.toml | 2 -- src/engine/settings.rs | 9 +++++++++ src/input/json.rs | 14 +++++++------- src/input/textmap.rs | 14 +++++++------- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 92a7ad4..da4623f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,6 @@ rand = "0.4.2" time = "0.1.4" rayon = "1.0.1" -[profile.release] -debug = true [features] benchmarking = [] diff --git a/src/engine/settings.rs b/src/engine/settings.rs index 40256d9..ec62408 100644 --- a/src/engine/settings.rs +++ b/src/engine/settings.rs @@ -1,10 +1,12 @@ use super::geometry::Point; use super::command::BuildingType; +use std::cmp; #[derive(Debug)] pub struct GameSettings { pub size: Point, pub energy_income: u16, + pub max_building_price: u16, pub energy: BuildingSettings, pub defence: BuildingSettings, pub attack: BuildingSettings @@ -22,6 +24,13 @@ pub struct BuildingSettings { } impl GameSettings { + pub fn new(size: Point, energy_income: u16, energy: BuildingSettings, defence: BuildingSettings, attack: BuildingSettings) -> GameSettings { + let max_building_price = cmp::max(cmp::max(energy.price, defence.price), attack.price); + GameSettings { + size, energy_income, max_building_price, + energy, defence, attack + } + } pub fn building_settings(&self, building: BuildingType) -> &BuildingSettings { match building { BuildingType::Defence => &self.defence, diff --git a/src/input/json.rs b/src/input/json.rs index 3a3fbf2..ed00984 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -110,13 +110,13 @@ struct MissileState { impl State { fn to_engine_settings(&self) -> engine::settings::GameSettings { - engine::settings::GameSettings { - size: engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), - energy_income: self.game_details.round_income_energy, - energy: self.game_details.buildings_stats.energy.to_engine(), - defence: self.game_details.buildings_stats.defense.to_engine(), - attack: self.game_details.buildings_stats.attack.to_engine(), - } + engine::settings::GameSettings::new( + engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), + self.game_details.round_income_energy, + self.game_details.buildings_stats.energy.to_engine(), + self.game_details.buildings_stats.defense.to_engine(), + self.game_details.buildings_stats.attack.to_engine(), + ) } fn to_engine(&self, settings: &engine::settings::GameSettings) -> engine::GameState { diff --git a/src/input/textmap.rs b/src/input/textmap.rs index 79fbe7f..5481770 100644 --- a/src/input/textmap.rs +++ b/src/input/textmap.rs @@ -14,10 +14,10 @@ pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), //TODO actually read the right file and parse it? - let engine_settings = GameSettings { - size: Point::new(8,4), - energy_income: 5, - energy: BuildingSettings { + let engine_settings = GameSettings::new( + Point::new(8,4), + 5, + BuildingSettings { price: 20, health: 5, construction_time: 2-2, @@ -26,7 +26,7 @@ pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), weapon_cooldown_period: 0, energy_generated_per_turn: 3 }, - defence: BuildingSettings { + BuildingSettings { price: 30, health: 20, construction_time: 4-2, @@ -35,7 +35,7 @@ pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), weapon_cooldown_period: 0, energy_generated_per_turn: 0 }, - attack: BuildingSettings { + BuildingSettings { price: 30, health: 5, construction_time: 2-2, @@ -44,7 +44,7 @@ pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), weapon_cooldown_period: 3, energy_generated_per_turn: 0 } - }; + ); let engine_state = GameState::new( Player { energy: 20, -- cgit v1.2.3 From 088f0aeb23789ace5e9b77e75d5c23f5442e4cdc Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 9 Jun 2018 10:27:29 +0200 Subject: Added pruning of buying energy buildings behind a feature flag --- Cargo.toml | 1 + src/engine/mod.rs | 59 +++++++++++++++++++++------------------------ src/strategy/mod.rs | 1 - src/strategy/monte_carlo.rs | 6 ++--- src/strategy/sample.rs | 40 ------------------------------ 5 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 src/strategy/sample.rs diff --git a/Cargo.toml b/Cargo.toml index da4623f..4c11e57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,3 +15,4 @@ rayon = "1.0.1" [features] benchmarking = [] single-threaded = [] +energy-cutoff = [] diff --git a/src/engine/mod.rs b/src/engine/mod.rs index a649453..28583a1 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -8,6 +8,9 @@ use self::settings::{GameSettings, BuildingSettings}; use std::ops::FnMut; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: f32 = 2.; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 10; + #[derive(Debug, Clone, PartialEq)] pub struct GameState { pub status: GameStatus, @@ -259,24 +262,6 @@ impl GameState { } result } - - pub fn player_affordable_buildings(&self, settings: &GameSettings) -> Vec { - GameState::affordable_buildings(self.player.energy, settings) - } - - pub fn opponent_affordable_buildings(&self, settings: &GameSettings) -> Vec { - GameState::affordable_buildings(self.opponent.energy, settings) - } - - fn affordable_buildings(energy: u16, settings: &GameSettings) -> Vec { - let mut result = Vec::with_capacity(3); - for b in BuildingType::all().iter() { - if settings.building_settings(*b).price <= energy { - result.push(*b); - } - } - result - } } impl GameStatus { @@ -293,21 +278,33 @@ impl Player { energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() } } - - pub fn can_afford_all_buildings(&self, settings: &GameSettings) -> bool { - self.can_afford_attack_buildings(settings) && - self.can_afford_defence_buildings(settings) && - self.can_afford_energy_buildings(settings) - } - pub fn can_afford_attack_buildings(&self, settings: &GameSettings) -> bool { - self.energy >= settings.attack.price - } - pub fn can_afford_defence_buildings(&self, settings: &GameSettings) -> bool { - self.energy >= settings.defence.price + #[cfg(not(feature = "energy-cutoff"))] + pub fn sensible_buildings(&self, settings: &GameSettings) -> Vec { + let mut result = Vec::with_capacity(3); + for b in BuildingType::all().iter() { + if settings.building_settings(*b).price <= self.energy { + result.push(*b); + } + } + result } - pub fn can_afford_energy_buildings(&self, settings: &GameSettings) -> bool { - self.energy >= settings.energy.price + + #[cfg(feature = "energy-cutoff")] + pub fn sensible_buildings(&self, settings: &GameSettings) -> Vec { + let mut result = Vec::with_capacity(3); + let needs_energy = self.energy_generated as f32 >= ENERGY_PRODUCTION_CUTOFF * settings.max_building_price as f32 && + self.energy >= ENERGY_STORAGE_CUTOFF * settings.max_building_price; + + for b in BuildingType::all().iter() { + let building_setting = settings.building_settings(*b); + let affordable = building_setting.price <= self.energy; + let energy_producing = building_setting.energy_generated_per_turn > 0; + if affordable && (!energy_producing || needs_energy) { + result.push(*b); + } + } + result } } diff --git a/src/strategy/mod.rs b/src/strategy/mod.rs index 9630c48..5b6e779 100644 --- a/src/strategy/mod.rs +++ b/src/strategy/mod.rs @@ -1,2 +1 @@ -pub mod sample; pub mod monte_carlo; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index c2f3561..0d813d3 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -75,12 +75,12 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam } fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_buildings = state.player_affordable_buildings(settings); + let all_buildings = state.player.sensible_buildings(settings); random_move(&state.unoccupied_player_cells, &all_buildings, rng) } fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_buildings = state.opponent_affordable_buildings(settings); + let all_buildings = state.opponent.sensible_buildings(settings); random_move(&state.unoccupied_opponent_cells, &all_buildings, rng) } @@ -151,7 +151,7 @@ impl CommandScore { } fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { - let all_buildings = state.player_affordable_buildings(settings); + let all_buildings = state.player.sensible_buildings(settings); let mut commands = Vec::with_capacity(state.unoccupied_player_cells.len()*all_buildings.len()+1); commands.push(CommandScore::new(Command::Nothing)); diff --git a/src/strategy/sample.rs b/src/strategy/sample.rs deleted file mode 100644 index 370df2f..0000000 --- a/src/strategy/sample.rs +++ /dev/null @@ -1,40 +0,0 @@ -use engine; -use engine::command::*; - -use rand::{thread_rng, Rng}; - -pub fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState) -> Command { - let mut rng = thread_rng(); - - if state.player.can_afford_defence_buildings(settings) { - for y in 0..settings.size.y { - if is_under_attack(state, y) { - let p_options = state.unoccupied_player_cells_in_row(y); - if let Some(&p) = rng.choose(&p_options) { - return Command::Build(p, BuildingType::Defence); - } - } - } - } - - if state.player.can_afford_all_buildings(settings) { - let option = rng.choose(&state.unoccupied_player_cells); - let buildings = [BuildingType::Attack, BuildingType::Defence, BuildingType::Energy]; - let building = rng.choose(&buildings); - match (option, building) { - (Some(&p), Some(&building)) => Command::Build(p, building), - _ => Command::Nothing - } - } - else { - Command::Nothing - } -} - -fn is_under_attack(state: &engine::GameState, y: u8) -> bool { - let attack = state.opponent_buildings.iter() - .any(|b| b.pos.y == y && b.weapon_damage > 0); - let defences = state.player_buildings.iter() - .any(|b| b.pos.y == y && b.health > 5); - attack && !defences -} -- cgit v1.2.3 From 96d55f1851b487d4deafec069e164d9e5b23fd9c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 9 Jun 2018 11:00:27 +0200 Subject: Added reduced time flag --- Cargo.toml | 1 + src/main.rs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4c11e57..b215a34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,3 +16,4 @@ rayon = "1.0.1" benchmarking = [] single-threaded = [] energy-cutoff = [] +reduced-time = [] diff --git a/src/main.rs b/src/main.rs index e84e207..6434c9d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,9 @@ use std::io::prelude::*; use std::process; fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { - let max_time = Duration::milliseconds(1950); + #[cfg(not(feature = "reduced-time"))] let max_time = Duration::milliseconds(1950); + #[cfg(feature = "reduced-time")] let max_time = Duration::milliseconds(950); + strategy::monte_carlo::choose_move(settings, state, start_time, max_time) } -- cgit v1.2.3 From e6b613207b540cfae6691d97941007d05ef019be Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 9 Jun 2018 13:23:32 +0200 Subject: Calibrated energy cutoff and turned it on by default --- Cargo.toml | 3 +++ src/engine/mod.rs | 8 ++++---- src/main.rs | 11 +++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b215a34..926ab10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,3 +17,6 @@ benchmarking = [] single-threaded = [] energy-cutoff = [] reduced-time = [] +extended-time = [] + +default = ["energy-cutoff", "benchmarking"] diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 28583a1..739dd85 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -8,8 +8,8 @@ use self::settings::{GameSettings, BuildingSettings}; use std::ops::FnMut; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: f32 = 2.; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 10; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: f32 = 1.2; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: f32 = 1.5; #[derive(Debug, Clone, PartialEq)] pub struct GameState { @@ -293,8 +293,8 @@ impl Player { #[cfg(feature = "energy-cutoff")] pub fn sensible_buildings(&self, settings: &GameSettings) -> Vec { let mut result = Vec::with_capacity(3); - let needs_energy = self.energy_generated as f32 >= ENERGY_PRODUCTION_CUTOFF * settings.max_building_price as f32 && - self.energy >= ENERGY_STORAGE_CUTOFF * settings.max_building_price; + let needs_energy = self.energy_generated as f32 <= ENERGY_PRODUCTION_CUTOFF * settings.max_building_price as f32 && + self.energy as f32 <= ENERGY_STORAGE_CUTOFF * settings.max_building_price as f32; for b in BuildingType::all().iter() { let building_setting = settings.building_settings(*b); diff --git a/src/main.rs b/src/main.rs index 6434c9d..251b980 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,8 +16,15 @@ use std::io::prelude::*; use std::process; fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { - #[cfg(not(feature = "reduced-time"))] let max_time = Duration::milliseconds(1950); - #[cfg(feature = "reduced-time")] let max_time = Duration::milliseconds(950); + #[cfg(not(feature = "reduced-time"))] + #[cfg(not(feature = "extended-time"))] + let max_time = Duration::milliseconds(1950); + + #[cfg(feature = "reduced-time")] + let max_time = Duration::milliseconds(950); + + #[cfg(feature = "extended-time")] + let max_time = Duration::milliseconds(19950); strategy::monte_carlo::choose_move(settings, state, start_time, max_time) } -- cgit v1.2.3 From f5699c057c000efd80e4bf7dd6b23a0d1750e628 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 9 Jun 2018 13:55:43 +0200 Subject: Updated default features to not include benchmarking --- Cargo.toml | 2 +- src/main.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 926ab10..bc49a40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,4 +19,4 @@ energy-cutoff = [] reduced-time = [] extended-time = [] -default = ["energy-cutoff", "benchmarking"] +default = ["energy-cutoff"] diff --git a/src/main.rs b/src/main.rs index 251b980..f3d9373 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,6 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { fn main() { let start_time = PreciseTime::now(); - println!("Reading in state.json file"); let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { -- cgit v1.2.3 From f1f81abab3ca1c1f97ccd52e99c3977905312d94 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 25 Jun 2018 17:37:14 +0200 Subject: Added new tower type and deconstruct action --- src/engine/command.rs | 10 ++++--- src/engine/mod.rs | 27 +++++++++++++++++++ src/engine/settings.rs | 10 ++++--- src/input/json.rs | 4 ++- src/input/mod.rs | 1 - src/input/textmap.rs | 69 ------------------------------------------------ tests/live-comparison.rs | 6 ++++- 7 files changed, 47 insertions(+), 80 deletions(-) delete mode 100644 src/input/textmap.rs diff --git a/src/engine/command.rs b/src/engine/command.rs index b350d65..7a2594d 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -5,6 +5,7 @@ use super::geometry::Point; pub enum Command { Nothing, Build(Point, BuildingType), + Deconstruct(Point) } impl fmt::Display for Command { @@ -12,6 +13,7 @@ impl fmt::Display for Command { match *self { Command::Nothing => write!(f, ""), Command::Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), + Command::Deconstruct(p) => write!(f, "3,{},{}", p.x, p.y), } } } @@ -22,18 +24,18 @@ pub enum BuildingType { Defence = 0, Attack = 1, Energy = 2, + Tesla = 4, } impl BuildingType { - pub fn all() -> [BuildingType; 3] { + pub fn all() -> [BuildingType; 4] { use self::BuildingType::*; - [Defence, Attack, Energy] + [Defence, Attack, Energy, Tesla] } - fn count() -> u8 { BuildingType::Energy as u8 + 1 } pub fn from_u8(id: u8) -> Option { use std::mem; - if id < Self::count() { Some(unsafe { mem::transmute(id) }) } else { None } + if id < 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } } } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 739dd85..2a334d5 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -122,6 +122,8 @@ impl GameState { GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); + GameState::fire_teslas(&mut self.player_buildings, &mut self.opponent_buildings); + GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); @@ -161,6 +163,22 @@ impl GameState { let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); unoccupied_cells.swap_remove(to_remove_index); }, + Command::Deconstruct(p) => { + let to_remove_index = buildings.iter().position(|&pos| pos == p); + if let Some(i) = to_remove_index { + buildings.swap_remove(i); + } + let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|&pos| pos == p); + if let Some(i) = unconstructed_to_remove_index { + unconstructed_buildings.swap_remove(i); + } + + debug_assert!(to_remove_index.is_some() || unconstructed_to_remove_index.is_some()); + + player.energy += 5; + + unoccupied_cells.push(p); + }, } } @@ -179,6 +197,15 @@ impl GameState { unconstructed_buildings.truncate(buildings_len); } + fn fire_teslas(_player_buildings: &mut Vec, _opponent_buildings: &mut Vec) { + // TODO all towers try to fire. If there isn't enough energy + // to fire multiple, the oldest fires. This seems like an edge + // case because you're only allowed two towers in total, and + // they're probably only late game towers. The odds of firing + // twice at once is slim. Opposing towers can't be stopped + // from firing by firing themselves. So fire all, then remove. + } + fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { for building in buildings.iter_mut().filter(|b| b.is_shooty()) { if building.weapon_cooldown_time_left > 0 { diff --git a/src/engine/settings.rs b/src/engine/settings.rs index ec62408..3657cb2 100644 --- a/src/engine/settings.rs +++ b/src/engine/settings.rs @@ -9,7 +9,8 @@ pub struct GameSettings { pub max_building_price: u16, pub energy: BuildingSettings, pub defence: BuildingSettings, - pub attack: BuildingSettings + pub attack: BuildingSettings, + pub tesla: BuildingSettings, } #[derive(Debug)] @@ -24,18 +25,19 @@ pub struct BuildingSettings { } impl GameSettings { - pub fn new(size: Point, energy_income: u16, energy: BuildingSettings, defence: BuildingSettings, attack: BuildingSettings) -> GameSettings { + pub fn new(size: Point, energy_income: u16, energy: BuildingSettings, defence: BuildingSettings, attack: BuildingSettings, tesla: BuildingSettings) -> GameSettings { let max_building_price = cmp::max(cmp::max(energy.price, defence.price), attack.price); GameSettings { size, energy_income, max_building_price, - energy, defence, attack + energy, defence, attack, tesla } } pub fn building_settings(&self, building: BuildingType) -> &BuildingSettings { match building { BuildingType::Defence => &self.defence, BuildingType::Attack => &self.attack, - BuildingType::Energy => &self.energy + BuildingType::Energy => &self.energy, + BuildingType::Tesla => &self.tesla, } } diff --git a/src/input/json.rs b/src/input/json.rs index ed00984..95dbd46 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -41,7 +41,8 @@ struct GameDetails { struct BuildingStats { energy: BuildingBlueprint, defense: BuildingBlueprint, - attack: BuildingBlueprint + attack: BuildingBlueprint, + tesla: BuildingBlueprint, } #[derive(Deserialize)] @@ -116,6 +117,7 @@ impl State { self.game_details.buildings_stats.energy.to_engine(), self.game_details.buildings_stats.defense.to_engine(), self.game_details.buildings_stats.attack.to_engine(), + self.game_details.buildings_stats.tesla.to_engine(), ) } diff --git a/src/input/mod.rs b/src/input/mod.rs index 47f359a..22fdbb3 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -1,2 +1 @@ pub mod json; -pub mod textmap; diff --git a/src/input/textmap.rs b/src/input/textmap.rs deleted file mode 100644 index 5481770..0000000 --- a/src/input/textmap.rs +++ /dev/null @@ -1,69 +0,0 @@ -use std::fs::File; -use std::io::prelude::*; -use std::error::Error; - -use ::engine::*; -use ::engine::settings::*; -use ::engine::geometry::*; - - -pub fn read_state_from_file(filename: &str) -> Result<(GameSettings, GameState), Box> { - let mut file = File::open(filename)?; - let mut content = String::new(); - file.read_to_string(&mut content)?; - - //TODO actually read the right file and parse it? - - let engine_settings = GameSettings::new( - Point::new(8,4), - 5, - BuildingSettings { - price: 20, - health: 5, - construction_time: 2-2, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 3 - }, - BuildingSettings { - price: 30, - health: 20, - construction_time: 4-2, - weapon_damage: 0, - weapon_speed: 0, - weapon_cooldown_period: 0, - energy_generated_per_turn: 0 - }, - BuildingSettings { - price: 30, - health: 5, - construction_time: 2-2, - weapon_damage: 5, - weapon_speed: 2, - weapon_cooldown_period: 3, - energy_generated_per_turn: 0 - } - ); - let engine_state = GameState::new( - Player { - energy: 20, - health: 100, - energy_generated: 5 - }, - Player { - energy: 20, - health: 100, - energy_generated: 5 - }, - Vec::new(), - Vec::new(), - Vec::new(), - Vec::new(), - Vec::new(), - Vec::new(), - &engine_settings - ); - - Ok((engine_settings, engine_state)) -} diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 301f8fc..621c247 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -52,7 +52,11 @@ fn read_opponent_command(filename: &str, settings: &GameSettings) -> Command { Command::Build(p, b) => Command::Build(Point::new( settings.size.x - p.x - 1, p.y - ), b) + ), b), + Command::Deconstruct(p) => Command::Deconstruct(Point::new( + settings.size.x - p.x - 1, + p.y + )), } } -- cgit v1.2.3 From 9e523171aee0a6ee5a255a248ec3c1e78f2ba21e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 25 Jun 2018 18:06:45 +0200 Subject: Added functioning of tesla towers --- src/engine/mod.rs | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 2a334d5..13ac0ac 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -122,7 +122,7 @@ impl GameState { GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); - GameState::fire_teslas(&mut self.player_buildings, &mut self.opponent_buildings); + GameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings, &settings); GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); @@ -164,11 +164,11 @@ impl GameState { unoccupied_cells.swap_remove(to_remove_index); }, Command::Deconstruct(p) => { - let to_remove_index = buildings.iter().position(|&pos| pos == p); + let to_remove_index = buildings.iter().position(|ref b| b.pos == p); if let Some(i) = to_remove_index { buildings.swap_remove(i); } - let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|&pos| pos == p); + let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|ref b| b.pos == p); if let Some(i) = unconstructed_to_remove_index { unconstructed_buildings.swap_remove(i); } @@ -197,13 +197,42 @@ impl GameState { unconstructed_buildings.truncate(buildings_len); } - fn fire_teslas(_player_buildings: &mut Vec, _opponent_buildings: &mut Vec) { - // TODO all towers try to fire. If there isn't enough energy - // to fire multiple, the oldest fires. This seems like an edge - // case because you're only allowed two towers in total, and - // they're probably only late game towers. The odds of firing - // twice at once is slim. Opposing towers can't be stopped - // from firing by firing themselves. So fire all, then remove. + fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, settings: &GameSettings) { + for tesla in player_buildings.iter().filter(|b| b.weapon_damage == 20) { + if tesla.pos.x + 1 >= settings.size.x/2 { + opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); + } + 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { + for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { + let target_point = Point::new(x, y); + for b in 0..opponent_buildings.len() { + if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { + opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); + continue 'player_col_loop; + } + } + } + } + } + + for tesla in opponent_buildings.iter().filter(|b| b.weapon_damage == 20) { + if tesla.pos.x <= settings.size.x/2 { + player.health = player.health.saturating_sub(settings.tesla.weapon_damage); + } + 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { + for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { + let target_point = Point::new(x, y); + for b in 0..player_buildings.len() { + if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { + player_buildings[b].health = player_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); + continue 'opponent_col_loop; + } + } + } + } + } + player_buildings.retain(|b| b.health > 0); + opponent_buildings.retain(|b| b.health > 0); } fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { @@ -380,7 +409,7 @@ impl Building { } fn is_shooty(&self) -> bool { - self.weapon_damage > 0 + self.weapon_damage > 0 && self.weapon_damage < 20 } } -- cgit v1.2.3 From 7bf7d8d977733cb02258b4a79faf2417c52e9323 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 25 Jun 2018 19:04:29 +0200 Subject: Compilation, allowing new moves to be chosen, and missile move order --- src/engine/mod.rs | 64 +++++++++++++++++++++++++++------------------ src/strategy/monte_carlo.rs | 33 ++++++++++++++++++----- 2 files changed, 66 insertions(+), 31 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 13ac0ac..15b7a4d 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -198,34 +198,48 @@ impl GameState { } fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, settings: &GameSettings) { - for tesla in player_buildings.iter().filter(|b| b.weapon_damage == 20) { - if tesla.pos.x + 1 >= settings.size.x/2 { - opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); - } - 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { - for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { - let target_point = Point::new(x, y); - for b in 0..opponent_buildings.len() { - if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { - opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); - continue 'player_col_loop; + for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { + if tesla.weapon_cooldown_time_left > 0 { + tesla.weapon_cooldown_time_left -= 1; + } else if player.energy >= 100 { + player.energy -= 100; + tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; + + if tesla.pos.x + 1 >= settings.size.x/2 { + opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); + } + 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { + for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { + let target_point = Point::new(x, y); + for b in 0..opponent_buildings.len() { + if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { + opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); + continue 'player_col_loop; + } } } } } } - for tesla in opponent_buildings.iter().filter(|b| b.weapon_damage == 20) { - if tesla.pos.x <= settings.size.x/2 { - player.health = player.health.saturating_sub(settings.tesla.weapon_damage); - } - 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { - for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { - let target_point = Point::new(x, y); - for b in 0..player_buildings.len() { - if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { - player_buildings[b].health = player_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); - continue 'opponent_col_loop; + for tesla in opponent_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { + if tesla.weapon_cooldown_time_left > 0 { + tesla.weapon_cooldown_time_left -= 1; + } else if opponent.energy >= 100 { + opponent.energy -= 100; + tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; + + if tesla.pos.x <= settings.size.x/2 { + player.health = player.health.saturating_sub(settings.tesla.weapon_damage); + } + 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { + for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { + let target_point = Point::new(x, y); + for b in 0..player_buildings.len() { + if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { + player_buildings[b].health = player_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); + continue 'opponent_col_loop; + } } } } @@ -253,8 +267,8 @@ impl GameState { fn move_missiles(missiles: &mut Vec, mut wrapping_move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings) where F: FnMut(&mut Point) { let mut missiles_len = missiles.len(); - 'missile_loop: for m in (0..missiles.len()).rev() { - 'speed_loop: for _ in 0..missiles[m].speed { + 'speed_loop: for _ in 0..settings.attack.weapon_speed { + 'missile_loop: for m in (0..missiles.len()).rev() { wrapping_move_fn(&mut missiles[m].pos); if missiles[m].pos.x >= settings.size.x { opponent.health = opponent.health.saturating_sub(missiles[m].damage); @@ -283,8 +297,8 @@ impl GameState { } } } + missiles.truncate(missiles_len); } - missiles.truncate(missiles_len); } fn add_energy(player: &mut Player) { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 0d813d3..1ea18db 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -76,25 +76,35 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { let all_buildings = state.player.sensible_buildings(settings); - random_move(&state.unoccupied_player_cells, &all_buildings, rng) + random_move(&settings, &state.unoccupied_player_cells, &all_buildings, rng) } fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { let all_buildings = state.opponent.sensible_buildings(settings); - random_move(&state.unoccupied_opponent_cells, &all_buildings, rng) + random_move(&settings, &state.unoccupied_opponent_cells, &all_buildings, rng) } -fn random_move(all_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { - let number_of_commands = all_positions.len()*all_buildings.len()+1; +fn random_move(settings: &GameSettings, all_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { + + let building_command_count = all_positions.len()*all_buildings.len(); + let deconstruct_count = (settings.size.x as usize * settings.size.y as usize / 2) - all_positions.len(); + let nothing_count = 1; + + let number_of_commands = building_command_count + deconstruct_count + nothing_count; + let choice_index = rng.gen_range(0, number_of_commands); if choice_index == number_of_commands - 1 { Command::Nothing - } else { + } else if choice_index < building_command_count { Command::Build( all_positions[choice_index/all_buildings.len()], all_buildings[choice_index%all_buildings.len()] ) + } else { + Command::Deconstruct( + all_positions[choice_index-building_command_count] + ) } } @@ -153,7 +163,11 @@ impl CommandScore { fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { let all_buildings = state.player.sensible_buildings(settings); - let mut commands = Vec::with_capacity(state.unoccupied_player_cells.len()*all_buildings.len()+1); + let building_command_count = state.unoccupied_player_cells.len()*all_buildings.len(); + let deconstruct_count = (settings.size.x as usize *settings.size.y as usize / 2) - state.unoccupied_player_cells.len(); + let nothing_count = 1; + + let mut commands = Vec::with_capacity(building_command_count + deconstruct_count + nothing_count); commands.push(CommandScore::new(Command::Nothing)); for &position in &state.unoccupied_player_cells { @@ -162,6 +176,13 @@ impl CommandScore { } } + for building in &state.player_buildings { + commands.push(CommandScore::new(Command::Deconstruct(building.pos))); + } + for building in &state.player_unconstructed_buildings { + commands.push(CommandScore::new(Command::Deconstruct(building.pos))); + } + commands } } -- cgit v1.2.3 From 286763000e4e5919c07f2840c64ecc7932530175 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 25 Jun 2018 20:26:05 +0200 Subject: Updated test cases and made engine work correctly according to tests I don't think a tesla appeared in this match. I need to contrive a bot to build one. --- src/engine/command.rs | 2 +- src/engine/mod.rs | 89 +- src/input/json.rs | 2 +- src/strategy/monte_carlo.rs | 21 +- tests/after_113/Round 000/OpponentCommand.txt | 1 - tests/after_113/Round 000/PlayerCommand.txt | 1 - tests/after_113/Round 001/OpponentCommand.txt | 1 - tests/after_113/Round 001/PlayerCommand.txt | 1 - tests/after_113/Round 002/OpponentCommand.txt | 1 - tests/after_113/Round 002/PlayerCommand.txt | 1 - tests/after_113/Round 003/OpponentCommand.txt | 1 - tests/after_113/Round 003/PlayerCommand.txt | 1 - tests/after_113/Round 004/OpponentCommand.txt | 1 - tests/after_113/Round 004/PlayerCommand.txt | 1 - tests/after_113/Round 005/OpponentCommand.txt | 1 - tests/after_113/Round 005/PlayerCommand.txt | 1 - tests/after_113/Round 006/OpponentCommand.txt | 1 - tests/after_113/Round 006/PlayerCommand.txt | 1 - tests/after_113/Round 007/OpponentCommand.txt | 1 - tests/after_113/Round 007/PlayerCommand.txt | 1 - tests/after_113/Round 008/OpponentCommand.txt | 1 - tests/after_113/Round 008/PlayerCommand.txt | 1 - tests/after_113/Round 009/OpponentCommand.txt | 1 - tests/after_113/Round 009/PlayerCommand.txt | 1 - tests/after_113/Round 010/OpponentCommand.txt | 1 - tests/after_113/Round 010/PlayerCommand.txt | 1 - tests/after_113/Round 011/OpponentCommand.txt | 1 - tests/after_113/Round 011/PlayerCommand.txt | 1 - tests/after_113/Round 012/OpponentCommand.txt | 1 - tests/after_113/Round 012/PlayerCommand.txt | 1 - tests/after_113/Round 013/OpponentCommand.txt | 1 - tests/after_113/Round 013/PlayerCommand.txt | 1 - tests/after_113/Round 014/OpponentCommand.txt | 1 - tests/after_113/Round 014/PlayerCommand.txt | 1 - tests/after_113/Round 015/OpponentCommand.txt | 1 - tests/after_113/Round 015/PlayerCommand.txt | 1 - tests/after_113/Round 016/OpponentCommand.txt | 1 - tests/after_113/Round 016/PlayerCommand.txt | 1 - tests/after_113/Round 017/OpponentCommand.txt | 1 - tests/after_113/Round 017/PlayerCommand.txt | 1 - tests/after_113/Round 018/OpponentCommand.txt | 1 - tests/after_113/Round 018/PlayerCommand.txt | 1 - tests/after_113/Round 019/OpponentCommand.txt | 1 - tests/after_113/Round 019/PlayerCommand.txt | 1 - tests/after_113/Round 020/OpponentCommand.txt | 1 - tests/after_113/Round 020/PlayerCommand.txt | 1 - tests/after_113/Round 021/OpponentCommand.txt | 1 - tests/after_113/Round 021/PlayerCommand.txt | 1 - tests/after_113/Round 022/OpponentCommand.txt | 1 - tests/after_113/Round 022/PlayerCommand.txt | 1 - tests/after_113/Round 023/OpponentCommand.txt | 1 - tests/after_113/Round 023/PlayerCommand.txt | 1 - tests/after_113/Round 024/OpponentCommand.txt | 1 - tests/after_113/Round 024/PlayerCommand.txt | 1 - tests/after_113/Round 025/OpponentCommand.txt | 1 - tests/after_113/Round 025/PlayerCommand.txt | 1 - tests/after_113/Round 026/OpponentCommand.txt | 1 - tests/after_113/Round 026/PlayerCommand.txt | 1 - tests/after_113/Round 027/OpponentCommand.txt | 1 - tests/after_113/Round 027/PlayerCommand.txt | 1 - tests/after_113/Round 028/OpponentCommand.txt | 1 - tests/after_113/Round 028/PlayerCommand.txt | 1 - tests/after_113/Round 029/OpponentCommand.txt | 1 - tests/after_113/Round 029/PlayerCommand.txt | 1 - tests/after_113/Round 030/OpponentCommand.txt | 1 - tests/after_113/Round 030/PlayerCommand.txt | 1 - tests/after_113/Round 031/OpponentCommand.txt | 1 - tests/after_113/Round 031/PlayerCommand.txt | 1 - tests/after_113/Round 032/OpponentCommand.txt | 1 - tests/after_113/Round 032/PlayerCommand.txt | 1 - tests/after_113/Round 033/OpponentCommand.txt | 1 - tests/after_113/Round 033/PlayerCommand.txt | 1 - tests/after_113/Round 034/OpponentCommand.txt | 1 - tests/after_113/Round 034/PlayerCommand.txt | 1 - tests/after_113/Round 035/OpponentCommand.txt | 1 - tests/after_113/Round 035/PlayerCommand.txt | 1 - tests/after_113/Round 036/OpponentCommand.txt | 1 - tests/after_113/Round 036/PlayerCommand.txt | 1 - tests/after_113/Round 037/OpponentCommand.txt | 1 - tests/after_113/Round 037/PlayerCommand.txt | 1 - tests/after_113/Round 038/OpponentCommand.txt | 1 - tests/after_113/Round 038/PlayerCommand.txt | 1 - tests/after_113/Round 039/OpponentCommand.txt | 1 - tests/after_113/Round 039/PlayerCommand.txt | 1 - tests/after_113/Round 040/OpponentCommand.txt | 1 - tests/after_113/Round 040/PlayerCommand.txt | 1 - tests/after_113/Round 041/OpponentCommand.txt | 1 - tests/after_113/Round 041/PlayerCommand.txt | 1 - tests/after_113/Round 042/OpponentCommand.txt | 1 - tests/after_113/Round 042/PlayerCommand.txt | 1 - tests/after_113/Round 043/OpponentCommand.txt | 1 - tests/after_113/Round 043/PlayerCommand.txt | 1 - tests/after_113/Round 044/OpponentCommand.txt | 1 - tests/after_113/Round 044/PlayerCommand.txt | 1 - tests/after_113/Round 045/OpponentCommand.txt | 1 - tests/after_113/Round 045/PlayerCommand.txt | 1 - tests/after_113/Round 046/OpponentCommand.txt | 1 - tests/after_113/Round 046/PlayerCommand.txt | 1 - tests/after_113/Round 047/OpponentCommand.txt | 1 - tests/after_113/Round 047/PlayerCommand.txt | 1 - tests/after_113/Round 048/OpponentCommand.txt | 1 - tests/after_113/Round 048/PlayerCommand.txt | 1 - tests/after_113/Round 049/OpponentCommand.txt | 1 - tests/after_113/Round 049/PlayerCommand.txt | 1 - tests/after_113/Round 050/OpponentCommand.txt | 1 - tests/after_113/Round 050/PlayerCommand.txt | 1 - tests/after_113/Round 051/OpponentCommand.txt | 1 - tests/after_113/Round 051/PlayerCommand.txt | 1 - tests/after_113/Round 052/OpponentCommand.txt | 1 - tests/after_113/Round 052/PlayerCommand.txt | 1 - tests/after_113/Round 053/OpponentCommand.txt | 1 - tests/after_113/Round 053/PlayerCommand.txt | 1 - tests/after_113/Round 054/OpponentCommand.txt | 1 - tests/after_113/Round 054/PlayerCommand.txt | 1 - tests/after_113/Round 055/OpponentCommand.txt | 1 - tests/after_113/Round 055/PlayerCommand.txt | 1 - tests/after_113/Round 056/OpponentCommand.txt | 1 - tests/after_113/Round 056/PlayerCommand.txt | 1 - tests/after_113/Round 057/OpponentCommand.txt | 1 - tests/after_113/Round 057/PlayerCommand.txt | 1 - tests/after_113/Round 058/OpponentCommand.txt | 1 - tests/after_113/Round 058/PlayerCommand.txt | 1 - tests/after_113/Round 059/OpponentCommand.txt | 1 - tests/after_113/Round 059/PlayerCommand.txt | 1 - tests/after_113/Round 060/OpponentCommand.txt | 1 - tests/after_113/Round 060/PlayerCommand.txt | 1 - tests/after_113/Round 061/OpponentCommand.txt | 1 - tests/after_113/Round 061/PlayerCommand.txt | 1 - tests/after_113/Round 062/OpponentCommand.txt | 1 - tests/after_113/Round 062/PlayerCommand.txt | 1 - tests/after_113/Round 063/OpponentCommand.txt | 1 - tests/after_113/Round 063/PlayerCommand.txt | 1 - tests/after_113/Round 064/OpponentCommand.txt | 1 - tests/after_113/Round 064/PlayerCommand.txt | 1 - tests/after_113/Round 065/OpponentCommand.txt | 1 - tests/after_113/Round 065/PlayerCommand.txt | 1 - tests/after_113/Round 066/OpponentCommand.txt | 1 - tests/after_113/Round 066/PlayerCommand.txt | 1 - tests/after_113/Round 067/OpponentCommand.txt | 1 - tests/after_113/Round 067/PlayerCommand.txt | 1 - tests/after_113/Round 068/OpponentCommand.txt | 1 - tests/after_113/Round 068/PlayerCommand.txt | 1 - tests/after_113/Round 069/OpponentCommand.txt | 1 - tests/after_113/Round 069/PlayerCommand.txt | 1 - tests/after_113/Round 070/OpponentCommand.txt | 1 - tests/after_113/Round 070/PlayerCommand.txt | 1 - tests/after_200/Round 000/OpponentCommand.txt | 1 + tests/after_200/Round 000/PlayerCommand.txt | 1 + tests/after_200/Round 001/OpponentCommand.txt | 1 + tests/after_200/Round 001/PlayerCommand.txt | 1 + tests/after_200/Round 002/OpponentCommand.txt | 1 + tests/after_200/Round 002/PlayerCommand.txt | 1 + tests/after_200/Round 003/OpponentCommand.txt | 1 + tests/after_200/Round 003/PlayerCommand.txt | 1 + tests/after_200/Round 004/OpponentCommand.txt | 1 + tests/after_200/Round 004/PlayerCommand.txt | 1 + tests/after_200/Round 005/OpponentCommand.txt | 1 + tests/after_200/Round 005/PlayerCommand.txt | 1 + tests/after_200/Round 006/OpponentCommand.txt | 1 + tests/after_200/Round 006/PlayerCommand.txt | 1 + tests/after_200/Round 007/OpponentCommand.txt | 1 + tests/after_200/Round 007/PlayerCommand.txt | 1 + tests/after_200/Round 008/OpponentCommand.txt | 1 + tests/after_200/Round 008/PlayerCommand.txt | 1 + tests/after_200/Round 009/OpponentCommand.txt | 1 + tests/after_200/Round 009/PlayerCommand.txt | 1 + tests/after_200/Round 010/OpponentCommand.txt | 1 + tests/after_200/Round 010/PlayerCommand.txt | 1 + tests/after_200/Round 011/OpponentCommand.txt | 1 + tests/after_200/Round 011/PlayerCommand.txt | 1 + tests/after_200/Round 012/OpponentCommand.txt | 1 + tests/after_200/Round 012/PlayerCommand.txt | 1 + tests/after_200/Round 013/OpponentCommand.txt | 1 + tests/after_200/Round 013/PlayerCommand.txt | 1 + tests/after_200/Round 014/OpponentCommand.txt | 1 + tests/after_200/Round 014/PlayerCommand.txt | 1 + tests/after_200/Round 015/OpponentCommand.txt | 1 + tests/after_200/Round 015/PlayerCommand.txt | 1 + tests/after_200/Round 016/OpponentCommand.txt | 1 + tests/after_200/Round 016/PlayerCommand.txt | 1 + tests/after_200/Round 017/OpponentCommand.txt | 1 + tests/after_200/Round 017/PlayerCommand.txt | 1 + tests/after_200/Round 018/OpponentCommand.txt | 1 + tests/after_200/Round 018/PlayerCommand.txt | 1 + tests/after_200/Round 019/OpponentCommand.txt | 1 + tests/after_200/Round 019/PlayerCommand.txt | 1 + tests/after_200/Round 020/OpponentCommand.txt | 1 + tests/after_200/Round 020/PlayerCommand.txt | 1 + tests/after_200/Round 021/OpponentCommand.txt | 1 + tests/after_200/Round 021/PlayerCommand.txt | 1 + tests/after_200/Round 022/OpponentCommand.txt | 1 + tests/after_200/Round 022/PlayerCommand.txt | 1 + tests/after_200/Round 023/OpponentCommand.txt | 1 + tests/after_200/Round 023/PlayerCommand.txt | 1 + tests/after_200/Round 024/OpponentCommand.txt | 1 + tests/after_200/Round 024/PlayerCommand.txt | 1 + tests/after_200/Round 025/OpponentCommand.txt | 1 + tests/after_200/Round 025/PlayerCommand.txt | 1 + tests/after_200/Round 026/OpponentCommand.txt | 1 + tests/after_200/Round 026/PlayerCommand.txt | 1 + tests/after_200/Round 027/OpponentCommand.txt | 1 + tests/after_200/Round 027/PlayerCommand.txt | 1 + tests/after_200/Round 028/OpponentCommand.txt | 1 + tests/after_200/Round 028/PlayerCommand.txt | 1 + tests/after_200/Round 029/OpponentCommand.txt | 1 + tests/after_200/Round 029/PlayerCommand.txt | 1 + tests/after_200/Round 030/OpponentCommand.txt | 1 + tests/after_200/Round 030/PlayerCommand.txt | 1 + tests/after_200/Round 031/OpponentCommand.txt | 1 + tests/after_200/Round 031/PlayerCommand.txt | 1 + tests/after_200/Round 032/OpponentCommand.txt | 1 + tests/after_200/Round 032/PlayerCommand.txt | 1 + tests/after_200/Round 033/OpponentCommand.txt | 1 + tests/after_200/Round 033/PlayerCommand.txt | 1 + tests/after_200/Round 034/OpponentCommand.txt | 1 + tests/after_200/Round 034/PlayerCommand.txt | 1 + tests/after_200/Round 035/OpponentCommand.txt | 1 + tests/after_200/Round 035/PlayerCommand.txt | 1 + tests/after_200/Round 036/OpponentCommand.txt | 1 + tests/after_200/Round 036/PlayerCommand.txt | 1 + tests/after_200/Round 037/OpponentCommand.txt | 1 + tests/after_200/Round 037/PlayerCommand.txt | 1 + tests/after_200/Round 038/OpponentCommand.txt | 1 + tests/after_200/Round 038/PlayerCommand.txt | 1 + tests/after_200/Round 039/OpponentCommand.txt | 1 + tests/after_200/Round 039/PlayerCommand.txt | 1 + tests/after_200/Round 040/OpponentCommand.txt | 1 + tests/after_200/Round 040/PlayerCommand.txt | 1 + tests/after_200/Round 041/OpponentCommand.txt | 1 + tests/after_200/Round 041/PlayerCommand.txt | 1 + tests/after_200/Round 042/OpponentCommand.txt | 1 + tests/after_200/Round 042/PlayerCommand.txt | 1 + tests/after_200/Round 043/OpponentCommand.txt | 1 + tests/after_200/Round 043/PlayerCommand.txt | 1 + tests/after_200/Round 044/OpponentCommand.txt | 1 + tests/after_200/Round 044/PlayerCommand.txt | 1 + tests/after_200/Round 045/OpponentCommand.txt | 1 + tests/after_200/Round 045/PlayerCommand.txt | 1 + tests/after_200/Round 046/OpponentCommand.txt | 1 + tests/after_200/Round 046/PlayerCommand.txt | 1 + tests/after_200/Round 047/OpponentCommand.txt | 1 + tests/after_200/Round 047/PlayerCommand.txt | 1 + tests/after_200/Round 048/OpponentCommand.txt | 1 + tests/after_200/Round 048/PlayerCommand.txt | 1 + tests/after_200/Round 049/OpponentCommand.txt | 1 + tests/after_200/Round 049/PlayerCommand.txt | 1 + tests/after_200/Round 050/OpponentCommand.txt | 1 + tests/after_200/Round 050/PlayerCommand.txt | 1 + tests/after_200/Round 051/OpponentCommand.txt | 1 + tests/after_200/Round 051/PlayerCommand.txt | 1 + tests/after_200/Round 052/OpponentCommand.txt | 1 + tests/after_200/Round 052/PlayerCommand.txt | 1 + tests/after_200/Round 053/OpponentCommand.txt | 1 + tests/after_200/Round 053/PlayerCommand.txt | 1 + tests/after_200/Round 054/OpponentCommand.txt | 1 + tests/after_200/Round 054/PlayerCommand.txt | 1 + tests/after_200/Round 055/OpponentCommand.txt | 1 + tests/after_200/Round 055/PlayerCommand.txt | 1 + tests/after_200/Round 056/OpponentCommand.txt | 1 + tests/after_200/Round 056/PlayerCommand.txt | 1 + tests/after_200/Round 057/OpponentCommand.txt | 1 + tests/after_200/Round 057/PlayerCommand.txt | 1 + tests/after_200/Round 058/OpponentCommand.txt | 1 + tests/after_200/Round 058/PlayerCommand.txt | 1 + tests/after_200/Round 059/OpponentCommand.txt | 1 + tests/after_200/Round 059/PlayerCommand.txt | 1 + tests/after_200/Round 060/OpponentCommand.txt | 1 + tests/after_200/Round 060/PlayerCommand.txt | 1 + tests/after_200/Round 061/OpponentCommand.txt | 1 + tests/after_200/Round 061/PlayerCommand.txt | 1 + tests/after_200/Round 062/OpponentCommand.txt | 1 + tests/after_200/Round 062/PlayerCommand.txt | 1 + tests/after_200/Round 063/OpponentCommand.txt | 1 + tests/after_200/Round 063/PlayerCommand.txt | 1 + tests/after_200/Round 064/OpponentCommand.txt | 1 + tests/after_200/Round 064/PlayerCommand.txt | 1 + tests/bigstate.json | 1499 ++++++++++++++++++++++++- tests/live-comparison.rs | 16 +- tests/monte-carlo-test.rs | 19 + tests/state0.json | 311 ++++- 280 files changed, 2028 insertions(+), 203 deletions(-) delete mode 100644 tests/after_113/Round 000/OpponentCommand.txt delete mode 100644 tests/after_113/Round 000/PlayerCommand.txt delete mode 100644 tests/after_113/Round 001/OpponentCommand.txt delete mode 100644 tests/after_113/Round 001/PlayerCommand.txt delete mode 100644 tests/after_113/Round 002/OpponentCommand.txt delete mode 100644 tests/after_113/Round 002/PlayerCommand.txt delete mode 100644 tests/after_113/Round 003/OpponentCommand.txt delete mode 100644 tests/after_113/Round 003/PlayerCommand.txt delete mode 100644 tests/after_113/Round 004/OpponentCommand.txt delete mode 100644 tests/after_113/Round 004/PlayerCommand.txt delete mode 100644 tests/after_113/Round 005/OpponentCommand.txt delete mode 100644 tests/after_113/Round 005/PlayerCommand.txt delete mode 100644 tests/after_113/Round 006/OpponentCommand.txt delete mode 100644 tests/after_113/Round 006/PlayerCommand.txt delete mode 100644 tests/after_113/Round 007/OpponentCommand.txt delete mode 100644 tests/after_113/Round 007/PlayerCommand.txt delete mode 100644 tests/after_113/Round 008/OpponentCommand.txt delete mode 100644 tests/after_113/Round 008/PlayerCommand.txt delete mode 100644 tests/after_113/Round 009/OpponentCommand.txt delete mode 100644 tests/after_113/Round 009/PlayerCommand.txt delete mode 100644 tests/after_113/Round 010/OpponentCommand.txt delete mode 100644 tests/after_113/Round 010/PlayerCommand.txt delete mode 100644 tests/after_113/Round 011/OpponentCommand.txt delete mode 100644 tests/after_113/Round 011/PlayerCommand.txt delete mode 100644 tests/after_113/Round 012/OpponentCommand.txt delete mode 100644 tests/after_113/Round 012/PlayerCommand.txt delete mode 100644 tests/after_113/Round 013/OpponentCommand.txt delete mode 100644 tests/after_113/Round 013/PlayerCommand.txt delete mode 100644 tests/after_113/Round 014/OpponentCommand.txt delete mode 100644 tests/after_113/Round 014/PlayerCommand.txt delete mode 100644 tests/after_113/Round 015/OpponentCommand.txt delete mode 100644 tests/after_113/Round 015/PlayerCommand.txt delete mode 100644 tests/after_113/Round 016/OpponentCommand.txt delete mode 100644 tests/after_113/Round 016/PlayerCommand.txt delete mode 100644 tests/after_113/Round 017/OpponentCommand.txt delete mode 100644 tests/after_113/Round 017/PlayerCommand.txt delete mode 100644 tests/after_113/Round 018/OpponentCommand.txt delete mode 100644 tests/after_113/Round 018/PlayerCommand.txt delete mode 100644 tests/after_113/Round 019/OpponentCommand.txt delete mode 100644 tests/after_113/Round 019/PlayerCommand.txt delete mode 100644 tests/after_113/Round 020/OpponentCommand.txt delete mode 100644 tests/after_113/Round 020/PlayerCommand.txt delete mode 100644 tests/after_113/Round 021/OpponentCommand.txt delete mode 100644 tests/after_113/Round 021/PlayerCommand.txt delete mode 100644 tests/after_113/Round 022/OpponentCommand.txt delete mode 100644 tests/after_113/Round 022/PlayerCommand.txt delete mode 100644 tests/after_113/Round 023/OpponentCommand.txt delete mode 100644 tests/after_113/Round 023/PlayerCommand.txt delete mode 100644 tests/after_113/Round 024/OpponentCommand.txt delete mode 100644 tests/after_113/Round 024/PlayerCommand.txt delete mode 100644 tests/after_113/Round 025/OpponentCommand.txt delete mode 100644 tests/after_113/Round 025/PlayerCommand.txt delete mode 100644 tests/after_113/Round 026/OpponentCommand.txt delete mode 100644 tests/after_113/Round 026/PlayerCommand.txt delete mode 100644 tests/after_113/Round 027/OpponentCommand.txt delete mode 100644 tests/after_113/Round 027/PlayerCommand.txt delete mode 100644 tests/after_113/Round 028/OpponentCommand.txt delete mode 100644 tests/after_113/Round 028/PlayerCommand.txt delete mode 100644 tests/after_113/Round 029/OpponentCommand.txt delete mode 100644 tests/after_113/Round 029/PlayerCommand.txt delete mode 100644 tests/after_113/Round 030/OpponentCommand.txt delete mode 100644 tests/after_113/Round 030/PlayerCommand.txt delete mode 100644 tests/after_113/Round 031/OpponentCommand.txt delete mode 100644 tests/after_113/Round 031/PlayerCommand.txt delete mode 100644 tests/after_113/Round 032/OpponentCommand.txt delete mode 100644 tests/after_113/Round 032/PlayerCommand.txt delete mode 100644 tests/after_113/Round 033/OpponentCommand.txt delete mode 100644 tests/after_113/Round 033/PlayerCommand.txt delete mode 100644 tests/after_113/Round 034/OpponentCommand.txt delete mode 100644 tests/after_113/Round 034/PlayerCommand.txt delete mode 100644 tests/after_113/Round 035/OpponentCommand.txt delete mode 100644 tests/after_113/Round 035/PlayerCommand.txt delete mode 100644 tests/after_113/Round 036/OpponentCommand.txt delete mode 100644 tests/after_113/Round 036/PlayerCommand.txt delete mode 100644 tests/after_113/Round 037/OpponentCommand.txt delete mode 100644 tests/after_113/Round 037/PlayerCommand.txt delete mode 100644 tests/after_113/Round 038/OpponentCommand.txt delete mode 100644 tests/after_113/Round 038/PlayerCommand.txt delete mode 100644 tests/after_113/Round 039/OpponentCommand.txt delete mode 100644 tests/after_113/Round 039/PlayerCommand.txt delete mode 100644 tests/after_113/Round 040/OpponentCommand.txt delete mode 100644 tests/after_113/Round 040/PlayerCommand.txt delete mode 100644 tests/after_113/Round 041/OpponentCommand.txt delete mode 100644 tests/after_113/Round 041/PlayerCommand.txt delete mode 100644 tests/after_113/Round 042/OpponentCommand.txt delete mode 100644 tests/after_113/Round 042/PlayerCommand.txt delete mode 100644 tests/after_113/Round 043/OpponentCommand.txt delete mode 100644 tests/after_113/Round 043/PlayerCommand.txt delete mode 100644 tests/after_113/Round 044/OpponentCommand.txt delete mode 100644 tests/after_113/Round 044/PlayerCommand.txt delete mode 100644 tests/after_113/Round 045/OpponentCommand.txt delete mode 100644 tests/after_113/Round 045/PlayerCommand.txt delete mode 100644 tests/after_113/Round 046/OpponentCommand.txt delete mode 100644 tests/after_113/Round 046/PlayerCommand.txt delete mode 100644 tests/after_113/Round 047/OpponentCommand.txt delete mode 100644 tests/after_113/Round 047/PlayerCommand.txt delete mode 100644 tests/after_113/Round 048/OpponentCommand.txt delete mode 100644 tests/after_113/Round 048/PlayerCommand.txt delete mode 100644 tests/after_113/Round 049/OpponentCommand.txt delete mode 100644 tests/after_113/Round 049/PlayerCommand.txt delete mode 100644 tests/after_113/Round 050/OpponentCommand.txt delete mode 100644 tests/after_113/Round 050/PlayerCommand.txt delete mode 100644 tests/after_113/Round 051/OpponentCommand.txt delete mode 100644 tests/after_113/Round 051/PlayerCommand.txt delete mode 100644 tests/after_113/Round 052/OpponentCommand.txt delete mode 100644 tests/after_113/Round 052/PlayerCommand.txt delete mode 100644 tests/after_113/Round 053/OpponentCommand.txt delete mode 100644 tests/after_113/Round 053/PlayerCommand.txt delete mode 100644 tests/after_113/Round 054/OpponentCommand.txt delete mode 100644 tests/after_113/Round 054/PlayerCommand.txt delete mode 100644 tests/after_113/Round 055/OpponentCommand.txt delete mode 100644 tests/after_113/Round 055/PlayerCommand.txt delete mode 100644 tests/after_113/Round 056/OpponentCommand.txt delete mode 100644 tests/after_113/Round 056/PlayerCommand.txt delete mode 100644 tests/after_113/Round 057/OpponentCommand.txt delete mode 100644 tests/after_113/Round 057/PlayerCommand.txt delete mode 100644 tests/after_113/Round 058/OpponentCommand.txt delete mode 100644 tests/after_113/Round 058/PlayerCommand.txt delete mode 100644 tests/after_113/Round 059/OpponentCommand.txt delete mode 100644 tests/after_113/Round 059/PlayerCommand.txt delete mode 100644 tests/after_113/Round 060/OpponentCommand.txt delete mode 100644 tests/after_113/Round 060/PlayerCommand.txt delete mode 100644 tests/after_113/Round 061/OpponentCommand.txt delete mode 100644 tests/after_113/Round 061/PlayerCommand.txt delete mode 100644 tests/after_113/Round 062/OpponentCommand.txt delete mode 100644 tests/after_113/Round 062/PlayerCommand.txt delete mode 100644 tests/after_113/Round 063/OpponentCommand.txt delete mode 100644 tests/after_113/Round 063/PlayerCommand.txt delete mode 100644 tests/after_113/Round 064/OpponentCommand.txt delete mode 100644 tests/after_113/Round 064/PlayerCommand.txt delete mode 100644 tests/after_113/Round 065/OpponentCommand.txt delete mode 100644 tests/after_113/Round 065/PlayerCommand.txt delete mode 100644 tests/after_113/Round 066/OpponentCommand.txt delete mode 100644 tests/after_113/Round 066/PlayerCommand.txt delete mode 100644 tests/after_113/Round 067/OpponentCommand.txt delete mode 100644 tests/after_113/Round 067/PlayerCommand.txt delete mode 100644 tests/after_113/Round 068/OpponentCommand.txt delete mode 100644 tests/after_113/Round 068/PlayerCommand.txt delete mode 100644 tests/after_113/Round 069/OpponentCommand.txt delete mode 100644 tests/after_113/Round 069/PlayerCommand.txt delete mode 100644 tests/after_113/Round 070/OpponentCommand.txt delete mode 100644 tests/after_113/Round 070/PlayerCommand.txt create mode 100644 tests/after_200/Round 000/OpponentCommand.txt create mode 100644 tests/after_200/Round 000/PlayerCommand.txt create mode 100644 tests/after_200/Round 001/OpponentCommand.txt create mode 100644 tests/after_200/Round 001/PlayerCommand.txt create mode 100644 tests/after_200/Round 002/OpponentCommand.txt create mode 100644 tests/after_200/Round 002/PlayerCommand.txt create mode 100644 tests/after_200/Round 003/OpponentCommand.txt create mode 100644 tests/after_200/Round 003/PlayerCommand.txt create mode 100644 tests/after_200/Round 004/OpponentCommand.txt create mode 100644 tests/after_200/Round 004/PlayerCommand.txt create mode 100644 tests/after_200/Round 005/OpponentCommand.txt create mode 100644 tests/after_200/Round 005/PlayerCommand.txt create mode 100644 tests/after_200/Round 006/OpponentCommand.txt create mode 100644 tests/after_200/Round 006/PlayerCommand.txt create mode 100644 tests/after_200/Round 007/OpponentCommand.txt create mode 100644 tests/after_200/Round 007/PlayerCommand.txt create mode 100644 tests/after_200/Round 008/OpponentCommand.txt create mode 100644 tests/after_200/Round 008/PlayerCommand.txt create mode 100644 tests/after_200/Round 009/OpponentCommand.txt create mode 100644 tests/after_200/Round 009/PlayerCommand.txt create mode 100644 tests/after_200/Round 010/OpponentCommand.txt create mode 100644 tests/after_200/Round 010/PlayerCommand.txt create mode 100644 tests/after_200/Round 011/OpponentCommand.txt create mode 100644 tests/after_200/Round 011/PlayerCommand.txt create mode 100644 tests/after_200/Round 012/OpponentCommand.txt create mode 100644 tests/after_200/Round 012/PlayerCommand.txt create mode 100644 tests/after_200/Round 013/OpponentCommand.txt create mode 100644 tests/after_200/Round 013/PlayerCommand.txt create mode 100644 tests/after_200/Round 014/OpponentCommand.txt create mode 100644 tests/after_200/Round 014/PlayerCommand.txt create mode 100644 tests/after_200/Round 015/OpponentCommand.txt create mode 100644 tests/after_200/Round 015/PlayerCommand.txt create mode 100644 tests/after_200/Round 016/OpponentCommand.txt create mode 100644 tests/after_200/Round 016/PlayerCommand.txt create mode 100644 tests/after_200/Round 017/OpponentCommand.txt create mode 100644 tests/after_200/Round 017/PlayerCommand.txt create mode 100644 tests/after_200/Round 018/OpponentCommand.txt create mode 100644 tests/after_200/Round 018/PlayerCommand.txt create mode 100644 tests/after_200/Round 019/OpponentCommand.txt create mode 100644 tests/after_200/Round 019/PlayerCommand.txt create mode 100644 tests/after_200/Round 020/OpponentCommand.txt create mode 100644 tests/after_200/Round 020/PlayerCommand.txt create mode 100644 tests/after_200/Round 021/OpponentCommand.txt create mode 100644 tests/after_200/Round 021/PlayerCommand.txt create mode 100644 tests/after_200/Round 022/OpponentCommand.txt create mode 100644 tests/after_200/Round 022/PlayerCommand.txt create mode 100644 tests/after_200/Round 023/OpponentCommand.txt create mode 100644 tests/after_200/Round 023/PlayerCommand.txt create mode 100644 tests/after_200/Round 024/OpponentCommand.txt create mode 100644 tests/after_200/Round 024/PlayerCommand.txt create mode 100644 tests/after_200/Round 025/OpponentCommand.txt create mode 100644 tests/after_200/Round 025/PlayerCommand.txt create mode 100644 tests/after_200/Round 026/OpponentCommand.txt create mode 100644 tests/after_200/Round 026/PlayerCommand.txt create mode 100644 tests/after_200/Round 027/OpponentCommand.txt create mode 100644 tests/after_200/Round 027/PlayerCommand.txt create mode 100644 tests/after_200/Round 028/OpponentCommand.txt create mode 100644 tests/after_200/Round 028/PlayerCommand.txt create mode 100644 tests/after_200/Round 029/OpponentCommand.txt create mode 100644 tests/after_200/Round 029/PlayerCommand.txt create mode 100644 tests/after_200/Round 030/OpponentCommand.txt create mode 100644 tests/after_200/Round 030/PlayerCommand.txt create mode 100644 tests/after_200/Round 031/OpponentCommand.txt create mode 100644 tests/after_200/Round 031/PlayerCommand.txt create mode 100644 tests/after_200/Round 032/OpponentCommand.txt create mode 100644 tests/after_200/Round 032/PlayerCommand.txt create mode 100644 tests/after_200/Round 033/OpponentCommand.txt create mode 100644 tests/after_200/Round 033/PlayerCommand.txt create mode 100644 tests/after_200/Round 034/OpponentCommand.txt create mode 100644 tests/after_200/Round 034/PlayerCommand.txt create mode 100644 tests/after_200/Round 035/OpponentCommand.txt create mode 100644 tests/after_200/Round 035/PlayerCommand.txt create mode 100644 tests/after_200/Round 036/OpponentCommand.txt create mode 100644 tests/after_200/Round 036/PlayerCommand.txt create mode 100644 tests/after_200/Round 037/OpponentCommand.txt create mode 100644 tests/after_200/Round 037/PlayerCommand.txt create mode 100644 tests/after_200/Round 038/OpponentCommand.txt create mode 100644 tests/after_200/Round 038/PlayerCommand.txt create mode 100644 tests/after_200/Round 039/OpponentCommand.txt create mode 100644 tests/after_200/Round 039/PlayerCommand.txt create mode 100644 tests/after_200/Round 040/OpponentCommand.txt create mode 100644 tests/after_200/Round 040/PlayerCommand.txt create mode 100644 tests/after_200/Round 041/OpponentCommand.txt create mode 100644 tests/after_200/Round 041/PlayerCommand.txt create mode 100644 tests/after_200/Round 042/OpponentCommand.txt create mode 100644 tests/after_200/Round 042/PlayerCommand.txt create mode 100644 tests/after_200/Round 043/OpponentCommand.txt create mode 100644 tests/after_200/Round 043/PlayerCommand.txt create mode 100644 tests/after_200/Round 044/OpponentCommand.txt create mode 100644 tests/after_200/Round 044/PlayerCommand.txt create mode 100644 tests/after_200/Round 045/OpponentCommand.txt create mode 100644 tests/after_200/Round 045/PlayerCommand.txt create mode 100644 tests/after_200/Round 046/OpponentCommand.txt create mode 100644 tests/after_200/Round 046/PlayerCommand.txt create mode 100644 tests/after_200/Round 047/OpponentCommand.txt create mode 100644 tests/after_200/Round 047/PlayerCommand.txt create mode 100644 tests/after_200/Round 048/OpponentCommand.txt create mode 100644 tests/after_200/Round 048/PlayerCommand.txt create mode 100644 tests/after_200/Round 049/OpponentCommand.txt create mode 100644 tests/after_200/Round 049/PlayerCommand.txt create mode 100644 tests/after_200/Round 050/OpponentCommand.txt create mode 100644 tests/after_200/Round 050/PlayerCommand.txt create mode 100644 tests/after_200/Round 051/OpponentCommand.txt create mode 100644 tests/after_200/Round 051/PlayerCommand.txt create mode 100644 tests/after_200/Round 052/OpponentCommand.txt create mode 100644 tests/after_200/Round 052/PlayerCommand.txt create mode 100644 tests/after_200/Round 053/OpponentCommand.txt create mode 100644 tests/after_200/Round 053/PlayerCommand.txt create mode 100644 tests/after_200/Round 054/OpponentCommand.txt create mode 100644 tests/after_200/Round 054/PlayerCommand.txt create mode 100644 tests/after_200/Round 055/OpponentCommand.txt create mode 100644 tests/after_200/Round 055/PlayerCommand.txt create mode 100644 tests/after_200/Round 056/OpponentCommand.txt create mode 100644 tests/after_200/Round 056/PlayerCommand.txt create mode 100644 tests/after_200/Round 057/OpponentCommand.txt create mode 100644 tests/after_200/Round 057/PlayerCommand.txt create mode 100644 tests/after_200/Round 058/OpponentCommand.txt create mode 100644 tests/after_200/Round 058/PlayerCommand.txt create mode 100644 tests/after_200/Round 059/OpponentCommand.txt create mode 100644 tests/after_200/Round 059/PlayerCommand.txt create mode 100644 tests/after_200/Round 060/OpponentCommand.txt create mode 100644 tests/after_200/Round 060/PlayerCommand.txt create mode 100644 tests/after_200/Round 061/OpponentCommand.txt create mode 100644 tests/after_200/Round 061/PlayerCommand.txt create mode 100644 tests/after_200/Round 062/OpponentCommand.txt create mode 100644 tests/after_200/Round 062/PlayerCommand.txt create mode 100644 tests/after_200/Round 063/OpponentCommand.txt create mode 100644 tests/after_200/Round 063/PlayerCommand.txt create mode 100644 tests/after_200/Round 064/OpponentCommand.txt create mode 100644 tests/after_200/Round 064/PlayerCommand.txt create mode 100644 tests/monte-carlo-test.rs diff --git a/src/engine/command.rs b/src/engine/command.rs index 7a2594d..bcfc352 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -13,7 +13,7 @@ impl fmt::Display for Command { match *self { Command::Nothing => write!(f, ""), Command::Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), - Command::Deconstruct(p) => write!(f, "3,{},{}", p.x, p.y), + Command::Deconstruct(p) => write!(f, "{},{},3", p.x, p.y), } } } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 15b7a4d..a04f875 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -119,6 +119,11 @@ impl GameState { return; } + GameState::perform_construct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); + GameState::perform_construct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); + GameState::perform_deconstruct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, player_command); + GameState::perform_deconstruct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, opponent_command); + GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); @@ -138,47 +143,44 @@ impl GameState { GameState::add_energy(&mut self.player); GameState::add_energy(&mut self.opponent); - - GameState::perform_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); - GameState::perform_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); GameState::update_status(self); } - fn perform_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { - match command { - Command::Nothing => { }, - Command::Build(p, b) => { - let blueprint = settings.building_settings(b); + fn perform_construct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { + if let Command::Build(p, b) = command { + let blueprint = settings.building_settings(b); - // This is used internally. I should not be making - // invalid moves! - debug_assert!(!buildings.iter().any(|b| b.pos == p)); - debug_assert!(p.x < size.x && p.y < size.y); - debug_assert!(player.energy >= blueprint.price); + // This is used internally. I should not be making + // invalid moves! + debug_assert!(!buildings.iter().any(|b| b.pos == p)); + debug_assert!(p.x < size.x && p.y < size.y); + debug_assert!(player.energy >= blueprint.price); - player.energy -= blueprint.price; - unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); - - let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); - unoccupied_cells.swap_remove(to_remove_index); - }, - Command::Deconstruct(p) => { - let to_remove_index = buildings.iter().position(|ref b| b.pos == p); - if let Some(i) = to_remove_index { - buildings.swap_remove(i); - } - let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|ref b| b.pos == p); - if let Some(i) = unconstructed_to_remove_index { - unconstructed_buildings.swap_remove(i); - } - - debug_assert!(to_remove_index.is_some() || unconstructed_to_remove_index.is_some()); - - player.energy += 5; - - unoccupied_cells.push(p); - }, + player.energy -= blueprint.price; + unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); + + let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); + unoccupied_cells.swap_remove(to_remove_index); + } + } + fn perform_deconstruct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, command: Command) { + if let Command::Deconstruct(p) = command { + let to_remove_index = buildings.iter().position(|ref b| b.pos == p); + let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|ref b| b.pos == p); + debug_assert!(to_remove_index.is_some() || unconstructed_to_remove_index.is_some()); + + if let Some(i) = to_remove_index { + player.energy_generated -= buildings[i].energy_generated_per_turn; + buildings.swap_remove(i); + } + if let Some(i) = unconstructed_to_remove_index { + unconstructed_buildings.swap_remove(i); + } + + player.energy += 5; + + unoccupied_cells.push(p); } } @@ -209,7 +211,7 @@ impl GameState { opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); } 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { - for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { + for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { let target_point = Point::new(x, y); for b in 0..opponent_buildings.len() { if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { @@ -233,7 +235,7 @@ impl GameState { player.health = player.health.saturating_sub(settings.tesla.weapon_damage); } 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { - for &y in [tesla.pos.y - 1, tesla.pos.y, tesla.pos.y + 1].iter() { + for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { let target_point = Point::new(x, y); for b in 0..player_buildings.len() { if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { @@ -332,6 +334,18 @@ impl GameState { } result } + + + pub fn occupied_player_cells(&self) -> Vec { + self.player_unconstructed_buildings.iter().map(|b| b.pos) + .chain(self.player_buildings.iter().map(|b| b.pos)) + .collect() + } + pub fn occupied_opponent_cells(&self) -> Vec { + self.opponent_unconstructed_buildings.iter().map(|b| b.pos) + .chain(self.opponent_buildings.iter().map(|b| b.pos)) + .collect() + } } impl GameStatus { @@ -376,7 +390,6 @@ impl Player { } result } - } impl UnconstructedBuilding { diff --git a/src/input/json.rs b/src/input/json.rs index 95dbd46..a2f6d8c 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -188,7 +188,7 @@ impl BuildingBlueprint { engine::settings::BuildingSettings { price: self.price, health: self.health, - construction_time: self.construction_time-2, + construction_time: self.construction_time-1, weapon_damage: self.weapon_damage, weapon_speed: self.weapon_speed, weapon_cooldown_period: self.weapon_cooldown_period, diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 1ea18db..18b8acc 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -76,18 +76,18 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { let all_buildings = state.player.sensible_buildings(settings); - random_move(&settings, &state.unoccupied_player_cells, &all_buildings, rng) + random_move(&state.unoccupied_player_cells, &state.occupied_player_cells(), &all_buildings, rng) } fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { let all_buildings = state.opponent.sensible_buildings(settings); - random_move(&settings, &state.unoccupied_opponent_cells, &all_buildings, rng) + random_move(&state.unoccupied_opponent_cells, &state.occupied_opponent_cells(), &all_buildings, rng) } -fn random_move(settings: &GameSettings, all_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { +fn random_move(free_positions: &[Point], occupied_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { - let building_command_count = all_positions.len()*all_buildings.len(); - let deconstruct_count = (settings.size.x as usize * settings.size.y as usize / 2) - all_positions.len(); + let building_command_count = free_positions.len()*all_buildings.len(); + let deconstruct_count = occupied_positions.len(); let nothing_count = 1; let number_of_commands = building_command_count + deconstruct_count + nothing_count; @@ -98,12 +98,12 @@ fn random_move(settings: &GameSettings, all_positions: &[Point], all_bui Command::Nothing } else if choice_index < building_command_count { Command::Build( - all_positions[choice_index/all_buildings.len()], + free_positions[choice_index/all_buildings.len()], all_buildings[choice_index%all_buildings.len()] ) } else { Command::Deconstruct( - all_positions[choice_index-building_command_count] + occupied_positions[choice_index-building_command_count] ) } } @@ -176,11 +176,8 @@ impl CommandScore { } } - for building in &state.player_buildings { - commands.push(CommandScore::new(Command::Deconstruct(building.pos))); - } - for building in &state.player_unconstructed_buildings { - commands.push(CommandScore::new(Command::Deconstruct(building.pos))); + for &position in &state.occupied_player_cells() { + commands.push(CommandScore::new(Command::Deconstruct(position))); } commands diff --git a/tests/after_113/Round 000/OpponentCommand.txt b/tests/after_113/Round 000/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_113/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 000/PlayerCommand.txt b/tests/after_113/Round 000/PlayerCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_113/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 001/OpponentCommand.txt b/tests/after_113/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 001/PlayerCommand.txt b/tests/after_113/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 002/OpponentCommand.txt b/tests/after_113/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 002/PlayerCommand.txt b/tests/after_113/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 003/OpponentCommand.txt b/tests/after_113/Round 003/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_113/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 003/PlayerCommand.txt b/tests/after_113/Round 003/PlayerCommand.txt deleted file mode 100644 index 4119710..0000000 --- a/tests/after_113/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 004/OpponentCommand.txt b/tests/after_113/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 004/PlayerCommand.txt b/tests/after_113/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 005/OpponentCommand.txt b/tests/after_113/Round 005/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_113/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 005/PlayerCommand.txt b/tests/after_113/Round 005/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_113/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 006/OpponentCommand.txt b/tests/after_113/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 006/PlayerCommand.txt b/tests/after_113/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 007/OpponentCommand.txt b/tests/after_113/Round 007/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 007/PlayerCommand.txt b/tests/after_113/Round 007/PlayerCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/after_113/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 008/OpponentCommand.txt b/tests/after_113/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 008/PlayerCommand.txt b/tests/after_113/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_113/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_113/Round 009/OpponentCommand.txt b/tests/after_113/Round 009/OpponentCommand.txt deleted file mode 100644 index bd4deea..0000000 --- a/tests/after_113/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 009/PlayerCommand.txt b/tests/after_113/Round 009/PlayerCommand.txt deleted file mode 100644 index d9a0acb..0000000 --- a/tests/after_113/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 010/OpponentCommand.txt b/tests/after_113/Round 010/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 010/PlayerCommand.txt b/tests/after_113/Round 010/PlayerCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/after_113/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 011/OpponentCommand.txt b/tests/after_113/Round 011/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_113/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 011/PlayerCommand.txt b/tests/after_113/Round 011/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_113/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 012/OpponentCommand.txt b/tests/after_113/Round 012/OpponentCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_113/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 012/PlayerCommand.txt b/tests/after_113/Round 012/PlayerCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 013/OpponentCommand.txt b/tests/after_113/Round 013/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 013/PlayerCommand.txt b/tests/after_113/Round 013/PlayerCommand.txt deleted file mode 100644 index 4d83fd9..0000000 --- a/tests/after_113/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 014/OpponentCommand.txt b/tests/after_113/Round 014/OpponentCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/after_113/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 014/PlayerCommand.txt b/tests/after_113/Round 014/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 015/OpponentCommand.txt b/tests/after_113/Round 015/OpponentCommand.txt deleted file mode 100644 index 8ba7f16..0000000 --- a/tests/after_113/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 015/PlayerCommand.txt b/tests/after_113/Round 015/PlayerCommand.txt deleted file mode 100644 index 055ca5b..0000000 --- a/tests/after_113/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 016/OpponentCommand.txt b/tests/after_113/Round 016/OpponentCommand.txt deleted file mode 100644 index a943cb9..0000000 --- a/tests/after_113/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 016/PlayerCommand.txt b/tests/after_113/Round 016/PlayerCommand.txt deleted file mode 100644 index 1fcc509..0000000 --- a/tests/after_113/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,1 \ No newline at end of file diff --git a/tests/after_113/Round 017/OpponentCommand.txt b/tests/after_113/Round 017/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 017/PlayerCommand.txt b/tests/after_113/Round 017/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_113/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 018/OpponentCommand.txt b/tests/after_113/Round 018/OpponentCommand.txt deleted file mode 100644 index 055ca5b..0000000 --- a/tests/after_113/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 018/PlayerCommand.txt b/tests/after_113/Round 018/PlayerCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/after_113/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 019/OpponentCommand.txt b/tests/after_113/Round 019/OpponentCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/after_113/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 019/PlayerCommand.txt b/tests/after_113/Round 019/PlayerCommand.txt deleted file mode 100644 index 75b785b..0000000 --- a/tests/after_113/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 020/OpponentCommand.txt b/tests/after_113/Round 020/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/after_113/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 020/PlayerCommand.txt b/tests/after_113/Round 020/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/after_113/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 021/OpponentCommand.txt b/tests/after_113/Round 021/OpponentCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 021/PlayerCommand.txt b/tests/after_113/Round 021/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_113/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 022/OpponentCommand.txt b/tests/after_113/Round 022/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_113/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 022/PlayerCommand.txt b/tests/after_113/Round 022/PlayerCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/after_113/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 023/OpponentCommand.txt b/tests/after_113/Round 023/OpponentCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_113/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 023/PlayerCommand.txt b/tests/after_113/Round 023/PlayerCommand.txt deleted file mode 100644 index 4763908..0000000 --- a/tests/after_113/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 024/OpponentCommand.txt b/tests/after_113/Round 024/OpponentCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_113/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 024/PlayerCommand.txt b/tests/after_113/Round 024/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_113/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 025/OpponentCommand.txt b/tests/after_113/Round 025/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 025/PlayerCommand.txt b/tests/after_113/Round 025/PlayerCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 026/OpponentCommand.txt b/tests/after_113/Round 026/OpponentCommand.txt deleted file mode 100644 index e02c049..0000000 --- a/tests/after_113/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 026/PlayerCommand.txt b/tests/after_113/Round 026/PlayerCommand.txt deleted file mode 100644 index bd4deea..0000000 --- a/tests/after_113/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 027/OpponentCommand.txt b/tests/after_113/Round 027/OpponentCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/after_113/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 027/PlayerCommand.txt b/tests/after_113/Round 027/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_113/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 028/OpponentCommand.txt b/tests/after_113/Round 028/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_113/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 028/PlayerCommand.txt b/tests/after_113/Round 028/PlayerCommand.txt deleted file mode 100644 index 08ecb10..0000000 --- a/tests/after_113/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 029/OpponentCommand.txt b/tests/after_113/Round 029/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/after_113/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 029/PlayerCommand.txt b/tests/after_113/Round 029/PlayerCommand.txt deleted file mode 100644 index 3177984..0000000 --- a/tests/after_113/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 030/OpponentCommand.txt b/tests/after_113/Round 030/OpponentCommand.txt deleted file mode 100644 index ac6c42a..0000000 --- a/tests/after_113/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 030/PlayerCommand.txt b/tests/after_113/Round 030/PlayerCommand.txt deleted file mode 100644 index 26912c7..0000000 --- a/tests/after_113/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 031/OpponentCommand.txt b/tests/after_113/Round 031/OpponentCommand.txt deleted file mode 100644 index 8ac3a56..0000000 --- a/tests/after_113/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 031/PlayerCommand.txt b/tests/after_113/Round 031/PlayerCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/after_113/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 032/OpponentCommand.txt b/tests/after_113/Round 032/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 032/PlayerCommand.txt b/tests/after_113/Round 032/PlayerCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/after_113/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 033/OpponentCommand.txt b/tests/after_113/Round 033/OpponentCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/after_113/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 033/PlayerCommand.txt b/tests/after_113/Round 033/PlayerCommand.txt deleted file mode 100644 index 429fd32..0000000 --- a/tests/after_113/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 034/OpponentCommand.txt b/tests/after_113/Round 034/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 034/PlayerCommand.txt b/tests/after_113/Round 034/PlayerCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 035/OpponentCommand.txt b/tests/after_113/Round 035/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_113/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 035/PlayerCommand.txt b/tests/after_113/Round 035/PlayerCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/after_113/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 036/OpponentCommand.txt b/tests/after_113/Round 036/OpponentCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/after_113/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 036/PlayerCommand.txt b/tests/after_113/Round 036/PlayerCommand.txt deleted file mode 100644 index a825030..0000000 --- a/tests/after_113/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,1 \ No newline at end of file diff --git a/tests/after_113/Round 037/OpponentCommand.txt b/tests/after_113/Round 037/OpponentCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/after_113/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 037/PlayerCommand.txt b/tests/after_113/Round 037/PlayerCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_113/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 038/OpponentCommand.txt b/tests/after_113/Round 038/OpponentCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/after_113/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 038/PlayerCommand.txt b/tests/after_113/Round 038/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_113/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 039/OpponentCommand.txt b/tests/after_113/Round 039/OpponentCommand.txt deleted file mode 100644 index 79e2fd9..0000000 --- a/tests/after_113/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 039/PlayerCommand.txt b/tests/after_113/Round 039/PlayerCommand.txt deleted file mode 100644 index 58897af..0000000 --- a/tests/after_113/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 040/OpponentCommand.txt b/tests/after_113/Round 040/OpponentCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/after_113/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 040/PlayerCommand.txt b/tests/after_113/Round 040/PlayerCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_113/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 041/OpponentCommand.txt b/tests/after_113/Round 041/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 041/PlayerCommand.txt b/tests/after_113/Round 041/PlayerCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/after_113/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 042/OpponentCommand.txt b/tests/after_113/Round 042/OpponentCommand.txt deleted file mode 100644 index 75b785b..0000000 --- a/tests/after_113/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 042/PlayerCommand.txt b/tests/after_113/Round 042/PlayerCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/after_113/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 043/OpponentCommand.txt b/tests/after_113/Round 043/OpponentCommand.txt deleted file mode 100644 index 1818e31..0000000 --- a/tests/after_113/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 043/PlayerCommand.txt b/tests/after_113/Round 043/PlayerCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_113/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 044/OpponentCommand.txt b/tests/after_113/Round 044/OpponentCommand.txt deleted file mode 100644 index c27eaf9..0000000 --- a/tests/after_113/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 044/PlayerCommand.txt b/tests/after_113/Round 044/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_113/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 045/OpponentCommand.txt b/tests/after_113/Round 045/OpponentCommand.txt deleted file mode 100644 index 1571d81..0000000 --- a/tests/after_113/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 045/PlayerCommand.txt b/tests/after_113/Round 045/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 046/OpponentCommand.txt b/tests/after_113/Round 046/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/after_113/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/after_113/Round 046/PlayerCommand.txt b/tests/after_113/Round 046/PlayerCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 047/OpponentCommand.txt b/tests/after_113/Round 047/OpponentCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/after_113/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 047/PlayerCommand.txt b/tests/after_113/Round 047/PlayerCommand.txt deleted file mode 100644 index ac6c42a..0000000 --- a/tests/after_113/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 048/OpponentCommand.txt b/tests/after_113/Round 048/OpponentCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/after_113/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/after_113/Round 048/PlayerCommand.txt b/tests/after_113/Round 048/PlayerCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/after_113/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 049/OpponentCommand.txt b/tests/after_113/Round 049/OpponentCommand.txt deleted file mode 100644 index 7ae20d1..0000000 --- a/tests/after_113/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,0 \ No newline at end of file diff --git a/tests/after_113/Round 049/PlayerCommand.txt b/tests/after_113/Round 049/PlayerCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_113/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 050/OpponentCommand.txt b/tests/after_113/Round 050/OpponentCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/after_113/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 050/PlayerCommand.txt b/tests/after_113/Round 050/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 051/OpponentCommand.txt b/tests/after_113/Round 051/OpponentCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_113/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 051/PlayerCommand.txt b/tests/after_113/Round 051/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 052/OpponentCommand.txt b/tests/after_113/Round 052/OpponentCommand.txt deleted file mode 100644 index 4763908..0000000 --- a/tests/after_113/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 052/PlayerCommand.txt b/tests/after_113/Round 052/PlayerCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/after_113/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 053/OpponentCommand.txt b/tests/after_113/Round 053/OpponentCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/after_113/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/after_113/Round 053/PlayerCommand.txt b/tests/after_113/Round 053/PlayerCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_113/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 054/OpponentCommand.txt b/tests/after_113/Round 054/OpponentCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/after_113/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 054/PlayerCommand.txt b/tests/after_113/Round 054/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 055/OpponentCommand.txt b/tests/after_113/Round 055/OpponentCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_113/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 055/PlayerCommand.txt b/tests/after_113/Round 055/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/after_113/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/after_113/Round 056/OpponentCommand.txt b/tests/after_113/Round 056/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_113/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_113/Round 056/PlayerCommand.txt b/tests/after_113/Round 056/PlayerCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/after_113/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 057/OpponentCommand.txt b/tests/after_113/Round 057/OpponentCommand.txt deleted file mode 100644 index c4e7948..0000000 --- a/tests/after_113/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 057/PlayerCommand.txt b/tests/after_113/Round 057/PlayerCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_113/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 058/OpponentCommand.txt b/tests/after_113/Round 058/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_113/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_113/Round 058/PlayerCommand.txt b/tests/after_113/Round 058/PlayerCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/after_113/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/after_113/Round 059/OpponentCommand.txt b/tests/after_113/Round 059/OpponentCommand.txt deleted file mode 100644 index aa178b0..0000000 --- a/tests/after_113/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,0 \ No newline at end of file diff --git a/tests/after_113/Round 059/PlayerCommand.txt b/tests/after_113/Round 059/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 060/OpponentCommand.txt b/tests/after_113/Round 060/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_113/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 060/PlayerCommand.txt b/tests/after_113/Round 060/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_113/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 061/OpponentCommand.txt b/tests/after_113/Round 061/OpponentCommand.txt deleted file mode 100644 index a7c241f..0000000 --- a/tests/after_113/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,0 \ No newline at end of file diff --git a/tests/after_113/Round 061/PlayerCommand.txt b/tests/after_113/Round 061/PlayerCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/after_113/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/after_113/Round 062/OpponentCommand.txt b/tests/after_113/Round 062/OpponentCommand.txt deleted file mode 100644 index 9033ecb..0000000 --- a/tests/after_113/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,2 \ No newline at end of file diff --git a/tests/after_113/Round 062/PlayerCommand.txt b/tests/after_113/Round 062/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 063/OpponentCommand.txt b/tests/after_113/Round 063/OpponentCommand.txt deleted file mode 100644 index 455ac78..0000000 --- a/tests/after_113/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,1 \ No newline at end of file diff --git a/tests/after_113/Round 063/PlayerCommand.txt b/tests/after_113/Round 063/PlayerCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_113/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 064/OpponentCommand.txt b/tests/after_113/Round 064/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 064/PlayerCommand.txt b/tests/after_113/Round 064/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 065/OpponentCommand.txt b/tests/after_113/Round 065/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113/Round 065/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 065/PlayerCommand.txt b/tests/after_113/Round 065/PlayerCommand.txt deleted file mode 100644 index b87efa8..0000000 --- a/tests/after_113/Round 065/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 066/OpponentCommand.txt b/tests/after_113/Round 066/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 066/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 066/PlayerCommand.txt b/tests/after_113/Round 066/PlayerCommand.txt deleted file mode 100644 index e638283..0000000 --- a/tests/after_113/Round 066/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 067/OpponentCommand.txt b/tests/after_113/Round 067/OpponentCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_113/Round 067/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 067/PlayerCommand.txt b/tests/after_113/Round 067/PlayerCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_113/Round 067/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 068/OpponentCommand.txt b/tests/after_113/Round 068/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 068/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 068/PlayerCommand.txt b/tests/after_113/Round 068/PlayerCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_113/Round 068/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 069/OpponentCommand.txt b/tests/after_113/Round 069/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_113/Round 069/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 069/PlayerCommand.txt b/tests/after_113/Round 069/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_113/Round 069/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_113/Round 070/OpponentCommand.txt b/tests/after_113/Round 070/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/after_113/Round 070/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/after_113/Round 070/PlayerCommand.txt b/tests/after_113/Round 070/PlayerCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_113/Round 070/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 000/OpponentCommand.txt b/tests/after_200/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_200/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 000/PlayerCommand.txt b/tests/after_200/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_200/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 001/OpponentCommand.txt b/tests/after_200/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 001/PlayerCommand.txt b/tests/after_200/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 002/OpponentCommand.txt b/tests/after_200/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 002/PlayerCommand.txt b/tests/after_200/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 003/OpponentCommand.txt b/tests/after_200/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_200/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 003/PlayerCommand.txt b/tests/after_200/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/after_200/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 004/OpponentCommand.txt b/tests/after_200/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..5720dc8 --- /dev/null +++ b/tests/after_200/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 004/PlayerCommand.txt b/tests/after_200/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..5720dc8 --- /dev/null +++ b/tests/after_200/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 005/OpponentCommand.txt b/tests/after_200/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_200/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 005/PlayerCommand.txt b/tests/after_200/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_200/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 006/OpponentCommand.txt b/tests/after_200/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 006/PlayerCommand.txt b/tests/after_200/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 007/OpponentCommand.txt b/tests/after_200/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_200/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 007/PlayerCommand.txt b/tests/after_200/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_200/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 008/OpponentCommand.txt b/tests/after_200/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 008/PlayerCommand.txt b/tests/after_200/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_200/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_200/Round 009/OpponentCommand.txt b/tests/after_200/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/after_200/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 009/PlayerCommand.txt b/tests/after_200/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/after_200/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 010/OpponentCommand.txt b/tests/after_200/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 010/PlayerCommand.txt b/tests/after_200/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 011/OpponentCommand.txt b/tests/after_200/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..c919a0e --- /dev/null +++ b/tests/after_200/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 011/PlayerCommand.txt b/tests/after_200/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..c919a0e --- /dev/null +++ b/tests/after_200/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 012/OpponentCommand.txt b/tests/after_200/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/after_200/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 012/PlayerCommand.txt b/tests/after_200/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/after_200/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 013/OpponentCommand.txt b/tests/after_200/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_200/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 013/PlayerCommand.txt b/tests/after_200/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_200/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 014/OpponentCommand.txt b/tests/after_200/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_200/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 014/PlayerCommand.txt b/tests/after_200/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_200/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 015/OpponentCommand.txt b/tests/after_200/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..601aa29 --- /dev/null +++ b/tests/after_200/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 015/PlayerCommand.txt b/tests/after_200/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..601aa29 --- /dev/null +++ b/tests/after_200/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +2,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 016/OpponentCommand.txt b/tests/after_200/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/after_200/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 016/PlayerCommand.txt b/tests/after_200/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/after_200/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 017/OpponentCommand.txt b/tests/after_200/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 017/PlayerCommand.txt b/tests/after_200/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 018/OpponentCommand.txt b/tests/after_200/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/after_200/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 018/PlayerCommand.txt b/tests/after_200/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_200/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_200/Round 019/OpponentCommand.txt b/tests/after_200/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/after_200/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 019/PlayerCommand.txt b/tests/after_200/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..10532f2 --- /dev/null +++ b/tests/after_200/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 020/OpponentCommand.txt b/tests/after_200/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..d9d71ea --- /dev/null +++ b/tests/after_200/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +4,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 020/PlayerCommand.txt b/tests/after_200/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/tests/after_200/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 021/OpponentCommand.txt b/tests/after_200/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..a825030 --- /dev/null +++ b/tests/after_200/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 021/PlayerCommand.txt b/tests/after_200/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/after_200/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 022/OpponentCommand.txt b/tests/after_200/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/after_200/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 022/PlayerCommand.txt b/tests/after_200/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/after_200/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 023/OpponentCommand.txt b/tests/after_200/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/after_200/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 023/PlayerCommand.txt b/tests/after_200/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/tests/after_200/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 024/OpponentCommand.txt b/tests/after_200/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_200/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 024/PlayerCommand.txt b/tests/after_200/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/after_200/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 025/OpponentCommand.txt b/tests/after_200/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..cb47d55 --- /dev/null +++ b/tests/after_200/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 025/PlayerCommand.txt b/tests/after_200/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..ad5a4bc --- /dev/null +++ b/tests/after_200/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +3,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 026/OpponentCommand.txt b/tests/after_200/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_200/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 026/PlayerCommand.txt b/tests/after_200/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..cb47d55 --- /dev/null +++ b/tests/after_200/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 027/OpponentCommand.txt b/tests/after_200/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..734a249 --- /dev/null +++ b/tests/after_200/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 027/PlayerCommand.txt b/tests/after_200/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..5ee21e6 --- /dev/null +++ b/tests/after_200/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +4,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 028/OpponentCommand.txt b/tests/after_200/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/after_200/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 028/PlayerCommand.txt b/tests/after_200/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/after_200/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 029/OpponentCommand.txt b/tests/after_200/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/after_200/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 029/PlayerCommand.txt b/tests/after_200/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/tests/after_200/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 030/OpponentCommand.txt b/tests/after_200/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_200/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 030/PlayerCommand.txt b/tests/after_200/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/after_200/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 031/OpponentCommand.txt b/tests/after_200/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/after_200/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 031/PlayerCommand.txt b/tests/after_200/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/tests/after_200/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 032/OpponentCommand.txt b/tests/after_200/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_200/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 032/PlayerCommand.txt b/tests/after_200/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/after_200/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 033/OpponentCommand.txt b/tests/after_200/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/after_200/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 033/PlayerCommand.txt b/tests/after_200/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..a030ed4 --- /dev/null +++ b/tests/after_200/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 034/OpponentCommand.txt b/tests/after_200/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..3fde4e2 --- /dev/null +++ b/tests/after_200/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,3 \ No newline at end of file diff --git a/tests/after_200/Round 034/PlayerCommand.txt b/tests/after_200/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/tests/after_200/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 035/OpponentCommand.txt b/tests/after_200/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/after_200/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 035/PlayerCommand.txt b/tests/after_200/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_200/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 036/OpponentCommand.txt b/tests/after_200/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/tests/after_200/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 036/PlayerCommand.txt b/tests/after_200/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/after_200/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 037/OpponentCommand.txt b/tests/after_200/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/tests/after_200/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 037/PlayerCommand.txt b/tests/after_200/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/tests/after_200/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 038/OpponentCommand.txt b/tests/after_200/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/tests/after_200/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 038/PlayerCommand.txt b/tests/after_200/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..ddc7f56 --- /dev/null +++ b/tests/after_200/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 039/OpponentCommand.txt b/tests/after_200/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..b87efa8 --- /dev/null +++ b/tests/after_200/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 039/PlayerCommand.txt b/tests/after_200/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/tests/after_200/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 040/OpponentCommand.txt b/tests/after_200/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_200/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 040/PlayerCommand.txt b/tests/after_200/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/after_200/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/after_200/Round 041/OpponentCommand.txt b/tests/after_200/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..ddc7f56 --- /dev/null +++ b/tests/after_200/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 041/PlayerCommand.txt b/tests/after_200/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..3ab3f32 --- /dev/null +++ b/tests/after_200/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 042/OpponentCommand.txt b/tests/after_200/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_200/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 042/PlayerCommand.txt b/tests/after_200/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_200/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 043/OpponentCommand.txt b/tests/after_200/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 043/PlayerCommand.txt b/tests/after_200/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..3d765f0 --- /dev/null +++ b/tests/after_200/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +5,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 044/OpponentCommand.txt b/tests/after_200/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/after_200/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/after_200/Round 044/PlayerCommand.txt b/tests/after_200/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/after_200/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 045/OpponentCommand.txt b/tests/after_200/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..93ec9b2 --- /dev/null +++ b/tests/after_200/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 045/PlayerCommand.txt b/tests/after_200/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/after_200/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 046/OpponentCommand.txt b/tests/after_200/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 046/PlayerCommand.txt b/tests/after_200/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..93ec9b2 --- /dev/null +++ b/tests/after_200/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 047/OpponentCommand.txt b/tests/after_200/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_200/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 047/PlayerCommand.txt b/tests/after_200/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/tests/after_200/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 048/OpponentCommand.txt b/tests/after_200/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/after_200/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 048/PlayerCommand.txt b/tests/after_200/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/after_200/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 049/OpponentCommand.txt b/tests/after_200/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_200/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 049/PlayerCommand.txt b/tests/after_200/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/after_200/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 050/OpponentCommand.txt b/tests/after_200/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/after_200/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 050/PlayerCommand.txt b/tests/after_200/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..1818e31 --- /dev/null +++ b/tests/after_200/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 051/OpponentCommand.txt b/tests/after_200/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..c602c71 --- /dev/null +++ b/tests/after_200/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,0 \ No newline at end of file diff --git a/tests/after_200/Round 051/PlayerCommand.txt b/tests/after_200/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/after_200/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 052/OpponentCommand.txt b/tests/after_200/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_200/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 052/PlayerCommand.txt b/tests/after_200/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..0d2a91c --- /dev/null +++ b/tests/after_200/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +3,4,3 \ No newline at end of file diff --git a/tests/after_200/Round 053/OpponentCommand.txt b/tests/after_200/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..704840c --- /dev/null +++ b/tests/after_200/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 053/PlayerCommand.txt b/tests/after_200/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/after_200/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 054/OpponentCommand.txt b/tests/after_200/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..ebfc684 --- /dev/null +++ b/tests/after_200/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,0 \ No newline at end of file diff --git a/tests/after_200/Round 054/PlayerCommand.txt b/tests/after_200/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/after_200/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/after_200/Round 055/OpponentCommand.txt b/tests/after_200/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/after_200/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 055/PlayerCommand.txt b/tests/after_200/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/after_200/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/after_200/Round 056/OpponentCommand.txt b/tests/after_200/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_200/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 056/PlayerCommand.txt b/tests/after_200/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..9c6b08d --- /dev/null +++ b/tests/after_200/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,3 \ No newline at end of file diff --git a/tests/after_200/Round 057/OpponentCommand.txt b/tests/after_200/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_200/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_200/Round 057/PlayerCommand.txt b/tests/after_200/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..885148a --- /dev/null +++ b/tests/after_200/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,3 \ No newline at end of file diff --git a/tests/after_200/Round 058/OpponentCommand.txt b/tests/after_200/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/after_200/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 058/PlayerCommand.txt b/tests/after_200/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/after_200/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/after_200/Round 059/OpponentCommand.txt b/tests/after_200/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..c163991 --- /dev/null +++ b/tests/after_200/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 059/PlayerCommand.txt b/tests/after_200/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..c163991 --- /dev/null +++ b/tests/after_200/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 060/OpponentCommand.txt b/tests/after_200/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..f069b31 --- /dev/null +++ b/tests/after_200/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,3 \ No newline at end of file diff --git a/tests/after_200/Round 060/PlayerCommand.txt b/tests/after_200/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..5cbd497 --- /dev/null +++ b/tests/after_200/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 061/OpponentCommand.txt b/tests/after_200/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..80a0b9a --- /dev/null +++ b/tests/after_200/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,3 \ No newline at end of file diff --git a/tests/after_200/Round 061/PlayerCommand.txt b/tests/after_200/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..589fe67 --- /dev/null +++ b/tests/after_200/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 062/OpponentCommand.txt b/tests/after_200/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..70a041a --- /dev/null +++ b/tests/after_200/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 062/PlayerCommand.txt b/tests/after_200/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..66cb3b1 --- /dev/null +++ b/tests/after_200/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 063/OpponentCommand.txt b/tests/after_200/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..cb0f20e --- /dev/null +++ b/tests/after_200/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 063/PlayerCommand.txt b/tests/after_200/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..e7cde1b --- /dev/null +++ b/tests/after_200/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,3 \ No newline at end of file diff --git a/tests/after_200/Round 064/OpponentCommand.txt b/tests/after_200/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..8a8e05d --- /dev/null +++ b/tests/after_200/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 064/PlayerCommand.txt b/tests/after_200/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..4e89ade --- /dev/null +++ b/tests/after_200/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +5,5,3 \ No newline at end of file diff --git a/tests/bigstate.json b/tests/bigstate.json index dd15670..2ad555f 100644 --- a/tests/bigstate.json +++ b/tests/bigstate.json @@ -1 +1,1498 @@ -{"gameDetails":{"round":0,"mapWidth":20,"mapHeight":10,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":8,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":8,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":9,"y":9,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":10,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":16,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":17,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":18,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":19,"y":9,"buildings":[],"missiles":[],"cellOwner":"B"}]]} +{ + "gameDetails": { + "round": 0, + "mapWidth": 20, + "mapHeight": 10, + "roundIncomeEnergy": 5, + "buildingPrices": { + "TESLA": 300, + "ENERGY": 20, + "ATTACK": 30, + "DEFENSE": 30 + }, + "buildingsStats": { + "TESLA": { + "health": 5, + "constructionTime": 11, + "price": 300, + "weaponDamage": 20, + "weaponSpeed": 0, + "weaponCooldownPeriod": 10, + "energyGeneratedPerTurn": 0, + "destroyMultiplier": 1, + "constructionScore": 1 + }, + "ENERGY": { + "health": 5, + "constructionTime": 2, + "price": 20, + "weaponDamage": 0, + "weaponSpeed": 0, + "weaponCooldownPeriod": 0, + "energyGeneratedPerTurn": 3, + "destroyMultiplier": 1, + "constructionScore": 1 + }, + "ATTACK": { + "health": 5, + "constructionTime": 2, + "price": 30, + "weaponDamage": 5, + "weaponSpeed": 1, + "weaponCooldownPeriod": 3, + "energyGeneratedPerTurn": 0, + "destroyMultiplier": 1, + "constructionScore": 1 + }, + "DEFENSE": { + "health": 20, + "constructionTime": 4, + "price": 30, + "weaponDamage": 0, + "weaponSpeed": 0, + "weaponCooldownPeriod": 0, + "energyGeneratedPerTurn": 0, + "destroyMultiplier": 1, + "constructionScore": 1 + } + } + }, + "players": [ + { + "playerType": "A", + "energy": 20, + "health": 100, + "hitsTaken": 0, + "score": 0 + }, + { + "playerType": "B", + "energy": 20, + "health": 100, + "hitsTaken": 0, + "score": 0 + } + ], + "gameMap": [ + [ + { + "x": 0, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 4, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 5, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 6, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 7, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 8, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 5, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 6, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 7, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 8, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 9, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 10, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 11, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 12, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 13, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 14, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 15, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 16, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 17, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 18, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 19, + "y": 9, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ] + ] +} diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 621c247..e063959 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -10,7 +10,7 @@ use std::io::prelude::*; #[test] fn it_successfully_simulates_replay() { - test_from_replay("tests/after_113", 32); + test_from_replay("tests/after_200", 62); } fn test_from_replay(replay_folder: &str, length: usize) { @@ -37,12 +37,14 @@ fn read_player_command(filename: &str) -> Command { } else { let mut components = content.split(','); - Command::Build( - Point::new(components.next().unwrap().trim().parse().unwrap(), - components.next().unwrap().trim().parse().unwrap() - ), - BuildingType::from_u8(components.next().unwrap().trim().parse().unwrap()).unwrap() - ) + let point = Point::new(components.next().unwrap().trim().parse().unwrap(), + components.next().unwrap().trim().parse().unwrap()); + let action_type = components.next().unwrap().trim().parse().unwrap(); + if action_type == 3 { + Command::Deconstruct(point) + } else { + Command::Build(point, BuildingType::from_u8(action_type).unwrap()) + } } } diff --git a/tests/monte-carlo-test.rs b/tests/monte-carlo-test.rs new file mode 100644 index 0000000..479b36d --- /dev/null +++ b/tests/monte-carlo-test.rs @@ -0,0 +1,19 @@ +extern crate zombot; +extern crate time; +use time::{PreciseTime, Duration}; + +use zombot::*; + +const STATE_PATH: &str = "tests/state0.json"; + +// there are assertions in the game engine, run when it's in debug mode +#[test] +fn it_does_a_normal_turn_successfully() { + let start_time = PreciseTime::now(); + let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => panic!("Error while parsing JSON file: {}", error) + }; + let max_time = Duration::milliseconds(1950); + strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); +} diff --git a/tests/state0.json b/tests/state0.json index fa41459..ef5cd39 100644 --- a/tests/state0.json +++ b/tests/state0.json @@ -1 +1,310 @@ -{"gameDetails":{"round":0,"mapWidth":8,"mapHeight":4,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":1},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":1,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":1}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}]]} +{ + "gameDetails": { + "round": 0, + "mapWidth": 8, + "mapHeight": 4, + "roundIncomeEnergy": 5, + "buildingPrices": { + "TESLA": 300, + "ENERGY": 20, + "ATTACK": 30, + "DEFENSE": 30 + }, + "buildingsStats": { + "TESLA": { + "health": 5, + "constructionTime": 11, + "price": 300, + "weaponDamage": 20, + "weaponSpeed": 0, + "weaponCooldownPeriod": 10, + "energyGeneratedPerTurn": 0, + "destroyMultiplier": 1, + "constructionScore": 1 + }, + "ENERGY": { + "health": 5, + "constructionTime": 2, + "price": 20, + "weaponDamage": 0, + "weaponSpeed": 0, + "weaponCooldownPeriod": 0, + "energyGeneratedPerTurn": 3, + "destroyMultiplier": 1, + "constructionScore": 1 + }, + "ATTACK": { + "health": 5, + "constructionTime": 2, + "price": 30, + "weaponDamage": 5, + "weaponSpeed": 1, + "weaponCooldownPeriod": 3, + "energyGeneratedPerTurn": 0, + "destroyMultiplier": 1, + "constructionScore": 1 + }, + "DEFENSE": { + "health": 20, + "constructionTime": 4, + "price": 30, + "weaponDamage": 0, + "weaponSpeed": 0, + "weaponCooldownPeriod": 0, + "energyGeneratedPerTurn": 0, + "destroyMultiplier": 1, + "constructionScore": 1 + } + } + }, + "players": [ + { + "playerType": "A", + "energy": 20, + "health": 100, + "hitsTaken": 0, + "score": 0 + }, + { + "playerType": "B", + "energy": 20, + "health": 100, + "hitsTaken": 0, + "score": 0 + } + ], + "gameMap": [ + [ + { + "x": 0, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 5, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 6, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 7, + "y": 0, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 5, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 6, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 7, + "y": 1, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 5, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 6, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 7, + "y": 2, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ], + [ + { + "x": 0, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 1, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 2, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 3, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "A" + }, + { + "x": 4, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 5, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 6, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + }, + { + "x": 7, + "y": 3, + "buildings": [], + "missiles": [], + "cellOwner": "B" + } + ] + ] +} -- cgit v1.2.3 From d2cc33043ad1ca2d67b59ec8ca78a825442e5cda Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 25 Jun 2018 21:17:11 +0200 Subject: Added rule on maximum two tesla towers --- src/engine/command.rs | 4 ++-- src/engine/mod.rs | 25 +++++++++++++++++++++---- src/engine/settings.rs | 2 +- src/strategy/monte_carlo.rs | 21 ++++++++------------- tests/live-comparison.rs | 2 +- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/engine/command.rs b/src/engine/command.rs index bcfc352..3ea0fbe 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -19,7 +19,7 @@ impl fmt::Display for Command { } #[repr(u8)] -#[derive(Debug, Clone, Copy)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum BuildingType { Defence = 0, Attack = 1, @@ -35,7 +35,7 @@ impl BuildingType { pub fn from_u8(id: u8) -> Option { use std::mem; - if id < 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } + if id <= 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } } } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index a04f875..7a39214 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -156,6 +156,9 @@ impl GameState { debug_assert!(!buildings.iter().any(|b| b.pos == p)); debug_assert!(p.x < size.x && p.y < size.y); debug_assert!(player.energy >= blueprint.price); + debug_assert!(b != BuildingType::Tesla || + unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + buildings.iter().filter(|b| b.weapon_damage == 20).count() < 2); player.energy -= blueprint.price; unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); @@ -346,6 +349,16 @@ impl GameState { .chain(self.opponent_buildings.iter().map(|b| b.pos)) .collect() } + + pub fn count_player_teslas(&self) -> usize { + self.player_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + self.player_buildings.iter().filter(|b| b.weapon_damage == 20).count() + } + + pub fn count_opponent_teslas(&self) -> usize { + self.opponent_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + self.opponent_buildings.iter().filter(|b| b.weapon_damage == 20).count() + } } impl GameStatus { @@ -364,10 +377,13 @@ impl Player { } #[cfg(not(feature = "energy-cutoff"))] - pub fn sensible_buildings(&self, settings: &GameSettings) -> Vec { + pub fn sensible_buildings(&self, tesla_allowed: bool, settings: &GameSettings) -> Vec { let mut result = Vec::with_capacity(3); for b in BuildingType::all().iter() { - if settings.building_settings(*b).price <= self.energy { + let building_setting = settings.building_settings(*b); + let affordable = building_setting.price <= self.energy; + let is_tesla = building_setting.weapon_damage == 20; + if affordable && (!is_tesla || tesla_allowed) { result.push(*b); } } @@ -375,7 +391,7 @@ impl Player { } #[cfg(feature = "energy-cutoff")] - pub fn sensible_buildings(&self, settings: &GameSettings) -> Vec { + pub fn sensible_buildings(&self, tesla_allowed: bool, settings: &GameSettings) -> Vec { let mut result = Vec::with_capacity(3); let needs_energy = self.energy_generated as f32 <= ENERGY_PRODUCTION_CUTOFF * settings.max_building_price as f32 && self.energy as f32 <= ENERGY_STORAGE_CUTOFF * settings.max_building_price as f32; @@ -384,7 +400,8 @@ impl Player { let building_setting = settings.building_settings(*b); let affordable = building_setting.price <= self.energy; let energy_producing = building_setting.energy_generated_per_turn > 0; - if affordable && (!energy_producing || needs_energy) { + let is_tesla = building_setting.weapon_damage == 20; + if affordable && (!energy_producing || needs_energy) && (!is_tesla || tesla_allowed) { result.push(*b); } } diff --git a/src/engine/settings.rs b/src/engine/settings.rs index 3657cb2..18bdde0 100644 --- a/src/engine/settings.rs +++ b/src/engine/settings.rs @@ -26,7 +26,7 @@ pub struct BuildingSettings { impl GameSettings { pub fn new(size: Point, energy_income: u16, energy: BuildingSettings, defence: BuildingSettings, attack: BuildingSettings, tesla: BuildingSettings) -> GameSettings { - let max_building_price = cmp::max(cmp::max(energy.price, defence.price), attack.price); + let max_building_price = cmp::max(cmp::max(cmp::max(energy.price, defence.price), attack.price), tesla.price); GameSettings { size, energy_income, max_building_price, energy, defence, attack, tesla diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 18b8acc..dbeac2f 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -75,36 +75,31 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam } fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_buildings = state.player.sensible_buildings(settings); - random_move(&state.unoccupied_player_cells, &state.occupied_player_cells(), &all_buildings, rng) + let all_buildings = state.player.sensible_buildings(state.count_player_teslas() < 2, settings); + random_move(&state.unoccupied_player_cells, &all_buildings, rng) } fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_buildings = state.opponent.sensible_buildings(settings); - random_move(&state.unoccupied_opponent_cells, &state.occupied_opponent_cells(), &all_buildings, rng) + let all_buildings = state.opponent.sensible_buildings(state.count_opponent_teslas() < 2, settings); + random_move(&state.unoccupied_opponent_cells, &all_buildings, rng) } -fn random_move(free_positions: &[Point], occupied_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { +fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { let building_command_count = free_positions.len()*all_buildings.len(); - let deconstruct_count = occupied_positions.len(); let nothing_count = 1; - let number_of_commands = building_command_count + deconstruct_count + nothing_count; + let number_of_commands = building_command_count + nothing_count; let choice_index = rng.gen_range(0, number_of_commands); if choice_index == number_of_commands - 1 { Command::Nothing - } else if choice_index < building_command_count { + } else { Command::Build( free_positions[choice_index/all_buildings.len()], all_buildings[choice_index%all_buildings.len()] ) - } else { - Command::Deconstruct( - occupied_positions[choice_index-building_command_count] - ) } } @@ -161,7 +156,7 @@ impl CommandScore { } fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { - let all_buildings = state.player.sensible_buildings(settings); + let all_buildings = state.player.sensible_buildings(state.count_player_teslas() < 2, settings); let building_command_count = state.unoccupied_player_cells.len()*all_buildings.len(); let deconstruct_count = (settings.size.x as usize *settings.size.y as usize / 2) - state.unoccupied_player_cells.len(); diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index e063959..711193e 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -10,7 +10,7 @@ use std::io::prelude::*; #[test] fn it_successfully_simulates_replay() { - test_from_replay("tests/after_200", 62); + test_from_replay("tests/after_200", 64); } fn test_from_replay(replay_folder: &str, length: usize) { -- cgit v1.2.3 From 1c8d9ddad9884f0de117b7d91d3e1c4e256d5586 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 13:07:30 +0200 Subject: Added test of newly functioning tesla towers --- src/engine/mod.rs | 14 ++++++++++++-- tests/after_203_teslas/Round 000/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 000/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 001/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 001/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 002/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 002/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 003/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 003/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 004/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 004/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 005/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 005/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 006/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 006/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 007/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 007/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 008/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 008/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 009/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 009/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 010/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 010/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 011/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 011/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 012/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 012/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 013/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 013/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 014/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 014/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 015/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 015/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 016/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 016/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 017/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 017/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 018/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 018/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 019/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 019/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 020/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 020/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 021/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 021/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 022/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 022/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 023/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 023/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 024/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 024/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 025/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 025/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 026/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 026/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 027/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 027/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 028/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 028/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 029/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 029/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 030/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 030/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 031/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 031/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 032/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 032/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 033/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 033/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 034/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 034/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 035/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 035/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 036/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 036/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 037/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 037/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 038/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 038/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 039/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 039/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 040/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 040/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 041/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 041/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 042/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 042/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 043/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 043/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 044/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 044/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 045/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 045/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 046/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 046/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 047/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 047/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 048/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 048/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 049/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 049/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 050/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 050/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 051/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 051/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 052/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 052/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 053/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 053/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 054/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 054/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 055/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 055/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 056/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 056/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 057/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 057/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 058/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 058/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 059/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 059/PlayerCommand.txt | 1 + tests/after_203_teslas/Round 060/OpponentCommand.txt | 1 + tests/after_203_teslas/Round 060/PlayerCommand.txt | 1 + tests/live-comparison.rs | 5 +++++ 124 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 tests/after_203_teslas/Round 000/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 000/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 001/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 001/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 002/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 002/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 003/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 003/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 004/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 004/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 005/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 005/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 006/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 006/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 007/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 007/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 008/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 008/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 009/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 009/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 010/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 010/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 011/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 011/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 012/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 012/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 013/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 013/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 014/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 014/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 015/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 015/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 016/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 016/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 017/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 017/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 018/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 018/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 019/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 019/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 020/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 020/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 021/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 021/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 022/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 022/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 023/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 023/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 024/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 024/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 025/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 025/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 026/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 026/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 027/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 027/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 028/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 028/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 029/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 029/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 030/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 030/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 031/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 031/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 032/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 032/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 033/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 033/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 034/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 034/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 035/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 035/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 036/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 036/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 037/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 037/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 038/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 038/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 039/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 039/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 040/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 040/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 041/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 041/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 042/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 042/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 043/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 043/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 044/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 044/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 045/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 045/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 046/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 046/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 047/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 047/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 048/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 048/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 049/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 049/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 050/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 050/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 051/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 051/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 052/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 052/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 053/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 053/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 054/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 054/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 055/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 055/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 056/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 056/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 057/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 057/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 058/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 058/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 059/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 059/PlayerCommand.txt create mode 100644 tests/after_203_teslas/Round 060/OpponentCommand.txt create mode 100644 tests/after_203_teslas/Round 060/PlayerCommand.txt diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 7a39214..8078ca9 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -127,7 +127,7 @@ impl GameState { GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); - GameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings, &settings); + GameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.unoccupied_player_cells, &mut self.opponent, &mut self.opponent_buildings, &mut self.unoccupied_opponent_cells, &settings); GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); @@ -202,7 +202,7 @@ impl GameState { unconstructed_buildings.truncate(buildings_len); } - fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, settings: &GameSettings) { + fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, player_unoccupied_cells: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, opponent_unoccupied_cells: &mut Vec,settings: &GameSettings) { for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { if tesla.weapon_cooldown_time_left > 0 { tesla.weapon_cooldown_time_left -= 1; @@ -250,7 +250,17 @@ impl GameState { } } } + + for building in player_buildings.iter().filter(|b| b.health == 0) { + player_unoccupied_cells.push(building.pos); + player.energy_generated -= building.energy_generated_per_turn; + } player_buildings.retain(|b| b.health > 0); + + for building in opponent_buildings.iter().filter(|b| b.health == 0) { + opponent_unoccupied_cells.push(building.pos); + opponent.energy_generated -= building.energy_generated_per_turn; + } opponent_buildings.retain(|b| b.health > 0); } diff --git a/tests/after_203_teslas/Round 000/OpponentCommand.txt b/tests/after_203_teslas/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/after_203_teslas/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 000/PlayerCommand.txt b/tests/after_203_teslas/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/after_203_teslas/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 001/OpponentCommand.txt b/tests/after_203_teslas/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 001/PlayerCommand.txt b/tests/after_203_teslas/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 002/OpponentCommand.txt b/tests/after_203_teslas/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 002/PlayerCommand.txt b/tests/after_203_teslas/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 003/OpponentCommand.txt b/tests/after_203_teslas/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/after_203_teslas/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 003/PlayerCommand.txt b/tests/after_203_teslas/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/after_203_teslas/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 004/OpponentCommand.txt b/tests/after_203_teslas/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 004/PlayerCommand.txt b/tests/after_203_teslas/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 005/OpponentCommand.txt b/tests/after_203_teslas/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/after_203_teslas/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 005/PlayerCommand.txt b/tests/after_203_teslas/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/after_203_teslas/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 006/OpponentCommand.txt b/tests/after_203_teslas/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 006/PlayerCommand.txt b/tests/after_203_teslas/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 007/OpponentCommand.txt b/tests/after_203_teslas/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_203_teslas/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 007/PlayerCommand.txt b/tests/after_203_teslas/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/tests/after_203_teslas/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 008/OpponentCommand.txt b/tests/after_203_teslas/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 008/PlayerCommand.txt b/tests/after_203_teslas/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 009/OpponentCommand.txt b/tests/after_203_teslas/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_203_teslas/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 009/PlayerCommand.txt b/tests/after_203_teslas/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..6628f95 --- /dev/null +++ b/tests/after_203_teslas/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +3,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 010/OpponentCommand.txt b/tests/after_203_teslas/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..07b92b5 --- /dev/null +++ b/tests/after_203_teslas/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 010/PlayerCommand.txt b/tests/after_203_teslas/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/after_203_teslas/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 011/OpponentCommand.txt b/tests/after_203_teslas/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_203_teslas/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 011/PlayerCommand.txt b/tests/after_203_teslas/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/after_203_teslas/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 012/OpponentCommand.txt b/tests/after_203_teslas/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/after_203_teslas/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 012/PlayerCommand.txt b/tests/after_203_teslas/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_203_teslas/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 013/OpponentCommand.txt b/tests/after_203_teslas/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..0b12f52 --- /dev/null +++ b/tests/after_203_teslas/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 013/PlayerCommand.txt b/tests/after_203_teslas/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/after_203_teslas/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 014/OpponentCommand.txt b/tests/after_203_teslas/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..f87d2e2 --- /dev/null +++ b/tests/after_203_teslas/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +4,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 014/PlayerCommand.txt b/tests/after_203_teslas/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_203_teslas/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 015/OpponentCommand.txt b/tests/after_203_teslas/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/tests/after_203_teslas/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 015/PlayerCommand.txt b/tests/after_203_teslas/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..c4e7948 --- /dev/null +++ b/tests/after_203_teslas/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 016/OpponentCommand.txt b/tests/after_203_teslas/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..ad5a4bc --- /dev/null +++ b/tests/after_203_teslas/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 016/PlayerCommand.txt b/tests/after_203_teslas/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..6cf40d9 --- /dev/null +++ b/tests/after_203_teslas/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 017/OpponentCommand.txt b/tests/after_203_teslas/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..8a842f9 --- /dev/null +++ b/tests/after_203_teslas/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +4,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 017/PlayerCommand.txt b/tests/after_203_teslas/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_203_teslas/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 018/OpponentCommand.txt b/tests/after_203_teslas/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/after_203_teslas/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 018/PlayerCommand.txt b/tests/after_203_teslas/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/after_203_teslas/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 019/OpponentCommand.txt b/tests/after_203_teslas/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/after_203_teslas/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 019/PlayerCommand.txt b/tests/after_203_teslas/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..66780d8 --- /dev/null +++ b/tests/after_203_teslas/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 020/OpponentCommand.txt b/tests/after_203_teslas/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..95a4cf3 --- /dev/null +++ b/tests/after_203_teslas/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 020/PlayerCommand.txt b/tests/after_203_teslas/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/after_203_teslas/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 021/OpponentCommand.txt b/tests/after_203_teslas/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/after_203_teslas/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 021/PlayerCommand.txt b/tests/after_203_teslas/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/after_203_teslas/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 022/OpponentCommand.txt b/tests/after_203_teslas/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..88af7ff --- /dev/null +++ b/tests/after_203_teslas/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 022/PlayerCommand.txt b/tests/after_203_teslas/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/tests/after_203_teslas/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 023/OpponentCommand.txt b/tests/after_203_teslas/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_203_teslas/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 023/PlayerCommand.txt b/tests/after_203_teslas/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/after_203_teslas/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 024/OpponentCommand.txt b/tests/after_203_teslas/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_203_teslas/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 024/PlayerCommand.txt b/tests/after_203_teslas/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_203_teslas/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 025/OpponentCommand.txt b/tests/after_203_teslas/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/after_203_teslas/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 025/PlayerCommand.txt b/tests/after_203_teslas/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/after_203_teslas/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 026/OpponentCommand.txt b/tests/after_203_teslas/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_203_teslas/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 026/PlayerCommand.txt b/tests/after_203_teslas/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/tests/after_203_teslas/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 027/OpponentCommand.txt b/tests/after_203_teslas/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..50688ac --- /dev/null +++ b/tests/after_203_teslas/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 027/PlayerCommand.txt b/tests/after_203_teslas/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_203_teslas/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 028/OpponentCommand.txt b/tests/after_203_teslas/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..412a2df --- /dev/null +++ b/tests/after_203_teslas/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 028/PlayerCommand.txt b/tests/after_203_teslas/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/tests/after_203_teslas/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 029/OpponentCommand.txt b/tests/after_203_teslas/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..e61ee5b --- /dev/null +++ b/tests/after_203_teslas/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +7,5,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 029/PlayerCommand.txt b/tests/after_203_teslas/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..412a2df --- /dev/null +++ b/tests/after_203_teslas/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 030/OpponentCommand.txt b/tests/after_203_teslas/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/after_203_teslas/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 030/PlayerCommand.txt b/tests/after_203_teslas/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/tests/after_203_teslas/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 031/OpponentCommand.txt b/tests/after_203_teslas/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/tests/after_203_teslas/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 031/PlayerCommand.txt b/tests/after_203_teslas/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..0b12f52 --- /dev/null +++ b/tests/after_203_teslas/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +2,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 032/OpponentCommand.txt b/tests/after_203_teslas/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/after_203_teslas/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 032/PlayerCommand.txt b/tests/after_203_teslas/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/tests/after_203_teslas/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 033/OpponentCommand.txt b/tests/after_203_teslas/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..7d08a5b --- /dev/null +++ b/tests/after_203_teslas/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 033/PlayerCommand.txt b/tests/after_203_teslas/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/after_203_teslas/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 034/OpponentCommand.txt b/tests/after_203_teslas/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/after_203_teslas/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 034/PlayerCommand.txt b/tests/after_203_teslas/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/after_203_teslas/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 035/OpponentCommand.txt b/tests/after_203_teslas/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..3de7cb6 --- /dev/null +++ b/tests/after_203_teslas/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 035/PlayerCommand.txt b/tests/after_203_teslas/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/after_203_teslas/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 036/OpponentCommand.txt b/tests/after_203_teslas/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/tests/after_203_teslas/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 036/PlayerCommand.txt b/tests/after_203_teslas/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..36e6f4c --- /dev/null +++ b/tests/after_203_teslas/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 037/OpponentCommand.txt b/tests/after_203_teslas/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/after_203_teslas/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 037/PlayerCommand.txt b/tests/after_203_teslas/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/after_203_teslas/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 038/OpponentCommand.txt b/tests/after_203_teslas/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..8c5ef78 --- /dev/null +++ b/tests/after_203_teslas/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 038/PlayerCommand.txt b/tests/after_203_teslas/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/after_203_teslas/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 039/OpponentCommand.txt b/tests/after_203_teslas/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/after_203_teslas/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 039/PlayerCommand.txt b/tests/after_203_teslas/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/after_203_teslas/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 040/OpponentCommand.txt b/tests/after_203_teslas/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/after_203_teslas/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 040/PlayerCommand.txt b/tests/after_203_teslas/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/after_203_teslas/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 041/OpponentCommand.txt b/tests/after_203_teslas/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/after_203_teslas/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 041/PlayerCommand.txt b/tests/after_203_teslas/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/after_203_teslas/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 042/OpponentCommand.txt b/tests/after_203_teslas/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_203_teslas/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 042/PlayerCommand.txt b/tests/after_203_teslas/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/after_203_teslas/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 043/OpponentCommand.txt b/tests/after_203_teslas/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/after_203_teslas/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 043/PlayerCommand.txt b/tests/after_203_teslas/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/tests/after_203_teslas/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 044/OpponentCommand.txt b/tests/after_203_teslas/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_203_teslas/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 044/PlayerCommand.txt b/tests/after_203_teslas/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_203_teslas/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 045/OpponentCommand.txt b/tests/after_203_teslas/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..a7c241f --- /dev/null +++ b/tests/after_203_teslas/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 045/PlayerCommand.txt b/tests/after_203_teslas/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..1818e31 --- /dev/null +++ b/tests/after_203_teslas/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 046/OpponentCommand.txt b/tests/after_203_teslas/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_203_teslas/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 046/PlayerCommand.txt b/tests/after_203_teslas/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/tests/after_203_teslas/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 047/OpponentCommand.txt b/tests/after_203_teslas/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..14d635f --- /dev/null +++ b/tests/after_203_teslas/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 047/PlayerCommand.txt b/tests/after_203_teslas/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..722ec58 --- /dev/null +++ b/tests/after_203_teslas/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 048/OpponentCommand.txt b/tests/after_203_teslas/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/after_203_teslas/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 048/PlayerCommand.txt b/tests/after_203_teslas/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/after_203_teslas/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 049/OpponentCommand.txt b/tests/after_203_teslas/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/after_203_teslas/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 049/PlayerCommand.txt b/tests/after_203_teslas/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..5c88dd1 --- /dev/null +++ b/tests/after_203_teslas/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 050/OpponentCommand.txt b/tests/after_203_teslas/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/after_203_teslas/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 050/PlayerCommand.txt b/tests/after_203_teslas/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/after_203_teslas/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 051/OpponentCommand.txt b/tests/after_203_teslas/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_203_teslas/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 051/PlayerCommand.txt b/tests/after_203_teslas/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/after_203_teslas/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 052/OpponentCommand.txt b/tests/after_203_teslas/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/after_203_teslas/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 052/PlayerCommand.txt b/tests/after_203_teslas/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..b743516 --- /dev/null +++ b/tests/after_203_teslas/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 053/OpponentCommand.txt b/tests/after_203_teslas/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/after_203_teslas/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 053/PlayerCommand.txt b/tests/after_203_teslas/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/tests/after_203_teslas/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 054/OpponentCommand.txt b/tests/after_203_teslas/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/after_203_teslas/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 054/PlayerCommand.txt b/tests/after_203_teslas/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..c4e7948 --- /dev/null +++ b/tests/after_203_teslas/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 055/OpponentCommand.txt b/tests/after_203_teslas/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..6cf40d9 --- /dev/null +++ b/tests/after_203_teslas/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 055/PlayerCommand.txt b/tests/after_203_teslas/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..6cf40d9 --- /dev/null +++ b/tests/after_203_teslas/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 056/OpponentCommand.txt b/tests/after_203_teslas/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..a7c241f --- /dev/null +++ b/tests/after_203_teslas/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 056/PlayerCommand.txt b/tests/after_203_teslas/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..a7c241f --- /dev/null +++ b/tests/after_203_teslas/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 057/OpponentCommand.txt b/tests/after_203_teslas/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/after_203_teslas/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 057/PlayerCommand.txt b/tests/after_203_teslas/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/after_203_teslas/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 058/OpponentCommand.txt b/tests/after_203_teslas/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..5c88dd1 --- /dev/null +++ b/tests/after_203_teslas/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 058/PlayerCommand.txt b/tests/after_203_teslas/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/tests/after_203_teslas/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 059/OpponentCommand.txt b/tests/after_203_teslas/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/tests/after_203_teslas/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 059/PlayerCommand.txt b/tests/after_203_teslas/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/tests/after_203_teslas/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 060/OpponentCommand.txt b/tests/after_203_teslas/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..58897af --- /dev/null +++ b/tests/after_203_teslas/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 060/PlayerCommand.txt b/tests/after_203_teslas/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..58897af --- /dev/null +++ b/tests/after_203_teslas/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,0 \ No newline at end of file diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 711193e..5f87be3 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -13,6 +13,11 @@ fn it_successfully_simulates_replay() { test_from_replay("tests/after_200", 64); } +#[test] +fn it_successfully_simulates_replay_with_teslas() { + test_from_replay("tests/after_203_teslas", 60); +} + fn test_from_replay(replay_folder: &str, length: usize) { let (settings, mut state) = json::read_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); -- cgit v1.2.3 From 826ab69037e9d680a60b4267201f6d7a33ae39f2 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 13:33:36 +0200 Subject: Removed deconstruction from the list of commands considered I don't think deconstruction is a necessary part of a viable strategy for now. --- src/strategy/monte_carlo.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index dbeac2f..ba4310d 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -159,10 +159,9 @@ impl CommandScore { let all_buildings = state.player.sensible_buildings(state.count_player_teslas() < 2, settings); let building_command_count = state.unoccupied_player_cells.len()*all_buildings.len(); - let deconstruct_count = (settings.size.x as usize *settings.size.y as usize / 2) - state.unoccupied_player_cells.len(); let nothing_count = 1; - let mut commands = Vec::with_capacity(building_command_count + deconstruct_count + nothing_count); + let mut commands = Vec::with_capacity(building_command_count + nothing_count); commands.push(CommandScore::new(Command::Nothing)); for &position in &state.unoccupied_player_cells { @@ -171,10 +170,6 @@ impl CommandScore { } } - for &position in &state.occupied_player_cells() { - commands.push(CommandScore::new(Command::Deconstruct(position))); - } - commands } } -- cgit v1.2.3 From 8d5f075021d8459766493e115ddf7b5eb4e314a1 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 13:52:34 +0200 Subject: Pruned dead functions in the engine --- src/engine/mod.rs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 8078ca9..588724a 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -331,10 +331,6 @@ impl GameState { }; } - pub fn unoccupied_player_cells_in_row(&self, y: u8) -> Vec { - self.unoccupied_player_cells.iter().filter(|p| p.y == y).cloned().collect() - } - fn unoccupied_cells(buildings: &[Building], unconstructed_buildings: &[UnconstructedBuilding], bl: Point, tr: Point) -> Vec { let mut result = Vec::with_capacity((tr.y-bl.y) as usize * (tr.x-bl.x) as usize); for y in bl.y..tr.y { @@ -348,18 +344,6 @@ impl GameState { result } - - pub fn occupied_player_cells(&self) -> Vec { - self.player_unconstructed_buildings.iter().map(|b| b.pos) - .chain(self.player_buildings.iter().map(|b| b.pos)) - .collect() - } - pub fn occupied_opponent_cells(&self) -> Vec { - self.opponent_unconstructed_buildings.iter().map(|b| b.pos) - .chain(self.opponent_buildings.iter().map(|b| b.pos)) - .collect() - } - pub fn count_player_teslas(&self) -> usize { self.player_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + self.player_buildings.iter().filter(|b| b.weapon_damage == 20).count() -- cgit v1.2.3 From 28af1786f35801c375a870b9bfbbfe3640aa872d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 15:09:25 +0200 Subject: Initial stab at putting game engine behind a trait --- src/engine/expressive_engine.rs | 397 ++++++++++++++++++++++++++++++++++++ src/engine/mod.rs | 436 ++-------------------------------------- src/input/json.rs | 29 +-- src/main.rs | 2 +- src/strategy/monte_carlo.rs | 77 +++++-- tests/live-comparison.rs | 3 +- 6 files changed, 487 insertions(+), 457 deletions(-) create mode 100644 src/engine/expressive_engine.rs diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs new file mode 100644 index 0000000..f1255c3 --- /dev/null +++ b/src/engine/expressive_engine.rs @@ -0,0 +1,397 @@ +use std::ops::FnMut; +use engine::command::{Command, BuildingType}; +use engine::geometry::Point; +use engine::settings::{GameSettings, BuildingSettings}; +use engine::{GameStatus, Player, GameState}; + +#[derive(Debug, Clone, PartialEq)] +pub struct ExpressiveGameState { + pub status: GameStatus, + pub player: Player, + pub opponent: Player, + pub player_unconstructed_buildings: Vec, + pub player_buildings: Vec, + pub unoccupied_player_cells: Vec, + pub opponent_unconstructed_buildings: Vec, + pub opponent_buildings: Vec, + pub unoccupied_opponent_cells: Vec, + pub player_missiles: Vec, + pub opponent_missiles: Vec +} + +#[derive(Debug, Clone, PartialEq)] +pub struct UnconstructedBuilding { + pub pos: Point, + pub health: u8, + pub construction_time_left: u8, + pub weapon_damage: u8, + pub weapon_speed: u8, + pub weapon_cooldown_period: u8, + pub energy_generated_per_turn: u16 +} + +#[derive(Debug, Clone, PartialEq)] +pub struct Building { + pub pos: Point, + pub health: u8, + pub weapon_damage: u8, + pub weapon_speed: u8, + pub weapon_cooldown_time_left: u8, + pub weapon_cooldown_period: u8, + pub energy_generated_per_turn: u16 +} + +#[derive(Debug, Clone, PartialEq)] +pub struct Missile { + pub pos: Point, + pub damage: u8, + pub speed: u8, +} + +impl GameState for ExpressiveGameState { + fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { + if self.status.is_complete() { + return self.status; + } + + ExpressiveGameState::perform_construct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); + ExpressiveGameState::perform_construct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); + ExpressiveGameState::perform_deconstruct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, player_command); + ExpressiveGameState::perform_deconstruct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, opponent_command); + + ExpressiveGameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); + ExpressiveGameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); + + ExpressiveGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.unoccupied_player_cells, &mut self.opponent, &mut self.opponent_buildings, &mut self.unoccupied_opponent_cells, &settings); + + ExpressiveGameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); + ExpressiveGameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); + + ExpressiveGameState::move_missiles(&mut self.player_missiles, |p| p.wrapping_move_right(), + &mut self.opponent_buildings, &mut self.opponent, + &mut self.unoccupied_opponent_cells, + &settings); + ExpressiveGameState::move_missiles(&mut self.opponent_missiles, |p| p.wrapping_move_left(), + &mut self.player_buildings, &mut self.player, + &mut self.unoccupied_player_cells, + &settings); + + ExpressiveGameState::add_energy(&mut self.player); + ExpressiveGameState::add_energy(&mut self.opponent); + + ExpressiveGameState::update_status(self); + + self.status + } + + + fn player(&self) -> &Player { &self.player } + fn opponent(&self) -> &Player { &self.opponent } + fn player_has_max_teslas(&self) -> bool { self.count_player_teslas() >= 2 } + fn opponent_has_max_teslas(&self) -> bool { self.count_opponent_teslas() >= 2 } + fn unoccupied_player_cells(&self) -> &Vec { &self.unoccupied_player_cells } + fn unoccupied_opponent_cells(&self) -> &Vec { &self.unoccupied_opponent_cells } +} + +impl ExpressiveGameState { + pub fn new( + player: Player, opponent: Player, + player_unconstructed_buildings: Vec, player_buildings: Vec, + opponent_unconstructed_buildings: Vec, opponent_buildings: Vec, + player_missiles: Vec, opponent_missiles: Vec, + settings: &GameSettings) -> ExpressiveGameState { + + let unoccupied_player_cells = ExpressiveGameState::unoccupied_cells( + &player_buildings, &player_unconstructed_buildings, Point::new(0, 0), Point::new(settings.size.x/2, settings.size.y) + ); + let unoccupied_opponent_cells = ExpressiveGameState::unoccupied_cells( + &opponent_buildings, &opponent_unconstructed_buildings, Point::new(settings.size.x/2, 0), Point::new(settings.size.x, settings.size.y) + ); + ExpressiveGameState { + status: GameStatus::Continue, + player, opponent, + player_unconstructed_buildings, player_buildings, unoccupied_player_cells, + opponent_unconstructed_buildings, opponent_buildings, unoccupied_opponent_cells, + player_missiles, opponent_missiles + } + } + + /** + * Sorts the various arrays. Generally not necessary, but useful + * for tests that check equality between states. + */ + pub fn sort(&mut self) { + self.player_unconstructed_buildings.sort_by_key(|b| b.pos); + self.player_buildings.sort_by_key(|b| b.pos); + self.unoccupied_player_cells.sort(); + self.opponent_unconstructed_buildings.sort_by_key(|b| b.pos); + self.opponent_buildings.sort_by_key(|b| b.pos); + self.unoccupied_opponent_cells.sort(); + self.player_missiles.sort_by_key(|b| b.pos); + self.opponent_missiles.sort_by_key(|b| b.pos); + } + + fn perform_construct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { + if let Command::Build(p, b) = command { + let blueprint = settings.building_settings(b); + + // This is used internally. I should not be making + // invalid moves! + debug_assert!(!buildings.iter().any(|b| b.pos == p)); + debug_assert!(p.x < size.x && p.y < size.y); + debug_assert!(player.energy >= blueprint.price); + debug_assert!(b != BuildingType::Tesla || + unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + buildings.iter().filter(|b| b.weapon_damage == 20).count() < 2); + + player.energy -= blueprint.price; + unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); + + let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); + unoccupied_cells.swap_remove(to_remove_index); + } + } + fn perform_deconstruct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, command: Command) { + if let Command::Deconstruct(p) = command { + let to_remove_index = buildings.iter().position(|ref b| b.pos == p); + let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|ref b| b.pos == p); + debug_assert!(to_remove_index.is_some() || unconstructed_to_remove_index.is_some()); + + if let Some(i) = to_remove_index { + player.energy_generated -= buildings[i].energy_generated_per_turn; + buildings.swap_remove(i); + } + if let Some(i) = unconstructed_to_remove_index { + unconstructed_buildings.swap_remove(i); + } + + player.energy += 5; + + unoccupied_cells.push(p); + } + } + + fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player) { + let mut buildings_len = unconstructed_buildings.len(); + for i in (0..buildings_len).rev() { + if unconstructed_buildings[i].is_constructed() { + player.energy_generated += unconstructed_buildings[i].energy_generated_per_turn; + buildings.push(unconstructed_buildings[i].to_building()); + buildings_len -= 1; + unconstructed_buildings.swap(i, buildings_len); + } else { + unconstructed_buildings[i].construction_time_left -= 1 + } + } + unconstructed_buildings.truncate(buildings_len); + } + + fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, player_unoccupied_cells: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, opponent_unoccupied_cells: &mut Vec,settings: &GameSettings) { + for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { + if tesla.weapon_cooldown_time_left > 0 { + tesla.weapon_cooldown_time_left -= 1; + } else if player.energy >= 100 { + player.energy -= 100; + tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; + + if tesla.pos.x + 1 >= settings.size.x/2 { + opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); + } + 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { + for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { + let target_point = Point::new(x, y); + for b in 0..opponent_buildings.len() { + if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { + opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); + continue 'player_col_loop; + } + } + } + } + } + } + + for tesla in opponent_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { + if tesla.weapon_cooldown_time_left > 0 { + tesla.weapon_cooldown_time_left -= 1; + } else if opponent.energy >= 100 { + opponent.energy -= 100; + tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; + + if tesla.pos.x <= settings.size.x/2 { + player.health = player.health.saturating_sub(settings.tesla.weapon_damage); + } + 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { + for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { + let target_point = Point::new(x, y); + for b in 0..player_buildings.len() { + if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { + player_buildings[b].health = player_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); + continue 'opponent_col_loop; + } + } + } + } + } + } + + for building in player_buildings.iter().filter(|b| b.health == 0) { + player_unoccupied_cells.push(building.pos); + player.energy_generated -= building.energy_generated_per_turn; + } + player_buildings.retain(|b| b.health > 0); + + for building in opponent_buildings.iter().filter(|b| b.health == 0) { + opponent_unoccupied_cells.push(building.pos); + opponent.energy_generated -= building.energy_generated_per_turn; + } + opponent_buildings.retain(|b| b.health > 0); + } + + fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { + for building in buildings.iter_mut().filter(|b| b.is_shooty()) { + if building.weapon_cooldown_time_left > 0 { + building.weapon_cooldown_time_left -= 1; + } else { + missiles.push(Missile { + pos: building.pos, + speed: building.weapon_speed, + damage: building.weapon_damage, + }); + building.weapon_cooldown_time_left = building.weapon_cooldown_period; + } + } + } + + fn move_missiles(missiles: &mut Vec, mut wrapping_move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings) + where F: FnMut(&mut Point) { + let mut missiles_len = missiles.len(); + 'speed_loop: for _ in 0..settings.attack.weapon_speed { + 'missile_loop: for m in (0..missiles.len()).rev() { + wrapping_move_fn(&mut missiles[m].pos); + if missiles[m].pos.x >= settings.size.x { + opponent.health = opponent.health.saturating_sub(missiles[m].damage); + + missiles_len -= 1; + missiles.swap(m, missiles_len); + + continue 'missile_loop; + } + else { + for b in 0..opponent_buildings.len() { + if opponent_buildings[b].pos == missiles[m].pos { + opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(missiles[m].damage); + + missiles_len -= 1; + missiles.swap(m, missiles_len); + + if opponent_buildings[b].health == 0 { + unoccupied_cells.push(opponent_buildings[b].pos); + opponent.energy_generated -= opponent_buildings[b].energy_generated_per_turn; + opponent_buildings.swap_remove(b); + } + //after game engine bug fix, this should go back to missile_loop + continue 'missile_loop; + } + } + } + } + missiles.truncate(missiles_len); + } + } + + fn add_energy(player: &mut Player) { + player.energy += player.energy_generated; + } + + fn update_status(state: &mut ExpressiveGameState) { + let player_dead = state.player.health == 0; + let opponent_dead = state.opponent.health == 0; + state.status = match (player_dead, opponent_dead) { + (true, true) => GameStatus::Draw, + (false, true) => GameStatus::PlayerWon, + (true, false) => GameStatus::OpponentWon, + (false, false) => GameStatus::Continue, + }; + } + + fn unoccupied_cells(buildings: &[Building], unconstructed_buildings: &[UnconstructedBuilding], bl: Point, tr: Point) -> Vec { + let mut result = Vec::with_capacity((tr.y-bl.y) as usize * (tr.x-bl.x) as usize); + for y in bl.y..tr.y { + for x in bl.x..tr.x { + let pos = Point::new(x, y); + if !buildings.iter().any(|b| b.pos == pos) && !unconstructed_buildings.iter().any(|b| b.pos == pos) { + result.push(pos); + } + } + } + result + } + + pub fn count_player_teslas(&self) -> usize { + self.player_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + self.player_buildings.iter().filter(|b| b.weapon_damage == 20).count() + } + + pub fn count_opponent_teslas(&self) -> usize { + self.opponent_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + self.opponent_buildings.iter().filter(|b| b.weapon_damage == 20).count() + } +} + +impl GameStatus { + fn is_complete(&self) -> bool { + *self != GameStatus::Continue + } +} + + + +impl UnconstructedBuilding { + pub fn new(pos: Point, blueprint: &BuildingSettings) -> UnconstructedBuilding { + UnconstructedBuilding { + pos, + health: blueprint.health, + construction_time_left: blueprint.construction_time, + weapon_damage: blueprint.weapon_damage, + weapon_speed: blueprint.weapon_speed, + weapon_cooldown_period: blueprint.weapon_cooldown_period, + energy_generated_per_turn: blueprint.energy_generated_per_turn + } + } + + fn is_constructed(&self) -> bool { + self.construction_time_left == 0 + } + + fn to_building(&self) -> Building { + Building { + pos: self.pos, + health: self.health, + weapon_damage: self.weapon_damage, + weapon_speed: self.weapon_speed, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: self.weapon_cooldown_period, + energy_generated_per_turn: self.energy_generated_per_turn + } + } +} + +impl Building { + pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { + Building { + pos, + health: blueprint.health, + weapon_damage: blueprint.weapon_damage, + weapon_speed: blueprint.weapon_speed, + weapon_cooldown_time_left: 0, + weapon_cooldown_period: blueprint.weapon_cooldown_period, + energy_generated_per_turn: blueprint.energy_generated_per_turn + } + } + + fn is_shooty(&self) -> bool { + self.weapon_damage > 0 && self.weapon_damage < 20 + } +} + diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 588724a..65d6e24 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -1,29 +1,22 @@ pub mod command; pub mod geometry; pub mod settings; +pub mod expressive_engine; -use self::command::{Command, BuildingType}; -use self::geometry::Point; -use self::settings::{GameSettings, BuildingSettings}; - -use std::ops::FnMut; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: f32 = 1.2; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: f32 = 1.5; +use self::command::{Command}; +use self::geometry::Point; +use self::settings::{GameSettings}; -#[derive(Debug, Clone, PartialEq)] -pub struct GameState { - pub status: GameStatus, - pub player: Player, - pub opponent: Player, - pub player_unconstructed_buildings: Vec, - pub player_buildings: Vec, - pub unoccupied_player_cells: Vec, - pub opponent_unconstructed_buildings: Vec, - pub opponent_buildings: Vec, - pub unoccupied_opponent_cells: Vec, - pub player_missiles: Vec, - pub opponent_missiles: Vec +pub trait GameState: Clone + Sync { + fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus; + + fn player(&self) -> &Player; + fn opponent(&self) -> &Player; + fn player_has_max_teslas(&self) -> bool; + fn opponent_has_max_teslas(&self) -> bool; + fn unoccupied_player_cells(&self) -> &Vec; + fn unoccupied_opponent_cells(&self) -> &Vec; } #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -41,413 +34,12 @@ pub struct Player { pub energy_generated: u16, } -#[derive(Debug, Clone, PartialEq)] -pub struct UnconstructedBuilding { - pub pos: Point, - pub health: u8, - pub construction_time_left: u8, - pub weapon_damage: u8, - pub weapon_speed: u8, - pub weapon_cooldown_period: u8, - pub energy_generated_per_turn: u16 -} - -#[derive(Debug, Clone, PartialEq)] -pub struct Building { - pub pos: Point, - pub health: u8, - pub weapon_damage: u8, - pub weapon_speed: u8, - pub weapon_cooldown_time_left: u8, - pub weapon_cooldown_period: u8, - pub energy_generated_per_turn: u16 -} - -#[derive(Debug, Clone, PartialEq)] -pub struct Missile { - pub pos: Point, - pub damage: u8, - pub speed: u8, -} - -impl GameState { - pub fn new( - player: Player, opponent: Player, - player_unconstructed_buildings: Vec, player_buildings: Vec, - opponent_unconstructed_buildings: Vec, opponent_buildings: Vec, - player_missiles: Vec, opponent_missiles: Vec, - settings: &GameSettings) -> GameState { - - let unoccupied_player_cells = GameState::unoccupied_cells( - &player_buildings, &player_unconstructed_buildings, Point::new(0, 0), Point::new(settings.size.x/2, settings.size.y) - ); - let unoccupied_opponent_cells = GameState::unoccupied_cells( - &opponent_buildings, &opponent_unconstructed_buildings, Point::new(settings.size.x/2, 0), Point::new(settings.size.x, settings.size.y) - ); - GameState { - status: GameStatus::Continue, - player, opponent, - player_unconstructed_buildings, player_buildings, unoccupied_player_cells, - opponent_unconstructed_buildings, opponent_buildings, unoccupied_opponent_cells, - player_missiles, opponent_missiles - } - } - - /** - * Sorts the various arrays. Generally not necessary, but useful - * for tests that check equality between states. - */ - pub fn sort(&mut self) { - self.player_unconstructed_buildings.sort_by_key(|b| b.pos); - self.player_buildings.sort_by_key(|b| b.pos); - self.unoccupied_player_cells.sort(); - self.opponent_unconstructed_buildings.sort_by_key(|b| b.pos); - self.opponent_buildings.sort_by_key(|b| b.pos); - self.unoccupied_opponent_cells.sort(); - self.player_missiles.sort_by_key(|b| b.pos); - self.opponent_missiles.sort_by_key(|b| b.pos); - } - - pub fn simulate(&self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameState { - let mut state = self.clone(); - state.simulate_mut(settings, player_command, opponent_command); - state - } - - pub fn simulate_mut(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) { - if self.status.is_complete() { - return; - } - - GameState::perform_construct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); - GameState::perform_construct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); - GameState::perform_deconstruct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, player_command); - GameState::perform_deconstruct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, opponent_command); - - GameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); - GameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); - - GameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.unoccupied_player_cells, &mut self.opponent, &mut self.opponent_buildings, &mut self.unoccupied_opponent_cells, &settings); - - GameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); - GameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); - - GameState::move_missiles(&mut self.player_missiles, |p| p.wrapping_move_right(), - &mut self.opponent_buildings, &mut self.opponent, - &mut self.unoccupied_opponent_cells, - &settings); - GameState::move_missiles(&mut self.opponent_missiles, |p| p.wrapping_move_left(), - &mut self.player_buildings, &mut self.player, - &mut self.unoccupied_player_cells, - &settings); - - GameState::add_energy(&mut self.player); - GameState::add_energy(&mut self.opponent); - - GameState::update_status(self); - } - - fn perform_construct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { - if let Command::Build(p, b) = command { - let blueprint = settings.building_settings(b); - - // This is used internally. I should not be making - // invalid moves! - debug_assert!(!buildings.iter().any(|b| b.pos == p)); - debug_assert!(p.x < size.x && p.y < size.y); - debug_assert!(player.energy >= blueprint.price); - debug_assert!(b != BuildingType::Tesla || - unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - buildings.iter().filter(|b| b.weapon_damage == 20).count() < 2); - - player.energy -= blueprint.price; - unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); - - let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); - unoccupied_cells.swap_remove(to_remove_index); - } - } - fn perform_deconstruct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, command: Command) { - if let Command::Deconstruct(p) = command { - let to_remove_index = buildings.iter().position(|ref b| b.pos == p); - let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|ref b| b.pos == p); - debug_assert!(to_remove_index.is_some() || unconstructed_to_remove_index.is_some()); - - if let Some(i) = to_remove_index { - player.energy_generated -= buildings[i].energy_generated_per_turn; - buildings.swap_remove(i); - } - if let Some(i) = unconstructed_to_remove_index { - unconstructed_buildings.swap_remove(i); - } - - player.energy += 5; - - unoccupied_cells.push(p); - } - } - - fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player) { - let mut buildings_len = unconstructed_buildings.len(); - for i in (0..buildings_len).rev() { - if unconstructed_buildings[i].is_constructed() { - player.energy_generated += unconstructed_buildings[i].energy_generated_per_turn; - buildings.push(unconstructed_buildings[i].to_building()); - buildings_len -= 1; - unconstructed_buildings.swap(i, buildings_len); - } else { - unconstructed_buildings[i].construction_time_left -= 1 - } - } - unconstructed_buildings.truncate(buildings_len); - } - - fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, player_unoccupied_cells: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, opponent_unoccupied_cells: &mut Vec,settings: &GameSettings) { - for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { - if tesla.weapon_cooldown_time_left > 0 { - tesla.weapon_cooldown_time_left -= 1; - } else if player.energy >= 100 { - player.energy -= 100; - tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; - - if tesla.pos.x + 1 >= settings.size.x/2 { - opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); - } - 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { - for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { - let target_point = Point::new(x, y); - for b in 0..opponent_buildings.len() { - if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { - opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); - continue 'player_col_loop; - } - } - } - } - } - } - - for tesla in opponent_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { - if tesla.weapon_cooldown_time_left > 0 { - tesla.weapon_cooldown_time_left -= 1; - } else if opponent.energy >= 100 { - opponent.energy -= 100; - tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; - - if tesla.pos.x <= settings.size.x/2 { - player.health = player.health.saturating_sub(settings.tesla.weapon_damage); - } - 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { - for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { - let target_point = Point::new(x, y); - for b in 0..player_buildings.len() { - if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { - player_buildings[b].health = player_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); - continue 'opponent_col_loop; - } - } - } - } - } - } - - for building in player_buildings.iter().filter(|b| b.health == 0) { - player_unoccupied_cells.push(building.pos); - player.energy_generated -= building.energy_generated_per_turn; - } - player_buildings.retain(|b| b.health > 0); - - for building in opponent_buildings.iter().filter(|b| b.health == 0) { - opponent_unoccupied_cells.push(building.pos); - opponent.energy_generated -= building.energy_generated_per_turn; - } - opponent_buildings.retain(|b| b.health > 0); - } - - fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { - for building in buildings.iter_mut().filter(|b| b.is_shooty()) { - if building.weapon_cooldown_time_left > 0 { - building.weapon_cooldown_time_left -= 1; - } else { - missiles.push(Missile { - pos: building.pos, - speed: building.weapon_speed, - damage: building.weapon_damage, - }); - building.weapon_cooldown_time_left = building.weapon_cooldown_period; - } - } - } - - fn move_missiles(missiles: &mut Vec, mut wrapping_move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings) - where F: FnMut(&mut Point) { - let mut missiles_len = missiles.len(); - 'speed_loop: for _ in 0..settings.attack.weapon_speed { - 'missile_loop: for m in (0..missiles.len()).rev() { - wrapping_move_fn(&mut missiles[m].pos); - if missiles[m].pos.x >= settings.size.x { - opponent.health = opponent.health.saturating_sub(missiles[m].damage); - - missiles_len -= 1; - missiles.swap(m, missiles_len); - - continue 'missile_loop; - } - else { - for b in 0..opponent_buildings.len() { - if opponent_buildings[b].pos == missiles[m].pos { - opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(missiles[m].damage); - - missiles_len -= 1; - missiles.swap(m, missiles_len); - - if opponent_buildings[b].health == 0 { - unoccupied_cells.push(opponent_buildings[b].pos); - opponent.energy_generated -= opponent_buildings[b].energy_generated_per_turn; - opponent_buildings.swap_remove(b); - } - //after game engine bug fix, this should go back to missile_loop - continue 'missile_loop; - } - } - } - } - missiles.truncate(missiles_len); - } - } - - fn add_energy(player: &mut Player) { - player.energy += player.energy_generated; - } - - fn update_status(state: &mut GameState) { - let player_dead = state.player.health == 0; - let opponent_dead = state.opponent.health == 0; - state.status = match (player_dead, opponent_dead) { - (true, true) => GameStatus::Draw, - (false, true) => GameStatus::PlayerWon, - (true, false) => GameStatus::OpponentWon, - (false, false) => GameStatus::Continue, - }; - } - - fn unoccupied_cells(buildings: &[Building], unconstructed_buildings: &[UnconstructedBuilding], bl: Point, tr: Point) -> Vec { - let mut result = Vec::with_capacity((tr.y-bl.y) as usize * (tr.x-bl.x) as usize); - for y in bl.y..tr.y { - for x in bl.x..tr.x { - let pos = Point::new(x, y); - if !buildings.iter().any(|b| b.pos == pos) && !unconstructed_buildings.iter().any(|b| b.pos == pos) { - result.push(pos); - } - } - } - result - } - - pub fn count_player_teslas(&self) -> usize { - self.player_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - self.player_buildings.iter().filter(|b| b.weapon_damage == 20).count() - } - - pub fn count_opponent_teslas(&self) -> usize { - self.opponent_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - self.opponent_buildings.iter().filter(|b| b.weapon_damage == 20).count() - } -} - -impl GameStatus { - fn is_complete(&self) -> bool { - *self != GameStatus::Continue - } -} - impl Player { - pub fn new(energy: u16, health: u8, settings: &GameSettings, buildings: &[Building]) -> Player { + pub fn new(energy: u16, health: u8, settings: &GameSettings, buildings: &[expressive_engine::Building]) -> Player { Player { energy, health, energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() } } - - #[cfg(not(feature = "energy-cutoff"))] - pub fn sensible_buildings(&self, tesla_allowed: bool, settings: &GameSettings) -> Vec { - let mut result = Vec::with_capacity(3); - for b in BuildingType::all().iter() { - let building_setting = settings.building_settings(*b); - let affordable = building_setting.price <= self.energy; - let is_tesla = building_setting.weapon_damage == 20; - if affordable && (!is_tesla || tesla_allowed) { - result.push(*b); - } - } - result - } - - #[cfg(feature = "energy-cutoff")] - pub fn sensible_buildings(&self, tesla_allowed: bool, settings: &GameSettings) -> Vec { - let mut result = Vec::with_capacity(3); - let needs_energy = self.energy_generated as f32 <= ENERGY_PRODUCTION_CUTOFF * settings.max_building_price as f32 && - self.energy as f32 <= ENERGY_STORAGE_CUTOFF * settings.max_building_price as f32; - - for b in BuildingType::all().iter() { - let building_setting = settings.building_settings(*b); - let affordable = building_setting.price <= self.energy; - let energy_producing = building_setting.energy_generated_per_turn > 0; - let is_tesla = building_setting.weapon_damage == 20; - if affordable && (!energy_producing || needs_energy) && (!is_tesla || tesla_allowed) { - result.push(*b); - } - } - result - } } - -impl UnconstructedBuilding { - pub fn new(pos: Point, blueprint: &BuildingSettings) -> UnconstructedBuilding { - UnconstructedBuilding { - pos, - health: blueprint.health, - construction_time_left: blueprint.construction_time, - weapon_damage: blueprint.weapon_damage, - weapon_speed: blueprint.weapon_speed, - weapon_cooldown_period: blueprint.weapon_cooldown_period, - energy_generated_per_turn: blueprint.energy_generated_per_turn - } - } - - fn is_constructed(&self) -> bool { - self.construction_time_left == 0 - } - - fn to_building(&self) -> Building { - Building { - pos: self.pos, - health: self.health, - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn - } - } -} - -impl Building { - pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { - Building { - pos, - health: blueprint.health, - weapon_damage: blueprint.weapon_damage, - weapon_speed: blueprint.weapon_speed, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: blueprint.weapon_cooldown_period, - energy_generated_per_turn: blueprint.energy_generated_per_turn - } - } - - fn is_shooty(&self) -> bool { - self.weapon_damage > 0 && self.weapon_damage < 20 - } -} - diff --git a/src/input/json.rs b/src/input/json.rs index a2f6d8c..3968afd 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -3,10 +3,11 @@ use std::io::prelude::*; use serde_json; use std::error::Error; -use ::engine; +use engine; +use engine::expressive_engine; -pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, engine::GameState), Box> { +pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, expressive_engine::ExpressiveGameState), Box> { let mut file = File::open(filename)?; let mut content = String::new(); file.read_to_string(&mut content)?; @@ -121,10 +122,10 @@ impl State { ) } - fn to_engine(&self, settings: &engine::settings::GameSettings) -> engine::GameState { + fn to_engine(&self, settings: &engine::settings::GameSettings) -> expressive_engine::ExpressiveGameState { let player_buildings = self.buildings_to_engine('A'); let opponent_buildings = self.buildings_to_engine('B'); - engine::GameState::new( + expressive_engine::ExpressiveGameState::new( self.player().to_engine(settings, &player_buildings), self.opponent().to_engine(settings, &opponent_buildings), self.unconstructed_buildings_to_engine('A'), @@ -149,7 +150,7 @@ impl State { .expect("Opponent character did not appear in state.json") } - fn unconstructed_buildings_to_engine(&self, player_type: char) -> Vec { + fn unconstructed_buildings_to_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() @@ -160,7 +161,7 @@ impl State { .collect() } - fn buildings_to_engine(&self, player_type: char) -> Vec { + fn buildings_to_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() @@ -171,7 +172,7 @@ impl State { .collect() } - fn missiles_to_engine(&self, player_type: char) -> Vec { + fn missiles_to_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.missiles.iter() @@ -198,14 +199,14 @@ impl BuildingBlueprint { } impl Player { - fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[engine::Building]) -> engine::Player { + fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[expressive_engine::Building]) -> engine::Player { engine::Player::new(self.energy, self.health, settings, buildings) } } impl BuildingState { - fn to_engine(&self) -> engine::Building { - engine::Building { + fn to_engine(&self) -> expressive_engine::Building { + expressive_engine::Building { pos: engine::geometry::Point::new(self.x, self.y), health: self.health, weapon_damage: self.weapon_damage, @@ -216,8 +217,8 @@ impl BuildingState { } } - fn to_engine_unconstructed(&self) -> engine::UnconstructedBuilding { - engine::UnconstructedBuilding { + fn to_engine_unconstructed(&self) -> expressive_engine::UnconstructedBuilding { + expressive_engine::UnconstructedBuilding { pos: engine::geometry::Point::new(self.x, self.y), health: self.health, construction_time_left: self.construction_time_left as u8, // > 0 check already happened @@ -230,8 +231,8 @@ impl BuildingState { } impl MissileState { - fn to_engine(&self) -> engine::Missile { - engine::Missile { + fn to_engine(&self) -> expressive_engine::Missile { + expressive_engine::Missile { pos: engine::geometry::Point::new(self.x, self.y), damage: self.damage, speed: self.speed, diff --git a/src/main.rs b/src/main.rs index f3d9373..61e2e55 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,7 @@ use std::fs::File; use std::io::prelude::*; use std::process; -fn choose_move(settings: &engine::settings::GameSettings, state: &engine::GameState, start_time: &PreciseTime) -> Command { +fn choose_move(settings: &engine::settings::GameSettings, state: &GS, start_time: &PreciseTime) -> Command { #[cfg(not(feature = "reduced-time"))] #[cfg(not(feature = "extended-time"))] let max_time = Duration::milliseconds(1950); diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index ba4310d..dae74bc 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,10 +1,10 @@ use engine::settings::GameSettings; use engine::command::*; use engine::geometry::*; -use engine::{GameState, GameStatus}; +use engine::{GameState, GameStatus, Player}; use rand::{Rng, XorShiftRng, SeedableRng}; - + const MAX_MOVES: u16 = 400; use time::{Duration, PreciseTime}; @@ -12,7 +12,10 @@ use time::{Duration, PreciseTime}; #[cfg(not(feature = "single-threaded"))] use rayon::prelude::*; -pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &PreciseTime, max_time: Duration) -> Command { +#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 30; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 45; + +pub fn choose_move(settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(settings, state); loop { @@ -51,22 +54,24 @@ pub fn choose_move(settings: &GameSettings, state: &GameState, start_time: &Prec } } -fn simulate_to_endstate(command_score: &mut CommandScore, settings: &GameSettings, state: &GameState, rng: &mut R) { - let opponent_first = random_opponent_move(settings, state, rng); - let mut state_mut = state.simulate(settings, command_score.command, opponent_first); +fn simulate_to_endstate(command_score: &mut CommandScore, settings: &GameSettings, state: &GS, rng: &mut R) { + let mut state_mut = state.clone(); + + let opponent_first = random_opponent_move(settings, &state_mut, rng); + let mut status = state_mut.simulate(settings, command_score.command, opponent_first); for _ in 0..MAX_MOVES { - if state_mut.status != GameStatus::Continue { + if status != GameStatus::Continue { break; } let player_command = random_player_move(settings, &state_mut, rng); let opponent_command = random_opponent_move(settings, &state_mut, rng); - state_mut.simulate_mut(settings, player_command, opponent_command); + status = state_mut.simulate(settings, player_command, opponent_command); } let next_seed = [rng.next_u32(), rng.next_u32(), rng.next_u32(), rng.next_u32()]; - match state_mut.status { + match status { GameStatus::PlayerWon => command_score.add_victory(next_seed), GameStatus::OpponentWon => command_score.add_defeat(next_seed), GameStatus::Continue => command_score.add_stalemate(next_seed), @@ -74,14 +79,14 @@ fn simulate_to_endstate(command_score: &mut CommandScore, settings: &Gam } } -fn random_player_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_buildings = state.player.sensible_buildings(state.count_player_teslas() < 2, settings); - random_move(&state.unoccupied_player_cells, &all_buildings, rng) +fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); + random_move(&state.unoccupied_player_cells(), &all_buildings, rng) } -fn random_opponent_move(settings: &GameSettings, state: &GameState, rng: &mut R) -> Command { - let all_buildings = state.opponent.sensible_buildings(state.count_opponent_teslas() < 2, settings); - random_move(&state.unoccupied_opponent_cells, &all_buildings, rng) +fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); + random_move(&state.unoccupied_opponent_cells(), &all_buildings, rng) } fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { @@ -155,16 +160,16 @@ impl CommandScore { (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) } - fn init_command_scores(settings: &GameSettings, state: &GameState) -> Vec { - let all_buildings = state.player.sensible_buildings(state.count_player_teslas() < 2, settings); + fn init_command_scores(settings: &GameSettings, state: &GS) -> Vec { + let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); - let building_command_count = state.unoccupied_player_cells.len()*all_buildings.len(); + let building_command_count = state.unoccupied_player_cells().len()*all_buildings.len(); let nothing_count = 1; let mut commands = Vec::with_capacity(building_command_count + nothing_count); commands.push(CommandScore::new(Command::Nothing)); - for &position in &state.unoccupied_player_cells { + for &position in state.unoccupied_player_cells() { for &building in &all_buildings { commands.push(CommandScore::new(Command::Build(position, building))); } @@ -173,3 +178,37 @@ impl CommandScore { commands } } + +#[cfg(not(feature = "energy-cutoff"))] +fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { + let mut result = Vec::with_capacity(4); + for b in BuildingType::all().iter() { + let building_setting = settings.building_settings(*b); + let affordable = building_setting.price <= player.energy; + let is_tesla = b == BuildingType::Tesla; + if affordable && (!is_tesla || !has_max_teslas) { + result.push(*b); + } + } + result +} + + +#[cfg(feature = "energy-cutoff")] +fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { + let mut result = Vec::with_capacity(4); + let needs_energy = player.energy_generated <= ENERGY_PRODUCTION_CUTOFF || + player.energy <= ENERGY_STORAGE_CUTOFF; + + for b in BuildingType::all().iter() { + let building_setting = settings.building_settings(*b); + let affordable = building_setting.price <= player.energy; + let energy_producing = building_setting.energy_generated_per_turn > 0; + let is_tesla = *b == BuildingType::Tesla; + if affordable && (!energy_producing || needs_energy) && (!is_tesla || !has_max_teslas) { + result.push(*b); + } + } + result +} + diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs index 5f87be3..20dbb2f 100644 --- a/tests/live-comparison.rs +++ b/tests/live-comparison.rs @@ -4,6 +4,7 @@ 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 std::fs::File; use std::io::prelude::*; @@ -26,7 +27,7 @@ fn test_from_replay(replay_folder: &str, length: usize) { let opponent = read_opponent_command(&format!("{}/Round {:03}/OpponentCommand.txt", replay_folder, i), &settings); let (_, mut expected_state) = json::read_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); - state.simulate_mut(&settings, player, opponent); + state.simulate(&settings, player, opponent); state.sort(); expected_state.sort(); assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); -- cgit v1.2.3 From 9db48d9c24fcdd7a807aacfe67cd34455c945555 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 15:38:45 +0200 Subject: Updated benchmark to only take constant map size into account --- src/bin/perf-test.rs | 21 ---- tests/state0.json | 311 +-------------------------------------------------- 2 files changed, 1 insertion(+), 331 deletions(-) diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 71044ad..054258f 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -5,17 +5,10 @@ use time::{PreciseTime, Duration}; use zombot::*; const STATE_PATH: &str = "tests/state0.json"; -const STATE_BIG_PATH: &str = "tests/bigstate.json"; use std::process; fn main() { - normal_state(); - big_state(); -} - -fn normal_state() { - println!("Normal size state file"); let start_time = PreciseTime::now(); let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { Ok(ok) => ok, @@ -27,17 +20,3 @@ fn normal_state() { let max_time = Duration::milliseconds(1950); strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); } - -fn big_state() { - println!("Big state file"); - let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_state_from_file(STATE_BIG_PATH) { - Ok(ok) => ok, - Err(error) => { - println!("Error while parsing JSON file: {}", error); - process::exit(1); - } - }; - let max_time = Duration::milliseconds(1950); - strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); -} diff --git a/tests/state0.json b/tests/state0.json index ef5cd39..9e52de6 100644 --- a/tests/state0.json +++ b/tests/state0.json @@ -1,310 +1 @@ -{ - "gameDetails": { - "round": 0, - "mapWidth": 8, - "mapHeight": 4, - "roundIncomeEnergy": 5, - "buildingPrices": { - "TESLA": 300, - "ENERGY": 20, - "ATTACK": 30, - "DEFENSE": 30 - }, - "buildingsStats": { - "TESLA": { - "health": 5, - "constructionTime": 11, - "price": 300, - "weaponDamage": 20, - "weaponSpeed": 0, - "weaponCooldownPeriod": 10, - "energyGeneratedPerTurn": 0, - "destroyMultiplier": 1, - "constructionScore": 1 - }, - "ENERGY": { - "health": 5, - "constructionTime": 2, - "price": 20, - "weaponDamage": 0, - "weaponSpeed": 0, - "weaponCooldownPeriod": 0, - "energyGeneratedPerTurn": 3, - "destroyMultiplier": 1, - "constructionScore": 1 - }, - "ATTACK": { - "health": 5, - "constructionTime": 2, - "price": 30, - "weaponDamage": 5, - "weaponSpeed": 1, - "weaponCooldownPeriod": 3, - "energyGeneratedPerTurn": 0, - "destroyMultiplier": 1, - "constructionScore": 1 - }, - "DEFENSE": { - "health": 20, - "constructionTime": 4, - "price": 30, - "weaponDamage": 0, - "weaponSpeed": 0, - "weaponCooldownPeriod": 0, - "energyGeneratedPerTurn": 0, - "destroyMultiplier": 1, - "constructionScore": 1 - } - } - }, - "players": [ - { - "playerType": "A", - "energy": 20, - "health": 100, - "hitsTaken": 0, - "score": 0 - }, - { - "playerType": "B", - "energy": 20, - "health": 100, - "hitsTaken": 0, - "score": 0 - } - ], - "gameMap": [ - [ - { - "x": 0, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 5, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 6, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 7, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 5, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 6, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 7, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 5, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 6, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 7, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 5, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 6, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 7, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ] - ] -} +{"gameDetails":{"round":0,"maxRounds":400,"mapWidth":16,"mapHeight":8,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30,"TESLA":300},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":3},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":2,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":4},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":10},"TESLA":{"health":5,"constructionTime":11,"price":300,"weaponDamage":20,"weaponSpeed":0,"weaponCooldownPeriod":10,"energyGeneratedPerTurn":0,"destroyMultiplier":10,"constructionScore":20}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}]],"teslaHitList":[]} \ No newline at end of file -- cgit v1.2.3 From 11457a738e63b5aaae55779fbfdc4978e6524bb1 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 16:10:40 +0200 Subject: Moved 'expressive' specific building logic out of generi code --- src/engine/mod.rs | 10 ---------- src/input/json.rs | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 65d6e24..2910b75 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -33,13 +33,3 @@ pub struct Player { pub health: u8, pub energy_generated: u16, } - -impl Player { - pub fn new(energy: u16, health: u8, settings: &GameSettings, buildings: &[expressive_engine::Building]) -> Player { - Player { - energy, - health, - energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() - } - } -} diff --git a/src/input/json.rs b/src/input/json.rs index 3968afd..6f7cda1 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -200,7 +200,11 @@ impl BuildingBlueprint { impl Player { fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[expressive_engine::Building]) -> engine::Player { - engine::Player::new(self.energy, self.health, settings, buildings) + engine::Player { + energy: self.energy, + health: self.health, + energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() + } } } -- cgit v1.2.3 From 11a7896e40da2315df9e46c8b03afb3d6eec94dc Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 30 Jun 2018 22:45:05 +0200 Subject: Created data structure for bitwise game engine --- src/engine/bitwise_engine.rs | 73 ++++++++++++++++++++++++++++++++++++++++++++ src/engine/mod.rs | 4 +-- 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 src/engine/bitwise_engine.rs diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs new file mode 100644 index 0000000..79d5120 --- /dev/null +++ b/src/engine/bitwise_engine.rs @@ -0,0 +1,73 @@ +use engine::command::{Command, BuildingType}; +use engine::geometry::Point; +use engine::settings::{GameSettings}; +use engine::{GameStatus, Player, GameState}; + +const MAP_WIDTH: usize = 16; +const MAP_HEIGHT: usize = 8; + +const MISSILE_COOLDOWN: usize = 3; + +const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits + +const MAX_TESLAS: usize = 2; + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct BitwiseGameState { + status: GameStatus, + player: Player, + opponent: Player, + player_buildings: PlayerBuildings, + opponent_buildings: PlayerBuildings, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +struct PlayerBuildings { + unconstructed: Vec, + energy_towers: [u8; MAP_HEIGHT], + missile_towers: [[u8; MAP_HEIGHT]; MISSILE_COOLDOWN], + defence_towers: [[u8; MAP_HEIGHT]; DEFENCE_HEALTH], + tesla_towers: [u8; MAP_HEIGHT], + + missiles: [[u16; MAP_HEIGHT]; MAP_WIDTH/4], + tesla_cooldowns: [TeslaCooldown; MAX_TESLAS], + + unoccupied: Vec +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct UnconstructedBuilding { + pub pos: Point, + pub construction_time_left: u8, + pub building_type: BuildingType +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct TeslaCooldown { + pub active: bool, + pub pos: Point, + pub cooldown: u8 +} + + +impl GameState for BitwiseGameState { + fn simulate(&mut self, _settings: &GameSettings, _player_command: Command, _opponent_command: Command) -> GameStatus { + //TODO + self.status + } + + + fn player(&self) -> &Player { &self.player } + fn opponent(&self) -> &Player { &self.opponent } + fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= MAX_TESLAS } + fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= MAX_TESLAS } + fn unoccupied_player_cells(&self) -> &Vec { &self.player_buildings.unoccupied } + fn unoccupied_opponent_cells(&self) -> &Vec { &self.opponent_buildings.unoccupied } +} + +impl PlayerBuildings { + pub fn count_teslas(&self) -> usize { + //TODO + 2 + } +} diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 2910b75..6e7c5c9 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -2,7 +2,7 @@ pub mod command; pub mod geometry; pub mod settings; pub mod expressive_engine; - +pub mod bitwise_engine; use self::command::{Command}; use self::geometry::Point; @@ -27,7 +27,7 @@ pub enum GameStatus { Draw } -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct Player { pub energy: u16, pub health: u8, -- cgit v1.2.3 From 96dfb9375125a2473fc639510653ae5ce2600343 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 12:06:21 +0200 Subject: Implemented tesla count for bitwise --- src/engine/bitwise_engine.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 79d5120..ca9cf00 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -67,7 +67,6 @@ impl GameState for BitwiseGameState { impl PlayerBuildings { pub fn count_teslas(&self) -> usize { - //TODO - 2 + self.tesla_cooldowns.iter().filter(|t| t.active).count() } } -- cgit v1.2.3 From 1ac0449bd0313ad01da0d253f7b45b45287314b7 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 12:11:51 +0200 Subject: Renamed tests to follow underscore convention --- tests/live-comparison.rs | 70 ----------------------------------------------- tests/live_comparison.rs | 70 +++++++++++++++++++++++++++++++++++++++++++++++ tests/monte-carlo-test.rs | 19 ------------- tests/monte_carlo_test.rs | 19 +++++++++++++ 4 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 tests/live-comparison.rs create mode 100644 tests/live_comparison.rs delete mode 100644 tests/monte-carlo-test.rs create mode 100644 tests/monte_carlo_test.rs diff --git a/tests/live-comparison.rs b/tests/live-comparison.rs deleted file mode 100644 index 20dbb2f..0000000 --- a/tests/live-comparison.rs +++ /dev/null @@ -1,70 +0,0 @@ -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 std::fs::File; -use std::io::prelude::*; - -#[test] -fn it_successfully_simulates_replay() { - test_from_replay("tests/after_200", 64); -} - -#[test] -fn it_successfully_simulates_replay_with_teslas() { - test_from_replay("tests/after_203_teslas", 60); -} - -fn test_from_replay(replay_folder: &str, length: usize) { - let (settings, mut state) = json::read_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_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); - - state.simulate(&settings, player, opponent); - state.sort(); - expected_state.sort(); - assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); - } -} - -fn read_player_command(filename: &str) -> Command { - let mut file = File::open(filename).unwrap(); - let mut content = String::new(); - file.read_to_string(&mut content).unwrap(); - if content.trim() == "No Command" { - Command::Nothing - } - else { - let mut components = content.split(','); - let point = Point::new(components.next().unwrap().trim().parse().unwrap(), - components.next().unwrap().trim().parse().unwrap()); - let action_type = components.next().unwrap().trim().parse().unwrap(); - if action_type == 3 { - Command::Deconstruct(point) - } else { - Command::Build(point, BuildingType::from_u8(action_type).unwrap()) - } - } -} - -fn read_opponent_command(filename: &str, settings: &GameSettings) -> Command { - match read_player_command(filename) { - Command::Nothing => Command::Nothing, - Command::Build(p, b) => Command::Build(Point::new( - settings.size.x - p.x - 1, - p.y - ), b), - Command::Deconstruct(p) => Command::Deconstruct(Point::new( - settings.size.x - p.x - 1, - p.y - )), - } - -} diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs new file mode 100644 index 0000000..20dbb2f --- /dev/null +++ b/tests/live_comparison.rs @@ -0,0 +1,70 @@ +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 std::fs::File; +use std::io::prelude::*; + +#[test] +fn it_successfully_simulates_replay() { + test_from_replay("tests/after_200", 64); +} + +#[test] +fn it_successfully_simulates_replay_with_teslas() { + test_from_replay("tests/after_203_teslas", 60); +} + +fn test_from_replay(replay_folder: &str, length: usize) { + let (settings, mut state) = json::read_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_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); + + state.simulate(&settings, player, opponent); + state.sort(); + expected_state.sort(); + assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); + } +} + +fn read_player_command(filename: &str) -> Command { + let mut file = File::open(filename).unwrap(); + let mut content = String::new(); + file.read_to_string(&mut content).unwrap(); + if content.trim() == "No Command" { + Command::Nothing + } + else { + let mut components = content.split(','); + let point = Point::new(components.next().unwrap().trim().parse().unwrap(), + components.next().unwrap().trim().parse().unwrap()); + let action_type = components.next().unwrap().trim().parse().unwrap(); + if action_type == 3 { + Command::Deconstruct(point) + } else { + Command::Build(point, BuildingType::from_u8(action_type).unwrap()) + } + } +} + +fn read_opponent_command(filename: &str, settings: &GameSettings) -> Command { + match read_player_command(filename) { + Command::Nothing => Command::Nothing, + Command::Build(p, b) => Command::Build(Point::new( + settings.size.x - p.x - 1, + p.y + ), b), + Command::Deconstruct(p) => Command::Deconstruct(Point::new( + settings.size.x - p.x - 1, + p.y + )), + } + +} diff --git a/tests/monte-carlo-test.rs b/tests/monte-carlo-test.rs deleted file mode 100644 index 479b36d..0000000 --- a/tests/monte-carlo-test.rs +++ /dev/null @@ -1,19 +0,0 @@ -extern crate zombot; -extern crate time; -use time::{PreciseTime, Duration}; - -use zombot::*; - -const STATE_PATH: &str = "tests/state0.json"; - -// there are assertions in the game engine, run when it's in debug mode -#[test] -fn it_does_a_normal_turn_successfully() { - let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { - Ok(ok) => ok, - Err(error) => panic!("Error while parsing JSON file: {}", error) - }; - let max_time = Duration::milliseconds(1950); - strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); -} diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs new file mode 100644 index 0000000..479b36d --- /dev/null +++ b/tests/monte_carlo_test.rs @@ -0,0 +1,19 @@ +extern crate zombot; +extern crate time; +use time::{PreciseTime, Duration}; + +use zombot::*; + +const STATE_PATH: &str = "tests/state0.json"; + +// there are assertions in the game engine, run when it's in debug mode +#[test] +fn it_does_a_normal_turn_successfully() { + let start_time = PreciseTime::now(); + let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => panic!("Error while parsing JSON file: {}", error) + }; + let max_time = Duration::milliseconds(1950); + strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); +} -- cgit v1.2.3 From 26aefe70fa11f209726e5b8a15bd05303726396e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 18:06:05 +0200 Subject: Set up (failing) property test for working of new game state Unfortunately, for this test to work, I still need to implement the function that reads the game state and goes from one to the other. --- Cargo.toml | 2 + src/bin/perf-test.rs | 2 +- src/engine/bitwise_engine.rs | 28 +- src/input/json.rs | 51 +- src/main.rs | 2 +- src/strategy/monte_carlo.rs | 2 +- tests/bigstate.json | 1498 ----------------------------- tests/expressive_to_bitwise_comparison.rs | 129 +++ tests/live_comparison.rs | 4 +- tests/monte_carlo_test.rs | 2 +- 10 files changed, 200 insertions(+), 1520 deletions(-) delete mode 100644 tests/bigstate.json create mode 100644 tests/expressive_to_bitwise_comparison.rs diff --git a/Cargo.toml b/Cargo.toml index bc49a40..cf325ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,8 @@ rand = "0.4.2" time = "0.1.4" rayon = "1.0.1" +[dev-dependencies] +proptest = "0.7.2" [features] benchmarking = [] diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 054258f..42b4def 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -10,7 +10,7 @@ use std::process; fn main() { let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { + let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { println!("Error while parsing JSON file: {}", error); diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index ca9cf00..bb1dd76 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -14,25 +14,25 @@ const MAX_TESLAS: usize = 2; #[derive(Debug, Clone, PartialEq, Eq)] pub struct BitwiseGameState { - status: GameStatus, - player: Player, - opponent: Player, - player_buildings: PlayerBuildings, - opponent_buildings: PlayerBuildings, + pub status: GameStatus, + pub player: Player, + pub opponent: Player, + pub player_buildings: PlayerBuildings, + pub opponent_buildings: PlayerBuildings, } #[derive(Debug, Clone, PartialEq, Eq)] -struct PlayerBuildings { - unconstructed: Vec, - energy_towers: [u8; MAP_HEIGHT], - missile_towers: [[u8; MAP_HEIGHT]; MISSILE_COOLDOWN], - defence_towers: [[u8; MAP_HEIGHT]; DEFENCE_HEALTH], - tesla_towers: [u8; MAP_HEIGHT], +pub struct PlayerBuildings { + pub unconstructed: Vec, + pub buildings: [u64; DEFENCE_HEALTH], - missiles: [[u16; MAP_HEIGHT]; MAP_WIDTH/4], - tesla_cooldowns: [TeslaCooldown; MAX_TESLAS], + pub energy_towers: u64, + pub missile_towers: [u64; MISSILE_COOLDOWN], + + pub missiles: [(u64, u64); MAP_WIDTH/4], + pub tesla_cooldowns: [TeslaCooldown; MAX_TESLAS], - unoccupied: Vec + pub unoccupied: Vec } #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/src/input/json.rs b/src/input/json.rs index 6f7cda1..fb88bf0 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -5,9 +5,9 @@ use std::error::Error; use engine; use engine::expressive_engine; +use engine::bitwise_engine; - -pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, expressive_engine::ExpressiveGameState), Box> { +pub fn read_expressive_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, expressive_engine::ExpressiveGameState), Box> { let mut file = File::open(filename)?; let mut content = String::new(); file.read_to_string(&mut content)?; @@ -18,6 +18,53 @@ pub fn read_state_from_file(filename: &str) -> Result<(engine::settings::GameSet Ok((engine_settings, engine_state)) } +pub fn read_bitwise_state_from_file(filename: &str) -> Result> { + //TODO + Ok(bitwise_engine::BitwiseGameState { + status: engine::GameStatus::Continue, + player: engine::Player { + energy: 0, health: 0, energy_generated: 0 + }, + opponent: engine::Player { + energy: 0, health: 0, energy_generated: 0 + }, + player_buildings: bitwise_engine::PlayerBuildings { + unconstructed: Vec::new(), + buildings: [0,0,0,0], + energy_towers: 0, + missile_towers: [0,0,0], + missiles: [(0,0),(0,0),(0,0),(0,0)], + tesla_cooldowns: [bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }, bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }], + unoccupied: Vec::new() + }, + opponent_buildings: bitwise_engine::PlayerBuildings { + unconstructed: Vec::new(), + buildings: [0,0,0,0], + energy_towers: 0, + missile_towers: [0,0,0], + missiles: [(0,0),(0,0),(0,0),(0,0)], + tesla_cooldowns: [bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }, bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }], + unoccupied: Vec::new() + } + }) +} + #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct State { diff --git a/src/main.rs b/src/main.rs index 61e2e55..fa9216e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,7 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { fn main() { let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_state_from_file(STATE_PATH) { + let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { println!("Error while parsing JSON file: {}", error); diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index dae74bc..19e663d 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -185,7 +185,7 @@ fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: for b in BuildingType::all().iter() { let building_setting = settings.building_settings(*b); let affordable = building_setting.price <= player.energy; - let is_tesla = b == BuildingType::Tesla; + let is_tesla = *b == BuildingType::Tesla; if affordable && (!is_tesla || !has_max_teslas) { result.push(*b); } diff --git a/tests/bigstate.json b/tests/bigstate.json deleted file mode 100644 index 2ad555f..0000000 --- a/tests/bigstate.json +++ /dev/null @@ -1,1498 +0,0 @@ -{ - "gameDetails": { - "round": 0, - "mapWidth": 20, - "mapHeight": 10, - "roundIncomeEnergy": 5, - "buildingPrices": { - "TESLA": 300, - "ENERGY": 20, - "ATTACK": 30, - "DEFENSE": 30 - }, - "buildingsStats": { - "TESLA": { - "health": 5, - "constructionTime": 11, - "price": 300, - "weaponDamage": 20, - "weaponSpeed": 0, - "weaponCooldownPeriod": 10, - "energyGeneratedPerTurn": 0, - "destroyMultiplier": 1, - "constructionScore": 1 - }, - "ENERGY": { - "health": 5, - "constructionTime": 2, - "price": 20, - "weaponDamage": 0, - "weaponSpeed": 0, - "weaponCooldownPeriod": 0, - "energyGeneratedPerTurn": 3, - "destroyMultiplier": 1, - "constructionScore": 1 - }, - "ATTACK": { - "health": 5, - "constructionTime": 2, - "price": 30, - "weaponDamage": 5, - "weaponSpeed": 1, - "weaponCooldownPeriod": 3, - "energyGeneratedPerTurn": 0, - "destroyMultiplier": 1, - "constructionScore": 1 - }, - "DEFENSE": { - "health": 20, - "constructionTime": 4, - "price": 30, - "weaponDamage": 0, - "weaponSpeed": 0, - "weaponCooldownPeriod": 0, - "energyGeneratedPerTurn": 0, - "destroyMultiplier": 1, - "constructionScore": 1 - } - } - }, - "players": [ - { - "playerType": "A", - "energy": 20, - "health": 100, - "hitsTaken": 0, - "score": 0 - }, - { - "playerType": "B", - "energy": 20, - "health": 100, - "hitsTaken": 0, - "score": 0 - } - ], - "gameMap": [ - [ - { - "x": 0, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 0, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 1, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 2, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 3, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 4, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 5, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 6, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 7, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 8, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ], - [ - { - "x": 0, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 1, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 2, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 3, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 4, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 5, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 6, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 7, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 8, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 9, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "A" - }, - { - "x": 10, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 11, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 12, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 13, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 14, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 15, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 16, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 17, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 18, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - }, - { - "x": 19, - "y": 9, - "buildings": [], - "missiles": [], - "cellOwner": "B" - } - ] - ] -} diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs new file mode 100644 index 0000000..c89c542 --- /dev/null +++ b/tests/expressive_to_bitwise_comparison.rs @@ -0,0 +1,129 @@ +extern crate zombot; + +#[macro_use] extern crate proptest; +extern crate rand; + +use zombot::input; +use zombot::engine::command::{Command, BuildingType}; +use zombot::engine::geometry::Point; +use zombot::engine::settings::GameSettings; +use zombot::engine::{GameState, GameStatus, Player}; + +use zombot::engine::expressive_engine; +use zombot::engine::bitwise_engine; + +use proptest::prelude::*; + +use rand::{Rng, XorShiftRng, SeedableRng}; + + +const STATE_PATH: &str = "tests/state0.json"; + +proptest! { + #[test] + fn follows_the_same_random_game_tree(seed in any::<[u32;4]>()) { + let mut rng = XorShiftRng::from_seed(seed); + + let (settings, mut expressive_state) = input::json::read_expressive_state_from_file(STATE_PATH).expect("Failed to load expressive state"); + let mut bitwise_state = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); + + let mut expected_status = GameStatus::Continue; + while expected_status == GameStatus::Continue { + let player_command = random_player_move(&settings, &expressive_state, &mut rng); + let opponent_command = random_opponent_move(&settings, &expressive_state, &mut rng); + + expected_status = expressive_state.simulate(&settings, player_command, opponent_command); + let actual_status = bitwise_state.simulate(&settings, player_command, opponent_command); + + assert_eq!(&expected_status, &actual_status); + assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.clone()); + } + } +} + + + +fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); + random_move(&state.unoccupied_player_cells(), &all_buildings, rng) +} + +fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); + random_move(&state.unoccupied_opponent_cells(), &all_buildings, rng) +} + +fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { + + let building_command_count = free_positions.len()*all_buildings.len(); + let nothing_count = 1; + + let number_of_commands = building_command_count + nothing_count; + + let choice_index = rng.gen_range(0, number_of_commands); + + if choice_index == number_of_commands - 1 { + Command::Nothing + } else { + Command::Build( + free_positions[choice_index/all_buildings.len()], + all_buildings[choice_index%all_buildings.len()] + ) + } +} + +fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { + let mut result = Vec::with_capacity(4); + for b in BuildingType::all().iter() { + let building_setting = settings.building_settings(*b); + let affordable = building_setting.price <= player.energy; + let is_tesla = *b == BuildingType::Tesla; + if affordable && (!is_tesla || !has_max_teslas) { + result.push(*b); + } + } + result +} + +fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameState) -> bitwise_engine::BitwiseGameState { + //TODO + bitwise_engine::BitwiseGameState { + status: expressive.status, + player: expressive.player.clone(), + opponent: expressive.opponent.clone(), + player_buildings: bitwise_engine::PlayerBuildings { + unconstructed: Vec::new(), + buildings: [0,0,0,0], + energy_towers: 0, + missile_towers: [0,0,0], + missiles: [(0,0),(0,0),(0,0),(0,0)], + tesla_cooldowns: [bitwise_engine::TeslaCooldown { + active: false, + pos: Point::new(0,0), + cooldown: 0 + }, bitwise_engine::TeslaCooldown { + active: false, + pos: Point::new(0,0), + cooldown: 0 + }], + unoccupied: Vec::new() + }, + opponent_buildings: bitwise_engine::PlayerBuildings { + unconstructed: Vec::new(), + buildings: [0,0,0,0], + energy_towers: 0, + missile_towers: [0,0,0], + missiles: [(0,0),(0,0),(0,0),(0,0)], + tesla_cooldowns: [bitwise_engine::TeslaCooldown { + active: false, + pos: Point::new(0,0), + cooldown: 0 + }, bitwise_engine::TeslaCooldown { + active: false, + pos: Point::new(0,0), + cooldown: 0 + }], + unoccupied: Vec::new() + } + } +} diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index 20dbb2f..91d3530 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -20,12 +20,12 @@ fn it_successfully_simulates_replay_with_teslas() { } fn test_from_replay(replay_folder: &str, length: usize) { - let (settings, mut state) = json::read_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); + let (settings, mut state) = json::read_expressive_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_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); + let (_, mut expected_state) = json::read_expressive_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); state.simulate(&settings, player, opponent); state.sort(); diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs index 479b36d..43476fd 100644 --- a/tests/monte_carlo_test.rs +++ b/tests/monte_carlo_test.rs @@ -10,7 +10,7 @@ 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_state_from_file(STATE_PATH) { + let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => panic!("Error while parsing JSON file: {}", error) }; -- cgit v1.2.3 From d23a63288dec711b93dfa6702233c29287918cd9 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 21:07:07 +0200 Subject: Built bitwise game state from current game state --- src/engine/bitwise_engine.rs | 12 +-- src/engine/expressive_engine.rs | 4 +- src/engine/geometry.rs | 28 ++++++ src/engine/mod.rs | 4 +- src/input/json.rs | 10 +- tests/expressive_to_bitwise_comparison.rs | 156 ++++++++++++++++++++++++------ 6 files changed, 167 insertions(+), 47 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index bb1dd76..85c4352 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -27,12 +27,10 @@ pub struct PlayerBuildings { pub buildings: [u64; DEFENCE_HEALTH], pub energy_towers: u64, - pub missile_towers: [u64; MISSILE_COOLDOWN], + pub missile_towers: [u64; MISSILE_COOLDOWN+1], pub missiles: [(u64, u64); MAP_WIDTH/4], - pub tesla_cooldowns: [TeslaCooldown; MAX_TESLAS], - - pub unoccupied: Vec + pub tesla_cooldowns: [TeslaCooldown; MAX_TESLAS] } #[derive(Debug, Clone, PartialEq, Eq)] @@ -50,6 +48,8 @@ pub struct TeslaCooldown { } +const EMPTY: [Point; 0] = []; + impl GameState for BitwiseGameState { fn simulate(&mut self, _settings: &GameSettings, _player_command: Command, _opponent_command: Command) -> GameStatus { //TODO @@ -61,8 +61,8 @@ impl GameState for BitwiseGameState { fn opponent(&self) -> &Player { &self.opponent } fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= MAX_TESLAS } fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= MAX_TESLAS } - fn unoccupied_player_cells(&self) -> &Vec { &self.player_buildings.unoccupied } - fn unoccupied_opponent_cells(&self) -> &Vec { &self.opponent_buildings.unoccupied } + fn unoccupied_player_cells(&self) -> &[Point] { &EMPTY } + fn unoccupied_opponent_cells(&self) -> &[Point] { &EMPTY } } impl PlayerBuildings { diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs index f1255c3..0640d58 100644 --- a/src/engine/expressive_engine.rs +++ b/src/engine/expressive_engine.rs @@ -89,8 +89,8 @@ impl GameState for ExpressiveGameState { fn opponent(&self) -> &Player { &self.opponent } fn player_has_max_teslas(&self) -> bool { self.count_player_teslas() >= 2 } fn opponent_has_max_teslas(&self) -> bool { self.count_opponent_teslas() >= 2 } - fn unoccupied_player_cells(&self) -> &Vec { &self.unoccupied_player_cells } - fn unoccupied_opponent_cells(&self) -> &Vec { &self.unoccupied_opponent_cells } + fn unoccupied_player_cells(&self) -> &[Point] { &self.unoccupied_player_cells } + fn unoccupied_opponent_cells(&self) -> &[Point] { &self.unoccupied_opponent_cells } } impl ExpressiveGameState { diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 44ce9fe..22b56f0 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -31,6 +31,34 @@ impl Point { pub fn wrapping_move_right(&mut self) { self.x = self.x.wrapping_add(1); } + + pub fn to_bitfield(&self, width: u8) -> (u64, u64) { + if self.x >= width { + let index = self.y * width + self.x - width; + (0, 1 << index) + } else { + let index = self.y * width + self.x; + (1 << index, 0) + } + } + + pub fn to_left_bitfield(&self, width: u8) -> u64 { + if self.x >= width { + 0 + } else { + let index = self.y * width + self.x; + 1 << index + } + } + + pub fn to_right_bitfield(&self, width: u8) -> u64 { + if self.x < width { + 0 + } else { + let index = self.y * width + self.x - width; + 1 << index + } + } } use std::cmp::Ord; diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 6e7c5c9..39a5f26 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -15,8 +15,8 @@ pub trait GameState: Clone + Sync { fn opponent(&self) -> &Player; fn player_has_max_teslas(&self) -> bool; fn opponent_has_max_teslas(&self) -> bool; - fn unoccupied_player_cells(&self) -> &Vec; - fn unoccupied_opponent_cells(&self) -> &Vec; + fn unoccupied_player_cells(&self) -> &[Point]; + fn unoccupied_opponent_cells(&self) -> &[Point]; } #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/input/json.rs b/src/input/json.rs index fb88bf0..319c77a 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -32,7 +32,7 @@ pub fn read_bitwise_state_from_file(filename: &str) -> Result Result Result()) { let mut rng = XorShiftRng::from_seed(seed); @@ -86,44 +95,129 @@ fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: } fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameState) -> bitwise_engine::BitwiseGameState { - //TODO + let player_unconstructed = expressive.player_unconstructed_buildings.iter() + .map(build_bitwise_unconstructed_from_expressive) + .collect(); + let opponent_unconstructed = expressive.opponent_unconstructed_buildings.iter() + .map(build_bitwise_unconstructed_from_expressive) + .collect(); + + let player_energy = expressive.player_buildings.iter() + .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); + let opponent_energy = expressive.opponent_buildings.iter() + .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); + + let mut player_buildings_iter = (0..4) + .map(|i| expressive.player_buildings.iter() + .filter(|b| b.health >= i*5) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + ); + let mut opponent_buildings_iter = (0..4) + .map(|i| expressive.opponent_buildings.iter() + .filter(|b| b.health >= i*5) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + ); + + let mut player_attack_iter = (0..4) + .map(|i| expressive.player_buildings.iter() + .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) + .filter(|b| b.weapon_cooldown_time_left == i) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + ); + let mut opponent_attack_iter = (0..4) + .map(|i| expressive.opponent_buildings.iter() + .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) + .filter(|b| b.weapon_cooldown_time_left == i) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + ); + + let empty_missiles: [(u64,u64);4] = [(0,0),(0,0),(0,0),(0,0)]; + let player_missiles = expressive.player_missiles.iter() + .fold(empty_missiles, |acc, m| { + let (mut left, mut right) = m.pos.to_bitfield(8); + let mut res = acc.clone(); + for mut tier in res.iter_mut() { + let setting = (!tier.0 & left, !tier.1 & right); + tier.0 |= setting.0; + tier.1 |= setting.1; + left &= !setting.0; + right &= !setting.1; + } + res + }); + let opponent_missiles = expressive.opponent_missiles.iter() + .fold(empty_missiles, |acc, m| { + let (mut left, mut right) = m.pos.to_bitfield(8); + let mut res = acc.clone(); + for mut tier in res.iter_mut() { + let setting = (!tier.0 & left, !tier.1 & right); + tier.0 |= setting.0; + tier.1 |= setting.1; + left &= !setting.0; + right &= !setting.1; + } + res + }); + + let null_tesla = bitwise_engine::TeslaCooldown { + active: false, + pos: Point::new(0,0), + cooldown: 0 + }; + let mut player_tesla_iter = expressive.player_buildings.iter() + .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Tesla) + .map(|b| bitwise_engine::TeslaCooldown { + active: true, + pos: b.pos, + cooldown: b.weapon_cooldown_time_left + }); + let mut opponent_tesla_iter = expressive.opponent_buildings.iter() + .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Tesla) + .map(|b| bitwise_engine::TeslaCooldown { + active: true, + pos: b.pos, + cooldown: b.weapon_cooldown_time_left + }); bitwise_engine::BitwiseGameState { status: expressive.status, player: expressive.player.clone(), opponent: expressive.opponent.clone(), player_buildings: bitwise_engine::PlayerBuildings { - unconstructed: Vec::new(), - buildings: [0,0,0,0], - energy_towers: 0, - missile_towers: [0,0,0], - missiles: [(0,0),(0,0),(0,0),(0,0)], - tesla_cooldowns: [bitwise_engine::TeslaCooldown { - active: false, - pos: Point::new(0,0), - cooldown: 0 - }, bitwise_engine::TeslaCooldown { - active: false, - pos: Point::new(0,0), - cooldown: 0 - }], - unoccupied: Vec::new() + unconstructed: player_unconstructed, + buildings: [player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap()], + energy_towers: player_energy, + missile_towers: [player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap()], + missiles: player_missiles, + tesla_cooldowns: [player_tesla_iter.next().unwrap_or(null_tesla.clone()), + player_tesla_iter.next().unwrap_or(null_tesla.clone())] }, opponent_buildings: bitwise_engine::PlayerBuildings { - unconstructed: Vec::new(), - buildings: [0,0,0,0], - energy_towers: 0, - missile_towers: [0,0,0], - missiles: [(0,0),(0,0),(0,0),(0,0)], - tesla_cooldowns: [bitwise_engine::TeslaCooldown { - active: false, - pos: Point::new(0,0), - cooldown: 0 - }, bitwise_engine::TeslaCooldown { - active: false, - pos: Point::new(0,0), - cooldown: 0 - }], - unoccupied: Vec::new() + unconstructed: opponent_unconstructed, + buildings: [opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap()], + energy_towers: opponent_energy, + missile_towers: [opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap()], + missiles: opponent_missiles, + tesla_cooldowns: [opponent_tesla_iter.next().unwrap_or(null_tesla.clone()), + opponent_tesla_iter.next().unwrap_or(null_tesla.clone())] } } } + +fn build_bitwise_unconstructed_from_expressive(b: &expressive_engine::UnconstructedBuilding) -> bitwise_engine::UnconstructedBuilding { + bitwise_engine::UnconstructedBuilding { + pos: b.pos, + construction_time_left: b.construction_time_left, + building_type: identify_building_type(b.weapon_damage, b.energy_generated_per_turn) + } +} + +fn identify_building_type(weapon_damage: u8, energy_generated_per_turn: u16) -> BuildingType { + match (weapon_damage, energy_generated_per_turn) { + (5, _) => BuildingType::Attack, + (20, _) => BuildingType::Tesla, + (_, 3) => BuildingType::Energy, + _ => BuildingType::Defence + } +} -- cgit v1.2.3 From 945ae96707f6b4065c89463047979a18ad8181aa Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 21:37:24 +0200 Subject: Started implementation of reading bitwise from json --- src/engine/bitwise_engine.rs | 13 +++ src/input/json.rs | 162 +++++++++++++++++++----------- tests/expressive_to_bitwise_comparison.rs | 15 ++- 3 files changed, 127 insertions(+), 63 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 85c4352..4fad36f 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -65,6 +65,19 @@ impl GameState for BitwiseGameState { fn unoccupied_opponent_cells(&self) -> &[Point] { &EMPTY } } +impl BitwiseGameState { + pub fn new( + player: Player, opponent: Player, + player_buildings: PlayerBuildings, opponent_buildings: PlayerBuildings + ) -> BitwiseGameState { + BitwiseGameState { + status: GameStatus::Continue, + player, opponent, + player_buildings, opponent_buildings + } + } +} + impl PlayerBuildings { pub fn count_teslas(&self) -> usize { self.tesla_cooldowns.iter().filter(|t| t.active).count() diff --git a/src/input/json.rs b/src/input/json.rs index 319c77a..0ed86e7 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -4,6 +4,7 @@ use serde_json; use std::error::Error; use engine; +use engine::command; use engine::expressive_engine; use engine::bitwise_engine; @@ -14,53 +15,18 @@ pub fn read_expressive_state_from_file(filename: &str) -> Result<(engine::settin let state: State = serde_json::from_str(content.as_ref())?; let engine_settings = state.to_engine_settings(); - let engine_state = state.to_engine(&engine_settings); + let engine_state = state.to_expressive_engine(&engine_settings); Ok((engine_settings, engine_state)) } pub fn read_bitwise_state_from_file(filename: &str) -> Result> { - //TODO - Ok(bitwise_engine::BitwiseGameState { - status: engine::GameStatus::Continue, - player: engine::Player { - energy: 0, health: 0, energy_generated: 0 - }, - opponent: engine::Player { - energy: 0, health: 0, energy_generated: 0 - }, - player_buildings: bitwise_engine::PlayerBuildings { - unconstructed: Vec::new(), - buildings: [0,0,0,0], - energy_towers: 0, - missile_towers: [0,0,0,0], - missiles: [(0,0),(0,0),(0,0),(0,0)], - tesla_cooldowns: [bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }, bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }] - }, - opponent_buildings: bitwise_engine::PlayerBuildings { - unconstructed: Vec::new(), - buildings: [0,0,0,0], - energy_towers: 0, - missile_towers: [0,0,0,0], - missiles: [(0,0),(0,0),(0,0),(0,0)], - tesla_cooldowns: [bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }, bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }] - } - }) + let mut file = File::open(filename)?; + let mut content = String::new(); + file.read_to_string(&mut content)?; + let state: State = serde_json::from_str(content.as_ref())?; + + let engine_state = state.to_bitwise_engine(); + Ok(engine_state) } #[derive(Deserialize)] @@ -138,7 +104,7 @@ struct BuildingState { //destroy_multiplier: u32, //construction_score: u32, energy_generated_per_turn: u16, - //building_type: String, + building_type: String, x: u8, y: u8, player_type: char @@ -167,22 +133,63 @@ impl State { ) } - fn to_engine(&self, settings: &engine::settings::GameSettings) -> expressive_engine::ExpressiveGameState { - let player_buildings = self.buildings_to_engine('A'); - let opponent_buildings = self.buildings_to_engine('B'); + fn to_expressive_engine(&self, settings: &engine::settings::GameSettings) -> expressive_engine::ExpressiveGameState { + let player_buildings = self.buildings_to_expressive_engine('A'); + let opponent_buildings = self.buildings_to_expressive_engine('B'); expressive_engine::ExpressiveGameState::new( self.player().to_engine(settings, &player_buildings), self.opponent().to_engine(settings, &opponent_buildings), - self.unconstructed_buildings_to_engine('A'), + self.unconstructed_buildings_to_expressive_engine('A'), player_buildings, - self.unconstructed_buildings_to_engine('B'), + self.unconstructed_buildings_to_expressive_engine('B'), opponent_buildings, - self.missiles_to_engine('A'), - self.missiles_to_engine('B'), + self.missiles_to_expressive_engine('A'), + self.missiles_to_expressive_engine('B'), settings ) } + fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { + let player_buildings = self.buildings_to_expressive_engine('A'); + let opponent_buildings = self.buildings_to_expressive_engine('B'); + bitwise_engine::BitwiseGameState::new( + self.player().to_bitwise_engine(), + self.opponent().to_bitwise_engine(), + bitwise_engine::PlayerBuildings { + unconstructed: self.unconstructed_buildings_to_bitwise_engine('A'), + buildings: [0,0,0,0], + energy_towers: 0, + missile_towers: [0,0,0,0], + missiles: [(0,0),(0,0),(0,0),(0,0)], + tesla_cooldowns: [bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }, bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }] + }, + bitwise_engine::PlayerBuildings { + unconstructed: Vec::new(), + buildings: [0,0,0,0], + energy_towers: 0, + missile_towers: [0,0,0,0], + missiles: [(0,0),(0,0),(0,0),(0,0)], + tesla_cooldowns: [bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }, bitwise_engine::TeslaCooldown { + active: false, + pos: engine::geometry::Point::new(0,0), + cooldown: 0 + }] + } + ) + } + fn player(&self) -> &Player { self.players.iter() .find(|p| p.player_type == 'A') @@ -195,34 +202,45 @@ impl State { .expect("Opponent character did not appear in state.json") } - fn unconstructed_buildings_to_engine(&self, player_type: char) -> Vec { + fn unconstructed_buildings_to_expressive_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) - .map(|b| b.to_engine_unconstructed()) + .map(|b| b.to_expressive_engine_unconstructed()) + ) + ) + .collect() + } + + fn unconstructed_buildings_to_bitwise_engine(&self, player_type: char) -> Vec { + self.game_map.iter() + .flat_map(|row| row.iter() + .flat_map(|cell| cell.buildings.iter() + .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) + .map(|b| b.to_bitwise_engine_unconstructed()) ) ) .collect() } - fn buildings_to_engine(&self, player_type: char) -> Vec { + fn buildings_to_expressive_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.buildings.iter() .filter(|b| b.player_type == player_type && b.construction_time_left < 0) - .map(|b| b.to_engine()) + .map(|b| b.to_expressive_engine()) ) ) .collect() } - fn missiles_to_engine(&self, player_type: char) -> Vec { + fn missiles_to_expressive_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() .flat_map(|cell| cell.missiles.iter() .filter(|b| b.player_type == player_type) - .map(|b| b.to_engine()) + .map(|b| b.to_expressive_engine()) ) ) .collect() @@ -251,10 +269,17 @@ impl Player { energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() } } + fn to_bitwise_engine(&self) -> engine::Player { + engine::Player { + energy: self.energy, + health: self.health, + energy_generated: 5 + } + } } impl BuildingState { - fn to_engine(&self) -> expressive_engine::Building { + fn to_expressive_engine(&self) -> expressive_engine::Building { expressive_engine::Building { pos: engine::geometry::Point::new(self.x, self.y), health: self.health, @@ -266,7 +291,7 @@ impl BuildingState { } } - fn to_engine_unconstructed(&self) -> expressive_engine::UnconstructedBuilding { + fn to_expressive_engine_unconstructed(&self) -> expressive_engine::UnconstructedBuilding { expressive_engine::UnconstructedBuilding { pos: engine::geometry::Point::new(self.x, self.y), health: self.health, @@ -277,10 +302,27 @@ impl BuildingState { energy_generated_per_turn: self.energy_generated_per_turn, } } + + fn to_bitwise_engine_unconstructed(&self) -> bitwise_engine::UnconstructedBuilding { + bitwise_engine::UnconstructedBuilding { + pos: engine::geometry::Point::new(self.x, self.y), + construction_time_left: self.construction_time_left as u8, // > 0 check already happened + building_type: self.convert_building_type() + } + } + + fn convert_building_type(&self) -> command::BuildingType { + match self.building_type.as_ref() { + "ATTACK" => command::BuildingType::Attack, + "ENERGY" => command::BuildingType::Energy, + "TESLA" => command::BuildingType::Tesla, + _ => command::BuildingType::Defence, + } + } } impl MissileState { - fn to_engine(&self) -> expressive_engine::Missile { + fn to_expressive_engine(&self) -> expressive_engine::Missile { expressive_engine::Missile { pos: engine::geometry::Point::new(self.x, self.y), damage: self.damage, diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 1dbbd74..e534fca 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -21,12 +21,21 @@ const STATE_PATH: &str = "tests/state0.json"; #[test] fn reads_into_bitwise_correctly() { - let (_, expressive_state) = input::json::read_expressive_state_from_file(STATE_PATH).expect("Failed to load expressive state"); - let bitwise_state = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); + test_reading_from_replay("tests/after_200", 64); +} + +fn test_reading_from_replay(replay_folder: &str, length: usize) { + for i in 0..length { + let state_file = format!("{}/Round {:03}/state.json", replay_folder, i); + + let (_, expressive_state) = input::json::read_expressive_state_from_file(&state_file).expect("Failed to load expressive state"); + let bitwise_state = input::json::read_bitwise_state_from_file(&state_file).expect("Failed to load bitwise state"); - assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.clone()); + assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.clone(), "\nFailed on state {}\n", i); + } } + proptest! { #[test] #[ignore] -- cgit v1.2.3 From c4fe897b41f90a53e0629e2444d3e7f2121cddde Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 22:24:49 +0200 Subject: JSON parsing of bitwise buildings --- src/engine/bitwise_engine.rs | 23 +++++++- src/input/json.rs | 97 +++++++++++++++++++------------ tests/expressive_to_bitwise_comparison.rs | 10 ++-- 3 files changed, 86 insertions(+), 44 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 4fad36f..04e4f85 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -40,7 +40,7 @@ pub struct UnconstructedBuilding { pub building_type: BuildingType } -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct TeslaCooldown { pub active: bool, pub pos: Point, @@ -82,4 +82,25 @@ impl PlayerBuildings { pub fn count_teslas(&self) -> usize { self.tesla_cooldowns.iter().filter(|t| t.active).count() } + + pub fn empty() -> PlayerBuildings { + PlayerBuildings { + unconstructed: Vec::with_capacity(4), + buildings: [0; 4], + energy_towers: 0, + missile_towers: [0; 4], + missiles: [(0,0); 4], + tesla_cooldowns: [TeslaCooldown::empty(); 2] + } + } +} + +impl TeslaCooldown { + pub fn empty() -> TeslaCooldown { + TeslaCooldown { + active: false, + pos: Point::new(0,0), + cooldown: 0 + } + } } diff --git a/src/input/json.rs b/src/input/json.rs index 0ed86e7..0c0ed48 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -84,8 +84,8 @@ struct Player { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct GameCell { - //x: u8, - //y: u8, + x: u8, + y: u8, buildings: Vec, missiles: Vec, //cell_owner: char @@ -150,43 +150,64 @@ impl State { } fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { - let player_buildings = self.buildings_to_expressive_engine('A'); - let opponent_buildings = self.buildings_to_expressive_engine('B'); - bitwise_engine::BitwiseGameState::new( - self.player().to_bitwise_engine(), - self.opponent().to_bitwise_engine(), - bitwise_engine::PlayerBuildings { - unconstructed: self.unconstructed_buildings_to_bitwise_engine('A'), - buildings: [0,0,0,0], - energy_towers: 0, - missile_towers: [0,0,0,0], - missiles: [(0,0),(0,0),(0,0),(0,0)], - tesla_cooldowns: [bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }, bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }] - }, - bitwise_engine::PlayerBuildings { - unconstructed: Vec::new(), - buildings: [0,0,0,0], - energy_towers: 0, - missile_towers: [0,0,0,0], - missiles: [(0,0),(0,0),(0,0),(0,0)], - tesla_cooldowns: [bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }, bitwise_engine::TeslaCooldown { - active: false, - pos: engine::geometry::Point::new(0,0), - cooldown: 0 - }] + let mut player = self.player().to_bitwise_engine(); + let mut opponent = self.opponent().to_bitwise_engine(); + let mut player_buildings = bitwise_engine::PlayerBuildings::empty(); + let mut opponent_buildings = bitwise_engine::PlayerBuildings::empty(); + for row in &self.game_map { + for cell in row { + let point = engine::geometry::Point::new(cell.x, cell.y); + for building in &cell.buildings { + let building_type = building.convert_building_type(); + + let (mut engine_player, mut bitwise_buildings, bitfield) = if building.player_type == 'A' { + (&mut player, &mut player_buildings, point.to_left_bitfield(8)) + } else { + (&mut opponent, &mut opponent_buildings, point.to_right_bitfield(8)) + }; + + if building.construction_time_left >= 0 { + bitwise_buildings.unconstructed.push(building.to_bitwise_engine_unconstructed()); + } else { + for health_tier in 0..4 { + if building.health > health_tier*5 { + bitwise_buildings.buildings[health_tier as usize] |= bitfield; + } + } + if building_type == command::BuildingType::Energy { + bitwise_buildings.energy_towers |= bitfield; + engine_player.energy_generated += building.energy_generated_per_turn; + } + if building_type == command::BuildingType::Attack { + for cooldown_tier in 0..4 { + if building.weapon_cooldown_time_left == cooldown_tier { + bitwise_buildings.missile_towers[cooldown_tier as usize] |= bitfield; + } + } + } + if building_type == command::BuildingType::Tesla { + let ref mut tesla_cooldown = if bitwise_buildings.tesla_cooldowns[0].active { + bitwise_buildings.tesla_cooldowns[1] + } else { + bitwise_buildings.tesla_cooldowns[0] + }; + tesla_cooldown.active = true; + tesla_cooldown.pos = point; + tesla_cooldown.cooldown = building.weapon_cooldown_time_left; + } + } + } + for missile in &cell.missiles { + if missile.player_type == 'A' { + } else { + } + } } + } + + bitwise_engine::BitwiseGameState::new( + player, opponent, + player_buildings, opponent_buildings ) } diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index e534fca..9ce5288 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -116,17 +116,17 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); let opponent_energy = expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); + .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)); let mut player_buildings_iter = (0..4) .map(|i| expressive.player_buildings.iter() - .filter(|b| b.health >= i*5) + .filter(|b| b.health > i*5) .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) ); let mut opponent_buildings_iter = (0..4) .map(|i| expressive.opponent_buildings.iter() - .filter(|b| b.health >= i*5) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + .filter(|b| b.health > i*5) + .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) ); let mut player_attack_iter = (0..4) @@ -139,7 +139,7 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS .map(|i| expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) ); let empty_missiles: [(u64,u64);4] = [(0,0),(0,0),(0,0),(0,0)]; -- cgit v1.2.3 From 709bd0b9be0eeed4ad204c121fcadef505d5336d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 22:28:14 +0200 Subject: Read missiles from the json into bitfields --- src/input/json.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/input/json.rs b/src/input/json.rs index 0c0ed48..b509926 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -198,8 +198,19 @@ impl State { } } for missile in &cell.missiles { - if missile.player_type == 'A' { + let mut bitwise_buildings = if missile.player_type == 'A' { + &mut player_buildings } else { + &mut opponent_buildings + }; + let (mut left, mut right) = point.to_bitfield(8); + + for mut tier in bitwise_buildings.missiles.iter_mut() { + let setting = (!tier.0 & left, !tier.1 & right); + tier.0 |= setting.0; + tier.1 |= setting.1; + left &= !setting.0; + right &= !setting.1; } } } -- cgit v1.2.3 From 99378ed484b04c710e0307db93ada65b29d93bae Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 22:39:44 +0200 Subject: Started filling in bitwise simulation logic --- src/engine/bitwise_engine.rs | 31 ++++++++++++++++++++++++++++--- src/input/json.rs | 13 +------------ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 04e4f85..7e02cde 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -4,7 +4,6 @@ use engine::settings::{GameSettings}; use engine::{GameStatus, Player, GameState}; const MAP_WIDTH: usize = 16; -const MAP_HEIGHT: usize = 8; const MISSILE_COOLDOWN: usize = 3; @@ -51,8 +50,17 @@ pub struct TeslaCooldown { const EMPTY: [Point; 0] = []; impl GameState for BitwiseGameState { - fn simulate(&mut self, _settings: &GameSettings, _player_command: Command, _opponent_command: Command) -> GameStatus { - //TODO + fn simulate(&mut self, settings: &GameSettings, _player_command: Command, _opponent_command: Command) -> GameStatus { + //TODO: Commands + //TODO: Make buildings out of under construction buildings + //TODO: Fire the TESLAS! + //TODO: Put missiles on the map + //TODO: Move and collide missiles + + BitwiseGameState::add_energy(settings, &mut self.player, &mut self.player_buildings); + BitwiseGameState::add_energy(settings, &mut self.opponent, &mut self.opponent_buildings); + + self.update_status(); self.status } @@ -76,6 +84,23 @@ impl BitwiseGameState { player_buildings, opponent_buildings } } + + fn add_energy(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings) { + player.energy_generated = player_buildings.energy_towers.count_ones() as u16 * settings.energy.energy_generated_per_turn; + player.energy += player.energy_generated; + } + + fn update_status(&mut self) { + let player_dead = self.player.health == 0; + let opponent_dead = self.opponent.health == 0; + self.status = match (player_dead, opponent_dead) { + (true, true) => GameStatus::Draw, + (false, true) => GameStatus::PlayerWon, + (true, false) => GameStatus::OpponentWon, + (false, false) => GameStatus::Continue, + }; + } + } impl PlayerBuildings { diff --git a/src/input/json.rs b/src/input/json.rs index b509926..13f0b5e 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -244,18 +244,7 @@ impl State { ) .collect() } - - fn unconstructed_buildings_to_bitwise_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) - .map(|b| b.to_bitwise_engine_unconstructed()) - ) - ) - .collect() - } - + fn buildings_to_expressive_engine(&self, player_type: char) -> Vec { self.game_map.iter() .flat_map(|row| row.iter() -- cgit v1.2.3 From 8dd9517ae4b925fba5b825da04254412e039fa0c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 1 Jul 2018 23:58:52 +0200 Subject: Continued filling in bitwise game engine --- src/engine/bitwise_engine.rs | 156 ++++++++++++++++++++++++++++-- src/engine/geometry.rs | 10 ++ src/input/json.rs | 3 +- tests/expressive_to_bitwise_comparison.rs | 11 +++ 4 files changed, 173 insertions(+), 7 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 7e02cde..d8e7868 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -24,6 +24,7 @@ pub struct BitwiseGameState { pub struct PlayerBuildings { pub unconstructed: Vec, pub buildings: [u64; DEFENCE_HEALTH], + pub occupied: u64, pub energy_towers: u64, pub missile_towers: [u64; MISSILE_COOLDOWN+1], @@ -50,11 +51,16 @@ pub struct TeslaCooldown { const EMPTY: [Point; 0] = []; impl GameState for BitwiseGameState { - fn simulate(&mut self, settings: &GameSettings, _player_command: Command, _opponent_command: Command) -> GameStatus { - //TODO: Commands - //TODO: Make buildings out of under construction buildings + fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { + BitwiseGameState::perform_command(settings, &mut self.player, &mut self.player_buildings, player_command); BitwiseGameState::perform_command(settings, &mut self.opponent, &mut self.opponent_buildings, opponent_command); + + BitwiseGameState::update_construction(settings, &mut self.player_buildings); + BitwiseGameState::update_construction(settings, &mut self.opponent_buildings); + //TODO: Fire the TESLAS! - //TODO: Put missiles on the map + + BitwiseGameState::add_left_missiles(&mut self.player_buildings); + BitwiseGameState::add_right_missiles(&mut self.opponent_buildings); //TODO: Move and collide missiles BitwiseGameState::add_energy(settings, &mut self.player, &mut self.player_buildings); @@ -69,8 +75,8 @@ impl GameState for BitwiseGameState { fn opponent(&self) -> &Player { &self.opponent } fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= MAX_TESLAS } fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= MAX_TESLAS } - fn unoccupied_player_cells(&self) -> &[Point] { &EMPTY } - fn unoccupied_opponent_cells(&self) -> &[Point] { &EMPTY } + fn unoccupied_player_cells(&self) -> &[Point] { &EMPTY } //TODO + fn unoccupied_opponent_cells(&self) -> &[Point] { &EMPTY } //TODO } impl BitwiseGameState { @@ -85,6 +91,143 @@ impl BitwiseGameState { } } + fn perform_command(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings, command: Command) { + match command { + Command::Nothing => {}, + Command::Build(p, b) => { + let blueprint = settings.building_settings(b); + let bitfield = p.to_either_bitfield(settings.size.x); + + // This is used internally. I should not be making + // invalid moves! + debug_assert!(player_buildings.buildings[0] & bitfield == 0); + debug_assert!(p.x < settings.size.x && p.y < settings.size.y); + debug_assert!(player.energy >= blueprint.price); + debug_assert!(b != BuildingType::Tesla || + player_buildings.count_teslas() < MAX_TESLAS); + + player.energy -= blueprint.price; + player_buildings.unconstructed.push(UnconstructedBuilding { + pos: p, + construction_time_left: blueprint.construction_time, + building_type: b + }); + player_buildings.occupied |= bitfield; + }, + Command::Deconstruct(p) => { + let unconstructed_to_remove_index = player_buildings.unconstructed.iter().position(|ref b| b.pos == p); + let deconstruct_mask = !(p.to_either_bitfield(settings.size.x) & player_buildings.buildings[0]); + + debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); + + if let Some(i) = unconstructed_to_remove_index { + player_buildings.unconstructed.swap_remove(i); + } + + player.energy += 5; + + for tier in 0..player_buildings.buildings.len() { + player_buildings.buildings[tier] &= deconstruct_mask; + } + player_buildings.energy_towers &= deconstruct_mask; + for tier in 0..player_buildings.missile_towers.len() { + player_buildings.missile_towers[tier] &= deconstruct_mask; + } + for tesla in 0..player_buildings.tesla_cooldowns.len() { + if player_buildings.tesla_cooldowns[tesla].pos == p { + player_buildings.tesla_cooldowns[tesla].active = false; + } + } + player_buildings.occupied &= deconstruct_mask; + } + } + } + + fn update_construction(settings: &GameSettings, player_buildings: &mut PlayerBuildings) { + let mut buildings_len = player_buildings.unconstructed.len(); + for i in (0..buildings_len).rev() { + if player_buildings.unconstructed[i].construction_time_left == 0 { + let building_type = player_buildings.unconstructed[i].building_type; + let blueprint = settings.building_settings(building_type); + let pos = player_buildings.unconstructed[i].pos; + let bitfield = pos.to_either_bitfield(settings.size.x); + + for health_tier in 0..4 { + if blueprint.health > health_tier*5 { + player_buildings.buildings[health_tier as usize] |= bitfield; + } + } + if building_type == BuildingType::Energy { + player_buildings.energy_towers |= bitfield; + } + if building_type == BuildingType::Attack { + player_buildings.missile_towers[0] |= bitfield; + } + if building_type == BuildingType::Tesla { + let ref mut tesla_cooldown = if player_buildings.tesla_cooldowns[0].active { + player_buildings.tesla_cooldowns[1] + } else { + player_buildings.tesla_cooldowns[0] + }; + tesla_cooldown.active = true; + tesla_cooldown.pos = pos; + tesla_cooldown.cooldown = 0; + } + + buildings_len -= 1; + player_buildings.unconstructed.swap(i, buildings_len); + } else { + player_buildings.unconstructed[i].construction_time_left -= 1 + } + } + player_buildings.unconstructed.truncate(buildings_len); + } + + + fn add_left_missiles(player_buildings: &mut PlayerBuildings) { + let mut missiles = player_buildings.missile_towers[0]; + for mut tier in player_buildings.missiles.iter_mut() { + let setting = !tier.0 & missiles; + tier.0 |= setting; + missiles &= !setting; + } + + BitwiseGameState::rotate_missile_towers(player_buildings); + } + + fn add_right_missiles(player_buildings: &mut PlayerBuildings) { + let mut missiles = player_buildings.missile_towers[0]; + for mut tier in player_buildings.missiles.iter_mut() { + let setting = !tier.1 & missiles; + tier.1 |= setting; + missiles &= !setting; + } + + BitwiseGameState::rotate_missile_towers(player_buildings); + } + + fn rotate_missile_towers(player_buildings: &mut PlayerBuildings) { + let zero = player_buildings.missile_towers[0]; + for i in 1..player_buildings.missile_towers.len() { + player_buildings.missile_towers[i-1] = player_buildings.missile_towers[i]; + } + let end = player_buildings.missile_towers.len()-1; + player_buildings.missile_towers[end] = zero; + } + + + fn move_and_collide_missiles_left(settings: &GameSettings, player_buildings: &mut PlayerBuildings, opponent: &mut Player) { + for _ in 0..settings.attack.weapon_speed { + for i in 0..player_buildings.missiles.len() { + //TODO this isn't so simple... + //collide some with the player, others jump the boundary + player_buildings.missiles[i].0 = player_buildings.missiles[i].0 << 1; + //TODO Collide with buildings + } + } + } + + fn add_energy(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings) { player.energy_generated = player_buildings.energy_towers.count_ones() as u16 * settings.energy.energy_generated_per_turn; player.energy += player.energy_generated; @@ -112,6 +255,7 @@ impl PlayerBuildings { PlayerBuildings { unconstructed: Vec::with_capacity(4), buildings: [0; 4], + occupied: 0, energy_towers: 0, missile_towers: [0; 4], missiles: [(0,0); 4], diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 22b56f0..02fe44b 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -59,6 +59,16 @@ impl Point { 1 << index } } + + pub fn to_either_bitfield(&self, width: u8) -> u64 { + if self.x >= width { + let index = self.y * width + self.x - width; + 1 << index + } else { + let index = self.y * width + self.x; + 1 << index + } + } } use std::cmp::Ord; diff --git a/src/input/json.rs b/src/input/json.rs index 13f0b5e..bebb5be 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -165,7 +165,8 @@ impl State { } else { (&mut opponent, &mut opponent_buildings, point.to_right_bitfield(8)) }; - + + bitwise_buildings.occupied |= bitfield; if building.construction_time_left >= 0 { bitwise_buildings.unconstructed.push(building.to_bitwise_engine_unconstructed()); } else { diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 9ce5288..40181b2 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -129,6 +129,15 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) ); + let player_occupied = expressive.player_buildings.iter() + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) | + expressive.player_unconstructed_buildings.iter() + .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); + let opponent_occupied = expressive.opponent_buildings.iter() + .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) | + expressive.opponent_unconstructed_buildings.iter() + .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)); + let mut player_attack_iter = (0..4) .map(|i| expressive.player_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) @@ -196,6 +205,7 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS player_buildings: bitwise_engine::PlayerBuildings { unconstructed: player_unconstructed, buildings: [player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap()], + occupied: player_occupied, energy_towers: player_energy, missile_towers: [player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap()], missiles: player_missiles, @@ -205,6 +215,7 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS opponent_buildings: bitwise_engine::PlayerBuildings { unconstructed: opponent_unconstructed, buildings: [opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap()], + occupied: opponent_occupied, energy_towers: opponent_energy, missile_towers: [opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap()], missiles: opponent_missiles, -- cgit v1.2.3 From 8251d5899a64515c9b2e8a71349dd4d2fcece69e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 2 Jul 2018 21:29:52 +0200 Subject: Game engine working, except for teslas and choosing a move --- src/engine/bitwise_engine.rs | 125 ++++++++++++++++++++++++++---- tests/expressive_to_bitwise_comparison.rs | 11 ++- 2 files changed, 117 insertions(+), 19 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index d8e7868..e3ca4c6 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -3,7 +3,9 @@ use engine::geometry::Point; use engine::settings::{GameSettings}; use engine::{GameStatus, Player, GameState}; -const MAP_WIDTH: usize = 16; +const FULL_MAP_WIDTH: u8 = 16; +const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; +const MAX_CONCURRENT_MISSILES: usize = SINGLE_MAP_WIDTH as usize / 2; const MISSILE_COOLDOWN: usize = 3; @@ -11,6 +13,9 @@ const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits const MAX_TESLAS: usize = 2; +const LEFT_COL_MASK: u64 = 0x0101010101010101; +const RIGHT_COL_MASK: u64 = 0x8080808080808080; + #[derive(Debug, Clone, PartialEq, Eq)] pub struct BitwiseGameState { pub status: GameStatus, @@ -29,7 +34,7 @@ pub struct PlayerBuildings { pub energy_towers: u64, pub missile_towers: [u64; MISSILE_COOLDOWN+1], - pub missiles: [(u64, u64); MAP_WIDTH/4], + pub missiles: [(u64, u64); MAX_CONCURRENT_MISSILES], pub tesla_cooldowns: [TeslaCooldown; MAX_TESLAS] } @@ -61,7 +66,9 @@ impl GameState for BitwiseGameState { BitwiseGameState::add_left_missiles(&mut self.player_buildings); BitwiseGameState::add_right_missiles(&mut self.opponent_buildings); - //TODO: Move and collide missiles + + BitwiseGameState::move_left_and_collide_missiles(settings, &mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); + BitwiseGameState::move_right_and_collide_missiles(settings, &mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); BitwiseGameState::add_energy(settings, &mut self.player, &mut self.player_buildings); BitwiseGameState::add_energy(settings, &mut self.opponent, &mut self.opponent_buildings); @@ -91,12 +98,45 @@ impl BitwiseGameState { } } + /** + * Like with the expressive, this is to make things more + * comparable when writing tests, not for actual use in the + * engine. + */ + pub fn sort(&mut self) { + for i in 0..MAX_CONCURRENT_MISSILES { + for j in i+1..MAX_CONCURRENT_MISSILES { + let move_down1 = !self.player_buildings.missiles[i].0 & self.player_buildings.missiles[j].0; + self.player_buildings.missiles[i].0 |= move_down1; + self.player_buildings.missiles[j].0 &= !move_down1; + + let move_down2 = !self.player_buildings.missiles[i].1 & self.player_buildings.missiles[j].1; + self.player_buildings.missiles[i].1 |= move_down2; + self.player_buildings.missiles[j].1 &= !move_down2; + + let move_down3 = !self.opponent_buildings.missiles[i].0 & self.opponent_buildings.missiles[j].0; + self.opponent_buildings.missiles[i].0 |= move_down3; + self.opponent_buildings.missiles[j].0 &= !move_down3; + + let move_down4 = !self.opponent_buildings.missiles[i].1 & self.opponent_buildings.missiles[j].1; + self.opponent_buildings.missiles[i].1 |= move_down4; + self.opponent_buildings.missiles[j].1 &= !move_down4; + } + } + } + + pub fn sorted(&self) -> BitwiseGameState { + let mut res = self.clone(); + res.sort(); + res + } + fn perform_command(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings, command: Command) { match command { Command::Nothing => {}, Command::Build(p, b) => { let blueprint = settings.building_settings(b); - let bitfield = p.to_either_bitfield(settings.size.x); + let bitfield = p.to_either_bitfield(SINGLE_MAP_WIDTH); // This is used internally. I should not be making // invalid moves! @@ -116,7 +156,7 @@ impl BitwiseGameState { }, Command::Deconstruct(p) => { let unconstructed_to_remove_index = player_buildings.unconstructed.iter().position(|ref b| b.pos == p); - let deconstruct_mask = !(p.to_either_bitfield(settings.size.x) & player_buildings.buildings[0]); + let deconstruct_mask = !(p.to_either_bitfield(SINGLE_MAP_WIDTH) & player_buildings.buildings[0]); debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); @@ -150,7 +190,7 @@ impl BitwiseGameState { let building_type = player_buildings.unconstructed[i].building_type; let blueprint = settings.building_settings(building_type); let pos = player_buildings.unconstructed[i].pos; - let bitfield = pos.to_either_bitfield(settings.size.x); + let bitfield = pos.to_either_bitfield(SINGLE_MAP_WIDTH); for health_tier in 0..4 { if blueprint.health > health_tier*5 { @@ -216,20 +256,79 @@ impl BitwiseGameState { } - fn move_and_collide_missiles_left(settings: &GameSettings, player_buildings: &mut PlayerBuildings, opponent: &mut Player) { + fn move_left_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MAX_CONCURRENT_MISSILES]) { + for _ in 0..settings.attack.weapon_speed { + for i in 0..player_missiles.len() { + let about_to_hit_opponent = player_missiles[i].0 & LEFT_COL_MASK; + let damage = about_to_hit_opponent.count_ones() as u8 * settings.attack.weapon_damage; + opponent.health = opponent.health.saturating_sub(damage); + player_missiles[i].0 = (player_missiles[i].0 & !LEFT_COL_MASK) >> 1; + + let swapping_sides = player_missiles[i].1 & LEFT_COL_MASK; + player_missiles[i].0 |= swapping_sides << 7; + player_missiles[i].1 = (player_missiles[i].1 & !LEFT_COL_MASK) >> 1; + + + let mut hits = 0; + for health_tier in (0..DEFENCE_HEALTH).rev() { + hits = opponent_buildings.buildings[health_tier] & player_missiles[i].0; + player_missiles[i].0 &= !hits; + opponent_buildings.buildings[health_tier] &= !hits; + } + + let deconstruct_mask = !hits; + opponent_buildings.energy_towers &= deconstruct_mask; + for tier in 0..opponent_buildings.missile_towers.len() { + opponent_buildings.missile_towers[tier] &= deconstruct_mask; + } + for tesla in 0..opponent_buildings.tesla_cooldowns.len() { + if opponent_buildings.tesla_cooldowns[tesla].pos.to_either_bitfield(SINGLE_MAP_WIDTH) & deconstruct_mask == 0 { + opponent_buildings.tesla_cooldowns[tesla].active = false; + } + } + opponent_buildings.occupied &= deconstruct_mask; + } + } + } + + fn move_right_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MAX_CONCURRENT_MISSILES]) { for _ in 0..settings.attack.weapon_speed { - for i in 0..player_buildings.missiles.len() { - //TODO this isn't so simple... - //collide some with the player, others jump the boundary - player_buildings.missiles[i].0 = player_buildings.missiles[i].0 << 1; - //TODO Collide with buildings + for i in 0..player_missiles.len() { + let about_to_hit_opponent = player_missiles[i].1 & RIGHT_COL_MASK; + let damage = about_to_hit_opponent.count_ones() as u8 * settings.attack.weapon_damage; + opponent.health = opponent.health.saturating_sub(damage); + player_missiles[i].1 = (player_missiles[i].1 & !RIGHT_COL_MASK) << 1; + + let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; + player_missiles[i].1 |= swapping_sides >> 7; + player_missiles[i].0 = (player_missiles[i].0 & !RIGHT_COL_MASK) << 1; + + + let mut hits = 0; + for health_tier in (0..DEFENCE_HEALTH).rev() { + hits = opponent_buildings.buildings[health_tier] & player_missiles[i].1; + player_missiles[i].1 &= !hits; + opponent_buildings.buildings[health_tier] &= !hits; + } + + let deconstruct_mask = !hits; + opponent_buildings.energy_towers &= deconstruct_mask; + for tier in 0..opponent_buildings.missile_towers.len() { + opponent_buildings.missile_towers[tier] &= deconstruct_mask; + } + for tesla in 0..opponent_buildings.tesla_cooldowns.len() { + if opponent_buildings.tesla_cooldowns[tesla].pos.to_either_bitfield(SINGLE_MAP_WIDTH) & deconstruct_mask == 0 { + opponent_buildings.tesla_cooldowns[tesla].active = false; + } + } + opponent_buildings.occupied &= deconstruct_mask; } } } fn add_energy(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings) { - player.energy_generated = player_buildings.energy_towers.count_ones() as u16 * settings.energy.energy_generated_per_turn; + player.energy_generated = settings.energy_income + player_buildings.energy_towers.count_ones() as u16 * settings.energy.energy_generated_per_turn; player.energy += player.energy_generated; } diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 40181b2..cb57e3b 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -38,7 +38,6 @@ fn test_reading_from_replay(replay_folder: &str, length: usize) { proptest! { #[test] - #[ignore] fn follows_the_same_random_game_tree(seed in any::<[u32;4]>()) { let mut rng = XorShiftRng::from_seed(seed); @@ -49,25 +48,25 @@ proptest! { while expected_status == GameStatus::Continue { let player_command = random_player_move(&settings, &expressive_state, &mut rng); let opponent_command = random_opponent_move(&settings, &expressive_state, &mut rng); + println!("Player command: {}", player_command); + println!("Opponent command: {}", opponent_command); expected_status = expressive_state.simulate(&settings, player_command, opponent_command); let actual_status = bitwise_state.simulate(&settings, player_command, opponent_command); assert_eq!(&expected_status, &actual_status); - assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.clone()); + assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.sorted()); } } } - - fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); + let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()||true); random_move(&state.unoccupied_player_cells(), &all_buildings, rng) } fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); + let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()||true); random_move(&state.unoccupied_opponent_cells(), &all_buildings, rng) } -- cgit v1.2.3 From 8e44d57fdb1c7be69501ebdfc5f9f5d48642b065 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 2 Jul 2018 22:08:51 +0200 Subject: Initial drop in replacement implementation It's faster than the other one! Doesn't tesla yet, but still! Yay! --- src/bin/perf-test.rs | 20 ++++++++++++++++++++ src/engine/bitwise_engine.rs | 31 +++++++++++++++++++++++++++---- src/engine/expressive_engine.rs | 7 +++++-- src/engine/mod.rs | 7 +++++-- src/input/json.rs | 5 +++-- src/strategy/monte_carlo.rs | 17 +++++++++-------- tests/expressive_to_bitwise_comparison.rs | 19 +++++++++---------- 7 files changed, 78 insertions(+), 28 deletions(-) diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 42b4def..81dc5a5 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -9,6 +9,12 @@ const STATE_PATH: &str = "tests/state0.json"; use std::process; fn main() { +// expressive(); + bitwise(); +} + +fn expressive() { + println!("Running expressive engine"); let start_time = PreciseTime::now(); let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { Ok(ok) => ok, @@ -20,3 +26,17 @@ fn main() { let max_time = Duration::milliseconds(1950); strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); } + +fn bitwise() { + println!("Running bitwise engine"); + let start_time = PreciseTime::now(); + let (settings, state) = match input::json::read_bitwise_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => { + println!("Error while parsing JSON file: {}", error); + process::exit(1); + } + }; + let max_time = Duration::milliseconds(1950); + strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); +} diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index e3ca4c6..31040bf 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -53,8 +53,6 @@ pub struct TeslaCooldown { } -const EMPTY: [Point; 0] = []; - impl GameState for BitwiseGameState { fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { BitwiseGameState::perform_command(settings, &mut self.player, &mut self.player_buildings, player_command); BitwiseGameState::perform_command(settings, &mut self.opponent, &mut self.opponent_buildings, opponent_command); @@ -82,8 +80,33 @@ impl GameState for BitwiseGameState { fn opponent(&self) -> &Player { &self.opponent } fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= MAX_TESLAS } fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= MAX_TESLAS } - fn unoccupied_player_cells(&self) -> &[Point] { &EMPTY } //TODO - fn unoccupied_opponent_cells(&self) -> &[Point] { &EMPTY } //TODO + + fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } + fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } + fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { + let mut current = 0; + for bit in 0..64 { + let is_free = (1 << bit) & self.player_buildings.occupied == 0; + if is_free && current == i{ + return Point::new(bit%SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); + } else if is_free { + current += 1; + } + } + panic!("Didn't find indicated free bit for player"); + } + fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { + let mut current = 0; + for bit in 0..64 { + let is_free = (1 << bit) & self.opponent_buildings.occupied == 0; + if is_free && current == i{ + return Point::new((bit%SINGLE_MAP_WIDTH) + SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); + } else if is_free { + current += 1; + } + } + panic!("Didn't find indicated free bit for opponent"); + } } impl BitwiseGameState { diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs index 0640d58..b7d7bf2 100644 --- a/src/engine/expressive_engine.rs +++ b/src/engine/expressive_engine.rs @@ -89,8 +89,11 @@ impl GameState for ExpressiveGameState { fn opponent(&self) -> &Player { &self.opponent } fn player_has_max_teslas(&self) -> bool { self.count_player_teslas() >= 2 } fn opponent_has_max_teslas(&self) -> bool { self.count_opponent_teslas() >= 2 } - fn unoccupied_player_cells(&self) -> &[Point] { &self.unoccupied_player_cells } - fn unoccupied_opponent_cells(&self) -> &[Point] { &self.unoccupied_opponent_cells } + + fn unoccupied_player_cell_count(&self) -> usize { self.unoccupied_player_cells.len() } + fn unoccupied_opponent_cell_count(&self) -> usize { self.unoccupied_opponent_cells.len() } + fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { self.unoccupied_player_cells[i] } + fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { self.unoccupied_opponent_cells[i] } } impl ExpressiveGameState { diff --git a/src/engine/mod.rs b/src/engine/mod.rs index 39a5f26..d36d0e9 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -15,8 +15,11 @@ pub trait GameState: Clone + Sync { fn opponent(&self) -> &Player; fn player_has_max_teslas(&self) -> bool; fn opponent_has_max_teslas(&self) -> bool; - fn unoccupied_player_cells(&self) -> &[Point]; - fn unoccupied_opponent_cells(&self) -> &[Point]; + + fn unoccupied_player_cell_count(&self) -> usize; + fn unoccupied_opponent_cell_count(&self) -> usize; + fn location_of_unoccupied_player_cell(&self, i: usize) -> Point; + fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point; } #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/input/json.rs b/src/input/json.rs index bebb5be..6f0d5e8 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -19,14 +19,15 @@ pub fn read_expressive_state_from_file(filename: &str) -> Result<(engine::settin Ok((engine_settings, engine_state)) } -pub fn read_bitwise_state_from_file(filename: &str) -> Result> { +pub fn read_bitwise_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, bitwise_engine::BitwiseGameState), Box> { let mut file = File::open(filename)?; let mut content = String::new(); file.read_to_string(&mut content)?; let state: State = serde_json::from_str(content.as_ref())?; + let engine_settings = state.to_engine_settings(); let engine_state = state.to_bitwise_engine(); - Ok(engine_state) + Ok((engine_settings, engine_state)) } #[derive(Deserialize)] diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 19e663d..3dc94eb 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -81,17 +81,16 @@ fn simulate_to_endstate(command_score: &mut CommandScore, fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); - random_move(&state.unoccupied_player_cells(), &all_buildings, rng) + random_move(&all_buildings, rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) } fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); - random_move(&state.unoccupied_opponent_cells(), &all_buildings, rng) + random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } -fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { - - let building_command_count = free_positions.len()*all_buildings.len(); +fn random_movePoint>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point: F) -> Command { + let building_command_count = free_positions_count*all_buildings.len(); let nothing_count = 1; let number_of_commands = building_command_count + nothing_count; @@ -102,7 +101,7 @@ fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], Command::Nothing } else { Command::Build( - free_positions[choice_index/all_buildings.len()], + get_point(choice_index/all_buildings.len()), all_buildings[choice_index%all_buildings.len()] ) } @@ -163,13 +162,15 @@ impl CommandScore { fn init_command_scores(settings: &GameSettings, state: &GS) -> Vec { let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); - let building_command_count = state.unoccupied_player_cells().len()*all_buildings.len(); + let unoccupied_cells = (0..state.unoccupied_player_cell_count()).map(|i| state.location_of_unoccupied_player_cell(i)); + + let building_command_count = unoccupied_cells.len()*all_buildings.len(); let nothing_count = 1; let mut commands = Vec::with_capacity(building_command_count + nothing_count); commands.push(CommandScore::new(Command::Nothing)); - for &position in state.unoccupied_player_cells() { + for position in unoccupied_cells { for &building in &all_buildings { commands.push(CommandScore::new(Command::Build(position, building))); } diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index cb57e3b..4a2a87e 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -29,7 +29,7 @@ fn test_reading_from_replay(replay_folder: &str, length: usize) { let state_file = format!("{}/Round {:03}/state.json", replay_folder, i); let (_, expressive_state) = input::json::read_expressive_state_from_file(&state_file).expect("Failed to load expressive state"); - let bitwise_state = input::json::read_bitwise_state_from_file(&state_file).expect("Failed to load bitwise state"); + let (_, bitwise_state) = input::json::read_bitwise_state_from_file(&state_file).expect("Failed to load bitwise state"); assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.clone(), "\nFailed on state {}\n", i); } @@ -42,7 +42,7 @@ proptest! { let mut rng = XorShiftRng::from_seed(seed); let (settings, mut expressive_state) = input::json::read_expressive_state_from_file(STATE_PATH).expect("Failed to load expressive state"); - let mut bitwise_state = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); + let (_, mut bitwise_state) = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); let mut expected_status = GameStatus::Continue; while expected_status == GameStatus::Continue { @@ -61,18 +61,17 @@ proptest! { } fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()||true); - random_move(&state.unoccupied_player_cells(), &all_buildings, rng) + let all_buildings = sensible_buildings(settings, &state.player(), true); + random_move(&all_buildings, rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) } fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()||true); - random_move(&state.unoccupied_opponent_cells(), &all_buildings, rng) + let all_buildings = sensible_buildings(settings, &state.opponent(), true); + random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } -fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], rng: &mut R) -> Command { - - let building_command_count = free_positions.len()*all_buildings.len(); +fn random_movePoint>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point: F) -> Command { + let building_command_count = free_positions_count*all_buildings.len(); let nothing_count = 1; let number_of_commands = building_command_count + nothing_count; @@ -83,7 +82,7 @@ fn random_move(free_positions: &[Point], all_buildings: &[BuildingType], Command::Nothing } else { Command::Build( - free_positions[choice_index/all_buildings.len()], + get_point(choice_index/all_buildings.len()), all_buildings[choice_index%all_buildings.len()] ) } -- cgit v1.2.3 From e051d9bd5554620f7f53d34f6f84331235cfb3cd Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 2 Jul 2018 22:18:14 +0200 Subject: Turned on debugging symbols for release mode To make it easier to profile and improve --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index cf325ad..d95ae94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,3 +22,6 @@ reduced-time = [] extended-time = [] default = ["energy-cutoff"] + +[profile.release] +debug = true \ No newline at end of file -- cgit v1.2.3 From d0b2740ddea28b20fd26d7dbd19149a76df129ff Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 4 Jul 2018 19:37:35 +0200 Subject: Added tests of indexing into random bitwise building --- src/engine/bitwise_engine.rs | 3 +++ src/engine/geometry.rs | 2 +- tests/expressive_to_bitwise_comparison.rs | 25 +++++++++++++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 31040bf..524ddf7 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -146,6 +146,9 @@ impl BitwiseGameState { self.opponent_buildings.missiles[j].1 &= !move_down4; } } + + self.player_buildings.unconstructed.sort_by_key(|b| b.pos); + self.opponent_buildings.unconstructed.sort_by_key(|b| b.pos); } pub fn sorted(&self) -> BitwiseGameState { diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 02fe44b..af91b19 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -81,6 +81,6 @@ impl PartialOrd for Point { } impl Ord for Point { fn cmp(&self, other: &Point) -> Ordering { - self.x.cmp(&other.x).then(self.y.cmp(&other.y)) + self.y.cmp(&other.y).then(self.x.cmp(&other.x)) } } diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 4a2a87e..f08b316 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -46,31 +46,33 @@ proptest! { let mut expected_status = GameStatus::Continue; while expected_status == GameStatus::Continue { - let player_command = random_player_move(&settings, &expressive_state, &mut rng); - let opponent_command = random_opponent_move(&settings, &expressive_state, &mut rng); + let player_command = random_player_move(&settings, &expressive_state, &bitwise_state, &mut rng); + let opponent_command = random_opponent_move(&settings, &expressive_state, &bitwise_state, &mut rng); println!("Player command: {}", player_command); println!("Opponent command: {}", opponent_command); expected_status = expressive_state.simulate(&settings, player_command, opponent_command); let actual_status = bitwise_state.simulate(&settings, player_command, opponent_command); + expressive_state.sort(); + assert_eq!(&expected_status, &actual_status); assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.sorted()); } } } -fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.player(), true); - random_move(&all_buildings, rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) +fn random_player_move(settings: &GameSettings, expressive_state: &GSE, bitwise_state: &GSB, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(settings, &expressive_state.player(), true); + random_move(&all_buildings, rng, expressive_state.unoccupied_player_cell_count(), |i| expressive_state.location_of_unoccupied_player_cell(i), |i| bitwise_state.location_of_unoccupied_player_cell(i)) } -fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.opponent(), true); - random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) +fn random_opponent_move(settings: &GameSettings, expressive_state: &GSE, bitwise_state: &GSB, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(settings, &expressive_state.opponent(), true); + random_move(&all_buildings, rng, expressive_state.unoccupied_opponent_cell_count(), |i| expressive_state.location_of_unoccupied_opponent_cell(i), |i| bitwise_state.location_of_unoccupied_opponent_cell(i)) } -fn random_movePoint>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point: F) -> Command { +fn random_movePoint, FB:Fn(usize)->Point>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point_expressive: FE, get_point_bitwise: FB) -> Command { let building_command_count = free_positions_count*all_buildings.len(); let nothing_count = 1; @@ -81,8 +83,11 @@ fn random_movePoint>(all_buildings: &[BuildingType], rng: if choice_index == number_of_commands - 1 { Command::Nothing } else { + let expressive_point = get_point_expressive(choice_index/all_buildings.len()); + let bitwise_point = get_point_bitwise(choice_index/all_buildings.len()); + assert_eq!(expressive_point, bitwise_point); Command::Build( - get_point(choice_index/all_buildings.len()), + expressive_point, all_buildings[choice_index%all_buildings.len()] ) } -- cgit v1.2.3 From 041cd03fac39dd231d62c79f19a22a5336c49f87 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 4 Jul 2018 21:25:00 +0200 Subject: Made the choice of random building spots be based on a more efficient algorithm Still lots of work that can be done here. --- src/engine/bitwise_engine.rs | 77 ++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 20 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 524ddf7..bc1f879 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -84,31 +84,49 @@ impl GameState for BitwiseGameState { fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { - let mut current = 0; - for bit in 0..64 { - let is_free = (1 << bit) & self.player_buildings.occupied == 0; - if is_free && current == i{ - return Point::new(bit%SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); - } else if is_free { - current += 1; - } - } - panic!("Didn't find indicated free bit for player"); + let bit = find_bit_index_from_rank(self.player_buildings.occupied, i as u64); + let point = Point::new(bit%SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); + debug_assert!(point.to_either_bitfield(SINGLE_MAP_WIDTH) & self.player_buildings.occupied == 0); + point } fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { - let mut current = 0; - for bit in 0..64 { - let is_free = (1 << bit) & self.opponent_buildings.occupied == 0; - if is_free && current == i{ - return Point::new((bit%SINGLE_MAP_WIDTH) + SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); - } else if is_free { - current += 1; - } - } - panic!("Didn't find indicated free bit for opponent"); + let bit = find_bit_index_from_rank(self.opponent_buildings.occupied, i as u64); + let point = Point::new(bit%SINGLE_MAP_WIDTH+SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); + debug_assert!(point.to_either_bitfield(SINGLE_MAP_WIDTH) & self.opponent_buildings.occupied == 0); + point } } +fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { + // Adapted from https://graphics.stanford.edu/~seander/bithacks.html#SelectPosFromMSBRank + let v = !occupied; + + let mut r = v.count_ones() as u64 - i as u64; + + let a: u64 = v - ((v >> 1) & !0u64/3); + let b: u64 = (a & (!0u64/5)) + ((a >> 2) & (!0u64/5)); + let c: u64 = (b + (b >> 4)) & (!0u64/0x11); + let d: u64 = (c + (c >> 8)) & (!0u64/0x101); + let mut t: u64 = (d >> 32) + (d >> 48); + + let mut s: u64 = 64; + s -= (t.wrapping_sub(r) & 256) >> 3; r -= t & (t.wrapping_sub(r) >> 8); + t = (d >> (s - 16)) & 0xff; + s -= (t.wrapping_sub(r) & 256) >> 4; r -= t & (t.wrapping_sub(r) >> 8); + t = (c >> (s - 8)) & 0xf; + s -= (t.wrapping_sub(r) & 256) >> 5; r -= t & (t.wrapping_sub(r) >> 8); + t = (b >> (s - 4)) & 0x7; + s -= (t.wrapping_sub(r) & 256) >> 6; r -= t & (t.wrapping_sub(r) >> 8); + t = (a >> (s - 2)) & 0x3; + s -= (t.wrapping_sub(r) & 256) >> 7; r -= t & (t.wrapping_sub(r) >> 8); + t = (v >> (s - 1)) & 0x1; + s -= (t.wrapping_sub(r) & 256) >> 8; + s = 65 - s; + + let bit = 64 - s as u8; + bit +} + impl BitwiseGameState { pub fn new( player: Player, opponent: Player, @@ -248,7 +266,26 @@ impl BitwiseGameState { } player_buildings.unconstructed.truncate(buildings_len); } +/* + fn fire_teslas(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { + for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { + if tesla.cooldown > 0 { + tesla.cooldown -= 1; + } else if player.energy >= 100 { + player.energy -= 100; + tesla.cooldown = settings.tesla.weapon_cooldown_period; + + if tesla.pos.x + 1 >= settings.size.x/2 { + opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); + } + // TODO destroy some buildings? + + } + } + // TODO Only clean up the tesla cooldowns after this has been called in both directions + } +*/ fn add_left_missiles(player_buildings: &mut PlayerBuildings) { let mut missiles = player_buildings.missile_towers[0]; -- cgit v1.2.3 From f7eef79cb2685d12f361e3903b79bce3583b36fc Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Fri, 6 Jul 2018 00:30:42 +0200 Subject: Added handling of tesla towers --- src/engine/bitwise_engine.rs | 115 ++++++++++++++++++++++-------- src/engine/expressive_engine.rs | 4 +- tests/expressive_to_bitwise_comparison.rs | 6 +- 3 files changed, 91 insertions(+), 34 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index bc1f879..c9bae0f 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -60,7 +60,7 @@ impl GameState for BitwiseGameState { BitwiseGameState::update_construction(settings, &mut self.player_buildings); BitwiseGameState::update_construction(settings, &mut self.opponent_buildings); - //TODO: Fire the TESLAS! + BitwiseGameState::fire_teslas(settings, &mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); BitwiseGameState::add_left_missiles(&mut self.player_buildings); BitwiseGameState::add_right_missiles(&mut self.opponent_buildings); @@ -167,6 +167,22 @@ impl BitwiseGameState { self.player_buildings.unconstructed.sort_by_key(|b| b.pos); self.opponent_buildings.unconstructed.sort_by_key(|b| b.pos); + + for tesla in self.player_buildings.tesla_cooldowns.iter_mut() { + if !tesla.active { + tesla.pos = Point::new(0,0); + tesla.cooldown = 0; + } + } + for tesla in self.opponent_buildings.tesla_cooldowns.iter_mut() { + if !tesla.active { + tesla.pos = Point::new(0,0); + tesla.cooldown = 0; + } + } + + self.player_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); + self.opponent_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); } pub fn sorted(&self) -> BitwiseGameState { @@ -249,9 +265,9 @@ impl BitwiseGameState { } if building_type == BuildingType::Tesla { let ref mut tesla_cooldown = if player_buildings.tesla_cooldowns[0].active { - player_buildings.tesla_cooldowns[1] + &mut player_buildings.tesla_cooldowns[1] } else { - player_buildings.tesla_cooldowns[0] + &mut player_buildings.tesla_cooldowns[0] }; tesla_cooldown.active = true; tesla_cooldown.pos = pos; @@ -266,7 +282,7 @@ impl BitwiseGameState { } player_buildings.unconstructed.truncate(buildings_len); } -/* + fn fire_teslas(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { if tesla.cooldown > 0 { @@ -275,17 +291,54 @@ impl BitwiseGameState { player.energy -= 100; tesla.cooldown = settings.tesla.weapon_cooldown_period; - if tesla.pos.x + 1 >= settings.size.x/2 { + if tesla.pos.x + 1 >= SINGLE_MAP_WIDTH { opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); } - // TODO destroy some buildings? + + let missed_cells = ((SINGLE_MAP_WIDTH - tesla.pos.x) as u32).saturating_sub(2); + let top_row = if tesla.pos.y == 0 { 0 } else { tesla.pos.y - 1 }; + let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); + let mut destroy_mask = top_row_mask.wrapping_shr(missed_cells) & top_row_mask; + + for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == 7 { 2 } else { 3 }) { + let hits = destroy_mask & opponent_buildings.buildings[0]; + destroy_mask &= !hits; + BitwiseGameState::destroy_buildings(opponent_buildings, hits); + destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; + } } } - // TODO Only clean up the tesla cooldowns after this has been called in both directions + for tesla in opponent_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { + if tesla.cooldown > 0 { + tesla.cooldown -= 1; + } else if opponent.energy >= 100 { + opponent.energy -= 100; + tesla.cooldown = settings.tesla.weapon_cooldown_period; + + if tesla.pos.x <= SINGLE_MAP_WIDTH { + player.health = player.health.saturating_sub(settings.tesla.weapon_damage); + } + + let missed_cells = ((tesla.pos.x - SINGLE_MAP_WIDTH) as u32).saturating_sub(1); + + let top_row = if tesla.pos.y == 0 { 0 } else { tesla.pos.y - 1 }; + let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); + let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; + + for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == 7 { 2 } else { 3 }) { + let hits = destroy_mask & player_buildings.buildings[0]; + destroy_mask &= !hits; + BitwiseGameState::destroy_buildings(player_buildings, hits); + destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; + } + } + } + + BitwiseGameState::update_tesla_activity(player_buildings); + BitwiseGameState::update_tesla_activity(opponent_buildings); } -*/ fn add_left_missiles(player_buildings: &mut PlayerBuildings) { let mut missiles = player_buildings.missile_towers[0]; @@ -339,17 +392,8 @@ impl BitwiseGameState { opponent_buildings.buildings[health_tier] &= !hits; } - let deconstruct_mask = !hits; - opponent_buildings.energy_towers &= deconstruct_mask; - for tier in 0..opponent_buildings.missile_towers.len() { - opponent_buildings.missile_towers[tier] &= deconstruct_mask; - } - for tesla in 0..opponent_buildings.tesla_cooldowns.len() { - if opponent_buildings.tesla_cooldowns[tesla].pos.to_either_bitfield(SINGLE_MAP_WIDTH) & deconstruct_mask == 0 { - opponent_buildings.tesla_cooldowns[tesla].active = false; - } - } - opponent_buildings.occupied &= deconstruct_mask; + BitwiseGameState::destroy_buildings(opponent_buildings, hits); + BitwiseGameState::update_tesla_activity(opponent_buildings); } } } @@ -374,20 +418,30 @@ impl BitwiseGameState { opponent_buildings.buildings[health_tier] &= !hits; } - let deconstruct_mask = !hits; - opponent_buildings.energy_towers &= deconstruct_mask; - for tier in 0..opponent_buildings.missile_towers.len() { - opponent_buildings.missile_towers[tier] &= deconstruct_mask; - } - for tesla in 0..opponent_buildings.tesla_cooldowns.len() { - if opponent_buildings.tesla_cooldowns[tesla].pos.to_either_bitfield(SINGLE_MAP_WIDTH) & deconstruct_mask == 0 { - opponent_buildings.tesla_cooldowns[tesla].active = false; - } - } - opponent_buildings.occupied &= deconstruct_mask; + BitwiseGameState::destroy_buildings(opponent_buildings, hits); + BitwiseGameState::update_tesla_activity(opponent_buildings); } } } + + fn destroy_buildings(buildings: &mut PlayerBuildings, hit_mask: u64) { + let deconstruct_mask = !hit_mask; + + buildings.energy_towers &= deconstruct_mask; + for tier in 0..buildings.missile_towers.len() { + buildings.missile_towers[tier] &= deconstruct_mask; + } + for tier in 0..buildings.buildings.len() { + buildings.buildings[tier] &= deconstruct_mask; + } + buildings.occupied &= deconstruct_mask; + } + + fn update_tesla_activity(buildings: &mut PlayerBuildings) { + for tesla in buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { + tesla.active = (tesla.pos.to_either_bitfield(SINGLE_MAP_WIDTH) & buildings.occupied) != 0; + } + } fn add_energy(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings) { @@ -411,6 +465,7 @@ impl BitwiseGameState { impl PlayerBuildings { pub fn count_teslas(&self) -> usize { self.tesla_cooldowns.iter().filter(|t| t.active).count() + + self.unconstructed.iter().filter(|t| t.building_type == BuildingType::Tesla).count() } pub fn empty() -> PlayerBuildings { diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs index b7d7bf2..cc4dae4 100644 --- a/src/engine/expressive_engine.rs +++ b/src/engine/expressive_engine.rs @@ -144,8 +144,8 @@ impl ExpressiveGameState { debug_assert!(p.x < size.x && p.y < size.y); debug_assert!(player.energy >= blueprint.price); debug_assert!(b != BuildingType::Tesla || - unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - buildings.iter().filter(|b| b.weapon_damage == 20).count() < 2); + (unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + + buildings.iter().filter(|b| b.weapon_damage == 20).count() < 2)); player.energy -= blueprint.price; unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index f08b316..95f867e 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -63,12 +63,14 @@ proptest! { } fn random_player_move(settings: &GameSettings, expressive_state: &GSE, bitwise_state: &GSB, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &expressive_state.player(), true); + assert_eq!(expressive_state.player_has_max_teslas(), bitwise_state.player_has_max_teslas()); + let all_buildings = sensible_buildings(settings, &expressive_state.player(), expressive_state.player_has_max_teslas()); random_move(&all_buildings, rng, expressive_state.unoccupied_player_cell_count(), |i| expressive_state.location_of_unoccupied_player_cell(i), |i| bitwise_state.location_of_unoccupied_player_cell(i)) } fn random_opponent_move(settings: &GameSettings, expressive_state: &GSE, bitwise_state: &GSB, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &expressive_state.opponent(), true); + assert_eq!(expressive_state.player_has_max_teslas(), bitwise_state.player_has_max_teslas()); + let all_buildings = sensible_buildings(settings, &expressive_state.opponent(), expressive_state.opponent_has_max_teslas()); random_move(&all_buildings, rng, expressive_state.unoccupied_opponent_cell_count(), |i| expressive_state.location_of_unoccupied_opponent_cell(i), |i| bitwise_state.location_of_unoccupied_opponent_cell(i)) } -- cgit v1.2.3 From 772d173dc2864e8fdaf98b9a549e2ed0f4be2099 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 7 Jul 2018 11:26:56 +0200 Subject: Changed default implementation used by main to be bitwise --- src/bin/perf-test.rs | 2 +- src/main.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 81dc5a5..f5a78a0 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -9,7 +9,7 @@ const STATE_PATH: &str = "tests/state0.json"; use std::process; fn main() { -// expressive(); + expressive(); bitwise(); } diff --git a/src/main.rs b/src/main.rs index fa9216e..752e8b9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,7 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { fn main() { let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { + let (settings, state) = match input::json::read_bitwise_state_from_file(STATE_PATH) { Ok(ok) => ok, Err(error) => { println!("Error while parsing JSON file: {}", error); -- cgit v1.2.3 From 8263d02a433c87fbfa246cdc80aa26a4dadb78f2 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 8 Jul 2018 13:23:18 +0200 Subject: Started moving constants to a constants file --- src/engine/bitwise_engine.rs | 41 ++++++++++++------------------- src/engine/constants.rs | 10 ++++++++ src/engine/geometry.rs | 30 +++++++++++----------- src/engine/mod.rs | 1 + src/input/json.rs | 6 ++--- tests/expressive_to_bitwise_comparison.rs | 24 +++++++++--------- 6 files changed, 58 insertions(+), 54 deletions(-) create mode 100644 src/engine/constants.rs diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index c9bae0f..486f2f5 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -1,18 +1,9 @@ use engine::command::{Command, BuildingType}; use engine::geometry::Point; use engine::settings::{GameSettings}; +use engine::constants::*; use engine::{GameStatus, Player, GameState}; -const FULL_MAP_WIDTH: u8 = 16; -const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; -const MAX_CONCURRENT_MISSILES: usize = SINGLE_MAP_WIDTH as usize / 2; - -const MISSILE_COOLDOWN: usize = 3; - -const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits - -const MAX_TESLAS: usize = 2; - const LEFT_COL_MASK: u64 = 0x0101010101010101; const RIGHT_COL_MASK: u64 = 0x8080808080808080; @@ -34,7 +25,7 @@ pub struct PlayerBuildings { pub energy_towers: u64, pub missile_towers: [u64; MISSILE_COOLDOWN+1], - pub missiles: [(u64, u64); MAX_CONCURRENT_MISSILES], + pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], pub tesla_cooldowns: [TeslaCooldown; MAX_TESLAS] } @@ -86,13 +77,13 @@ impl GameState for BitwiseGameState { fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.player_buildings.occupied, i as u64); let point = Point::new(bit%SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); - debug_assert!(point.to_either_bitfield(SINGLE_MAP_WIDTH) & self.player_buildings.occupied == 0); + debug_assert!(point.to_either_bitfield() & self.player_buildings.occupied == 0); point } fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.opponent_buildings.occupied, i as u64); let point = Point::new(bit%SINGLE_MAP_WIDTH+SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); - debug_assert!(point.to_either_bitfield(SINGLE_MAP_WIDTH) & self.opponent_buildings.occupied == 0); + debug_assert!(point.to_either_bitfield() & self.opponent_buildings.occupied == 0); point } } @@ -145,8 +136,8 @@ impl BitwiseGameState { * engine. */ pub fn sort(&mut self) { - for i in 0..MAX_CONCURRENT_MISSILES { - for j in i+1..MAX_CONCURRENT_MISSILES { + for i in 0..MISSILE_MAX_SINGLE_CELL { + for j in i+1..MISSILE_MAX_SINGLE_CELL { let move_down1 = !self.player_buildings.missiles[i].0 & self.player_buildings.missiles[j].0; self.player_buildings.missiles[i].0 |= move_down1; self.player_buildings.missiles[j].0 &= !move_down1; @@ -196,7 +187,7 @@ impl BitwiseGameState { Command::Nothing => {}, Command::Build(p, b) => { let blueprint = settings.building_settings(b); - let bitfield = p.to_either_bitfield(SINGLE_MAP_WIDTH); + let bitfield = p.to_either_bitfield(); // This is used internally. I should not be making // invalid moves! @@ -216,7 +207,7 @@ impl BitwiseGameState { }, Command::Deconstruct(p) => { let unconstructed_to_remove_index = player_buildings.unconstructed.iter().position(|ref b| b.pos == p); - let deconstruct_mask = !(p.to_either_bitfield(SINGLE_MAP_WIDTH) & player_buildings.buildings[0]); + let deconstruct_mask = !(p.to_either_bitfield() & player_buildings.buildings[0]); debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); @@ -250,7 +241,7 @@ impl BitwiseGameState { let building_type = player_buildings.unconstructed[i].building_type; let blueprint = settings.building_settings(building_type); let pos = player_buildings.unconstructed[i].pos; - let bitfield = pos.to_either_bitfield(SINGLE_MAP_WIDTH); + let bitfield = pos.to_either_bitfield(); for health_tier in 0..4 { if blueprint.health > health_tier*5 { @@ -372,9 +363,9 @@ impl BitwiseGameState { } - fn move_left_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MAX_CONCURRENT_MISSILES]) { - for _ in 0..settings.attack.weapon_speed { - for i in 0..player_missiles.len() { + fn move_left_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + for _ in 0..MISSILE_SPEED { + for i in 0..MISSILE_MAX_SINGLE_CELL { let about_to_hit_opponent = player_missiles[i].0 & LEFT_COL_MASK; let damage = about_to_hit_opponent.count_ones() as u8 * settings.attack.weapon_damage; opponent.health = opponent.health.saturating_sub(damage); @@ -398,9 +389,9 @@ impl BitwiseGameState { } } - fn move_right_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MAX_CONCURRENT_MISSILES]) { - for _ in 0..settings.attack.weapon_speed { - for i in 0..player_missiles.len() { + fn move_right_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + for _ in 0..MISSILE_SPEED { + for i in 0..MISSILE_MAX_SINGLE_CELL { let about_to_hit_opponent = player_missiles[i].1 & RIGHT_COL_MASK; let damage = about_to_hit_opponent.count_ones() as u8 * settings.attack.weapon_damage; opponent.health = opponent.health.saturating_sub(damage); @@ -439,7 +430,7 @@ impl BitwiseGameState { fn update_tesla_activity(buildings: &mut PlayerBuildings) { for tesla in buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { - tesla.active = (tesla.pos.to_either_bitfield(SINGLE_MAP_WIDTH) & buildings.occupied) != 0; + tesla.active = (tesla.pos.to_either_bitfield() & buildings.occupied) != 0; } } diff --git a/src/engine/constants.rs b/src/engine/constants.rs new file mode 100644 index 0000000..5e1b9f3 --- /dev/null +++ b/src/engine/constants.rs @@ -0,0 +1,10 @@ +pub const FULL_MAP_WIDTH: u8 = 16; +pub const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; + +pub const MISSILE_COOLDOWN: usize = 3; +pub const MISSILE_SPEED: usize = 2; +pub const MISSILE_MAX_SINGLE_CELL: usize = SINGLE_MAP_WIDTH as usize / MISSILE_SPEED; + +pub const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits + +pub const MAX_TESLAS: usize = 2; diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index af91b19..293ffce 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -1,3 +1,5 @@ +use engine::constants::*; + #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct Point { pub x: u8, @@ -32,40 +34,40 @@ impl Point { self.x = self.x.wrapping_add(1); } - pub fn to_bitfield(&self, width: u8) -> (u64, u64) { - if self.x >= width { - let index = self.y * width + self.x - width; + pub fn to_bitfield(&self) -> (u64, u64) { + if self.x >= SINGLE_MAP_WIDTH { + let index = self.y * SINGLE_MAP_WIDTH + self.x - SINGLE_MAP_WIDTH; (0, 1 << index) } else { - let index = self.y * width + self.x; + let index = self.y * SINGLE_MAP_WIDTH + self.x; (1 << index, 0) } } - pub fn to_left_bitfield(&self, width: u8) -> u64 { - if self.x >= width { + pub fn to_left_bitfield(&self) -> u64 { + if self.x >= SINGLE_MAP_WIDTH { 0 } else { - let index = self.y * width + self.x; + let index = self.y * SINGLE_MAP_WIDTH + self.x; 1 << index } } - pub fn to_right_bitfield(&self, width: u8) -> u64 { - if self.x < width { + pub fn to_right_bitfield(&self) -> u64 { + if self.x < SINGLE_MAP_WIDTH { 0 } else { - let index = self.y * width + self.x - width; + let index = self.y * SINGLE_MAP_WIDTH + self.x - SINGLE_MAP_WIDTH; 1 << index } } - pub fn to_either_bitfield(&self, width: u8) -> u64 { - if self.x >= width { - let index = self.y * width + self.x - width; + pub fn to_either_bitfield(&self) -> u64 { + if self.x >= SINGLE_MAP_WIDTH { + let index = self.y * SINGLE_MAP_WIDTH + self.x - SINGLE_MAP_WIDTH; 1 << index } else { - let index = self.y * width + self.x; + let index = self.y * SINGLE_MAP_WIDTH + self.x; 1 << index } } diff --git a/src/engine/mod.rs b/src/engine/mod.rs index d36d0e9..a444059 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -3,6 +3,7 @@ pub mod geometry; pub mod settings; pub mod expressive_engine; pub mod bitwise_engine; +pub mod constants; use self::command::{Command}; use self::geometry::Point; diff --git a/src/input/json.rs b/src/input/json.rs index 6f0d5e8..c032f48 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -162,9 +162,9 @@ impl State { let building_type = building.convert_building_type(); let (mut engine_player, mut bitwise_buildings, bitfield) = if building.player_type == 'A' { - (&mut player, &mut player_buildings, point.to_left_bitfield(8)) + (&mut player, &mut player_buildings, point.to_left_bitfield()) } else { - (&mut opponent, &mut opponent_buildings, point.to_right_bitfield(8)) + (&mut opponent, &mut opponent_buildings, point.to_right_bitfield()) }; bitwise_buildings.occupied |= bitfield; @@ -205,7 +205,7 @@ impl State { } else { &mut opponent_buildings }; - let (mut left, mut right) = point.to_bitfield(8); + let (mut left, mut right) = point.to_bitfield(); for mut tier in bitwise_buildings.missiles.iter_mut() { let setting = (!tier.0 & left, !tier.1 & right); diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 95f867e..bdc4a19 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -118,48 +118,48 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS let player_energy = expressive.player_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); + .fold(0, |acc, next| acc | next.pos.to_left_bitfield()); let opponent_energy = expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) - .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)); + .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); let mut player_buildings_iter = (0..4) .map(|i| expressive.player_buildings.iter() .filter(|b| b.health > i*5) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) ); let mut opponent_buildings_iter = (0..4) .map(|i| expressive.opponent_buildings.iter() .filter(|b| b.health > i*5) - .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) + .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) ); let player_occupied = expressive.player_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) | + .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) | expressive.player_unconstructed_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)); + .fold(0, |acc, next| acc | next.pos.to_left_bitfield()); let opponent_occupied = expressive.opponent_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) | + .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) | expressive.opponent_unconstructed_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)); + .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); let mut player_attack_iter = (0..4) .map(|i| expressive.player_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield(8)) + .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) ); let mut opponent_attack_iter = (0..4) .map(|i| expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) - .fold(0, |acc, next| acc | next.pos.to_right_bitfield(8)) + .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) ); let empty_missiles: [(u64,u64);4] = [(0,0),(0,0),(0,0),(0,0)]; let player_missiles = expressive.player_missiles.iter() .fold(empty_missiles, |acc, m| { - let (mut left, mut right) = m.pos.to_bitfield(8); + let (mut left, mut right) = m.pos.to_bitfield(); let mut res = acc.clone(); for mut tier in res.iter_mut() { let setting = (!tier.0 & left, !tier.1 & right); @@ -172,7 +172,7 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS }); let opponent_missiles = expressive.opponent_missiles.iter() .fold(empty_missiles, |acc, m| { - let (mut left, mut right) = m.pos.to_bitfield(8); + let (mut left, mut right) = m.pos.to_bitfield(); let mut res = acc.clone(); for mut tier in res.iter_mut() { let setting = (!tier.0 & left, !tier.1 & right); -- cgit v1.2.3 From 03f574e28c2c535a2365b3621bf08e808e75c23b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 12 Jul 2018 23:17:45 +0200 Subject: Updating bot to use more named constants --- src/engine/bitwise_engine.rs | 91 +++++++++++++++++++++++------------------ src/engine/constants.rs | 12 +++++- src/engine/expressive_engine.rs | 7 ++++ 3 files changed, 70 insertions(+), 40 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 486f2f5..db4ad9a 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -26,7 +26,7 @@ pub struct PlayerBuildings { pub missile_towers: [u64; MISSILE_COOLDOWN+1], pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], - pub tesla_cooldowns: [TeslaCooldown; MAX_TESLAS] + pub tesla_cooldowns: [TeslaCooldown; TESLA_MAX] } #[derive(Debug, Clone, PartialEq, Eq)] @@ -51,16 +51,16 @@ impl GameState for BitwiseGameState { BitwiseGameState::update_construction(settings, &mut self.player_buildings); BitwiseGameState::update_construction(settings, &mut self.opponent_buildings); - BitwiseGameState::fire_teslas(settings, &mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); + BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); BitwiseGameState::add_left_missiles(&mut self.player_buildings); BitwiseGameState::add_right_missiles(&mut self.opponent_buildings); - BitwiseGameState::move_left_and_collide_missiles(settings, &mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); - BitwiseGameState::move_right_and_collide_missiles(settings, &mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); + BitwiseGameState::move_left_and_collide_missiles(&mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); + BitwiseGameState::move_right_and_collide_missiles(&mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); - BitwiseGameState::add_energy(settings, &mut self.player, &mut self.player_buildings); - BitwiseGameState::add_energy(settings, &mut self.opponent, &mut self.opponent_buildings); + BitwiseGameState::add_energy(&mut self.player, &mut self.player_buildings); + BitwiseGameState::add_energy(&mut self.opponent, &mut self.opponent_buildings); self.update_status(); self.status @@ -69,8 +69,8 @@ impl GameState for BitwiseGameState { fn player(&self) -> &Player { &self.player } fn opponent(&self) -> &Player { &self.opponent } - fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= MAX_TESLAS } - fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= MAX_TESLAS } + fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= TESLA_MAX } + fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= TESLA_MAX } fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } @@ -135,6 +135,7 @@ impl BitwiseGameState { * comparable when writing tests, not for actual use in the * engine. */ + #[cfg(debug_assertions)] pub fn sort(&mut self) { for i in 0..MISSILE_MAX_SINGLE_CELL { for j in i+1..MISSILE_MAX_SINGLE_CELL { @@ -176,6 +177,7 @@ impl BitwiseGameState { self.opponent_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); } + #[cfg(debug_assertions)] pub fn sorted(&self) -> BitwiseGameState { let mut res = self.clone(); res.sort(); @@ -195,7 +197,7 @@ impl BitwiseGameState { debug_assert!(p.x < settings.size.x && p.y < settings.size.y); debug_assert!(player.energy >= blueprint.price); debug_assert!(b != BuildingType::Tesla || - player_buildings.count_teslas() < MAX_TESLAS); + player_buildings.count_teslas() < TESLA_MAX); player.energy -= blueprint.price; player_buildings.unconstructed.push(UnconstructedBuilding { @@ -215,7 +217,7 @@ impl BitwiseGameState { player_buildings.unconstructed.swap_remove(i); } - player.energy += 5; + player.energy += DECONSTRUCT_ENERGY; for tier in 0..player_buildings.buildings.len() { player_buildings.buildings[tier] &= deconstruct_mask; @@ -238,13 +240,15 @@ impl BitwiseGameState { let mut buildings_len = player_buildings.unconstructed.len(); for i in (0..buildings_len).rev() { if player_buildings.unconstructed[i].construction_time_left == 0 { + //TODO: Avoid blueprint here? let building_type = player_buildings.unconstructed[i].building_type; let blueprint = settings.building_settings(building_type); + let pos = player_buildings.unconstructed[i].pos; let bitfield = pos.to_either_bitfield(); - for health_tier in 0..4 { - if blueprint.health > health_tier*5 { + for health_tier in 0..DEFENCE_HEALTH as u8 { + if blueprint.health > health_tier*MISSILE_DAMAGE { player_buildings.buildings[health_tier as usize] |= bitfield; } } @@ -274,16 +278,23 @@ impl BitwiseGameState { player_buildings.unconstructed.truncate(buildings_len); } - fn fire_teslas(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { + fn fire_teslas(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { + + #[cfg(debug_assertions)] + { + player_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); + opponent_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); + } + for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { if tesla.cooldown > 0 { tesla.cooldown -= 1; - } else if player.energy >= 100 { - player.energy -= 100; - tesla.cooldown = settings.tesla.weapon_cooldown_period; + } else if player.energy >= TESLA_FIRING_ENERGY { + player.energy -= TESLA_FIRING_ENERGY; + tesla.cooldown = TESLA_COOLDOWN; if tesla.pos.x + 1 >= SINGLE_MAP_WIDTH { - opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); + opponent.health = opponent.health.saturating_sub(TESLA_DAMAGE); } let missed_cells = ((SINGLE_MAP_WIDTH - tesla.pos.x) as u32).saturating_sub(2); @@ -292,7 +303,7 @@ impl BitwiseGameState { let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); let mut destroy_mask = top_row_mask.wrapping_shr(missed_cells) & top_row_mask; - for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == 7 { 2 } else { 3 }) { + for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { let hits = destroy_mask & opponent_buildings.buildings[0]; destroy_mask &= !hits; BitwiseGameState::destroy_buildings(opponent_buildings, hits); @@ -304,12 +315,12 @@ impl BitwiseGameState { for tesla in opponent_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { if tesla.cooldown > 0 { tesla.cooldown -= 1; - } else if opponent.energy >= 100 { - opponent.energy -= 100; - tesla.cooldown = settings.tesla.weapon_cooldown_period; + } else if opponent.energy >= TESLA_FIRING_ENERGY { + opponent.energy -= TESLA_FIRING_ENERGY; + tesla.cooldown = TESLA_COOLDOWN; if tesla.pos.x <= SINGLE_MAP_WIDTH { - player.health = player.health.saturating_sub(settings.tesla.weapon_damage); + player.health = player.health.saturating_sub(TESLA_DAMAGE); } let missed_cells = ((tesla.pos.x - SINGLE_MAP_WIDTH) as u32).saturating_sub(1); @@ -318,7 +329,7 @@ impl BitwiseGameState { let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; - for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == 7 { 2 } else { 3 }) { + for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { let hits = destroy_mask & player_buildings.buildings[0]; destroy_mask &= !hits; BitwiseGameState::destroy_buildings(player_buildings, hits); @@ -353,6 +364,7 @@ impl BitwiseGameState { BitwiseGameState::rotate_missile_towers(player_buildings); } + //TODO: Add a pointer and stop rotating here fn rotate_missile_towers(player_buildings: &mut PlayerBuildings) { let zero = player_buildings.missile_towers[0]; for i in 1..player_buildings.missile_towers.len() { @@ -363,16 +375,17 @@ impl BitwiseGameState { } - fn move_left_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + //TODO: Can I rearrange my bitfields to make these two functions one thing? + fn move_left_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { let about_to_hit_opponent = player_missiles[i].0 & LEFT_COL_MASK; - let damage = about_to_hit_opponent.count_ones() as u8 * settings.attack.weapon_damage; + let damage = about_to_hit_opponent.count_ones() as u8 * MISSILE_DAMAGE; opponent.health = opponent.health.saturating_sub(damage); player_missiles[i].0 = (player_missiles[i].0 & !LEFT_COL_MASK) >> 1; let swapping_sides = player_missiles[i].1 & LEFT_COL_MASK; - player_missiles[i].0 |= swapping_sides << 7; + player_missiles[i].0 |= swapping_sides << (SINGLE_MAP_WIDTH-1); player_missiles[i].1 = (player_missiles[i].1 & !LEFT_COL_MASK) >> 1; @@ -389,16 +402,16 @@ impl BitwiseGameState { } } - fn move_right_and_collide_missiles(settings: &GameSettings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + fn move_right_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { let about_to_hit_opponent = player_missiles[i].1 & RIGHT_COL_MASK; - let damage = about_to_hit_opponent.count_ones() as u8 * settings.attack.weapon_damage; + let damage = about_to_hit_opponent.count_ones() as u8 * MISSILE_DAMAGE; opponent.health = opponent.health.saturating_sub(damage); player_missiles[i].1 = (player_missiles[i].1 & !RIGHT_COL_MASK) << 1; let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; - player_missiles[i].1 |= swapping_sides >> 7; + player_missiles[i].1 |= swapping_sides >> (SINGLE_MAP_WIDTH-1); player_missiles[i].0 = (player_missiles[i].0 & !RIGHT_COL_MASK) << 1; @@ -419,11 +432,11 @@ impl BitwiseGameState { let deconstruct_mask = !hit_mask; buildings.energy_towers &= deconstruct_mask; - for tier in 0..buildings.missile_towers.len() { - buildings.missile_towers[tier] &= deconstruct_mask; + for tier in buildings.missile_towers.iter_mut() { + *tier &= deconstruct_mask; } - for tier in 0..buildings.buildings.len() { - buildings.buildings[tier] &= deconstruct_mask; + for tier in buildings.buildings.iter_mut() { + *tier &= deconstruct_mask; } buildings.occupied &= deconstruct_mask; } @@ -435,8 +448,8 @@ impl BitwiseGameState { } - fn add_energy(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings) { - player.energy_generated = settings.energy_income + player_buildings.energy_towers.count_ones() as u16 * settings.energy.energy_generated_per_turn; + fn add_energy(player: &mut Player, player_buildings: &mut PlayerBuildings) { + player.energy_generated = ENERGY_GENERATED_BASE + player_buildings.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER; player.energy += player.energy_generated; } @@ -462,12 +475,12 @@ impl PlayerBuildings { pub fn empty() -> PlayerBuildings { PlayerBuildings { unconstructed: Vec::with_capacity(4), - buildings: [0; 4], + buildings: [0; DEFENCE_HEALTH], occupied: 0, energy_towers: 0, - missile_towers: [0; 4], - missiles: [(0,0); 4], - tesla_cooldowns: [TeslaCooldown::empty(); 2] + missile_towers: [0; MISSILE_COOLDOWN+1], + missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], + tesla_cooldowns: [TeslaCooldown::empty(); TESLA_MAX] } } } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 5e1b9f3..e77392e 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -1,10 +1,20 @@ pub const FULL_MAP_WIDTH: u8 = 16; pub const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; +pub const MAP_HEIGHT: u8 = 8; pub const MISSILE_COOLDOWN: usize = 3; pub const MISSILE_SPEED: usize = 2; pub const MISSILE_MAX_SINGLE_CELL: usize = SINGLE_MAP_WIDTH as usize / MISSILE_SPEED; +pub const MISSILE_DAMAGE: u8 = 5; pub const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits -pub const MAX_TESLAS: usize = 2; +pub const TESLA_MAX: usize = 2; +pub const TESLA_COOLDOWN: u8 = 10; +pub const TESLA_FIRING_ENERGY: u16 = 100; +pub const TESLA_DAMAGE: u8 = 20; + +pub const ENERGY_GENERATED_BASE: u16 = 5; +pub const ENERGY_GENERATED_TOWER: u16 = 3; + +pub const DECONSTRUCT_ENERGY: u16 = 5; diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs index cc4dae4..aa9448b 100644 --- a/src/engine/expressive_engine.rs +++ b/src/engine/expressive_engine.rs @@ -123,6 +123,7 @@ impl ExpressiveGameState { * Sorts the various arrays. Generally not necessary, but useful * for tests that check equality between states. */ + #[cfg(debug_assertions)] pub fn sort(&mut self) { self.player_unconstructed_buildings.sort_by_key(|b| b.pos); self.player_buildings.sort_by_key(|b| b.pos); @@ -190,6 +191,12 @@ impl ExpressiveGameState { } fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, player_unoccupied_cells: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, opponent_unoccupied_cells: &mut Vec,settings: &GameSettings) { + #[cfg(debug_assertions)] + { + player_buildings.sort_by_key(|b| b.pos); + opponent_buildings.sort_by_key(|b| b.pos); + } + for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { if tesla.weapon_cooldown_time_left > 0 { tesla.weapon_cooldown_time_left -= 1; -- cgit v1.2.3 From daa60184c6e52c82008ed375c7a2d4f7e65dfab0 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 12 Jul 2018 23:41:58 +0200 Subject: Changed other bitwise stuff to use constants --- src/engine/bitwise_engine.rs | 1 + src/input/json.rs | 15 ++++++++------- tests/expressive_to_bitwise_comparison.rs | 21 +++++++++++---------- tests/live_comparison.rs | 4 ++-- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index db4ad9a..87b7f0f 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -306,6 +306,7 @@ impl BitwiseGameState { for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { let hits = destroy_mask & opponent_buildings.buildings[0]; destroy_mask &= !hits; + //TODO: This can probably be pulled out of the loop BitwiseGameState::destroy_buildings(opponent_buildings, hits); destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; } diff --git a/src/input/json.rs b/src/input/json.rs index c032f48..72c964d 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -7,6 +7,7 @@ use engine; use engine::command; use engine::expressive_engine; use engine::bitwise_engine; +use engine::constants::*; pub fn read_expressive_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, expressive_engine::ExpressiveGameState), Box> { let mut file = File::open(filename)?; @@ -171,9 +172,9 @@ impl State { if building.construction_time_left >= 0 { bitwise_buildings.unconstructed.push(building.to_bitwise_engine_unconstructed()); } else { - for health_tier in 0..4 { - if building.health > health_tier*5 { - bitwise_buildings.buildings[health_tier as usize] |= bitfield; + for health_tier in 0..DEFENCE_HEALTH { + if building.health > health_tier as u8 * MISSILE_DAMAGE { + bitwise_buildings.buildings[health_tier] |= bitfield; } } if building_type == command::BuildingType::Energy { @@ -181,9 +182,9 @@ impl State { engine_player.energy_generated += building.energy_generated_per_turn; } if building_type == command::BuildingType::Attack { - for cooldown_tier in 0..4 { - if building.weapon_cooldown_time_left == cooldown_tier { - bitwise_buildings.missile_towers[cooldown_tier as usize] |= bitfield; + for cooldown_tier in 0..MISSILE_COOLDOWN + 1 { + if building.weapon_cooldown_time_left == cooldown_tier as u8 { + bitwise_buildings.missile_towers[cooldown_tier] |= bitfield; } } } @@ -296,7 +297,7 @@ impl Player { engine::Player { energy: self.energy, health: self.health, - energy_generated: 5 + energy_generated: ENERGY_GENERATED_BASE } } } diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index bdc4a19..ac2cbf0 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -11,6 +11,7 @@ use zombot::engine::{GameState, GameStatus, Player}; use zombot::engine::expressive_engine; use zombot::engine::bitwise_engine; +use zombot::engine::constants::*; use proptest::prelude::*; @@ -123,14 +124,14 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); - let mut player_buildings_iter = (0..4) + let mut player_buildings_iter = (0..DEFENCE_HEALTH as u8) .map(|i| expressive.player_buildings.iter() - .filter(|b| b.health > i*5) + .filter(|b| b.health > i*MISSILE_DAMAGE) .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) ); - let mut opponent_buildings_iter = (0..4) + let mut opponent_buildings_iter = (0..DEFENCE_HEALTH as u8) .map(|i| expressive.opponent_buildings.iter() - .filter(|b| b.health > i*5) + .filter(|b| b.health > i*MISSILE_DAMAGE) .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) ); @@ -143,20 +144,20 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS expressive.opponent_unconstructed_buildings.iter() .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); - let mut player_attack_iter = (0..4) + let mut player_attack_iter = (0..MISSILE_COOLDOWN as u8 + 1) .map(|i| expressive.player_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) ); - let mut opponent_attack_iter = (0..4) + let mut opponent_attack_iter = (0..MISSILE_COOLDOWN as u8 + 1) .map(|i| expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) ); - let empty_missiles: [(u64,u64);4] = [(0,0),(0,0),(0,0),(0,0)]; + let empty_missiles: [(u64,u64);MISSILE_COOLDOWN+1] = [(0,0),(0,0),(0,0),(0,0)]; let player_missiles = expressive.player_missiles.iter() .fold(empty_missiles, |acc, m| { let (mut left, mut right) = m.pos.to_bitfield(); @@ -240,9 +241,9 @@ fn build_bitwise_unconstructed_from_expressive(b: &expressive_engine::Unconstruc fn identify_building_type(weapon_damage: u8, energy_generated_per_turn: u16) -> BuildingType { match (weapon_damage, energy_generated_per_turn) { - (5, _) => BuildingType::Attack, - (20, _) => BuildingType::Tesla, - (_, 3) => BuildingType::Energy, + (MISSILE_DAMAGE, _) => BuildingType::Attack, + (TESLA_DAMAGE, _) => BuildingType::Tesla, + (_, ENERGY_GENERATED_TOWER) => BuildingType::Energy, _ => BuildingType::Defence } } diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index 91d3530..2fcc8b5 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -20,12 +20,12 @@ fn it_successfully_simulates_replay_with_teslas() { } fn test_from_replay(replay_folder: &str, length: usize) { - let (settings, mut state) = json::read_expressive_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); + let (settings, 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_expressive_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); + 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.sort(); -- cgit v1.2.3 From cfbd535191552fc085762738c820f3cbc49a0ebd Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 15 Jul 2018 22:05:19 +0200 Subject: Implemented shooting teslas in the same order as the game engine Order by age --- src/engine/bitwise_engine.rs | 19 +++++++++++-------- src/engine/expressive_engine.rs | 15 ++++++++++----- src/input/json.rs | 12 +++++++----- tests/expressive_to_bitwise_comparison.rs | 9 ++++++--- tests/live_comparison.rs | 2 ++ 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 87b7f0f..a70d5e2 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -40,7 +40,8 @@ pub struct UnconstructedBuilding { pub struct TeslaCooldown { pub active: bool, pub pos: Point, - pub cooldown: u8 + pub cooldown: u8, + pub age: u16 } @@ -164,12 +165,14 @@ impl BitwiseGameState { if !tesla.active { tesla.pos = Point::new(0,0); tesla.cooldown = 0; + tesla.age = 0; } } for tesla in self.opponent_buildings.tesla_cooldowns.iter_mut() { if !tesla.active { tesla.pos = Point::new(0,0); tesla.cooldown = 0; + tesla.age = 0; } } @@ -267,6 +270,7 @@ impl BitwiseGameState { tesla_cooldown.active = true; tesla_cooldown.pos = pos; tesla_cooldown.cooldown = 0; + tesla_cooldown.age = 0; } buildings_len -= 1; @@ -279,14 +283,11 @@ impl BitwiseGameState { } fn fire_teslas(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { - - #[cfg(debug_assertions)] - { - player_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); - opponent_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); - } + player_buildings.tesla_cooldowns.sort_by(|a, b| b.age.cmp(&a.age)); + opponent_buildings.tesla_cooldowns.sort_by(|a, b| b.age.cmp(&a.age)); for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { + tesla.age += 1; if tesla.cooldown > 0 { tesla.cooldown -= 1; } else if player.energy >= TESLA_FIRING_ENERGY { @@ -314,6 +315,7 @@ impl BitwiseGameState { } for tesla in opponent_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { + tesla.age += 1; if tesla.cooldown > 0 { tesla.cooldown -= 1; } else if opponent.energy >= TESLA_FIRING_ENERGY { @@ -491,7 +493,8 @@ impl TeslaCooldown { TeslaCooldown { active: false, pos: Point::new(0,0), - cooldown: 0 + cooldown: 0, + age: 0 } } } diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs index aa9448b..557e0fa 100644 --- a/src/engine/expressive_engine.rs +++ b/src/engine/expressive_engine.rs @@ -38,7 +38,8 @@ pub struct Building { pub weapon_speed: u8, pub weapon_cooldown_time_left: u8, pub weapon_cooldown_period: u8, - pub energy_generated_per_turn: u16 + pub energy_generated_per_turn: u16, + pub age: u16 } #[derive(Debug, Clone, PartialEq)] @@ -193,11 +194,12 @@ impl ExpressiveGameState { fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, player_unoccupied_cells: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, opponent_unoccupied_cells: &mut Vec,settings: &GameSettings) { #[cfg(debug_assertions)] { - player_buildings.sort_by_key(|b| b.pos); - opponent_buildings.sort_by_key(|b| b.pos); + player_buildings.sort_by(|a, b| b.age.cmp(&a.age).then(a.pos.cmp(&b.pos))); + opponent_buildings.sort_by(|a, b| b.age.cmp(&a.age).then(a.pos.cmp(&b.pos))); } for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { + tesla.age += 1; if tesla.weapon_cooldown_time_left > 0 { tesla.weapon_cooldown_time_left -= 1; } else if player.energy >= 100 { @@ -222,6 +224,7 @@ impl ExpressiveGameState { } for tesla in opponent_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { + tesla.age += 1; if tesla.weapon_cooldown_time_left > 0 { tesla.weapon_cooldown_time_left -= 1; } else if opponent.energy >= 100 { @@ -382,7 +385,8 @@ impl UnconstructedBuilding { weapon_speed: self.weapon_speed, weapon_cooldown_time_left: 0, weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn + energy_generated_per_turn: self.energy_generated_per_turn, + age: 0 } } } @@ -396,7 +400,8 @@ impl Building { weapon_speed: blueprint.weapon_speed, weapon_cooldown_time_left: 0, weapon_cooldown_period: blueprint.weapon_cooldown_period, - energy_generated_per_turn: blueprint.energy_generated_per_turn + energy_generated_per_turn: blueprint.energy_generated_per_turn, + age: 0 } } diff --git a/src/input/json.rs b/src/input/json.rs index 72c964d..c3d8474 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -97,7 +97,7 @@ struct GameCell { #[serde(rename_all = "camelCase")] struct BuildingState { health: u8, - construction_time_left: i8, + construction_time_left: i16, //price: u16, weapon_damage: u8, weapon_speed: u8, @@ -181,22 +181,23 @@ impl State { bitwise_buildings.energy_towers |= bitfield; engine_player.energy_generated += building.energy_generated_per_turn; } - if building_type == command::BuildingType::Attack { + else if building_type == command::BuildingType::Attack { for cooldown_tier in 0..MISSILE_COOLDOWN + 1 { if building.weapon_cooldown_time_left == cooldown_tier as u8 { bitwise_buildings.missile_towers[cooldown_tier] |= bitfield; } } } - if building_type == command::BuildingType::Tesla { + else if building_type == command::BuildingType::Tesla { let ref mut tesla_cooldown = if bitwise_buildings.tesla_cooldowns[0].active { - bitwise_buildings.tesla_cooldowns[1] + &mut bitwise_buildings.tesla_cooldowns[1] } else { - bitwise_buildings.tesla_cooldowns[0] + &mut bitwise_buildings.tesla_cooldowns[0] }; tesla_cooldown.active = true; tesla_cooldown.pos = point; tesla_cooldown.cooldown = building.weapon_cooldown_time_left; + tesla_cooldown.age = building.construction_time_left.abs() as u16; } } } @@ -312,6 +313,7 @@ impl BuildingState { weapon_cooldown_time_left: self.weapon_cooldown_time_left, weapon_cooldown_period: self.weapon_cooldown_period, energy_generated_per_turn: self.energy_generated_per_turn, + age: self.construction_time_left.abs() as u16 } } diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index ac2cbf0..6a72748 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -188,21 +188,24 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS let null_tesla = bitwise_engine::TeslaCooldown { active: false, pos: Point::new(0,0), - cooldown: 0 + cooldown: 0, + age: 0 }; let mut player_tesla_iter = expressive.player_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Tesla) .map(|b| bitwise_engine::TeslaCooldown { active: true, pos: b.pos, - cooldown: b.weapon_cooldown_time_left + cooldown: b.weapon_cooldown_time_left, + age: b.age, }); let mut opponent_tesla_iter = expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Tesla) .map(|b| bitwise_engine::TeslaCooldown { active: true, pos: b.pos, - cooldown: b.weapon_cooldown_time_left + cooldown: b.weapon_cooldown_time_left, + age: b.age, }); bitwise_engine::BitwiseGameState { status: expressive.status, diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index 2fcc8b5..23beaec 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -30,6 +30,8 @@ fn test_from_replay(replay_folder: &str, length: usize) { state.simulate(&settings, player, opponent); state.sort(); expected_state.sort(); + + println!("State {}: {:?}", i+1, state); assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); } } -- cgit v1.2.3 From 02e5c2a8687a0beb907a29121a9d8dbe8c672530 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 15 Jul 2018 22:08:41 +0200 Subject: Decreased running time of monte carlo test --- tests/monte_carlo_test.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs index 43476fd..87feadb 100644 --- a/tests/monte_carlo_test.rs +++ b/tests/monte_carlo_test.rs @@ -14,6 +14,8 @@ fn it_does_a_normal_turn_successfully() { Ok(ok) => ok, Err(error) => panic!("Error while parsing JSON file: {}", error) }; - let max_time = Duration::milliseconds(1950); + let max_time = Duration::milliseconds(200); strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); + + assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(10)) } -- cgit v1.2.3 From 8f88b294511b786e8ae518594eceafb8da9d3f34 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 15 Jul 2018 22:55:55 +0200 Subject: Flipped bitfields on the opponent side to make implementation more concise --- src/engine/bitwise_engine.rs | 109 +++++++----------------------- src/engine/geometry.rs | 44 +++++++----- src/input/json.rs | 8 +-- tests/expressive_to_bitwise_comparison.rs | 8 ++- tests/monte_carlo_test.rs | 4 +- 5 files changed, 63 insertions(+), 110 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index a70d5e2..4113e14 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -47,18 +47,19 @@ pub struct TeslaCooldown { impl GameState for BitwiseGameState { fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { - BitwiseGameState::perform_command(settings, &mut self.player, &mut self.player_buildings, player_command); BitwiseGameState::perform_command(settings, &mut self.opponent, &mut self.opponent_buildings, opponent_command); + BitwiseGameState::perform_command(settings, &mut self.player, &mut self.player_buildings, player_command); + BitwiseGameState::perform_command(settings, &mut self.opponent, &mut self.opponent_buildings, opponent_command); BitwiseGameState::update_construction(settings, &mut self.player_buildings); BitwiseGameState::update_construction(settings, &mut self.opponent_buildings); BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); - BitwiseGameState::add_left_missiles(&mut self.player_buildings); - BitwiseGameState::add_right_missiles(&mut self.opponent_buildings); + BitwiseGameState::add_missiles(&mut self.player_buildings); + BitwiseGameState::add_missiles(&mut self.opponent_buildings); - BitwiseGameState::move_left_and_collide_missiles(&mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); - BitwiseGameState::move_right_and_collide_missiles(&mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); + BitwiseGameState::move_and_collide_missiles(&mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); + BitwiseGameState::move_and_collide_missiles(&mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); BitwiseGameState::add_energy(&mut self.player, &mut self.player_buildings); BitwiseGameState::add_energy(&mut self.opponent, &mut self.opponent_buildings); @@ -67,7 +68,6 @@ impl GameState for BitwiseGameState { self.status } - fn player(&self) -> &Player { &self.player } fn opponent(&self) -> &Player { &self.opponent } fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= TESLA_MAX } @@ -83,7 +83,7 @@ impl GameState for BitwiseGameState { } fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.opponent_buildings.occupied, i as u64); - let point = Point::new(bit%SINGLE_MAP_WIDTH+SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); + let point = Point::new(FULL_MAP_WIDTH - bit%SINGLE_MAP_WIDTH - 1, bit/SINGLE_MAP_WIDTH); debug_assert!(point.to_either_bitfield() & self.opponent_buildings.occupied == 0); point } @@ -283,9 +283,15 @@ impl BitwiseGameState { } fn fire_teslas(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { - player_buildings.tesla_cooldowns.sort_by(|a, b| b.age.cmp(&a.age)); - opponent_buildings.tesla_cooldowns.sort_by(|a, b| b.age.cmp(&a.age)); + BitwiseGameState::fire_single_players_teslas_without_cleanup(player, player_buildings, opponent, opponent_buildings); + BitwiseGameState::fire_single_players_teslas_without_cleanup(opponent, opponent_buildings, player, player_buildings); + + BitwiseGameState::update_tesla_activity(player_buildings); + BitwiseGameState::update_tesla_activity(opponent_buildings); + } + fn fire_single_players_teslas_without_cleanup(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { + player_buildings.tesla_cooldowns.sort_by(|a, b| b.age.cmp(&a.age)); for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { tesla.age += 1; if tesla.cooldown > 0 { @@ -294,15 +300,17 @@ impl BitwiseGameState { player.energy -= TESLA_FIRING_ENERGY; tesla.cooldown = TESLA_COOLDOWN; - if tesla.pos.x + 1 >= SINGLE_MAP_WIDTH { + let flipped_pos = tesla.pos.flip_x(); + + if flipped_pos.x >= SINGLE_MAP_WIDTH - 1 { opponent.health = opponent.health.saturating_sub(TESLA_DAMAGE); } - let missed_cells = ((SINGLE_MAP_WIDTH - tesla.pos.x) as u32).saturating_sub(2); + let missed_cells = ((SINGLE_MAP_WIDTH - flipped_pos.x) as u32).saturating_sub(2); let top_row = if tesla.pos.y == 0 { 0 } else { tesla.pos.y - 1 }; let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); - let mut destroy_mask = top_row_mask.wrapping_shr(missed_cells) & top_row_mask; + let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { let hits = destroy_mask & opponent_buildings.buildings[0]; @@ -313,39 +321,9 @@ impl BitwiseGameState { } } } - - for tesla in opponent_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { - tesla.age += 1; - if tesla.cooldown > 0 { - tesla.cooldown -= 1; - } else if opponent.energy >= TESLA_FIRING_ENERGY { - opponent.energy -= TESLA_FIRING_ENERGY; - tesla.cooldown = TESLA_COOLDOWN; - - if tesla.pos.x <= SINGLE_MAP_WIDTH { - player.health = player.health.saturating_sub(TESLA_DAMAGE); - } - - let missed_cells = ((tesla.pos.x - SINGLE_MAP_WIDTH) as u32).saturating_sub(1); - - let top_row = if tesla.pos.y == 0 { 0 } else { tesla.pos.y - 1 }; - let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); - let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; - - for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { - let hits = destroy_mask & player_buildings.buildings[0]; - destroy_mask &= !hits; - BitwiseGameState::destroy_buildings(player_buildings, hits); - destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; - } - } - } - - BitwiseGameState::update_tesla_activity(player_buildings); - BitwiseGameState::update_tesla_activity(opponent_buildings); } - fn add_left_missiles(player_buildings: &mut PlayerBuildings) { + fn add_missiles(player_buildings: &mut PlayerBuildings) { let mut missiles = player_buildings.missile_towers[0]; for mut tier in player_buildings.missiles.iter_mut() { let setting = !tier.0 & missiles; @@ -356,17 +334,6 @@ impl BitwiseGameState { BitwiseGameState::rotate_missile_towers(player_buildings); } - fn add_right_missiles(player_buildings: &mut PlayerBuildings) { - let mut missiles = player_buildings.missile_towers[0]; - for mut tier in player_buildings.missiles.iter_mut() { - let setting = !tier.1 & missiles; - tier.1 |= setting; - missiles &= !setting; - } - - BitwiseGameState::rotate_missile_towers(player_buildings); - } - //TODO: Add a pointer and stop rotating here fn rotate_missile_towers(player_buildings: &mut PlayerBuildings) { let zero = player_buildings.missile_towers[0]; @@ -378,46 +345,18 @@ impl BitwiseGameState { } - //TODO: Can I rearrange my bitfields to make these two functions one thing? - fn move_left_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + fn move_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { - let about_to_hit_opponent = player_missiles[i].0 & LEFT_COL_MASK; + let about_to_hit_opponent = player_missiles[i].1 & LEFT_COL_MASK; let damage = about_to_hit_opponent.count_ones() as u8 * MISSILE_DAMAGE; opponent.health = opponent.health.saturating_sub(damage); - player_missiles[i].0 = (player_missiles[i].0 & !LEFT_COL_MASK) >> 1; - - let swapping_sides = player_missiles[i].1 & LEFT_COL_MASK; - player_missiles[i].0 |= swapping_sides << (SINGLE_MAP_WIDTH-1); player_missiles[i].1 = (player_missiles[i].1 & !LEFT_COL_MASK) >> 1; - - let mut hits = 0; - for health_tier in (0..DEFENCE_HEALTH).rev() { - hits = opponent_buildings.buildings[health_tier] & player_missiles[i].0; - player_missiles[i].0 &= !hits; - opponent_buildings.buildings[health_tier] &= !hits; - } - - BitwiseGameState::destroy_buildings(opponent_buildings, hits); - BitwiseGameState::update_tesla_activity(opponent_buildings); - } - } - } - - fn move_right_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { - for _ in 0..MISSILE_SPEED { - for i in 0..MISSILE_MAX_SINGLE_CELL { - let about_to_hit_opponent = player_missiles[i].1 & RIGHT_COL_MASK; - let damage = about_to_hit_opponent.count_ones() as u8 * MISSILE_DAMAGE; - opponent.health = opponent.health.saturating_sub(damage); - player_missiles[i].1 = (player_missiles[i].1 & !RIGHT_COL_MASK) << 1; - let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; - player_missiles[i].1 |= swapping_sides >> (SINGLE_MAP_WIDTH-1); + player_missiles[i].1 |= swapping_sides; player_missiles[i].0 = (player_missiles[i].0 & !RIGHT_COL_MASK) << 1; - let mut hits = 0; for health_tier in (0..DEFENCE_HEALTH).rev() { hits = opponent_buildings.buildings[health_tier] & player_missiles[i].1; diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 293ffce..ee331b7 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -34,14 +34,30 @@ impl Point { self.x = self.x.wrapping_add(1); } - pub fn to_bitfield(&self) -> (u64, u64) { - if self.x >= SINGLE_MAP_WIDTH { - let index = self.y * SINGLE_MAP_WIDTH + self.x - SINGLE_MAP_WIDTH; - (0, 1 << index) + pub fn flip_x(&self) -> Point { + let flipped_x = if self.x >= SINGLE_MAP_WIDTH { + FULL_MAP_WIDTH - self.x - 1 } else { - let index = self.y * SINGLE_MAP_WIDTH + self.x; - (1 << index, 0) - } + self.x + }; + Point::new(flipped_x, self.y) + } +} + +impl Point { + /** + * # Bitfields + * + * 0,0 is the top left point. + * >> (towards 0) moves bits towards the player that owns that side + * << (towards max) moves bits towards the opponent + * This involves mirroring the x dimension for the opponent's side + */ + + + //TODO: Clean up the left vs right bitfield nonsense here, get rid of some branches + pub fn to_bitfield(&self) -> (u64, u64) { + (self.to_left_bitfield(), self.to_right_bitfield()) } pub fn to_left_bitfield(&self) -> u64 { @@ -57,19 +73,13 @@ impl Point { if self.x < SINGLE_MAP_WIDTH { 0 } else { - let index = self.y * SINGLE_MAP_WIDTH + self.x - SINGLE_MAP_WIDTH; + let index = self.y * SINGLE_MAP_WIDTH + FULL_MAP_WIDTH - self.x - 1; 1 << index } } pub fn to_either_bitfield(&self) -> u64 { - if self.x >= SINGLE_MAP_WIDTH { - let index = self.y * SINGLE_MAP_WIDTH + self.x - SINGLE_MAP_WIDTH; - 1 << index - } else { - let index = self.y * SINGLE_MAP_WIDTH + self.x; - 1 << index - } + self.to_left_bitfield() | self.to_right_bitfield() } } @@ -83,6 +93,8 @@ impl PartialOrd for Point { } impl Ord for Point { fn cmp(&self, other: &Point) -> Ordering { - self.y.cmp(&other.y).then(self.x.cmp(&other.x)) + let a = self.flip_x(); + let b = other.flip_x(); + a.y.cmp(&b.y).then(a.x.cmp(&b.x)) } } diff --git a/src/input/json.rs b/src/input/json.rs index c3d8474..000c355 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -202,12 +202,12 @@ impl State { } } for missile in &cell.missiles { - let mut bitwise_buildings = if missile.player_type == 'A' { - &mut player_buildings + let bitfields = point.to_bitfield(); + let (mut bitwise_buildings, mut left, mut right) = if missile.player_type == 'A' { + (&mut player_buildings, bitfields.0, bitfields.1) } else { - &mut opponent_buildings + (&mut opponent_buildings, bitfields.1, bitfields.0) }; - let (mut left, mut right) = point.to_bitfield(); for mut tier in bitwise_buildings.missiles.iter_mut() { let setting = (!tier.0 & left, !tier.1 & right); diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 6a72748..e0c9a30 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -45,6 +45,8 @@ proptest! { let (settings, mut expressive_state) = input::json::read_expressive_state_from_file(STATE_PATH).expect("Failed to load expressive state"); let (_, mut bitwise_state) = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); + expressive_state.sort(); + let mut expected_status = GameStatus::Continue; while expected_status == GameStatus::Continue { let player_command = random_player_move(&settings, &expressive_state, &bitwise_state, &mut rng); @@ -176,11 +178,11 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS let (mut left, mut right) = m.pos.to_bitfield(); let mut res = acc.clone(); for mut tier in res.iter_mut() { - let setting = (!tier.0 & left, !tier.1 & right); + let setting = (!tier.0 & right, !tier.1 & left); tier.0 |= setting.0; tier.1 |= setting.1; - left &= !setting.0; - right &= !setting.1; + right &= !setting.0; + left &= !setting.1; } res }); diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs index 87feadb..832cdb3 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_expressive_state_from_file(STATE_PATH) { + let (settings, 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); - assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(10)) + assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) } -- cgit v1.2.3 From ae2872e1e6cd367d15ff177d932088209e325e3c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 12:18:27 +0200 Subject: Broke dependency on settings in constructing building --- src/engine/bitwise_engine.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 4113e14..dd9ba93 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -50,8 +50,8 @@ impl GameState for BitwiseGameState { BitwiseGameState::perform_command(settings, &mut self.player, &mut self.player_buildings, player_command); BitwiseGameState::perform_command(settings, &mut self.opponent, &mut self.opponent_buildings, opponent_command); - BitwiseGameState::update_construction(settings, &mut self.player_buildings); - BitwiseGameState::update_construction(settings, &mut self.opponent_buildings); + BitwiseGameState::update_construction(&mut self.player_buildings); + BitwiseGameState::update_construction(&mut self.opponent_buildings); BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); @@ -239,21 +239,18 @@ impl BitwiseGameState { } } - fn update_construction(settings: &GameSettings, player_buildings: &mut PlayerBuildings) { + fn update_construction(player_buildings: &mut PlayerBuildings) { let mut buildings_len = player_buildings.unconstructed.len(); for i in (0..buildings_len).rev() { if player_buildings.unconstructed[i].construction_time_left == 0 { - //TODO: Avoid blueprint here? let building_type = player_buildings.unconstructed[i].building_type; - let blueprint = settings.building_settings(building_type); + let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; let pos = player_buildings.unconstructed[i].pos; let bitfield = pos.to_either_bitfield(); - for health_tier in 0..DEFENCE_HEALTH as u8 { - if blueprint.health > health_tier*MISSILE_DAMAGE { - player_buildings.buildings[health_tier as usize] |= bitfield; - } + for health_tier in 0..health { + player_buildings.buildings[health_tier] |= bitfield; } if building_type == BuildingType::Energy { player_buildings.energy_towers |= bitfield; -- cgit v1.2.3 From 595c1cf576677415b7d76f620e30032734d61c85 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 12:22:13 +0200 Subject: Pulls a change out of a loop --- src/engine/bitwise_engine.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index dd9ba93..99e4d92 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -309,13 +309,13 @@ impl BitwiseGameState { let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; + let mut hits = 0; for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { - let hits = destroy_mask & opponent_buildings.buildings[0]; + hits |= destroy_mask & opponent_buildings.buildings[0]; destroy_mask &= !hits; - //TODO: This can probably be pulled out of the loop - BitwiseGameState::destroy_buildings(opponent_buildings, hits); destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; } + BitwiseGameState::destroy_buildings(opponent_buildings, hits); } } } -- cgit v1.2.3 From a1f2934e82312761b6eb2cc2cb427895868f5f19 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 12:37:56 +0200 Subject: Added an index, to make the missile towers a proper circular buffer --- src/engine/bitwise_engine.rs | 45 +++++++++++++++++++------------ src/engine/constants.rs | 1 + tests/expressive_to_bitwise_comparison.rs | 8 +++--- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 99e4d92..add7d31 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -23,7 +23,9 @@ pub struct PlayerBuildings { pub occupied: u64, pub energy_towers: u64, - pub missile_towers: [u64; MISSILE_COOLDOWN+1], + + pub missile_towers: [u64; MISSILE_COOLDOWN_STATES], + pub firing_tower: usize, pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], pub tesla_cooldowns: [TeslaCooldown; TESLA_MAX] @@ -178,6 +180,26 @@ impl BitwiseGameState { self.player_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); self.opponent_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); + + + while self.player_buildings.firing_tower > 0 { + self.player_buildings.firing_tower -= 1; + let zero = self.player_buildings.missile_towers[0]; + for i in 1..self.player_buildings.missile_towers.len() { + self.player_buildings.missile_towers[i-1] = self.player_buildings.missile_towers[i]; + } + let end = self.player_buildings.missile_towers.len()-1; + self.player_buildings.missile_towers[end] = zero; + } + while self.opponent_buildings.firing_tower > 0 { + self.opponent_buildings.firing_tower -= 1; + let zero = self.opponent_buildings.missile_towers[0]; + for i in 1..self.opponent_buildings.missile_towers.len() { + self.opponent_buildings.missile_towers[i-1] = self.opponent_buildings.missile_towers[i]; + } + let end = self.opponent_buildings.missile_towers.len()-1; + self.opponent_buildings.missile_towers[end] = zero; + } } #[cfg(debug_assertions)] @@ -256,7 +278,7 @@ impl BitwiseGameState { player_buildings.energy_towers |= bitfield; } if building_type == BuildingType::Attack { - player_buildings.missile_towers[0] |= bitfield; + player_buildings.missile_towers[player_buildings.firing_tower] |= bitfield; } if building_type == BuildingType::Tesla { let ref mut tesla_cooldown = if player_buildings.tesla_cooldowns[0].active { @@ -321,27 +343,15 @@ impl BitwiseGameState { } fn add_missiles(player_buildings: &mut PlayerBuildings) { - let mut missiles = player_buildings.missile_towers[0]; + let mut missiles = player_buildings.missile_towers[player_buildings.firing_tower]; for mut tier in player_buildings.missiles.iter_mut() { let setting = !tier.0 & missiles; tier.0 |= setting; missiles &= !setting; } - - BitwiseGameState::rotate_missile_towers(player_buildings); - } - - //TODO: Add a pointer and stop rotating here - fn rotate_missile_towers(player_buildings: &mut PlayerBuildings) { - let zero = player_buildings.missile_towers[0]; - for i in 1..player_buildings.missile_towers.len() { - player_buildings.missile_towers[i-1] = player_buildings.missile_towers[i]; - } - let end = player_buildings.missile_towers.len()-1; - player_buildings.missile_towers[end] = zero; + player_buildings.firing_tower = (player_buildings.firing_tower + 1) % MISSILE_COOLDOWN_STATES; } - fn move_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { @@ -417,7 +427,8 @@ impl PlayerBuildings { buildings: [0; DEFENCE_HEALTH], occupied: 0, energy_towers: 0, - missile_towers: [0; MISSILE_COOLDOWN+1], + missile_towers: [0; MISSILE_COOLDOWN_STATES], + firing_tower: 0, missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], tesla_cooldowns: [TeslaCooldown::empty(); TESLA_MAX] } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index e77392e..e321a81 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -3,6 +3,7 @@ pub const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; pub const MAP_HEIGHT: u8 = 8; pub const MISSILE_COOLDOWN: usize = 3; +pub const MISSILE_COOLDOWN_STATES: usize = MISSILE_COOLDOWN+1; pub const MISSILE_SPEED: usize = 2; pub const MISSILE_MAX_SINGLE_CELL: usize = SINGLE_MAP_WIDTH as usize / MISSILE_SPEED; pub const MISSILE_DAMAGE: u8 = 5; diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index e0c9a30..72b5731 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -146,20 +146,20 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS expressive.opponent_unconstructed_buildings.iter() .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); - let mut player_attack_iter = (0..MISSILE_COOLDOWN as u8 + 1) + let mut player_attack_iter = (0..MISSILE_COOLDOWN_STATES as u8) .map(|i| expressive.player_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) ); - let mut opponent_attack_iter = (0..MISSILE_COOLDOWN as u8 + 1) + let mut opponent_attack_iter = (0..MISSILE_COOLDOWN_STATES as u8) .map(|i| expressive.opponent_buildings.iter() .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) .filter(|b| b.weapon_cooldown_time_left == i) .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) ); - let empty_missiles: [(u64,u64);MISSILE_COOLDOWN+1] = [(0,0),(0,0),(0,0),(0,0)]; + let empty_missiles: [(u64,u64);MISSILE_COOLDOWN_STATES] = [(0,0),(0,0),(0,0),(0,0)]; let player_missiles = expressive.player_missiles.iter() .fold(empty_missiles, |acc, m| { let (mut left, mut right) = m.pos.to_bitfield(); @@ -219,6 +219,7 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS occupied: player_occupied, energy_towers: player_energy, missile_towers: [player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap()], + firing_tower: 0, missiles: player_missiles, tesla_cooldowns: [player_tesla_iter.next().unwrap_or(null_tesla.clone()), player_tesla_iter.next().unwrap_or(null_tesla.clone())] @@ -229,6 +230,7 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS occupied: opponent_occupied, energy_towers: opponent_energy, missile_towers: [opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap()], + firing_tower: 0, missiles: opponent_missiles, tesla_cooldowns: [opponent_tesla_iter.next().unwrap_or(null_tesla.clone()), opponent_tesla_iter.next().unwrap_or(null_tesla.clone())] -- cgit v1.2.3 From 76c92c5555e7ee4b9654958b02d1b262a37e765d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 13:34:23 +0200 Subject: Removed need to load settings for the bitwise game engine It's all constants now. --- src/engine/bitwise_engine.rs | 30 +++++++++++++++++++++--------- src/engine/constants.rs | 8 ++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index add7d31..c7cadf1 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -48,9 +48,9 @@ pub struct TeslaCooldown { impl GameState for BitwiseGameState { - fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { - BitwiseGameState::perform_command(settings, &mut self.player, &mut self.player_buildings, player_command); - BitwiseGameState::perform_command(settings, &mut self.opponent, &mut self.opponent_buildings, opponent_command); + fn simulate(&mut self, _settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { + BitwiseGameState::perform_command(&mut self.player, &mut self.player_buildings, player_command); + BitwiseGameState::perform_command(&mut self.opponent, &mut self.opponent_buildings, opponent_command); BitwiseGameState::update_construction(&mut self.player_buildings); BitwiseGameState::update_construction(&mut self.opponent_buildings); @@ -209,25 +209,37 @@ impl BitwiseGameState { res } - fn perform_command(settings: &GameSettings, player: &mut Player, player_buildings: &mut PlayerBuildings, command: Command) { + fn perform_command(player: &mut Player, player_buildings: &mut PlayerBuildings, command: Command) { match command { Command::Nothing => {}, Command::Build(p, b) => { - let blueprint = settings.building_settings(b); let bitfield = p.to_either_bitfield(); + let price = match b { + BuildingType::Attack => MISSILE_PRICE, + BuildingType::Defence => DEFENCE_PRICE, + BuildingType::Energy => ENERGY_PRICE, + BuildingType::Tesla => TESLA_PRICE, + }; + let construction_time = match b { + BuildingType::Attack => MISSILE_CONSTRUCTION_TIME, + BuildingType::Defence => DEFENCE_CONSTRUCTION_TIME, + BuildingType::Energy => ENERGY_CONSTRUCTION_TIME, + BuildingType::Tesla => TESLA_CONSTRUCTION_TIME, + }; + // This is used internally. I should not be making // invalid moves! debug_assert!(player_buildings.buildings[0] & bitfield == 0); - debug_assert!(p.x < settings.size.x && p.y < settings.size.y); - debug_assert!(player.energy >= blueprint.price); + debug_assert!(p.x < FULL_MAP_WIDTH && p.y < MAP_HEIGHT); + debug_assert!(player.energy >= price); debug_assert!(b != BuildingType::Tesla || player_buildings.count_teslas() < TESLA_MAX); - player.energy -= blueprint.price; + player.energy -= price; player_buildings.unconstructed.push(UnconstructedBuilding { pos: p, - construction_time_left: blueprint.construction_time, + construction_time_left: construction_time, building_type: b }); player_buildings.occupied |= bitfield; diff --git a/src/engine/constants.rs b/src/engine/constants.rs index e321a81..9805f72 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -7,15 +7,23 @@ pub const MISSILE_COOLDOWN_STATES: usize = MISSILE_COOLDOWN+1; pub const MISSILE_SPEED: usize = 2; pub const MISSILE_MAX_SINGLE_CELL: usize = SINGLE_MAP_WIDTH as usize / MISSILE_SPEED; pub const MISSILE_DAMAGE: u8 = 5; +pub const MISSILE_PRICE: u16 = 30; +pub const MISSILE_CONSTRUCTION_TIME: u8 = 1; pub const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits +pub const DEFENCE_PRICE: u16 = 30; +pub const DEFENCE_CONSTRUCTION_TIME: u8 = 3; pub const TESLA_MAX: usize = 2; pub const TESLA_COOLDOWN: u8 = 10; pub const TESLA_FIRING_ENERGY: u16 = 100; pub const TESLA_DAMAGE: u8 = 20; +pub const TESLA_PRICE: u16 = 300; +pub const TESLA_CONSTRUCTION_TIME: u8 = 10; pub const ENERGY_GENERATED_BASE: u16 = 5; pub const ENERGY_GENERATED_TOWER: u16 = 3; +pub const ENERGY_PRICE: u16 = 20; +pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; pub const DECONSTRUCT_ENERGY: u16 = 5; -- cgit v1.2.3 From ac8d715c63331f7f4836828a207689473dd0ab40 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 17:58:52 +0200 Subject: Disabled benchmarking on expressive engine --- src/bin/perf-test.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index f5a78a0..d4eae32 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -9,11 +9,10 @@ const STATE_PATH: &str = "tests/state0.json"; use std::process; fn main() { - expressive(); bitwise(); } -fn expressive() { +fn _expressive() { println!("Running expressive engine"); let start_time = PreciseTime::now(); let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { -- cgit v1.2.3 From e8dc7d777a6a3fe40d2c4f3fee78ec49d14f5dec Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 18:46:09 +0200 Subject: Removed bitfield comment I tried implementing it and it made things slower --- src/engine/bitwise_engine.rs | 2 +- src/engine/geometry.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index c7cadf1..9dfd449 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -322,7 +322,7 @@ impl BitwiseGameState { } fn fire_single_players_teslas_without_cleanup(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { - player_buildings.tesla_cooldowns.sort_by(|a, b| b.age.cmp(&a.age)); + player_buildings.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { tesla.age += 1; if tesla.cooldown > 0 { diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index ee331b7..28df774 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -55,7 +55,6 @@ impl Point { */ - //TODO: Clean up the left vs right bitfield nonsense here, get rid of some branches pub fn to_bitfield(&self) -> (u64, u64) { (self.to_left_bitfield(), self.to_right_bitfield()) } -- cgit v1.2.3 From 2b806d56875276b06275230445aa3f6cd7a5f4d0 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 18:49:58 +0200 Subject: Fixed dependency for bot submission --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7b46d01..fa6e62b 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ profile: clean: cargo clean -submission.zip: +submission.zip: bot.json Cargo.lock Cargo.toml src zip -r9 submission.zip bot.json Cargo.lock Cargo.toml src .PHONY: build test bench profile clean -- cgit v1.2.3 From 2cc0a6ff93b2e0dc20ba75c18ce34881bf3d9fbe Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 20:31:41 +0200 Subject: Removed sudo from perf requirements I pushed the appropriate settings to my OS config --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fa6e62b..8b630d0 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ bench: profile: cargo build --release --features "benchmarking single-threaded" mkdir -p target/profile - sudo perf record -F 1000 -a -g target/release/perf-test - sudo perf script > target/profile/out.perf + perf record -g target/release/perf-test + perf script > target/profile/out.perf ../FlameGraph/stackcollapse-perf.pl target/profile/out.perf > target/profile/out.folded ../FlameGraph/flamegraph.pl target/profile/out.folded > target/profile/flamegraph.svg -- cgit v1.2.3 From a96424cf8a90aa93edcf4e9ff11fc54800ea1b9e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 20:40:40 +0200 Subject: Simplified duration handling to allow longer profiling --- Makefile | 2 +- src/bin/perf-test.rs | 5 +++-- src/engine/constants.rs | 11 +++++++++++ src/main.rs | 12 ++---------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8b630d0..42ce706 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ bench: cargo run --release --features "benchmarking" --bin perf-test profile: - cargo build --release --features "benchmarking single-threaded" + cargo build --release --features "benchmarking single-threaded extended-time" mkdir -p target/profile perf record -g target/release/perf-test perf script > target/profile/out.perf diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index d4eae32..8d6a490 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -3,6 +3,7 @@ extern crate time; use time::{PreciseTime, Duration}; use zombot::*; +use zombot::engine::constants::*; const STATE_PATH: &str = "tests/state0.json"; @@ -22,7 +23,7 @@ fn _expressive() { process::exit(1); } }; - let max_time = Duration::milliseconds(1950); + let max_time = Duration::milliseconds(MAX_TIME_MILLIS); strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); } @@ -36,6 +37,6 @@ fn bitwise() { process::exit(1); } }; - let max_time = Duration::milliseconds(1950); + let max_time = Duration::milliseconds(MAX_TIME_MILLIS); strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 9805f72..8453a54 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -27,3 +27,14 @@ pub const ENERGY_PRICE: u16 = 20; pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; pub const DECONSTRUCT_ENERGY: u16 = 5; + + +#[cfg(not(feature = "reduced-time"))] +#[cfg(not(feature = "extended-time"))] +pub const MAX_TIME_MILLIS: i64 = 1950; + +#[cfg(feature = "reduced-time")] +pub const MAX_TIME_MILLIS: i64 = 950; + +#[cfg(feature = "extended-time")] +pub const MAX_TIME_MILLIS: i64 = 19950; diff --git a/src/main.rs b/src/main.rs index 752e8b9..0235d5f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,7 @@ extern crate time; use time::{PreciseTime, Duration}; use zombot::*; +use zombot::engine::constants::*; use zombot::engine::command::Command; use std::error::Error; @@ -16,16 +17,7 @@ use std::io::prelude::*; use std::process; fn choose_move(settings: &engine::settings::GameSettings, state: &GS, start_time: &PreciseTime) -> Command { - #[cfg(not(feature = "reduced-time"))] - #[cfg(not(feature = "extended-time"))] - let max_time = Duration::milliseconds(1950); - - #[cfg(feature = "reduced-time")] - let max_time = Duration::milliseconds(950); - - #[cfg(feature = "extended-time")] - let max_time = Duration::milliseconds(19950); - + let max_time = Duration::milliseconds(MAX_TIME_MILLIS); strategy::monte_carlo::choose_move(settings, state, start_time, max_time) } -- cgit v1.2.3 From deef6b8e3f29a6baac5c545e7f586c6fbfa437ba Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 20:45:46 +0200 Subject: Marginally faster tesla activity update --- src/engine/bitwise_engine.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 9dfd449..1d7e424 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -403,8 +403,8 @@ impl BitwiseGameState { } fn update_tesla_activity(buildings: &mut PlayerBuildings) { - for tesla in buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { - tesla.active = (tesla.pos.to_either_bitfield() & buildings.occupied) != 0; + for i in 0..TESLA_MAX { + buildings.tesla_cooldowns[i].active = buildings.tesla_cooldowns[i].active && (buildings.tesla_cooldowns[i].pos.to_either_bitfield() & buildings.occupied) != 0; } } -- cgit v1.2.3 From 8fdd6e813c4b88332f0e91350dab7d080087aee2 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 23:21:15 +0200 Subject: Moved change to all buildings outside of missile update loop --- src/engine/bitwise_engine.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 1d7e424..8a3157e 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -365,6 +365,7 @@ impl BitwiseGameState { } fn move_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + let mut destroyed = 0; for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { let about_to_hit_opponent = player_missiles[i].1 & LEFT_COL_MASK; @@ -382,11 +383,11 @@ impl BitwiseGameState { player_missiles[i].1 &= !hits; opponent_buildings.buildings[health_tier] &= !hits; } - - BitwiseGameState::destroy_buildings(opponent_buildings, hits); - BitwiseGameState::update_tesla_activity(opponent_buildings); + destroyed |= hits; } } + BitwiseGameState::destroy_buildings(opponent_buildings, destroyed); + BitwiseGameState::update_tesla_activity(opponent_buildings); } fn destroy_buildings(buildings: &mut PlayerBuildings, hit_mask: u64) { -- cgit v1.2.3 From 889907e32692cd26567db76585710be9071dfe5f Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 23:40:46 +0200 Subject: More efficient opponent damage calc --- src/engine/bitwise_engine.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 8a3157e..49b780d 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -366,11 +366,12 @@ impl BitwiseGameState { fn move_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { let mut destroyed = 0; + let mut damaging = 0; for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { let about_to_hit_opponent = player_missiles[i].1 & LEFT_COL_MASK; - let damage = about_to_hit_opponent.count_ones() as u8 * MISSILE_DAMAGE; - opponent.health = opponent.health.saturating_sub(damage); + damaging = damaging << 1; + damaging |= about_to_hit_opponent; player_missiles[i].1 = (player_missiles[i].1 & !LEFT_COL_MASK) >> 1; let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; @@ -386,6 +387,9 @@ impl BitwiseGameState { destroyed |= hits; } } + let damage = damaging.count_ones() as u8 * MISSILE_DAMAGE; + opponent.health = opponent.health.saturating_sub(damage); + BitwiseGameState::destroy_buildings(opponent_buildings, destroyed); BitwiseGameState::update_tesla_activity(opponent_buildings); } -- cgit v1.2.3 From a1fe6b65f6f4178b4a0b724ee6524da650fd2ef1 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 21 Jul 2018 23:47:55 +0200 Subject: Rearranged to make data flow clearer --- src/engine/bitwise_engine.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 49b780d..db31511 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -369,14 +369,13 @@ impl BitwiseGameState { let mut damaging = 0; for _ in 0..MISSILE_SPEED { for i in 0..MISSILE_MAX_SINGLE_CELL { + let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; let about_to_hit_opponent = player_missiles[i].1 & LEFT_COL_MASK; - damaging = damaging << 1; - damaging |= about_to_hit_opponent; - player_missiles[i].1 = (player_missiles[i].1 & !LEFT_COL_MASK) >> 1; - let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; - player_missiles[i].1 |= swapping_sides; player_missiles[i].0 = (player_missiles[i].0 & !RIGHT_COL_MASK) << 1; + player_missiles[i].1 = ((player_missiles[i].1 & !LEFT_COL_MASK) >> 1) | swapping_sides; + + damaging = (damaging << 1) | about_to_hit_opponent; let mut hits = 0; for health_tier in (0..DEFENCE_HEALTH).rev() { -- cgit v1.2.3 From b099be3c38b6754ec4f0c962d7bbe188e69f9c95 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 22 Jul 2018 22:15:46 +0200 Subject: Naive implementation of depth first walk of the state space This does not run in a time that terminates in human time I think. --- src/bin/depth-first-search.rs | 103 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 src/bin/depth-first-search.rs diff --git a/src/bin/depth-first-search.rs b/src/bin/depth-first-search.rs new file mode 100644 index 0000000..c2b82de --- /dev/null +++ b/src/bin/depth-first-search.rs @@ -0,0 +1,103 @@ +extern crate zombot; +extern crate time; +use time::PreciseTime; + +use zombot::*; +use zombot::engine::*; +use zombot::engine::settings::*; +use zombot::engine::constants::*; +use zombot::engine::command::*; + +const STATE_PATH: &str = "tests/state0.json"; + +use std::process; + +fn main() { + println!("Performing an exhaustive depth-first walk of the game states"); + let start_time = PreciseTime::now(); + let (settings, state) = match input::json::read_bitwise_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => { + println!("Error while parsing JSON file: {}", error); + process::exit(1); + } + }; + + walk_states(&settings, &state, 0); + + println!("Total running time: {}", start_time.to(PreciseTime::now())); +} + +fn walk_states(settings: &GameSettings, state: &GS, depth: u32) { + if depth >= 200 { + return; + } + + let player_buildings = valid_buildings(settings, &state.player(), state.player_has_max_teslas()); + let opponent_buildings = valid_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); + + for &player_building in &player_buildings { + for player_i in 0..state.unoccupied_player_cell_count() { + for &opponent_building in &opponent_buildings { + for opponent_i in 0..state.unoccupied_opponent_cell_count() { + let player_point = state.location_of_unoccupied_player_cell(player_i); + let player_move = Command::Build(player_point, player_building); + let opponent_point = state.location_of_unoccupied_player_cell(opponent_i); + let opponent_move = Command::Build(opponent_point, opponent_building); + + let mut after_move = state.clone(); + let status = after_move.simulate(settings, player_move, opponent_move); + if status == GameStatus::Continue { + walk_states(settings, &after_move, depth+1); + } + } + } + } + } + for player_building in player_buildings { + for player_i in 0..state.unoccupied_player_cell_count() { + let player_point = state.location_of_unoccupied_player_cell(player_i); + let player_move = Command::Build(player_point, player_building); + let opponent_move = Command::Nothing; + + let mut after_move = state.clone(); + let status = after_move.simulate(settings, player_move, opponent_move); + if status == GameStatus::Continue { + walk_states(settings, &after_move, depth+1); + } + } + } + for opponent_building in opponent_buildings { + for opponent_i in 0..state.unoccupied_opponent_cell_count() { + let player_move = Command::Nothing; + let opponent_point = state.location_of_unoccupied_player_cell(opponent_i); + let opponent_move = Command::Build(opponent_point, opponent_building); + + let mut after_move = state.clone(); + let status = after_move.simulate(settings, player_move, opponent_move); + if status == GameStatus::Continue { + walk_states(settings, &after_move, depth+1); + } + } + } + let player_move = Command::Nothing; + let opponent_move = Command::Nothing; + let mut after_move = state.clone(); + let status = after_move.simulate(settings, player_move, opponent_move); + if status == GameStatus::Continue { + walk_states(settings, &after_move, depth+1); + } +} + +fn valid_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { + let mut result = Vec::with_capacity(4); + for b in BuildingType::all().iter() { + let building_setting = settings.building_settings(*b); + let affordable = building_setting.price <= player.energy; + let is_tesla = *b == BuildingType::Tesla; + if affordable && (!is_tesla || !has_max_teslas) { + result.push(*b); + } + } + result +} -- cgit v1.2.3 From 5bd54ecdc30717347168052d4f6aa62cfd293d8b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 23 Jul 2018 22:32:10 +0200 Subject: Added option for discarding poor performing moves early --- Cargo.toml | 1 + src/bin/depth-first-search.rs | 4 ++- src/strategy/monte_carlo.rs | 68 +++++++++++++++++++++++++++++-------------- 3 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d95ae94..23e18b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,6 +20,7 @@ single-threaded = [] energy-cutoff = [] reduced-time = [] extended-time = [] +discard-poor-performers = [] default = ["energy-cutoff"] diff --git a/src/bin/depth-first-search.rs b/src/bin/depth-first-search.rs index c2b82de..c04061d 100644 --- a/src/bin/depth-first-search.rs +++ b/src/bin/depth-first-search.rs @@ -5,7 +5,6 @@ use time::PreciseTime; use zombot::*; use zombot::engine::*; use zombot::engine::settings::*; -use zombot::engine::constants::*; use zombot::engine::command::*; const STATE_PATH: &str = "tests/state0.json"; @@ -87,6 +86,9 @@ fn walk_states(settings: &GameSettings, state: &GS, depth: u32) { if status == GameStatus::Continue { walk_states(settings, &after_move, depth+1); } + if depth < 10 { + print!("."); + } } fn valid_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 3dc94eb..d735074 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -17,28 +17,8 @@ use rayon::prelude::*; pub fn choose_move(settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(settings, state); - - loop { - #[cfg(feature = "single-threaded")] - { - command_scores.iter_mut() - .for_each(|score| { - let mut rng = XorShiftRng::from_seed(score.next_seed); - simulate_to_endstate(score, settings, state, &mut rng); - }); - } - #[cfg(not(feature = "single-threaded"))] - { - command_scores.par_iter_mut() - .for_each(|score| { - let mut rng = XorShiftRng::from_seed(score.next_seed); - simulate_to_endstate(score, settings, state, &mut rng); - }); - } - if start_time.to(PreciseTime::now()) > max_time { - break; - } - } + + simulate_options_to_timeout(&mut command_scores, settings, state, start_time, max_time); let command = command_scores.iter().max_by_key(|&c| c.win_ratio()); @@ -54,6 +34,50 @@ pub fn choose_move(settings: &GameSettings, state: &GS, start_tim } } +#[cfg(not(feature = "discard-poor-performers"))] +fn simulate_options_to_timeout(command_scores: &mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) { + loop { + simulate_all_options_once(command_scores, settings, state); + if start_time.to(PreciseTime::now()) > max_time { + break; + } + } +} + +#[cfg(feature = "discard-poor-performers")] +fn simulate_options_to_timeout(command_scores: &mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) { + let maxes = [max_time / 4, max_time / 2, max_time * 3 / 4, max_time]; + for &max in maxes.iter() { + loop { + simulate_all_options_once(command_scores, settings, state); + if start_time.to(PreciseTime::now()) > max { + break; + } + } + command_scores.sort_unstable_by_key(|c| -c.win_ratio()); + let new_length = command_scores.len()/2; + command_scores.truncate(new_length); + } +} + +#[cfg(feature = "single-threaded")] +fn simulate_all_options_once(command_scores: &mut[CommandScore], settings: &GameSettings, state: &GS) { + command_scores.iter_mut() + .for_each(|score| { + let mut rng = XorShiftRng::from_seed(score.next_seed); + simulate_to_endstate(score, settings, state, &mut rng); + }); +} + +#[cfg(not(feature = "single-threaded"))] +fn simulate_all_options_once(command_scores: &mut[CommandScore], settings: &GameSettings, state: &GS) { + command_scores.par_iter_mut() + .for_each(|score| { + let mut rng = XorShiftRng::from_seed(score.next_seed); + simulate_to_endstate(score, settings, state, &mut rng); + }); +} + fn simulate_to_endstate(command_score: &mut CommandScore, settings: &GameSettings, state: &GS, rng: &mut R) { let mut state_mut = state.clone(); -- cgit v1.2.3 From e8ef2ee25863694f105ced35f0fed8dcaaf1297c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 23 Jul 2018 22:52:27 +0200 Subject: Turned on discarding poor performing moves early in default config --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 23e18b5..1bcef68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ reduced-time = [] extended-time = [] discard-poor-performers = [] -default = ["energy-cutoff"] +default = ["energy-cutoff", "discard-poor-performers"] [profile.release] debug = true \ No newline at end of file -- cgit v1.2.3 From 5a2a493cd299705105a14fe1dfcd7bd1ddd104d7 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 24 Jul 2018 00:02:11 +0200 Subject: Modified pruning to be friendlier to calculating benchmarks --- src/strategy/monte_carlo.rs | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index d735074..0a51b39 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -17,10 +17,7 @@ use rayon::prelude::*; pub fn choose_move(settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(settings, state); - - simulate_options_to_timeout(&mut command_scores, settings, state, start_time, max_time); - - let command = command_scores.iter().max_by_key(|&c| c.win_ratio()); + let command = simulate_options_to_timeout(&mut command_scores, settings, state, start_time, max_time); #[cfg(feature = "benchmarking")] { @@ -35,29 +32,33 @@ pub fn choose_move(settings: &GameSettings, state: &GS, start_tim } #[cfg(not(feature = "discard-poor-performers"))] -fn simulate_options_to_timeout(command_scores: &mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) { +fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { loop { simulate_all_options_once(command_scores, settings, state); if start_time.to(PreciseTime::now()) > max_time { break; } } + command_scores.iter().max_by_key(|&c| c.win_ratio()) } #[cfg(feature = "discard-poor-performers")] -fn simulate_options_to_timeout(command_scores: &mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) { +fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { + use std::cmp; + let maxes = [max_time / 4, max_time / 2, max_time * 3 / 4, max_time]; - for &max in maxes.iter() { + for (i, &max) in maxes.iter().enumerate() { + let new_length = cmp::max(20, command_scores.len() / (2usize.pow(i as u32))); + let active_scores = &mut command_scores[0..new_length]; loop { - simulate_all_options_once(command_scores, settings, state); + simulate_all_options_once(active_scores, settings, state); if start_time.to(PreciseTime::now()) > max { break; } } - command_scores.sort_unstable_by_key(|c| -c.win_ratio()); - let new_length = command_scores.len()/2; - command_scores.truncate(new_length); + active_scores.sort_unstable_by_key(|c| -c.win_ratio()); } + command_scores.first() } #[cfg(feature = "single-threaded")] -- cgit v1.2.3 From 4b64d36d14785c8ab1bc72368bae3fcb3543bb27 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 24 Jul 2018 22:21:29 +0200 Subject: Fixed min and benchmark logging in discarding search --- src/strategy/monte_carlo.rs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 0a51b39..127e690 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -18,12 +18,6 @@ use rayon::prelude::*; pub fn choose_move(settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(settings, state); let command = simulate_options_to_timeout(&mut command_scores, settings, state, start_time, max_time); - - #[cfg(feature = "benchmarking")] - { - let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); - println!("Iterations: {}", total_iterations); - } match command { Some(command) => command.command, @@ -39,16 +33,24 @@ fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec(command_scores: &'a mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { use std::cmp; + let min_options = cmp::min(command_scores.len(), 5); let maxes = [max_time / 4, max_time / 2, max_time * 3 / 4, max_time]; for (i, &max) in maxes.iter().enumerate() { - let new_length = cmp::max(20, command_scores.len() / (2usize.pow(i as u32))); + let new_length = cmp::max(min_options, command_scores.len() / (2usize.pow(i as u32))); let active_scores = &mut command_scores[0..new_length]; loop { simulate_all_options_once(active_scores, settings, state); @@ -58,6 +60,13 @@ fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec Date: Thu, 26 Jul 2018 20:53:59 +0200 Subject: Bumped version to match major version of engine --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1bcef68..dfe6413 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zombot" -version = "1.0.0" +version = "2.0.0" [dependencies] serde_derive = "1.0.43" -- cgit v1.2.3 From 72a86bb4c043b6316e5c5f163cdd1e66cb99229f Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 13:07:15 +0200 Subject: Added more TODO ideas --- src/engine/bitwise_engine.rs | 1 + src/engine/geometry.rs | 3 +++ src/strategy/monte_carlo.rs | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index db31511..8a4ea91 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -16,6 +16,7 @@ pub struct BitwiseGameState { pub opponent_buildings: PlayerBuildings, } +//TODO: Add in smallvec? #[derive(Debug, Clone, PartialEq, Eq)] pub struct PlayerBuildings { pub unconstructed: Vec, diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 28df774..de9d95a 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -1,5 +1,8 @@ use engine::constants::*; +//TODO: Change Point to be a single number, or stored as a bitfield +// (bitfield to x and y for writing move might be hard? + #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct Point { pub x: u8, diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 127e690..d4003bb 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -123,6 +123,7 @@ fn random_opponent_move(settings: &GameSettings, state: & random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } +// TODO: Given enough energy, most opponents won't do nothing fn random_movePoint>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point: F) -> Command { let building_command_count = free_positions_count*all_buildings.len(); let nothing_count = 1; @@ -131,6 +132,8 @@ fn random_movePoint>(all_buildings: &[BuildingType], rng: let choice_index = rng.gen_range(0, number_of_commands); + // TODO: Remove the divide here? + if choice_index == number_of_commands - 1 { Command::Nothing } else { @@ -192,7 +195,8 @@ impl CommandScore { fn win_ratio(&self) -> i32 { (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) } - + + //TODO: Devalue nothing so that it doesn't stand and do nothing when it can do things fn init_command_scores(settings: &GameSettings, state: &GS) -> Vec { let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); @@ -229,6 +233,7 @@ fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: } +//TODO: Heuristic that avoids building the initial energy towers all in the same row? #[cfg(feature = "energy-cutoff")] fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); -- cgit v1.2.3 From f41255a8dda9e2c6a18c32564a30e63eed58f6b3 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 13:10:14 +0200 Subject: Removed expressive engine Refocus on the bitwise idea. It's faster, and has more potential for speed. Also, it works well as a way of thinking on the puzzle as a whole. --- src/bin/perf-test.rs | 14 - src/engine/expressive_engine.rs | 412 ------------------------------ src/engine/mod.rs | 1 - src/input/json.rs | 117 +-------- tests/expressive_to_bitwise_comparison.rs | 256 ------------------- 5 files changed, 7 insertions(+), 793 deletions(-) delete mode 100644 src/engine/expressive_engine.rs delete mode 100644 tests/expressive_to_bitwise_comparison.rs diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 8d6a490..8c93f5a 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -13,20 +13,6 @@ fn main() { bitwise(); } -fn _expressive() { - println!("Running expressive engine"); - let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) { - Ok(ok) => ok, - Err(error) => { - println!("Error while parsing JSON file: {}", error); - process::exit(1); - } - }; - let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); -} - fn bitwise() { println!("Running bitwise engine"); let start_time = PreciseTime::now(); diff --git a/src/engine/expressive_engine.rs b/src/engine/expressive_engine.rs deleted file mode 100644 index 557e0fa..0000000 --- a/src/engine/expressive_engine.rs +++ /dev/null @@ -1,412 +0,0 @@ -use std::ops::FnMut; -use engine::command::{Command, BuildingType}; -use engine::geometry::Point; -use engine::settings::{GameSettings, BuildingSettings}; -use engine::{GameStatus, Player, GameState}; - -#[derive(Debug, Clone, PartialEq)] -pub struct ExpressiveGameState { - pub status: GameStatus, - pub player: Player, - pub opponent: Player, - pub player_unconstructed_buildings: Vec, - pub player_buildings: Vec, - pub unoccupied_player_cells: Vec, - pub opponent_unconstructed_buildings: Vec, - pub opponent_buildings: Vec, - pub unoccupied_opponent_cells: Vec, - pub player_missiles: Vec, - pub opponent_missiles: Vec -} - -#[derive(Debug, Clone, PartialEq)] -pub struct UnconstructedBuilding { - pub pos: Point, - pub health: u8, - pub construction_time_left: u8, - pub weapon_damage: u8, - pub weapon_speed: u8, - pub weapon_cooldown_period: u8, - pub energy_generated_per_turn: u16 -} - -#[derive(Debug, Clone, PartialEq)] -pub struct Building { - pub pos: Point, - pub health: u8, - pub weapon_damage: u8, - pub weapon_speed: u8, - pub weapon_cooldown_time_left: u8, - pub weapon_cooldown_period: u8, - pub energy_generated_per_turn: u16, - pub age: u16 -} - -#[derive(Debug, Clone, PartialEq)] -pub struct Missile { - pub pos: Point, - pub damage: u8, - pub speed: u8, -} - -impl GameState for ExpressiveGameState { - fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { - if self.status.is_complete() { - return self.status; - } - - ExpressiveGameState::perform_construct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, settings, player_command, &settings.size); - ExpressiveGameState::perform_construct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, settings, opponent_command, &settings.size); - ExpressiveGameState::perform_deconstruct_command(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player, &mut self.unoccupied_player_cells, player_command); - ExpressiveGameState::perform_deconstruct_command(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent, &mut self.unoccupied_opponent_cells, opponent_command); - - ExpressiveGameState::update_construction(&mut self.player_unconstructed_buildings, &mut self.player_buildings, &mut self.player); - ExpressiveGameState::update_construction(&mut self.opponent_unconstructed_buildings, &mut self.opponent_buildings, &mut self.opponent); - - ExpressiveGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.unoccupied_player_cells, &mut self.opponent, &mut self.opponent_buildings, &mut self.unoccupied_opponent_cells, &settings); - - ExpressiveGameState::add_missiles(&mut self.player_buildings, &mut self.player_missiles); - ExpressiveGameState::add_missiles(&mut self.opponent_buildings, &mut self.opponent_missiles); - - ExpressiveGameState::move_missiles(&mut self.player_missiles, |p| p.wrapping_move_right(), - &mut self.opponent_buildings, &mut self.opponent, - &mut self.unoccupied_opponent_cells, - &settings); - ExpressiveGameState::move_missiles(&mut self.opponent_missiles, |p| p.wrapping_move_left(), - &mut self.player_buildings, &mut self.player, - &mut self.unoccupied_player_cells, - &settings); - - ExpressiveGameState::add_energy(&mut self.player); - ExpressiveGameState::add_energy(&mut self.opponent); - - ExpressiveGameState::update_status(self); - - self.status - } - - - fn player(&self) -> &Player { &self.player } - fn opponent(&self) -> &Player { &self.opponent } - fn player_has_max_teslas(&self) -> bool { self.count_player_teslas() >= 2 } - fn opponent_has_max_teslas(&self) -> bool { self.count_opponent_teslas() >= 2 } - - fn unoccupied_player_cell_count(&self) -> usize { self.unoccupied_player_cells.len() } - fn unoccupied_opponent_cell_count(&self) -> usize { self.unoccupied_opponent_cells.len() } - fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { self.unoccupied_player_cells[i] } - fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { self.unoccupied_opponent_cells[i] } -} - -impl ExpressiveGameState { - pub fn new( - player: Player, opponent: Player, - player_unconstructed_buildings: Vec, player_buildings: Vec, - opponent_unconstructed_buildings: Vec, opponent_buildings: Vec, - player_missiles: Vec, opponent_missiles: Vec, - settings: &GameSettings) -> ExpressiveGameState { - - let unoccupied_player_cells = ExpressiveGameState::unoccupied_cells( - &player_buildings, &player_unconstructed_buildings, Point::new(0, 0), Point::new(settings.size.x/2, settings.size.y) - ); - let unoccupied_opponent_cells = ExpressiveGameState::unoccupied_cells( - &opponent_buildings, &opponent_unconstructed_buildings, Point::new(settings.size.x/2, 0), Point::new(settings.size.x, settings.size.y) - ); - ExpressiveGameState { - status: GameStatus::Continue, - player, opponent, - player_unconstructed_buildings, player_buildings, unoccupied_player_cells, - opponent_unconstructed_buildings, opponent_buildings, unoccupied_opponent_cells, - player_missiles, opponent_missiles - } - } - - /** - * Sorts the various arrays. Generally not necessary, but useful - * for tests that check equality between states. - */ - #[cfg(debug_assertions)] - pub fn sort(&mut self) { - self.player_unconstructed_buildings.sort_by_key(|b| b.pos); - self.player_buildings.sort_by_key(|b| b.pos); - self.unoccupied_player_cells.sort(); - self.opponent_unconstructed_buildings.sort_by_key(|b| b.pos); - self.opponent_buildings.sort_by_key(|b| b.pos); - self.unoccupied_opponent_cells.sort(); - self.player_missiles.sort_by_key(|b| b.pos); - self.opponent_missiles.sort_by_key(|b| b.pos); - } - - fn perform_construct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings, command: Command, size: &Point) { - if let Command::Build(p, b) = command { - let blueprint = settings.building_settings(b); - - // This is used internally. I should not be making - // invalid moves! - debug_assert!(!buildings.iter().any(|b| b.pos == p)); - debug_assert!(p.x < size.x && p.y < size.y); - debug_assert!(player.energy >= blueprint.price); - debug_assert!(b != BuildingType::Tesla || - (unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - buildings.iter().filter(|b| b.weapon_damage == 20).count() < 2)); - - player.energy -= blueprint.price; - unconstructed_buildings.push(UnconstructedBuilding::new(p, blueprint)); - - let to_remove_index = unoccupied_cells.iter().position(|&pos| pos == p).unwrap(); - unoccupied_cells.swap_remove(to_remove_index); - } - } - fn perform_deconstruct_command(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player, unoccupied_cells: &mut Vec, command: Command) { - if let Command::Deconstruct(p) = command { - let to_remove_index = buildings.iter().position(|ref b| b.pos == p); - let unconstructed_to_remove_index = unconstructed_buildings.iter().position(|ref b| b.pos == p); - debug_assert!(to_remove_index.is_some() || unconstructed_to_remove_index.is_some()); - - if let Some(i) = to_remove_index { - player.energy_generated -= buildings[i].energy_generated_per_turn; - buildings.swap_remove(i); - } - if let Some(i) = unconstructed_to_remove_index { - unconstructed_buildings.swap_remove(i); - } - - player.energy += 5; - - unoccupied_cells.push(p); - } - } - - fn update_construction(unconstructed_buildings: &mut Vec, buildings: &mut Vec, player: &mut Player) { - let mut buildings_len = unconstructed_buildings.len(); - for i in (0..buildings_len).rev() { - if unconstructed_buildings[i].is_constructed() { - player.energy_generated += unconstructed_buildings[i].energy_generated_per_turn; - buildings.push(unconstructed_buildings[i].to_building()); - buildings_len -= 1; - unconstructed_buildings.swap(i, buildings_len); - } else { - unconstructed_buildings[i].construction_time_left -= 1 - } - } - unconstructed_buildings.truncate(buildings_len); - } - - fn fire_teslas(player: &mut Player, player_buildings: &mut Vec, player_unoccupied_cells: &mut Vec, opponent: &mut Player, opponent_buildings: &mut Vec, opponent_unoccupied_cells: &mut Vec,settings: &GameSettings) { - #[cfg(debug_assertions)] - { - player_buildings.sort_by(|a, b| b.age.cmp(&a.age).then(a.pos.cmp(&b.pos))); - opponent_buildings.sort_by(|a, b| b.age.cmp(&a.age).then(a.pos.cmp(&b.pos))); - } - - for tesla in player_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { - tesla.age += 1; - if tesla.weapon_cooldown_time_left > 0 { - tesla.weapon_cooldown_time_left -= 1; - } else if player.energy >= 100 { - player.energy -= 100; - tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; - - if tesla.pos.x + 1 >= settings.size.x/2 { - opponent.health = opponent.health.saturating_sub(settings.tesla.weapon_damage); - } - 'player_col_loop: for x in tesla.pos.x+1..tesla.pos.x+(settings.size.x/2)+2 { - for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { - let target_point = Point::new(x, y); - for b in 0..opponent_buildings.len() { - if opponent_buildings[b].pos == target_point && opponent_buildings[b].health > 0 { - opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); - continue 'player_col_loop; - } - } - } - } - } - } - - for tesla in opponent_buildings.iter_mut().filter(|b| b.weapon_damage == 20) { - tesla.age += 1; - if tesla.weapon_cooldown_time_left > 0 { - tesla.weapon_cooldown_time_left -= 1; - } else if opponent.energy >= 100 { - opponent.energy -= 100; - tesla.weapon_cooldown_time_left = tesla.weapon_cooldown_period; - - if tesla.pos.x <= settings.size.x/2 { - player.health = player.health.saturating_sub(settings.tesla.weapon_damage); - } - 'opponent_col_loop: for x in tesla.pos.x.saturating_sub((settings.size.x/2)+1)..tesla.pos.x { - for &y in [tesla.pos.y.saturating_sub(1), tesla.pos.y, tesla.pos.y.saturating_add(1)].iter() { - let target_point = Point::new(x, y); - for b in 0..player_buildings.len() { - if player_buildings[b].pos == target_point && player_buildings[b].health > 0 { - player_buildings[b].health = player_buildings[b].health.saturating_sub(settings.tesla.weapon_damage); - continue 'opponent_col_loop; - } - } - } - } - } - } - - for building in player_buildings.iter().filter(|b| b.health == 0) { - player_unoccupied_cells.push(building.pos); - player.energy_generated -= building.energy_generated_per_turn; - } - player_buildings.retain(|b| b.health > 0); - - for building in opponent_buildings.iter().filter(|b| b.health == 0) { - opponent_unoccupied_cells.push(building.pos); - opponent.energy_generated -= building.energy_generated_per_turn; - } - opponent_buildings.retain(|b| b.health > 0); - } - - fn add_missiles(buildings: &mut Vec, missiles: &mut Vec) { - for building in buildings.iter_mut().filter(|b| b.is_shooty()) { - if building.weapon_cooldown_time_left > 0 { - building.weapon_cooldown_time_left -= 1; - } else { - missiles.push(Missile { - pos: building.pos, - speed: building.weapon_speed, - damage: building.weapon_damage, - }); - building.weapon_cooldown_time_left = building.weapon_cooldown_period; - } - } - } - - fn move_missiles(missiles: &mut Vec, mut wrapping_move_fn: F, opponent_buildings: &mut Vec, opponent: &mut Player, unoccupied_cells: &mut Vec, settings: &GameSettings) - where F: FnMut(&mut Point) { - let mut missiles_len = missiles.len(); - 'speed_loop: for _ in 0..settings.attack.weapon_speed { - 'missile_loop: for m in (0..missiles.len()).rev() { - wrapping_move_fn(&mut missiles[m].pos); - if missiles[m].pos.x >= settings.size.x { - opponent.health = opponent.health.saturating_sub(missiles[m].damage); - - missiles_len -= 1; - missiles.swap(m, missiles_len); - - continue 'missile_loop; - } - else { - for b in 0..opponent_buildings.len() { - if opponent_buildings[b].pos == missiles[m].pos { - opponent_buildings[b].health = opponent_buildings[b].health.saturating_sub(missiles[m].damage); - - missiles_len -= 1; - missiles.swap(m, missiles_len); - - if opponent_buildings[b].health == 0 { - unoccupied_cells.push(opponent_buildings[b].pos); - opponent.energy_generated -= opponent_buildings[b].energy_generated_per_turn; - opponent_buildings.swap_remove(b); - } - //after game engine bug fix, this should go back to missile_loop - continue 'missile_loop; - } - } - } - } - missiles.truncate(missiles_len); - } - } - - fn add_energy(player: &mut Player) { - player.energy += player.energy_generated; - } - - fn update_status(state: &mut ExpressiveGameState) { - let player_dead = state.player.health == 0; - let opponent_dead = state.opponent.health == 0; - state.status = match (player_dead, opponent_dead) { - (true, true) => GameStatus::Draw, - (false, true) => GameStatus::PlayerWon, - (true, false) => GameStatus::OpponentWon, - (false, false) => GameStatus::Continue, - }; - } - - fn unoccupied_cells(buildings: &[Building], unconstructed_buildings: &[UnconstructedBuilding], bl: Point, tr: Point) -> Vec { - let mut result = Vec::with_capacity((tr.y-bl.y) as usize * (tr.x-bl.x) as usize); - for y in bl.y..tr.y { - for x in bl.x..tr.x { - let pos = Point::new(x, y); - if !buildings.iter().any(|b| b.pos == pos) && !unconstructed_buildings.iter().any(|b| b.pos == pos) { - result.push(pos); - } - } - } - result - } - - pub fn count_player_teslas(&self) -> usize { - self.player_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - self.player_buildings.iter().filter(|b| b.weapon_damage == 20).count() - } - - pub fn count_opponent_teslas(&self) -> usize { - self.opponent_unconstructed_buildings.iter().filter(|b| b.weapon_damage == 20).count() + - self.opponent_buildings.iter().filter(|b| b.weapon_damage == 20).count() - } -} - -impl GameStatus { - fn is_complete(&self) -> bool { - *self != GameStatus::Continue - } -} - - - -impl UnconstructedBuilding { - pub fn new(pos: Point, blueprint: &BuildingSettings) -> UnconstructedBuilding { - UnconstructedBuilding { - pos, - health: blueprint.health, - construction_time_left: blueprint.construction_time, - weapon_damage: blueprint.weapon_damage, - weapon_speed: blueprint.weapon_speed, - weapon_cooldown_period: blueprint.weapon_cooldown_period, - energy_generated_per_turn: blueprint.energy_generated_per_turn - } - } - - fn is_constructed(&self) -> bool { - self.construction_time_left == 0 - } - - fn to_building(&self) -> Building { - Building { - pos: self.pos, - health: self.health, - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - age: 0 - } - } -} - -impl Building { - pub fn new(pos: Point, blueprint: &BuildingSettings) -> Building { - Building { - pos, - health: blueprint.health, - weapon_damage: blueprint.weapon_damage, - weapon_speed: blueprint.weapon_speed, - weapon_cooldown_time_left: 0, - weapon_cooldown_period: blueprint.weapon_cooldown_period, - energy_generated_per_turn: blueprint.energy_generated_per_turn, - age: 0 - } - } - - fn is_shooty(&self) -> bool { - self.weapon_damage > 0 && self.weapon_damage < 20 - } -} - diff --git a/src/engine/mod.rs b/src/engine/mod.rs index a444059..c205d72 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -1,7 +1,6 @@ pub mod command; pub mod geometry; pub mod settings; -pub mod expressive_engine; pub mod bitwise_engine; pub mod constants; diff --git a/src/input/json.rs b/src/input/json.rs index 000c355..200252a 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -5,21 +5,9 @@ use std::error::Error; use engine; use engine::command; -use engine::expressive_engine; use engine::bitwise_engine; use engine::constants::*; -pub fn read_expressive_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, expressive_engine::ExpressiveGameState), Box> { - let mut file = File::open(filename)?; - let mut content = String::new(); - file.read_to_string(&mut content)?; - let state: State = serde_json::from_str(content.as_ref())?; - - let engine_settings = state.to_engine_settings(); - let engine_state = state.to_expressive_engine(&engine_settings); - Ok((engine_settings, engine_state)) -} - pub fn read_bitwise_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, bitwise_engine::BitwiseGameState), Box> { let mut file = File::open(filename)?; let mut content = String::new(); @@ -99,10 +87,10 @@ struct BuildingState { health: u8, construction_time_left: i16, //price: u16, - weapon_damage: u8, - weapon_speed: u8, + //weapon_damage: u8, + //weapon_speed: u8, weapon_cooldown_time_left: u8, - weapon_cooldown_period: u8, + //weapon_cooldown_period: u8, //destroy_multiplier: u32, //construction_score: u32, energy_generated_per_turn: u16, @@ -115,10 +103,10 @@ struct BuildingState { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct MissileState { - damage: u8, - speed: u8, - x: u8, - y: u8, + //damage: u8, + //speed: u8, + //x: u8, + //y: u8, player_type: char } @@ -135,22 +123,6 @@ impl State { ) } - fn to_expressive_engine(&self, settings: &engine::settings::GameSettings) -> expressive_engine::ExpressiveGameState { - let player_buildings = self.buildings_to_expressive_engine('A'); - let opponent_buildings = self.buildings_to_expressive_engine('B'); - expressive_engine::ExpressiveGameState::new( - self.player().to_engine(settings, &player_buildings), - self.opponent().to_engine(settings, &opponent_buildings), - self.unconstructed_buildings_to_expressive_engine('A'), - player_buildings, - self.unconstructed_buildings_to_expressive_engine('B'), - opponent_buildings, - self.missiles_to_expressive_engine('A'), - self.missiles_to_expressive_engine('B'), - settings - ) - } - fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { let mut player = self.player().to_bitwise_engine(); let mut opponent = self.opponent().to_bitwise_engine(); @@ -237,39 +209,6 @@ impl State { .find(|p| p.player_type == 'B') .expect("Opponent character did not appear in state.json") } - - fn unconstructed_buildings_to_expressive_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left >= 0) - .map(|b| b.to_expressive_engine_unconstructed()) - ) - ) - .collect() - } - - fn buildings_to_expressive_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.buildings.iter() - .filter(|b| b.player_type == player_type && b.construction_time_left < 0) - .map(|b| b.to_expressive_engine()) - ) - ) - .collect() - } - - fn missiles_to_expressive_engine(&self, player_type: char) -> Vec { - self.game_map.iter() - .flat_map(|row| row.iter() - .flat_map(|cell| cell.missiles.iter() - .filter(|b| b.player_type == player_type) - .map(|b| b.to_expressive_engine()) - ) - ) - .collect() - } } impl BuildingBlueprint { @@ -287,13 +226,6 @@ impl BuildingBlueprint { } impl Player { - fn to_engine(&self, settings: &engine::settings::GameSettings, buildings: &[expressive_engine::Building]) -> engine::Player { - engine::Player { - energy: self.energy, - health: self.health, - energy_generated: settings.energy_income + buildings.iter().map(|b| b.energy_generated_per_turn).sum::() - } - } fn to_bitwise_engine(&self) -> engine::Player { engine::Player { energy: self.energy, @@ -304,31 +236,6 @@ impl Player { } impl BuildingState { - fn to_expressive_engine(&self) -> expressive_engine::Building { - expressive_engine::Building { - pos: engine::geometry::Point::new(self.x, self.y), - health: self.health, - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_time_left: self.weapon_cooldown_time_left, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - age: self.construction_time_left.abs() as u16 - } - } - - fn to_expressive_engine_unconstructed(&self) -> expressive_engine::UnconstructedBuilding { - expressive_engine::UnconstructedBuilding { - pos: engine::geometry::Point::new(self.x, self.y), - health: self.health, - construction_time_left: self.construction_time_left as u8, // > 0 check already happened - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - } - } - fn to_bitwise_engine_unconstructed(&self) -> bitwise_engine::UnconstructedBuilding { bitwise_engine::UnconstructedBuilding { pos: engine::geometry::Point::new(self.x, self.y), @@ -346,13 +253,3 @@ impl BuildingState { } } } - -impl MissileState { - fn to_expressive_engine(&self) -> expressive_engine::Missile { - expressive_engine::Missile { - pos: engine::geometry::Point::new(self.x, self.y), - damage: self.damage, - speed: self.speed, - } - } -} diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs deleted file mode 100644 index 72b5731..0000000 --- a/tests/expressive_to_bitwise_comparison.rs +++ /dev/null @@ -1,256 +0,0 @@ -extern crate zombot; - -#[macro_use] extern crate proptest; -extern crate rand; - -use zombot::input; -use zombot::engine::command::{Command, BuildingType}; -use zombot::engine::geometry::Point; -use zombot::engine::settings::GameSettings; -use zombot::engine::{GameState, GameStatus, Player}; - -use zombot::engine::expressive_engine; -use zombot::engine::bitwise_engine; -use zombot::engine::constants::*; - -use proptest::prelude::*; - -use rand::{Rng, XorShiftRng, SeedableRng}; - - -const STATE_PATH: &str = "tests/state0.json"; - -#[test] -fn reads_into_bitwise_correctly() { - test_reading_from_replay("tests/after_200", 64); -} - -fn test_reading_from_replay(replay_folder: &str, length: usize) { - for i in 0..length { - let state_file = format!("{}/Round {:03}/state.json", replay_folder, i); - - let (_, expressive_state) = input::json::read_expressive_state_from_file(&state_file).expect("Failed to load expressive state"); - let (_, bitwise_state) = input::json::read_bitwise_state_from_file(&state_file).expect("Failed to load bitwise state"); - - assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.clone(), "\nFailed on state {}\n", i); - } -} - - -proptest! { - #[test] - fn follows_the_same_random_game_tree(seed in any::<[u32;4]>()) { - let mut rng = XorShiftRng::from_seed(seed); - - let (settings, mut expressive_state) = input::json::read_expressive_state_from_file(STATE_PATH).expect("Failed to load expressive state"); - let (_, mut bitwise_state) = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); - - expressive_state.sort(); - - let mut expected_status = GameStatus::Continue; - while expected_status == GameStatus::Continue { - let player_command = random_player_move(&settings, &expressive_state, &bitwise_state, &mut rng); - let opponent_command = random_opponent_move(&settings, &expressive_state, &bitwise_state, &mut rng); - println!("Player command: {}", player_command); - println!("Opponent command: {}", opponent_command); - - expected_status = expressive_state.simulate(&settings, player_command, opponent_command); - let actual_status = bitwise_state.simulate(&settings, player_command, opponent_command); - - expressive_state.sort(); - - assert_eq!(&expected_status, &actual_status); - assert_eq!(build_bitwise_from_expressive(&expressive_state), bitwise_state.sorted()); - } - } -} - -fn random_player_move(settings: &GameSettings, expressive_state: &GSE, bitwise_state: &GSB, rng: &mut R) -> Command { - assert_eq!(expressive_state.player_has_max_teslas(), bitwise_state.player_has_max_teslas()); - let all_buildings = sensible_buildings(settings, &expressive_state.player(), expressive_state.player_has_max_teslas()); - random_move(&all_buildings, rng, expressive_state.unoccupied_player_cell_count(), |i| expressive_state.location_of_unoccupied_player_cell(i), |i| bitwise_state.location_of_unoccupied_player_cell(i)) -} - -fn random_opponent_move(settings: &GameSettings, expressive_state: &GSE, bitwise_state: &GSB, rng: &mut R) -> Command { - assert_eq!(expressive_state.player_has_max_teslas(), bitwise_state.player_has_max_teslas()); - let all_buildings = sensible_buildings(settings, &expressive_state.opponent(), expressive_state.opponent_has_max_teslas()); - random_move(&all_buildings, rng, expressive_state.unoccupied_opponent_cell_count(), |i| expressive_state.location_of_unoccupied_opponent_cell(i), |i| bitwise_state.location_of_unoccupied_opponent_cell(i)) -} - -fn random_movePoint, FB:Fn(usize)->Point>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point_expressive: FE, get_point_bitwise: FB) -> Command { - let building_command_count = free_positions_count*all_buildings.len(); - let nothing_count = 1; - - let number_of_commands = building_command_count + nothing_count; - - let choice_index = rng.gen_range(0, number_of_commands); - - if choice_index == number_of_commands - 1 { - Command::Nothing - } else { - let expressive_point = get_point_expressive(choice_index/all_buildings.len()); - let bitwise_point = get_point_bitwise(choice_index/all_buildings.len()); - assert_eq!(expressive_point, bitwise_point); - Command::Build( - expressive_point, - all_buildings[choice_index%all_buildings.len()] - ) - } -} - -fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { - let mut result = Vec::with_capacity(4); - for b in BuildingType::all().iter() { - let building_setting = settings.building_settings(*b); - let affordable = building_setting.price <= player.energy; - let is_tesla = *b == BuildingType::Tesla; - if affordable && (!is_tesla || !has_max_teslas) { - result.push(*b); - } - } - result -} - -fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameState) -> bitwise_engine::BitwiseGameState { - let player_unconstructed = expressive.player_unconstructed_buildings.iter() - .map(build_bitwise_unconstructed_from_expressive) - .collect(); - let opponent_unconstructed = expressive.opponent_unconstructed_buildings.iter() - .map(build_bitwise_unconstructed_from_expressive) - .collect(); - - let player_energy = expressive.player_buildings.iter() - .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield()); - let opponent_energy = expressive.opponent_buildings.iter() - .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Energy) - .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); - - let mut player_buildings_iter = (0..DEFENCE_HEALTH as u8) - .map(|i| expressive.player_buildings.iter() - .filter(|b| b.health > i*MISSILE_DAMAGE) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) - ); - let mut opponent_buildings_iter = (0..DEFENCE_HEALTH as u8) - .map(|i| expressive.opponent_buildings.iter() - .filter(|b| b.health > i*MISSILE_DAMAGE) - .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) - ); - - let player_occupied = expressive.player_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) | - expressive.player_unconstructed_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_left_bitfield()); - let opponent_occupied = expressive.opponent_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) | - expressive.opponent_unconstructed_buildings.iter() - .fold(0, |acc, next| acc | next.pos.to_right_bitfield()); - - let mut player_attack_iter = (0..MISSILE_COOLDOWN_STATES as u8) - .map(|i| expressive.player_buildings.iter() - .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) - .filter(|b| b.weapon_cooldown_time_left == i) - .fold(0, |acc, next| acc | next.pos.to_left_bitfield()) - ); - let mut opponent_attack_iter = (0..MISSILE_COOLDOWN_STATES as u8) - .map(|i| expressive.opponent_buildings.iter() - .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Attack) - .filter(|b| b.weapon_cooldown_time_left == i) - .fold(0, |acc, next| acc | next.pos.to_right_bitfield()) - ); - - let empty_missiles: [(u64,u64);MISSILE_COOLDOWN_STATES] = [(0,0),(0,0),(0,0),(0,0)]; - let player_missiles = expressive.player_missiles.iter() - .fold(empty_missiles, |acc, m| { - let (mut left, mut right) = m.pos.to_bitfield(); - let mut res = acc.clone(); - for mut tier in res.iter_mut() { - let setting = (!tier.0 & left, !tier.1 & right); - tier.0 |= setting.0; - tier.1 |= setting.1; - left &= !setting.0; - right &= !setting.1; - } - res - }); - let opponent_missiles = expressive.opponent_missiles.iter() - .fold(empty_missiles, |acc, m| { - let (mut left, mut right) = m.pos.to_bitfield(); - let mut res = acc.clone(); - for mut tier in res.iter_mut() { - let setting = (!tier.0 & right, !tier.1 & left); - tier.0 |= setting.0; - tier.1 |= setting.1; - right &= !setting.0; - left &= !setting.1; - } - res - }); - - let null_tesla = bitwise_engine::TeslaCooldown { - active: false, - pos: Point::new(0,0), - cooldown: 0, - age: 0 - }; - let mut player_tesla_iter = expressive.player_buildings.iter() - .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Tesla) - .map(|b| bitwise_engine::TeslaCooldown { - active: true, - pos: b.pos, - cooldown: b.weapon_cooldown_time_left, - age: b.age, - }); - let mut opponent_tesla_iter = expressive.opponent_buildings.iter() - .filter(|b| identify_building_type(b.weapon_damage, b.energy_generated_per_turn) == BuildingType::Tesla) - .map(|b| bitwise_engine::TeslaCooldown { - active: true, - pos: b.pos, - cooldown: b.weapon_cooldown_time_left, - age: b.age, - }); - bitwise_engine::BitwiseGameState { - status: expressive.status, - player: expressive.player.clone(), - opponent: expressive.opponent.clone(), - player_buildings: bitwise_engine::PlayerBuildings { - unconstructed: player_unconstructed, - buildings: [player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap(), player_buildings_iter.next().unwrap()], - occupied: player_occupied, - energy_towers: player_energy, - missile_towers: [player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap(), player_attack_iter.next().unwrap()], - firing_tower: 0, - missiles: player_missiles, - tesla_cooldowns: [player_tesla_iter.next().unwrap_or(null_tesla.clone()), - player_tesla_iter.next().unwrap_or(null_tesla.clone())] - }, - opponent_buildings: bitwise_engine::PlayerBuildings { - unconstructed: opponent_unconstructed, - buildings: [opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap(), opponent_buildings_iter.next().unwrap()], - occupied: opponent_occupied, - energy_towers: opponent_energy, - missile_towers: [opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap(), opponent_attack_iter.next().unwrap()], - firing_tower: 0, - missiles: opponent_missiles, - tesla_cooldowns: [opponent_tesla_iter.next().unwrap_or(null_tesla.clone()), - opponent_tesla_iter.next().unwrap_or(null_tesla.clone())] - } - } -} - -fn build_bitwise_unconstructed_from_expressive(b: &expressive_engine::UnconstructedBuilding) -> bitwise_engine::UnconstructedBuilding { - bitwise_engine::UnconstructedBuilding { - pos: b.pos, - construction_time_left: b.construction_time_left, - building_type: identify_building_type(b.weapon_damage, b.energy_generated_per_turn) - } -} - -fn identify_building_type(weapon_damage: u8, energy_generated_per_turn: u16) -> BuildingType { - match (weapon_damage, energy_generated_per_turn) { - (MISSILE_DAMAGE, _) => BuildingType::Attack, - (TESLA_DAMAGE, _) => BuildingType::Tesla, - (_, ENERGY_GENERATED_TOWER) => BuildingType::Energy, - _ => BuildingType::Defence - } -} -- cgit v1.2.3 From ea78e266cff3f57c39442aefc21295a758419e69 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 20:40:03 +0200 Subject: Removed dynamic settings It worked really well for round 2 to set constants --- src/bin/depth-first-search.rs | 105 ------------------------------------------ src/bin/perf-test.rs | 4 +- src/engine/bitwise_engine.rs | 30 +++++++----- src/engine/mod.rs | 35 +------------- src/engine/settings.rs | 44 ------------------ src/engine/status.rs | 7 +++ src/input/json.rs | 82 ++------------------------------- src/main.rs | 11 ++--- src/strategy/monte_carlo.rs | 96 +++++++++++++++++++++----------------- tests/live_comparison.rs | 17 ++++--- tests/monte_carlo_test.rs | 4 +- 11 files changed, 99 insertions(+), 336 deletions(-) delete mode 100644 src/bin/depth-first-search.rs delete mode 100644 src/engine/settings.rs create mode 100644 src/engine/status.rs diff --git a/src/bin/depth-first-search.rs b/src/bin/depth-first-search.rs deleted file mode 100644 index c04061d..0000000 --- a/src/bin/depth-first-search.rs +++ /dev/null @@ -1,105 +0,0 @@ -extern crate zombot; -extern crate time; -use time::PreciseTime; - -use zombot::*; -use zombot::engine::*; -use zombot::engine::settings::*; -use zombot::engine::command::*; - -const STATE_PATH: &str = "tests/state0.json"; - -use std::process; - -fn main() { - println!("Performing an exhaustive depth-first walk of the game states"); - let start_time = PreciseTime::now(); - let (settings, state) = match input::json::read_bitwise_state_from_file(STATE_PATH) { - Ok(ok) => ok, - Err(error) => { - println!("Error while parsing JSON file: {}", error); - process::exit(1); - } - }; - - walk_states(&settings, &state, 0); - - println!("Total running time: {}", start_time.to(PreciseTime::now())); -} - -fn walk_states(settings: &GameSettings, state: &GS, depth: u32) { - if depth >= 200 { - return; - } - - let player_buildings = valid_buildings(settings, &state.player(), state.player_has_max_teslas()); - let opponent_buildings = valid_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); - - for &player_building in &player_buildings { - for player_i in 0..state.unoccupied_player_cell_count() { - for &opponent_building in &opponent_buildings { - for opponent_i in 0..state.unoccupied_opponent_cell_count() { - let player_point = state.location_of_unoccupied_player_cell(player_i); - let player_move = Command::Build(player_point, player_building); - let opponent_point = state.location_of_unoccupied_player_cell(opponent_i); - let opponent_move = Command::Build(opponent_point, opponent_building); - - let mut after_move = state.clone(); - let status = after_move.simulate(settings, player_move, opponent_move); - if status == GameStatus::Continue { - walk_states(settings, &after_move, depth+1); - } - } - } - } - } - for player_building in player_buildings { - for player_i in 0..state.unoccupied_player_cell_count() { - let player_point = state.location_of_unoccupied_player_cell(player_i); - let player_move = Command::Build(player_point, player_building); - let opponent_move = Command::Nothing; - - let mut after_move = state.clone(); - let status = after_move.simulate(settings, player_move, opponent_move); - if status == GameStatus::Continue { - walk_states(settings, &after_move, depth+1); - } - } - } - for opponent_building in opponent_buildings { - for opponent_i in 0..state.unoccupied_opponent_cell_count() { - let player_move = Command::Nothing; - let opponent_point = state.location_of_unoccupied_player_cell(opponent_i); - let opponent_move = Command::Build(opponent_point, opponent_building); - - let mut after_move = state.clone(); - let status = after_move.simulate(settings, player_move, opponent_move); - if status == GameStatus::Continue { - walk_states(settings, &after_move, depth+1); - } - } - } - let player_move = Command::Nothing; - let opponent_move = Command::Nothing; - let mut after_move = state.clone(); - let status = after_move.simulate(settings, player_move, opponent_move); - if status == GameStatus::Continue { - walk_states(settings, &after_move, depth+1); - } - if depth < 10 { - print!("."); - } -} - -fn valid_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { - let mut result = Vec::with_capacity(4); - for b in BuildingType::all().iter() { - let building_setting = settings.building_settings(*b); - let affordable = building_setting.price <= player.energy; - let is_tesla = *b == BuildingType::Tesla; - if affordable && (!is_tesla || !has_max_teslas) { - result.push(*b); - } - } - result -} diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 8c93f5a..415cd61 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -16,7 +16,7 @@ fn main() { fn bitwise() { println!("Running bitwise engine"); 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) => { println!("Error while parsing JSON file: {}", error); @@ -24,5 +24,5 @@ fn bitwise() { } }; let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time); + strategy::monte_carlo::choose_move(&state, &start_time, max_time); } diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 8a4ea91..6b9ccab 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -1,12 +1,18 @@ use engine::command::{Command, BuildingType}; use engine::geometry::Point; -use engine::settings::{GameSettings}; use engine::constants::*; -use engine::{GameStatus, Player, GameState}; +use engine::status::GameStatus; const LEFT_COL_MASK: u64 = 0x0101010101010101; const RIGHT_COL_MASK: u64 = 0x8080808080808080; +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct Player { + pub energy: u16, + pub health: u8, + pub energy_generated: u16, +} + #[derive(Debug, Clone, PartialEq, Eq)] pub struct BitwiseGameState { pub status: GameStatus, @@ -48,8 +54,8 @@ pub struct TeslaCooldown { } -impl GameState for BitwiseGameState { - fn simulate(&mut self, _settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus { +impl BitwiseGameState { + pub fn simulate(&mut self, player_command: Command, opponent_command: Command) -> GameStatus { BitwiseGameState::perform_command(&mut self.player, &mut self.player_buildings, player_command); BitwiseGameState::perform_command(&mut self.opponent, &mut self.opponent_buildings, opponent_command); @@ -71,20 +77,20 @@ impl GameState for BitwiseGameState { self.status } - fn player(&self) -> &Player { &self.player } - fn opponent(&self) -> &Player { &self.opponent } - fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= TESLA_MAX } - fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= TESLA_MAX } + pub fn player(&self) -> &Player { &self.player } + pub fn opponent(&self) -> &Player { &self.opponent } + pub fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= TESLA_MAX } + pub fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= TESLA_MAX } - fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } - fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } - fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { + pub fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } + pub fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } + pub fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.player_buildings.occupied, i as u64); let point = Point::new(bit%SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); debug_assert!(point.to_either_bitfield() & self.player_buildings.occupied == 0); point } - fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { + pub fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.opponent_buildings.occupied, i as u64); let point = Point::new(FULL_MAP_WIDTH - bit%SINGLE_MAP_WIDTH - 1, bit/SINGLE_MAP_WIDTH); debug_assert!(point.to_either_bitfield() & self.opponent_buildings.occupied == 0); diff --git a/src/engine/mod.rs b/src/engine/mod.rs index c205d72..f98ef6b 100644 --- a/src/engine/mod.rs +++ b/src/engine/mod.rs @@ -1,38 +1,5 @@ pub mod command; pub mod geometry; -pub mod settings; pub mod bitwise_engine; pub mod constants; - -use self::command::{Command}; -use self::geometry::Point; -use self::settings::{GameSettings}; - -pub trait GameState: Clone + Sync { - fn simulate(&mut self, settings: &GameSettings, player_command: Command, opponent_command: Command) -> GameStatus; - - fn player(&self) -> &Player; - fn opponent(&self) -> &Player; - fn player_has_max_teslas(&self) -> bool; - fn opponent_has_max_teslas(&self) -> bool; - - fn unoccupied_player_cell_count(&self) -> usize; - fn unoccupied_opponent_cell_count(&self) -> usize; - fn location_of_unoccupied_player_cell(&self, i: usize) -> Point; - fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point; -} - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum GameStatus { - Continue, - PlayerWon, - OpponentWon, - Draw -} - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct Player { - pub energy: u16, - pub health: u8, - pub energy_generated: u16, -} +pub mod status; diff --git a/src/engine/settings.rs b/src/engine/settings.rs deleted file mode 100644 index 18bdde0..0000000 --- a/src/engine/settings.rs +++ /dev/null @@ -1,44 +0,0 @@ -use super::geometry::Point; -use super::command::BuildingType; -use std::cmp; - -#[derive(Debug)] -pub struct GameSettings { - pub size: Point, - pub energy_income: u16, - pub max_building_price: u16, - pub energy: BuildingSettings, - pub defence: BuildingSettings, - pub attack: BuildingSettings, - pub tesla: BuildingSettings, -} - -#[derive(Debug)] -pub struct BuildingSettings { - pub price: u16, - pub health: u8, - pub construction_time: u8, - pub weapon_damage: u8, - pub weapon_speed: u8, - pub weapon_cooldown_period: u8, - pub energy_generated_per_turn: u16 -} - -impl GameSettings { - pub fn new(size: Point, energy_income: u16, energy: BuildingSettings, defence: BuildingSettings, attack: BuildingSettings, tesla: BuildingSettings) -> GameSettings { - let max_building_price = cmp::max(cmp::max(cmp::max(energy.price, defence.price), attack.price), tesla.price); - GameSettings { - size, energy_income, max_building_price, - energy, defence, attack, tesla - } - } - pub fn building_settings(&self, building: BuildingType) -> &BuildingSettings { - match building { - BuildingType::Defence => &self.defence, - BuildingType::Attack => &self.attack, - BuildingType::Energy => &self.energy, - BuildingType::Tesla => &self.tesla, - } - } - -} diff --git a/src/engine/status.rs b/src/engine/status.rs new file mode 100644 index 0000000..1fa7ac0 --- /dev/null +++ b/src/engine/status.rs @@ -0,0 +1,7 @@ +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum GameStatus { + Continue, + PlayerWon, + OpponentWon, + Draw +} diff --git a/src/input/json.rs b/src/input/json.rs index 200252a..9bc0518 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -8,67 +8,29 @@ use engine::command; use engine::bitwise_engine; use engine::constants::*; -pub fn read_bitwise_state_from_file(filename: &str) -> Result<(engine::settings::GameSettings, bitwise_engine::BitwiseGameState), Box> { +pub fn read_bitwise_state_from_file(filename: &str) -> Result> { let mut file = File::open(filename)?; let mut content = String::new(); file.read_to_string(&mut content)?; let state: State = serde_json::from_str(content.as_ref())?; - let engine_settings = state.to_engine_settings(); let engine_state = state.to_bitwise_engine(); - Ok((engine_settings, engine_state)) + Ok(engine_state) } #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct State { - game_details: GameDetails, players: Vec, game_map: Vec>, } -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct GameDetails { - //round: u16, - //max_rounds: u16, - map_width: u8, - map_height: u8, - round_income_energy: u16, - buildings_stats: BuildingStats -} - -#[derive(Deserialize)] -#[serde(rename_all = "SCREAMING_SNAKE_CASE")] -struct BuildingStats { - energy: BuildingBlueprint, - defense: BuildingBlueprint, - attack: BuildingBlueprint, - tesla: BuildingBlueprint, -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct BuildingBlueprint { - price: u16, - health: u8, - construction_time: u8, - weapon_damage: u8, - weapon_speed: u8, - weapon_cooldown_period: u8, - energy_generated_per_turn: u16, -// destroy_multiplier: u16, -// construction_score: u16 -} - #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct Player { player_type: char, energy: u16, health: u8, - //hits_taken: u32, - //score: u32 } #[derive(Deserialize)] @@ -78,7 +40,6 @@ struct GameCell { y: u8, buildings: Vec, missiles: Vec, - //cell_owner: char } #[derive(Deserialize)] @@ -86,13 +47,7 @@ struct GameCell { struct BuildingState { health: u8, construction_time_left: i16, - //price: u16, - //weapon_damage: u8, - //weapon_speed: u8, weapon_cooldown_time_left: u8, - //weapon_cooldown_period: u8, - //destroy_multiplier: u32, - //construction_score: u32, energy_generated_per_turn: u16, building_type: String, x: u8, @@ -103,26 +58,11 @@ struct BuildingState { #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct MissileState { - //damage: u8, - //speed: u8, - //x: u8, - //y: u8, player_type: char } impl State { - fn to_engine_settings(&self) -> engine::settings::GameSettings { - engine::settings::GameSettings::new( - engine::geometry::Point::new(self.game_details.map_width, self.game_details.map_height), - self.game_details.round_income_energy, - self.game_details.buildings_stats.energy.to_engine(), - self.game_details.buildings_stats.defense.to_engine(), - self.game_details.buildings_stats.attack.to_engine(), - self.game_details.buildings_stats.tesla.to_engine(), - ) - } - fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { let mut player = self.player().to_bitwise_engine(); let mut opponent = self.opponent().to_bitwise_engine(); @@ -211,23 +151,9 @@ impl State { } } -impl BuildingBlueprint { - fn to_engine(&self) -> engine::settings::BuildingSettings { - engine::settings::BuildingSettings { - price: self.price, - health: self.health, - construction_time: self.construction_time-1, - weapon_damage: self.weapon_damage, - weapon_speed: self.weapon_speed, - weapon_cooldown_period: self.weapon_cooldown_period, - energy_generated_per_turn: self.energy_generated_per_turn, - } - } -} - impl Player { - fn to_bitwise_engine(&self) -> engine::Player { - engine::Player { + fn to_bitwise_engine(&self) -> engine::bitwise_engine::Player { + engine::bitwise_engine::Player { energy: self.energy, health: self.health, energy_generated: ENERGY_GENERATED_BASE diff --git a/src/main.rs b/src/main.rs index 0235d5f..cdafaba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,12 +16,6 @@ use std::fs::File; use std::io::prelude::*; use std::process; -fn choose_move(settings: &engine::settings::GameSettings, state: &GS, start_time: &PreciseTime) -> Command { - let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - strategy::monte_carlo::choose_move(settings, state, start_time, max_time) -} - - fn write_command(filename: &str, command: Command) -> Result<(), Box > { let mut file = File::create(filename)?; write!(file, "{}", command)?; @@ -31,15 +25,16 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { fn main() { let start_time = PreciseTime::now(); + let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - 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) => { println!("Error while parsing JSON file: {}", error); process::exit(1); } }; - let command = choose_move(&settings, &state, &start_time); + let command = strategy::monte_carlo::choose_move(&state, &start_time, max_time); match write_command(COMMAND_PATH, command) { Ok(()) => {} diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index d4003bb..cf0d77c 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,7 +1,8 @@ -use engine::settings::GameSettings; use engine::command::*; use engine::geometry::*; -use engine::{GameState, GameStatus, Player}; +use engine::status::GameStatus; +use engine::bitwise_engine::{Player, BitwiseGameState}; +use engine::constants::*; use rand::{Rng, XorShiftRng, SeedableRng}; @@ -15,9 +16,9 @@ use rayon::prelude::*; #[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 30; #[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 45; -pub fn choose_move(settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Command { - let mut command_scores = CommandScore::init_command_scores(settings, state); - let command = simulate_options_to_timeout(&mut command_scores, settings, state, start_time, max_time); +pub fn choose_move(state: &BitwiseGameState, start_time: &PreciseTime, max_time: Duration) -> Command { + let mut command_scores = CommandScore::init_command_scores(state); + let command = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); match command { Some(command) => command.command, @@ -26,7 +27,7 @@ pub fn choose_move(settings: &GameSettings, state: &GS, start_tim } #[cfg(not(feature = "discard-poor-performers"))] -fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { +fn simulate_options_to_timeout(command_scores: &'a mut Vec, settings: &GameSettings, state: &BitwiseGameState, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { loop { simulate_all_options_once(command_scores, settings, state); if start_time.to(PreciseTime::now()) > max_time { @@ -44,7 +45,7 @@ fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec(command_scores: &'a mut Vec, settings: &GameSettings, state: &GS, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { +fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { use std::cmp; let min_options = cmp::min(command_scores.len(), 5); @@ -53,7 +54,7 @@ fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec max { break; } @@ -71,37 +72,37 @@ fn simulate_options_to_timeout<'a, GS: GameState>(command_scores: &'a mut Vec(command_scores: &mut[CommandScore], settings: &GameSettings, state: &GS) { +fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &BitwiseGameState) { command_scores.iter_mut() .for_each(|score| { let mut rng = XorShiftRng::from_seed(score.next_seed); - simulate_to_endstate(score, settings, state, &mut rng); + simulate_to_endstate(score, state, &mut rng); }); } #[cfg(not(feature = "single-threaded"))] -fn simulate_all_options_once(command_scores: &mut[CommandScore], settings: &GameSettings, state: &GS) { +fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &BitwiseGameState) { command_scores.par_iter_mut() .for_each(|score| { let mut rng = XorShiftRng::from_seed(score.next_seed); - simulate_to_endstate(score, settings, state, &mut rng); + simulate_to_endstate(score, state, &mut rng); }); } -fn simulate_to_endstate(command_score: &mut CommandScore, settings: &GameSettings, state: &GS, rng: &mut R) { +fn simulate_to_endstate(command_score: &mut CommandScore, state: &BitwiseGameState, rng: &mut R) { let mut state_mut = state.clone(); - let opponent_first = random_opponent_move(settings, &state_mut, rng); - let mut status = state_mut.simulate(settings, command_score.command, opponent_first); + let opponent_first = random_opponent_move(&state_mut, rng); + let mut status = state_mut.simulate(command_score.command, opponent_first); for _ in 0..MAX_MOVES { if status != GameStatus::Continue { break; } - let player_command = random_player_move(settings, &state_mut, rng); - let opponent_command = random_opponent_move(settings, &state_mut, rng); - status = state_mut.simulate(settings, player_command, opponent_command); + let player_command = random_player_move(&state_mut, rng); + let opponent_command = random_opponent_move(&state_mut, rng); + status = state_mut.simulate(player_command, opponent_command); } let next_seed = [rng.next_u32(), rng.next_u32(), rng.next_u32(), rng.next_u32()]; @@ -113,13 +114,13 @@ fn simulate_to_endstate(command_score: &mut CommandScore, } } -fn random_player_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); +fn random_player_move(state: &BitwiseGameState, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(&state.player(), state.player_has_max_teslas()); random_move(&all_buildings, rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) } -fn random_opponent_move(settings: &GameSettings, state: &GS, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(settings, &state.opponent(), state.opponent_has_max_teslas()); +fn random_opponent_move(state: &BitwiseGameState, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(&state.opponent(), state.opponent_has_max_teslas()); random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } @@ -197,8 +198,8 @@ impl CommandScore { } //TODO: Devalue nothing so that it doesn't stand and do nothing when it can do things - fn init_command_scores(settings: &GameSettings, state: &GS) -> Vec { - let all_buildings = sensible_buildings(settings, &state.player(), state.player_has_max_teslas()); + fn init_command_scores(state: &BitwiseGameState) -> Vec { + let all_buildings = sensible_buildings(&state.player(), state.player_has_max_teslas()); let unoccupied_cells = (0..state.unoccupied_player_cell_count()).map(|i| state.location_of_unoccupied_player_cell(i)); @@ -219,36 +220,47 @@ impl CommandScore { } #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { +fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); - for b in BuildingType::all().iter() { - let building_setting = settings.building_settings(*b); - let affordable = building_setting.price <= player.energy; - let is_tesla = *b == BuildingType::Tesla; - if affordable && (!is_tesla || !has_max_teslas) { - result.push(*b); - } + + if DEFENCE_PRICE <= player.energy { + result.push(BuildingType::Defence); + } + if MISSILE_PRICE <= player.energy { + result.push(BuildingType::Attack); + } + if ENERGY_PRICE <= player.energy { + result.push(BuildingType::Energy); } + if TESLA_PRICE <= player.energy && !has_max_teslas { + result.push(BuildingType::Tesla); + } + result } //TODO: Heuristic that avoids building the initial energy towers all in the same row? +//TODO: Update cutoff to maybe build iron curtains #[cfg(feature = "energy-cutoff")] -fn sensible_buildings(settings: &GameSettings, player: &Player, has_max_teslas: bool) -> Vec { +fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); let needs_energy = player.energy_generated <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; - - for b in BuildingType::all().iter() { - let building_setting = settings.building_settings(*b); - let affordable = building_setting.price <= player.energy; - let energy_producing = building_setting.energy_generated_per_turn > 0; - let is_tesla = *b == BuildingType::Tesla; - if affordable && (!energy_producing || needs_energy) && (!is_tesla || !has_max_teslas) { - result.push(*b); - } + + if DEFENCE_PRICE <= player.energy { + result.push(BuildingType::Defence); + } + if MISSILE_PRICE <= player.energy { + result.push(BuildingType::Attack); } + if ENERGY_PRICE <= player.energy && needs_energy { + result.push(BuildingType::Energy); + } + if TESLA_PRICE <= player.energy && !has_max_teslas { + result.push(BuildingType::Tesla); + } + result } 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)) } -- cgit v1.2.3 From 2c7870073e70ac19a6959c5627b04ad3c62d8173 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 20:50:25 +0200 Subject: Removed unnecessary Player field --- src/engine/bitwise_engine.rs | 10 ++++++---- src/input/json.rs | 15 ++++++--------- src/strategy/monte_carlo.rs | 14 +++++++------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 6b9ccab..e1296c8 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -9,8 +9,7 @@ const RIGHT_COL_MASK: u64 = 0x8080808080808080; #[derive(Debug, Clone, PartialEq, Eq)] pub struct Player { pub energy: u16, - pub health: u8, - pub energy_generated: u16, + pub health: u8 } #[derive(Debug, Clone, PartialEq, Eq)] @@ -421,8 +420,7 @@ impl BitwiseGameState { fn add_energy(player: &mut Player, player_buildings: &mut PlayerBuildings) { - player.energy_generated = ENERGY_GENERATED_BASE + player_buildings.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER; - player.energy += player.energy_generated; + player.energy += player_buildings.energy_generated(); } fn update_status(&mut self) { @@ -456,6 +454,10 @@ impl PlayerBuildings { tesla_cooldowns: [TeslaCooldown::empty(); TESLA_MAX] } } + + pub fn energy_generated(&self) -> u16 { + ENERGY_GENERATED_BASE + self.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER + } } impl TeslaCooldown { diff --git a/src/input/json.rs b/src/input/json.rs index 9bc0518..d51200e 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -48,7 +48,6 @@ struct BuildingState { health: u8, construction_time_left: i16, weapon_cooldown_time_left: u8, - energy_generated_per_turn: u16, building_type: String, x: u8, y: u8, @@ -64,8 +63,8 @@ struct MissileState { impl State { fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { - let mut player = self.player().to_bitwise_engine(); - let mut opponent = self.opponent().to_bitwise_engine(); + let player = self.player().to_bitwise_engine(); + let opponent = self.opponent().to_bitwise_engine(); let mut player_buildings = bitwise_engine::PlayerBuildings::empty(); let mut opponent_buildings = bitwise_engine::PlayerBuildings::empty(); for row in &self.game_map { @@ -74,10 +73,10 @@ impl State { for building in &cell.buildings { let building_type = building.convert_building_type(); - let (mut engine_player, mut bitwise_buildings, bitfield) = if building.player_type == 'A' { - (&mut player, &mut player_buildings, point.to_left_bitfield()) + let (mut bitwise_buildings, bitfield) = if building.player_type == 'A' { + (&mut player_buildings, point.to_left_bitfield()) } else { - (&mut opponent, &mut opponent_buildings, point.to_right_bitfield()) + (&mut opponent_buildings, point.to_right_bitfield()) }; bitwise_buildings.occupied |= bitfield; @@ -91,7 +90,6 @@ impl State { } if building_type == command::BuildingType::Energy { bitwise_buildings.energy_towers |= bitfield; - engine_player.energy_generated += building.energy_generated_per_turn; } else if building_type == command::BuildingType::Attack { for cooldown_tier in 0..MISSILE_COOLDOWN + 1 { @@ -155,8 +153,7 @@ impl Player { fn to_bitwise_engine(&self) -> engine::bitwise_engine::Player { engine::bitwise_engine::Player { energy: self.energy, - health: self.health, - energy_generated: ENERGY_GENERATED_BASE + health: self.health } } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index cf0d77c..25b5a66 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,7 +1,7 @@ use engine::command::*; use engine::geometry::*; use engine::status::GameStatus; -use engine::bitwise_engine::{Player, BitwiseGameState}; +use engine::bitwise_engine::{Player, PlayerBuildings, BitwiseGameState}; use engine::constants::*; use rand::{Rng, XorShiftRng, SeedableRng}; @@ -115,12 +115,12 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } fn random_player_move(state: &BitwiseGameState, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(&state.player(), state.player_has_max_teslas()); + let all_buildings = sensible_buildings(&state.player, &state.player_buildings, state.player_has_max_teslas()); random_move(&all_buildings, rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) } fn random_opponent_move(state: &BitwiseGameState, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(&state.opponent(), state.opponent_has_max_teslas()); + let all_buildings = sensible_buildings(&state.opponent, &state.opponent_buildings, state.opponent_has_max_teslas()); random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } @@ -199,7 +199,7 @@ impl CommandScore { //TODO: Devalue nothing so that it doesn't stand and do nothing when it can do things fn init_command_scores(state: &BitwiseGameState) -> Vec { - let all_buildings = sensible_buildings(&state.player(), state.player_has_max_teslas()); + let all_buildings = sensible_buildings(&state.player, &state.player_buildings, state.player_has_max_teslas()); let unoccupied_cells = (0..state.unoccupied_player_cell_count()).map(|i| state.location_of_unoccupied_player_cell(i)); @@ -220,7 +220,7 @@ impl CommandScore { } #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec { +fn sensible_buildings(player: &Player, _player_buildings: &PlayerBuildings, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); if DEFENCE_PRICE <= player.energy { @@ -243,9 +243,9 @@ fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec Vec { +fn sensible_buildings(player: &Player, player_buildings: &PlayerBuildings, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); - let needs_energy = player.energy_generated <= ENERGY_PRODUCTION_CUTOFF || + let needs_energy = player_buildings.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; if DEFENCE_PRICE <= player.energy { -- cgit v1.2.3 From b2cbd720858d482257da98839a5c8ee8c85c6b62 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 21:17:02 +0200 Subject: Converted game engine vectors to arrayvecs --- Cargo.toml | 2 ++ src/engine/bitwise_engine.rs | 71 +++++++++++--------------------------------- src/engine/constants.rs | 2 ++ src/input/json.rs | 14 ++++----- src/lib.rs | 2 ++ 5 files changed, 29 insertions(+), 62 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dfe6413..685dba4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,8 @@ rand = "0.4.2" time = "0.1.4" rayon = "1.0.1" +arrayvec = "0.4.7" + [dev-dependencies] proptest = "0.7.2" diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index e1296c8..40a8562 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -3,6 +3,8 @@ use engine::geometry::Point; use engine::constants::*; use engine::status::GameStatus; +use arrayvec::ArrayVec; + const LEFT_COL_MASK: u64 = 0x0101010101010101; const RIGHT_COL_MASK: u64 = 0x8080808080808080; @@ -21,10 +23,9 @@ pub struct BitwiseGameState { pub opponent_buildings: PlayerBuildings, } -//TODO: Add in smallvec? #[derive(Debug, Clone, PartialEq, Eq)] pub struct PlayerBuildings { - pub unconstructed: Vec, + pub unconstructed: ArrayVec<[UnconstructedBuilding; MAX_CONCURRENT_CONSTRUCTION]>, pub buildings: [u64; DEFENCE_HEALTH], pub occupied: u64, @@ -34,7 +35,7 @@ pub struct PlayerBuildings { pub firing_tower: usize, pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], - pub tesla_cooldowns: [TeslaCooldown; TESLA_MAX] + pub tesla_cooldowns: ArrayVec<[TeslaCooldown; TESLA_MAX]> } #[derive(Debug, Clone, PartialEq, Eq)] @@ -46,7 +47,6 @@ pub struct UnconstructedBuilding { #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct TeslaCooldown { - pub active: bool, pub pos: Point, pub cooldown: u8, pub age: u16 @@ -169,23 +169,8 @@ impl BitwiseGameState { self.player_buildings.unconstructed.sort_by_key(|b| b.pos); self.opponent_buildings.unconstructed.sort_by_key(|b| b.pos); - for tesla in self.player_buildings.tesla_cooldowns.iter_mut() { - if !tesla.active { - tesla.pos = Point::new(0,0); - tesla.cooldown = 0; - tesla.age = 0; - } - } - for tesla in self.opponent_buildings.tesla_cooldowns.iter_mut() { - if !tesla.active { - tesla.pos = Point::new(0,0); - tesla.cooldown = 0; - tesla.age = 0; - } - } - - self.player_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); - self.opponent_buildings.tesla_cooldowns.sort_by_key(|b| (!b.active, b.pos)); + self.player_buildings.tesla_cooldowns.sort_by_key(|b| b.pos); + self.opponent_buildings.tesla_cooldowns.sort_by_key(|b| b.pos); while self.player_buildings.firing_tower > 0 { @@ -269,11 +254,7 @@ impl BitwiseGameState { for tier in 0..player_buildings.missile_towers.len() { player_buildings.missile_towers[tier] &= deconstruct_mask; } - for tesla in 0..player_buildings.tesla_cooldowns.len() { - if player_buildings.tesla_cooldowns[tesla].pos == p { - player_buildings.tesla_cooldowns[tesla].active = false; - } - } + player_buildings.tesla_cooldowns.retain(|t| t.pos != p); player_buildings.occupied &= deconstruct_mask; } } @@ -299,15 +280,11 @@ impl BitwiseGameState { player_buildings.missile_towers[player_buildings.firing_tower] |= bitfield; } if building_type == BuildingType::Tesla { - let ref mut tesla_cooldown = if player_buildings.tesla_cooldowns[0].active { - &mut player_buildings.tesla_cooldowns[1] - } else { - &mut player_buildings.tesla_cooldowns[0] - }; - tesla_cooldown.active = true; - tesla_cooldown.pos = pos; - tesla_cooldown.cooldown = 0; - tesla_cooldown.age = 0; + player_buildings.tesla_cooldowns.push(TeslaCooldown { + pos: pos, + cooldown: 0, + age: 0 + }); } buildings_len -= 1; @@ -329,7 +306,7 @@ impl BitwiseGameState { fn fire_single_players_teslas_without_cleanup(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { player_buildings.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); - for tesla in player_buildings.tesla_cooldowns.iter_mut().filter(|t| t.active) { + for tesla in player_buildings.tesla_cooldowns.iter_mut() { tesla.age += 1; if tesla.cooldown > 0 { tesla.cooldown -= 1; @@ -413,9 +390,8 @@ impl BitwiseGameState { } fn update_tesla_activity(buildings: &mut PlayerBuildings) { - for i in 0..TESLA_MAX { - buildings.tesla_cooldowns[i].active = buildings.tesla_cooldowns[i].active && (buildings.tesla_cooldowns[i].pos.to_either_bitfield() & buildings.occupied) != 0; - } + let occupied = buildings.occupied; + buildings.tesla_cooldowns.retain(|t| (t.pos.to_either_bitfield() & occupied) != 0); } @@ -438,20 +414,20 @@ impl BitwiseGameState { impl PlayerBuildings { pub fn count_teslas(&self) -> usize { - self.tesla_cooldowns.iter().filter(|t| t.active).count() + self.tesla_cooldowns.len() + self.unconstructed.iter().filter(|t| t.building_type == BuildingType::Tesla).count() } pub fn empty() -> PlayerBuildings { PlayerBuildings { - unconstructed: Vec::with_capacity(4), + unconstructed: ArrayVec::new(), buildings: [0; DEFENCE_HEALTH], occupied: 0, energy_towers: 0, missile_towers: [0; MISSILE_COOLDOWN_STATES], firing_tower: 0, missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], - tesla_cooldowns: [TeslaCooldown::empty(); TESLA_MAX] + tesla_cooldowns: ArrayVec::new() } } @@ -459,14 +435,3 @@ impl PlayerBuildings { ENERGY_GENERATED_BASE + self.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER } } - -impl TeslaCooldown { - pub fn empty() -> TeslaCooldown { - TeslaCooldown { - active: false, - pos: Point::new(0,0), - cooldown: 0, - age: 0 - } - } -} diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 8453a54..2e80988 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -28,6 +28,8 @@ pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; pub const DECONSTRUCT_ENERGY: u16 = 5; +pub const MAX_CONCURRENT_CONSTRUCTION: usize = 5; //2 teslas, and 3 of anything else + #[cfg(not(feature = "reduced-time"))] #[cfg(not(feature = "extended-time"))] diff --git a/src/input/json.rs b/src/input/json.rs index d51200e..3927a96 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -99,15 +99,11 @@ impl State { } } else if building_type == command::BuildingType::Tesla { - let ref mut tesla_cooldown = if bitwise_buildings.tesla_cooldowns[0].active { - &mut bitwise_buildings.tesla_cooldowns[1] - } else { - &mut bitwise_buildings.tesla_cooldowns[0] - }; - tesla_cooldown.active = true; - tesla_cooldown.pos = point; - tesla_cooldown.cooldown = building.weapon_cooldown_time_left; - tesla_cooldown.age = building.construction_time_left.abs() as u16; + bitwise_buildings.tesla_cooldowns.push(bitwise_engine::TeslaCooldown { + pos: point, + cooldown: building.weapon_cooldown_time_left, + age: building.construction_time_left.abs() as u16 + }); } } } diff --git a/src/lib.rs b/src/lib.rs index 7b15502..de8b120 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,6 +9,8 @@ extern crate time; extern crate rayon; +extern crate arrayvec; + pub mod input; pub mod engine; pub mod strategy; -- cgit v1.2.3 From 52c4dc1dd7bbe6546e0a2b3eeb4b5ec78d3fb582 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 22:08:16 +0200 Subject: Updated point representation to better match my heavy bitfield usage --- src/engine/bitwise_engine.rs | 18 +++++------ src/engine/command.rs | 4 +-- src/engine/geometry.rs | 76 ++++++++++++-------------------------------- src/input/json.rs | 15 +++++---- tests/live_comparison.rs | 14 +------- 5 files changed, 41 insertions(+), 86 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 40a8562..0cfd5fc 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -85,13 +85,13 @@ impl BitwiseGameState { pub fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } pub fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.player_buildings.occupied, i as u64); - let point = Point::new(bit%SINGLE_MAP_WIDTH, bit/SINGLE_MAP_WIDTH); + let point = Point { index: bit }; debug_assert!(point.to_either_bitfield() & self.player_buildings.occupied == 0); point } pub fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.opponent_buildings.occupied, i as u64); - let point = Point::new(FULL_MAP_WIDTH - bit%SINGLE_MAP_WIDTH - 1, bit/SINGLE_MAP_WIDTH); + let point = Point { index: bit }; debug_assert!(point.to_either_bitfield() & self.opponent_buildings.occupied == 0); point } @@ -222,7 +222,7 @@ impl BitwiseGameState { // This is used internally. I should not be making // invalid moves! debug_assert!(player_buildings.buildings[0] & bitfield == 0); - debug_assert!(p.x < FULL_MAP_WIDTH && p.y < MAP_HEIGHT); + debug_assert!(p.x() < FULL_MAP_WIDTH && p.y() < MAP_HEIGHT); debug_assert!(player.energy >= price); debug_assert!(b != BuildingType::Tesla || player_buildings.count_teslas() < TESLA_MAX); @@ -314,20 +314,20 @@ impl BitwiseGameState { player.energy -= TESLA_FIRING_ENERGY; tesla.cooldown = TESLA_COOLDOWN; - let flipped_pos = tesla.pos.flip_x(); - - if flipped_pos.x >= SINGLE_MAP_WIDTH - 1 { + if tesla.pos.to_either_bitfield() & RIGHT_COL_MASK != 0 { opponent.health = opponent.health.saturating_sub(TESLA_DAMAGE); } - let missed_cells = ((SINGLE_MAP_WIDTH - flipped_pos.x) as u32).saturating_sub(2); + let x = tesla.pos.x(); + let y = tesla.pos.y(); + let missed_cells = ((SINGLE_MAP_WIDTH - x) as u32).saturating_sub(2); - let top_row = if tesla.pos.y == 0 { 0 } else { tesla.pos.y - 1 }; + let top_row = y.saturating_sub(1); let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; let mut hits = 0; - for _ in 0..(if tesla.pos.y == 0 || tesla.pos.y == MAP_HEIGHT-1 { 2 } else { 3 }) { + for _ in 0..(if y == 0 || y == MAP_HEIGHT-1 { 2 } else { 3 }) { hits |= destroy_mask & opponent_buildings.buildings[0]; destroy_mask &= !hits; destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; diff --git a/src/engine/command.rs b/src/engine/command.rs index 3ea0fbe..da7e1e0 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -12,8 +12,8 @@ impl fmt::Display for Command { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { Command::Nothing => write!(f, ""), - Command::Build(p, b) => write!(f, "{},{},{}", p.x, p.y, b as u8), - Command::Deconstruct(p) => write!(f, "{},{},3", p.x, p.y), + Command::Build(p, b) => write!(f, "{},{},{}", p.x(), p.y(), b as u8), + Command::Deconstruct(p) => write!(f, "{},{},3", p.x(), p.y()), } } } diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index de9d95a..bfa59da 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -5,45 +5,36 @@ use engine::constants::*; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct Point { - pub x: u8, - pub y: u8 + pub index: u8 } impl Point { pub fn new(x: u8, y: u8) -> Point { - Point { x, y } - } - pub fn move_left(&self) -> Option { - self.x.checked_sub(1).map(|x| Point { - x, - ..*self - }) - } - pub fn move_right(&self, size: &Point) -> Option { - if self.x + 1 >= size.x { - None + let flipped_x = if x >= SINGLE_MAP_WIDTH { + FULL_MAP_WIDTH - x - 1 } else { - Some(Point { - x: self.x + 1, - ..*self - }) + x + }; + Point { + index: y * SINGLE_MAP_WIDTH + flipped_x } } - pub fn wrapping_move_left(&mut self) { - self.x = self.x.wrapping_sub(1); + pub fn new_double_bitfield(x: u8, y: u8, is_left_player: bool) -> (u64, u64) { + let bitfield = Point::new(x, y).to_either_bitfield(); + if (x >= SINGLE_MAP_WIDTH) == is_left_player { + (0, bitfield) + } else { + (bitfield, 0) + } } - pub fn wrapping_move_right(&mut self) { - self.x = self.x.wrapping_add(1); + + pub fn x(&self) -> u8 { + self.index % SINGLE_MAP_WIDTH } - pub fn flip_x(&self) -> Point { - let flipped_x = if self.x >= SINGLE_MAP_WIDTH { - FULL_MAP_WIDTH - self.x - 1 - } else { - self.x - }; - Point::new(flipped_x, self.y) + pub fn y(&self) -> u8 { + self.index / SINGLE_MAP_WIDTH } } @@ -57,31 +48,8 @@ impl Point { * This involves mirroring the x dimension for the opponent's side */ - - pub fn to_bitfield(&self) -> (u64, u64) { - (self.to_left_bitfield(), self.to_right_bitfield()) - } - - pub fn to_left_bitfield(&self) -> u64 { - if self.x >= SINGLE_MAP_WIDTH { - 0 - } else { - let index = self.y * SINGLE_MAP_WIDTH + self.x; - 1 << index - } - } - - pub fn to_right_bitfield(&self) -> u64 { - if self.x < SINGLE_MAP_WIDTH { - 0 - } else { - let index = self.y * SINGLE_MAP_WIDTH + FULL_MAP_WIDTH - self.x - 1; - 1 << index - } - } - pub fn to_either_bitfield(&self) -> u64 { - self.to_left_bitfield() | self.to_right_bitfield() + 1u64 << self.index } } @@ -95,8 +63,6 @@ impl PartialOrd for Point { } impl Ord for Point { fn cmp(&self, other: &Point) -> Ordering { - let a = self.flip_x(); - let b = other.flip_x(); - a.y.cmp(&b.y).then(a.x.cmp(&b.x)) + self.index.cmp(&other.index) } } diff --git a/src/input/json.rs b/src/input/json.rs index 3927a96..4aebcfa 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -73,11 +73,12 @@ impl State { for building in &cell.buildings { let building_type = building.convert_building_type(); - let (mut bitwise_buildings, bitfield) = if building.player_type == 'A' { - (&mut player_buildings, point.to_left_bitfield()) + let mut bitwise_buildings = if building.player_type == 'A' { + &mut player_buildings } else { - (&mut opponent_buildings, point.to_right_bitfield()) + &mut opponent_buildings }; + let bitfield = point.to_either_bitfield(); bitwise_buildings.occupied |= bitfield; if building.construction_time_left >= 0 { @@ -108,11 +109,11 @@ impl State { } } for missile in &cell.missiles { - let bitfields = point.to_bitfield(); - let (mut bitwise_buildings, mut left, mut right) = if missile.player_type == 'A' { - (&mut player_buildings, bitfields.0, bitfields.1) + let (mut left, mut right) = engine::geometry::Point::new_double_bitfield(cell.x, cell.y, missile.player_type == 'A'); + let mut bitwise_buildings = if missile.player_type == 'A' { + &mut player_buildings } else { - (&mut opponent_buildings, bitfields.1, bitfields.0) + &mut opponent_buildings }; for mut tier in bitwise_buildings.missiles.iter_mut() { diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index 5761454..3297fa8 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -3,7 +3,6 @@ extern crate zombot; use zombot::input::json; use zombot::engine::command::{Command, BuildingType}; use zombot::engine::geometry::Point; -use zombot::engine::constants::*; use std::fs::File; use std::io::prelude::*; @@ -56,16 +55,5 @@ fn read_player_command(filename: &str) -> 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( - FULL_MAP_WIDTH - p.x - 1, - p.y - ), b), - Command::Deconstruct(p) => Command::Deconstruct(Point::new( - FULL_MAP_WIDTH - p.x - 1, - p.y - )), - } - + read_player_command(filename) } -- cgit v1.2.3 From 856a6a17aa927e95e33cffcbd178efe86ce14262 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 9 Aug 2018 22:17:02 +0200 Subject: Rearranged random move selection to avoid expensive division --- src/engine/constants.rs | 2 +- src/strategy/monte_carlo.rs | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 2e80988..458251f 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -28,7 +28,7 @@ pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; pub const DECONSTRUCT_ENERGY: u16 = 5; -pub const MAX_CONCURRENT_CONSTRUCTION: usize = 5; //2 teslas, and 3 of anything else +pub const MAX_CONCURRENT_CONSTRUCTION: usize = 6; //2 teslas, and 3 of anything else, 1 extra because it's push here then update construction times #[cfg(not(feature = "reduced-time"))] diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 25b5a66..0844402 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -126,21 +126,16 @@ fn random_opponent_move(state: &BitwiseGameState, rng: &mut R) -> Comman // TODO: Given enough energy, most opponents won't do nothing fn random_movePoint>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point: F) -> Command { - let building_command_count = free_positions_count*all_buildings.len(); let nothing_count = 1; - - let number_of_commands = building_command_count + nothing_count; + let building_choice_index = rng.gen_range(0, nothing_count + all_buildings.len()); - let choice_index = rng.gen_range(0, number_of_commands); - - // TODO: Remove the divide here? - - if choice_index == number_of_commands - 1 { + if building_choice_index == all_buildings.len() { Command::Nothing } else { + let position_choice = rng.gen_range(0, free_positions_count); Command::Build( - get_point(choice_index/all_buildings.len()), - all_buildings[choice_index%all_buildings.len()] + get_point(position_choice), + all_buildings[building_choice_index] ) } } -- cgit v1.2.3 From 8a562b9f8cd37fe23bc61974ee2124d77bbd9885 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 11 Aug 2018 17:10:28 +0200 Subject: Clippy-suggested edits --- src/bin/perf-test.rs | 2 +- src/engine/bitwise_engine.rs | 37 ++++++++++++++++++------------------- src/lib.rs | 2 ++ src/main.rs | 2 +- src/strategy/monte_carlo.rs | 6 +++--- tests/monte_carlo_test.rs | 2 +- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index 415cd61..da7a0a5 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -24,5 +24,5 @@ fn bitwise() { } }; let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - strategy::monte_carlo::choose_move(&state, &start_time, max_time); + strategy::monte_carlo::choose_move(&state, start_time, max_time); } diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 0cfd5fc..3dbd7fb 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -5,8 +5,8 @@ use engine::status::GameStatus; use arrayvec::ArrayVec; -const LEFT_COL_MASK: u64 = 0x0101010101010101; -const RIGHT_COL_MASK: u64 = 0x8080808080808080; +const LEFT_COL_MASK: u64 = 0x0101_0101_0101_0101; +const RIGHT_COL_MASK: u64 = 0x8080_8080_8080_8080; #[derive(Debug, Clone, PartialEq, Eq)] pub struct Player { @@ -101,9 +101,9 @@ fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { // Adapted from https://graphics.stanford.edu/~seander/bithacks.html#SelectPosFromMSBRank let v = !occupied; - let mut r = v.count_ones() as u64 - i as u64; + let mut r = u64::from(v.count_ones()) - i; - let a: u64 = v - ((v >> 1) & !0u64/3); + let a: u64 = v - ((v >> 1) & (!0u64/3)); let b: u64 = (a & (!0u64/5)) + ((a >> 2) & (!0u64/5)); let c: u64 = (b + (b >> 4)) & (!0u64/0x11); let d: u64 = (c + (c >> 8)) & (!0u64/0x101); @@ -123,8 +123,7 @@ fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { s -= (t.wrapping_sub(r) & 256) >> 8; s = 65 - s; - let bit = 64 - s as u8; - bit + 64 - s as u8 } impl BitwiseGameState { @@ -281,7 +280,7 @@ impl BitwiseGameState { } if building_type == BuildingType::Tesla { player_buildings.tesla_cooldowns.push(TeslaCooldown { - pos: pos, + pos, cooldown: 0, age: 0 }); @@ -320,7 +319,7 @@ impl BitwiseGameState { let x = tesla.pos.x(); let y = tesla.pos.y(); - let missed_cells = ((SINGLE_MAP_WIDTH - x) as u32).saturating_sub(2); + let missed_cells = (u32::from(SINGLE_MAP_WIDTH - x)).saturating_sub(2); let top_row = y.saturating_sub(1); let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); @@ -330,7 +329,7 @@ impl BitwiseGameState { for _ in 0..(if y == 0 || y == MAP_HEIGHT-1 { 2 } else { 3 }) { hits |= destroy_mask & opponent_buildings.buildings[0]; destroy_mask &= !hits; - destroy_mask = destroy_mask << SINGLE_MAP_WIDTH; + destroy_mask <<= SINGLE_MAP_WIDTH; } BitwiseGameState::destroy_buildings(opponent_buildings, hits); } @@ -339,7 +338,7 @@ impl BitwiseGameState { fn add_missiles(player_buildings: &mut PlayerBuildings) { let mut missiles = player_buildings.missile_towers[player_buildings.firing_tower]; - for mut tier in player_buildings.missiles.iter_mut() { + for mut tier in &mut player_buildings.missiles { let setting = !tier.0 & missiles; tier.0 |= setting; missiles &= !setting; @@ -351,19 +350,19 @@ impl BitwiseGameState { let mut destroyed = 0; let mut damaging = 0; for _ in 0..MISSILE_SPEED { - for i in 0..MISSILE_MAX_SINGLE_CELL { - let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK; - let about_to_hit_opponent = player_missiles[i].1 & LEFT_COL_MASK; + for missile in player_missiles.iter_mut() { + let swapping_sides = missile.0 & RIGHT_COL_MASK; + let about_to_hit_opponent = missile.1 & LEFT_COL_MASK; - player_missiles[i].0 = (player_missiles[i].0 & !RIGHT_COL_MASK) << 1; - player_missiles[i].1 = ((player_missiles[i].1 & !LEFT_COL_MASK) >> 1) | swapping_sides; + missile.0 = (missile.0 & !RIGHT_COL_MASK) << 1; + missile.1 = ((missile.1 & !LEFT_COL_MASK) >> 1) | swapping_sides; damaging = (damaging << 1) | about_to_hit_opponent; let mut hits = 0; for health_tier in (0..DEFENCE_HEALTH).rev() { - hits = opponent_buildings.buildings[health_tier] & player_missiles[i].1; - player_missiles[i].1 &= !hits; + hits = opponent_buildings.buildings[health_tier] & missile.1; + missile.1 &= !hits; opponent_buildings.buildings[health_tier] &= !hits; } destroyed |= hits; @@ -380,10 +379,10 @@ impl BitwiseGameState { let deconstruct_mask = !hit_mask; buildings.energy_towers &= deconstruct_mask; - for tier in buildings.missile_towers.iter_mut() { + for tier in &mut buildings.missile_towers { *tier &= deconstruct_mask; } - for tier in buildings.buildings.iter_mut() { + for tier in &mut buildings.buildings { *tier &= deconstruct_mask; } buildings.occupied &= deconstruct_mask; diff --git a/src/lib.rs b/src/lib.rs index de8b120..1883b8e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,5 @@ +#![warn(clippy)] + extern crate serde; extern crate serde_json; diff --git a/src/main.rs b/src/main.rs index cdafaba..45fd356 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,7 +34,7 @@ fn main() { process::exit(1); } }; - let command = strategy::monte_carlo::choose_move(&state, &start_time, max_time); + let command = strategy::monte_carlo::choose_move(&state, start_time, max_time); match write_command(COMMAND_PATH, command) { Ok(()) => {} diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 0844402..57eaaff 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -16,7 +16,7 @@ use rayon::prelude::*; #[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 30; #[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 45; -pub fn choose_move(state: &BitwiseGameState, start_time: &PreciseTime, max_time: Duration) -> Command { +pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(state); let command = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); @@ -27,7 +27,7 @@ pub fn choose_move(state: &BitwiseGameState, start_time: &PreciseTime, max_time: } #[cfg(not(feature = "discard-poor-performers"))] -fn simulate_options_to_timeout(command_scores: &'a mut Vec, settings: &GameSettings, state: &BitwiseGameState, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { +fn simulate_options_to_timeout(command_scores: &'a mut Vec, settings: &GameSettings, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { loop { simulate_all_options_once(command_scores, settings, state); if start_time.to(PreciseTime::now()) > max_time { @@ -45,7 +45,7 @@ fn simulate_options_to_timeout(command_scores: &'a mut Vec, settin } #[cfg(feature = "discard-poor-performers")] -fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: &PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { +fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { use std::cmp; let min_options = cmp::min(command_scores.len(), 5); diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs index 71e0b07..1fb4238 100644 --- a/tests/monte_carlo_test.rs +++ b/tests/monte_carlo_test.rs @@ -15,7 +15,7 @@ fn it_does_a_normal_turn_successfully() { Err(error) => panic!("Error while parsing JSON file: {}", error) }; let max_time = Duration::milliseconds(200); - strategy::monte_carlo::choose_move(&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)) } -- cgit v1.2.3 From fe3fbbdd7b4c4cb243f859db63a0cc6070179839 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 11 Aug 2018 23:02:35 +0200 Subject: Implemented most of the iron curtain changes Still need to - set it active - make the random move selection choose it - test against real engine --- src/engine/bitwise_engine.rs | 30 +++++++++++++++++++++++++++--- src/engine/command.rs | 4 +++- src/engine/constants.rs | 6 +++++- src/input/json.rs | 24 ++++++++++++++++++++++-- 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 3dbd7fb..e9c1b0a 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -35,7 +35,10 @@ pub struct PlayerBuildings { pub firing_tower: usize, pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], - pub tesla_cooldowns: ArrayVec<[TeslaCooldown; TESLA_MAX]> + pub tesla_cooldowns: ArrayVec<[TeslaCooldown; TESLA_MAX]>, + + pub iron_curtain_available: bool, + pub iron_curtain_remaining: u8, } #[derive(Debug, Clone, PartialEq, Eq)] @@ -60,6 +63,9 @@ impl BitwiseGameState { BitwiseGameState::update_construction(&mut self.player_buildings); BitwiseGameState::update_construction(&mut self.opponent_buildings); + + BitwiseGameState::update_iron_curtain(&mut self.player_buildings); + BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings); BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); @@ -255,6 +261,14 @@ impl BitwiseGameState { } player_buildings.tesla_cooldowns.retain(|t| t.pos != p); player_buildings.occupied &= deconstruct_mask; + }, + Command::IronCurtain => { + debug_assert!(player_buildings.iron_curtain_available); + debug_assert!(player.energy >= IRON_CURTAIN_PRICE); + + player.energy -= IRON_CURTAIN_PRICE; + player_buildings.iron_curtain_available = false; + player_buildings.iron_curtain_remaining = IRON_CURTAIN_DURATION; } } } @@ -295,6 +309,11 @@ impl BitwiseGameState { player_buildings.unconstructed.truncate(buildings_len); } + fn update_iron_curtain(player_buildings: &mut PlayerBuildings) { + //TODO: Get in current round and set available to true + player_buildings.iron_curtain_remaining -= 1; + } + fn fire_teslas(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { BitwiseGameState::fire_single_players_teslas_without_cleanup(player, player_buildings, opponent, opponent_buildings); BitwiseGameState::fire_single_players_teslas_without_cleanup(opponent, opponent_buildings, player, player_buildings); @@ -309,6 +328,9 @@ impl BitwiseGameState { tesla.age += 1; if tesla.cooldown > 0 { tesla.cooldown -= 1; + } else if player.energy >= TESLA_FIRING_ENERGY && opponent_buildings.iron_curtain_remaining > 0 { + player.energy -= TESLA_FIRING_ENERGY; + tesla.cooldown = TESLA_COOLDOWN; } else if player.energy >= TESLA_FIRING_ENERGY { player.energy -= TESLA_FIRING_ENERGY; tesla.cooldown = TESLA_COOLDOWN; @@ -351,7 +373,7 @@ impl BitwiseGameState { let mut damaging = 0; for _ in 0..MISSILE_SPEED { for missile in player_missiles.iter_mut() { - let swapping_sides = missile.0 & RIGHT_COL_MASK; + let swapping_sides = if opponent_buildings.iron_curtain_remaining > 0 { 0 } else { missile.0 & RIGHT_COL_MASK }; let about_to_hit_opponent = missile.1 & LEFT_COL_MASK; missile.0 = (missile.0 & !RIGHT_COL_MASK) << 1; @@ -426,7 +448,9 @@ impl PlayerBuildings { missile_towers: [0; MISSILE_COOLDOWN_STATES], firing_tower: 0, missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], - tesla_cooldowns: ArrayVec::new() + tesla_cooldowns: ArrayVec::new(), + iron_curtain_available: false, + iron_curtain_remaining: 0 } } diff --git a/src/engine/command.rs b/src/engine/command.rs index da7e1e0..e6dbedf 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -5,7 +5,8 @@ use super::geometry::Point; pub enum Command { Nothing, Build(Point, BuildingType), - Deconstruct(Point) + Deconstruct(Point), + IronCurtain } impl fmt::Display for Command { @@ -14,6 +15,7 @@ impl fmt::Display for Command { Command::Nothing => write!(f, ""), Command::Build(p, b) => write!(f, "{},{},{}", p.x(), p.y(), b as u8), Command::Deconstruct(p) => write!(f, "{},{},3", p.x(), p.y()), + Command::IronCurtain => write!(f, "0,0,5") } } } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 458251f..11afa29 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -18,7 +18,7 @@ pub const TESLA_MAX: usize = 2; pub const TESLA_COOLDOWN: u8 = 10; pub const TESLA_FIRING_ENERGY: u16 = 100; pub const TESLA_DAMAGE: u8 = 20; -pub const TESLA_PRICE: u16 = 300; +pub const TESLA_PRICE: u16 = 100; pub const TESLA_CONSTRUCTION_TIME: u8 = 10; pub const ENERGY_GENERATED_BASE: u16 = 5; @@ -26,6 +26,10 @@ pub const ENERGY_GENERATED_TOWER: u16 = 3; pub const ENERGY_PRICE: u16 = 20; pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; +pub const IRON_CURTAIN_PRICE: u16 = 100; +pub const IRON_CURTAIN_UNLOCK_INTERVAL: u8 = 30; +pub const IRON_CURTAIN_DURATION: u8 = 6; + pub const DECONSTRUCT_ENERGY: u16 = 5; pub const MAX_CONCURRENT_CONSTRUCTION: usize = 6; //2 teslas, and 3 of anything else, 1 extra because it's push here then update construction times diff --git a/src/input/json.rs b/src/input/json.rs index 4aebcfa..32f98d0 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -31,6 +31,8 @@ struct Player { player_type: char, energy: u16, health: u8, + iron_curtain_available: bool, + active_iron_curtain_lifetime: i16 } #[derive(Deserialize)] @@ -63,10 +65,28 @@ struct MissileState { impl State { fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { - let player = self.player().to_bitwise_engine(); - let opponent = self.opponent().to_bitwise_engine(); + let json_player = self.player(); + let player = json_player.to_bitwise_engine(); + let json_opponent = self.opponent(); + let opponent = json_opponent.to_bitwise_engine(); let mut player_buildings = bitwise_engine::PlayerBuildings::empty(); let mut opponent_buildings = bitwise_engine::PlayerBuildings::empty(); + + // TODO roll the player into the playerbuildings and remove this duplication + player_buildings.iron_curtain_available = json_player.iron_curtain_available; + player_buildings.iron_curtain_remaining = if json_player.active_iron_curtain_lifetime < 0 { + 0 + } else { + json_player.active_iron_curtain_lifetime as u8 + }; + opponent_buildings.iron_curtain_available = json_opponent.iron_curtain_available; + opponent_buildings.iron_curtain_remaining = if json_opponent.active_iron_curtain_lifetime < 0 { + 0 + } else { + json_opponent.active_iron_curtain_lifetime as u8 + }; + + for row in &self.game_map { for cell in row { let point = engine::geometry::Point::new(cell.x, cell.y); -- cgit v1.2.3 From a760bc7543b186714b11648e8be515dcdfc49b95 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 09:37:44 +0200 Subject: Allowed monte carlo search to use iron curtains --- src/engine/bitwise_engine.rs | 7 +++++++ src/strategy/monte_carlo.rs | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index e9c1b0a..fb46567 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -87,6 +87,13 @@ impl BitwiseGameState { pub fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= TESLA_MAX } pub fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= TESLA_MAX } + pub fn player_can_build_iron_curtain(&self) -> bool { + self.player_buildings.iron_curtain_available && self.player_buildings.iron_curtain_remaining == 0 && self.player.energy >= IRON_CURTAIN_PRICE + } + pub fn opponent_can_build_iron_curtain(&self) -> bool { + self.opponent_buildings.iron_curtain_available && self.opponent_buildings.iron_curtain_remaining == 0 && self.opponent.energy >= IRON_CURTAIN_PRICE + } + pub fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } pub fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } pub fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 57eaaff..95d87fa 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -116,21 +116,24 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis fn random_player_move(state: &BitwiseGameState, rng: &mut R) -> Command { let all_buildings = sensible_buildings(&state.player, &state.player_buildings, state.player_has_max_teslas()); - random_move(&all_buildings, rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) + random_move(&all_buildings, state.player_can_build_iron_curtain(), rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) } fn random_opponent_move(state: &BitwiseGameState, rng: &mut R) -> Command { let all_buildings = sensible_buildings(&state.opponent, &state.opponent_buildings, state.opponent_has_max_teslas()); - random_move(&all_buildings, rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) + random_move(&all_buildings, state.opponent_can_build_iron_curtain(), rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } // TODO: Given enough energy, most opponents won't do nothing -fn random_movePoint>(all_buildings: &[BuildingType], rng: &mut R, free_positions_count: usize, get_point: F) -> Command { +fn random_movePoint>(all_buildings: &[BuildingType], iron_curtain_available: bool, rng: &mut R, free_positions_count: usize, get_point: F) -> Command { let nothing_count = 1; - let building_choice_index = rng.gen_range(0, nothing_count + all_buildings.len()); + let iron_curtain_count = if iron_curtain_available { 1 } else { 0 }; + let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); if building_choice_index == all_buildings.len() { Command::Nothing + } else if iron_curtain_available && building_choice_index == all_buildings.len() + 1 { + Command::IronCurtain } else { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( -- cgit v1.2.3 From 6935a0c82606b95391dfd76c01e393ca99d6bf77 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 11:07:41 +0200 Subject: Test for iron curtain availability and normal towers --- src/engine/bitwise_engine.rs | 21 ++++++++++++++------- src/engine/constants.rs | 2 +- src/input/json.rs | 10 +++++++++- tests/after_200/Round 000/OpponentCommand.txt | 1 - tests/after_200/Round 000/PlayerCommand.txt | 1 - tests/after_200/Round 001/OpponentCommand.txt | 1 - tests/after_200/Round 001/PlayerCommand.txt | 1 - tests/after_200/Round 002/OpponentCommand.txt | 1 - tests/after_200/Round 002/PlayerCommand.txt | 1 - tests/after_200/Round 003/OpponentCommand.txt | 1 - tests/after_200/Round 003/PlayerCommand.txt | 1 - tests/after_200/Round 004/OpponentCommand.txt | 1 - tests/after_200/Round 004/PlayerCommand.txt | 1 - tests/after_200/Round 005/OpponentCommand.txt | 1 - tests/after_200/Round 005/PlayerCommand.txt | 1 - tests/after_200/Round 006/OpponentCommand.txt | 1 - tests/after_200/Round 006/PlayerCommand.txt | 1 - tests/after_200/Round 007/OpponentCommand.txt | 1 - tests/after_200/Round 007/PlayerCommand.txt | 1 - tests/after_200/Round 008/OpponentCommand.txt | 1 - tests/after_200/Round 008/PlayerCommand.txt | 1 - tests/after_200/Round 009/OpponentCommand.txt | 1 - tests/after_200/Round 009/PlayerCommand.txt | 1 - tests/after_200/Round 010/OpponentCommand.txt | 1 - tests/after_200/Round 010/PlayerCommand.txt | 1 - tests/after_200/Round 011/OpponentCommand.txt | 1 - tests/after_200/Round 011/PlayerCommand.txt | 1 - tests/after_200/Round 012/OpponentCommand.txt | 1 - tests/after_200/Round 012/PlayerCommand.txt | 1 - tests/after_200/Round 013/OpponentCommand.txt | 1 - tests/after_200/Round 013/PlayerCommand.txt | 1 - tests/after_200/Round 014/OpponentCommand.txt | 1 - tests/after_200/Round 014/PlayerCommand.txt | 1 - tests/after_200/Round 015/OpponentCommand.txt | 1 - tests/after_200/Round 015/PlayerCommand.txt | 1 - tests/after_200/Round 016/OpponentCommand.txt | 1 - tests/after_200/Round 016/PlayerCommand.txt | 1 - tests/after_200/Round 017/OpponentCommand.txt | 1 - tests/after_200/Round 017/PlayerCommand.txt | 1 - tests/after_200/Round 018/OpponentCommand.txt | 1 - tests/after_200/Round 018/PlayerCommand.txt | 1 - tests/after_200/Round 019/OpponentCommand.txt | 1 - tests/after_200/Round 019/PlayerCommand.txt | 1 - tests/after_200/Round 020/OpponentCommand.txt | 1 - tests/after_200/Round 020/PlayerCommand.txt | 1 - tests/after_200/Round 021/OpponentCommand.txt | 1 - tests/after_200/Round 021/PlayerCommand.txt | 1 - tests/after_200/Round 022/OpponentCommand.txt | 1 - tests/after_200/Round 022/PlayerCommand.txt | 1 - tests/after_200/Round 023/OpponentCommand.txt | 1 - tests/after_200/Round 023/PlayerCommand.txt | 1 - tests/after_200/Round 024/OpponentCommand.txt | 1 - tests/after_200/Round 024/PlayerCommand.txt | 1 - tests/after_200/Round 025/OpponentCommand.txt | 1 - tests/after_200/Round 025/PlayerCommand.txt | 1 - tests/after_200/Round 026/OpponentCommand.txt | 1 - tests/after_200/Round 026/PlayerCommand.txt | 1 - tests/after_200/Round 027/OpponentCommand.txt | 1 - tests/after_200/Round 027/PlayerCommand.txt | 1 - tests/after_200/Round 028/OpponentCommand.txt | 1 - tests/after_200/Round 028/PlayerCommand.txt | 1 - tests/after_200/Round 029/OpponentCommand.txt | 1 - tests/after_200/Round 029/PlayerCommand.txt | 1 - tests/after_200/Round 030/OpponentCommand.txt | 1 - tests/after_200/Round 030/PlayerCommand.txt | 1 - tests/after_200/Round 031/OpponentCommand.txt | 1 - tests/after_200/Round 031/PlayerCommand.txt | 1 - tests/after_200/Round 032/OpponentCommand.txt | 1 - tests/after_200/Round 032/PlayerCommand.txt | 1 - tests/after_200/Round 033/OpponentCommand.txt | 1 - tests/after_200/Round 033/PlayerCommand.txt | 1 - tests/after_200/Round 034/OpponentCommand.txt | 1 - tests/after_200/Round 034/PlayerCommand.txt | 1 - tests/after_200/Round 035/OpponentCommand.txt | 1 - tests/after_200/Round 035/PlayerCommand.txt | 1 - tests/after_200/Round 036/OpponentCommand.txt | 1 - tests/after_200/Round 036/PlayerCommand.txt | 1 - tests/after_200/Round 037/OpponentCommand.txt | 1 - tests/after_200/Round 037/PlayerCommand.txt | 1 - tests/after_200/Round 038/OpponentCommand.txt | 1 - tests/after_200/Round 038/PlayerCommand.txt | 1 - tests/after_200/Round 039/OpponentCommand.txt | 1 - tests/after_200/Round 039/PlayerCommand.txt | 1 - tests/after_200/Round 040/OpponentCommand.txt | 1 - tests/after_200/Round 040/PlayerCommand.txt | 1 - tests/after_200/Round 041/OpponentCommand.txt | 1 - tests/after_200/Round 041/PlayerCommand.txt | 1 - tests/after_200/Round 042/OpponentCommand.txt | 1 - tests/after_200/Round 042/PlayerCommand.txt | 1 - tests/after_200/Round 043/OpponentCommand.txt | 1 - tests/after_200/Round 043/PlayerCommand.txt | 1 - tests/after_200/Round 044/OpponentCommand.txt | 1 - tests/after_200/Round 044/PlayerCommand.txt | 1 - tests/after_200/Round 045/OpponentCommand.txt | 1 - tests/after_200/Round 045/PlayerCommand.txt | 1 - tests/after_200/Round 046/OpponentCommand.txt | 1 - tests/after_200/Round 046/PlayerCommand.txt | 1 - tests/after_200/Round 047/OpponentCommand.txt | 1 - tests/after_200/Round 047/PlayerCommand.txt | 1 - tests/after_200/Round 048/OpponentCommand.txt | 1 - tests/after_200/Round 048/PlayerCommand.txt | 1 - tests/after_200/Round 049/OpponentCommand.txt | 1 - tests/after_200/Round 049/PlayerCommand.txt | 1 - tests/after_200/Round 050/OpponentCommand.txt | 1 - tests/after_200/Round 050/PlayerCommand.txt | 1 - tests/after_200/Round 051/OpponentCommand.txt | 1 - tests/after_200/Round 051/PlayerCommand.txt | 1 - tests/after_200/Round 052/OpponentCommand.txt | 1 - tests/after_200/Round 052/PlayerCommand.txt | 1 - tests/after_200/Round 053/OpponentCommand.txt | 1 - tests/after_200/Round 053/PlayerCommand.txt | 1 - tests/after_200/Round 054/OpponentCommand.txt | 1 - tests/after_200/Round 054/PlayerCommand.txt | 1 - tests/after_200/Round 055/OpponentCommand.txt | 1 - tests/after_200/Round 055/PlayerCommand.txt | 1 - tests/after_200/Round 056/OpponentCommand.txt | 1 - tests/after_200/Round 056/PlayerCommand.txt | 1 - tests/after_200/Round 057/OpponentCommand.txt | 1 - tests/after_200/Round 057/PlayerCommand.txt | 1 - tests/after_200/Round 058/OpponentCommand.txt | 1 - tests/after_200/Round 058/PlayerCommand.txt | 1 - tests/after_200/Round 059/OpponentCommand.txt | 1 - tests/after_200/Round 059/PlayerCommand.txt | 1 - tests/after_200/Round 060/OpponentCommand.txt | 1 - tests/after_200/Round 060/PlayerCommand.txt | 1 - tests/after_200/Round 061/OpponentCommand.txt | 1 - tests/after_200/Round 061/PlayerCommand.txt | 1 - tests/after_200/Round 062/OpponentCommand.txt | 1 - tests/after_200/Round 062/PlayerCommand.txt | 1 - tests/after_200/Round 063/OpponentCommand.txt | 1 - tests/after_200/Round 063/PlayerCommand.txt | 1 - tests/after_200/Round 064/OpponentCommand.txt | 1 - tests/after_200/Round 064/PlayerCommand.txt | 1 - .../after_203_teslas/Round 000/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 000/PlayerCommand.txt | 1 - .../after_203_teslas/Round 001/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 001/PlayerCommand.txt | 1 - .../after_203_teslas/Round 002/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 002/PlayerCommand.txt | 1 - .../after_203_teslas/Round 003/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 003/PlayerCommand.txt | 1 - .../after_203_teslas/Round 004/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 004/PlayerCommand.txt | 1 - .../after_203_teslas/Round 005/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 005/PlayerCommand.txt | 1 - .../after_203_teslas/Round 006/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 006/PlayerCommand.txt | 1 - .../after_203_teslas/Round 007/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 007/PlayerCommand.txt | 1 - .../after_203_teslas/Round 008/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 008/PlayerCommand.txt | 1 - .../after_203_teslas/Round 009/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 009/PlayerCommand.txt | 1 - .../after_203_teslas/Round 010/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 010/PlayerCommand.txt | 1 - .../after_203_teslas/Round 011/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 011/PlayerCommand.txt | 1 - .../after_203_teslas/Round 012/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 012/PlayerCommand.txt | 1 - .../after_203_teslas/Round 013/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 013/PlayerCommand.txt | 1 - .../after_203_teslas/Round 014/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 014/PlayerCommand.txt | 1 - .../after_203_teslas/Round 015/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 015/PlayerCommand.txt | 1 - .../after_203_teslas/Round 016/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 016/PlayerCommand.txt | 1 - .../after_203_teslas/Round 017/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 017/PlayerCommand.txt | 1 - .../after_203_teslas/Round 018/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 018/PlayerCommand.txt | 1 - .../after_203_teslas/Round 019/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 019/PlayerCommand.txt | 1 - .../after_203_teslas/Round 020/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 020/PlayerCommand.txt | 1 - .../after_203_teslas/Round 021/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 021/PlayerCommand.txt | 1 - .../after_203_teslas/Round 022/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 022/PlayerCommand.txt | 1 - .../after_203_teslas/Round 023/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 023/PlayerCommand.txt | 1 - .../after_203_teslas/Round 024/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 024/PlayerCommand.txt | 1 - .../after_203_teslas/Round 025/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 025/PlayerCommand.txt | 1 - .../after_203_teslas/Round 026/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 026/PlayerCommand.txt | 1 - .../after_203_teslas/Round 027/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 027/PlayerCommand.txt | 1 - .../after_203_teslas/Round 028/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 028/PlayerCommand.txt | 1 - .../after_203_teslas/Round 029/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 029/PlayerCommand.txt | 1 - .../after_203_teslas/Round 030/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 030/PlayerCommand.txt | 1 - .../after_203_teslas/Round 031/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 031/PlayerCommand.txt | 1 - .../after_203_teslas/Round 032/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 032/PlayerCommand.txt | 1 - .../after_203_teslas/Round 033/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 033/PlayerCommand.txt | 1 - .../after_203_teslas/Round 034/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 034/PlayerCommand.txt | 1 - .../after_203_teslas/Round 035/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 035/PlayerCommand.txt | 1 - .../after_203_teslas/Round 036/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 036/PlayerCommand.txt | 1 - .../after_203_teslas/Round 037/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 037/PlayerCommand.txt | 1 - .../after_203_teslas/Round 038/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 038/PlayerCommand.txt | 1 - .../after_203_teslas/Round 039/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 039/PlayerCommand.txt | 1 - .../after_203_teslas/Round 040/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 040/PlayerCommand.txt | 1 - .../after_203_teslas/Round 041/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 041/PlayerCommand.txt | 1 - .../after_203_teslas/Round 042/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 042/PlayerCommand.txt | 1 - .../after_203_teslas/Round 043/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 043/PlayerCommand.txt | 1 - .../after_203_teslas/Round 044/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 044/PlayerCommand.txt | 1 - .../after_203_teslas/Round 045/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 045/PlayerCommand.txt | 1 - .../after_203_teslas/Round 046/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 046/PlayerCommand.txt | 1 - .../after_203_teslas/Round 047/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 047/PlayerCommand.txt | 1 - .../after_203_teslas/Round 048/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 048/PlayerCommand.txt | 1 - .../after_203_teslas/Round 049/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 049/PlayerCommand.txt | 1 - .../after_203_teslas/Round 050/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 050/PlayerCommand.txt | 1 - .../after_203_teslas/Round 051/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 051/PlayerCommand.txt | 1 - .../after_203_teslas/Round 052/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 052/PlayerCommand.txt | 1 - .../after_203_teslas/Round 053/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 053/PlayerCommand.txt | 1 - .../after_203_teslas/Round 054/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 054/PlayerCommand.txt | 1 - .../after_203_teslas/Round 055/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 055/PlayerCommand.txt | 1 - .../after_203_teslas/Round 056/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 056/PlayerCommand.txt | 1 - .../after_203_teslas/Round 057/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 057/PlayerCommand.txt | 1 - .../after_203_teslas/Round 058/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 058/PlayerCommand.txt | 1 - .../after_203_teslas/Round 059/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 059/PlayerCommand.txt | 1 - .../after_203_teslas/Round 060/OpponentCommand.txt | 1 - tests/after_203_teslas/Round 060/PlayerCommand.txt | 1 - tests/live_comparison.rs | 20 +++++++++----------- tests/state0.json | 2 +- .../Round 000/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 000/PlayerCommand.txt | 1 + .../Round 001/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 001/PlayerCommand.txt | 1 + .../Round 002/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 002/PlayerCommand.txt | 1 + .../Round 003/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 003/PlayerCommand.txt | 1 + .../Round 004/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 004/PlayerCommand.txt | 1 + .../Round 005/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 005/PlayerCommand.txt | 1 + .../Round 006/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 006/PlayerCommand.txt | 1 + .../Round 007/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 007/PlayerCommand.txt | 1 + .../Round 008/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 008/PlayerCommand.txt | 1 + .../Round 009/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 009/PlayerCommand.txt | 1 + .../Round 010/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 010/PlayerCommand.txt | 1 + .../Round 011/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 011/PlayerCommand.txt | 1 + .../Round 012/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 012/PlayerCommand.txt | 1 + .../Round 013/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 013/PlayerCommand.txt | 1 + .../Round 014/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 014/PlayerCommand.txt | 1 + .../Round 015/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 015/PlayerCommand.txt | 1 + .../Round 016/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 016/PlayerCommand.txt | 1 + .../Round 017/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 017/PlayerCommand.txt | 1 + .../Round 018/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 018/PlayerCommand.txt | 1 + .../Round 019/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 019/PlayerCommand.txt | 1 + .../Round 020/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 020/PlayerCommand.txt | 1 + .../Round 021/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 021/PlayerCommand.txt | 1 + .../Round 022/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 022/PlayerCommand.txt | 1 + .../Round 023/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 023/PlayerCommand.txt | 1 + .../Round 024/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 024/PlayerCommand.txt | 1 + .../Round 025/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 025/PlayerCommand.txt | 1 + .../Round 026/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 026/PlayerCommand.txt | 1 + .../Round 027/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 027/PlayerCommand.txt | 1 + .../Round 028/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 028/PlayerCommand.txt | 1 + .../Round 029/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 029/PlayerCommand.txt | 1 + .../Round 030/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 030/PlayerCommand.txt | 1 + .../Round 031/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 031/PlayerCommand.txt | 1 + .../Round 032/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 032/PlayerCommand.txt | 1 + .../Round 033/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 033/PlayerCommand.txt | 1 + .../Round 034/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 034/PlayerCommand.txt | 1 + .../Round 035/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 035/PlayerCommand.txt | 1 + .../Round 036/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 036/PlayerCommand.txt | 1 + .../Round 037/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 037/PlayerCommand.txt | 1 + .../Round 038/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 038/PlayerCommand.txt | 1 + .../Round 039/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 039/PlayerCommand.txt | 1 + .../Round 040/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 040/PlayerCommand.txt | 1 + .../Round 041/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 041/PlayerCommand.txt | 1 + .../Round 042/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 042/PlayerCommand.txt | 1 + .../Round 043/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 043/PlayerCommand.txt | 1 + .../Round 044/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 044/PlayerCommand.txt | 1 + .../Round 045/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 045/PlayerCommand.txt | 1 + .../Round 046/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 046/PlayerCommand.txt | 1 + .../Round 047/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 047/PlayerCommand.txt | 1 + .../Round 048/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 048/PlayerCommand.txt | 1 + .../Round 049/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 049/PlayerCommand.txt | 1 + .../Round 050/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 050/PlayerCommand.txt | 1 + .../Round 051/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 051/PlayerCommand.txt | 1 + .../Round 052/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 052/PlayerCommand.txt | 1 + .../Round 053/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 053/PlayerCommand.txt | 1 + .../Round 054/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 054/PlayerCommand.txt | 1 + .../Round 055/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 055/PlayerCommand.txt | 1 + .../Round 056/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 056/PlayerCommand.txt | 1 + .../Round 057/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 057/PlayerCommand.txt | 1 + .../Round 058/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 058/PlayerCommand.txt | 1 + .../Round 059/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 059/PlayerCommand.txt | 1 + .../Round 060/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 060/PlayerCommand.txt | 1 + .../Round 061/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 061/PlayerCommand.txt | 1 + .../Round 062/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 062/PlayerCommand.txt | 1 + .../Round 063/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 063/PlayerCommand.txt | 1 + .../Round 064/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 064/PlayerCommand.txt | 1 + .../Round 065/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 065/PlayerCommand.txt | 1 + .../Round 066/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 066/PlayerCommand.txt | 1 + .../Round 067/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 067/PlayerCommand.txt | 1 + .../Round 068/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 068/PlayerCommand.txt | 1 + .../Round 069/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 069/PlayerCommand.txt | 1 + .../Round 070/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 070/PlayerCommand.txt | 1 + .../Round 071/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 071/PlayerCommand.txt | 1 + .../Round 072/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 072/PlayerCommand.txt | 1 + .../Round 073/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 073/PlayerCommand.txt | 1 + .../Round 074/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 074/PlayerCommand.txt | 1 + .../Round 075/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 075/PlayerCommand.txt | 1 + .../Round 076/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 076/PlayerCommand.txt | 1 + .../Round 077/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 077/PlayerCommand.txt | 1 + .../Round 078/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 078/PlayerCommand.txt | 1 + .../Round 079/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 079/PlayerCommand.txt | 1 + .../Round 080/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 080/PlayerCommand.txt | 1 + 419 files changed, 196 insertions(+), 273 deletions(-) delete mode 100644 tests/after_200/Round 000/OpponentCommand.txt delete mode 100644 tests/after_200/Round 000/PlayerCommand.txt delete mode 100644 tests/after_200/Round 001/OpponentCommand.txt delete mode 100644 tests/after_200/Round 001/PlayerCommand.txt delete mode 100644 tests/after_200/Round 002/OpponentCommand.txt delete mode 100644 tests/after_200/Round 002/PlayerCommand.txt delete mode 100644 tests/after_200/Round 003/OpponentCommand.txt delete mode 100644 tests/after_200/Round 003/PlayerCommand.txt delete mode 100644 tests/after_200/Round 004/OpponentCommand.txt delete mode 100644 tests/after_200/Round 004/PlayerCommand.txt delete mode 100644 tests/after_200/Round 005/OpponentCommand.txt delete mode 100644 tests/after_200/Round 005/PlayerCommand.txt delete mode 100644 tests/after_200/Round 006/OpponentCommand.txt delete mode 100644 tests/after_200/Round 006/PlayerCommand.txt delete mode 100644 tests/after_200/Round 007/OpponentCommand.txt delete mode 100644 tests/after_200/Round 007/PlayerCommand.txt delete mode 100644 tests/after_200/Round 008/OpponentCommand.txt delete mode 100644 tests/after_200/Round 008/PlayerCommand.txt delete mode 100644 tests/after_200/Round 009/OpponentCommand.txt delete mode 100644 tests/after_200/Round 009/PlayerCommand.txt delete mode 100644 tests/after_200/Round 010/OpponentCommand.txt delete mode 100644 tests/after_200/Round 010/PlayerCommand.txt delete mode 100644 tests/after_200/Round 011/OpponentCommand.txt delete mode 100644 tests/after_200/Round 011/PlayerCommand.txt delete mode 100644 tests/after_200/Round 012/OpponentCommand.txt delete mode 100644 tests/after_200/Round 012/PlayerCommand.txt delete mode 100644 tests/after_200/Round 013/OpponentCommand.txt delete mode 100644 tests/after_200/Round 013/PlayerCommand.txt delete mode 100644 tests/after_200/Round 014/OpponentCommand.txt delete mode 100644 tests/after_200/Round 014/PlayerCommand.txt delete mode 100644 tests/after_200/Round 015/OpponentCommand.txt delete mode 100644 tests/after_200/Round 015/PlayerCommand.txt delete mode 100644 tests/after_200/Round 016/OpponentCommand.txt delete mode 100644 tests/after_200/Round 016/PlayerCommand.txt delete mode 100644 tests/after_200/Round 017/OpponentCommand.txt delete mode 100644 tests/after_200/Round 017/PlayerCommand.txt delete mode 100644 tests/after_200/Round 018/OpponentCommand.txt delete mode 100644 tests/after_200/Round 018/PlayerCommand.txt delete mode 100644 tests/after_200/Round 019/OpponentCommand.txt delete mode 100644 tests/after_200/Round 019/PlayerCommand.txt delete mode 100644 tests/after_200/Round 020/OpponentCommand.txt delete mode 100644 tests/after_200/Round 020/PlayerCommand.txt delete mode 100644 tests/after_200/Round 021/OpponentCommand.txt delete mode 100644 tests/after_200/Round 021/PlayerCommand.txt delete mode 100644 tests/after_200/Round 022/OpponentCommand.txt delete mode 100644 tests/after_200/Round 022/PlayerCommand.txt delete mode 100644 tests/after_200/Round 023/OpponentCommand.txt delete mode 100644 tests/after_200/Round 023/PlayerCommand.txt delete mode 100644 tests/after_200/Round 024/OpponentCommand.txt delete mode 100644 tests/after_200/Round 024/PlayerCommand.txt delete mode 100644 tests/after_200/Round 025/OpponentCommand.txt delete mode 100644 tests/after_200/Round 025/PlayerCommand.txt delete mode 100644 tests/after_200/Round 026/OpponentCommand.txt delete mode 100644 tests/after_200/Round 026/PlayerCommand.txt delete mode 100644 tests/after_200/Round 027/OpponentCommand.txt delete mode 100644 tests/after_200/Round 027/PlayerCommand.txt delete mode 100644 tests/after_200/Round 028/OpponentCommand.txt delete mode 100644 tests/after_200/Round 028/PlayerCommand.txt delete mode 100644 tests/after_200/Round 029/OpponentCommand.txt delete mode 100644 tests/after_200/Round 029/PlayerCommand.txt delete mode 100644 tests/after_200/Round 030/OpponentCommand.txt delete mode 100644 tests/after_200/Round 030/PlayerCommand.txt delete mode 100644 tests/after_200/Round 031/OpponentCommand.txt delete mode 100644 tests/after_200/Round 031/PlayerCommand.txt delete mode 100644 tests/after_200/Round 032/OpponentCommand.txt delete mode 100644 tests/after_200/Round 032/PlayerCommand.txt delete mode 100644 tests/after_200/Round 033/OpponentCommand.txt delete mode 100644 tests/after_200/Round 033/PlayerCommand.txt delete mode 100644 tests/after_200/Round 034/OpponentCommand.txt delete mode 100644 tests/after_200/Round 034/PlayerCommand.txt delete mode 100644 tests/after_200/Round 035/OpponentCommand.txt delete mode 100644 tests/after_200/Round 035/PlayerCommand.txt delete mode 100644 tests/after_200/Round 036/OpponentCommand.txt delete mode 100644 tests/after_200/Round 036/PlayerCommand.txt delete mode 100644 tests/after_200/Round 037/OpponentCommand.txt delete mode 100644 tests/after_200/Round 037/PlayerCommand.txt delete mode 100644 tests/after_200/Round 038/OpponentCommand.txt delete mode 100644 tests/after_200/Round 038/PlayerCommand.txt delete mode 100644 tests/after_200/Round 039/OpponentCommand.txt delete mode 100644 tests/after_200/Round 039/PlayerCommand.txt delete mode 100644 tests/after_200/Round 040/OpponentCommand.txt delete mode 100644 tests/after_200/Round 040/PlayerCommand.txt delete mode 100644 tests/after_200/Round 041/OpponentCommand.txt delete mode 100644 tests/after_200/Round 041/PlayerCommand.txt delete mode 100644 tests/after_200/Round 042/OpponentCommand.txt delete mode 100644 tests/after_200/Round 042/PlayerCommand.txt delete mode 100644 tests/after_200/Round 043/OpponentCommand.txt delete mode 100644 tests/after_200/Round 043/PlayerCommand.txt delete mode 100644 tests/after_200/Round 044/OpponentCommand.txt delete mode 100644 tests/after_200/Round 044/PlayerCommand.txt delete mode 100644 tests/after_200/Round 045/OpponentCommand.txt delete mode 100644 tests/after_200/Round 045/PlayerCommand.txt delete mode 100644 tests/after_200/Round 046/OpponentCommand.txt delete mode 100644 tests/after_200/Round 046/PlayerCommand.txt delete mode 100644 tests/after_200/Round 047/OpponentCommand.txt delete mode 100644 tests/after_200/Round 047/PlayerCommand.txt delete mode 100644 tests/after_200/Round 048/OpponentCommand.txt delete mode 100644 tests/after_200/Round 048/PlayerCommand.txt delete mode 100644 tests/after_200/Round 049/OpponentCommand.txt delete mode 100644 tests/after_200/Round 049/PlayerCommand.txt delete mode 100644 tests/after_200/Round 050/OpponentCommand.txt delete mode 100644 tests/after_200/Round 050/PlayerCommand.txt delete mode 100644 tests/after_200/Round 051/OpponentCommand.txt delete mode 100644 tests/after_200/Round 051/PlayerCommand.txt delete mode 100644 tests/after_200/Round 052/OpponentCommand.txt delete mode 100644 tests/after_200/Round 052/PlayerCommand.txt delete mode 100644 tests/after_200/Round 053/OpponentCommand.txt delete mode 100644 tests/after_200/Round 053/PlayerCommand.txt delete mode 100644 tests/after_200/Round 054/OpponentCommand.txt delete mode 100644 tests/after_200/Round 054/PlayerCommand.txt delete mode 100644 tests/after_200/Round 055/OpponentCommand.txt delete mode 100644 tests/after_200/Round 055/PlayerCommand.txt delete mode 100644 tests/after_200/Round 056/OpponentCommand.txt delete mode 100644 tests/after_200/Round 056/PlayerCommand.txt delete mode 100644 tests/after_200/Round 057/OpponentCommand.txt delete mode 100644 tests/after_200/Round 057/PlayerCommand.txt delete mode 100644 tests/after_200/Round 058/OpponentCommand.txt delete mode 100644 tests/after_200/Round 058/PlayerCommand.txt delete mode 100644 tests/after_200/Round 059/OpponentCommand.txt delete mode 100644 tests/after_200/Round 059/PlayerCommand.txt delete mode 100644 tests/after_200/Round 060/OpponentCommand.txt delete mode 100644 tests/after_200/Round 060/PlayerCommand.txt delete mode 100644 tests/after_200/Round 061/OpponentCommand.txt delete mode 100644 tests/after_200/Round 061/PlayerCommand.txt delete mode 100644 tests/after_200/Round 062/OpponentCommand.txt delete mode 100644 tests/after_200/Round 062/PlayerCommand.txt delete mode 100644 tests/after_200/Round 063/OpponentCommand.txt delete mode 100644 tests/after_200/Round 063/PlayerCommand.txt delete mode 100644 tests/after_200/Round 064/OpponentCommand.txt delete mode 100644 tests/after_200/Round 064/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 000/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 000/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 001/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 001/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 002/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 002/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 003/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 003/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 004/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 004/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 005/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 005/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 006/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 006/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 007/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 007/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 008/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 008/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 009/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 009/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 010/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 010/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 011/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 011/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 012/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 012/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 013/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 013/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 014/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 014/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 015/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 015/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 016/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 016/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 017/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 017/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 018/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 018/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 019/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 019/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 020/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 020/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 021/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 021/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 022/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 022/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 023/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 023/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 024/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 024/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 025/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 025/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 026/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 026/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 027/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 027/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 028/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 028/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 029/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 029/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 030/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 030/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 031/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 031/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 032/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 032/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 033/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 033/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 034/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 034/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 035/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 035/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 036/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 036/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 037/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 037/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 038/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 038/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 039/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 039/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 040/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 040/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 041/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 041/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 042/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 042/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 043/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 043/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 044/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 044/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 045/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 045/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 046/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 046/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 047/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 047/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 048/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 048/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 049/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 049/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 050/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 050/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 051/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 051/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 052/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 052/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 053/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 053/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 054/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 054/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 055/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 055/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 056/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 056/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 057/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 057/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 058/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 058/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 059/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 059/PlayerCommand.txt delete mode 100644 tests/after_203_teslas/Round 060/OpponentCommand.txt delete mode 100644 tests/after_203_teslas/Round 060/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 000/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 000/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 001/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 001/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 002/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 002/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 003/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 003/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 004/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 004/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 005/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 005/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 006/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 006/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 007/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 007/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 008/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 008/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 009/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 009/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 010/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 010/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 011/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 011/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 012/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 012/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 013/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 013/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 014/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 014/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 015/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 015/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 016/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 016/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 017/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 017/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 018/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 018/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 019/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 019/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 020/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 020/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 021/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 021/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 022/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 022/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 023/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 023/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 024/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 024/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 025/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 025/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 026/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 026/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 027/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 027/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 028/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 028/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 029/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 029/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 030/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 030/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 031/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 031/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 032/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 032/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 033/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 033/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 034/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 034/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 035/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 035/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 036/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 036/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 037/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 037/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 038/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 038/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 039/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 039/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 040/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 040/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 041/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 041/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 042/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 042/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 043/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 043/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 044/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 044/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 045/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 045/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 046/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 046/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 047/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 047/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 048/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 048/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 049/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 049/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 050/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 050/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 051/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 051/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 052/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 052/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 053/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 053/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 054/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 054/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 055/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 055/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 056/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 056/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 057/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 057/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 058/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 058/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 059/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 059/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 060/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 060/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 061/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 061/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 062/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 062/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 063/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 063/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 064/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 064/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 065/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 065/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 066/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 066/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 067/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 067/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 068/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 068/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 069/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 069/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 070/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 070/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 071/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 071/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 072/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 072/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 073/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 073/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 074/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 074/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 075/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 075/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 076/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 076/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 077/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 077/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 078/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 078/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 079/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 079/PlayerCommand.txt create mode 100644 tests/v300_normal_towers/Round 080/OpponentCommand.txt create mode 100644 tests/v300_normal_towers/Round 080/PlayerCommand.txt diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index fb46567..d8cbec6 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -21,6 +21,7 @@ pub struct BitwiseGameState { pub opponent: Player, pub player_buildings: PlayerBuildings, pub opponent_buildings: PlayerBuildings, + pub round: u16 } #[derive(Debug, Clone, PartialEq, Eq)] @@ -64,8 +65,8 @@ impl BitwiseGameState { BitwiseGameState::update_construction(&mut self.player_buildings); BitwiseGameState::update_construction(&mut self.opponent_buildings); - BitwiseGameState::update_iron_curtain(&mut self.player_buildings); - BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings); + BitwiseGameState::update_iron_curtain(&mut self.player_buildings, self.round); + BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings, self.round); BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); @@ -78,6 +79,8 @@ impl BitwiseGameState { BitwiseGameState::add_energy(&mut self.player, &mut self.player_buildings); BitwiseGameState::add_energy(&mut self.opponent, &mut self.opponent_buildings); + self.round += 1; + self.update_status(); self.status } @@ -142,12 +145,14 @@ fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { impl BitwiseGameState { pub fn new( player: Player, opponent: Player, - player_buildings: PlayerBuildings, opponent_buildings: PlayerBuildings + player_buildings: PlayerBuildings, opponent_buildings: PlayerBuildings, + round: u16 ) -> BitwiseGameState { BitwiseGameState { status: GameStatus::Continue, player, opponent, - player_buildings, opponent_buildings + player_buildings, opponent_buildings, + round } } @@ -316,9 +321,11 @@ impl BitwiseGameState { player_buildings.unconstructed.truncate(buildings_len); } - fn update_iron_curtain(player_buildings: &mut PlayerBuildings) { - //TODO: Get in current round and set available to true - player_buildings.iron_curtain_remaining -= 1; + fn update_iron_curtain(player_buildings: &mut PlayerBuildings, round: u16) { + if round != 0 && round % IRON_CURTAIN_UNLOCK_INTERVAL == 0 { + player_buildings.iron_curtain_available = true; + } + player_buildings.iron_curtain_remaining = player_buildings.iron_curtain_remaining.saturating_sub(1); } fn fire_teslas(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 11afa29..9ece36d 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -27,7 +27,7 @@ pub const ENERGY_PRICE: u16 = 20; pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; pub const IRON_CURTAIN_PRICE: u16 = 100; -pub const IRON_CURTAIN_UNLOCK_INTERVAL: u8 = 30; +pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30; pub const IRON_CURTAIN_DURATION: u8 = 6; pub const DECONSTRUCT_ENERGY: u16 = 5; diff --git a/src/input/json.rs b/src/input/json.rs index 32f98d0..544e5ed 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -21,10 +21,17 @@ pub fn read_bitwise_state_from_file(filename: &str) -> Result, game_map: Vec>, } +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameDetails { + round: u16 +} + #[derive(Deserialize)] #[serde(rename_all = "camelCase")] struct Player { @@ -149,7 +156,8 @@ impl State { bitwise_engine::BitwiseGameState::new( player, opponent, - player_buildings, opponent_buildings + player_buildings, opponent_buildings, + self.game_details.round ) } diff --git a/tests/after_200/Round 000/OpponentCommand.txt b/tests/after_200/Round 000/OpponentCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_200/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 000/PlayerCommand.txt b/tests/after_200/Round 000/PlayerCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_200/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 001/OpponentCommand.txt b/tests/after_200/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 001/PlayerCommand.txt b/tests/after_200/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 002/OpponentCommand.txt b/tests/after_200/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 002/PlayerCommand.txt b/tests/after_200/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 003/OpponentCommand.txt b/tests/after_200/Round 003/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_200/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 003/PlayerCommand.txt b/tests/after_200/Round 003/PlayerCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/after_200/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/after_200/Round 004/OpponentCommand.txt b/tests/after_200/Round 004/OpponentCommand.txt deleted file mode 100644 index 5720dc8..0000000 --- a/tests/after_200/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 004/PlayerCommand.txt b/tests/after_200/Round 004/PlayerCommand.txt deleted file mode 100644 index 5720dc8..0000000 --- a/tests/after_200/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 005/OpponentCommand.txt b/tests/after_200/Round 005/OpponentCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_200/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 005/PlayerCommand.txt b/tests/after_200/Round 005/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_200/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 006/OpponentCommand.txt b/tests/after_200/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 006/PlayerCommand.txt b/tests/after_200/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 007/OpponentCommand.txt b/tests/after_200/Round 007/OpponentCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_200/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 007/PlayerCommand.txt b/tests/after_200/Round 007/PlayerCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_200/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 008/OpponentCommand.txt b/tests/after_200/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 008/PlayerCommand.txt b/tests/after_200/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_200/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_200/Round 009/OpponentCommand.txt b/tests/after_200/Round 009/OpponentCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/after_200/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 009/PlayerCommand.txt b/tests/after_200/Round 009/PlayerCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/after_200/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 010/OpponentCommand.txt b/tests/after_200/Round 010/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 010/PlayerCommand.txt b/tests/after_200/Round 010/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 011/OpponentCommand.txt b/tests/after_200/Round 011/OpponentCommand.txt deleted file mode 100644 index c919a0e..0000000 --- a/tests/after_200/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 011/PlayerCommand.txt b/tests/after_200/Round 011/PlayerCommand.txt deleted file mode 100644 index c919a0e..0000000 --- a/tests/after_200/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,3 \ No newline at end of file diff --git a/tests/after_200/Round 012/OpponentCommand.txt b/tests/after_200/Round 012/OpponentCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/after_200/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 012/PlayerCommand.txt b/tests/after_200/Round 012/PlayerCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/after_200/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 013/OpponentCommand.txt b/tests/after_200/Round 013/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_200/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 013/PlayerCommand.txt b/tests/after_200/Round 013/PlayerCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_200/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 014/OpponentCommand.txt b/tests/after_200/Round 014/OpponentCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_200/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 014/PlayerCommand.txt b/tests/after_200/Round 014/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_200/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 015/OpponentCommand.txt b/tests/after_200/Round 015/OpponentCommand.txt deleted file mode 100644 index 601aa29..0000000 --- a/tests/after_200/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 015/PlayerCommand.txt b/tests/after_200/Round 015/PlayerCommand.txt deleted file mode 100644 index 601aa29..0000000 --- a/tests/after_200/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 016/OpponentCommand.txt b/tests/after_200/Round 016/OpponentCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/after_200/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 016/PlayerCommand.txt b/tests/after_200/Round 016/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/after_200/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 017/OpponentCommand.txt b/tests/after_200/Round 017/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 017/PlayerCommand.txt b/tests/after_200/Round 017/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 018/OpponentCommand.txt b/tests/after_200/Round 018/OpponentCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/after_200/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 018/PlayerCommand.txt b/tests/after_200/Round 018/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_200/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_200/Round 019/OpponentCommand.txt b/tests/after_200/Round 019/OpponentCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/after_200/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 019/PlayerCommand.txt b/tests/after_200/Round 019/PlayerCommand.txt deleted file mode 100644 index 10532f2..0000000 --- a/tests/after_200/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 020/OpponentCommand.txt b/tests/after_200/Round 020/OpponentCommand.txt deleted file mode 100644 index d9d71ea..0000000 --- a/tests/after_200/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 020/PlayerCommand.txt b/tests/after_200/Round 020/PlayerCommand.txt deleted file mode 100644 index 49c1201..0000000 --- a/tests/after_200/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 021/OpponentCommand.txt b/tests/after_200/Round 021/OpponentCommand.txt deleted file mode 100644 index a825030..0000000 --- a/tests/after_200/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 021/PlayerCommand.txt b/tests/after_200/Round 021/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/after_200/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 022/OpponentCommand.txt b/tests/after_200/Round 022/OpponentCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/after_200/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/after_200/Round 022/PlayerCommand.txt b/tests/after_200/Round 022/PlayerCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/after_200/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 023/OpponentCommand.txt b/tests/after_200/Round 023/OpponentCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/after_200/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 023/PlayerCommand.txt b/tests/after_200/Round 023/PlayerCommand.txt deleted file mode 100644 index b7adddf..0000000 --- a/tests/after_200/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 024/OpponentCommand.txt b/tests/after_200/Round 024/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_200/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 024/PlayerCommand.txt b/tests/after_200/Round 024/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/after_200/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 025/OpponentCommand.txt b/tests/after_200/Round 025/OpponentCommand.txt deleted file mode 100644 index cb47d55..0000000 --- a/tests/after_200/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 025/PlayerCommand.txt b/tests/after_200/Round 025/PlayerCommand.txt deleted file mode 100644 index ad5a4bc..0000000 --- a/tests/after_200/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 026/OpponentCommand.txt b/tests/after_200/Round 026/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_200/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 026/PlayerCommand.txt b/tests/after_200/Round 026/PlayerCommand.txt deleted file mode 100644 index cb47d55..0000000 --- a/tests/after_200/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 027/OpponentCommand.txt b/tests/after_200/Round 027/OpponentCommand.txt deleted file mode 100644 index 734a249..0000000 --- a/tests/after_200/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 027/PlayerCommand.txt b/tests/after_200/Round 027/PlayerCommand.txt deleted file mode 100644 index 5ee21e6..0000000 --- a/tests/after_200/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 028/OpponentCommand.txt b/tests/after_200/Round 028/OpponentCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/after_200/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 028/PlayerCommand.txt b/tests/after_200/Round 028/PlayerCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/after_200/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 029/OpponentCommand.txt b/tests/after_200/Round 029/OpponentCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/after_200/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 029/PlayerCommand.txt b/tests/after_200/Round 029/PlayerCommand.txt deleted file mode 100644 index b7adddf..0000000 --- a/tests/after_200/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 030/OpponentCommand.txt b/tests/after_200/Round 030/OpponentCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_200/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 030/PlayerCommand.txt b/tests/after_200/Round 030/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/after_200/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 031/OpponentCommand.txt b/tests/after_200/Round 031/OpponentCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/after_200/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 031/PlayerCommand.txt b/tests/after_200/Round 031/PlayerCommand.txt deleted file mode 100644 index e638283..0000000 --- a/tests/after_200/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 032/OpponentCommand.txt b/tests/after_200/Round 032/OpponentCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_200/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 032/PlayerCommand.txt b/tests/after_200/Round 032/PlayerCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/after_200/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 033/OpponentCommand.txt b/tests/after_200/Round 033/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/after_200/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 033/PlayerCommand.txt b/tests/after_200/Round 033/PlayerCommand.txt deleted file mode 100644 index a030ed4..0000000 --- a/tests/after_200/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 034/OpponentCommand.txt b/tests/after_200/Round 034/OpponentCommand.txt deleted file mode 100644 index 3fde4e2..0000000 --- a/tests/after_200/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,3 \ No newline at end of file diff --git a/tests/after_200/Round 034/PlayerCommand.txt b/tests/after_200/Round 034/PlayerCommand.txt deleted file mode 100644 index 3177984..0000000 --- a/tests/after_200/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 035/OpponentCommand.txt b/tests/after_200/Round 035/OpponentCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/after_200/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 035/PlayerCommand.txt b/tests/after_200/Round 035/PlayerCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_200/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_200/Round 036/OpponentCommand.txt b/tests/after_200/Round 036/OpponentCommand.txt deleted file mode 100644 index 3177984..0000000 --- a/tests/after_200/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 036/PlayerCommand.txt b/tests/after_200/Round 036/PlayerCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/after_200/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 037/OpponentCommand.txt b/tests/after_200/Round 037/OpponentCommand.txt deleted file mode 100644 index 4a8cf07..0000000 --- a/tests/after_200/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 037/PlayerCommand.txt b/tests/after_200/Round 037/PlayerCommand.txt deleted file mode 100644 index 1571d81..0000000 --- a/tests/after_200/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 038/OpponentCommand.txt b/tests/after_200/Round 038/OpponentCommand.txt deleted file mode 100644 index 72ca43d..0000000 --- a/tests/after_200/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 038/PlayerCommand.txt b/tests/after_200/Round 038/PlayerCommand.txt deleted file mode 100644 index ddc7f56..0000000 --- a/tests/after_200/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 039/OpponentCommand.txt b/tests/after_200/Round 039/OpponentCommand.txt deleted file mode 100644 index b87efa8..0000000 --- a/tests/after_200/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 039/PlayerCommand.txt b/tests/after_200/Round 039/PlayerCommand.txt deleted file mode 100644 index 16ddcd7..0000000 --- a/tests/after_200/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 040/OpponentCommand.txt b/tests/after_200/Round 040/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_200/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 040/PlayerCommand.txt b/tests/after_200/Round 040/PlayerCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/after_200/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/after_200/Round 041/OpponentCommand.txt b/tests/after_200/Round 041/OpponentCommand.txt deleted file mode 100644 index ddc7f56..0000000 --- a/tests/after_200/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 041/PlayerCommand.txt b/tests/after_200/Round 041/PlayerCommand.txt deleted file mode 100644 index 3ab3f32..0000000 --- a/tests/after_200/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 042/OpponentCommand.txt b/tests/after_200/Round 042/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_200/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 042/PlayerCommand.txt b/tests/after_200/Round 042/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_200/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 043/OpponentCommand.txt b/tests/after_200/Round 043/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 043/PlayerCommand.txt b/tests/after_200/Round 043/PlayerCommand.txt deleted file mode 100644 index 3d765f0..0000000 --- a/tests/after_200/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 044/OpponentCommand.txt b/tests/after_200/Round 044/OpponentCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/after_200/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/after_200/Round 044/PlayerCommand.txt b/tests/after_200/Round 044/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/after_200/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 045/OpponentCommand.txt b/tests/after_200/Round 045/OpponentCommand.txt deleted file mode 100644 index 93ec9b2..0000000 --- a/tests/after_200/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 045/PlayerCommand.txt b/tests/after_200/Round 045/PlayerCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/after_200/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 046/OpponentCommand.txt b/tests/after_200/Round 046/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 046/PlayerCommand.txt b/tests/after_200/Round 046/PlayerCommand.txt deleted file mode 100644 index 93ec9b2..0000000 --- a/tests/after_200/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,1 \ No newline at end of file diff --git a/tests/after_200/Round 047/OpponentCommand.txt b/tests/after_200/Round 047/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_200/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 047/PlayerCommand.txt b/tests/after_200/Round 047/PlayerCommand.txt deleted file mode 100644 index 16ddcd7..0000000 --- a/tests/after_200/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,1 \ No newline at end of file diff --git a/tests/after_200/Round 048/OpponentCommand.txt b/tests/after_200/Round 048/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/after_200/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 048/PlayerCommand.txt b/tests/after_200/Round 048/PlayerCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/after_200/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 049/OpponentCommand.txt b/tests/after_200/Round 049/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_200/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 049/PlayerCommand.txt b/tests/after_200/Round 049/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/after_200/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 050/OpponentCommand.txt b/tests/after_200/Round 050/OpponentCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/after_200/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/after_200/Round 050/PlayerCommand.txt b/tests/after_200/Round 050/PlayerCommand.txt deleted file mode 100644 index 1818e31..0000000 --- a/tests/after_200/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,0 \ No newline at end of file diff --git a/tests/after_200/Round 051/OpponentCommand.txt b/tests/after_200/Round 051/OpponentCommand.txt deleted file mode 100644 index c602c71..0000000 --- a/tests/after_200/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,0 \ No newline at end of file diff --git a/tests/after_200/Round 051/PlayerCommand.txt b/tests/after_200/Round 051/PlayerCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/after_200/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/after_200/Round 052/OpponentCommand.txt b/tests/after_200/Round 052/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_200/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_200/Round 052/PlayerCommand.txt b/tests/after_200/Round 052/PlayerCommand.txt deleted file mode 100644 index 0d2a91c..0000000 --- a/tests/after_200/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,3 \ No newline at end of file diff --git a/tests/after_200/Round 053/OpponentCommand.txt b/tests/after_200/Round 053/OpponentCommand.txt deleted file mode 100644 index 704840c..0000000 --- a/tests/after_200/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 053/PlayerCommand.txt b/tests/after_200/Round 053/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/after_200/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/after_200/Round 054/OpponentCommand.txt b/tests/after_200/Round 054/OpponentCommand.txt deleted file mode 100644 index ebfc684..0000000 --- a/tests/after_200/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,0 \ No newline at end of file diff --git a/tests/after_200/Round 054/PlayerCommand.txt b/tests/after_200/Round 054/PlayerCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/after_200/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/after_200/Round 055/OpponentCommand.txt b/tests/after_200/Round 055/OpponentCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/after_200/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/after_200/Round 055/PlayerCommand.txt b/tests/after_200/Round 055/PlayerCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/after_200/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/after_200/Round 056/OpponentCommand.txt b/tests/after_200/Round 056/OpponentCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_200/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_200/Round 056/PlayerCommand.txt b/tests/after_200/Round 056/PlayerCommand.txt deleted file mode 100644 index 9c6b08d..0000000 --- a/tests/after_200/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,3 \ No newline at end of file diff --git a/tests/after_200/Round 057/OpponentCommand.txt b/tests/after_200/Round 057/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_200/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_200/Round 057/PlayerCommand.txt b/tests/after_200/Round 057/PlayerCommand.txt deleted file mode 100644 index 885148a..0000000 --- a/tests/after_200/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,3 \ No newline at end of file diff --git a/tests/after_200/Round 058/OpponentCommand.txt b/tests/after_200/Round 058/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/after_200/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/after_200/Round 058/PlayerCommand.txt b/tests/after_200/Round 058/PlayerCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/after_200/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/after_200/Round 059/OpponentCommand.txt b/tests/after_200/Round 059/OpponentCommand.txt deleted file mode 100644 index c163991..0000000 --- a/tests/after_200/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 059/PlayerCommand.txt b/tests/after_200/Round 059/PlayerCommand.txt deleted file mode 100644 index c163991..0000000 --- a/tests/after_200/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 060/OpponentCommand.txt b/tests/after_200/Round 060/OpponentCommand.txt deleted file mode 100644 index f069b31..0000000 --- a/tests/after_200/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,3 \ No newline at end of file diff --git a/tests/after_200/Round 060/PlayerCommand.txt b/tests/after_200/Round 060/PlayerCommand.txt deleted file mode 100644 index 5cbd497..0000000 --- a/tests/after_200/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 061/OpponentCommand.txt b/tests/after_200/Round 061/OpponentCommand.txt deleted file mode 100644 index 80a0b9a..0000000 --- a/tests/after_200/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,3 \ No newline at end of file diff --git a/tests/after_200/Round 061/PlayerCommand.txt b/tests/after_200/Round 061/PlayerCommand.txt deleted file mode 100644 index 589fe67..0000000 --- a/tests/after_200/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 062/OpponentCommand.txt b/tests/after_200/Round 062/OpponentCommand.txt deleted file mode 100644 index 70a041a..0000000 --- a/tests/after_200/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 062/PlayerCommand.txt b/tests/after_200/Round 062/PlayerCommand.txt deleted file mode 100644 index 66cb3b1..0000000 --- a/tests/after_200/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,3 \ No newline at end of file diff --git a/tests/after_200/Round 063/OpponentCommand.txt b/tests/after_200/Round 063/OpponentCommand.txt deleted file mode 100644 index cb0f20e..0000000 --- a/tests/after_200/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 063/PlayerCommand.txt b/tests/after_200/Round 063/PlayerCommand.txt deleted file mode 100644 index e7cde1b..0000000 --- a/tests/after_200/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,3 \ No newline at end of file diff --git a/tests/after_200/Round 064/OpponentCommand.txt b/tests/after_200/Round 064/OpponentCommand.txt deleted file mode 100644 index 8a8e05d..0000000 --- a/tests/after_200/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,3 \ No newline at end of file diff --git a/tests/after_200/Round 064/PlayerCommand.txt b/tests/after_200/Round 064/PlayerCommand.txt deleted file mode 100644 index 4e89ade..0000000 --- a/tests/after_200/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,3 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 000/OpponentCommand.txt b/tests/after_203_teslas/Round 000/OpponentCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/after_203_teslas/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 000/PlayerCommand.txt b/tests/after_203_teslas/Round 000/PlayerCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/after_203_teslas/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 001/OpponentCommand.txt b/tests/after_203_teslas/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 001/PlayerCommand.txt b/tests/after_203_teslas/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 002/OpponentCommand.txt b/tests/after_203_teslas/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 002/PlayerCommand.txt b/tests/after_203_teslas/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 003/OpponentCommand.txt b/tests/after_203_teslas/Round 003/OpponentCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/after_203_teslas/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 003/PlayerCommand.txt b/tests/after_203_teslas/Round 003/PlayerCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/after_203_teslas/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 004/OpponentCommand.txt b/tests/after_203_teslas/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 004/PlayerCommand.txt b/tests/after_203_teslas/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 005/OpponentCommand.txt b/tests/after_203_teslas/Round 005/OpponentCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/after_203_teslas/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 005/PlayerCommand.txt b/tests/after_203_teslas/Round 005/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/after_203_teslas/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 006/OpponentCommand.txt b/tests/after_203_teslas/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 006/PlayerCommand.txt b/tests/after_203_teslas/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 007/OpponentCommand.txt b/tests/after_203_teslas/Round 007/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_203_teslas/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 007/PlayerCommand.txt b/tests/after_203_teslas/Round 007/PlayerCommand.txt deleted file mode 100644 index 9233a2a..0000000 --- a/tests/after_203_teslas/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 008/OpponentCommand.txt b/tests/after_203_teslas/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 008/PlayerCommand.txt b/tests/after_203_teslas/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 009/OpponentCommand.txt b/tests/after_203_teslas/Round 009/OpponentCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_203_teslas/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 009/PlayerCommand.txt b/tests/after_203_teslas/Round 009/PlayerCommand.txt deleted file mode 100644 index 6628f95..0000000 --- a/tests/after_203_teslas/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 010/OpponentCommand.txt b/tests/after_203_teslas/Round 010/OpponentCommand.txt deleted file mode 100644 index 07b92b5..0000000 --- a/tests/after_203_teslas/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 010/PlayerCommand.txt b/tests/after_203_teslas/Round 010/PlayerCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/after_203_teslas/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 011/OpponentCommand.txt b/tests/after_203_teslas/Round 011/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_203_teslas/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 011/PlayerCommand.txt b/tests/after_203_teslas/Round 011/PlayerCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/after_203_teslas/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 012/OpponentCommand.txt b/tests/after_203_teslas/Round 012/OpponentCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/after_203_teslas/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 012/PlayerCommand.txt b/tests/after_203_teslas/Round 012/PlayerCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_203_teslas/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 013/OpponentCommand.txt b/tests/after_203_teslas/Round 013/OpponentCommand.txt deleted file mode 100644 index 0b12f52..0000000 --- a/tests/after_203_teslas/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 013/PlayerCommand.txt b/tests/after_203_teslas/Round 013/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/after_203_teslas/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 014/OpponentCommand.txt b/tests/after_203_teslas/Round 014/OpponentCommand.txt deleted file mode 100644 index f87d2e2..0000000 --- a/tests/after_203_teslas/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 014/PlayerCommand.txt b/tests/after_203_teslas/Round 014/PlayerCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_203_teslas/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 015/OpponentCommand.txt b/tests/after_203_teslas/Round 015/OpponentCommand.txt deleted file mode 100644 index c27eaf9..0000000 --- a/tests/after_203_teslas/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 015/PlayerCommand.txt b/tests/after_203_teslas/Round 015/PlayerCommand.txt deleted file mode 100644 index c4e7948..0000000 --- a/tests/after_203_teslas/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 016/OpponentCommand.txt b/tests/after_203_teslas/Round 016/OpponentCommand.txt deleted file mode 100644 index ad5a4bc..0000000 --- a/tests/after_203_teslas/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 016/PlayerCommand.txt b/tests/after_203_teslas/Round 016/PlayerCommand.txt deleted file mode 100644 index 6cf40d9..0000000 --- a/tests/after_203_teslas/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 017/OpponentCommand.txt b/tests/after_203_teslas/Round 017/OpponentCommand.txt deleted file mode 100644 index 8a842f9..0000000 --- a/tests/after_203_teslas/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 017/PlayerCommand.txt b/tests/after_203_teslas/Round 017/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_203_teslas/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 018/OpponentCommand.txt b/tests/after_203_teslas/Round 018/OpponentCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/after_203_teslas/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 018/PlayerCommand.txt b/tests/after_203_teslas/Round 018/PlayerCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/after_203_teslas/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 019/OpponentCommand.txt b/tests/after_203_teslas/Round 019/OpponentCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/after_203_teslas/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 019/PlayerCommand.txt b/tests/after_203_teslas/Round 019/PlayerCommand.txt deleted file mode 100644 index 66780d8..0000000 --- a/tests/after_203_teslas/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 020/OpponentCommand.txt b/tests/after_203_teslas/Round 020/OpponentCommand.txt deleted file mode 100644 index 95a4cf3..0000000 --- a/tests/after_203_teslas/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 020/PlayerCommand.txt b/tests/after_203_teslas/Round 020/PlayerCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/after_203_teslas/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 021/OpponentCommand.txt b/tests/after_203_teslas/Round 021/OpponentCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/after_203_teslas/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 021/PlayerCommand.txt b/tests/after_203_teslas/Round 021/PlayerCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/after_203_teslas/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 022/OpponentCommand.txt b/tests/after_203_teslas/Round 022/OpponentCommand.txt deleted file mode 100644 index 88af7ff..0000000 --- a/tests/after_203_teslas/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 022/PlayerCommand.txt b/tests/after_203_teslas/Round 022/PlayerCommand.txt deleted file mode 100644 index f24e83b..0000000 --- a/tests/after_203_teslas/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 023/OpponentCommand.txt b/tests/after_203_teslas/Round 023/OpponentCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_203_teslas/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 023/PlayerCommand.txt b/tests/after_203_teslas/Round 023/PlayerCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/after_203_teslas/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 024/OpponentCommand.txt b/tests/after_203_teslas/Round 024/OpponentCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_203_teslas/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 024/PlayerCommand.txt b/tests/after_203_teslas/Round 024/PlayerCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_203_teslas/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 025/OpponentCommand.txt b/tests/after_203_teslas/Round 025/OpponentCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/after_203_teslas/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 025/PlayerCommand.txt b/tests/after_203_teslas/Round 025/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/after_203_teslas/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 026/OpponentCommand.txt b/tests/after_203_teslas/Round 026/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_203_teslas/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 026/PlayerCommand.txt b/tests/after_203_teslas/Round 026/PlayerCommand.txt deleted file mode 100644 index 94d7b0a..0000000 --- a/tests/after_203_teslas/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 027/OpponentCommand.txt b/tests/after_203_teslas/Round 027/OpponentCommand.txt deleted file mode 100644 index 50688ac..0000000 --- a/tests/after_203_teslas/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 027/PlayerCommand.txt b/tests/after_203_teslas/Round 027/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_203_teslas/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 028/OpponentCommand.txt b/tests/after_203_teslas/Round 028/OpponentCommand.txt deleted file mode 100644 index 412a2df..0000000 --- a/tests/after_203_teslas/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 028/PlayerCommand.txt b/tests/after_203_teslas/Round 028/PlayerCommand.txt deleted file mode 100644 index c27eaf9..0000000 --- a/tests/after_203_teslas/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 029/OpponentCommand.txt b/tests/after_203_teslas/Round 029/OpponentCommand.txt deleted file mode 100644 index e61ee5b..0000000 --- a/tests/after_203_teslas/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 029/PlayerCommand.txt b/tests/after_203_teslas/Round 029/PlayerCommand.txt deleted file mode 100644 index 412a2df..0000000 --- a/tests/after_203_teslas/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 030/OpponentCommand.txt b/tests/after_203_teslas/Round 030/OpponentCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/after_203_teslas/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 030/PlayerCommand.txt b/tests/after_203_teslas/Round 030/PlayerCommand.txt deleted file mode 100644 index 4119710..0000000 --- a/tests/after_203_teslas/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 031/OpponentCommand.txt b/tests/after_203_teslas/Round 031/OpponentCommand.txt deleted file mode 100644 index 94d7b0a..0000000 --- a/tests/after_203_teslas/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 031/PlayerCommand.txt b/tests/after_203_teslas/Round 031/PlayerCommand.txt deleted file mode 100644 index 0b12f52..0000000 --- a/tests/after_203_teslas/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 032/OpponentCommand.txt b/tests/after_203_teslas/Round 032/OpponentCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/after_203_teslas/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 032/PlayerCommand.txt b/tests/after_203_teslas/Round 032/PlayerCommand.txt deleted file mode 100644 index 72ca43d..0000000 --- a/tests/after_203_teslas/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 033/OpponentCommand.txt b/tests/after_203_teslas/Round 033/OpponentCommand.txt deleted file mode 100644 index 7d08a5b..0000000 --- a/tests/after_203_teslas/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 033/PlayerCommand.txt b/tests/after_203_teslas/Round 033/PlayerCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/after_203_teslas/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 034/OpponentCommand.txt b/tests/after_203_teslas/Round 034/OpponentCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/after_203_teslas/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 034/PlayerCommand.txt b/tests/after_203_teslas/Round 034/PlayerCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/after_203_teslas/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 035/OpponentCommand.txt b/tests/after_203_teslas/Round 035/OpponentCommand.txt deleted file mode 100644 index 3de7cb6..0000000 --- a/tests/after_203_teslas/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 035/PlayerCommand.txt b/tests/after_203_teslas/Round 035/PlayerCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/after_203_teslas/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 036/OpponentCommand.txt b/tests/after_203_teslas/Round 036/OpponentCommand.txt deleted file mode 100644 index b7adddf..0000000 --- a/tests/after_203_teslas/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 036/PlayerCommand.txt b/tests/after_203_teslas/Round 036/PlayerCommand.txt deleted file mode 100644 index 36e6f4c..0000000 --- a/tests/after_203_teslas/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 037/OpponentCommand.txt b/tests/after_203_teslas/Round 037/OpponentCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/after_203_teslas/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 037/PlayerCommand.txt b/tests/after_203_teslas/Round 037/PlayerCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/after_203_teslas/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 038/OpponentCommand.txt b/tests/after_203_teslas/Round 038/OpponentCommand.txt deleted file mode 100644 index 8c5ef78..0000000 --- a/tests/after_203_teslas/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 038/PlayerCommand.txt b/tests/after_203_teslas/Round 038/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/after_203_teslas/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 039/OpponentCommand.txt b/tests/after_203_teslas/Round 039/OpponentCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/after_203_teslas/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 039/PlayerCommand.txt b/tests/after_203_teslas/Round 039/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/after_203_teslas/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 040/OpponentCommand.txt b/tests/after_203_teslas/Round 040/OpponentCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/after_203_teslas/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 040/PlayerCommand.txt b/tests/after_203_teslas/Round 040/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/after_203_teslas/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/after_203_teslas/Round 041/OpponentCommand.txt b/tests/after_203_teslas/Round 041/OpponentCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/after_203_teslas/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 041/PlayerCommand.txt b/tests/after_203_teslas/Round 041/PlayerCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/after_203_teslas/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 042/OpponentCommand.txt b/tests/after_203_teslas/Round 042/OpponentCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_203_teslas/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 042/PlayerCommand.txt b/tests/after_203_teslas/Round 042/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/after_203_teslas/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 043/OpponentCommand.txt b/tests/after_203_teslas/Round 043/OpponentCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/after_203_teslas/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 043/PlayerCommand.txt b/tests/after_203_teslas/Round 043/PlayerCommand.txt deleted file mode 100644 index d51905f..0000000 --- a/tests/after_203_teslas/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 044/OpponentCommand.txt b/tests/after_203_teslas/Round 044/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_203_teslas/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 044/PlayerCommand.txt b/tests/after_203_teslas/Round 044/PlayerCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_203_teslas/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 045/OpponentCommand.txt b/tests/after_203_teslas/Round 045/OpponentCommand.txt deleted file mode 100644 index a7c241f..0000000 --- a/tests/after_203_teslas/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 045/PlayerCommand.txt b/tests/after_203_teslas/Round 045/PlayerCommand.txt deleted file mode 100644 index 1818e31..0000000 --- a/tests/after_203_teslas/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 046/OpponentCommand.txt b/tests/after_203_teslas/Round 046/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_203_teslas/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 046/PlayerCommand.txt b/tests/after_203_teslas/Round 046/PlayerCommand.txt deleted file mode 100644 index 77bf522..0000000 --- a/tests/after_203_teslas/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 047/OpponentCommand.txt b/tests/after_203_teslas/Round 047/OpponentCommand.txt deleted file mode 100644 index 14d635f..0000000 --- a/tests/after_203_teslas/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,4 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 047/PlayerCommand.txt b/tests/after_203_teslas/Round 047/PlayerCommand.txt deleted file mode 100644 index 722ec58..0000000 --- a/tests/after_203_teslas/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 048/OpponentCommand.txt b/tests/after_203_teslas/Round 048/OpponentCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/after_203_teslas/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 048/PlayerCommand.txt b/tests/after_203_teslas/Round 048/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/after_203_teslas/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 049/OpponentCommand.txt b/tests/after_203_teslas/Round 049/OpponentCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/after_203_teslas/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 049/PlayerCommand.txt b/tests/after_203_teslas/Round 049/PlayerCommand.txt deleted file mode 100644 index 5c88dd1..0000000 --- a/tests/after_203_teslas/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 050/OpponentCommand.txt b/tests/after_203_teslas/Round 050/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/after_203_teslas/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 050/PlayerCommand.txt b/tests/after_203_teslas/Round 050/PlayerCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/after_203_teslas/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 051/OpponentCommand.txt b/tests/after_203_teslas/Round 051/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_203_teslas/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 051/PlayerCommand.txt b/tests/after_203_teslas/Round 051/PlayerCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/after_203_teslas/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 052/OpponentCommand.txt b/tests/after_203_teslas/Round 052/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/after_203_teslas/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 052/PlayerCommand.txt b/tests/after_203_teslas/Round 052/PlayerCommand.txt deleted file mode 100644 index b743516..0000000 --- a/tests/after_203_teslas/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 053/OpponentCommand.txt b/tests/after_203_teslas/Round 053/OpponentCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/after_203_teslas/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 053/PlayerCommand.txt b/tests/after_203_teslas/Round 053/PlayerCommand.txt deleted file mode 100644 index 77bf522..0000000 --- a/tests/after_203_teslas/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 054/OpponentCommand.txt b/tests/after_203_teslas/Round 054/OpponentCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/after_203_teslas/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 054/PlayerCommand.txt b/tests/after_203_teslas/Round 054/PlayerCommand.txt deleted file mode 100644 index c4e7948..0000000 --- a/tests/after_203_teslas/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 055/OpponentCommand.txt b/tests/after_203_teslas/Round 055/OpponentCommand.txt deleted file mode 100644 index 6cf40d9..0000000 --- a/tests/after_203_teslas/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 055/PlayerCommand.txt b/tests/after_203_teslas/Round 055/PlayerCommand.txt deleted file mode 100644 index 6cf40d9..0000000 --- a/tests/after_203_teslas/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 056/OpponentCommand.txt b/tests/after_203_teslas/Round 056/OpponentCommand.txt deleted file mode 100644 index a7c241f..0000000 --- a/tests/after_203_teslas/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 056/PlayerCommand.txt b/tests/after_203_teslas/Round 056/PlayerCommand.txt deleted file mode 100644 index a7c241f..0000000 --- a/tests/after_203_teslas/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 057/OpponentCommand.txt b/tests/after_203_teslas/Round 057/OpponentCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/after_203_teslas/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 057/PlayerCommand.txt b/tests/after_203_teslas/Round 057/PlayerCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/after_203_teslas/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 058/OpponentCommand.txt b/tests/after_203_teslas/Round 058/OpponentCommand.txt deleted file mode 100644 index 5c88dd1..0000000 --- a/tests/after_203_teslas/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 058/PlayerCommand.txt b/tests/after_203_teslas/Round 058/PlayerCommand.txt deleted file mode 100644 index 429fd32..0000000 --- a/tests/after_203_teslas/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 059/OpponentCommand.txt b/tests/after_203_teslas/Round 059/OpponentCommand.txt deleted file mode 100644 index f24e83b..0000000 --- a/tests/after_203_teslas/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 059/PlayerCommand.txt b/tests/after_203_teslas/Round 059/PlayerCommand.txt deleted file mode 100644 index f24e83b..0000000 --- a/tests/after_203_teslas/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 060/OpponentCommand.txt b/tests/after_203_teslas/Round 060/OpponentCommand.txt deleted file mode 100644 index 58897af..0000000 --- a/tests/after_203_teslas/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,0 \ No newline at end of file diff --git a/tests/after_203_teslas/Round 060/PlayerCommand.txt b/tests/after_203_teslas/Round 060/PlayerCommand.txt deleted file mode 100644 index 58897af..0000000 --- a/tests/after_203_teslas/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,0 \ No newline at end of file diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index 3297fa8..ca2ba1b 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -6,24 +6,22 @@ use zombot::engine::geometry::Point; use std::fs::File; use std::io::prelude::*; +use std::path::Path; #[test] fn it_successfully_simulates_replay() { - test_from_replay("tests/after_200", 64); + test_from_replay(&Path::new("tests/v300_normal_towers")); } -#[test] -fn it_successfully_simulates_replay_with_teslas() { - test_from_replay("tests/after_203_teslas", 60); -} - -fn test_from_replay(replay_folder: &str, length: usize) { - let mut state = json::read_bitwise_state_from_file(&format!("{}/Round 000/state.json", replay_folder)).unwrap(); +fn test_from_replay(replay_folder: &Path) { + let length = replay_folder.read_dir().unwrap().count()-1; + + let mut state = json::read_bitwise_state_from_file(&format!("{}/Round 000/state.json", replay_folder.display())).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)); - let mut expected_state = json::read_bitwise_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder, i+1)).unwrap(); + let player = read_player_command(&format!("{}/Round {:03}/PlayerCommand.txt", replay_folder.display(), i)); + let opponent = read_opponent_command(&format!("{}/Round {:03}/OpponentCommand.txt", replay_folder.display(), i)); + let mut expected_state = json::read_bitwise_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder.display(), i+1)).unwrap(); state.simulate(player, opponent); state.sort(); diff --git a/tests/state0.json b/tests/state0.json index 9e52de6..572fcf9 100644 --- a/tests/state0.json +++ b/tests/state0.json @@ -1 +1 @@ -{"gameDetails":{"round":0,"maxRounds":400,"mapWidth":16,"mapHeight":8,"roundIncomeEnergy":5,"buildingPrices":{"ENERGY":20,"ATTACK":30,"DEFENSE":30,"TESLA":300},"buildingsStats":{"ENERGY":{"health":5,"constructionTime":2,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":3},"ATTACK":{"health":5,"constructionTime":2,"price":30,"weaponDamage":5,"weaponSpeed":2,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":4},"DEFENSE":{"health":20,"constructionTime":4,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":10},"TESLA":{"health":5,"constructionTime":11,"price":300,"weaponDamage":20,"weaponSpeed":0,"weaponCooldownPeriod":10,"energyGeneratedPerTurn":0,"destroyMultiplier":10,"constructionScore":20}}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}]],"teslaHitList":[]} \ No newline at end of file +{"gameDetails":{"round":0,"maxRounds":400,"mapWidth":16,"mapHeight":8,"roundIncomeEnergy":5,"buildingPrices":{"TESLA":100,"DEFENSE":30,"ATTACK":30,"ENERGY":20},"buildingsStats":{"TESLA":{"health":5,"constructionTime":10,"price":100,"weaponDamage":20,"weaponSpeed":0,"weaponCooldownPeriod":10,"energyGeneratedPerTurn":0,"destroyMultiplier":10,"constructionScore":20},"DEFENSE":{"health":20,"constructionTime":3,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":10},"ATTACK":{"health":5,"constructionTime":1,"price":30,"weaponDamage":5,"weaponSpeed":2,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":4},"ENERGY":{"health":5,"constructionTime":1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":3}},"ironCurtainStats":{"activeRounds":6,"resetPeriod":50,"price":150,"constructionScore":20}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0,"ironCurtainAvailable":false,"activeIronCurtainLifetime":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0,"ironCurtainAvailable":false,"activeIronCurtainLifetime":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}]],"teslaHitList":[],"ironcurtainHitList":[]} \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 000/OpponentCommand.txt b/tests/v300_normal_towers/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/v300_normal_towers/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 000/PlayerCommand.txt b/tests/v300_normal_towers/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/v300_normal_towers/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 001/OpponentCommand.txt b/tests/v300_normal_towers/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 001/PlayerCommand.txt b/tests/v300_normal_towers/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 002/OpponentCommand.txt b/tests/v300_normal_towers/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 002/PlayerCommand.txt b/tests/v300_normal_towers/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 003/OpponentCommand.txt b/tests/v300_normal_towers/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_normal_towers/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 003/PlayerCommand.txt b/tests/v300_normal_towers/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_normal_towers/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 004/OpponentCommand.txt b/tests/v300_normal_towers/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 004/PlayerCommand.txt b/tests/v300_normal_towers/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 005/OpponentCommand.txt b/tests/v300_normal_towers/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..7ca2987 --- /dev/null +++ b/tests/v300_normal_towers/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 005/PlayerCommand.txt b/tests/v300_normal_towers/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/v300_normal_towers/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 006/OpponentCommand.txt b/tests/v300_normal_towers/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 006/PlayerCommand.txt b/tests/v300_normal_towers/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 007/OpponentCommand.txt b/tests/v300_normal_towers/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/v300_normal_towers/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 007/PlayerCommand.txt b/tests/v300_normal_towers/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/v300_normal_towers/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 008/OpponentCommand.txt b/tests/v300_normal_towers/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 008/PlayerCommand.txt b/tests/v300_normal_towers/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 009/OpponentCommand.txt b/tests/v300_normal_towers/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/tests/v300_normal_towers/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 009/PlayerCommand.txt b/tests/v300_normal_towers/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_normal_towers/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 010/OpponentCommand.txt b/tests/v300_normal_towers/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_normal_towers/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 010/PlayerCommand.txt b/tests/v300_normal_towers/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/v300_normal_towers/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 011/OpponentCommand.txt b/tests/v300_normal_towers/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_normal_towers/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 011/PlayerCommand.txt b/tests/v300_normal_towers/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/tests/v300_normal_towers/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 012/OpponentCommand.txt b/tests/v300_normal_towers/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/v300_normal_towers/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 012/PlayerCommand.txt b/tests/v300_normal_towers/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/tests/v300_normal_towers/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 013/OpponentCommand.txt b/tests/v300_normal_towers/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/v300_normal_towers/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 013/PlayerCommand.txt b/tests/v300_normal_towers/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/v300_normal_towers/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 014/OpponentCommand.txt b/tests/v300_normal_towers/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/v300_normal_towers/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 014/PlayerCommand.txt b/tests/v300_normal_towers/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/v300_normal_towers/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 015/OpponentCommand.txt b/tests/v300_normal_towers/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 015/PlayerCommand.txt b/tests/v300_normal_towers/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/tests/v300_normal_towers/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 016/OpponentCommand.txt b/tests/v300_normal_towers/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/v300_normal_towers/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 016/PlayerCommand.txt b/tests/v300_normal_towers/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 017/OpponentCommand.txt b/tests/v300_normal_towers/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/v300_normal_towers/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 017/PlayerCommand.txt b/tests/v300_normal_towers/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/v300_normal_towers/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 018/OpponentCommand.txt b/tests/v300_normal_towers/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/tests/v300_normal_towers/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 018/PlayerCommand.txt b/tests/v300_normal_towers/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 019/OpponentCommand.txt b/tests/v300_normal_towers/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/v300_normal_towers/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 019/PlayerCommand.txt b/tests/v300_normal_towers/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..26912c7 --- /dev/null +++ b/tests/v300_normal_towers/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 020/OpponentCommand.txt b/tests/v300_normal_towers/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/v300_normal_towers/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 020/PlayerCommand.txt b/tests/v300_normal_towers/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_normal_towers/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 021/OpponentCommand.txt b/tests/v300_normal_towers/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_normal_towers/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 021/PlayerCommand.txt b/tests/v300_normal_towers/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/v300_normal_towers/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 022/OpponentCommand.txt b/tests/v300_normal_towers/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/v300_normal_towers/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 022/PlayerCommand.txt b/tests/v300_normal_towers/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/tests/v300_normal_towers/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 023/OpponentCommand.txt b/tests/v300_normal_towers/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 023/PlayerCommand.txt b/tests/v300_normal_towers/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/v300_normal_towers/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 024/OpponentCommand.txt b/tests/v300_normal_towers/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/tests/v300_normal_towers/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 024/PlayerCommand.txt b/tests/v300_normal_towers/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/tests/v300_normal_towers/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 025/OpponentCommand.txt b/tests/v300_normal_towers/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 025/PlayerCommand.txt b/tests/v300_normal_towers/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/v300_normal_towers/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 026/OpponentCommand.txt b/tests/v300_normal_towers/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/v300_normal_towers/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 026/PlayerCommand.txt b/tests/v300_normal_towers/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 027/OpponentCommand.txt b/tests/v300_normal_towers/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/tests/v300_normal_towers/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 027/PlayerCommand.txt b/tests/v300_normal_towers/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/tests/v300_normal_towers/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 028/OpponentCommand.txt b/tests/v300_normal_towers/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_normal_towers/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 028/PlayerCommand.txt b/tests/v300_normal_towers/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_normal_towers/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 029/OpponentCommand.txt b/tests/v300_normal_towers/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 029/PlayerCommand.txt b/tests/v300_normal_towers/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 030/OpponentCommand.txt b/tests/v300_normal_towers/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/tests/v300_normal_towers/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 030/PlayerCommand.txt b/tests/v300_normal_towers/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_normal_towers/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 031/OpponentCommand.txt b/tests/v300_normal_towers/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/v300_normal_towers/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 031/PlayerCommand.txt b/tests/v300_normal_towers/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 032/OpponentCommand.txt b/tests/v300_normal_towers/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/v300_normal_towers/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 032/PlayerCommand.txt b/tests/v300_normal_towers/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_normal_towers/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 033/OpponentCommand.txt b/tests/v300_normal_towers/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/v300_normal_towers/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 033/PlayerCommand.txt b/tests/v300_normal_towers/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/v300_normal_towers/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 034/OpponentCommand.txt b/tests/v300_normal_towers/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/v300_normal_towers/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 034/PlayerCommand.txt b/tests/v300_normal_towers/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/v300_normal_towers/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 035/OpponentCommand.txt b/tests/v300_normal_towers/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 035/PlayerCommand.txt b/tests/v300_normal_towers/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_normal_towers/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 036/OpponentCommand.txt b/tests/v300_normal_towers/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/tests/v300_normal_towers/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 036/PlayerCommand.txt b/tests/v300_normal_towers/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 037/OpponentCommand.txt b/tests/v300_normal_towers/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..7ca2987 --- /dev/null +++ b/tests/v300_normal_towers/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 037/PlayerCommand.txt b/tests/v300_normal_towers/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/tests/v300_normal_towers/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 038/OpponentCommand.txt b/tests/v300_normal_towers/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/tests/v300_normal_towers/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 038/PlayerCommand.txt b/tests/v300_normal_towers/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/tests/v300_normal_towers/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 039/OpponentCommand.txt b/tests/v300_normal_towers/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..a825030 --- /dev/null +++ b/tests/v300_normal_towers/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 039/PlayerCommand.txt b/tests/v300_normal_towers/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/v300_normal_towers/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 040/OpponentCommand.txt b/tests/v300_normal_towers/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 040/PlayerCommand.txt b/tests/v300_normal_towers/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/v300_normal_towers/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 041/OpponentCommand.txt b/tests/v300_normal_towers/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/tests/v300_normal_towers/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 041/PlayerCommand.txt b/tests/v300_normal_towers/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/v300_normal_towers/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 042/OpponentCommand.txt b/tests/v300_normal_towers/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/v300_normal_towers/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 042/PlayerCommand.txt b/tests/v300_normal_towers/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..aa178b0 --- /dev/null +++ b/tests/v300_normal_towers/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 043/OpponentCommand.txt b/tests/v300_normal_towers/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 043/PlayerCommand.txt b/tests/v300_normal_towers/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/v300_normal_towers/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 044/OpponentCommand.txt b/tests/v300_normal_towers/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/tests/v300_normal_towers/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 044/PlayerCommand.txt b/tests/v300_normal_towers/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/v300_normal_towers/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 045/OpponentCommand.txt b/tests/v300_normal_towers/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 045/PlayerCommand.txt b/tests/v300_normal_towers/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/tests/v300_normal_towers/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 046/OpponentCommand.txt b/tests/v300_normal_towers/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..cb47d55 --- /dev/null +++ b/tests/v300_normal_towers/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 046/PlayerCommand.txt b/tests/v300_normal_towers/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 047/OpponentCommand.txt b/tests/v300_normal_towers/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 047/PlayerCommand.txt b/tests/v300_normal_towers/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_normal_towers/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 048/OpponentCommand.txt b/tests/v300_normal_towers/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_normal_towers/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 048/PlayerCommand.txt b/tests/v300_normal_towers/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_normal_towers/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 049/OpponentCommand.txt b/tests/v300_normal_towers/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/v300_normal_towers/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 049/PlayerCommand.txt b/tests/v300_normal_towers/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/v300_normal_towers/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 050/OpponentCommand.txt b/tests/v300_normal_towers/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/v300_normal_towers/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 050/PlayerCommand.txt b/tests/v300_normal_towers/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/tests/v300_normal_towers/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 051/OpponentCommand.txt b/tests/v300_normal_towers/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..43be3f4 --- /dev/null +++ b/tests/v300_normal_towers/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +2,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 051/PlayerCommand.txt b/tests/v300_normal_towers/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/v300_normal_towers/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 052/OpponentCommand.txt b/tests/v300_normal_towers/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 052/PlayerCommand.txt b/tests/v300_normal_towers/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/v300_normal_towers/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 053/OpponentCommand.txt b/tests/v300_normal_towers/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_normal_towers/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 053/PlayerCommand.txt b/tests/v300_normal_towers/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..0c3ccbf --- /dev/null +++ b/tests/v300_normal_towers/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 054/OpponentCommand.txt b/tests/v300_normal_towers/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 054/PlayerCommand.txt b/tests/v300_normal_towers/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/v300_normal_towers/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 055/OpponentCommand.txt b/tests/v300_normal_towers/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..b548cc7 --- /dev/null +++ b/tests/v300_normal_towers/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 055/PlayerCommand.txt b/tests/v300_normal_towers/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_normal_towers/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 056/OpponentCommand.txt b/tests/v300_normal_towers/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..ac6c42a --- /dev/null +++ b/tests/v300_normal_towers/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 056/PlayerCommand.txt b/tests/v300_normal_towers/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/v300_normal_towers/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 057/OpponentCommand.txt b/tests/v300_normal_towers/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/tests/v300_normal_towers/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 057/PlayerCommand.txt b/tests/v300_normal_towers/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/v300_normal_towers/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 058/OpponentCommand.txt b/tests/v300_normal_towers/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 058/PlayerCommand.txt b/tests/v300_normal_towers/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/tests/v300_normal_towers/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 059/OpponentCommand.txt b/tests/v300_normal_towers/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/tests/v300_normal_towers/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 059/PlayerCommand.txt b/tests/v300_normal_towers/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 060/OpponentCommand.txt b/tests/v300_normal_towers/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/tests/v300_normal_towers/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 060/PlayerCommand.txt b/tests/v300_normal_towers/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_normal_towers/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 061/OpponentCommand.txt b/tests/v300_normal_towers/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_normal_towers/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 061/PlayerCommand.txt b/tests/v300_normal_towers/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..0c3ccbf --- /dev/null +++ b/tests/v300_normal_towers/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 062/OpponentCommand.txt b/tests/v300_normal_towers/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/tests/v300_normal_towers/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 062/PlayerCommand.txt b/tests/v300_normal_towers/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..722ec58 --- /dev/null +++ b/tests/v300_normal_towers/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 063/OpponentCommand.txt b/tests/v300_normal_towers/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_normal_towers/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 063/PlayerCommand.txt b/tests/v300_normal_towers/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..c602c71 --- /dev/null +++ b/tests/v300_normal_towers/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 064/OpponentCommand.txt b/tests/v300_normal_towers/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_normal_towers/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 064/PlayerCommand.txt b/tests/v300_normal_towers/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/v300_normal_towers/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 065/OpponentCommand.txt b/tests/v300_normal_towers/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_normal_towers/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 065/PlayerCommand.txt b/tests/v300_normal_towers/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/v300_normal_towers/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 066/OpponentCommand.txt b/tests/v300_normal_towers/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/tests/v300_normal_towers/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 066/PlayerCommand.txt b/tests/v300_normal_towers/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/v300_normal_towers/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 067/OpponentCommand.txt b/tests/v300_normal_towers/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/v300_normal_towers/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 067/PlayerCommand.txt b/tests/v300_normal_towers/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/tests/v300_normal_towers/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 068/OpponentCommand.txt b/tests/v300_normal_towers/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..e874b1f --- /dev/null +++ b/tests/v300_normal_towers/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 068/PlayerCommand.txt b/tests/v300_normal_towers/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/v300_normal_towers/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 069/OpponentCommand.txt b/tests/v300_normal_towers/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/v300_normal_towers/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 069/PlayerCommand.txt b/tests/v300_normal_towers/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..ddc7f56 --- /dev/null +++ b/tests/v300_normal_towers/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 070/OpponentCommand.txt b/tests/v300_normal_towers/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..dc922cc --- /dev/null +++ b/tests/v300_normal_towers/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 070/PlayerCommand.txt b/tests/v300_normal_towers/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..93ec9b2 --- /dev/null +++ b/tests/v300_normal_towers/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 071/OpponentCommand.txt b/tests/v300_normal_towers/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_normal_towers/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 071/PlayerCommand.txt b/tests/v300_normal_towers/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/tests/v300_normal_towers/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 072/OpponentCommand.txt b/tests/v300_normal_towers/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/tests/v300_normal_towers/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 072/PlayerCommand.txt b/tests/v300_normal_towers/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..3d765f0 --- /dev/null +++ b/tests/v300_normal_towers/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +5,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 073/OpponentCommand.txt b/tests/v300_normal_towers/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/v300_normal_towers/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 073/PlayerCommand.txt b/tests/v300_normal_towers/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..08ceedf --- /dev/null +++ b/tests/v300_normal_towers/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 074/OpponentCommand.txt b/tests/v300_normal_towers/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..10532f2 --- /dev/null +++ b/tests/v300_normal_towers/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 074/PlayerCommand.txt b/tests/v300_normal_towers/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 075/OpponentCommand.txt b/tests/v300_normal_towers/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/tests/v300_normal_towers/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 075/PlayerCommand.txt b/tests/v300_normal_towers/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/v300_normal_towers/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 076/OpponentCommand.txt b/tests/v300_normal_towers/Round 076/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/v300_normal_towers/Round 076/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 076/PlayerCommand.txt b/tests/v300_normal_towers/Round 076/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/v300_normal_towers/Round 076/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 077/OpponentCommand.txt b/tests/v300_normal_towers/Round 077/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/v300_normal_towers/Round 077/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 077/PlayerCommand.txt b/tests/v300_normal_towers/Round 077/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 077/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 078/OpponentCommand.txt b/tests/v300_normal_towers/Round 078/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/tests/v300_normal_towers/Round 078/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 078/PlayerCommand.txt b/tests/v300_normal_towers/Round 078/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 078/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 079/OpponentCommand.txt b/tests/v300_normal_towers/Round 079/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/v300_normal_towers/Round 079/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 079/PlayerCommand.txt b/tests/v300_normal_towers/Round 079/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 079/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 080/OpponentCommand.txt b/tests/v300_normal_towers/Round 080/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/v300_normal_towers/Round 080/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 080/PlayerCommand.txt b/tests/v300_normal_towers/Round 080/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_normal_towers/Round 080/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file -- cgit v1.2.3 From 648dce3cfae16253472ed87674de448555ef0a15 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 12:05:12 +0200 Subject: Test cases that do the iron curtain --- src/engine/bitwise_engine.rs | 8 ++++---- src/strategy/monte_carlo.rs | 12 ++++++++---- tests/live_comparison.rs | 13 +++++++++++++ tests/v300_iron_curtain/Round 000/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 000/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 001/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 001/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 002/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 002/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 003/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 003/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 004/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 004/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 005/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 005/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 006/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 006/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 007/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 007/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 008/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 008/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 009/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 009/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 010/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 010/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 011/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 011/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 012/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 012/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 013/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 013/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 014/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 014/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 015/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 015/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 016/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 016/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 017/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 017/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 018/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 018/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 019/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 019/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 020/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 020/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 021/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 021/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 022/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 022/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 023/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 023/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 024/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 024/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 025/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 025/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 026/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 026/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 027/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 027/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 028/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 028/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 029/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 029/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 030/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 030/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 031/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 031/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 032/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 032/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 033/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 033/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 034/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 034/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 035/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 035/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 036/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 036/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 037/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 037/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 038/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 038/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 039/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 039/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 040/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 040/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 041/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 041/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 042/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 042/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 043/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 043/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 044/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 044/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 045/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 045/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 046/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 046/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 047/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 047/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 048/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 048/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 049/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 049/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 050/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 050/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 051/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 051/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 052/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 052/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 053/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 053/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 054/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 054/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 055/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 055/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 056/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 056/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 057/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 057/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 058/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 058/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 059/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 059/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 060/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 060/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 061/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 061/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 062/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 062/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 063/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 063/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 064/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 064/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 065/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 065/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 066/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 066/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 067/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 067/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 068/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 068/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 069/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 069/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 070/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 070/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 071/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 071/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 072/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 072/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 073/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 073/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 074/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 074/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 075/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 075/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 076/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 076/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 077/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 077/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 078/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 078/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 079/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 079/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 080/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 080/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 081/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 081/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 082/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 082/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 083/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 083/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 084/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 084/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 085/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 085/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 086/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 086/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 087/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 087/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 088/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 088/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 089/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 089/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 090/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 090/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 091/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 091/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 092/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 092/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 093/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 093/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 094/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 094/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 095/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 095/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 096/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 096/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 097/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 097/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 098/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 098/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 099/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 099/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 100/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 100/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 101/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 101/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 102/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 102/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 103/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 103/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 104/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 104/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 105/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 105/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 106/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 106/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 107/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 107/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 108/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 108/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 109/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 109/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 110/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 110/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 111/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 111/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 112/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 112/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 113/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 113/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 114/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 114/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 115/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 115/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 116/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 116/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 117/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 117/PlayerCommand.txt | 1 + tests/v300_iron_curtain/Round 118/OpponentCommand.txt | 1 + tests/v300_iron_curtain/Round 118/PlayerCommand.txt | 1 + .../Round 000/OpponentCommand.txt | 1 + .../Round 000/PlayerCommand.txt | 1 + .../Round 001/OpponentCommand.txt | 1 + .../Round 001/PlayerCommand.txt | 1 + .../Round 002/OpponentCommand.txt | 1 + .../Round 002/PlayerCommand.txt | 1 + .../Round 003/OpponentCommand.txt | 1 + .../Round 003/PlayerCommand.txt | 1 + .../Round 004/OpponentCommand.txt | 1 + .../Round 004/PlayerCommand.txt | 1 + .../Round 005/OpponentCommand.txt | 1 + .../Round 005/PlayerCommand.txt | 1 + .../Round 006/OpponentCommand.txt | 1 + .../Round 006/PlayerCommand.txt | 1 + .../Round 007/OpponentCommand.txt | 1 + .../Round 007/PlayerCommand.txt | 1 + .../Round 008/OpponentCommand.txt | 1 + .../Round 008/PlayerCommand.txt | 1 + .../Round 009/OpponentCommand.txt | 1 + .../Round 009/PlayerCommand.txt | 1 + .../Round 010/OpponentCommand.txt | 1 + .../Round 010/PlayerCommand.txt | 1 + .../Round 011/OpponentCommand.txt | 1 + .../Round 011/PlayerCommand.txt | 1 + .../Round 012/OpponentCommand.txt | 1 + .../Round 012/PlayerCommand.txt | 1 + .../Round 013/OpponentCommand.txt | 1 + .../Round 013/PlayerCommand.txt | 1 + .../Round 014/OpponentCommand.txt | 1 + .../Round 014/PlayerCommand.txt | 1 + .../Round 015/OpponentCommand.txt | 1 + .../Round 015/PlayerCommand.txt | 1 + .../Round 016/OpponentCommand.txt | 1 + .../Round 016/PlayerCommand.txt | 1 + .../Round 017/OpponentCommand.txt | 1 + .../Round 017/PlayerCommand.txt | 1 + .../Round 018/OpponentCommand.txt | 1 + .../Round 018/PlayerCommand.txt | 1 + .../Round 019/OpponentCommand.txt | 1 + .../Round 019/PlayerCommand.txt | 1 + .../Round 020/OpponentCommand.txt | 1 + .../Round 020/PlayerCommand.txt | 1 + .../Round 021/OpponentCommand.txt | 1 + .../Round 021/PlayerCommand.txt | 1 + .../Round 022/OpponentCommand.txt | 1 + .../Round 022/PlayerCommand.txt | 1 + .../Round 023/OpponentCommand.txt | 1 + .../Round 023/PlayerCommand.txt | 1 + .../Round 024/OpponentCommand.txt | 1 + .../Round 024/PlayerCommand.txt | 1 + .../Round 025/OpponentCommand.txt | 1 + .../Round 025/PlayerCommand.txt | 1 + .../Round 026/OpponentCommand.txt | 1 + .../Round 026/PlayerCommand.txt | 1 + .../Round 027/OpponentCommand.txt | 1 + .../Round 027/PlayerCommand.txt | 1 + .../Round 028/OpponentCommand.txt | 1 + .../Round 028/PlayerCommand.txt | 1 + .../Round 029/OpponentCommand.txt | 1 + .../Round 029/PlayerCommand.txt | 1 + .../Round 030/OpponentCommand.txt | 1 + .../Round 030/PlayerCommand.txt | 1 + .../Round 031/OpponentCommand.txt | 1 + .../Round 031/PlayerCommand.txt | 1 + .../Round 032/OpponentCommand.txt | 1 + .../Round 032/PlayerCommand.txt | 1 + .../Round 033/OpponentCommand.txt | 1 + .../Round 033/PlayerCommand.txt | 1 + .../Round 034/OpponentCommand.txt | 1 + .../Round 034/PlayerCommand.txt | 1 + .../Round 035/OpponentCommand.txt | 1 + .../Round 035/PlayerCommand.txt | 1 + .../Round 036/OpponentCommand.txt | 1 + .../Round 036/PlayerCommand.txt | 1 + .../Round 037/OpponentCommand.txt | 1 + .../Round 037/PlayerCommand.txt | 1 + .../Round 038/OpponentCommand.txt | 1 + .../Round 038/PlayerCommand.txt | 1 + .../Round 039/OpponentCommand.txt | 1 + .../Round 039/PlayerCommand.txt | 1 + .../Round 040/OpponentCommand.txt | 1 + .../Round 040/PlayerCommand.txt | 1 + .../Round 041/OpponentCommand.txt | 1 + .../Round 041/PlayerCommand.txt | 1 + .../Round 042/OpponentCommand.txt | 1 + .../Round 042/PlayerCommand.txt | 1 + .../Round 043/OpponentCommand.txt | 1 + .../Round 043/PlayerCommand.txt | 1 + .../Round 044/OpponentCommand.txt | 1 + .../Round 044/PlayerCommand.txt | 1 + .../Round 045/OpponentCommand.txt | 1 + .../Round 045/PlayerCommand.txt | 1 + .../Round 046/OpponentCommand.txt | 1 + .../Round 046/PlayerCommand.txt | 1 + .../Round 047/OpponentCommand.txt | 1 + .../Round 047/PlayerCommand.txt | 1 + .../Round 048/OpponentCommand.txt | 1 + .../Round 048/PlayerCommand.txt | 1 + .../Round 049/OpponentCommand.txt | 1 + .../Round 049/PlayerCommand.txt | 1 + .../Round 050/OpponentCommand.txt | 1 + .../Round 050/PlayerCommand.txt | 1 + .../Round 051/OpponentCommand.txt | 1 + .../Round 051/PlayerCommand.txt | 1 + .../Round 052/OpponentCommand.txt | 1 + .../Round 052/PlayerCommand.txt | 1 + .../Round 053/OpponentCommand.txt | 1 + .../Round 053/PlayerCommand.txt | 1 + .../Round 054/OpponentCommand.txt | 1 + .../Round 054/PlayerCommand.txt | 1 + .../Round 055/OpponentCommand.txt | 1 + .../Round 055/PlayerCommand.txt | 1 + .../Round 056/OpponentCommand.txt | 1 + .../Round 056/PlayerCommand.txt | 1 + .../Round 057/OpponentCommand.txt | 1 + .../Round 057/PlayerCommand.txt | 1 + .../Round 058/OpponentCommand.txt | 1 + .../Round 058/PlayerCommand.txt | 1 + .../Round 059/OpponentCommand.txt | 1 + .../Round 059/PlayerCommand.txt | 1 + .../Round 060/OpponentCommand.txt | 1 + .../Round 060/PlayerCommand.txt | 1 + .../Round 061/OpponentCommand.txt | 1 + .../Round 061/PlayerCommand.txt | 1 + .../Round 062/OpponentCommand.txt | 1 + .../Round 062/PlayerCommand.txt | 1 + .../Round 063/OpponentCommand.txt | 1 + .../Round 063/PlayerCommand.txt | 1 + .../Round 064/OpponentCommand.txt | 1 + .../Round 064/PlayerCommand.txt | 1 + .../Round 065/OpponentCommand.txt | 1 + .../Round 065/PlayerCommand.txt | 1 + .../Round 066/OpponentCommand.txt | 1 + .../Round 066/PlayerCommand.txt | 1 + .../Round 067/OpponentCommand.txt | 1 + .../Round 067/PlayerCommand.txt | 1 + .../Round 068/OpponentCommand.txt | 1 + .../Round 068/PlayerCommand.txt | 1 + .../Round 069/OpponentCommand.txt | 1 + .../Round 069/PlayerCommand.txt | 1 + .../Round 070/OpponentCommand.txt | 1 + .../Round 070/PlayerCommand.txt | 1 + .../Round 071/OpponentCommand.txt | 1 + .../Round 071/PlayerCommand.txt | 1 + .../Round 072/OpponentCommand.txt | 1 + .../Round 072/PlayerCommand.txt | 1 + .../Round 073/OpponentCommand.txt | 1 + .../Round 073/PlayerCommand.txt | 1 + .../Round 074/OpponentCommand.txt | 1 + .../Round 074/PlayerCommand.txt | 1 + .../Round 075/OpponentCommand.txt | 1 + .../Round 075/PlayerCommand.txt | 1 + 393 files changed, 415 insertions(+), 8 deletions(-) create mode 100644 tests/v300_iron_curtain/Round 000/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 000/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 001/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 001/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 002/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 002/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 003/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 003/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 004/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 004/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 005/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 005/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 006/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 006/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 007/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 007/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 008/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 008/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 009/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 009/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 010/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 010/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 011/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 011/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 012/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 012/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 013/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 013/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 014/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 014/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 015/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 015/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 016/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 016/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 017/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 017/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 018/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 018/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 019/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 019/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 020/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 020/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 021/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 021/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 022/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 022/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 023/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 023/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 024/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 024/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 025/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 025/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 026/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 026/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 027/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 027/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 028/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 028/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 029/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 029/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 030/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 030/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 031/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 031/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 032/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 032/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 033/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 033/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 034/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 034/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 035/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 035/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 036/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 036/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 037/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 037/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 038/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 038/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 039/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 039/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 040/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 040/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 041/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 041/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 042/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 042/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 043/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 043/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 044/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 044/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 045/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 045/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 046/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 046/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 047/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 047/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 048/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 048/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 049/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 049/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 050/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 050/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 051/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 051/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 052/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 052/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 053/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 053/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 054/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 054/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 055/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 055/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 056/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 056/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 057/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 057/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 058/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 058/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 059/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 059/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 060/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 060/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 061/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 061/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 062/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 062/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 063/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 063/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 064/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 064/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 065/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 065/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 066/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 066/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 067/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 067/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 068/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 068/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 069/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 069/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 070/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 070/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 071/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 071/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 072/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 072/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 073/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 073/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 074/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 074/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 075/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 075/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 076/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 076/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 077/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 077/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 078/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 078/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 079/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 079/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 080/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 080/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 081/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 081/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 082/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 082/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 083/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 083/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 084/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 084/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 085/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 085/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 086/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 086/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 087/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 087/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 088/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 088/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 089/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 089/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 090/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 090/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 091/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 091/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 092/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 092/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 093/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 093/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 094/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 094/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 095/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 095/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 096/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 096/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 097/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 097/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 098/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 098/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 099/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 099/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 100/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 100/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 101/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 101/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 102/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 102/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 103/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 103/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 104/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 104/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 105/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 105/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 106/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 106/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 107/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 107/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 108/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 108/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 109/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 109/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 110/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 110/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 111/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 111/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 112/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 112/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 113/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 113/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 114/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 114/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 115/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 115/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 116/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 116/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 117/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 117/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain/Round 118/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain/Round 118/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt create mode 100644 tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index d8cbec6..0bcacbc 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -64,10 +64,7 @@ impl BitwiseGameState { BitwiseGameState::update_construction(&mut self.player_buildings); BitwiseGameState::update_construction(&mut self.opponent_buildings); - - BitwiseGameState::update_iron_curtain(&mut self.player_buildings, self.round); - BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings, self.round); - + BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); BitwiseGameState::add_missiles(&mut self.player_buildings); @@ -79,6 +76,9 @@ impl BitwiseGameState { BitwiseGameState::add_energy(&mut self.player, &mut self.player_buildings); BitwiseGameState::add_energy(&mut self.opponent, &mut self.opponent_buildings); + BitwiseGameState::update_iron_curtain(&mut self.player_buildings, self.round); + BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings, self.round); + self.round += 1; self.update_status(); diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 95d87fa..b02ebf4 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -134,12 +134,14 @@ fn random_movePoint>(all_buildings: &[BuildingType], iron_ Command::Nothing } else if iron_curtain_available && building_choice_index == all_buildings.len() + 1 { Command::IronCurtain - } else { + } else if free_positions_count > 0 { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( get_point(position_choice), all_buildings[building_choice_index] ) + } else { + Command::Nothing } } @@ -202,10 +204,12 @@ impl CommandScore { let unoccupied_cells = (0..state.unoccupied_player_cell_count()).map(|i| state.location_of_unoccupied_player_cell(i)); let building_command_count = unoccupied_cells.len()*all_buildings.len(); - let nothing_count = 1; - let mut commands = Vec::with_capacity(building_command_count + nothing_count); + let mut commands = Vec::with_capacity(building_command_count + 2); commands.push(CommandScore::new(Command::Nothing)); + if state.player_can_build_iron_curtain() { + commands.push(CommandScore::new(Command::IronCurtain)); + } for position in unoccupied_cells { for &building in &all_buildings { @@ -238,7 +242,7 @@ fn sensible_buildings(player: &Player, _player_buildings: &PlayerBuildings, has_ } -//TODO: Heuristic that avoids building the initial energy towers all in the same row? +//TODO: Heuristic that avoids building the initial energy towers all in the same row? Max energy in a row? //TODO: Update cutoff to maybe build iron curtains #[cfg(feature = "energy-cutoff")] fn sensible_buildings(player: &Player, player_buildings: &PlayerBuildings, has_max_teslas: bool) -> Vec { diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index ca2ba1b..045414a 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -13,6 +13,17 @@ fn it_successfully_simulates_replay() { test_from_replay(&Path::new("tests/v300_normal_towers")); } +#[test] +fn it_successfully_simulates_replay_with_iron_curtain() { + test_from_replay(&Path::new("tests/v300_iron_curtain")); +} + +#[test] +fn it_successfully_simulates_replay_with_iron_curtain_with_teslas() { + test_from_replay(&Path::new("tests/v300_iron_curtain_with_teslas")); +} + + fn test_from_replay(replay_folder: &Path) { let length = replay_folder.read_dir().unwrap().count()-1; @@ -46,6 +57,8 @@ fn read_player_command(filename: &str) -> Command { let action_type = components.next().unwrap().trim().parse().unwrap(); if action_type == 3 { Command::Deconstruct(point) + } else if action_type == 5 { + Command::IronCurtain } else { Command::Build(point, BuildingType::from_u8(action_type).unwrap()) } diff --git a/tests/v300_iron_curtain/Round 000/OpponentCommand.txt b/tests/v300_iron_curtain/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/v300_iron_curtain/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 000/PlayerCommand.txt b/tests/v300_iron_curtain/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 001/OpponentCommand.txt b/tests/v300_iron_curtain/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 001/PlayerCommand.txt b/tests/v300_iron_curtain/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 002/OpponentCommand.txt b/tests/v300_iron_curtain/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 002/PlayerCommand.txt b/tests/v300_iron_curtain/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 003/OpponentCommand.txt b/tests/v300_iron_curtain/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/v300_iron_curtain/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 003/PlayerCommand.txt b/tests/v300_iron_curtain/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/v300_iron_curtain/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 004/OpponentCommand.txt b/tests/v300_iron_curtain/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 004/PlayerCommand.txt b/tests/v300_iron_curtain/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 005/OpponentCommand.txt b/tests/v300_iron_curtain/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/v300_iron_curtain/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 005/PlayerCommand.txt b/tests/v300_iron_curtain/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/v300_iron_curtain/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 006/OpponentCommand.txt b/tests/v300_iron_curtain/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 006/PlayerCommand.txt b/tests/v300_iron_curtain/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 007/OpponentCommand.txt b/tests/v300_iron_curtain/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/v300_iron_curtain/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 007/PlayerCommand.txt b/tests/v300_iron_curtain/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 008/OpponentCommand.txt b/tests/v300_iron_curtain/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 008/PlayerCommand.txt b/tests/v300_iron_curtain/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 009/OpponentCommand.txt b/tests/v300_iron_curtain/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/tests/v300_iron_curtain/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 009/PlayerCommand.txt b/tests/v300_iron_curtain/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/v300_iron_curtain/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 010/OpponentCommand.txt b/tests/v300_iron_curtain/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 010/PlayerCommand.txt b/tests/v300_iron_curtain/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 011/OpponentCommand.txt b/tests/v300_iron_curtain/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/v300_iron_curtain/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 011/PlayerCommand.txt b/tests/v300_iron_curtain/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/v300_iron_curtain/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 012/OpponentCommand.txt b/tests/v300_iron_curtain/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/v300_iron_curtain/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 012/PlayerCommand.txt b/tests/v300_iron_curtain/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 013/OpponentCommand.txt b/tests/v300_iron_curtain/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/v300_iron_curtain/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 013/PlayerCommand.txt b/tests/v300_iron_curtain/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 014/OpponentCommand.txt b/tests/v300_iron_curtain/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/v300_iron_curtain/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 014/PlayerCommand.txt b/tests/v300_iron_curtain/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/v300_iron_curtain/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 015/OpponentCommand.txt b/tests/v300_iron_curtain/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 015/PlayerCommand.txt b/tests/v300_iron_curtain/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/v300_iron_curtain/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 016/OpponentCommand.txt b/tests/v300_iron_curtain/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..10532f2 --- /dev/null +++ b/tests/v300_iron_curtain/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 016/PlayerCommand.txt b/tests/v300_iron_curtain/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 017/OpponentCommand.txt b/tests/v300_iron_curtain/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..0f83bc0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 017/PlayerCommand.txt b/tests/v300_iron_curtain/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/v300_iron_curtain/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 018/OpponentCommand.txt b/tests/v300_iron_curtain/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/v300_iron_curtain/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 018/PlayerCommand.txt b/tests/v300_iron_curtain/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/tests/v300_iron_curtain/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 019/OpponentCommand.txt b/tests/v300_iron_curtain/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 019/PlayerCommand.txt b/tests/v300_iron_curtain/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/v300_iron_curtain/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 020/OpponentCommand.txt b/tests/v300_iron_curtain/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..3ab3f32 --- /dev/null +++ b/tests/v300_iron_curtain/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 020/PlayerCommand.txt b/tests/v300_iron_curtain/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 021/OpponentCommand.txt b/tests/v300_iron_curtain/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/v300_iron_curtain/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 021/PlayerCommand.txt b/tests/v300_iron_curtain/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/tests/v300_iron_curtain/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 022/OpponentCommand.txt b/tests/v300_iron_curtain/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/v300_iron_curtain/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 022/PlayerCommand.txt b/tests/v300_iron_curtain/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..4371338 --- /dev/null +++ b/tests/v300_iron_curtain/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 023/OpponentCommand.txt b/tests/v300_iron_curtain/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/v300_iron_curtain/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 023/PlayerCommand.txt b/tests/v300_iron_curtain/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/tests/v300_iron_curtain/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 024/OpponentCommand.txt b/tests/v300_iron_curtain/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/tests/v300_iron_curtain/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 024/PlayerCommand.txt b/tests/v300_iron_curtain/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/v300_iron_curtain/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 025/OpponentCommand.txt b/tests/v300_iron_curtain/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/tests/v300_iron_curtain/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 025/PlayerCommand.txt b/tests/v300_iron_curtain/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 026/OpponentCommand.txt b/tests/v300_iron_curtain/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/v300_iron_curtain/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 026/PlayerCommand.txt b/tests/v300_iron_curtain/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..8a842f9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 027/OpponentCommand.txt b/tests/v300_iron_curtain/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/v300_iron_curtain/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 027/PlayerCommand.txt b/tests/v300_iron_curtain/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/v300_iron_curtain/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 028/OpponentCommand.txt b/tests/v300_iron_curtain/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..b2c26e5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 028/PlayerCommand.txt b/tests/v300_iron_curtain/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..08ceedf --- /dev/null +++ b/tests/v300_iron_curtain/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 029/OpponentCommand.txt b/tests/v300_iron_curtain/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/v300_iron_curtain/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 029/PlayerCommand.txt b/tests/v300_iron_curtain/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..9408cb0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 030/OpponentCommand.txt b/tests/v300_iron_curtain/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/tests/v300_iron_curtain/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 030/PlayerCommand.txt b/tests/v300_iron_curtain/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/v300_iron_curtain/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 031/OpponentCommand.txt b/tests/v300_iron_curtain/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/tests/v300_iron_curtain/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 031/PlayerCommand.txt b/tests/v300_iron_curtain/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_iron_curtain/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 032/OpponentCommand.txt b/tests/v300_iron_curtain/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/tests/v300_iron_curtain/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 032/PlayerCommand.txt b/tests/v300_iron_curtain/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/v300_iron_curtain/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 033/OpponentCommand.txt b/tests/v300_iron_curtain/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 033/PlayerCommand.txt b/tests/v300_iron_curtain/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..c37c6f4 --- /dev/null +++ b/tests/v300_iron_curtain/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +1,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 034/OpponentCommand.txt b/tests/v300_iron_curtain/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/v300_iron_curtain/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 034/PlayerCommand.txt b/tests/v300_iron_curtain/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 035/OpponentCommand.txt b/tests/v300_iron_curtain/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/tests/v300_iron_curtain/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 035/PlayerCommand.txt b/tests/v300_iron_curtain/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..8ac3a56 --- /dev/null +++ b/tests/v300_iron_curtain/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 036/OpponentCommand.txt b/tests/v300_iron_curtain/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/tests/v300_iron_curtain/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 036/PlayerCommand.txt b/tests/v300_iron_curtain/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/tests/v300_iron_curtain/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 037/OpponentCommand.txt b/tests/v300_iron_curtain/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/tests/v300_iron_curtain/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 037/PlayerCommand.txt b/tests/v300_iron_curtain/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/v300_iron_curtain/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 038/OpponentCommand.txt b/tests/v300_iron_curtain/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/tests/v300_iron_curtain/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 038/PlayerCommand.txt b/tests/v300_iron_curtain/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/tests/v300_iron_curtain/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 039/OpponentCommand.txt b/tests/v300_iron_curtain/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 039/PlayerCommand.txt b/tests/v300_iron_curtain/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/tests/v300_iron_curtain/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 040/OpponentCommand.txt b/tests/v300_iron_curtain/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/v300_iron_curtain/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 040/PlayerCommand.txt b/tests/v300_iron_curtain/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/v300_iron_curtain/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 041/OpponentCommand.txt b/tests/v300_iron_curtain/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/tests/v300_iron_curtain/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 041/PlayerCommand.txt b/tests/v300_iron_curtain/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/tests/v300_iron_curtain/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 042/OpponentCommand.txt b/tests/v300_iron_curtain/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/v300_iron_curtain/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 042/PlayerCommand.txt b/tests/v300_iron_curtain/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/tests/v300_iron_curtain/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 043/OpponentCommand.txt b/tests/v300_iron_curtain/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/v300_iron_curtain/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 043/PlayerCommand.txt b/tests/v300_iron_curtain/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 044/OpponentCommand.txt b/tests/v300_iron_curtain/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/tests/v300_iron_curtain/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 044/PlayerCommand.txt b/tests/v300_iron_curtain/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/tests/v300_iron_curtain/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 045/OpponentCommand.txt b/tests/v300_iron_curtain/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/v300_iron_curtain/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 045/PlayerCommand.txt b/tests/v300_iron_curtain/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/v300_iron_curtain/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 046/OpponentCommand.txt b/tests/v300_iron_curtain/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..055ca5b --- /dev/null +++ b/tests/v300_iron_curtain/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 046/PlayerCommand.txt b/tests/v300_iron_curtain/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/v300_iron_curtain/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 047/OpponentCommand.txt b/tests/v300_iron_curtain/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..e874b1f --- /dev/null +++ b/tests/v300_iron_curtain/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 047/PlayerCommand.txt b/tests/v300_iron_curtain/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 048/OpponentCommand.txt b/tests/v300_iron_curtain/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/tests/v300_iron_curtain/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 048/PlayerCommand.txt b/tests/v300_iron_curtain/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/tests/v300_iron_curtain/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 049/OpponentCommand.txt b/tests/v300_iron_curtain/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/tests/v300_iron_curtain/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 049/PlayerCommand.txt b/tests/v300_iron_curtain/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 050/OpponentCommand.txt b/tests/v300_iron_curtain/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/v300_iron_curtain/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 050/PlayerCommand.txt b/tests/v300_iron_curtain/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/v300_iron_curtain/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 051/OpponentCommand.txt b/tests/v300_iron_curtain/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..d9e32bb --- /dev/null +++ b/tests/v300_iron_curtain/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 051/PlayerCommand.txt b/tests/v300_iron_curtain/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/tests/v300_iron_curtain/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 052/OpponentCommand.txt b/tests/v300_iron_curtain/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..226a1f4 --- /dev/null +++ b/tests/v300_iron_curtain/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 052/PlayerCommand.txt b/tests/v300_iron_curtain/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/tests/v300_iron_curtain/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 053/OpponentCommand.txt b/tests/v300_iron_curtain/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/tests/v300_iron_curtain/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 053/PlayerCommand.txt b/tests/v300_iron_curtain/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/v300_iron_curtain/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 054/OpponentCommand.txt b/tests/v300_iron_curtain/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..1e7a5f9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 054/PlayerCommand.txt b/tests/v300_iron_curtain/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/tests/v300_iron_curtain/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 055/OpponentCommand.txt b/tests/v300_iron_curtain/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/v300_iron_curtain/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 055/PlayerCommand.txt b/tests/v300_iron_curtain/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/tests/v300_iron_curtain/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 056/OpponentCommand.txt b/tests/v300_iron_curtain/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..b2c26e5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 056/PlayerCommand.txt b/tests/v300_iron_curtain/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/tests/v300_iron_curtain/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 057/OpponentCommand.txt b/tests/v300_iron_curtain/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/tests/v300_iron_curtain/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 057/PlayerCommand.txt b/tests/v300_iron_curtain/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..d9d71ea --- /dev/null +++ b/tests/v300_iron_curtain/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 058/OpponentCommand.txt b/tests/v300_iron_curtain/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..722ec58 --- /dev/null +++ b/tests/v300_iron_curtain/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +4,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 058/PlayerCommand.txt b/tests/v300_iron_curtain/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_iron_curtain/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 059/OpponentCommand.txt b/tests/v300_iron_curtain/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..07b92b5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 059/PlayerCommand.txt b/tests/v300_iron_curtain/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/v300_iron_curtain/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 060/OpponentCommand.txt b/tests/v300_iron_curtain/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/v300_iron_curtain/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 060/PlayerCommand.txt b/tests/v300_iron_curtain/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..117d6c2 --- /dev/null +++ b/tests/v300_iron_curtain/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 061/OpponentCommand.txt b/tests/v300_iron_curtain/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/v300_iron_curtain/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 061/PlayerCommand.txt b/tests/v300_iron_curtain/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/v300_iron_curtain/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 062/OpponentCommand.txt b/tests/v300_iron_curtain/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/tests/v300_iron_curtain/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 062/PlayerCommand.txt b/tests/v300_iron_curtain/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_iron_curtain/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 063/OpponentCommand.txt b/tests/v300_iron_curtain/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/tests/v300_iron_curtain/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 063/PlayerCommand.txt b/tests/v300_iron_curtain/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/tests/v300_iron_curtain/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 064/OpponentCommand.txt b/tests/v300_iron_curtain/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_iron_curtain/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 064/PlayerCommand.txt b/tests/v300_iron_curtain/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/tests/v300_iron_curtain/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 065/OpponentCommand.txt b/tests/v300_iron_curtain/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 065/PlayerCommand.txt b/tests/v300_iron_curtain/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..26912c7 --- /dev/null +++ b/tests/v300_iron_curtain/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 066/OpponentCommand.txt b/tests/v300_iron_curtain/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..4f716a1 --- /dev/null +++ b/tests/v300_iron_curtain/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 066/PlayerCommand.txt b/tests/v300_iron_curtain/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 067/OpponentCommand.txt b/tests/v300_iron_curtain/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 067/PlayerCommand.txt b/tests/v300_iron_curtain/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 068/OpponentCommand.txt b/tests/v300_iron_curtain/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..d9e32bb --- /dev/null +++ b/tests/v300_iron_curtain/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 068/PlayerCommand.txt b/tests/v300_iron_curtain/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..50688ac --- /dev/null +++ b/tests/v300_iron_curtain/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 069/OpponentCommand.txt b/tests/v300_iron_curtain/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..ebfc684 --- /dev/null +++ b/tests/v300_iron_curtain/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 069/PlayerCommand.txt b/tests/v300_iron_curtain/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/tests/v300_iron_curtain/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 070/OpponentCommand.txt b/tests/v300_iron_curtain/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..c742585 --- /dev/null +++ b/tests/v300_iron_curtain/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 070/PlayerCommand.txt b/tests/v300_iron_curtain/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/tests/v300_iron_curtain/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 071/OpponentCommand.txt b/tests/v300_iron_curtain/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/tests/v300_iron_curtain/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 071/PlayerCommand.txt b/tests/v300_iron_curtain/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 072/OpponentCommand.txt b/tests/v300_iron_curtain/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 072/PlayerCommand.txt b/tests/v300_iron_curtain/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/tests/v300_iron_curtain/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 073/OpponentCommand.txt b/tests/v300_iron_curtain/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..a91c23f --- /dev/null +++ b/tests/v300_iron_curtain/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 073/PlayerCommand.txt b/tests/v300_iron_curtain/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..95a4cf3 --- /dev/null +++ b/tests/v300_iron_curtain/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 074/OpponentCommand.txt b/tests/v300_iron_curtain/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..daa46d9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 074/PlayerCommand.txt b/tests/v300_iron_curtain/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_iron_curtain/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 075/OpponentCommand.txt b/tests/v300_iron_curtain/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/v300_iron_curtain/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 075/PlayerCommand.txt b/tests/v300_iron_curtain/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..910a1ab --- /dev/null +++ b/tests/v300_iron_curtain/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 076/OpponentCommand.txt b/tests/v300_iron_curtain/Round 076/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_iron_curtain/Round 076/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 076/PlayerCommand.txt b/tests/v300_iron_curtain/Round 076/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/tests/v300_iron_curtain/Round 076/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 077/OpponentCommand.txt b/tests/v300_iron_curtain/Round 077/OpponentCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_iron_curtain/Round 077/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 077/PlayerCommand.txt b/tests/v300_iron_curtain/Round 077/PlayerCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/tests/v300_iron_curtain/Round 077/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 078/OpponentCommand.txt b/tests/v300_iron_curtain/Round 078/OpponentCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/tests/v300_iron_curtain/Round 078/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 078/PlayerCommand.txt b/tests/v300_iron_curtain/Round 078/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/tests/v300_iron_curtain/Round 078/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 079/OpponentCommand.txt b/tests/v300_iron_curtain/Round 079/OpponentCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/tests/v300_iron_curtain/Round 079/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 079/PlayerCommand.txt b/tests/v300_iron_curtain/Round 079/PlayerCommand.txt new file mode 100644 index 0000000..f8007d6 --- /dev/null +++ b/tests/v300_iron_curtain/Round 079/PlayerCommand.txt @@ -0,0 +1 @@ +0,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 080/OpponentCommand.txt b/tests/v300_iron_curtain/Round 080/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/tests/v300_iron_curtain/Round 080/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 080/PlayerCommand.txt b/tests/v300_iron_curtain/Round 080/PlayerCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/tests/v300_iron_curtain/Round 080/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 081/OpponentCommand.txt b/tests/v300_iron_curtain/Round 081/OpponentCommand.txt new file mode 100644 index 0000000..4f8f464 --- /dev/null +++ b/tests/v300_iron_curtain/Round 081/OpponentCommand.txt @@ -0,0 +1 @@ +5,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 081/PlayerCommand.txt b/tests/v300_iron_curtain/Round 081/PlayerCommand.txt new file mode 100644 index 0000000..c49791c --- /dev/null +++ b/tests/v300_iron_curtain/Round 081/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 082/OpponentCommand.txt b/tests/v300_iron_curtain/Round 082/OpponentCommand.txt new file mode 100644 index 0000000..ce49ef6 --- /dev/null +++ b/tests/v300_iron_curtain/Round 082/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 082/PlayerCommand.txt b/tests/v300_iron_curtain/Round 082/PlayerCommand.txt new file mode 100644 index 0000000..3ab3f32 --- /dev/null +++ b/tests/v300_iron_curtain/Round 082/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 083/OpponentCommand.txt b/tests/v300_iron_curtain/Round 083/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain/Round 083/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 083/PlayerCommand.txt b/tests/v300_iron_curtain/Round 083/PlayerCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/tests/v300_iron_curtain/Round 083/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 084/OpponentCommand.txt b/tests/v300_iron_curtain/Round 084/OpponentCommand.txt new file mode 100644 index 0000000..b2c26e5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 084/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 084/PlayerCommand.txt b/tests/v300_iron_curtain/Round 084/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_iron_curtain/Round 084/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 085/OpponentCommand.txt b/tests/v300_iron_curtain/Round 085/OpponentCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/tests/v300_iron_curtain/Round 085/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 085/PlayerCommand.txt b/tests/v300_iron_curtain/Round 085/PlayerCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 085/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 086/OpponentCommand.txt b/tests/v300_iron_curtain/Round 086/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/tests/v300_iron_curtain/Round 086/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 086/PlayerCommand.txt b/tests/v300_iron_curtain/Round 086/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/v300_iron_curtain/Round 086/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 087/OpponentCommand.txt b/tests/v300_iron_curtain/Round 087/OpponentCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/tests/v300_iron_curtain/Round 087/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 087/PlayerCommand.txt b/tests/v300_iron_curtain/Round 087/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/tests/v300_iron_curtain/Round 087/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 088/OpponentCommand.txt b/tests/v300_iron_curtain/Round 088/OpponentCommand.txt new file mode 100644 index 0000000..4b87d86 --- /dev/null +++ b/tests/v300_iron_curtain/Round 088/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 088/PlayerCommand.txt b/tests/v300_iron_curtain/Round 088/PlayerCommand.txt new file mode 100644 index 0000000..f238916 --- /dev/null +++ b/tests/v300_iron_curtain/Round 088/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 089/OpponentCommand.txt b/tests/v300_iron_curtain/Round 089/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/v300_iron_curtain/Round 089/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 089/PlayerCommand.txt b/tests/v300_iron_curtain/Round 089/PlayerCommand.txt new file mode 100644 index 0000000..2a21cf5 --- /dev/null +++ b/tests/v300_iron_curtain/Round 089/PlayerCommand.txt @@ -0,0 +1 @@ +3,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 090/OpponentCommand.txt b/tests/v300_iron_curtain/Round 090/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/tests/v300_iron_curtain/Round 090/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 090/PlayerCommand.txt b/tests/v300_iron_curtain/Round 090/PlayerCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/tests/v300_iron_curtain/Round 090/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 091/OpponentCommand.txt b/tests/v300_iron_curtain/Round 091/OpponentCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/v300_iron_curtain/Round 091/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 091/PlayerCommand.txt b/tests/v300_iron_curtain/Round 091/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_iron_curtain/Round 091/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 092/OpponentCommand.txt b/tests/v300_iron_curtain/Round 092/OpponentCommand.txt new file mode 100644 index 0000000..7d08a5b --- /dev/null +++ b/tests/v300_iron_curtain/Round 092/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 092/PlayerCommand.txt b/tests/v300_iron_curtain/Round 092/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 092/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 093/OpponentCommand.txt b/tests/v300_iron_curtain/Round 093/OpponentCommand.txt new file mode 100644 index 0000000..7ae2a9c --- /dev/null +++ b/tests/v300_iron_curtain/Round 093/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 093/PlayerCommand.txt b/tests/v300_iron_curtain/Round 093/PlayerCommand.txt new file mode 100644 index 0000000..5ee21e6 --- /dev/null +++ b/tests/v300_iron_curtain/Round 093/PlayerCommand.txt @@ -0,0 +1 @@ +4,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 094/OpponentCommand.txt b/tests/v300_iron_curtain/Round 094/OpponentCommand.txt new file mode 100644 index 0000000..8ac3a56 --- /dev/null +++ b/tests/v300_iron_curtain/Round 094/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 094/PlayerCommand.txt b/tests/v300_iron_curtain/Round 094/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_iron_curtain/Round 094/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 095/OpponentCommand.txt b/tests/v300_iron_curtain/Round 095/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/tests/v300_iron_curtain/Round 095/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 095/PlayerCommand.txt b/tests/v300_iron_curtain/Round 095/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/tests/v300_iron_curtain/Round 095/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 096/OpponentCommand.txt b/tests/v300_iron_curtain/Round 096/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/tests/v300_iron_curtain/Round 096/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 096/PlayerCommand.txt b/tests/v300_iron_curtain/Round 096/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_iron_curtain/Round 096/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 097/OpponentCommand.txt b/tests/v300_iron_curtain/Round 097/OpponentCommand.txt new file mode 100644 index 0000000..ce49ef6 --- /dev/null +++ b/tests/v300_iron_curtain/Round 097/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 097/PlayerCommand.txt b/tests/v300_iron_curtain/Round 097/PlayerCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/tests/v300_iron_curtain/Round 097/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 098/OpponentCommand.txt b/tests/v300_iron_curtain/Round 098/OpponentCommand.txt new file mode 100644 index 0000000..c4e7948 --- /dev/null +++ b/tests/v300_iron_curtain/Round 098/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 098/PlayerCommand.txt b/tests/v300_iron_curtain/Round 098/PlayerCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/tests/v300_iron_curtain/Round 098/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 099/OpponentCommand.txt b/tests/v300_iron_curtain/Round 099/OpponentCommand.txt new file mode 100644 index 0000000..e2634f0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 099/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 099/PlayerCommand.txt b/tests/v300_iron_curtain/Round 099/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_iron_curtain/Round 099/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 100/OpponentCommand.txt b/tests/v300_iron_curtain/Round 100/OpponentCommand.txt new file mode 100644 index 0000000..f82aafb --- /dev/null +++ b/tests/v300_iron_curtain/Round 100/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 100/PlayerCommand.txt b/tests/v300_iron_curtain/Round 100/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_iron_curtain/Round 100/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 101/OpponentCommand.txt b/tests/v300_iron_curtain/Round 101/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/tests/v300_iron_curtain/Round 101/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 101/PlayerCommand.txt b/tests/v300_iron_curtain/Round 101/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 101/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 102/OpponentCommand.txt b/tests/v300_iron_curtain/Round 102/OpponentCommand.txt new file mode 100644 index 0000000..910a1ab --- /dev/null +++ b/tests/v300_iron_curtain/Round 102/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 102/PlayerCommand.txt b/tests/v300_iron_curtain/Round 102/PlayerCommand.txt new file mode 100644 index 0000000..8c5ef78 --- /dev/null +++ b/tests/v300_iron_curtain/Round 102/PlayerCommand.txt @@ -0,0 +1 @@ +4,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 103/OpponentCommand.txt b/tests/v300_iron_curtain/Round 103/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/v300_iron_curtain/Round 103/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 103/PlayerCommand.txt b/tests/v300_iron_curtain/Round 103/PlayerCommand.txt new file mode 100644 index 0000000..b548cc7 --- /dev/null +++ b/tests/v300_iron_curtain/Round 103/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 104/OpponentCommand.txt b/tests/v300_iron_curtain/Round 104/OpponentCommand.txt new file mode 100644 index 0000000..ac6c42a --- /dev/null +++ b/tests/v300_iron_curtain/Round 104/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 104/PlayerCommand.txt b/tests/v300_iron_curtain/Round 104/PlayerCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/tests/v300_iron_curtain/Round 104/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 105/OpponentCommand.txt b/tests/v300_iron_curtain/Round 105/OpponentCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_iron_curtain/Round 105/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 105/PlayerCommand.txt b/tests/v300_iron_curtain/Round 105/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_iron_curtain/Round 105/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 106/OpponentCommand.txt b/tests/v300_iron_curtain/Round 106/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 106/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 106/PlayerCommand.txt b/tests/v300_iron_curtain/Round 106/PlayerCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/tests/v300_iron_curtain/Round 106/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 107/OpponentCommand.txt b/tests/v300_iron_curtain/Round 107/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 107/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 107/PlayerCommand.txt b/tests/v300_iron_curtain/Round 107/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 107/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 108/OpponentCommand.txt b/tests/v300_iron_curtain/Round 108/OpponentCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/tests/v300_iron_curtain/Round 108/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 108/PlayerCommand.txt b/tests/v300_iron_curtain/Round 108/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 108/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 109/OpponentCommand.txt b/tests/v300_iron_curtain/Round 109/OpponentCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/tests/v300_iron_curtain/Round 109/OpponentCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 109/PlayerCommand.txt b/tests/v300_iron_curtain/Round 109/PlayerCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/tests/v300_iron_curtain/Round 109/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 110/OpponentCommand.txt b/tests/v300_iron_curtain/Round 110/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/tests/v300_iron_curtain/Round 110/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 110/PlayerCommand.txt b/tests/v300_iron_curtain/Round 110/PlayerCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/tests/v300_iron_curtain/Round 110/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 111/OpponentCommand.txt b/tests/v300_iron_curtain/Round 111/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/v300_iron_curtain/Round 111/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 111/PlayerCommand.txt b/tests/v300_iron_curtain/Round 111/PlayerCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/tests/v300_iron_curtain/Round 111/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 112/OpponentCommand.txt b/tests/v300_iron_curtain/Round 112/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 112/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 112/PlayerCommand.txt b/tests/v300_iron_curtain/Round 112/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 112/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 113/OpponentCommand.txt b/tests/v300_iron_curtain/Round 113/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 113/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 113/PlayerCommand.txt b/tests/v300_iron_curtain/Round 113/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 113/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 114/OpponentCommand.txt b/tests/v300_iron_curtain/Round 114/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 114/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 114/PlayerCommand.txt b/tests/v300_iron_curtain/Round 114/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 114/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 115/OpponentCommand.txt b/tests/v300_iron_curtain/Round 115/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 115/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 115/PlayerCommand.txt b/tests/v300_iron_curtain/Round 115/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 115/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 116/OpponentCommand.txt b/tests/v300_iron_curtain/Round 116/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 116/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 116/PlayerCommand.txt b/tests/v300_iron_curtain/Round 116/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 116/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 117/OpponentCommand.txt b/tests/v300_iron_curtain/Round 117/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 117/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 117/PlayerCommand.txt b/tests/v300_iron_curtain/Round 117/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 117/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 118/OpponentCommand.txt b/tests/v300_iron_curtain/Round 118/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 118/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 118/PlayerCommand.txt b/tests/v300_iron_curtain/Round 118/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain/Round 118/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..36e6f4c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..36e6f4c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..0b12f52 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..601aa29 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..1ba30d4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..ddc7f56 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..bee7857 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..43be3f4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..bee7857 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..a2a45e9 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..d9d71ea --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..412a2df --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..f238916 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +2,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..a91c23f --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..3de7cb6 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..7d93635 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..07b92b5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..7d08a5b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..3775784 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..5c88dd1 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..3de7cb6 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..bee7857 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..b743516 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..674d299 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..0c3ccbf --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..b548cc7 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file -- cgit v1.2.3 From 4de30343c62371d8dd81d1605ad5e49c880877d3 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 12:25:12 +0200 Subject: Missile towers destroyed by a tesla can still fire that turn --- src/engine/bitwise_engine.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 0bcacbc..1f8bf96 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -64,12 +64,12 @@ impl BitwiseGameState { BitwiseGameState::update_construction(&mut self.player_buildings); BitwiseGameState::update_construction(&mut self.opponent_buildings); - - BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); BitwiseGameState::add_missiles(&mut self.player_buildings); BitwiseGameState::add_missiles(&mut self.opponent_buildings); + BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); + BitwiseGameState::move_and_collide_missiles(&mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); BitwiseGameState::move_and_collide_missiles(&mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); @@ -78,7 +78,7 @@ impl BitwiseGameState { BitwiseGameState::update_iron_curtain(&mut self.player_buildings, self.round); BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings, self.round); - + self.round += 1; self.update_status(); -- cgit v1.2.3 From 9abf2e670b18663fb8d0e7be2ba9df49d5945b71 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 19:37:15 +0200 Subject: Bumped energy cutoffs right up to allow iron curtain --- src/strategy/monte_carlo.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index b02ebf4..73ebf01 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -13,8 +13,8 @@ use time::{Duration, PreciseTime}; #[cfg(not(feature = "single-threaded"))] use rayon::prelude::*; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 30; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 45; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 100; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 100; pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(state); -- cgit v1.2.3 From 629c70c86b0bb29d2d0c281add9d0d826a11c419 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 20:01:34 +0200 Subject: Collapsed player info into the rest of the 'buildings' object --- src/engine/bitwise_engine.rs | 246 +++++++++++++++++++++---------------------- src/input/json.rs | 37 +++---- src/strategy/monte_carlo.rs | 14 +-- 3 files changed, 140 insertions(+), 157 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 1f8bf96..24189ee 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -8,24 +8,18 @@ use arrayvec::ArrayVec; const LEFT_COL_MASK: u64 = 0x0101_0101_0101_0101; const RIGHT_COL_MASK: u64 = 0x8080_8080_8080_8080; -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct Player { - pub energy: u16, - pub health: u8 -} - #[derive(Debug, Clone, PartialEq, Eq)] pub struct BitwiseGameState { pub status: GameStatus, pub player: Player, pub opponent: Player, - pub player_buildings: PlayerBuildings, - pub opponent_buildings: PlayerBuildings, pub round: u16 } #[derive(Debug, Clone, PartialEq, Eq)] -pub struct PlayerBuildings { +pub struct Player { + pub energy: u16, + pub health: u8, pub unconstructed: ArrayVec<[UnconstructedBuilding; MAX_CONCURRENT_CONSTRUCTION]>, pub buildings: [u64; DEFENCE_HEALTH], pub occupied: u64, @@ -59,25 +53,25 @@ pub struct TeslaCooldown { impl BitwiseGameState { pub fn simulate(&mut self, player_command: Command, opponent_command: Command) -> GameStatus { - BitwiseGameState::perform_command(&mut self.player, &mut self.player_buildings, player_command); - BitwiseGameState::perform_command(&mut self.opponent, &mut self.opponent_buildings, opponent_command); + BitwiseGameState::perform_command(&mut self.player, player_command); + BitwiseGameState::perform_command(&mut self.opponent, opponent_command); - BitwiseGameState::update_construction(&mut self.player_buildings); - BitwiseGameState::update_construction(&mut self.opponent_buildings); + BitwiseGameState::update_construction(&mut self.player); + BitwiseGameState::update_construction(&mut self.opponent); - BitwiseGameState::add_missiles(&mut self.player_buildings); - BitwiseGameState::add_missiles(&mut self.opponent_buildings); + BitwiseGameState::add_missiles(&mut self.player); + BitwiseGameState::add_missiles(&mut self.opponent); - BitwiseGameState::fire_teslas(&mut self.player, &mut self.player_buildings, &mut self.opponent, &mut self.opponent_buildings); + BitwiseGameState::fire_teslas(&mut self.player, &mut self.opponent); - BitwiseGameState::move_and_collide_missiles(&mut self.player, &mut self.player_buildings, &mut self.opponent_buildings.missiles); - BitwiseGameState::move_and_collide_missiles(&mut self.opponent, &mut self.opponent_buildings, &mut self.player_buildings.missiles); + BitwiseGameState::move_and_collide_missiles(&mut self.player, &mut self.opponent.missiles); + BitwiseGameState::move_and_collide_missiles(&mut self.opponent, &mut self.player.missiles); - BitwiseGameState::add_energy(&mut self.player, &mut self.player_buildings); - BitwiseGameState::add_energy(&mut self.opponent, &mut self.opponent_buildings); + BitwiseGameState::add_energy(&mut self.player); + BitwiseGameState::add_energy(&mut self.opponent); - BitwiseGameState::update_iron_curtain(&mut self.player_buildings, self.round); - BitwiseGameState::update_iron_curtain(&mut self.opponent_buildings, self.round); + BitwiseGameState::update_iron_curtain(&mut self.player, self.round); + BitwiseGameState::update_iron_curtain(&mut self.opponent, self.round); self.round += 1; @@ -85,30 +79,28 @@ impl BitwiseGameState { self.status } - pub fn player(&self) -> &Player { &self.player } - pub fn opponent(&self) -> &Player { &self.opponent } - pub fn player_has_max_teslas(&self) -> bool { self.player_buildings.count_teslas() >= TESLA_MAX } - pub fn opponent_has_max_teslas(&self) -> bool { self.opponent_buildings.count_teslas() >= TESLA_MAX } + pub fn player_has_max_teslas(&self) -> bool { self.player.count_teslas() >= TESLA_MAX } + pub fn opponent_has_max_teslas(&self) -> bool { self.opponent.count_teslas() >= TESLA_MAX } pub fn player_can_build_iron_curtain(&self) -> bool { - self.player_buildings.iron_curtain_available && self.player_buildings.iron_curtain_remaining == 0 && self.player.energy >= IRON_CURTAIN_PRICE + self.player.iron_curtain_available && self.player.iron_curtain_remaining == 0 && self.player.energy >= IRON_CURTAIN_PRICE } pub fn opponent_can_build_iron_curtain(&self) -> bool { - self.opponent_buildings.iron_curtain_available && self.opponent_buildings.iron_curtain_remaining == 0 && self.opponent.energy >= IRON_CURTAIN_PRICE + self.opponent.iron_curtain_available && self.opponent.iron_curtain_remaining == 0 && self.opponent.energy >= IRON_CURTAIN_PRICE } - pub fn unoccupied_player_cell_count(&self) -> usize { self.player_buildings.occupied.count_zeros() as usize } - pub fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent_buildings.occupied.count_zeros() as usize } + pub fn unoccupied_player_cell_count(&self) -> usize { self.player.occupied.count_zeros() as usize } + pub fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent.occupied.count_zeros() as usize } pub fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.player_buildings.occupied, i as u64); + let bit = find_bit_index_from_rank(self.player.occupied, i as u64); let point = Point { index: bit }; - debug_assert!(point.to_either_bitfield() & self.player_buildings.occupied == 0); + debug_assert!(point.to_either_bitfield() & self.player.occupied == 0); point } pub fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.opponent_buildings.occupied, i as u64); + let bit = find_bit_index_from_rank(self.opponent.occupied, i as u64); let point = Point { index: bit }; - debug_assert!(point.to_either_bitfield() & self.opponent_buildings.occupied == 0); + debug_assert!(point.to_either_bitfield() & self.opponent.occupied == 0); point } } @@ -145,13 +137,11 @@ fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { impl BitwiseGameState { pub fn new( player: Player, opponent: Player, - player_buildings: PlayerBuildings, opponent_buildings: PlayerBuildings, round: u16 ) -> BitwiseGameState { BitwiseGameState { status: GameStatus::Continue, player, opponent, - player_buildings, opponent_buildings, round } } @@ -165,48 +155,48 @@ impl BitwiseGameState { pub fn sort(&mut self) { for i in 0..MISSILE_MAX_SINGLE_CELL { for j in i+1..MISSILE_MAX_SINGLE_CELL { - let move_down1 = !self.player_buildings.missiles[i].0 & self.player_buildings.missiles[j].0; - self.player_buildings.missiles[i].0 |= move_down1; - self.player_buildings.missiles[j].0 &= !move_down1; + let move_down1 = !self.player.missiles[i].0 & self.player.missiles[j].0; + self.player.missiles[i].0 |= move_down1; + self.player.missiles[j].0 &= !move_down1; - let move_down2 = !self.player_buildings.missiles[i].1 & self.player_buildings.missiles[j].1; - self.player_buildings.missiles[i].1 |= move_down2; - self.player_buildings.missiles[j].1 &= !move_down2; + let move_down2 = !self.player.missiles[i].1 & self.player.missiles[j].1; + self.player.missiles[i].1 |= move_down2; + self.player.missiles[j].1 &= !move_down2; - let move_down3 = !self.opponent_buildings.missiles[i].0 & self.opponent_buildings.missiles[j].0; - self.opponent_buildings.missiles[i].0 |= move_down3; - self.opponent_buildings.missiles[j].0 &= !move_down3; + let move_down3 = !self.opponent.missiles[i].0 & self.opponent.missiles[j].0; + self.opponent.missiles[i].0 |= move_down3; + self.opponent.missiles[j].0 &= !move_down3; - let move_down4 = !self.opponent_buildings.missiles[i].1 & self.opponent_buildings.missiles[j].1; - self.opponent_buildings.missiles[i].1 |= move_down4; - self.opponent_buildings.missiles[j].1 &= !move_down4; + let move_down4 = !self.opponent.missiles[i].1 & self.opponent.missiles[j].1; + self.opponent.missiles[i].1 |= move_down4; + self.opponent.missiles[j].1 &= !move_down4; } } - self.player_buildings.unconstructed.sort_by_key(|b| b.pos); - self.opponent_buildings.unconstructed.sort_by_key(|b| b.pos); + self.player.unconstructed.sort_by_key(|b| b.pos); + self.opponent.unconstructed.sort_by_key(|b| b.pos); - self.player_buildings.tesla_cooldowns.sort_by_key(|b| b.pos); - self.opponent_buildings.tesla_cooldowns.sort_by_key(|b| b.pos); + self.player.tesla_cooldowns.sort_by_key(|b| b.pos); + self.opponent.tesla_cooldowns.sort_by_key(|b| b.pos); - while self.player_buildings.firing_tower > 0 { - self.player_buildings.firing_tower -= 1; - let zero = self.player_buildings.missile_towers[0]; - for i in 1..self.player_buildings.missile_towers.len() { - self.player_buildings.missile_towers[i-1] = self.player_buildings.missile_towers[i]; + while self.player.firing_tower > 0 { + self.player.firing_tower -= 1; + let zero = self.player.missile_towers[0]; + for i in 1..self.player.missile_towers.len() { + self.player.missile_towers[i-1] = self.player.missile_towers[i]; } - let end = self.player_buildings.missile_towers.len()-1; - self.player_buildings.missile_towers[end] = zero; + let end = self.player.missile_towers.len()-1; + self.player.missile_towers[end] = zero; } - while self.opponent_buildings.firing_tower > 0 { - self.opponent_buildings.firing_tower -= 1; - let zero = self.opponent_buildings.missile_towers[0]; - for i in 1..self.opponent_buildings.missile_towers.len() { - self.opponent_buildings.missile_towers[i-1] = self.opponent_buildings.missile_towers[i]; + while self.opponent.firing_tower > 0 { + self.opponent.firing_tower -= 1; + let zero = self.opponent.missile_towers[0]; + for i in 1..self.opponent.missile_towers.len() { + self.opponent.missile_towers[i-1] = self.opponent.missile_towers[i]; } - let end = self.opponent_buildings.missile_towers.len()-1; - self.opponent_buildings.missile_towers[end] = zero; + let end = self.opponent.missile_towers.len()-1; + self.opponent.missile_towers[end] = zero; } } @@ -217,7 +207,7 @@ impl BitwiseGameState { res } - fn perform_command(player: &mut Player, player_buildings: &mut PlayerBuildings, command: Command) { + fn perform_command(player: &mut Player, command: Command) { match command { Command::Nothing => {}, Command::Build(p, b) => { @@ -238,74 +228,74 @@ impl BitwiseGameState { // This is used internally. I should not be making // invalid moves! - debug_assert!(player_buildings.buildings[0] & bitfield == 0); + debug_assert!(player.buildings[0] & bitfield == 0); debug_assert!(p.x() < FULL_MAP_WIDTH && p.y() < MAP_HEIGHT); debug_assert!(player.energy >= price); debug_assert!(b != BuildingType::Tesla || - player_buildings.count_teslas() < TESLA_MAX); + player.count_teslas() < TESLA_MAX); player.energy -= price; - player_buildings.unconstructed.push(UnconstructedBuilding { + player.unconstructed.push(UnconstructedBuilding { pos: p, construction_time_left: construction_time, building_type: b }); - player_buildings.occupied |= bitfield; + player.occupied |= bitfield; }, Command::Deconstruct(p) => { - let unconstructed_to_remove_index = player_buildings.unconstructed.iter().position(|ref b| b.pos == p); - let deconstruct_mask = !(p.to_either_bitfield() & player_buildings.buildings[0]); + let unconstructed_to_remove_index = player.unconstructed.iter().position(|ref b| b.pos == p); + let deconstruct_mask = !(p.to_either_bitfield() & player.buildings[0]); debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); if let Some(i) = unconstructed_to_remove_index { - player_buildings.unconstructed.swap_remove(i); + player.unconstructed.swap_remove(i); } player.energy += DECONSTRUCT_ENERGY; - for tier in 0..player_buildings.buildings.len() { - player_buildings.buildings[tier] &= deconstruct_mask; + for tier in 0..player.buildings.len() { + player.buildings[tier] &= deconstruct_mask; } - player_buildings.energy_towers &= deconstruct_mask; - for tier in 0..player_buildings.missile_towers.len() { - player_buildings.missile_towers[tier] &= deconstruct_mask; + player.energy_towers &= deconstruct_mask; + for tier in 0..player.missile_towers.len() { + player.missile_towers[tier] &= deconstruct_mask; } - player_buildings.tesla_cooldowns.retain(|t| t.pos != p); - player_buildings.occupied &= deconstruct_mask; + player.tesla_cooldowns.retain(|t| t.pos != p); + player.occupied &= deconstruct_mask; }, Command::IronCurtain => { - debug_assert!(player_buildings.iron_curtain_available); + debug_assert!(player.iron_curtain_available); debug_assert!(player.energy >= IRON_CURTAIN_PRICE); player.energy -= IRON_CURTAIN_PRICE; - player_buildings.iron_curtain_available = false; - player_buildings.iron_curtain_remaining = IRON_CURTAIN_DURATION; + player.iron_curtain_available = false; + player.iron_curtain_remaining = IRON_CURTAIN_DURATION; } } } - fn update_construction(player_buildings: &mut PlayerBuildings) { - let mut buildings_len = player_buildings.unconstructed.len(); + fn update_construction(player: &mut Player) { + let mut buildings_len = player.unconstructed.len(); for i in (0..buildings_len).rev() { - if player_buildings.unconstructed[i].construction_time_left == 0 { - let building_type = player_buildings.unconstructed[i].building_type; + if player.unconstructed[i].construction_time_left == 0 { + let building_type = player.unconstructed[i].building_type; let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; - let pos = player_buildings.unconstructed[i].pos; + let pos = player.unconstructed[i].pos; let bitfield = pos.to_either_bitfield(); for health_tier in 0..health { - player_buildings.buildings[health_tier] |= bitfield; + player.buildings[health_tier] |= bitfield; } if building_type == BuildingType::Energy { - player_buildings.energy_towers |= bitfield; + player.energy_towers |= bitfield; } if building_type == BuildingType::Attack { - player_buildings.missile_towers[player_buildings.firing_tower] |= bitfield; + player.missile_towers[player.firing_tower] |= bitfield; } if building_type == BuildingType::Tesla { - player_buildings.tesla_cooldowns.push(TeslaCooldown { + player.tesla_cooldowns.push(TeslaCooldown { pos, cooldown: 0, age: 0 @@ -313,36 +303,36 @@ impl BitwiseGameState { } buildings_len -= 1; - player_buildings.unconstructed.swap(i, buildings_len); + player.unconstructed.swap(i, buildings_len); } else { - player_buildings.unconstructed[i].construction_time_left -= 1 + player.unconstructed[i].construction_time_left -= 1 } } - player_buildings.unconstructed.truncate(buildings_len); + player.unconstructed.truncate(buildings_len); } - fn update_iron_curtain(player_buildings: &mut PlayerBuildings, round: u16) { + fn update_iron_curtain(player: &mut Player, round: u16) { if round != 0 && round % IRON_CURTAIN_UNLOCK_INTERVAL == 0 { - player_buildings.iron_curtain_available = true; + player.iron_curtain_available = true; } - player_buildings.iron_curtain_remaining = player_buildings.iron_curtain_remaining.saturating_sub(1); + player.iron_curtain_remaining = player.iron_curtain_remaining.saturating_sub(1); } - fn fire_teslas(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { - BitwiseGameState::fire_single_players_teslas_without_cleanup(player, player_buildings, opponent, opponent_buildings); - BitwiseGameState::fire_single_players_teslas_without_cleanup(opponent, opponent_buildings, player, player_buildings); + fn fire_teslas(player: &mut Player, opponent: &mut Player) { + BitwiseGameState::fire_single_players_teslas_without_cleanup(player, opponent); + BitwiseGameState::fire_single_players_teslas_without_cleanup(opponent, player); - BitwiseGameState::update_tesla_activity(player_buildings); - BitwiseGameState::update_tesla_activity(opponent_buildings); + BitwiseGameState::update_tesla_activity(player); + BitwiseGameState::update_tesla_activity(opponent); } - fn fire_single_players_teslas_without_cleanup(player: &mut Player, player_buildings: &mut PlayerBuildings, opponent: &mut Player, opponent_buildings: &mut PlayerBuildings) { - player_buildings.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); - for tesla in player_buildings.tesla_cooldowns.iter_mut() { + fn fire_single_players_teslas_without_cleanup(player: &mut Player, opponent: &mut Player) { + player.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); + for tesla in player.tesla_cooldowns.iter_mut() { tesla.age += 1; if tesla.cooldown > 0 { tesla.cooldown -= 1; - } else if player.energy >= TESLA_FIRING_ENERGY && opponent_buildings.iron_curtain_remaining > 0 { + } else if player.energy >= TESLA_FIRING_ENERGY && opponent.iron_curtain_remaining > 0 { player.energy -= TESLA_FIRING_ENERGY; tesla.cooldown = TESLA_COOLDOWN; } else if player.energy >= TESLA_FIRING_ENERGY { @@ -363,31 +353,31 @@ impl BitwiseGameState { let mut hits = 0; for _ in 0..(if y == 0 || y == MAP_HEIGHT-1 { 2 } else { 3 }) { - hits |= destroy_mask & opponent_buildings.buildings[0]; + hits |= destroy_mask & opponent.buildings[0]; destroy_mask &= !hits; destroy_mask <<= SINGLE_MAP_WIDTH; } - BitwiseGameState::destroy_buildings(opponent_buildings, hits); + BitwiseGameState::destroy_buildings(opponent, hits); } } } - fn add_missiles(player_buildings: &mut PlayerBuildings) { - let mut missiles = player_buildings.missile_towers[player_buildings.firing_tower]; - for mut tier in &mut player_buildings.missiles { + fn add_missiles(player: &mut Player) { + let mut missiles = player.missile_towers[player.firing_tower]; + for mut tier in &mut player.missiles { let setting = !tier.0 & missiles; tier.0 |= setting; missiles &= !setting; } - player_buildings.firing_tower = (player_buildings.firing_tower + 1) % MISSILE_COOLDOWN_STATES; + player.firing_tower = (player.firing_tower + 1) % MISSILE_COOLDOWN_STATES; } - fn move_and_collide_missiles(opponent: &mut Player, opponent_buildings: &mut PlayerBuildings, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + fn move_and_collide_missiles(opponent: &mut Player, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { let mut destroyed = 0; let mut damaging = 0; for _ in 0..MISSILE_SPEED { for missile in player_missiles.iter_mut() { - let swapping_sides = if opponent_buildings.iron_curtain_remaining > 0 { 0 } else { missile.0 & RIGHT_COL_MASK }; + let swapping_sides = if opponent.iron_curtain_remaining > 0 { 0 } else { missile.0 & RIGHT_COL_MASK }; let about_to_hit_opponent = missile.1 & LEFT_COL_MASK; missile.0 = (missile.0 & !RIGHT_COL_MASK) << 1; @@ -397,9 +387,9 @@ impl BitwiseGameState { let mut hits = 0; for health_tier in (0..DEFENCE_HEALTH).rev() { - hits = opponent_buildings.buildings[health_tier] & missile.1; + hits = opponent.buildings[health_tier] & missile.1; missile.1 &= !hits; - opponent_buildings.buildings[health_tier] &= !hits; + opponent.buildings[health_tier] &= !hits; } destroyed |= hits; } @@ -407,11 +397,11 @@ impl BitwiseGameState { let damage = damaging.count_ones() as u8 * MISSILE_DAMAGE; opponent.health = opponent.health.saturating_sub(damage); - BitwiseGameState::destroy_buildings(opponent_buildings, destroyed); - BitwiseGameState::update_tesla_activity(opponent_buildings); + BitwiseGameState::destroy_buildings(opponent, destroyed); + BitwiseGameState::update_tesla_activity(opponent); } - fn destroy_buildings(buildings: &mut PlayerBuildings, hit_mask: u64) { + fn destroy_buildings(buildings: &mut Player, hit_mask: u64) { let deconstruct_mask = !hit_mask; buildings.energy_towers &= deconstruct_mask; @@ -424,14 +414,14 @@ impl BitwiseGameState { buildings.occupied &= deconstruct_mask; } - fn update_tesla_activity(buildings: &mut PlayerBuildings) { + fn update_tesla_activity(buildings: &mut Player) { let occupied = buildings.occupied; buildings.tesla_cooldowns.retain(|t| (t.pos.to_either_bitfield() & occupied) != 0); } - fn add_energy(player: &mut Player, player_buildings: &mut PlayerBuildings) { - player.energy += player_buildings.energy_generated(); + fn add_energy(player: &mut Player) { + player.energy += player.energy_generated(); } fn update_status(&mut self) { @@ -447,14 +437,16 @@ impl BitwiseGameState { } -impl PlayerBuildings { +impl Player { pub fn count_teslas(&self) -> usize { self.tesla_cooldowns.len() + self.unconstructed.iter().filter(|t| t.building_type == BuildingType::Tesla).count() } - pub fn empty() -> PlayerBuildings { - PlayerBuildings { + pub fn empty() -> Player { + Player { + health: 0, + energy: 0, unconstructed: ArrayVec::new(), buildings: [0; DEFENCE_HEALTH], occupied: 0, diff --git a/src/input/json.rs b/src/input/json.rs index 544e5ed..2152fc2 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -73,26 +73,27 @@ struct MissileState { impl State { fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { let json_player = self.player(); - let player = json_player.to_bitwise_engine(); let json_opponent = self.opponent(); - let opponent = json_opponent.to_bitwise_engine(); - let mut player_buildings = bitwise_engine::PlayerBuildings::empty(); - let mut opponent_buildings = bitwise_engine::PlayerBuildings::empty(); + let mut player = bitwise_engine::Player::empty(); + let mut opponent = bitwise_engine::Player::empty(); // TODO roll the player into the playerbuildings and remove this duplication - player_buildings.iron_curtain_available = json_player.iron_curtain_available; - player_buildings.iron_curtain_remaining = if json_player.active_iron_curtain_lifetime < 0 { + player.health = json_player.health; + player.energy = json_player.energy; + player.iron_curtain_available = json_player.iron_curtain_available; + player.iron_curtain_remaining = if json_player.active_iron_curtain_lifetime < 0 { 0 } else { json_player.active_iron_curtain_lifetime as u8 }; - opponent_buildings.iron_curtain_available = json_opponent.iron_curtain_available; - opponent_buildings.iron_curtain_remaining = if json_opponent.active_iron_curtain_lifetime < 0 { + opponent.health = json_opponent.health; + opponent.energy = json_opponent.energy; + opponent.iron_curtain_available = json_opponent.iron_curtain_available; + opponent.iron_curtain_remaining = if json_opponent.active_iron_curtain_lifetime < 0 { 0 } else { json_opponent.active_iron_curtain_lifetime as u8 }; - for row in &self.game_map { for cell in row { @@ -101,9 +102,9 @@ impl State { let building_type = building.convert_building_type(); let mut bitwise_buildings = if building.player_type == 'A' { - &mut player_buildings + &mut player } else { - &mut opponent_buildings + &mut opponent }; let bitfield = point.to_either_bitfield(); @@ -138,9 +139,9 @@ impl State { for missile in &cell.missiles { let (mut left, mut right) = engine::geometry::Point::new_double_bitfield(cell.x, cell.y, missile.player_type == 'A'); let mut bitwise_buildings = if missile.player_type == 'A' { - &mut player_buildings + &mut player } else { - &mut opponent_buildings + &mut opponent }; for mut tier in bitwise_buildings.missiles.iter_mut() { @@ -156,7 +157,6 @@ impl State { bitwise_engine::BitwiseGameState::new( player, opponent, - player_buildings, opponent_buildings, self.game_details.round ) } @@ -174,15 +174,6 @@ impl State { } } -impl Player { - fn to_bitwise_engine(&self) -> engine::bitwise_engine::Player { - engine::bitwise_engine::Player { - energy: self.energy, - health: self.health - } - } -} - impl BuildingState { fn to_bitwise_engine_unconstructed(&self) -> bitwise_engine::UnconstructedBuilding { bitwise_engine::UnconstructedBuilding { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 73ebf01..87033cb 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,7 +1,7 @@ use engine::command::*; use engine::geometry::*; use engine::status::GameStatus; -use engine::bitwise_engine::{Player, PlayerBuildings, BitwiseGameState}; +use engine::bitwise_engine::{Player, BitwiseGameState}; use engine::constants::*; use rand::{Rng, XorShiftRng, SeedableRng}; @@ -115,12 +115,12 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } fn random_player_move(state: &BitwiseGameState, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(&state.player, &state.player_buildings, state.player_has_max_teslas()); + let all_buildings = sensible_buildings(&state.player, state.player_has_max_teslas()); random_move(&all_buildings, state.player_can_build_iron_curtain(), rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) } fn random_opponent_move(state: &BitwiseGameState, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(&state.opponent, &state.opponent_buildings, state.opponent_has_max_teslas()); + let all_buildings = sensible_buildings(&state.opponent, state.opponent_has_max_teslas()); random_move(&all_buildings, state.opponent_can_build_iron_curtain(), rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) } @@ -199,7 +199,7 @@ impl CommandScore { //TODO: Devalue nothing so that it doesn't stand and do nothing when it can do things fn init_command_scores(state: &BitwiseGameState) -> Vec { - let all_buildings = sensible_buildings(&state.player, &state.player_buildings, state.player_has_max_teslas()); + let all_buildings = sensible_buildings(&state.player, state.player_has_max_teslas()); let unoccupied_cells = (0..state.unoccupied_player_cell_count()).map(|i| state.location_of_unoccupied_player_cell(i)); @@ -222,7 +222,7 @@ impl CommandScore { } #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player, _player_buildings: &PlayerBuildings, has_max_teslas: bool) -> Vec { +fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); if DEFENCE_PRICE <= player.energy { @@ -245,9 +245,9 @@ fn sensible_buildings(player: &Player, _player_buildings: &PlayerBuildings, has_ //TODO: Heuristic that avoids building the initial energy towers all in the same row? Max energy in a row? //TODO: Update cutoff to maybe build iron curtains #[cfg(feature = "energy-cutoff")] -fn sensible_buildings(player: &Player, player_buildings: &PlayerBuildings, has_max_teslas: bool) -> Vec { +fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec { let mut result = Vec::with_capacity(4); - let needs_energy = player_buildings.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || + let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; if DEFENCE_PRICE <= player.energy { -- cgit v1.2.3 From 868287bbce9464cb28a6ea816d928af0e876533b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 20:41:31 +0200 Subject: Folded duplicate code for player and opponent --- src/engine/bitwise_engine.rs | 46 +++++++++++++++++--------------------------- src/strategy/monte_carlo.rs | 41 ++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 52 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 24189ee..a4842ec 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -78,31 +78,6 @@ impl BitwiseGameState { self.update_status(); self.status } - - pub fn player_has_max_teslas(&self) -> bool { self.player.count_teslas() >= TESLA_MAX } - pub fn opponent_has_max_teslas(&self) -> bool { self.opponent.count_teslas() >= TESLA_MAX } - - pub fn player_can_build_iron_curtain(&self) -> bool { - self.player.iron_curtain_available && self.player.iron_curtain_remaining == 0 && self.player.energy >= IRON_CURTAIN_PRICE - } - pub fn opponent_can_build_iron_curtain(&self) -> bool { - self.opponent.iron_curtain_available && self.opponent.iron_curtain_remaining == 0 && self.opponent.energy >= IRON_CURTAIN_PRICE - } - - pub fn unoccupied_player_cell_count(&self) -> usize { self.player.occupied.count_zeros() as usize } - pub fn unoccupied_opponent_cell_count(&self) -> usize { self.opponent.occupied.count_zeros() as usize } - pub fn location_of_unoccupied_player_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.player.occupied, i as u64); - let point = Point { index: bit }; - debug_assert!(point.to_either_bitfield() & self.player.occupied == 0); - point - } - pub fn location_of_unoccupied_opponent_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.opponent.occupied, i as u64); - let point = Point { index: bit }; - debug_assert!(point.to_either_bitfield() & self.opponent.occupied == 0); - point - } } fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { @@ -147,9 +122,8 @@ impl BitwiseGameState { } /** - * Like with the expressive, this is to make things more - * comparable when writing tests, not for actual use in the - * engine. + * This is to make things more comparable when writing tests, not + * for actual use in the engine. */ #[cfg(debug_assertions)] pub fn sort(&mut self) { @@ -463,4 +437,20 @@ impl Player { pub fn energy_generated(&self) -> u16 { ENERGY_GENERATED_BASE + self.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER } + + pub fn has_max_teslas(&self) -> bool { + self.count_teslas() >= TESLA_MAX + } + + pub fn can_build_iron_curtain(&self) -> bool { + self.iron_curtain_available && self.iron_curtain_remaining == 0 && self.energy >= IRON_CURTAIN_PRICE + } + + pub fn unoccupied_cell_count(&self) -> usize { self.occupied.count_zeros() as usize } + pub fn location_of_unoccupied_cell(&self, i: usize) -> Point { + let bit = find_bit_index_from_rank(self.occupied, i as u64); + let point = Point { index: bit }; + debug_assert!(point.to_either_bitfield() & self.occupied == 0); + point + } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 87033cb..3e6cb7a 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -92,7 +92,7 @@ fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &Bitwise fn simulate_to_endstate(command_score: &mut CommandScore, state: &BitwiseGameState, rng: &mut R) { let mut state_mut = state.clone(); - let opponent_first = random_opponent_move(&state_mut, rng); + let opponent_first = random_move(&state_mut.opponent, rng); let mut status = state_mut.simulate(command_score.command, opponent_first); for _ in 0..MAX_MOVES { @@ -100,8 +100,8 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis break; } - let player_command = random_player_move(&state_mut, rng); - let opponent_command = random_opponent_move(&state_mut, rng); + let player_command = random_move(&state_mut.player, rng); + let opponent_command = random_move(&state_mut.opponent, rng); status = state_mut.simulate(player_command, opponent_command); } @@ -114,30 +114,23 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } } -fn random_player_move(state: &BitwiseGameState, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(&state.player, state.player_has_max_teslas()); - random_move(&all_buildings, state.player_can_build_iron_curtain(), rng, state.unoccupied_player_cell_count(), |i| state.location_of_unoccupied_player_cell(i)) -} - -fn random_opponent_move(state: &BitwiseGameState, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(&state.opponent, state.opponent_has_max_teslas()); - random_move(&all_buildings, state.opponent_can_build_iron_curtain(), rng, state.unoccupied_opponent_cell_count(), |i| state.location_of_unoccupied_opponent_cell(i)) -} - // TODO: Given enough energy, most opponents won't do nothing -fn random_movePoint>(all_buildings: &[BuildingType], iron_curtain_available: bool, rng: &mut R, free_positions_count: usize, get_point: F) -> Command { +fn random_move(player: &Player, rng: &mut R) -> Command { + let all_buildings = sensible_buildings(player); let nothing_count = 1; - let iron_curtain_count = if iron_curtain_available { 1 } else { 0 }; + let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; + let free_positions_count = player.unoccupied_cell_count(); + let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); if building_choice_index == all_buildings.len() { Command::Nothing - } else if iron_curtain_available && building_choice_index == all_buildings.len() + 1 { + } else if iron_curtain_count > 0 && building_choice_index == all_buildings.len() + 1 { Command::IronCurtain } else if free_positions_count > 0 { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( - get_point(position_choice), + player.location_of_unoccupied_cell(position_choice), all_buildings[building_choice_index] ) } else { @@ -199,15 +192,15 @@ impl CommandScore { //TODO: Devalue nothing so that it doesn't stand and do nothing when it can do things fn init_command_scores(state: &BitwiseGameState) -> Vec { - let all_buildings = sensible_buildings(&state.player, state.player_has_max_teslas()); + let all_buildings = sensible_buildings(&state.player); - let unoccupied_cells = (0..state.unoccupied_player_cell_count()).map(|i| state.location_of_unoccupied_player_cell(i)); + let unoccupied_cells = (0..state.player.unoccupied_cell_count()).map(|i| state.player.location_of_unoccupied_cell(i)); let building_command_count = unoccupied_cells.len()*all_buildings.len(); let mut commands = Vec::with_capacity(building_command_count + 2); commands.push(CommandScore::new(Command::Nothing)); - if state.player_can_build_iron_curtain() { + if state.player.can_build_iron_curtain() { commands.push(CommandScore::new(Command::IronCurtain)); } @@ -222,7 +215,7 @@ impl CommandScore { } #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec { +fn sensible_buildings(player: &Player) -> Vec { let mut result = Vec::with_capacity(4); if DEFENCE_PRICE <= player.energy { @@ -234,7 +227,7 @@ fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec Vec Vec { +fn sensible_buildings(player: &Player) -> Vec { let mut result = Vec::with_capacity(4); let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; @@ -259,7 +252,7 @@ fn sensible_buildings(player: &Player, has_max_teslas: bool) -> Vec Date: Sun, 12 Aug 2018 20:49:47 +0200 Subject: Removed unused import --- src/strategy/monte_carlo.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 3e6cb7a..2c9ff19 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,5 +1,4 @@ use engine::command::*; -use engine::geometry::*; use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; use engine::constants::*; -- cgit v1.2.3 From c9f09a22bc54b6275913aa3b900b402c56461c32 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 21:00:52 +0200 Subject: Reduced more duplication and removed TODOs --- src/engine/geometry.rs | 3 --- src/input/json.rs | 35 ++++++++++++++++------------------- src/strategy/monte_carlo.rs | 2 +- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index bfa59da..090652f 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -1,8 +1,5 @@ use engine::constants::*; -//TODO: Change Point to be a single number, or stored as a bitfield -// (bitfield to x and y for writing move might be hard? - #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct Point { pub index: u8 diff --git a/src/input/json.rs b/src/input/json.rs index 2152fc2..843f228 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -72,28 +72,11 @@ struct MissileState { impl State { fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { - let json_player = self.player(); - let json_opponent = self.opponent(); let mut player = bitwise_engine::Player::empty(); let mut opponent = bitwise_engine::Player::empty(); - // TODO roll the player into the playerbuildings and remove this duplication - player.health = json_player.health; - player.energy = json_player.energy; - player.iron_curtain_available = json_player.iron_curtain_available; - player.iron_curtain_remaining = if json_player.active_iron_curtain_lifetime < 0 { - 0 - } else { - json_player.active_iron_curtain_lifetime as u8 - }; - opponent.health = json_opponent.health; - opponent.energy = json_opponent.energy; - opponent.iron_curtain_available = json_opponent.iron_curtain_available; - opponent.iron_curtain_remaining = if json_opponent.active_iron_curtain_lifetime < 0 { - 0 - } else { - json_opponent.active_iron_curtain_lifetime as u8 - }; + self.player().map_onto_engine(&mut player); + self.opponent().map_onto_engine(&mut opponent); for row in &self.game_map { for cell in row { @@ -192,3 +175,17 @@ impl BuildingState { } } } + + +impl Player { + fn map_onto_engine(&self, engine_player: &mut bitwise_engine::Player) { + engine_player.health = self.health; + engine_player.energy = self.energy; + engine_player.iron_curtain_available = self.iron_curtain_available; + engine_player.iron_curtain_remaining = if self.active_iron_curtain_lifetime < 0 { + 0 + } else { + self.active_iron_curtain_lifetime as u8 + }; + } +} diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 2c9ff19..866ec0e 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -12,6 +12,7 @@ use time::{Duration, PreciseTime}; #[cfg(not(feature = "single-threaded"))] use rayon::prelude::*; +//TODO Rethink / adjust these? #[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 100; #[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 100; @@ -235,7 +236,6 @@ fn sensible_buildings(player: &Player) -> Vec { //TODO: Heuristic that avoids building the initial energy towers all in the same row? Max energy in a row? -//TODO: Update cutoff to maybe build iron curtains #[cfg(feature = "energy-cutoff")] fn sensible_buildings(player: &Player) -> Vec { let mut result = Vec::with_capacity(4); -- cgit v1.2.3 From f5de63875890cfca2891848f54e8cd35019bea8e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 21:18:01 +0200 Subject: Eliminated assuming opponents might do nothing in random moves --- src/strategy/monte_carlo.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 866ec0e..4d699c1 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -114,25 +114,23 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } } -// TODO: Given enough energy, most opponents won't do nothing fn random_move(player: &Player, rng: &mut R) -> Command { let all_buildings = sensible_buildings(player); - let nothing_count = 1; + let nothing_count = if all_buildings.len() > 2 { 1 } else { 0 }; let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; let free_positions_count = player.unoccupied_cell_count(); let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); - - if building_choice_index == all_buildings.len() { - Command::Nothing - } else if iron_curtain_count > 0 && building_choice_index == all_buildings.len() + 1 { - Command::IronCurtain - } else if free_positions_count > 0 { + + if building_choice_index < all_buildings.len() && free_positions_count > 0 { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( player.location_of_unoccupied_cell(position_choice), all_buildings[building_choice_index] ) + } + else if iron_curtain_count > 0 && building_choice_index == all_buildings.len() { + Command::IronCurtain } else { Command::Nothing } -- cgit v1.2.3 From 268d82833ec4ab18baa6f2f79ffd417c1f1c8a9a Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 12 Aug 2018 21:26:41 +0200 Subject: Fixed logic error on when nothing should be avoided --- src/strategy/monte_carlo.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 4d699c1..78ec4ac 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -116,9 +116,10 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis fn random_move(player: &Player, rng: &mut R) -> Command { let all_buildings = sensible_buildings(player); - let nothing_count = if all_buildings.len() > 2 { 1 } else { 0 }; - let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; let free_positions_count = player.unoccupied_cell_count(); + + let nothing_count = if all_buildings.len() > 2 && free_positions_count > 0 { 0 } else { 1 }; + let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); -- cgit v1.2.3 From 89f2c5b50576afcf25fc8eb53a053ce75a6cf042 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 14 Aug 2018 22:40:57 +0200 Subject: Bumped dependency version numbers --- Cargo.toml | 12 ++++++------ src/strategy/monte_carlo.rs | 15 ++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 685dba4..55928d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,18 +3,18 @@ name = "zombot" version = "2.0.0" [dependencies] -serde_derive = "1.0.43" -serde = "1.0.43" -serde_json = "1.0.16" +serde_derive = "1.0.71" +serde = "1.0.71" +serde_json = "1.0.26" -rand = "0.4.2" +rand = "0.5.5" time = "0.1.4" -rayon = "1.0.1" +rayon = "1.0.2" arrayvec = "0.4.7" [dev-dependencies] -proptest = "0.7.2" +proptest = "0.8.4" [features] benchmarking = [] diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 78ec4ac..2b98eed 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -105,7 +105,8 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis status = state_mut.simulate(player_command, opponent_command); } - let next_seed = [rng.next_u32(), rng.next_u32(), rng.next_u32(), rng.next_u32()]; + let mut next_seed: [u8;16] = [0; 16]; + rng.fill_bytes(&mut next_seed); match status { GameStatus::PlayerWon => command_score.add_victory(next_seed), GameStatus::OpponentWon => command_score.add_defeat(next_seed), @@ -145,7 +146,7 @@ struct CommandScore { draws: u32, stalemates: u32, attempts: u32, - next_seed: [u32; 4] + next_seed: [u8; 16] } impl CommandScore { @@ -157,29 +158,29 @@ impl CommandScore { draws: 0, stalemates: 0, attempts: 0, - next_seed: [0x7b6a_e1f4, 0x413c_e90f, 0x6781_6799, 0x770a_6bda] + next_seed: [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda] } } - fn add_victory(&mut self, next_seed: [u32; 4]) { + fn add_victory(&mut self, next_seed: [u8; 16]) { self.victories += 1; self.attempts += 1; self.next_seed = next_seed; } - fn add_defeat(&mut self, next_seed: [u32; 4]) { + fn add_defeat(&mut self, next_seed: [u8; 16]) { self.defeats += 1; self.attempts += 1; self.next_seed = next_seed; } - fn add_draw(&mut self, next_seed: [u32; 4]) { + fn add_draw(&mut self, next_seed: [u8; 16]) { self.draws += 1; self.attempts += 1; self.next_seed = next_seed; } - fn add_stalemate(&mut self, next_seed: [u32; 4]) { + fn add_stalemate(&mut self, next_seed: [u8; 16]) { self.stalemates += 1; self.attempts += 1; self.next_seed = next_seed; -- cgit v1.2.3 From 54abdbc20c0c304d1b0df5504c816cc07ef81abc Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 14 Aug 2018 22:45:27 +0200 Subject: Bumped my own version to represent the jump in game engine version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 55928d5..a37a9f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zombot" -version = "2.0.0" +version = "3.0.0" [dependencies] serde_derive = "1.0.71" -- cgit v1.2.3 From baa4f9950f49ffbb451c4796a764738f48b29504 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Tue, 14 Aug 2018 23:28:47 +0200 Subject: Added extra logging of the win ratios --- Cargo.toml | 4 +++- src/strategy/monte_carlo.rs | 50 +++++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a37a9f6..8ea3564 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,9 +19,11 @@ proptest = "0.8.4" [features] benchmarking = [] single-threaded = [] -energy-cutoff = [] +debug-decisions = [] reduced-time = [] extended-time = [] + +energy-cutoff = [] discard-poor-performers = [] default = ["energy-cutoff", "discard-poor-performers"] diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 2b98eed..ba2ef5c 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -3,6 +3,8 @@ use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; use engine::constants::*; +use std::fmt; + use rand::{Rng, XorShiftRng, SeedableRng}; const MAX_MOVES: u16 = 400; @@ -18,12 +20,28 @@ use rayon::prelude::*; pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(state); - let command = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); - - match command { - Some(command) => command.command, - _ => Command::Nothing + + let command = { + let best_command_score = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); + match best_command_score { + Some(best_command_score) => best_command_score.command, + _ => Command::Nothing + } + }; + + #[cfg(feature = "benchmarking")] + { + let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); + println!("Iterations: {}", total_iterations); + } + #[cfg(feature = "debug-decisions")] + { + for score in command_scores { + println!("{}", score); + } } + + command } #[cfg(not(feature = "discard-poor-performers"))] @@ -34,13 +52,6 @@ fn simulate_options_to_timeout(command_scores: &'a mut Vec, settin break; } } - - #[cfg(feature = "benchmarking")] - { - let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); - println!("Iterations: {}", total_iterations); - } - command_scores.iter().max_by_key(|&c| c.win_ratio()) } @@ -61,13 +72,6 @@ fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, st } active_scores.sort_unstable_by_key(|c| -c.win_ratio()); } - - #[cfg(feature = "benchmarking")] - { - let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); - println!("Iterations: {}", total_iterations); - } - command_scores.first() } @@ -214,6 +218,13 @@ impl CommandScore { } } +impl fmt::Display for CommandScore { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{},{}", self.command, self.win_ratio()) + } +} + + #[cfg(not(feature = "energy-cutoff"))] fn sensible_buildings(player: &Player) -> Vec { let mut result = Vec::with_capacity(4); @@ -234,7 +245,6 @@ fn sensible_buildings(player: &Player) -> Vec { result } - //TODO: Heuristic that avoids building the initial energy towers all in the same row? Max energy in a row? #[cfg(feature = "energy-cutoff")] fn sensible_buildings(player: &Player) -> Vec { -- cgit v1.2.3 From c2795dd5bd74f9bdc1c77ae5a07b2b416a71d714 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 16 Aug 2018 22:22:31 +0200 Subject: Added initial seed on nothing move --- src/strategy/monte_carlo.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index ba2ef5c..a2b5a4b 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -8,6 +8,7 @@ use std::fmt; use rand::{Rng, XorShiftRng, SeedableRng}; const MAX_MOVES: u16 = 400; +const INIT_SEED: [u8;16] = [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda]; use time::{Duration, PreciseTime}; @@ -162,7 +163,19 @@ impl CommandScore { draws: 0, stalemates: 0, attempts: 0, - next_seed: [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda] + next_seed: INIT_SEED + } + } + + fn with_seeded_stalemate(command: Command) -> CommandScore { + CommandScore { + command, + victories: 0, + defeats: 0, + draws: 0, + stalemates: 0, + attempts: 1, + next_seed: INIT_SEED } } @@ -194,7 +207,6 @@ impl CommandScore { (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) } - //TODO: Devalue nothing so that it doesn't stand and do nothing when it can do things fn init_command_scores(state: &BitwiseGameState) -> Vec { let all_buildings = sensible_buildings(&state.player); @@ -203,7 +215,7 @@ impl CommandScore { let building_command_count = unoccupied_cells.len()*all_buildings.len(); let mut commands = Vec::with_capacity(building_command_count + 2); - commands.push(CommandScore::new(Command::Nothing)); + commands.push(CommandScore::with_seeded_stalemate(Command::Nothing)); if state.player.can_build_iron_curtain() { commands.push(CommandScore::new(Command::IronCurtain)); } -- cgit v1.2.3 From c36278ec2593ff9b25bf3f5bad22ab547cca5447 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 16 Aug 2018 22:58:07 +0200 Subject: Printed debug for different tower building --- src/engine/command.rs | 2 +- src/strategy/monte_carlo.rs | 45 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/engine/command.rs b/src/engine/command.rs index e6dbedf..c4268c5 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -1,7 +1,7 @@ use std::fmt; use super::geometry::Point; -#[derive(Debug, Clone, Copy)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum Command { Nothing, Build(Point, BuildingType), diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index a2b5a4b..f937ea1 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,6 +1,7 @@ use engine::command::*; use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; +use engine::geometry::*; use engine::constants::*; use std::fmt; @@ -37,14 +38,52 @@ pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: } #[cfg(feature = "debug-decisions")] { - for score in command_scores { - println!("{}", score); - } + debug_print_choices("ENERGY", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Energy) => Some((p, score.win_ratio())), + _ => None + }); + debug_print_choices("ATTACK", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Attack) => Some((p, score.win_ratio())), + _ => None + }); + debug_print_choices("DEFENCE", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Defence) => Some((p, score.win_ratio())), + _ => None + }); + debug_print_choices("TESLA", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Tesla) => Some((p, score.win_ratio())), + _ => None + }); + + println!("NOTHING"); + println!("{}", command_scores.iter().find(|c| c.command == Command::Nothing).map(|s| s.win_ratio()).unwrap_or(0)); + println!(""); + + println!("IRON CURTAIN"); + println!("{}", command_scores.iter().find(|c| c.command == Command::IronCurtain).map(|s| s.win_ratio()).unwrap_or(0)); + println!(""); } command } +#[cfg(feature = "debug-decisions")] +fn debug_print_choices Option<(Point, i32)>>(label: &str, command_scores: &[CommandScore], extractor: F) { + println!("{}", label); + let relevant_moves: Vec<(Point, i32)> = command_scores.iter() + .filter_map(extractor) + .collect(); + for y in 0..MAP_HEIGHT { + for x in 0..SINGLE_MAP_WIDTH { + let point = Point::new(x, y); + let score = relevant_moves.iter().find(|(p, _)| *p == point); + print!(" | {}", score.map(|(_,s)| s).cloned().unwrap_or(0)); + } + println!(" |"); + } + println!(""); +} + #[cfg(not(feature = "discard-poor-performers"))] fn simulate_options_to_timeout(command_scores: &'a mut Vec, settings: &GameSettings, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { loop { -- cgit v1.2.3 From 0c1636355918a82df0ec188252c8f90487206c7b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 18 Aug 2018 22:18:01 +0200 Subject: Implemented maximum number of energy buildings in a row --- src/engine/bitwise_engine.rs | 25 +++++++++++++++++++++++++ src/engine/constants.rs | 2 ++ src/strategy/monte_carlo.rs | 26 +++++++++++++++++++------- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index a4842ec..27c1bd8 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -453,4 +453,29 @@ impl Player { debug_assert!(point.to_either_bitfield() & self.occupied == 0); point } + + pub fn energy_occupied_energy_with_heuristics(&self) -> u64 { + let mut result = 0; + for y in 0..MAP_HEIGHT { + let mask = 255 << y*SINGLE_MAP_WIDTH; + let isolated_row = self.energy_towers & mask; + let row_count = isolated_row.count_ones(); + result |= if row_count > ENERGY_MAX_IN_ROW { + mask + } else { + self.occupied & mask + }; + } + result + } + + pub fn unoccupied_energy_cell_count(&self) -> usize { + self.energy_occupied_energy_with_heuristics().count_zeros() as usize + } + pub fn location_of_unoccupied_energy_cell(&self, i: usize) -> Point { + let bit = find_bit_index_from_rank(self.energy_occupied_energy_with_heuristics(), i as u64); + let point = Point { index: bit }; + debug_assert!(point.to_either_bitfield() & self.occupied == 0); + point + } } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 9ece36d..60e8101 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -26,6 +26,8 @@ pub const ENERGY_GENERATED_TOWER: u16 = 3; pub const ENERGY_PRICE: u16 = 20; pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; +pub const ENERGY_MAX_IN_ROW: u32 = 2; + pub const IRON_CURTAIN_PRICE: u16 = 100; pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30; pub const IRON_CURTAIN_DURATION: u8 = 6; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index f937ea1..6599212 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -1,7 +1,6 @@ use engine::command::*; use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; -use engine::geometry::*; use engine::constants::*; use std::fmt; @@ -162,13 +161,24 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis fn random_move(player: &Player, rng: &mut R) -> Command { let all_buildings = sensible_buildings(player); let free_positions_count = player.unoccupied_cell_count(); + let unoccupied_energy_cell_count = player.unoccupied_energy_cell_count(); let nothing_count = if all_buildings.len() > 2 && free_positions_count > 0 { 0 } else { 1 }; let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); - if building_choice_index < all_buildings.len() && free_positions_count > 0 { + if building_choice_index < all_buildings.len() + && all_buildings[building_choice_index] == BuildingType::Energy + && unoccupied_energy_cell_count > 0 { + let position_choice = rng.gen_range(0, unoccupied_energy_cell_count); + Command::Build( + player.location_of_unoccupied_energy_cell(position_choice), + BuildingType::Energy + ) + + } + else if building_choice_index < all_buildings.len() && free_positions_count > 0 { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( player.location_of_unoccupied_cell(position_choice), @@ -249,7 +259,8 @@ impl CommandScore { fn init_command_scores(state: &BitwiseGameState) -> Vec { let all_buildings = sensible_buildings(&state.player); - let unoccupied_cells = (0..state.player.unoccupied_cell_count()).map(|i| state.player.location_of_unoccupied_cell(i)); + let unoccupied_cells = (0..state.player.unoccupied_cell_count()).map(|i| state.player.location_of_unoccupied_cell(i)).collect::>(); + let unoccupied_energy_cells = (0..state.player.unoccupied_energy_cell_count()).map(|i| state.player.location_of_unoccupied_energy_cell(i)).collect::>(); let building_command_count = unoccupied_cells.len()*all_buildings.len(); @@ -259,9 +270,11 @@ impl CommandScore { commands.push(CommandScore::new(Command::IronCurtain)); } - for position in unoccupied_cells { - for &building in &all_buildings { - commands.push(CommandScore::new(Command::Build(position, building))); + for &building in &all_buildings { + let cells = if building == BuildingType::Energy { &unoccupied_energy_cells } else { &unoccupied_cells }; + for position in cells { + + commands.push(CommandScore::new(Command::Build(*position, building))); } } @@ -296,7 +309,6 @@ fn sensible_buildings(player: &Player) -> Vec { result } -//TODO: Heuristic that avoids building the initial energy towers all in the same row? Max energy in a row? #[cfg(feature = "energy-cutoff")] fn sensible_buildings(player: &Player) -> Vec { let mut result = Vec::with_capacity(4); -- cgit v1.2.3 From 32e3f839c4d8ec0cdee18bff8143eb649fd70ff9 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 19 Aug 2018 14:57:06 +0200 Subject: Tweaked performance for enegy tower limiting --- Makefile | 4 +--- src/engine/bitwise_engine.rs | 53 ++++++++++++++++++++++++++++++++++++-------- src/engine/constants.rs | 2 +- src/input/json.rs | 2 ++ src/strategy/monte_carlo.rs | 51 +++++++++++++++++++++++++++++------------- 5 files changed, 83 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 42ce706..ec1506f 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,7 @@ profile: cargo build --release --features "benchmarking single-threaded extended-time" mkdir -p target/profile perf record -g target/release/perf-test - perf script > target/profile/out.perf - ../FlameGraph/stackcollapse-perf.pl target/profile/out.perf > target/profile/out.folded - ../FlameGraph/flamegraph.pl target/profile/out.folded > target/profile/flamegraph.svg + perf report clean: cargo clean diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 27c1bd8..f8af86d 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -34,6 +34,8 @@ pub struct Player { pub iron_curtain_available: bool, pub iron_curtain_remaining: u8, + + pub energy_towers_with_heuristics: u64, } #[derive(Debug, Clone, PartialEq, Eq)] @@ -73,6 +75,9 @@ impl BitwiseGameState { BitwiseGameState::update_iron_curtain(&mut self.player, self.round); BitwiseGameState::update_iron_curtain(&mut self.opponent, self.round); + self.player.update_energy_towers_with_heuristics(); + self.opponent.update_energy_towers_with_heuristics(); + self.round += 1; self.update_status(); @@ -430,7 +435,8 @@ impl Player { missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], tesla_cooldowns: ArrayVec::new(), iron_curtain_available: false, - iron_curtain_remaining: 0 + iron_curtain_remaining: 0, + energy_towers_with_heuristics: 0 } } @@ -454,28 +460,57 @@ impl Player { point } - pub fn energy_occupied_energy_with_heuristics(&self) -> u64 { - let mut result = 0; + pub fn update_energy_towers_with_heuristics(&mut self) { + self.energy_towers_with_heuristics = self.occupied; for y in 0..MAP_HEIGHT { - let mask = 255 << y*SINGLE_MAP_WIDTH; + let mask = 255u64 << (y*SINGLE_MAP_WIDTH); let isolated_row = self.energy_towers & mask; let row_count = isolated_row.count_ones(); - result |= if row_count > ENERGY_MAX_IN_ROW { + self.energy_towers_with_heuristics |= if row_count >= ENERGY_MAX_IN_ROW { mask } else { - self.occupied & mask + 0 }; } - result } pub fn unoccupied_energy_cell_count(&self) -> usize { - self.energy_occupied_energy_with_heuristics().count_zeros() as usize + self.energy_towers_with_heuristics.count_zeros() as usize } pub fn location_of_unoccupied_energy_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.energy_occupied_energy_with_heuristics(), i as u64); + let bit = find_bit_index_from_rank(self.energy_towers_with_heuristics, i as u64); let point = Point { index: bit }; debug_assert!(point.to_either_bitfield() & self.occupied == 0); point } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn energy_occupied_marks_empty_rows_appropriately() { + let mut player = Player::empty(); + player.energy_towers = 0; + player.occupied = 0; + player.update_energy_towers_with_heuristics(); + + let expected = 0; + let actual = player.energy_towers_with_heuristics; + + assert_eq!(expected, actual); + } + #[test] + fn energy_occupied_marks_full_first_row_appropriately() { + let mut player = Player::empty(); + player.energy_towers = 0x00_07; //3 energy towers in first row, don't build more + player.occupied = 0x07_07; //3 more towers in second row, can still build by them + player.update_energy_towers_with_heuristics(); + + let expected = 0x07_ff; + let actual = player.energy_towers_with_heuristics; + + assert_eq!(expected, actual); + } +} diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 60e8101..71d937d 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -26,7 +26,7 @@ pub const ENERGY_GENERATED_TOWER: u16 = 3; pub const ENERGY_PRICE: u16 = 20; pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; -pub const ENERGY_MAX_IN_ROW: u32 = 2; +pub const ENERGY_MAX_IN_ROW: u32 = 3; pub const IRON_CURTAIN_PRICE: u16 = 100; pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30; diff --git a/src/input/json.rs b/src/input/json.rs index 843f228..6c83563 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -137,6 +137,8 @@ impl State { } } } + player.update_energy_towers_with_heuristics(); + opponent.update_energy_towers_with_heuristics(); bitwise_engine::BitwiseGameState::new( player, opponent, diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 6599212..75ca055 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -7,6 +7,8 @@ use std::fmt; use rand::{Rng, XorShiftRng, SeedableRng}; +use arrayvec::ArrayVec; + const MAX_MOVES: u16 = 400; const INIT_SEED: [u8;16] = [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda]; @@ -159,18 +161,24 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } fn random_move(player: &Player, rng: &mut R) -> Command { - let all_buildings = sensible_buildings(player); let free_positions_count = player.unoccupied_cell_count(); let unoccupied_energy_cell_count = player.unoccupied_energy_cell_count(); - - let nothing_count = if all_buildings.len() > 2 && free_positions_count > 0 { 0 } else { 1 }; + + let open_energy_spot = unoccupied_energy_cell_count > 0; + let open_building_spot = free_positions_count > 0; + + let all_buildings = sensible_buildings(player, open_building_spot, open_energy_spot); + let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; - + //TODO: This appears to make things much slower. Or maybe games last longer? + let nothing_count = 1;//if all_buildings.len() + iron_curtain_count > 0 { 0 } else { 1 }; + let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); - if building_choice_index < all_buildings.len() - && all_buildings[building_choice_index] == BuildingType::Energy - && unoccupied_energy_cell_count > 0 { + let choice_is_building = building_choice_index < all_buildings.len(); + let choice_is_energy = choice_is_building && all_buildings[building_choice_index] == BuildingType::Energy; + + if choice_is_energy { let position_choice = rng.gen_range(0, unoccupied_energy_cell_count); Command::Build( player.location_of_unoccupied_energy_cell(position_choice), @@ -178,7 +186,7 @@ fn random_move(player: &Player, rng: &mut R) -> Command { ) } - else if building_choice_index < all_buildings.len() && free_positions_count > 0 { + else if choice_is_building { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( player.location_of_unoccupied_cell(position_choice), @@ -257,11 +265,15 @@ impl CommandScore { } fn init_command_scores(state: &BitwiseGameState) -> Vec { - let all_buildings = sensible_buildings(&state.player); - let unoccupied_cells = (0..state.player.unoccupied_cell_count()).map(|i| state.player.location_of_unoccupied_cell(i)).collect::>(); let unoccupied_energy_cells = (0..state.player.unoccupied_energy_cell_count()).map(|i| state.player.location_of_unoccupied_energy_cell(i)).collect::>(); + let open_building_spot = unoccupied_cells.len() > 0; + let open_energy_spot = unoccupied_energy_cells.len() > 0; + + + let all_buildings = sensible_buildings(&state.player, open_building_spot, open_energy_spot); + let building_command_count = unoccupied_cells.len()*all_buildings.len(); let mut commands = Vec::with_capacity(building_command_count + 2); @@ -290,8 +302,11 @@ impl fmt::Display for CommandScore { #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player) -> Vec { - let mut result = Vec::with_capacity(4); +fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spot: bool) -> ArrayVec<[BuildingType;4]> { + let mut result = ArrayVec::new(); + if !open_building_spot { + return result; + } if DEFENCE_PRICE <= player.energy { result.push(BuildingType::Defence); @@ -299,7 +314,7 @@ fn sensible_buildings(player: &Player) -> Vec { if MISSILE_PRICE <= player.energy { result.push(BuildingType::Attack); } - if ENERGY_PRICE <= player.energy { + if ENERGY_PRICE <= player.energy && open_energy_spot { result.push(BuildingType::Energy); } if TESLA_PRICE <= player.energy && !player.has_max_teslas() { @@ -310,8 +325,12 @@ fn sensible_buildings(player: &Player) -> Vec { } #[cfg(feature = "energy-cutoff")] -fn sensible_buildings(player: &Player) -> Vec { - let mut result = Vec::with_capacity(4); +fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spot: bool) -> ArrayVec<[BuildingType;4]> { + let mut result = ArrayVec::new(); + if !open_building_spot { + return result; + } + let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; @@ -321,7 +340,7 @@ fn sensible_buildings(player: &Player) -> Vec { if MISSILE_PRICE <= player.energy { result.push(BuildingType::Attack); } - if ENERGY_PRICE <= player.energy && needs_energy { + if ENERGY_PRICE <= player.energy && open_energy_spot && needs_energy { result.push(BuildingType::Energy); } if TESLA_PRICE <= player.energy && !player.has_max_teslas() { -- cgit v1.2.3 From c90898da21e92da5f6c874eea9ed3aedf5330195 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 27 Aug 2018 21:10:37 +0200 Subject: Increased the likelihood of using an iron curtain if there's energy --- src/strategy/monte_carlo.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 75ca055..27caea8 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -169,9 +169,8 @@ fn random_move(player: &Player, rng: &mut R) -> Command { let all_buildings = sensible_buildings(player, open_building_spot, open_energy_spot); - let iron_curtain_count = if player.can_build_iron_curtain() { 1 } else { 0 }; - //TODO: This appears to make things much slower. Or maybe games last longer? - let nothing_count = 1;//if all_buildings.len() + iron_curtain_count > 0 { 0 } else { 1 }; + let iron_curtain_count = if player.can_build_iron_curtain() { 5 } else { 0 }; + let nothing_count = 1; let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); @@ -193,10 +192,10 @@ fn random_move(player: &Player, rng: &mut R) -> Command { all_buildings[building_choice_index] ) } - else if iron_curtain_count > 0 && building_choice_index == all_buildings.len() { - Command::IronCurtain + else if building_choice_index == all_buildings.len() { + Command::Nothing } else { - Command::Nothing + Command::IronCurtain } } @@ -277,7 +276,7 @@ impl CommandScore { let building_command_count = unoccupied_cells.len()*all_buildings.len(); let mut commands = Vec::with_capacity(building_command_count + 2); - commands.push(CommandScore::with_seeded_stalemate(Command::Nothing)); + commands.push(CommandScore::new(Command::Nothing)); if state.player.can_build_iron_curtain() { commands.push(CommandScore::new(Command::IronCurtain)); } -- cgit v1.2.3 From dbc008ad4d16072d181e0ac6949fab09a9c05801 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 27 Aug 2018 21:48:26 +0200 Subject: Removed branching around energy limiting heuristics --- src/engine/bitwise_engine.rs | 60 -------------------------------------------- src/engine/constants.rs | 2 -- src/input/json.rs | 2 -- src/strategy/monte_carlo.rs | 59 ++++++++++++------------------------------- 4 files changed, 16 insertions(+), 107 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index f8af86d..628fefc 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -34,8 +34,6 @@ pub struct Player { pub iron_curtain_available: bool, pub iron_curtain_remaining: u8, - - pub energy_towers_with_heuristics: u64, } #[derive(Debug, Clone, PartialEq, Eq)] @@ -75,9 +73,6 @@ impl BitwiseGameState { BitwiseGameState::update_iron_curtain(&mut self.player, self.round); BitwiseGameState::update_iron_curtain(&mut self.opponent, self.round); - self.player.update_energy_towers_with_heuristics(); - self.opponent.update_energy_towers_with_heuristics(); - self.round += 1; self.update_status(); @@ -436,7 +431,6 @@ impl Player { tesla_cooldowns: ArrayVec::new(), iron_curtain_available: false, iron_curtain_remaining: 0, - energy_towers_with_heuristics: 0 } } @@ -459,58 +453,4 @@ impl Player { debug_assert!(point.to_either_bitfield() & self.occupied == 0); point } - - pub fn update_energy_towers_with_heuristics(&mut self) { - self.energy_towers_with_heuristics = self.occupied; - for y in 0..MAP_HEIGHT { - let mask = 255u64 << (y*SINGLE_MAP_WIDTH); - let isolated_row = self.energy_towers & mask; - let row_count = isolated_row.count_ones(); - self.energy_towers_with_heuristics |= if row_count >= ENERGY_MAX_IN_ROW { - mask - } else { - 0 - }; - } - } - - pub fn unoccupied_energy_cell_count(&self) -> usize { - self.energy_towers_with_heuristics.count_zeros() as usize - } - pub fn location_of_unoccupied_energy_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.energy_towers_with_heuristics, i as u64); - let point = Point { index: bit }; - debug_assert!(point.to_either_bitfield() & self.occupied == 0); - point - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn energy_occupied_marks_empty_rows_appropriately() { - let mut player = Player::empty(); - player.energy_towers = 0; - player.occupied = 0; - player.update_energy_towers_with_heuristics(); - - let expected = 0; - let actual = player.energy_towers_with_heuristics; - - assert_eq!(expected, actual); - } - #[test] - fn energy_occupied_marks_full_first_row_appropriately() { - let mut player = Player::empty(); - player.energy_towers = 0x00_07; //3 energy towers in first row, don't build more - player.occupied = 0x07_07; //3 more towers in second row, can still build by them - player.update_energy_towers_with_heuristics(); - - let expected = 0x07_ff; - let actual = player.energy_towers_with_heuristics; - - assert_eq!(expected, actual); - } } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 71d937d..9ece36d 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -26,8 +26,6 @@ pub const ENERGY_GENERATED_TOWER: u16 = 3; pub const ENERGY_PRICE: u16 = 20; pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; -pub const ENERGY_MAX_IN_ROW: u32 = 3; - pub const IRON_CURTAIN_PRICE: u16 = 100; pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30; pub const IRON_CURTAIN_DURATION: u8 = 6; diff --git a/src/input/json.rs b/src/input/json.rs index 6c83563..843f228 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -137,8 +137,6 @@ impl State { } } } - player.update_energy_towers_with_heuristics(); - opponent.update_energy_towers_with_heuristics(); bitwise_engine::BitwiseGameState::new( player, opponent, diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 27caea8..7672dff 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -2,6 +2,7 @@ use engine::command::*; use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; use engine::constants::*; +use engine::geometry::*; use std::fmt; @@ -18,7 +19,7 @@ use time::{Duration, PreciseTime}; use rayon::prelude::*; //TODO Rethink / adjust these? -#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 100; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 50; #[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 100; pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { @@ -162,30 +163,17 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis fn random_move(player: &Player, rng: &mut R) -> Command { let free_positions_count = player.unoccupied_cell_count(); - let unoccupied_energy_cell_count = player.unoccupied_energy_cell_count(); - let open_energy_spot = unoccupied_energy_cell_count > 0; let open_building_spot = free_positions_count > 0; - let all_buildings = sensible_buildings(player, open_building_spot, open_energy_spot); + let all_buildings = sensible_buildings(player, open_building_spot); let iron_curtain_count = if player.can_build_iron_curtain() { 5 } else { 0 }; let nothing_count = 1; let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); - let choice_is_building = building_choice_index < all_buildings.len(); - let choice_is_energy = choice_is_building && all_buildings[building_choice_index] == BuildingType::Energy; - - if choice_is_energy { - let position_choice = rng.gen_range(0, unoccupied_energy_cell_count); - Command::Build( - player.location_of_unoccupied_energy_cell(position_choice), - BuildingType::Energy - ) - - } - else if choice_is_building { + if building_choice_index < all_buildings.len() { let position_choice = rng.gen_range(0, free_positions_count); Command::Build( player.location_of_unoccupied_cell(position_choice), @@ -223,18 +211,6 @@ impl CommandScore { } } - fn with_seeded_stalemate(command: Command) -> CommandScore { - CommandScore { - command, - victories: 0, - defeats: 0, - draws: 0, - stalemates: 0, - attempts: 1, - next_seed: INIT_SEED - } - } - fn add_victory(&mut self, next_seed: [u8; 16]) { self.victories += 1; self.attempts += 1; @@ -264,14 +240,13 @@ impl CommandScore { } fn init_command_scores(state: &BitwiseGameState) -> Vec { - let unoccupied_cells = (0..state.player.unoccupied_cell_count()).map(|i| state.player.location_of_unoccupied_cell(i)).collect::>(); - let unoccupied_energy_cells = (0..state.player.unoccupied_energy_cell_count()).map(|i| state.player.location_of_unoccupied_energy_cell(i)).collect::>(); - - let open_building_spot = unoccupied_cells.len() > 0; - let open_energy_spot = unoccupied_energy_cells.len() > 0; + let unoccupied_cells_count = state.player.unoccupied_cell_count(); + let unoccupied_cells = (0..unoccupied_cells_count) + .map(|i| state.player.location_of_unoccupied_cell(i)); + let open_building_spot = unoccupied_cells_count > 0; - let all_buildings = sensible_buildings(&state.player, open_building_spot, open_energy_spot); + let all_buildings = sensible_buildings(&state.player, open_building_spot); let building_command_count = unoccupied_cells.len()*all_buildings.len(); @@ -281,11 +256,9 @@ impl CommandScore { commands.push(CommandScore::new(Command::IronCurtain)); } - for &building in &all_buildings { - let cells = if building == BuildingType::Energy { &unoccupied_energy_cells } else { &unoccupied_cells }; - for position in cells { - - commands.push(CommandScore::new(Command::Build(*position, building))); + for position in unoccupied_cells { + for &building in &all_buildings { + commands.push(CommandScore::new(Command::Build(position, building))); } } @@ -301,7 +274,7 @@ impl fmt::Display for CommandScore { #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spot: bool) -> ArrayVec<[BuildingType;4]> { +fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType;4]> { let mut result = ArrayVec::new(); if !open_building_spot { return result; @@ -313,7 +286,7 @@ fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spo if MISSILE_PRICE <= player.energy { result.push(BuildingType::Attack); } - if ENERGY_PRICE <= player.energy && open_energy_spot { + if ENERGY_PRICE <= player.energy { result.push(BuildingType::Energy); } if TESLA_PRICE <= player.energy && !player.has_max_teslas() { @@ -324,7 +297,7 @@ fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spo } #[cfg(feature = "energy-cutoff")] -fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spot: bool) -> ArrayVec<[BuildingType;4]> { +fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType;4]> { let mut result = ArrayVec::new(); if !open_building_spot { return result; @@ -339,7 +312,7 @@ fn sensible_buildings(player: &Player, open_building_spot: bool, open_energy_spo if MISSILE_PRICE <= player.energy { result.push(BuildingType::Attack); } - if ENERGY_PRICE <= player.energy && open_energy_spot && needs_energy { + if ENERGY_PRICE <= player.energy && needs_energy { result.push(BuildingType::Energy); } if TESLA_PRICE <= player.energy && !player.has_max_teslas() { -- cgit v1.2.3 From 17441593bd78a82a18695cd2b1b53465e3c26285 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 27 Aug 2018 22:22:23 +0200 Subject: More plot info for debug --- src/lib.rs | 2 -- src/strategy/monte_carlo.rs | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 1883b8e..de8b120 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,3 @@ -#![warn(clippy)] - extern crate serde; extern crate serde_json; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 7672dff..b8d89aa 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -71,7 +71,8 @@ pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: #[cfg(feature = "debug-decisions")] fn debug_print_choices Option<(Point, i32)>>(label: &str, command_scores: &[CommandScore], extractor: F) { - println!("{}", label); + println!("#+NAME: {}", label); + println!("#+PLOT: type:3d with:pm3d"); let relevant_moves: Vec<(Point, i32)> = command_scores.iter() .filter_map(extractor) .collect(); -- cgit v1.2.3 From 5c299a662f178832d6d0722dabdec5cf4dd73e02 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 27 Aug 2018 22:38:01 +0200 Subject: Refactoring to have more stuff on player --- src/engine/bitwise_engine.rs | 241 ++++++++++++++++++++++--------------------- 1 file changed, 121 insertions(+), 120 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 628fefc..0429e84 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -53,14 +53,14 @@ pub struct TeslaCooldown { impl BitwiseGameState { pub fn simulate(&mut self, player_command: Command, opponent_command: Command) -> GameStatus { - BitwiseGameState::perform_command(&mut self.player, player_command); - BitwiseGameState::perform_command(&mut self.opponent, opponent_command); + self.player.perform_command(player_command); + self.opponent.perform_command(opponent_command); - BitwiseGameState::update_construction(&mut self.player); - BitwiseGameState::update_construction(&mut self.opponent); + self.player.update_construction(); + self.opponent.update_construction(); - BitwiseGameState::add_missiles(&mut self.player); - BitwiseGameState::add_missiles(&mut self.opponent); + self.player.add_missiles(); + self.opponent.add_missiles(); BitwiseGameState::fire_teslas(&mut self.player, &mut self.opponent); @@ -181,110 +181,6 @@ impl BitwiseGameState { res } - fn perform_command(player: &mut Player, command: Command) { - match command { - Command::Nothing => {}, - Command::Build(p, b) => { - let bitfield = p.to_either_bitfield(); - - let price = match b { - BuildingType::Attack => MISSILE_PRICE, - BuildingType::Defence => DEFENCE_PRICE, - BuildingType::Energy => ENERGY_PRICE, - BuildingType::Tesla => TESLA_PRICE, - }; - let construction_time = match b { - BuildingType::Attack => MISSILE_CONSTRUCTION_TIME, - BuildingType::Defence => DEFENCE_CONSTRUCTION_TIME, - BuildingType::Energy => ENERGY_CONSTRUCTION_TIME, - BuildingType::Tesla => TESLA_CONSTRUCTION_TIME, - }; - - // This is used internally. I should not be making - // invalid moves! - debug_assert!(player.buildings[0] & bitfield == 0); - debug_assert!(p.x() < FULL_MAP_WIDTH && p.y() < MAP_HEIGHT); - debug_assert!(player.energy >= price); - debug_assert!(b != BuildingType::Tesla || - player.count_teslas() < TESLA_MAX); - - player.energy -= price; - player.unconstructed.push(UnconstructedBuilding { - pos: p, - construction_time_left: construction_time, - building_type: b - }); - player.occupied |= bitfield; - }, - Command::Deconstruct(p) => { - let unconstructed_to_remove_index = player.unconstructed.iter().position(|ref b| b.pos == p); - let deconstruct_mask = !(p.to_either_bitfield() & player.buildings[0]); - - debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); - - if let Some(i) = unconstructed_to_remove_index { - player.unconstructed.swap_remove(i); - } - - player.energy += DECONSTRUCT_ENERGY; - - for tier in 0..player.buildings.len() { - player.buildings[tier] &= deconstruct_mask; - } - player.energy_towers &= deconstruct_mask; - for tier in 0..player.missile_towers.len() { - player.missile_towers[tier] &= deconstruct_mask; - } - player.tesla_cooldowns.retain(|t| t.pos != p); - player.occupied &= deconstruct_mask; - }, - Command::IronCurtain => { - debug_assert!(player.iron_curtain_available); - debug_assert!(player.energy >= IRON_CURTAIN_PRICE); - - player.energy -= IRON_CURTAIN_PRICE; - player.iron_curtain_available = false; - player.iron_curtain_remaining = IRON_CURTAIN_DURATION; - } - } - } - - fn update_construction(player: &mut Player) { - let mut buildings_len = player.unconstructed.len(); - for i in (0..buildings_len).rev() { - if player.unconstructed[i].construction_time_left == 0 { - let building_type = player.unconstructed[i].building_type; - let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; - - let pos = player.unconstructed[i].pos; - let bitfield = pos.to_either_bitfield(); - - for health_tier in 0..health { - player.buildings[health_tier] |= bitfield; - } - if building_type == BuildingType::Energy { - player.energy_towers |= bitfield; - } - if building_type == BuildingType::Attack { - player.missile_towers[player.firing_tower] |= bitfield; - } - if building_type == BuildingType::Tesla { - player.tesla_cooldowns.push(TeslaCooldown { - pos, - cooldown: 0, - age: 0 - }); - } - - buildings_len -= 1; - player.unconstructed.swap(i, buildings_len); - } else { - player.unconstructed[i].construction_time_left -= 1 - } - } - player.unconstructed.truncate(buildings_len); - } - fn update_iron_curtain(player: &mut Player, round: u16) { if round != 0 && round % IRON_CURTAIN_UNLOCK_INTERVAL == 0 { player.iron_curtain_available = true; @@ -336,16 +232,6 @@ impl BitwiseGameState { } } - fn add_missiles(player: &mut Player) { - let mut missiles = player.missile_towers[player.firing_tower]; - for mut tier in &mut player.missiles { - let setting = !tier.0 & missiles; - tier.0 |= setting; - missiles &= !setting; - } - player.firing_tower = (player.firing_tower + 1) % MISSILE_COOLDOWN_STATES; - } - fn move_and_collide_missiles(opponent: &mut Player, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { let mut destroyed = 0; let mut damaging = 0; @@ -453,4 +339,119 @@ impl Player { debug_assert!(point.to_either_bitfield() & self.occupied == 0); point } + + + fn perform_command(&mut self, command: Command) { + match command { + Command::Nothing => {}, + Command::Build(p, b) => { + let bitfield = p.to_either_bitfield(); + + let price = match b { + BuildingType::Attack => MISSILE_PRICE, + BuildingType::Defence => DEFENCE_PRICE, + BuildingType::Energy => ENERGY_PRICE, + BuildingType::Tesla => TESLA_PRICE, + }; + let construction_time = match b { + BuildingType::Attack => MISSILE_CONSTRUCTION_TIME, + BuildingType::Defence => DEFENCE_CONSTRUCTION_TIME, + BuildingType::Energy => ENERGY_CONSTRUCTION_TIME, + BuildingType::Tesla => TESLA_CONSTRUCTION_TIME, + }; + + // This is used internally. I should not be making + // invalid moves! + debug_assert!(self.buildings[0] & bitfield == 0); + debug_assert!(p.x() < FULL_MAP_WIDTH && p.y() < MAP_HEIGHT); + debug_assert!(self.energy >= price); + debug_assert!(b != BuildingType::Tesla || + self.count_teslas() < TESLA_MAX); + + self.energy -= price; + self.unconstructed.push(UnconstructedBuilding { + pos: p, + construction_time_left: construction_time, + building_type: b + }); + self.occupied |= bitfield; + }, + Command::Deconstruct(p) => { + let unconstructed_to_remove_index = self.unconstructed.iter().position(|ref b| b.pos == p); + let deconstruct_mask = !(p.to_either_bitfield() & self.buildings[0]); + + debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); + + if let Some(i) = unconstructed_to_remove_index { + self.unconstructed.swap_remove(i); + } + + self.energy += DECONSTRUCT_ENERGY; + + for tier in 0..self.buildings.len() { + self.buildings[tier] &= deconstruct_mask; + } + self.energy_towers &= deconstruct_mask; + for tier in 0..self.missile_towers.len() { + self.missile_towers[tier] &= deconstruct_mask; + } + self.tesla_cooldowns.retain(|t| t.pos != p); + self.occupied &= deconstruct_mask; + }, + Command::IronCurtain => { + debug_assert!(self.iron_curtain_available); + debug_assert!(self.energy >= IRON_CURTAIN_PRICE); + + self.energy -= IRON_CURTAIN_PRICE; + self.iron_curtain_available = false; + self.iron_curtain_remaining = IRON_CURTAIN_DURATION; + } + } + } + + fn update_construction(&mut self) { + let mut buildings_len = self.unconstructed.len(); + for i in (0..buildings_len).rev() { + if self.unconstructed[i].construction_time_left == 0 { + let building_type = self.unconstructed[i].building_type; + let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; + + let pos = self.unconstructed[i].pos; + let bitfield = pos.to_either_bitfield(); + + for health_tier in 0..health { + self.buildings[health_tier] |= bitfield; + } + if building_type == BuildingType::Energy { + self.energy_towers |= bitfield; + } + if building_type == BuildingType::Attack { + self.missile_towers[self.firing_tower] |= bitfield; + } + if building_type == BuildingType::Tesla { + self.tesla_cooldowns.push(TeslaCooldown { + pos, + cooldown: 0, + age: 0 + }); + } + + buildings_len -= 1; + self.unconstructed.swap(i, buildings_len); + } else { + self.unconstructed[i].construction_time_left -= 1 + } + } + self.unconstructed.truncate(buildings_len); + } + + fn add_missiles(&mut self) { + let mut missiles = self.missile_towers[self.firing_tower]; + for mut tier in &mut self.missiles { + let setting = !tier.0 & missiles; + tier.0 |= setting; + missiles &= !setting; + } + self.firing_tower = (self.firing_tower + 1) % MISSILE_COOLDOWN_STATES; + } } -- cgit v1.2.3 From 72a29f9844a86050c5632861f71855713878c0b5 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 27 Aug 2018 22:40:02 +0200 Subject: Removed unused deconstruct command --- src/engine/bitwise_engine.rs | 22 ---------------------- src/engine/command.rs | 2 -- tests/live_comparison.rs | 4 +--- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 0429e84..102f3fb 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -376,28 +376,6 @@ impl Player { }); self.occupied |= bitfield; }, - Command::Deconstruct(p) => { - let unconstructed_to_remove_index = self.unconstructed.iter().position(|ref b| b.pos == p); - let deconstruct_mask = !(p.to_either_bitfield() & self.buildings[0]); - - debug_assert!(deconstruct_mask != 0 || unconstructed_to_remove_index.is_some()); - - if let Some(i) = unconstructed_to_remove_index { - self.unconstructed.swap_remove(i); - } - - self.energy += DECONSTRUCT_ENERGY; - - for tier in 0..self.buildings.len() { - self.buildings[tier] &= deconstruct_mask; - } - self.energy_towers &= deconstruct_mask; - for tier in 0..self.missile_towers.len() { - self.missile_towers[tier] &= deconstruct_mask; - } - self.tesla_cooldowns.retain(|t| t.pos != p); - self.occupied &= deconstruct_mask; - }, Command::IronCurtain => { debug_assert!(self.iron_curtain_available); debug_assert!(self.energy >= IRON_CURTAIN_PRICE); diff --git a/src/engine/command.rs b/src/engine/command.rs index c4268c5..d026bca 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -5,7 +5,6 @@ use super::geometry::Point; pub enum Command { Nothing, Build(Point, BuildingType), - Deconstruct(Point), IronCurtain } @@ -14,7 +13,6 @@ impl fmt::Display for Command { match *self { Command::Nothing => write!(f, ""), Command::Build(p, b) => write!(f, "{},{},{}", p.x(), p.y(), b as u8), - Command::Deconstruct(p) => write!(f, "{},{},3", p.x(), p.y()), Command::IronCurtain => write!(f, "0,0,5") } } diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs index 045414a..c85e3fe 100644 --- a/tests/live_comparison.rs +++ b/tests/live_comparison.rs @@ -55,9 +55,7 @@ fn read_player_command(filename: &str) -> Command { let point = Point::new(components.next().unwrap().trim().parse().unwrap(), components.next().unwrap().trim().parse().unwrap()); let action_type = components.next().unwrap().trim().parse().unwrap(); - if action_type == 3 { - Command::Deconstruct(point) - } else if action_type == 5 { + if action_type == 5 { Command::IronCurtain } else { Command::Build(point, BuildingType::from_u8(action_type).unwrap()) -- cgit v1.2.3 From 5c33043385cf540de90f54d07225517aff01df01 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 27 Aug 2018 22:58:32 +0200 Subject: Removed tesla order fixing --- src/engine/bitwise_engine.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 102f3fb..873b6e5 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -197,7 +197,11 @@ impl BitwiseGameState { } fn fire_single_players_teslas_without_cleanup(player: &mut Player, opponent: &mut Player) { - player.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); + // It's technically more accurate to have this in, but for + // most practical purposes it's a moot point and it's faster + // without it. + // + // player.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); for tesla in player.tesla_cooldowns.iter_mut() { tesla.age += 1; if tesla.cooldown > 0 { -- cgit v1.2.3 From e5a09e11e8a99440d22d9f4cbde97f0e3d6fca7b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 29 Aug 2018 20:52:15 +0200 Subject: Added targeted waiting to evaluated moves --- src/engine/bitwise_engine.rs | 2 +- src/engine/command.rs | 25 +++++++++++++++++++++++++ src/strategy/monte_carlo.rs | 32 ++++++++++++++++++-------------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 873b6e5..d54ccc0 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -333,7 +333,7 @@ impl Player { } pub fn can_build_iron_curtain(&self) -> bool { - self.iron_curtain_available && self.iron_curtain_remaining == 0 && self.energy >= IRON_CURTAIN_PRICE + self.iron_curtain_available && self.iron_curtain_remaining == 0 } pub fn unoccupied_cell_count(&self) -> usize { self.occupied.count_zeros() as usize } diff --git a/src/engine/command.rs b/src/engine/command.rs index d026bca..764e3cb 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -1,4 +1,5 @@ use std::fmt; +use super::constants::*; use super::geometry::Point; #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -18,6 +19,19 @@ impl fmt::Display for Command { } } +impl Command { + pub fn cant_build_yet(&self, energy: u16) -> bool { + use self::Command::*; + + match self { + Nothing => false, + Build(_, b) => b.cant_build_yet(energy), + IronCurtain => energy < IRON_CURTAIN_PRICE + } + } +} + + #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum BuildingType { @@ -38,4 +52,15 @@ impl BuildingType { if id <= 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } } + pub fn cant_build_yet(&self, energy: u16) -> bool { + use self::BuildingType::*; + + let required = match self { + Defence => DEFENCE_PRICE, + Attack => MISSILE_PRICE, + Energy => ENERGY_PRICE, + Tesla => TESLA_PRICE + }; + energy < required + } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index b8d89aa..971fc1d 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -28,7 +28,7 @@ pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: let command = { let best_command_score = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); match best_command_score { - Some(best_command_score) => best_command_score.command, + Some(best) if !best.starts_with_nothing => best.command, _ => Command::Nothing } }; @@ -139,15 +139,21 @@ fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &Bitwise fn simulate_to_endstate(command_score: &mut CommandScore, state: &BitwiseGameState, rng: &mut R) { let mut state_mut = state.clone(); - let opponent_first = random_move(&state_mut.opponent, rng); - let mut status = state_mut.simulate(command_score.command, opponent_first); + let mut status = GameStatus::Continue; //state_mut.simulate(command_score.command, opponent_first); + let mut first_move_made = false; for _ in 0..MAX_MOVES { if status != GameStatus::Continue { break; } - let player_command = random_move(&state_mut.player, rng); + let player_command = if first_move_made { + random_move(&state_mut.player, rng) + } else { + let do_nothing = command_score.command.cant_build_yet(state_mut.player.energy); + first_move_made = !do_nothing; + if do_nothing { Command::Nothing } else { command_score.command } + }; let opponent_command = random_move(&state_mut.opponent, rng); status = state_mut.simulate(player_command, opponent_command); } @@ -169,7 +175,7 @@ fn random_move(player: &Player, rng: &mut R) -> Command { let all_buildings = sensible_buildings(player, open_building_spot); - let iron_curtain_count = if player.can_build_iron_curtain() { 5 } else { 0 }; + let iron_curtain_count = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { 1 } else { 0 }; let nothing_count = 1; let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); @@ -191,6 +197,7 @@ fn random_move(player: &Player, rng: &mut R) -> Command { #[derive(Debug)] struct CommandScore { command: Command, + starts_with_nothing: bool, victories: u32, defeats: u32, draws: u32, @@ -200,9 +207,9 @@ struct CommandScore { } impl CommandScore { - fn new(command: Command) -> CommandScore { + fn new(command: Command, starts_with_nothing: bool) -> CommandScore { CommandScore { - command, + command, starts_with_nothing, victories: 0, defeats: 0, draws: 0, @@ -245,21 +252,18 @@ impl CommandScore { let unoccupied_cells = (0..unoccupied_cells_count) .map(|i| state.player.location_of_unoccupied_cell(i)); - let open_building_spot = unoccupied_cells_count > 0; - - let all_buildings = sensible_buildings(&state.player, open_building_spot); + let all_buildings = [BuildingType::Defence, BuildingType::Attack, BuildingType::Energy, BuildingType::Tesla]; let building_command_count = unoccupied_cells.len()*all_buildings.len(); - let mut commands = Vec::with_capacity(building_command_count + 2); - commands.push(CommandScore::new(Command::Nothing)); + let mut commands = Vec::with_capacity(building_command_count + 1); if state.player.can_build_iron_curtain() { - commands.push(CommandScore::new(Command::IronCurtain)); + commands.push(CommandScore::new(Command::IronCurtain, state.player.energy < IRON_CURTAIN_PRICE)); } for position in unoccupied_cells { for &building in &all_buildings { - commands.push(CommandScore::new(Command::Build(position, building))); + commands.push(CommandScore::new(Command::Build(position, building), building.cant_build_yet(state.player.energy))); } } -- cgit v1.2.3 From 18510603042a7c55b512cdba41fea6c1e84854df Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Fri, 31 Aug 2018 20:12:00 +0200 Subject: Limited the looking into the future to be a bit more limited --- src/strategy/monte_carlo.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 971fc1d..6176f1a 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -168,6 +168,8 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } } +// TODO: This needs a decent heuristic play. Don't do nothing and +// target certain rows with missiles? fn random_move(player: &Player, rng: &mut R) -> Command { let free_positions_count = player.unoccupied_cell_count(); @@ -251,13 +253,26 @@ impl CommandScore { let unoccupied_cells_count = state.player.unoccupied_cell_count(); let unoccupied_cells = (0..unoccupied_cells_count) .map(|i| state.player.location_of_unoccupied_cell(i)); + let energy_generated = state.player.energy_generated(); - let all_buildings = [BuildingType::Defence, BuildingType::Attack, BuildingType::Energy, BuildingType::Tesla]; - + let mut all_buildings: ArrayVec<[BuildingType; 4]> = ArrayVec::new(); + if DEFENCE_PRICE <= state.player.energy { + all_buildings.push(BuildingType::Defence); + } + if MISSILE_PRICE <= state.player.energy { + all_buildings.push(BuildingType::Attack); + } + if ENERGY_PRICE <= state.player.energy { + all_buildings.push(BuildingType::Energy); + } + if !state.player.has_max_teslas() && (TESLA_PRICE.saturating_sub(state.player.energy) / energy_generated < 4) { + all_buildings.push(BuildingType::Tesla); + } + let building_command_count = unoccupied_cells.len()*all_buildings.len(); let mut commands = Vec::with_capacity(building_command_count + 1); - if state.player.can_build_iron_curtain() { + if state.player.can_build_iron_curtain() && IRON_CURTAIN_PRICE.saturating_sub(state.player.energy) / energy_generated < 4 { commands.push(CommandScore::new(Command::IronCurtain, state.player.energy < IRON_CURTAIN_PRICE)); } @@ -277,7 +292,6 @@ impl fmt::Display for CommandScore { } } - #[cfg(not(feature = "energy-cutoff"))] fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType;4]> { let mut result = ArrayVec::new(); -- cgit v1.2.3 From 82230e9f67dbebb3a0a608a53bca05aa38a5f501 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Fri, 31 Aug 2018 21:43:58 +0200 Subject: Placeholder for new heuristic based random search --- Cargo.toml | 1 + src/strategy/monte_carlo.rs | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8ea3564..ab624cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ extended-time = [] energy-cutoff = [] discard-poor-performers = [] +heuristic-random = [] default = ["energy-cutoff", "discard-poor-performers"] diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 6176f1a..2489c8a 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -168,8 +168,21 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } } -// TODO: This needs a decent heuristic play. Don't do nothing and -// target certain rows with missiles? +// TODO +// 1. Have a (static) array of all moves. Even invalid ones. ALL +// 2. Create a new CDF array, same size. +// 3. Loop moves +// 3.1. Compute PDF for move. Invalid moves are 0. +// 3.2. Add to last CDF value and stick in array +// 4. Generate random number uniformly, 0 to CDF max +// 5. Binary search to find random number in CDF array. Min index where CDF[index] > random +// 6. Lookup move in static array +#[cfg(feature = "heuristic-random")] +fn random_move(player: &Player, rng: &mut R) -> Command { + Command::Nothing +} + +#[cfg(not(feature = "heuristic-random"))] fn random_move(player: &Player, rng: &mut R) -> Command { let free_positions_count = player.unoccupied_cell_count(); -- cgit v1.2.3 From 6f2f6ce1e5d53a2344a26862eb05e4e12bfabe1a Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Fri, 31 Aug 2018 22:23:02 +0200 Subject: Most of the heuristic random move lookup structure --- Cargo.toml | 4 +++- src/engine/command.rs | 2 +- src/engine/constants.rs | 5 +++++ src/engine/geometry.rs | 6 ++++++ src/lib.rs | 4 ++++ src/strategy/monte_carlo.rs | 46 ++++++++++++++++++++++++++++++++------------- 6 files changed, 52 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ab624cb..6f19b1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,8 @@ rayon = "1.0.2" arrayvec = "0.4.7" +lazy_static = { version = "1.1.0", optional = true } + [dev-dependencies] proptest = "0.8.4" @@ -25,7 +27,7 @@ extended-time = [] energy-cutoff = [] discard-poor-performers = [] -heuristic-random = [] +heuristic-random = ["lazy_static"] default = ["energy-cutoff", "discard-poor-performers"] diff --git a/src/engine/command.rs b/src/engine/command.rs index 764e3cb..b34553f 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -42,7 +42,7 @@ pub enum BuildingType { } impl BuildingType { - pub fn all() -> [BuildingType; 4] { + pub fn all() -> [BuildingType; NUMBER_OF_BUILDING_TYPES] { use self::BuildingType::*; [Defence, Attack, Energy, Tesla] } diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 9ece36d..7d260e8 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -35,6 +35,11 @@ pub const DECONSTRUCT_ENERGY: u16 = 5; pub const MAX_CONCURRENT_CONSTRUCTION: usize = 6; //2 teslas, and 3 of anything else, 1 extra because it's push here then update construction times +pub const NUMBER_OF_BUILDING_TYPES: usize = 4; +pub const NUMBER_OF_MAP_POSITIONS: usize = SINGLE_MAP_WIDTH as usize * MAP_HEIGHT as usize; +pub const NUMBER_OF_POSSIBLE_MOVES: usize = NUMBER_OF_MAP_POSITIONS * NUMBER_OF_BUILDING_TYPES + 2; + + #[cfg(not(feature = "reduced-time"))] #[cfg(not(feature = "extended-time"))] pub const MAX_TIME_MILLIS: i64 = 1950; diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index 090652f..b9b556a 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -17,6 +17,12 @@ impl Point { } } + pub fn new_index(index: u8) -> Point { + Point { + index + } + } + pub fn new_double_bitfield(x: u8, y: u8, is_left_player: bool) -> (u64, u64) { let bitfield = Point::new(x, y).to_either_bitfield(); if (x >= SINGLE_MAP_WIDTH) == is_left_player { diff --git a/src/lib.rs b/src/lib.rs index de8b120..6cd8730 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,6 +11,10 @@ extern crate rayon; extern crate arrayvec; +#[macro_use] +#[cfg(feature = "heuristic-random")] +extern crate lazy_static; + pub mod input; pub mod engine; pub mod strategy; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 2489c8a..952e2b1 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -168,18 +168,38 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } } -// TODO -// 1. Have a (static) array of all moves. Even invalid ones. ALL -// 2. Create a new CDF array, same size. -// 3. Loop moves -// 3.1. Compute PDF for move. Invalid moves are 0. -// 3.2. Add to last CDF value and stick in array -// 4. Generate random number uniformly, 0 to CDF max -// 5. Binary search to find random number in CDF array. Min index where CDF[index] > random -// 6. Lookup move in static array #[cfg(feature = "heuristic-random")] fn random_move(player: &Player, rng: &mut R) -> Command { - Command::Nothing + lazy_static! { + static ref MOVES: Vec = { + let mut m = Vec::with_capacity(NUMBER_OF_POSSIBLE_MOVES); + m.push(Command::IronCurtain); + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + for b in [BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla].iter() { + m.push(Command::Build(point, *b)); + } + } + m + }; + } + + let mut cdf = Vec::with_capacity(NUMBER_OF_POSSIBLE_MOVES); + let mut cumulative_distribution: u32 = 0; + for m in MOVES.iter() { + // TODO: Heuristic here. Invalid moves are 0. Higher is more likely. + let weight = 1; + + cumulative_distribution += weight; + cdf.push(cumulative_distribution); + } + + let choice = rng.gen_range(0, cumulative_distribution); + + // TODO: Binary search here. Find choice in cdf. + let index = 0; + + MOVES[index].clone() } #[cfg(not(feature = "heuristic-random"))] @@ -268,7 +288,7 @@ impl CommandScore { .map(|i| state.player.location_of_unoccupied_cell(i)); let energy_generated = state.player.energy_generated(); - let mut all_buildings: ArrayVec<[BuildingType; 4]> = ArrayVec::new(); + let mut all_buildings: ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> = ArrayVec::new(); if DEFENCE_PRICE <= state.player.energy { all_buildings.push(BuildingType::Defence); } @@ -306,7 +326,7 @@ impl fmt::Display for CommandScore { } #[cfg(not(feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType;4]> { +fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { let mut result = ArrayVec::new(); if !open_building_spot { return result; @@ -329,7 +349,7 @@ fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[Bu } #[cfg(feature = "energy-cutoff")] -fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType;4]> { +fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { let mut result = ArrayVec::new(); if !open_building_spot { return result; -- cgit v1.2.3 From 7919b5aa7a79b98348d3645bff8b0987e9ea549a Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 1 Sep 2018 11:12:38 +0200 Subject: Removed TODO on thinking about energy cutoffs --- src/strategy/monte_carlo.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 952e2b1..51dcb43 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -18,9 +18,8 @@ use time::{Duration, PreciseTime}; #[cfg(not(feature = "single-threaded"))] use rayon::prelude::*; -//TODO Rethink / adjust these? #[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 50; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 100; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 120; pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { let mut command_scores = CommandScore::init_command_scores(state); -- cgit v1.2.3 From 10eb17a8b415800531e70bd231a0f0b06564b0aa Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 1 Sep 2018 12:05:05 +0200 Subject: Semifunctional heuristic search It's slow. Very very slow. --- src/strategy/monte_carlo.rs | 82 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 11 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 51dcb43..af22cd7 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -147,13 +147,13 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } let player_command = if first_move_made { - random_move(&state_mut.player, rng) + random_move(&state_mut.player, &state_mut, rng) } else { let do_nothing = command_score.command.cant_build_yet(state_mut.player.energy); first_move_made = !do_nothing; if do_nothing { Command::Nothing } else { command_score.command } }; - let opponent_command = random_move(&state_mut.opponent, rng); + let opponent_command = random_move(&state_mut.opponent, &state_mut, rng); status = state_mut.simulate(player_command, opponent_command); } @@ -168,14 +168,14 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } #[cfg(feature = "heuristic-random")] -fn random_move(player: &Player, rng: &mut R) -> Command { +fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) -> Command { lazy_static! { static ref MOVES: Vec = { let mut m = Vec::with_capacity(NUMBER_OF_POSSIBLE_MOVES); m.push(Command::IronCurtain); - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + for b in [BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla].iter() { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); - for b in [BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla].iter() { m.push(Command::Build(point, *b)); } } @@ -186,23 +186,83 @@ fn random_move(player: &Player, rng: &mut R) -> Command { let mut cdf = Vec::with_capacity(NUMBER_OF_POSSIBLE_MOVES); let mut cumulative_distribution: u32 = 0; for m in MOVES.iter() { - // TODO: Heuristic here. Invalid moves are 0. Higher is more likely. - let weight = 1; + let weight = match m { + Command::Nothing => { + 0 + }, + Command::Build(p, BuildingType::Energy) => { + if player.energy < ENERGY_PRICE || player.occupied & p.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + } + }, + Command::Build(p, BuildingType::Defence) => { + if player.energy < DEFENCE_PRICE || player.occupied & p.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + } + }, + Command::Build(p, BuildingType::Attack) => { + if player.energy < MISSILE_PRICE || player.occupied & p.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + } + }, + Command::Build(p, BuildingType::Tesla) => { + if player.has_max_teslas() || player.energy < TESLA_PRICE || player.occupied & p.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + } + }, + Command::IronCurtain => { + if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { + 20 + } else { + 0 + } + } + }; cumulative_distribution += weight; cdf.push(cumulative_distribution); } + if cumulative_distribution == 0 { + return Command::Nothing; + } let choice = rng.gen_range(0, cumulative_distribution); - // TODO: Binary search here. Find choice in cdf. - let index = 0; - + // find maximum index where choice <= cdf[index] + let index = cdf.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"); + + /* + let mut min_index = 0; + let mut max_index = cdf.len(); + + while max_index - min_index > 1 { + let mid = (min_index + max_index) / 2; + if cdf[mid] > choice { + max_index = mid+1; + } else { + min_index = mid; + } + } + let index = min_index; + */ + MOVES[index].clone() } #[cfg(not(feature = "heuristic-random"))] -fn random_move(player: &Player, rng: &mut R) -> Command { +fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) -> Command { let free_positions_count = player.unoccupied_cell_count(); let open_building_spot = free_positions_count > 0; -- cgit v1.2.3 From 90aa5bbecfaac59d2e58577a7015aad14ebd57a9 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 1 Sep 2018 12:37:23 +0200 Subject: Optimized creation of heuristic weighting It's still 4 times slower, but it's probably decent to start filling in a heuristic. --- src/strategy/monte_carlo.rs | 142 ++++++++++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 52 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index af22cd7..4ebe90c 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -170,70 +170,108 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis #[cfg(feature = "heuristic-random")] fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) -> Command { lazy_static! { - static ref MOVES: Vec = { - let mut m = Vec::with_capacity(NUMBER_OF_POSSIBLE_MOVES); - m.push(Command::IronCurtain); + static ref MOVES: [Command; NUMBER_OF_POSSIBLE_MOVES] = { + let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; + m[1] = Command::IronCurtain; + let mut i = 2; for b in [BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla].iter() { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); - m.push(Command::Build(point, *b)); + m[i] = Command::Build(point, *b); + i += 1; } } m }; } - - let mut cdf = Vec::with_capacity(NUMBER_OF_POSSIBLE_MOVES); + + let mut cdf = [0; NUMBER_OF_POSSIBLE_MOVES]; let mut cumulative_distribution: u32 = 0; - for m in MOVES.iter() { - let weight = match m { - Command::Nothing => { - 0 - }, - Command::Build(p, BuildingType::Energy) => { - if player.energy < ENERGY_PRICE || player.occupied & p.to_either_bitfield() != 0 { - 0 - } else { - //TODO: This needs to be more complex - 1 - } - }, - Command::Build(p, BuildingType::Defence) => { - if player.energy < DEFENCE_PRICE || player.occupied & p.to_either_bitfield() != 0 { - 0 - } else { - //TODO: This needs to be more complex - 1 - } - }, - Command::Build(p, BuildingType::Attack) => { - if player.energy < MISSILE_PRICE || player.occupied & p.to_either_bitfield() != 0 { - 0 - } else { - //TODO: This needs to be more complex - 1 - } - }, - Command::Build(p, BuildingType::Tesla) => { - if player.has_max_teslas() || player.energy < TESLA_PRICE || player.occupied & p.to_either_bitfield() != 0 { - 0 - } else { - //TODO: This needs to be more complex - 1 - } - }, - Command::IronCurtain => { - if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { - 20 - } else { - 0 - } - } + let mut i = 0; + + // Nothing + { + let weight = 0; + cumulative_distribution += weight; + cdf[i] = cumulative_distribution; + i += 1; + } + + // Iron Curtain + { + let weight = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { + 20 + } else { + 0 }; - cumulative_distribution += weight; - cdf.push(cumulative_distribution); + cdf[i] = cumulative_distribution; + i += 1; + } + + // Energy + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.energy < ENERGY_PRICE || player.occupied & point.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + }; + + cumulative_distribution += weight; + cdf[i] = cumulative_distribution; + i += 1; } + + // Defence + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.energy < DEFENCE_PRICE || player.occupied & point.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + }; + + cumulative_distribution += weight; + cdf[i] = cumulative_distribution; + i += 1; + } + + // Attack + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.energy < MISSILE_PRICE || player.occupied & point.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + }; + + cumulative_distribution += weight; + cdf[i] = cumulative_distribution; + i += 1; + } + + // Tesla + let cant_tesla = player.has_max_teslas() || player.energy < TESLA_PRICE; + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if cant_tesla || player.occupied & point.to_either_bitfield() != 0 { + 0 + } else { + //TODO: This needs to be more complex + 1 + }; + + cumulative_distribution += weight; + cdf[i] = cumulative_distribution; + i += 1; + } + + assert_eq!(MOVES.len(), i); + if cumulative_distribution == 0 { return Command::Nothing; } -- cgit v1.2.3 From 95ab438eb33e67c47fb9371f3294e44dcc9e163e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 1 Sep 2018 14:41:02 +0200 Subject: Improved perf by breaking strong ordering dependency in indexes --- src/strategy/monte_carlo.rs | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 4ebe90c..1293e94 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -147,13 +147,13 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } let player_command = if first_move_made { - random_move(&state_mut.player, &state_mut, rng) + random_move(&state_mut.player, &state_mut.opponent, rng) } else { let do_nothing = command_score.command.cant_build_yet(state_mut.player.energy); first_move_made = !do_nothing; if do_nothing { Command::Nothing } else { command_score.command } }; - let opponent_command = random_move(&state_mut.opponent, &state_mut, rng); + let opponent_command = random_move(&state_mut.opponent, &state_mut.player, rng); status = state_mut.simulate(player_command, opponent_command); } @@ -168,7 +168,7 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } #[cfg(feature = "heuristic-random")] -fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) -> Command { +fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { lazy_static! { static ref MOVES: [Command; NUMBER_OF_POSSIBLE_MOVES] = { let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; @@ -187,14 +187,12 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) let mut cdf = [0; NUMBER_OF_POSSIBLE_MOVES]; let mut cumulative_distribution: u32 = 0; - let mut i = 0; // Nothing { let weight = 0; cumulative_distribution += weight; - cdf[i] = cumulative_distribution; - i += 1; + cdf[0] = cumulative_distribution; } // Iron Curtain @@ -205,12 +203,13 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) 0 }; cumulative_distribution += weight; - cdf[i] = cumulative_distribution; - i += 1; + cdf[1] = cumulative_distribution; } // Energy + let e_base = 2; for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let i = e_base + p as usize; let point = Point::new_index(p); let weight = if player.energy < ENERGY_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 @@ -221,11 +220,12 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) cumulative_distribution += weight; cdf[i] = cumulative_distribution; - i += 1; } // Defence + let d_base = e_base + NUMBER_OF_MAP_POSITIONS; for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let i = d_base + p as usize; let point = Point::new_index(p); let weight = if player.energy < DEFENCE_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 @@ -236,11 +236,12 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) cumulative_distribution += weight; cdf[i] = cumulative_distribution; - i += 1; } // Attack + let a_base = d_base + NUMBER_OF_MAP_POSITIONS; for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let i = a_base + p as usize; let point = Point::new_index(p); let weight = if player.energy < MISSILE_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 @@ -251,12 +252,13 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) cumulative_distribution += weight; cdf[i] = cumulative_distribution; - i += 1; } // Tesla + let t_base = a_base + NUMBER_OF_MAP_POSITIONS; let cant_tesla = player.has_max_teslas() || player.energy < TESLA_PRICE; for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let i = t_base + p as usize; let point = Point::new_index(p); let weight = if cant_tesla || player.occupied & point.to_either_bitfield() != 0 { 0 @@ -267,10 +269,9 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) cumulative_distribution += weight; cdf[i] = cumulative_distribution; - i += 1; } - assert_eq!(MOVES.len(), i); + assert_eq!(MOVES.len(), t_base + NUMBER_OF_MAP_POSITIONS); if cumulative_distribution == 0 { return Command::Nothing; @@ -300,7 +301,7 @@ fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) } #[cfg(not(feature = "heuristic-random"))] -fn random_move(player: &Player, _state: &BitwiseGameState, rng: &mut R) -> Command { +fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { let free_positions_count = player.unoccupied_cell_count(); let open_building_spot = free_positions_count > 0; -- cgit v1.2.3 From f7a7d40dede261bc29edf88e8a8d2bfb71c58513 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 1 Sep 2018 20:27:57 +0200 Subject: Added basic heuristic --- src/engine/bitwise_engine.rs | 14 ++++++++++++++ src/strategy/monte_carlo.rs | 39 +++++++++++++-------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index d54ccc0..75acb7d 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -436,4 +436,18 @@ impl Player { } self.firing_tower = (self.firing_tower + 1) % MISSILE_COOLDOWN_STATES; } + + fn any_missile_towers(&self) -> u64 { + self.missile_towers.iter().fold(0, |acc, next| acc | next) + } + + pub fn count_attack_towers_in_row(&self, y: u8) -> u32 { + let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + (self.any_missile_towers() & mask).count_ones() + } + + pub fn count_energy_towers_in_row(&self, y: u8) -> u32 { + let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + (self.energy_towers & mask).count_ones() + } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 1293e94..1e4483b 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -168,7 +168,7 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } #[cfg(feature = "heuristic-random")] -fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { +fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Command { lazy_static! { static ref MOVES: [Command; NUMBER_OF_POSSIBLE_MOVES] = { let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; @@ -208,13 +208,16 @@ fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Comm // Energy let e_base = 2; + let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || + player.energy <= ENERGY_STORAGE_CUTOFF; for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let i = e_base + p as usize; let point = Point::new_index(p); - let weight = if player.energy < ENERGY_PRICE || player.occupied & point.to_either_bitfield() != 0 { + let weight = if !needs_energy || player.energy < ENERGY_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 + } else if point.x() < 2 { + 2 } else { - //TODO: This needs to be more complex 1 }; @@ -230,8 +233,8 @@ fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Comm let weight = if player.energy < DEFENCE_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 } else { - //TODO: This needs to be more complex - 1 + //TODO: Favour the front and rows with something to defend + opponent.count_attack_towers_in_row(point.y()) }; cumulative_distribution += weight; @@ -246,8 +249,7 @@ fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Comm let weight = if player.energy < MISSILE_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 } else { - //TODO: This needs to be more complex - 1 + 8 + opponent.count_energy_towers_in_row(point.y()) - opponent.count_attack_towers_in_row(point.y()) }; cumulative_distribution += weight; @@ -260,11 +262,10 @@ fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Comm for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let i = t_base + p as usize; let point = Point::new_index(p); - let weight = if cant_tesla || player.occupied & point.to_either_bitfield() != 0 { + let weight = if cant_tesla || (player.occupied & point.to_either_bitfield() != 0) || point.y() < 7 { 0 } else { - //TODO: This needs to be more complex - 1 + 2 }; cumulative_distribution += weight; @@ -280,23 +281,9 @@ fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Comm let choice = rng.gen_range(0, cumulative_distribution); // find maximum index where choice <= cdf[index] + // TODO can this be a more efficient lookup? let index = cdf.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"); - - /* - let mut min_index = 0; - let mut max_index = cdf.len(); - - while max_index - min_index > 1 { - let mid = (min_index + max_index) / 2; - if cdf[mid] > choice { - max_index = mid+1; - } else { - min_index = mid; - } - } - let index = min_index; - */ - + MOVES[index].clone() } -- cgit v1.2.3 From dafb9cf03cc5e8ad0a2b2d1857bb635d237f47b0 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 1 Sep 2018 22:01:28 +0200 Subject: Corrected which player's attack towers to consider --- src/engine/bitwise_engine.rs | 10 ++++++++++ src/strategy/monte_carlo.rs | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 75acb7d..c82e268 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -450,4 +450,14 @@ impl Player { let mask = 255u64 << (y * SINGLE_MAP_WIDTH); (self.energy_towers & mask).count_ones() } + + pub fn count_healthy_defence_in_row(&self, y: u8) -> u32 { + let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + (self.buildings[1] & mask).count_ones() + } + + pub fn count_towers_in_row(&self, y: u8) -> u32 { + let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + (self.occupied & mask).count_ones() + } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 1e4483b..347af96 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -249,7 +249,8 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let weight = if player.energy < MISSILE_PRICE || player.occupied & point.to_either_bitfield() != 0 { 0 } else { - 8 + opponent.count_energy_towers_in_row(point.y()) - opponent.count_attack_towers_in_row(point.y()) + // TODO: take into account opponent attacks and defence in row? + 8 + opponent.count_energy_towers_in_row(point.y()) - player.count_attack_towers_in_row(point.y()) }; cumulative_distribution += weight; @@ -272,7 +273,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma cdf[i] = cumulative_distribution; } - assert_eq!(MOVES.len(), t_base + NUMBER_OF_MAP_POSITIONS); + debug_assert_eq!(MOVES.len(), t_base + NUMBER_OF_MAP_POSITIONS); if cumulative_distribution == 0 { return Command::Nothing; @@ -280,7 +281,6 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let choice = rng.gen_range(0, cumulative_distribution); - // find maximum index where choice <= cdf[index] // TODO can this be a more efficient lookup? let index = cdf.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"); -- cgit v1.2.3 From c405ac9bd5b6e34fca1d743949992b605a15d13e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 09:29:14 +0200 Subject: Clippy suggested improvements --- src/engine/command.rs | 4 ++-- src/engine/geometry.rs | 6 +++--- src/input/json.rs | 2 +- src/strategy/monte_carlo.rs | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/engine/command.rs b/src/engine/command.rs index b34553f..76cfaee 100644 --- a/src/engine/command.rs +++ b/src/engine/command.rs @@ -20,7 +20,7 @@ impl fmt::Display for Command { } impl Command { - pub fn cant_build_yet(&self, energy: u16) -> bool { + pub fn cant_build_yet(self, energy: u16) -> bool { use self::Command::*; match self { @@ -52,7 +52,7 @@ impl BuildingType { if id <= 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } } - pub fn cant_build_yet(&self, energy: u16) -> bool { + pub fn cant_build_yet(self, energy: u16) -> bool { use self::BuildingType::*; let required = match self { diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index b9b556a..b8b38dd 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -32,11 +32,11 @@ impl Point { } } - pub fn x(&self) -> u8 { + pub fn x(self) -> u8 { self.index % SINGLE_MAP_WIDTH } - pub fn y(&self) -> u8 { + pub fn y(self) -> u8 { self.index / SINGLE_MAP_WIDTH } } @@ -51,7 +51,7 @@ impl Point { * This involves mirroring the x dimension for the opponent's side */ - pub fn to_either_bitfield(&self) -> u64 { + pub fn to_either_bitfield(self) -> u64 { 1u64 << self.index } } diff --git a/src/input/json.rs b/src/input/json.rs index 843f228..4e10f9a 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -127,7 +127,7 @@ impl State { &mut opponent }; - for mut tier in bitwise_buildings.missiles.iter_mut() { + for mut tier in &mut bitwise_buildings.missiles { let setting = (!tier.0 & left, !tier.1 & right); tier.0 |= setting.0; tier.1 |= setting.1; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 347af96..0587e31 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -58,11 +58,11 @@ pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: println!("NOTHING"); println!("{}", command_scores.iter().find(|c| c.command == Command::Nothing).map(|s| s.win_ratio()).unwrap_or(0)); - println!(""); + println!(); println!("IRON CURTAIN"); println!("{}", command_scores.iter().find(|c| c.command == Command::IronCurtain).map(|s| s.win_ratio()).unwrap_or(0)); - println!(""); + println!(); } command @@ -83,7 +83,7 @@ fn debug_print_choices Option<(Point, i32)>>(label: & } println!(" |"); } - println!(""); + println!(); } #[cfg(not(feature = "discard-poor-performers"))] @@ -174,7 +174,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; m[1] = Command::IronCurtain; let mut i = 2; - for b in [BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla].iter() { + for b in &[BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla] { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); m[i] = Command::Build(point, *b); @@ -284,7 +284,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma // TODO can this be a more efficient lookup? let index = cdf.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"); - MOVES[index].clone() + MOVES[index] } #[cfg(not(feature = "heuristic-random"))] -- cgit v1.2.3 From a737142562c57a53a54bed76ef4d37794c79f44d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 16:52:41 +0200 Subject: A bit more performance tweaking on CDF. Broke into smaller more cache friendly arrays. --- src/strategy/monte_carlo.rs | 140 ++++++++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 62 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 0587e31..0acaaae 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -185,95 +185,104 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma }; } - let mut cdf = [0; NUMBER_OF_POSSIBLE_MOVES]; - let mut cumulative_distribution: u32 = 0; + let mut cdf_other = [0; 2]; + let mut cdf_energy = [0; NUMBER_OF_MAP_POSITIONS]; + let mut cdf_defence = [0; NUMBER_OF_MAP_POSITIONS]; + let mut cdf_attack = [0; NUMBER_OF_MAP_POSITIONS]; + let mut cdf_tesla = [0; NUMBER_OF_MAP_POSITIONS]; + + let mut other_end: u32 = 0; // Nothing { - let weight = 0; - cumulative_distribution += weight; - cdf[0] = cumulative_distribution; + let weight = 1; + other_end += weight; + cdf_other[0] = other_end; } // Iron Curtain { let weight = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { - 20 + 30 } else { 0 }; - cumulative_distribution += weight; - cdf[1] = cumulative_distribution; + other_end += weight; + cdf_other[1] = other_end; } // Energy - let e_base = 2; + let mut energy_end: u32 = other_end; let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let i = e_base + p as usize; - let point = Point::new_index(p); - let weight = if !needs_energy || player.energy < ENERGY_PRICE || player.occupied & point.to_either_bitfield() != 0 { - 0 - } else if point.x() < 2 { - 2 - } else { - 1 - }; - - cumulative_distribution += weight; - cdf[i] = cumulative_distribution; + if needs_energy && player.energy >= ENERGY_PRICE { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.occupied & point.to_either_bitfield() != 0 { + 0 + } else if point.x() < 2 { + 2 + } else { + 1 + }; + + energy_end += weight; + cdf_energy[p as usize] = energy_end; + } } // Defence - let d_base = e_base + NUMBER_OF_MAP_POSITIONS; - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let i = d_base + p as usize; - let point = Point::new_index(p); - let weight = if player.energy < DEFENCE_PRICE || player.occupied & point.to_either_bitfield() != 0 { - 0 - } else { - //TODO: Favour the front and rows with something to defend - opponent.count_attack_towers_in_row(point.y()) - }; - - cumulative_distribution += weight; - cdf[i] = cumulative_distribution; + let mut defence_end: u32 = energy_end; + if player.energy >= DEFENCE_PRICE { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.occupied & point.to_either_bitfield() != 0 { + 0 + } else { + //TODO: Favour the front and rows with something to defend + opponent.count_attack_towers_in_row(point.y()) + }; + + defence_end += weight; + cdf_defence[p as usize] = defence_end; + } } // Attack - let a_base = d_base + NUMBER_OF_MAP_POSITIONS; - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let i = a_base + p as usize; - let point = Point::new_index(p); - let weight = if player.energy < MISSILE_PRICE || player.occupied & point.to_either_bitfield() != 0 { - 0 - } else { - // TODO: take into account opponent attacks and defence in row? - 8 + opponent.count_energy_towers_in_row(point.y()) - player.count_attack_towers_in_row(point.y()) - }; - - cumulative_distribution += weight; - cdf[i] = cumulative_distribution; + let mut attack_end: u32 = defence_end; + if player.energy >= MISSILE_PRICE { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.occupied & point.to_either_bitfield() != 0 { + 0 + } else { + // TODO: take into account opponent attacks and defence in row? + 8 + opponent.count_energy_towers_in_row(point.y()) - player.count_attack_towers_in_row(point.y()) + }; + + attack_end += weight; + cdf_attack[p as usize] = attack_end; + } } // Tesla - let t_base = a_base + NUMBER_OF_MAP_POSITIONS; + let mut tesla_end: u32 = attack_end; let cant_tesla = player.has_max_teslas() || player.energy < TESLA_PRICE; - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let i = t_base + p as usize; - let point = Point::new_index(p); - let weight = if cant_tesla || (player.occupied & point.to_either_bitfield() != 0) || point.y() < 7 { - 0 - } else { - 2 - }; - - cumulative_distribution += weight; - cdf[i] = cumulative_distribution; + if !cant_tesla { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if (player.occupied & point.to_either_bitfield() != 0) || point.y() < 7 { + 0 + } else { + 2 + }; + + tesla_end += weight; + cdf_tesla[p as usize] = tesla_end; + } } - debug_assert_eq!(MOVES.len(), t_base + NUMBER_OF_MAP_POSITIONS); + let cumulative_distribution = tesla_end; if cumulative_distribution == 0 { return Command::Nothing; @@ -282,7 +291,14 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let choice = rng.gen_range(0, cumulative_distribution); // TODO can this be a more efficient lookup? - let index = cdf.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"); + + let index = match choice { + c if c < other_end => cdf_other.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + c if c < energy_end => 2 + cdf_energy.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + c if c < defence_end => 2 + NUMBER_OF_MAP_POSITIONS + cdf_defence.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + c if c < attack_end => 2 + 2 * NUMBER_OF_MAP_POSITIONS + cdf_attack.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + _ => 2 + 3 * NUMBER_OF_MAP_POSITIONS + cdf_tesla.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + }; MOVES[index] } -- cgit v1.2.3 From 4c8b8667cbd0d16f6da056c1404a841196654e9b Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 16:55:59 +0200 Subject: Decreased size of big CDF arrays --- src/engine/bitwise_engine.rs | 16 ++++++++-------- src/strategy/monte_carlo.rs | 12 +++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index c82e268..afd4bcc 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -441,23 +441,23 @@ impl Player { self.missile_towers.iter().fold(0, |acc, next| acc | next) } - pub fn count_attack_towers_in_row(&self, y: u8) -> u32 { + pub fn count_attack_towers_in_row(&self, y: u8) -> u16 { let mask = 255u64 << (y * SINGLE_MAP_WIDTH); - (self.any_missile_towers() & mask).count_ones() + (self.any_missile_towers() & mask).count_ones() as u16 } - pub fn count_energy_towers_in_row(&self, y: u8) -> u32 { + pub fn count_energy_towers_in_row(&self, y: u8) -> u16 { let mask = 255u64 << (y * SINGLE_MAP_WIDTH); - (self.energy_towers & mask).count_ones() + (self.energy_towers & mask).count_ones() as u16 } - pub fn count_healthy_defence_in_row(&self, y: u8) -> u32 { + pub fn count_healthy_defence_in_row(&self, y: u8) -> u16 { let mask = 255u64 << (y * SINGLE_MAP_WIDTH); - (self.buildings[1] & mask).count_ones() + (self.buildings[1] & mask).count_ones() as u16 } - pub fn count_towers_in_row(&self, y: u8) -> u32 { + pub fn count_towers_in_row(&self, y: u8) -> u16 { let mask = 255u64 << (y * SINGLE_MAP_WIDTH); - (self.occupied & mask).count_ones() + (self.occupied & mask).count_ones() as u16 } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 0acaaae..1a4c400 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -192,7 +192,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let mut cdf_tesla = [0; NUMBER_OF_MAP_POSITIONS]; - let mut other_end: u32 = 0; + let mut other_end: u16 = 0; // Nothing { let weight = 1; @@ -212,7 +212,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma } // Energy - let mut energy_end: u32 = other_end; + let mut energy_end: u16 = other_end; let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || player.energy <= ENERGY_STORAGE_CUTOFF; if needs_energy && player.energy >= ENERGY_PRICE { @@ -232,7 +232,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma } // Defence - let mut defence_end: u32 = energy_end; + let mut defence_end: u16 = energy_end; if player.energy >= DEFENCE_PRICE { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); @@ -249,7 +249,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma } // Attack - let mut attack_end: u32 = defence_end; + let mut attack_end: u16 = defence_end; if player.energy >= MISSILE_PRICE { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); @@ -266,7 +266,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma } // Tesla - let mut tesla_end: u32 = attack_end; + let mut tesla_end: u16 = attack_end; let cant_tesla = player.has_max_teslas() || player.energy < TESLA_PRICE; if !cant_tesla { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { @@ -290,8 +290,6 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let choice = rng.gen_range(0, cumulative_distribution); - // TODO can this be a more efficient lookup? - let index = match choice { c if c < other_end => cdf_other.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), c if c < energy_end => 2 + cdf_energy.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), -- cgit v1.2.3 From b78eae28a11edefb27599d16307f248b52f74b6d Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 20:48:15 +0200 Subject: Made it possible to build iron curtains as they become available --- src/engine/bitwise_engine.rs | 5 +++++ src/strategy/monte_carlo.rs | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index afd4bcc..35b574e 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -336,6 +336,11 @@ impl Player { self.iron_curtain_available && self.iron_curtain_remaining == 0 } + pub fn can_build_iron_curtain_in(&self, round: u16, moves: u8) -> bool { + let unlocks = round % IRON_CURTAIN_UNLOCK_INTERVAL > round + u16::from(moves) % IRON_CURTAIN_UNLOCK_INTERVAL; + (self.iron_curtain_available || unlocks) && self.iron_curtain_remaining.saturating_sub(moves) == 0 + } + pub fn unoccupied_cell_count(&self) -> usize { self.occupied.count_zeros() as usize } pub fn location_of_unoccupied_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.occupied, i as u64); diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 1a4c400..f6b8956 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -257,7 +257,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma 0 } else { // TODO: take into account opponent attacks and defence in row? - 8 + opponent.count_energy_towers_in_row(point.y()) - player.count_attack_towers_in_row(point.y()) + 8 + opponent.count_energy_towers_in_row(point.y()) + opponent.count_towers_in_row(point.y()) - player.count_attack_towers_in_row(point.y()) }; attack_end += weight; @@ -402,9 +402,11 @@ impl CommandScore { } let building_command_count = unoccupied_cells.len()*all_buildings.len(); - + let mut commands = Vec::with_capacity(building_command_count + 1); - if state.player.can_build_iron_curtain() && IRON_CURTAIN_PRICE.saturating_sub(state.player.energy) / energy_generated < 4 { + let time_to_curtain_energy = (IRON_CURTAIN_PRICE.saturating_sub(state.player.energy) / energy_generated) as u8; + + if time_to_curtain_energy < 4 && state.player.can_build_iron_curtain_in(state.round, time_to_curtain_energy) { commands.push(CommandScore::new(Command::IronCurtain, state.player.energy < IRON_CURTAIN_PRICE)); } -- cgit v1.2.3 From 20fa684dab660ad6cd9b9dbf2c6fa632f6971755 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 21:26:51 +0200 Subject: Simplified energy random chance --- src/strategy/monte_carlo.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index f6b8956..be53ef1 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -220,10 +220,8 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let point = Point::new_index(p); let weight = if player.occupied & point.to_either_bitfield() != 0 { 0 - } else if point.x() < 2 { - 2 } else { - 1 + 2 }; energy_end += weight; -- cgit v1.2.3 From 1cb761aefe4d7b33a02c76803d19f48e7929d52c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 21:38:56 +0200 Subject: Improvement from precomputing row masks --- src/engine/bitwise_engine.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index 35b574e..b9f08e3 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -8,6 +8,17 @@ use arrayvec::ArrayVec; const LEFT_COL_MASK: u64 = 0x0101_0101_0101_0101; const RIGHT_COL_MASK: u64 = 0x8080_8080_8080_8080; +const ROW_MASKS: [u64; MAP_HEIGHT as usize] = [ + 0x0000_0000_0000_00ff, + 0x0000_0000_0000_ff00, + 0x0000_0000_00ff_0000, + 0x0000_0000_ff00_0000, + 0x0000_00ff_0000_0000, + 0x0000_ff00_0000_0000, + 0x00ff_0000_0000_0000, + 0xff00_0000_0000_0000, +]; + #[derive(Debug, Clone, PartialEq, Eq)] pub struct BitwiseGameState { pub status: GameStatus, @@ -222,7 +233,7 @@ impl BitwiseGameState { let missed_cells = (u32::from(SINGLE_MAP_WIDTH - x)).saturating_sub(2); let top_row = y.saturating_sub(1); - let top_row_mask = 255u64 << (top_row * SINGLE_MAP_WIDTH); + let top_row_mask = ROW_MASKS[top_row as usize]; let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; let mut hits = 0; @@ -447,22 +458,22 @@ impl Player { } pub fn count_attack_towers_in_row(&self, y: u8) -> u16 { - let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + let mask = ROW_MASKS[y as usize]; (self.any_missile_towers() & mask).count_ones() as u16 } pub fn count_energy_towers_in_row(&self, y: u8) -> u16 { - let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + let mask = ROW_MASKS[y as usize]; (self.energy_towers & mask).count_ones() as u16 } pub fn count_healthy_defence_in_row(&self, y: u8) -> u16 { - let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + let mask = ROW_MASKS[y as usize]; (self.buildings[1] & mask).count_ones() as u16 } pub fn count_towers_in_row(&self, y: u8) -> u16 { - let mask = 255u64 << (y * SINGLE_MAP_WIDTH); + let mask = ROW_MASKS[y as usize]; (self.occupied & mask).count_ones() as u16 } } -- cgit v1.2.3 From e7e948d8861661880d2d283954288d9dba25014f Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 2 Sep 2018 21:52:14 +0200 Subject: Improved performance of heuristic calcs by caching common calcs --- Cargo.toml | 2 +- src/strategy/monte_carlo.rs | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6f19b1c..e502dd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ energy-cutoff = [] discard-poor-performers = [] heuristic-random = ["lazy_static"] -default = ["energy-cutoff", "discard-poor-performers"] +default = ["energy-cutoff", "discard-poor-performers", "heuristic-random", "debug-decisions"] [profile.release] debug = true \ No newline at end of file diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index be53ef1..6180fce 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -190,6 +190,17 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let mut cdf_defence = [0; NUMBER_OF_MAP_POSITIONS]; let mut cdf_attack = [0; NUMBER_OF_MAP_POSITIONS]; let mut cdf_tesla = [0; NUMBER_OF_MAP_POSITIONS]; + + let mut opponent_energy_per_row = [0; MAP_HEIGHT as usize]; + let mut opponent_attack_per_row = [0; MAP_HEIGHT as usize]; + let mut opponent_towers_per_row = [0; MAP_HEIGHT as usize]; + let mut player_attack_per_row = [0; MAP_HEIGHT as usize]; + for y in 0..MAP_HEIGHT { + opponent_energy_per_row[y as usize] = opponent.count_energy_towers_in_row(y); + opponent_attack_per_row[y as usize] = opponent.count_attack_towers_in_row(y); + opponent_towers_per_row[y as usize] = opponent.count_towers_in_row(y); + player_attack_per_row[y as usize] = player.count_attack_towers_in_row(y); + } let mut other_end: u16 = 0; @@ -238,7 +249,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma 0 } else { //TODO: Favour the front and rows with something to defend - opponent.count_attack_towers_in_row(point.y()) + opponent_attack_per_row[usize::from(point.y())] }; defence_end += weight; @@ -255,7 +266,8 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma 0 } else { // TODO: take into account opponent attacks and defence in row? - 8 + opponent.count_energy_towers_in_row(point.y()) + opponent.count_towers_in_row(point.y()) - player.count_attack_towers_in_row(point.y()) + let y = usize::from(point.y()); + 8 + opponent_energy_per_row[y] + opponent_towers_per_row[y] - player_attack_per_row[y] }; attack_end += weight; -- cgit v1.2.3 From b249c261380323f429883e2364fed0060b2ffd54 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 5 Sep 2018 20:57:10 +0200 Subject: Added weighting of victory / defeat board positions --- src/engine/bitwise_engine.rs | 4 ++++ src/strategy/monte_carlo.rs | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index b9f08e3..f03f1c0 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -476,4 +476,8 @@ impl Player { let mask = ROW_MASKS[y as usize]; (self.occupied & mask).count_ones() as u16 } + + pub fn count_towers(&self) -> u32 { + self.occupied.count_ones() + } } diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 6180fce..7baba17 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -160,8 +160,8 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis let mut next_seed: [u8;16] = [0; 16]; rng.fill_bytes(&mut next_seed); match status { - GameStatus::PlayerWon => command_score.add_victory(next_seed), - GameStatus::OpponentWon => command_score.add_defeat(next_seed), + GameStatus::PlayerWon => command_score.add_victory(state_mut.player.count_towers() as i32 - state_mut.opponent.count_towers() as i32, next_seed), + GameStatus::OpponentWon => command_score.add_defeat(state_mut.opponent.count_towers() as i32 - state_mut.player.count_towers() as i32, next_seed), GameStatus::Continue => command_score.add_stalemate(next_seed), GameStatus::Draw => command_score.add_draw(next_seed) } @@ -342,7 +342,9 @@ fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Comm struct CommandScore { command: Command, starts_with_nothing: bool, + victory_score: i32, victories: u32, + defeat_score: i32, defeats: u32, draws: u32, stalemates: u32, @@ -354,7 +356,9 @@ impl CommandScore { fn new(command: Command, starts_with_nothing: bool) -> CommandScore { CommandScore { command, starts_with_nothing, + victory_score: 0, victories: 0, + defeat_score: 0, defeats: 0, draws: 0, stalemates: 0, @@ -363,13 +367,15 @@ impl CommandScore { } } - fn add_victory(&mut self, next_seed: [u8; 16]) { + fn add_victory(&mut self, weight: i32, next_seed: [u8; 16]) { + self.victory_score += weight; self.victories += 1; self.attempts += 1; self.next_seed = next_seed; } - fn add_defeat(&mut self, next_seed: [u8; 16]) { + fn add_defeat(&mut self, weight: i32, next_seed: [u8; 16]) { + self.defeat_score += weight; self.defeats += 1; self.attempts += 1; self.next_seed = next_seed; @@ -388,7 +394,7 @@ impl CommandScore { } fn win_ratio(&self) -> i32 { - (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) + (self.victory_score - self.defeat_score) * 10000 / (self.attempts as i32) } fn init_command_scores(state: &BitwiseGameState) -> Vec { -- cgit v1.2.3 From c4f3fb147d9610ed878e71755507f1888e4dc7eb Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 5 Sep 2018 21:00:00 +0200 Subject: Fixed config that hadn't been tested in a while --- src/strategy/monte_carlo.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 7baba17..8627a00 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -87,9 +87,9 @@ fn debug_print_choices Option<(Point, i32)>>(label: & } #[cfg(not(feature = "discard-poor-performers"))] -fn simulate_options_to_timeout(command_scores: &'a mut Vec, settings: &GameSettings, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { +fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { loop { - simulate_all_options_once(command_scores, settings, state); + simulate_all_options_once(command_scores, state); if start_time.to(PreciseTime::now()) > max_time { break; } -- cgit v1.2.3 From c4e873d0f9d8d427b1a24c6c465c22e90430fd10 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 5 Sep 2018 23:00:46 +0200 Subject: Tweaking weighting in heuristic search --- src/strategy/monte_carlo.rs | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 8627a00..dba735c 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -102,7 +102,7 @@ fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, st use std::cmp; let min_options = cmp::min(command_scores.len(), 5); - let maxes = [max_time / 4, max_time / 2, max_time * 3 / 4, max_time]; + let maxes = [max_time / 3, max_time * 2 / 3, max_time]; for (i, &max) in maxes.iter().enumerate() { let new_length = cmp::max(min_options, command_scores.len() / (2usize.pow(i as u32))); let active_scores = &mut command_scores[0..new_length]; @@ -194,11 +194,13 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let mut opponent_energy_per_row = [0; MAP_HEIGHT as usize]; let mut opponent_attack_per_row = [0; MAP_HEIGHT as usize]; let mut opponent_towers_per_row = [0; MAP_HEIGHT as usize]; + let mut player_energy_per_row = [0; MAP_HEIGHT as usize]; let mut player_attack_per_row = [0; MAP_HEIGHT as usize]; for y in 0..MAP_HEIGHT { opponent_energy_per_row[y as usize] = opponent.count_energy_towers_in_row(y); opponent_attack_per_row[y as usize] = opponent.count_attack_towers_in_row(y); opponent_towers_per_row[y as usize] = opponent.count_towers_in_row(y); + player_energy_per_row[y as usize] = player.count_energy_towers_in_row(y); player_attack_per_row[y as usize] = player.count_attack_towers_in_row(y); } @@ -206,7 +208,11 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let mut other_end: u16 = 0; // Nothing { - let weight = 1; + let weight = if player.can_build_iron_curtain() && player.energy < IRON_CURTAIN_PRICE { + 5 + } else { + 0 + }; other_end += weight; cdf_other[0] = other_end; } @@ -214,7 +220,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma // Iron Curtain { let weight = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { - 30 + 50 } else { 0 }; @@ -245,11 +251,12 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma if player.energy >= DEFENCE_PRICE { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); - let weight = if player.occupied & point.to_either_bitfield() != 0 { + let y = usize::from(point.y()); + + let weight = if player.occupied & point.to_either_bitfield() != 0 || point.x() < 4 || opponent_attack_per_row[y] == 0 { 0 } else { - //TODO: Favour the front and rows with something to defend - opponent_attack_per_row[usize::from(point.y())] + 5 }; defence_end += weight; @@ -265,7 +272,6 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let weight = if player.occupied & point.to_either_bitfield() != 0 { 0 } else { - // TODO: take into account opponent attacks and defence in row? let y = usize::from(point.y()); 8 + opponent_energy_per_row[y] + opponent_towers_per_row[y] - player_attack_per_row[y] }; @@ -284,7 +290,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma let weight = if (player.occupied & point.to_either_bitfield() != 0) || point.y() < 7 { 0 } else { - 2 + 10 }; tesla_end += weight; -- cgit v1.2.3 From 579c0407920093f286628fa983f2f622f8f9d021 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 5 Sep 2018 23:01:00 +0200 Subject: Data structures for proper monte carlo search --- src/strategy/mod.rs | 1 + src/strategy/monte_carlo_tree.rs | 97 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 src/strategy/monte_carlo_tree.rs diff --git a/src/strategy/mod.rs b/src/strategy/mod.rs index 5b6e779..ceb624b 100644 --- a/src/strategy/mod.rs +++ b/src/strategy/mod.rs @@ -1 +1,2 @@ pub mod monte_carlo; +pub mod monte_carlo_tree; diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs new file mode 100644 index 0000000..b168bcd --- /dev/null +++ b/src/strategy/monte_carlo_tree.rs @@ -0,0 +1,97 @@ +use engine::command::*; +use engine::status::GameStatus; +use engine::bitwise_engine::{Player, BitwiseGameState}; +use engine::constants::*; +use engine::geometry::*; + +use rand::{Rng, XorShiftRng, SeedableRng}; +use time::{Duration, PreciseTime}; + + +enum SearchTree { + Leaf(NodeStats), + FullyExploredNode(FullyExploredStats), + PartiallyExploredNode(PartiallyExploredStats) +} + +struct NodeStats { + wins: u32, + attempts: u32 +} + +struct FullyExploredStats { + wins: u32, + attempts: u32, + explored: Vec<(Command, SearchTree)> +} + +struct PartiallyExploredStats { + wins: u32, + attempts: u32, + explored: Vec<(Command, SearchTree)>, + unexplored: Vec +} + +impl SearchTree { + fn create_node(state: &Player) -> SearchTree { + SearchTree::PartiallyExploredNode(PartiallyExploredStats { + wins: 0, + attempts: 0, + explored: Vec::new(), + unexplored: Vec::new() //TODO + }) + } +} + +impl FullyExploredStats { + fn node_with_highest_ucb<'a>(&'a self) -> &'a (Command, SearchTree) { + //TODO + &self.explored[0] + } +} + +impl PartiallyExploredStats { + fn add_node(&mut self, command: Command) { + //TODO + } +} + + +pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { + use self::SearchTree::*; + + // create root node as partially explored node + // creating a new node needs to populate all (valid) unexplored moves + + let root = SearchTree::create_node(&state.player); + + loop { + //tree_search(&state, &mut root); + } + + Command::Nothing +} + +/* +fn tree_search(state: &BitwiseGameState, tree: &mut SearchTree) -> bool { + match tree { + Leaf(stats) => { + // ??? + false + }, + FullyExploredNode(stats) => { + let (next_command, next_tree) = stats.node_with_highest_ucb(); + tree_search(state, &mut next_tree) + // TODO: Swap players? + // TODO: Back-propagation? + }, + PartiallyExploredNode(stats) => { + // choose random command and add as partially explored node to the tree + // simulate to end with random commands + // back-propagate (remember to keep a stack of commands to that point node) + // convert to fully explored if applicable + } + } + +} +*/ -- cgit v1.2.3 From 4e6facda6a2907d3752721c747080ee016ff4076 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 5 Sep 2018 23:55:36 +0200 Subject: Filled in high level outline of monte carlo tree --- src/strategy/monte_carlo_tree.rs | 70 +++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs index b168bcd..62cc8e5 100644 --- a/src/strategy/monte_carlo_tree.rs +++ b/src/strategy/monte_carlo_tree.rs @@ -44,54 +44,86 @@ impl SearchTree { } impl FullyExploredStats { - fn node_with_highest_ucb<'a>(&'a self) -> &'a (Command, SearchTree) { + fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, SearchTree) { //TODO - &self.explored[0] + &mut self.explored[0] } } impl PartiallyExploredStats { - fn add_node(&mut self, command: Command) { - //TODO + fn add_node<'a>(&'a mut self, state: &Player, command: Command) -> &'a mut (Command, SearchTree) { + //TODO: Insert + let node = SearchTree::create_node(state); + self.explored.push((command, node)); + self.explored.last_mut().unwrap() } } - +use self::SearchTree::*; pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { - use self::SearchTree::*; + // create root node as partially explored node // creating a new node needs to populate all (valid) unexplored moves - let root = SearchTree::create_node(&state.player); + let mut root = SearchTree::create_node(&state.player); loop { - //tree_search(&state, &mut root); + // TODO: Break out! + tree_search(&state, &mut root); } Command::Nothing } -/* +// TODO: Max depth + fn tree_search(state: &BitwiseGameState, tree: &mut SearchTree) -> bool { match tree { Leaf(stats) => { // ??? false }, - FullyExploredNode(stats) => { + FullyExploredNode(ref mut stats) => { let (next_command, next_tree) = stats.node_with_highest_ucb(); - tree_search(state, &mut next_tree) - // TODO: Swap players? + tree_search_opponent(state, next_tree, next_command.clone()) // TODO: Back-propagation? }, - PartiallyExploredNode(stats) => { - // choose random command and add as partially explored node to the tree - // simulate to end with random commands - // back-propagate (remember to keep a stack of commands to that point node) - // convert to fully explored if applicable + PartiallyExploredNode(ref mut stats) => { + let next_command = stats.unexplored[0].clone(); // TODO: Random + let next_tree = stats.add_node(&state.opponent, next_command); + + // TODO: simulate to end + // TODO: Back-propagate + false + } + } +} + +fn tree_search_opponent(state: &BitwiseGameState, tree: &mut SearchTree, player_command: Command) -> bool { + match tree { + Leaf(stats) => { + // ??? + false + }, + FullyExploredNode(ref mut stats) => { + let (next_command, next_tree) = stats.node_with_highest_ucb(); + let mut next_state = state.clone(); + next_state.simulate(player_command, next_command.clone()); + tree_search(&next_state, next_tree) + // TODO: Back-propagation? + }, + PartiallyExploredNode(ref mut stats) => { + let next_command = stats.unexplored[0].clone(); // TODO: Random + + let mut next_state = state.clone(); + next_state.simulate(player_command, next_command.clone()); + + let next_tree = stats.add_node(&next_state.player, next_command); + + // TODO: simulate to end + // TODO: Back-propagate + false } } - } -*/ -- cgit v1.2.3 From 6c8d7fc3a3a00fcee50592ef618d2b88fed0dbfe Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 6 Sep 2018 08:39:48 +0200 Subject: Disabled detailed debugging --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e502dd6..c596887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ energy-cutoff = [] discard-poor-performers = [] heuristic-random = ["lazy_static"] -default = ["energy-cutoff", "discard-poor-performers", "heuristic-random", "debug-decisions"] +default = ["energy-cutoff", "discard-poor-performers", "heuristic-random"] [profile.release] debug = true \ No newline at end of file -- cgit v1.2.3 From 4ad0035f4f11b41e400a1f567fdcd3541fa3f21e Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 6 Sep 2018 21:20:04 +0200 Subject: Filled in the remaining TODOs on the tree search --- src/engine/constants.rs | 3 + src/engine/status.rs | 1 + src/main.rs | 3 +- src/strategy/monte_carlo.rs | 7 +- src/strategy/monte_carlo_tree.rs | 267 ++++++++++++++++++++++++++------------- 5 files changed, 188 insertions(+), 93 deletions(-) diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 7d260e8..951a756 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -2,6 +2,9 @@ pub const FULL_MAP_WIDTH: u8 = 16; pub const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; pub const MAP_HEIGHT: u8 = 8; +pub const MAX_MOVES: u16 = 400; +pub const INIT_SEED: [u8;16] = [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda]; + pub const MISSILE_COOLDOWN: usize = 3; pub const MISSILE_COOLDOWN_STATES: usize = MISSILE_COOLDOWN+1; pub const MISSILE_SPEED: usize = 2; diff --git a/src/engine/status.rs b/src/engine/status.rs index 1fa7ac0..d6ee4dd 100644 --- a/src/engine/status.rs +++ b/src/engine/status.rs @@ -5,3 +5,4 @@ pub enum GameStatus { OpponentWon, Draw } + diff --git a/src/main.rs b/src/main.rs index 45fd356..26d6eac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,6 @@ fn write_command(filename: &str, command: Command) -> Result<(), Box > { Ok(()) } - fn main() { let start_time = PreciseTime::now(); let max_time = Duration::milliseconds(MAX_TIME_MILLIS); @@ -34,6 +33,8 @@ fn main() { process::exit(1); } }; + + // TODO: Opening playbook? let command = strategy::monte_carlo::choose_move(&state, start_time, max_time); match write_command(COMMAND_PATH, command) { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index dba735c..56701f5 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -10,9 +10,6 @@ use rand::{Rng, XorShiftRng, SeedableRng}; use arrayvec::ArrayVec; -const MAX_MOVES: u16 = 400; -const INIT_SEED: [u8;16] = [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda]; - use time::{Duration, PreciseTime}; #[cfg(not(feature = "single-threaded"))] @@ -168,7 +165,7 @@ fn simulate_to_endstate(command_score: &mut CommandScore, state: &Bitwis } #[cfg(feature = "heuristic-random")] -fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Command { +pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Command { lazy_static! { static ref MOVES: [Command; NUMBER_OF_POSSIBLE_MOVES] = { let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; @@ -318,7 +315,7 @@ fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Comma } #[cfg(not(feature = "heuristic-random"))] -fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { +pub fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { let free_positions_count = player.unoccupied_cell_count(); let open_building_spot = free_positions_count > 0; diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs index 62cc8e5..4efded8 100644 --- a/src/strategy/monte_carlo_tree.rs +++ b/src/strategy/monte_carlo_tree.rs @@ -7,123 +7,216 @@ use engine::geometry::*; use rand::{Rng, XorShiftRng, SeedableRng}; use time::{Duration, PreciseTime}; +use strategy::monte_carlo; -enum SearchTree { - Leaf(NodeStats), - FullyExploredNode(FullyExploredStats), - PartiallyExploredNode(PartiallyExploredStats) -} +use arrayvec::ArrayVec; +#[derive(Debug)] struct NodeStats { - wins: u32, - attempts: u32 + wins: f32, + losses: f32, + attempts: f32, + explored: Vec<(Command, NodeStats)>, + unexplored: Vec } -struct FullyExploredStats { - wins: u32, - attempts: u32, - explored: Vec<(Command, SearchTree)> -} +impl NodeStats { + fn create_node(player: &Player) -> NodeStats { + let unoccupied_cells_count = player.unoccupied_cell_count(); + let unoccupied_cells = (0..unoccupied_cells_count) + .map(|i| player.location_of_unoccupied_cell(i)); -struct PartiallyExploredStats { - wins: u32, - attempts: u32, - explored: Vec<(Command, SearchTree)>, - unexplored: Vec -} + let mut all_buildings: ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> = ArrayVec::new(); + if DEFENCE_PRICE <= player.energy { + all_buildings.push(BuildingType::Defence); + } + if MISSILE_PRICE <= player.energy { + all_buildings.push(BuildingType::Attack); + } + if ENERGY_PRICE <= player.energy { + all_buildings.push(BuildingType::Energy); + } + if TESLA_PRICE <= player.energy && !player.has_max_teslas() { + all_buildings.push(BuildingType::Tesla); + } + + let building_command_count = unoccupied_cells.len()*all_buildings.len(); + + let mut commands = Vec::with_capacity(building_command_count + 2); + + commands.push(Command::Nothing); + if IRON_CURTAIN_PRICE <= player.energy && player.can_build_iron_curtain() { + commands.push(Command::IronCurtain); + } -impl SearchTree { - fn create_node(state: &Player) -> SearchTree { - SearchTree::PartiallyExploredNode(PartiallyExploredStats { - wins: 0, - attempts: 0, - explored: Vec::new(), - unexplored: Vec::new() //TODO - }) + for position in unoccupied_cells { + for &building in &all_buildings { + commands.push(Command::Build(position, building)); + } + } + + NodeStats { + wins: 0., + losses: 0., + attempts: 0., + explored: Vec::with_capacity(commands.len()), + unexplored: commands + } + } + + fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, NodeStats) { + debug_assert!(self.unexplored.is_empty()); + let total_attempts = self.explored.iter().map(|(_, n)| n.attempts).sum::(); + + let mut max_position = 0; + let mut max_value = self.explored[0].1.ucb(total_attempts); + for i in 1..self.explored.len() { + let value = self.explored[i].1.ucb(total_attempts); + if value > max_value { + max_position = i; + max_value = value; + } + } + &mut self.explored[max_position] } -} -impl FullyExploredStats { - fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, SearchTree) { - //TODO - &mut self.explored[0] + fn ucb(&self, n: f32) -> f32 { + self.wins / self.attempts + (2.0 * n / self.attempts).sqrt() } -} -impl PartiallyExploredStats { - fn add_node<'a>(&'a mut self, state: &Player, command: Command) -> &'a mut (Command, SearchTree) { - //TODO: Insert - let node = SearchTree::create_node(state); + fn add_node<'a>(&'a mut self, player: &Player, command: Command) -> &'a mut (Command, NodeStats) { + let node = NodeStats::create_node(player); self.explored.push((command, node)); + self.unexplored.retain(|c| *c != command); self.explored.last_mut().unwrap() } + + fn add_victory(&mut self) { + self.attempts += 1.; + self.wins += 1.; + } + fn add_defeat(&mut self) { + self.attempts += 1.; + self.losses += 1.; + } + fn add_draw(&mut self) { + self.attempts += 1.; + } } -use self::SearchTree::*; pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { + let mut rng = XorShiftRng::from_seed(INIT_SEED); - - // create root node as partially explored node - // creating a new node needs to populate all (valid) unexplored moves - - let mut root = SearchTree::create_node(&state.player); + let mut root = NodeStats::create_node(&state.player); - loop { - // TODO: Break out! - tree_search(&state, &mut root); + while start_time.to(PreciseTime::now()) < max_time { + tree_search(&state, &mut root, &mut rng); } - - Command::Nothing -} -// TODO: Max depth + let (command, _) = root.node_with_highest_ucb(); + command.clone() +} -fn tree_search(state: &BitwiseGameState, tree: &mut SearchTree) -> bool { - match tree { - Leaf(stats) => { - // ??? - false - }, - FullyExploredNode(ref mut stats) => { +fn tree_search(state: &BitwiseGameState, stats: &mut NodeStats, rng: &mut R) -> GameStatus { + // root is opponent move + // node being added is player move + + if state.round >= MAX_MOVES { + return GameStatus::Draw + } + + if stats.unexplored.is_empty() { + let result = { let (next_command, next_tree) = stats.node_with_highest_ucb(); - tree_search_opponent(state, next_tree, next_command.clone()) - // TODO: Back-propagation? - }, - PartiallyExploredNode(ref mut stats) => { - let next_command = stats.unexplored[0].clone(); // TODO: Random - let next_tree = stats.add_node(&state.opponent, next_command); - - // TODO: simulate to end - // TODO: Back-propagate - false - } + tree_search_opponent(state, next_tree, next_command.clone(), rng) + }; + match result { + GameStatus::PlayerWon => {stats.add_defeat()}, + GameStatus::OpponentWon => {stats.add_victory()}, + _ => {stats.add_draw()} + }; + result + } else { + let next_command = rng.choose(&stats.unexplored).expect("Partially explored had no options").clone(); + let result = { + let (_, next_stats) = stats.add_node(&state.opponent, next_command); + + let opponent_random = monte_carlo::random_move(&state.opponent, &state.player, rng); + let mut next_state = state.clone(); + next_state.simulate(next_command, opponent_random); + + let result = simulate_to_endstate(next_state, rng); + match result { + GameStatus::PlayerWon => {next_stats.add_victory()}, + GameStatus::OpponentWon => {next_stats.add_defeat()}, + _ => {next_stats.add_draw()} + }; + + result + }; + + match result { + GameStatus::PlayerWon => {stats.add_defeat()}, + GameStatus::OpponentWon => {stats.add_victory()}, + _ => {stats.add_draw()} + }; + result } } -fn tree_search_opponent(state: &BitwiseGameState, tree: &mut SearchTree, player_command: Command) -> bool { - match tree { - Leaf(stats) => { - // ??? - false - }, - FullyExploredNode(ref mut stats) => { +fn tree_search_opponent(state: &BitwiseGameState, stats: &mut NodeStats, player_command: Command, rng: &mut R) -> GameStatus { + // root is player move + // node being added is opponent move + + if stats.unexplored.is_empty() { + let result = { let (next_command, next_tree) = stats.node_with_highest_ucb(); let mut next_state = state.clone(); next_state.simulate(player_command, next_command.clone()); - tree_search(&next_state, next_tree) - // TODO: Back-propagation? - }, - PartiallyExploredNode(ref mut stats) => { - let next_command = stats.unexplored[0].clone(); // TODO: Random - - let mut next_state = state.clone(); - next_state.simulate(player_command, next_command.clone()); + tree_search(&next_state, next_tree, rng) + }; + match result { + GameStatus::PlayerWon => {stats.add_victory()}, + GameStatus::OpponentWon => {stats.add_defeat()}, + _ => {stats.add_draw()} + }; + result + } else { + let next_command = rng.choose(&stats.unexplored).expect("Partially explored had no options").clone(); + let mut next_state = state.clone(); + next_state.simulate(player_command, next_command); + + let result = { + let (_, next_stats) = stats.add_node(&next_state.player, next_command); + + let result = simulate_to_endstate(next_state, rng); + match result { + GameStatus::PlayerWon => {next_stats.add_defeat()}, + GameStatus::OpponentWon => {next_stats.add_victory()}, + _ => {next_stats.add_draw()} + }; - let next_tree = stats.add_node(&next_state.player, next_command); + result + }; + + match result { + GameStatus::PlayerWon => {stats.add_victory()}, + GameStatus::OpponentWon => {stats.add_defeat()}, + _ => {stats.add_draw()} + }; + result + } +} - // TODO: simulate to end - // TODO: Back-propagate - false - } + +fn simulate_to_endstate(mut state: BitwiseGameState, rng: &mut R) -> GameStatus { + let mut status = GameStatus::Continue; + + while status == GameStatus::Continue && state.round < MAX_MOVES { + let player_command = monte_carlo::random_move(&state.player, &state.opponent, rng); + let opponent_command = monte_carlo::random_move(&state.opponent, &state.player, rng); + status = state.simulate(player_command, opponent_command); } + status } + -- cgit v1.2.3 From 90a7c7d34def7e5f92f2cd521fdc014e0cbd9906 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 6 Sep 2018 21:51:50 +0200 Subject: Added benchmarking for number of explored nodes --- src/strategy/monte_carlo_tree.rs | 10 ++++++++++ tests/monte_carlo_test.rs | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs index 4efded8..7d688f2 100644 --- a/src/strategy/monte_carlo_tree.rs +++ b/src/strategy/monte_carlo_tree.rs @@ -66,6 +66,7 @@ impl NodeStats { fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, NodeStats) { debug_assert!(self.unexplored.is_empty()); + debug_assert!(self.explored.len() > 0); let total_attempts = self.explored.iter().map(|(_, n)| n.attempts).sum::(); let mut max_position = 0; @@ -102,6 +103,10 @@ impl NodeStats { fn add_draw(&mut self) { self.attempts += 1.; } + + fn count_explored(&self) -> usize { + 1 + self.explored.iter().map(|(_, n)| n.count_explored()).sum::() + } } pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { @@ -113,6 +118,11 @@ pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: tree_search(&state, &mut root, &mut rng); } + #[cfg(feature = "benchmarking")] + { + println!("Explored nodes: {}", root.count_explored()); + } + let (command, _) = root.node_with_highest_ucb(); command.clone() } diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs index 1fb4238..470c92d 100644 --- a/tests/monte_carlo_test.rs +++ b/tests/monte_carlo_test.rs @@ -19,3 +19,16 @@ fn it_does_a_normal_turn_successfully() { assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) } + +#[test] +fn it_does_a_normal_tree_serach_turn_successfully() { + let start_time = PreciseTime::now(); + 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(20000); + strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); + + assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) +} -- cgit v1.2.3 From 188c3c1ef073187cfb957dd5afe1aa0e7c2b6a33 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 08:47:24 +0200 Subject: Put selection of full monte carlo tree behind a feature flag --- Cargo.toml | 1 + src/bin/perf-test.rs | 8 +++----- src/main.rs | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c596887..9ec8947 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ extended-time = [] energy-cutoff = [] discard-poor-performers = [] heuristic-random = ["lazy_static"] +full-monte-carlo-tree = [] default = ["energy-cutoff", "discard-poor-performers", "heuristic-random"] diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs index da7a0a5..ee0c2be 100644 --- a/src/bin/perf-test.rs +++ b/src/bin/perf-test.rs @@ -10,10 +10,6 @@ const STATE_PATH: &str = "tests/state0.json"; use std::process; fn main() { - bitwise(); -} - -fn bitwise() { println!("Running bitwise engine"); let start_time = PreciseTime::now(); let state = match input::json::read_bitwise_state_from_file(STATE_PATH) { @@ -24,5 +20,7 @@ fn bitwise() { } }; let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - strategy::monte_carlo::choose_move(&state, start_time, max_time); + + #[cfg(feature = "full-monte-carlo-tree")] strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); + #[cfg(not(feature = "full-monte-carlo-tree"))] strategy::monte_carlo::choose_move(&state, start_time, max_time); } diff --git a/src/main.rs b/src/main.rs index 26d6eac..05b9546 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,7 +35,8 @@ fn main() { }; // TODO: Opening playbook? - let command = strategy::monte_carlo::choose_move(&state, start_time, max_time); + #[cfg(feature = "full-monte-carlo-tree")] let command = strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); + #[cfg(not(feature = "full-monte-carlo-tree"))] let command = strategy::monte_carlo::choose_move(&state, start_time, max_time); match write_command(COMMAND_PATH, command) { Ok(()) => {} -- cgit v1.2.3 From d3f78b98ad67920d799fa15421115d0bf4b7ee45 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 09:31:41 +0200 Subject: Added a static set of opening moves to get energy up and running --- Cargo.toml | 3 ++- src/main.rs | 11 ++++++++--- src/strategy/mod.rs | 1 + src/strategy/static_opening.rs | 21 +++++++++++++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/strategy/static_opening.rs diff --git a/Cargo.toml b/Cargo.toml index 9ec8947..1602696 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,8 +29,9 @@ energy-cutoff = [] discard-poor-performers = [] heuristic-random = ["lazy_static"] full-monte-carlo-tree = [] +static-opening = [] -default = ["energy-cutoff", "discard-poor-performers", "heuristic-random"] +default = ["energy-cutoff", "discard-poor-performers", "heuristic-random", "static-opening", "debug-decisions"] [profile.release] debug = true \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 05b9546..4fa0366 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,9 +34,13 @@ fn main() { } }; - // TODO: Opening playbook? - #[cfg(feature = "full-monte-carlo-tree")] let command = strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); - #[cfg(not(feature = "full-monte-carlo-tree"))] let command = strategy::monte_carlo::choose_move(&state, start_time, max_time); + let command = if cfg!(feature = "static-opening") && state.round < strategy::static_opening::STATIC_OPENING_LENGTH { + strategy::static_opening::choose_move(&state) + } else if cfg!(feature = "full-monte-carlo-tree") { + strategy::monte_carlo_tree::choose_move(&state, start_time, max_time) + } else { + strategy::monte_carlo::choose_move(&state, start_time, max_time) + }; match write_command(COMMAND_PATH, command) { Ok(()) => {} @@ -48,3 +52,4 @@ fn main() { println!("Elapsed time: {}", start_time.to(PreciseTime::now())); } + diff --git a/src/strategy/mod.rs b/src/strategy/mod.rs index ceb624b..9ec41bb 100644 --- a/src/strategy/mod.rs +++ b/src/strategy/mod.rs @@ -1,2 +1,3 @@ pub mod monte_carlo; pub mod monte_carlo_tree; +pub mod static_opening; diff --git a/src/strategy/static_opening.rs b/src/strategy/static_opening.rs new file mode 100644 index 0000000..f7e101c --- /dev/null +++ b/src/strategy/static_opening.rs @@ -0,0 +1,21 @@ +use engine::geometry::*; +use engine::command::*; +use engine::bitwise_engine::*; + +pub const STATIC_OPENING_LENGTH: u16 = 12; + +pub fn choose_move(state: &BitwiseGameState) -> Command { + match state.round { + 0 => Command::Build(Point::new(0,0), BuildingType::Energy), + 3 => Command::Build(Point::new(0,1), BuildingType::Energy), + 5 => Command::Build(Point::new(0,2), BuildingType::Energy), + 7 => Command::Build(Point::new(0,3), BuildingType::Energy), + 9 => Command::Build(Point::new(0,4), BuildingType::Energy), + 10 => Command::Build(Point::new(0,5), BuildingType::Energy), + 11 => Command::Build(Point::new(0,6), BuildingType::Energy), + 12 => Command::Build(Point::new(0,7), BuildingType::Energy), + 13 => Command::Build(Point::new(1,0), BuildingType::Energy), + 14 => Command::Build(Point::new(1,7), BuildingType::Energy), + _ => Command::Nothing + } +} -- cgit v1.2.3 From 8adf0daa3610807fbefb411c1c4af878b07230c6 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 10:24:53 +0200 Subject: Added minimum to weighted victory / defeat score --- src/strategy/monte_carlo.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 56701f5..a513a63 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -371,14 +371,16 @@ impl CommandScore { } fn add_victory(&mut self, weight: i32, next_seed: [u8; 16]) { - self.victory_score += weight; + use std::cmp; + self.victory_score += cmp::max(weight, 1); self.victories += 1; self.attempts += 1; self.next_seed = next_seed; } fn add_defeat(&mut self, weight: i32, next_seed: [u8; 16]) { - self.defeat_score += weight; + use std::cmp; + self.defeat_score += cmp::max(weight, 1); self.defeats += 1; self.attempts += 1; self.next_seed = next_seed; @@ -445,7 +447,7 @@ impl fmt::Display for CommandScore { } } -#[cfg(not(feature = "energy-cutoff"))] +#[cfg(all(not(feature = "heuristic-random"), not(feature = "energy-cutoff")))] fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { let mut result = ArrayVec::new(); if !open_building_spot { @@ -468,7 +470,7 @@ fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[Bu result } -#[cfg(feature = "energy-cutoff")] +#[cfg(all(not(feature = "heuristic-random"), feature = "energy-cutoff")] fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { let mut result = ArrayVec::new(); if !open_building_spot { -- cgit v1.2.3 From 1a56ac6db8392aec65fe566505fa1df0214ed91a Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 10:25:20 +0200 Subject: Added compile as a default build target --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ec1506f..b5005da 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +default: build + build: cargo build --release @@ -19,4 +21,4 @@ clean: submission.zip: bot.json Cargo.lock Cargo.toml src zip -r9 submission.zip bot.json Cargo.lock Cargo.toml src -.PHONY: build test bench profile clean +.PHONY: default build test bench profile clean -- cgit v1.2.3 From 0da5a09df776ba7f08550641d990707392c24e4c Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 10:29:59 +0200 Subject: Cleaned up compile warnings --- src/strategy/monte_carlo.rs | 2 +- src/strategy/monte_carlo_tree.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index a513a63..039c861 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -470,7 +470,7 @@ fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[Bu result } -#[cfg(all(not(feature = "heuristic-random"), feature = "energy-cutoff")] +#[cfg(all(not(feature = "heuristic-random"), feature = "energy-cutoff"))] fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { let mut result = ArrayVec::new(); if !open_building_spot { diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs index 7d688f2..fe59e34 100644 --- a/src/strategy/monte_carlo_tree.rs +++ b/src/strategy/monte_carlo_tree.rs @@ -2,7 +2,6 @@ use engine::command::*; use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; use engine::constants::*; -use engine::geometry::*; use rand::{Rng, XorShiftRng, SeedableRng}; use time::{Duration, PreciseTime}; @@ -104,6 +103,7 @@ impl NodeStats { self.attempts += 1.; } + #[cfg(feature = "benchmarking")] fn count_explored(&self) -> usize { 1 + self.explored.iter().map(|(_, n)| n.count_explored()).sum::() } -- cgit v1.2.3 From 32e1dedc420c1011f63aaa90ed96fa19d2590a77 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 10:36:09 +0200 Subject: Feature-flaggified weighting win ratios --- Cargo.toml | 3 ++- src/strategy/monte_carlo.rs | 6 ++++++ tests/monte_carlo_test.rs | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1602696..12ffc19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,9 @@ discard-poor-performers = [] heuristic-random = ["lazy_static"] full-monte-carlo-tree = [] static-opening = [] +weighted-win-ratio = [] -default = ["energy-cutoff", "discard-poor-performers", "heuristic-random", "static-opening", "debug-decisions"] +default = ["energy-cutoff", "discard-poor-performers", "heuristic-random", "static-opening", "weighted-win-ratio", "debug-decisions"] [profile.release] debug = true \ No newline at end of file diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 039c861..978f8f1 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -398,10 +398,16 @@ impl CommandScore { self.next_seed = next_seed; } + #[cfg(feature = "weighted-win-ratio")] fn win_ratio(&self) -> i32 { (self.victory_score - self.defeat_score) * 10000 / (self.attempts as i32) } + #[cfg(not(feature = "weighted-win-ratio"))] + fn win_ratio(&self) -> i32 { + (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) + } + fn init_command_scores(state: &BitwiseGameState) -> Vec { let unoccupied_cells_count = state.player.unoccupied_cell_count(); let unoccupied_cells = (0..unoccupied_cells_count) diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs index 470c92d..cec3256 100644 --- a/tests/monte_carlo_test.rs +++ b/tests/monte_carlo_test.rs @@ -27,7 +27,7 @@ fn it_does_a_normal_tree_serach_turn_successfully() { Ok(ok) => ok, Err(error) => panic!("Error while parsing JSON file: {}", error) }; - let max_time = Duration::milliseconds(20000); + let max_time = Duration::milliseconds(200); strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) -- cgit v1.2.3 From 694c3421b23e74da244675cbf7b2c3cfbb2866ab Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 13:01:33 +0200 Subject: Cached more values in tree exploration calcs --- src/strategy/monte_carlo_tree.rs | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs index fe59e34..2d27b62 100644 --- a/src/strategy/monte_carlo_tree.rs +++ b/src/strategy/monte_carlo_tree.rs @@ -15,8 +15,10 @@ struct NodeStats { wins: f32, losses: f32, attempts: f32, + average: f32, + confidence: f32, explored: Vec<(Command, NodeStats)>, - unexplored: Vec + unexplored: Vec, } impl NodeStats { @@ -58,6 +60,8 @@ impl NodeStats { wins: 0., losses: 0., attempts: 0., + average: 0., + confidence: 0., explored: Vec::with_capacity(commands.len()), unexplored: commands } @@ -67,11 +71,12 @@ impl NodeStats { debug_assert!(self.unexplored.is_empty()); debug_assert!(self.explored.len() > 0); let total_attempts = self.explored.iter().map(|(_, n)| n.attempts).sum::(); + let sqrt_n = total_attempts.sqrt(); let mut max_position = 0; - let mut max_value = self.explored[0].1.ucb(total_attempts); + let mut max_value = self.explored[0].1.ucb(sqrt_n); for i in 1..self.explored.len() { - let value = self.explored[i].1.ucb(total_attempts); + let value = self.explored[i].1.ucb(sqrt_n); if value > max_value { max_position = i; max_value = value; @@ -80,8 +85,8 @@ impl NodeStats { &mut self.explored[max_position] } - fn ucb(&self, n: f32) -> f32 { - self.wins / self.attempts + (2.0 * n / self.attempts).sqrt() + fn ucb(&self, sqrt_n: f32) -> f32 { + self.average + sqrt_n * self.confidence } fn add_node<'a>(&'a mut self, player: &Player, command: Command) -> &'a mut (Command, NodeStats) { @@ -94,13 +99,20 @@ impl NodeStats { fn add_victory(&mut self) { self.attempts += 1.; self.wins += 1.; + self.update_confidence(); } fn add_defeat(&mut self) { self.attempts += 1.; self.losses += 1.; + self.update_confidence(); } fn add_draw(&mut self) { self.attempts += 1.; + self.update_confidence(); + } + fn update_confidence(&mut self) { + self.average = self.wins / self.attempts; + self.confidence = (2.0 / self.attempts).sqrt(); } #[cfg(feature = "benchmarking")] -- cgit v1.2.3 From 7960997ed26e2631a5015104eb841864eb33bfef Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 13:17:27 +0200 Subject: Optimized away unnecessary sum --- src/strategy/monte_carlo_tree.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs index 2d27b62..24b2088 100644 --- a/src/strategy/monte_carlo_tree.rs +++ b/src/strategy/monte_carlo_tree.rs @@ -70,8 +70,7 @@ impl NodeStats { fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, NodeStats) { debug_assert!(self.unexplored.is_empty()); debug_assert!(self.explored.len() > 0); - let total_attempts = self.explored.iter().map(|(_, n)| n.attempts).sum::(); - let sqrt_n = total_attempts.sqrt(); + let sqrt_n = self.attempts.sqrt(); let mut max_position = 0; let mut max_value = self.explored[0].1.ucb(sqrt_n); -- cgit v1.2.3 From b9506c24dcbf9fe5194fa7347150cda07c4cb074 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 14:16:58 +0200 Subject: Moved metric calculations to reuse per row --- src/strategy/monte_carlo.rs | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 978f8f1..543d5d7 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -188,17 +188,19 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C let mut cdf_attack = [0; NUMBER_OF_MAP_POSITIONS]; let mut cdf_tesla = [0; NUMBER_OF_MAP_POSITIONS]; - let mut opponent_energy_per_row = [0; MAP_HEIGHT as usize]; - let mut opponent_attack_per_row = [0; MAP_HEIGHT as usize]; - let mut opponent_towers_per_row = [0; MAP_HEIGHT as usize]; - let mut player_energy_per_row = [0; MAP_HEIGHT as usize]; - let mut player_attack_per_row = [0; MAP_HEIGHT as usize]; + let mut attack_metric_per_row = [0; MAP_HEIGHT as usize]; + let mut defence_metric_per_row = [0; MAP_HEIGHT as usize]; for y in 0..MAP_HEIGHT { - opponent_energy_per_row[y as usize] = opponent.count_energy_towers_in_row(y); - opponent_attack_per_row[y as usize] = opponent.count_attack_towers_in_row(y); - opponent_towers_per_row[y as usize] = opponent.count_towers_in_row(y); - player_energy_per_row[y as usize] = player.count_energy_towers_in_row(y); - player_attack_per_row[y as usize] = player.count_attack_towers_in_row(y); + let opponent_energy = opponent.count_energy_towers_in_row(y); + let opponent_attack = opponent.count_attack_towers_in_row(y); + let opponent_towers = opponent.count_towers_in_row(y); + + let player_energy = player.count_energy_towers_in_row(y); + let player_attack = player.count_attack_towers_in_row(y); + let player_towers = player.count_towers_in_row(y); + + defence_metric_per_row[y as usize] = if opponent_attack == 0 { 0 } else { opponent_attack + player_towers }; + attack_metric_per_row[y as usize] = 8 + opponent_energy + opponent_towers + player_energy - player_attack; } @@ -250,10 +252,10 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C let point = Point::new_index(p); let y = usize::from(point.y()); - let weight = if player.occupied & point.to_either_bitfield() != 0 || point.x() < 4 || opponent_attack_per_row[y] == 0 { + let weight = if player.occupied & point.to_either_bitfield() != 0 || point.x() < 4 { 0 } else { - 5 + defence_metric_per_row[y] }; defence_end += weight; @@ -270,7 +272,7 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C 0 } else { let y = usize::from(point.y()); - 8 + opponent_energy_per_row[y] + opponent_towers_per_row[y] - player_attack_per_row[y] + attack_metric_per_row[y] }; attack_end += weight; -- cgit v1.2.3 From aa0ac38266f4427727f58368958cf563513ac3ae Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Sep 2018 19:50:41 +0200 Subject: Update compile flags for submission --- Cargo.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 12ffc19..6af9c75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,4 @@ full-monte-carlo-tree = [] static-opening = [] weighted-win-ratio = [] -default = ["energy-cutoff", "discard-poor-performers", "heuristic-random", "static-opening", "weighted-win-ratio", "debug-decisions"] - -[profile.release] -debug = true \ No newline at end of file +default = ["energy-cutoff", "discard-poor-performers", "static-opening", "weighted-win-ratio"] -- cgit v1.2.3 From f9b39be53174f76ac7bc32ce1fd4d52d4773e056 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Mon, 17 Sep 2018 10:05:06 +0200 Subject: Added readme for completed bot I also had to remove the readme that had been hanging around from the sample bot. --- README.md | 38 -------------------------------------- license.org | 22 ++++++++++++++++++++++ readme.org | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 38 deletions(-) delete mode 100644 README.md create mode 100644 license.org create mode 100644 readme.org diff --git a/README.md b/README.md deleted file mode 100644 index 0b97c14..0000000 --- a/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# Rust Sample Bot - -Rust is a systems programming language, giving programmers the low -level control that they would usually associate with a programming -langauge like C or C++, but modern high level programming features. - -Rust is a compiled language, which compiles to an -architecture-specific binary. - -For getting started with this bot in particular, I've done a write up -about [writing a Rust bot for the Entelect challenge](https://www.worthe-it.co.za/programming/2018/05/02/writing-an-entelect-challenge-bot-in-rust.html). - -## Environment Setup - -The Rust compiler toolchain can be downloaded from the Rust project -website. - -https://www.rust-lang.org/en-US/install.html - -## Compilation - -The bot can be built using the Rust build tool, Cargo. For the sake of -the competition, the `--release` flag should be used. - -``` -cargo build --release -``` - -## Running - -After compilation, there will be an executable in -`target/release/`. - -For example, this sample bot's name is -`entelect_challenge_rust_sample`, so the executable to be run is -`target/release/entelect_challenge_rust_sample` on Linux or -`target/release/entelect_challenge_rust_sample.exe` on Windows. - diff --git a/license.org b/license.org new file mode 100644 index 0000000..d643604 --- /dev/null +++ b/license.org @@ -0,0 +1,22 @@ +* The MIT License + +Copyright 2018 Justin Worthe + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/readme.org b/readme.org new file mode 100644 index 0000000..e947202 --- /dev/null +++ b/readme.org @@ -0,0 +1,52 @@ +* Entelect Challenge 2018 - Tower Defence - Rustbot + +This is the source code for my [[https://challenge.entelect.co.za/][Entelect Challenge]] 2018 bot. It did +really well, coming in 3rd place in the finals. + +** How does it work? + +I've put together a blog post with the high level overview of how I +got to this point and how it works [[https://www.offerzen.com/blog/coding-for-the-win-how-i-built-a-tower-defence-bot][here]]. I will be putting up more +articles diving into the details shortly. + +The short explanation is that it's a Monte Carlo Tree Search. All +possible moved I can make from the first state are generated. I then +iterate through the list of possible moved and play random games that +start with that move. The move that statistically wins the most random +games is taken as the best move. + +** Environment Setup + +The Rust compiler tool-chain can be downloaded from the Rust project +website. + +https://www.rust-lang.org/en-US/install.html + +** Compilation + +The bot is written in Rust, and compiled using Cargo. For the sake of +running the bot in the tournament, you have to compile using the +~--release~ flag (this is specified in [[./bot.json]]). + +#+BEGIN_SRC shell + cargo build --release +#+END_SRC + +After compilation, there will be an executable in ~target/release/~. + +** Other useful commands + +You can find other interesting commands that I used in writing the bot +in the [[./Makefile]]. Some notable ones are: + +- ~make bench~: compiles with the benchmarking feature turned on, and + runs my end to end benchmark. +- ~make profile~: similar to the benchmark, but runs single threaded, + for a longer time, and uses ~perf~ to gather statistics on the run. +- ~make submission.zip~: Creates the zip file to upload to the + Entelect Challenge servers. + +** License + +See [[./license.org]] + -- cgit v1.2.3 From c4a76b78662b5db6ed894759513d09576f57adc7 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Wed, 19 Sep 2018 19:47:54 +0200 Subject: Added debug flags into release build I had these turned off for the final submission, but it's necessary for showing profiling. --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 6af9c75..120aa54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,3 +33,6 @@ static-opening = [] weighted-win-ratio = [] default = ["energy-cutoff", "discard-poor-performers", "static-opening", "weighted-win-ratio"] + +[profile.release] +debug = true -- cgit v1.2.3 From f6611aab7c696520d9be5dfe29303fd6e0ade0d7 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Thu, 15 Nov 2018 20:16:59 +0200 Subject: More concise feature flags for variables --- src/engine/constants.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/engine/constants.rs b/src/engine/constants.rs index 951a756..a66c9e1 100644 --- a/src/engine/constants.rs +++ b/src/engine/constants.rs @@ -42,9 +42,7 @@ pub const NUMBER_OF_BUILDING_TYPES: usize = 4; pub const NUMBER_OF_MAP_POSITIONS: usize = SINGLE_MAP_WIDTH as usize * MAP_HEIGHT as usize; pub const NUMBER_OF_POSSIBLE_MOVES: usize = NUMBER_OF_MAP_POSITIONS * NUMBER_OF_BUILDING_TYPES + 2; - -#[cfg(not(feature = "reduced-time"))] -#[cfg(not(feature = "extended-time"))] +#[cfg(not(any(feature = "reduced-time", feature = "extended-time")))] pub const MAX_TIME_MILLIS: i64 = 1950; #[cfg(feature = "reduced-time")] -- cgit v1.2.3 From 1e21ebed15321aacbba53121cb40bbc60f4db1cc Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sat, 8 Dec 2018 22:02:19 +0200 Subject: Renamed variable to be more concise --- src/engine/bitwise_engine.rs | 10 +++++----- src/engine/geometry.rs | 4 ++-- src/input/json.rs | 2 +- src/strategy/monte_carlo.rs | 9 ++++----- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs index f03f1c0..694a309 100644 --- a/src/engine/bitwise_engine.rs +++ b/src/engine/bitwise_engine.rs @@ -224,7 +224,7 @@ impl BitwiseGameState { player.energy -= TESLA_FIRING_ENERGY; tesla.cooldown = TESLA_COOLDOWN; - if tesla.pos.to_either_bitfield() & RIGHT_COL_MASK != 0 { + if tesla.pos.to_bitfield() & RIGHT_COL_MASK != 0 { opponent.health = opponent.health.saturating_sub(TESLA_DAMAGE); } @@ -291,7 +291,7 @@ impl BitwiseGameState { fn update_tesla_activity(buildings: &mut Player) { let occupied = buildings.occupied; - buildings.tesla_cooldowns.retain(|t| (t.pos.to_either_bitfield() & occupied) != 0); + buildings.tesla_cooldowns.retain(|t| (t.pos.to_bitfield() & occupied) != 0); } @@ -356,7 +356,7 @@ impl Player { pub fn location_of_unoccupied_cell(&self, i: usize) -> Point { let bit = find_bit_index_from_rank(self.occupied, i as u64); let point = Point { index: bit }; - debug_assert!(point.to_either_bitfield() & self.occupied == 0); + debug_assert!(point.to_bitfield() & self.occupied == 0); point } @@ -365,7 +365,7 @@ impl Player { match command { Command::Nothing => {}, Command::Build(p, b) => { - let bitfield = p.to_either_bitfield(); + let bitfield = p.to_bitfield(); let price = match b { BuildingType::Attack => MISSILE_PRICE, @@ -415,7 +415,7 @@ impl Player { let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; let pos = self.unconstructed[i].pos; - let bitfield = pos.to_either_bitfield(); + let bitfield = pos.to_bitfield(); for health_tier in 0..health { self.buildings[health_tier] |= bitfield; diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs index b8b38dd..9cd1d90 100644 --- a/src/engine/geometry.rs +++ b/src/engine/geometry.rs @@ -24,7 +24,7 @@ impl Point { } pub fn new_double_bitfield(x: u8, y: u8, is_left_player: bool) -> (u64, u64) { - let bitfield = Point::new(x, y).to_either_bitfield(); + let bitfield = Point::new(x, y).to_bitfield(); if (x >= SINGLE_MAP_WIDTH) == is_left_player { (0, bitfield) } else { @@ -51,7 +51,7 @@ impl Point { * This involves mirroring the x dimension for the opponent's side */ - pub fn to_either_bitfield(self) -> u64 { + pub fn to_bitfield(self) -> u64 { 1u64 << self.index } } diff --git a/src/input/json.rs b/src/input/json.rs index 4e10f9a..a71d49e 100644 --- a/src/input/json.rs +++ b/src/input/json.rs @@ -89,7 +89,7 @@ impl State { } else { &mut opponent }; - let bitfield = point.to_either_bitfield(); + let bitfield = point.to_bitfield(); bitwise_buildings.occupied |= bitfield; if building.construction_time_left >= 0 { diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs index 543d5d7..adbb911 100644 --- a/src/strategy/monte_carlo.rs +++ b/src/strategy/monte_carlo.rs @@ -2,7 +2,6 @@ use engine::command::*; use engine::status::GameStatus; use engine::bitwise_engine::{Player, BitwiseGameState}; use engine::constants::*; -use engine::geometry::*; use std::fmt; @@ -234,7 +233,7 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C if needs_energy && player.energy >= ENERGY_PRICE { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); - let weight = if player.occupied & point.to_either_bitfield() != 0 { + let weight = if player.occupied & point.to_bitfield() != 0 { 0 } else { 2 @@ -252,7 +251,7 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C let point = Point::new_index(p); let y = usize::from(point.y()); - let weight = if player.occupied & point.to_either_bitfield() != 0 || point.x() < 4 { + let weight = if player.occupied & point.to_bitfield() != 0 || point.x() < 4 { 0 } else { defence_metric_per_row[y] @@ -268,7 +267,7 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C if player.energy >= MISSILE_PRICE { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); - let weight = if player.occupied & point.to_either_bitfield() != 0 { + let weight = if player.occupied & point.to_bitfield() != 0 { 0 } else { let y = usize::from(point.y()); @@ -286,7 +285,7 @@ pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> C if !cant_tesla { for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { let point = Point::new_index(p); - let weight = if (player.occupied & point.to_either_bitfield() != 0) || point.y() < 7 { + let weight = if (player.occupied & point.to_bitfield() != 0) || point.y() < 7 { 0 } else { 10 -- cgit v1.2.3 From 7ec48d0d454499177b63bc5bd512a3a2d6baa839 Mon Sep 17 00:00:00 2001 From: Justin Wernick Date: Tue, 19 Apr 2022 21:26:49 +0200 Subject: Refile for merging repos --- .gitignore | 13 - 2018-tower-defence/.gitignore | 13 + 2018-tower-defence/Cargo.toml | 38 ++ 2018-tower-defence/Makefile | 24 + 2018-tower-defence/bot.json | 8 + 2018-tower-defence/import-replay.sh | 21 + 2018-tower-defence/license.org | 22 + 2018-tower-defence/readme.org | 52 +++ 2018-tower-defence/src/bin/perf-test.rs | 26 ++ 2018-tower-defence/src/engine/bitwise_engine.rs | 483 ++++++++++++++++++++ 2018-tower-defence/src/engine/command.rs | 66 +++ 2018-tower-defence/src/engine/constants.rs | 52 +++ 2018-tower-defence/src/engine/geometry.rs | 71 +++ 2018-tower-defence/src/engine/mod.rs | 5 + 2018-tower-defence/src/engine/status.rs | 8 + 2018-tower-defence/src/input/json.rs | 191 ++++++++ 2018-tower-defence/src/input/mod.rs | 1 + 2018-tower-defence/src/lib.rs | 20 + 2018-tower-defence/src/main.rs | 55 +++ 2018-tower-defence/src/strategy/mod.rs | 3 + 2018-tower-defence/src/strategy/monte_carlo.rs | 505 +++++++++++++++++++++ .../src/strategy/monte_carlo_tree.rs | 243 ++++++++++ 2018-tower-defence/src/strategy/static_opening.rs | 21 + 2018-tower-defence/tests/live_comparison.rs | 68 +++ 2018-tower-defence/tests/monte_carlo_test.rs | 34 ++ 2018-tower-defence/tests/state0.json | 1 + .../Round 000/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 000/PlayerCommand.txt | 1 + .../Round 001/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 001/PlayerCommand.txt | 1 + .../Round 002/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 002/PlayerCommand.txt | 1 + .../Round 003/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 003/PlayerCommand.txt | 1 + .../Round 004/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 004/PlayerCommand.txt | 1 + .../Round 005/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 005/PlayerCommand.txt | 1 + .../Round 006/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 006/PlayerCommand.txt | 1 + .../Round 007/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 007/PlayerCommand.txt | 1 + .../Round 008/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 008/PlayerCommand.txt | 1 + .../Round 009/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 009/PlayerCommand.txt | 1 + .../Round 010/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 010/PlayerCommand.txt | 1 + .../Round 011/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 011/PlayerCommand.txt | 1 + .../Round 012/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 012/PlayerCommand.txt | 1 + .../Round 013/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 013/PlayerCommand.txt | 1 + .../Round 014/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 014/PlayerCommand.txt | 1 + .../Round 015/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 015/PlayerCommand.txt | 1 + .../Round 016/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 016/PlayerCommand.txt | 1 + .../Round 017/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 017/PlayerCommand.txt | 1 + .../Round 018/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 018/PlayerCommand.txt | 1 + .../Round 019/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 019/PlayerCommand.txt | 1 + .../Round 020/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 020/PlayerCommand.txt | 1 + .../Round 021/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 021/PlayerCommand.txt | 1 + .../Round 022/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 022/PlayerCommand.txt | 1 + .../Round 023/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 023/PlayerCommand.txt | 1 + .../Round 024/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 024/PlayerCommand.txt | 1 + .../Round 025/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 025/PlayerCommand.txt | 1 + .../Round 026/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 026/PlayerCommand.txt | 1 + .../Round 027/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 027/PlayerCommand.txt | 1 + .../Round 028/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 028/PlayerCommand.txt | 1 + .../Round 029/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 029/PlayerCommand.txt | 1 + .../Round 030/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 030/PlayerCommand.txt | 1 + .../Round 031/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 031/PlayerCommand.txt | 1 + .../Round 032/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 032/PlayerCommand.txt | 1 + .../Round 033/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 033/PlayerCommand.txt | 1 + .../Round 034/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 034/PlayerCommand.txt | 1 + .../Round 035/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 035/PlayerCommand.txt | 1 + .../Round 036/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 036/PlayerCommand.txt | 1 + .../Round 037/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 037/PlayerCommand.txt | 1 + .../Round 038/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 038/PlayerCommand.txt | 1 + .../Round 039/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 039/PlayerCommand.txt | 1 + .../Round 040/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 040/PlayerCommand.txt | 1 + .../Round 041/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 041/PlayerCommand.txt | 1 + .../Round 042/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 042/PlayerCommand.txt | 1 + .../Round 043/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 043/PlayerCommand.txt | 1 + .../Round 044/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 044/PlayerCommand.txt | 1 + .../Round 045/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 045/PlayerCommand.txt | 1 + .../Round 046/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 046/PlayerCommand.txt | 1 + .../Round 047/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 047/PlayerCommand.txt | 1 + .../Round 048/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 048/PlayerCommand.txt | 1 + .../Round 049/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 049/PlayerCommand.txt | 1 + .../Round 050/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 050/PlayerCommand.txt | 1 + .../Round 051/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 051/PlayerCommand.txt | 1 + .../Round 052/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 052/PlayerCommand.txt | 1 + .../Round 053/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 053/PlayerCommand.txt | 1 + .../Round 054/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 054/PlayerCommand.txt | 1 + .../Round 055/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 055/PlayerCommand.txt | 1 + .../Round 056/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 056/PlayerCommand.txt | 1 + .../Round 057/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 057/PlayerCommand.txt | 1 + .../Round 058/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 058/PlayerCommand.txt | 1 + .../Round 059/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 059/PlayerCommand.txt | 1 + .../Round 060/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 060/PlayerCommand.txt | 1 + .../Round 061/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 061/PlayerCommand.txt | 1 + .../Round 062/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 062/PlayerCommand.txt | 1 + .../Round 063/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 063/PlayerCommand.txt | 1 + .../Round 064/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 064/PlayerCommand.txt | 1 + .../Round 065/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 065/PlayerCommand.txt | 1 + .../Round 066/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 066/PlayerCommand.txt | 1 + .../Round 067/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 067/PlayerCommand.txt | 1 + .../Round 068/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 068/PlayerCommand.txt | 1 + .../Round 069/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 069/PlayerCommand.txt | 1 + .../Round 070/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 070/PlayerCommand.txt | 1 + .../Round 071/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 071/PlayerCommand.txt | 1 + .../Round 072/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 072/PlayerCommand.txt | 1 + .../Round 073/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 073/PlayerCommand.txt | 1 + .../Round 074/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 074/PlayerCommand.txt | 1 + .../Round 075/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 075/PlayerCommand.txt | 1 + .../Round 076/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 076/PlayerCommand.txt | 1 + .../Round 077/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 077/PlayerCommand.txt | 1 + .../Round 078/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 078/PlayerCommand.txt | 1 + .../Round 079/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 079/PlayerCommand.txt | 1 + .../Round 080/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 080/PlayerCommand.txt | 1 + .../Round 081/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 081/PlayerCommand.txt | 1 + .../Round 082/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 082/PlayerCommand.txt | 1 + .../Round 083/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 083/PlayerCommand.txt | 1 + .../Round 084/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 084/PlayerCommand.txt | 1 + .../Round 085/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 085/PlayerCommand.txt | 1 + .../Round 086/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 086/PlayerCommand.txt | 1 + .../Round 087/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 087/PlayerCommand.txt | 1 + .../Round 088/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 088/PlayerCommand.txt | 1 + .../Round 089/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 089/PlayerCommand.txt | 1 + .../Round 090/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 090/PlayerCommand.txt | 1 + .../Round 091/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 091/PlayerCommand.txt | 1 + .../Round 092/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 092/PlayerCommand.txt | 1 + .../Round 093/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 093/PlayerCommand.txt | 1 + .../Round 094/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 094/PlayerCommand.txt | 1 + .../Round 095/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 095/PlayerCommand.txt | 1 + .../Round 096/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 096/PlayerCommand.txt | 1 + .../Round 097/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 097/PlayerCommand.txt | 1 + .../Round 098/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 098/PlayerCommand.txt | 1 + .../Round 099/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 099/PlayerCommand.txt | 1 + .../Round 100/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 100/PlayerCommand.txt | 1 + .../Round 101/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 101/PlayerCommand.txt | 1 + .../Round 102/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 102/PlayerCommand.txt | 1 + .../Round 103/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 103/PlayerCommand.txt | 1 + .../Round 104/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 104/PlayerCommand.txt | 1 + .../Round 105/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 105/PlayerCommand.txt | 1 + .../Round 106/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 106/PlayerCommand.txt | 1 + .../Round 107/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 107/PlayerCommand.txt | 1 + .../Round 108/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 108/PlayerCommand.txt | 1 + .../Round 109/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 109/PlayerCommand.txt | 1 + .../Round 110/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 110/PlayerCommand.txt | 1 + .../Round 111/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 111/PlayerCommand.txt | 1 + .../Round 112/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 112/PlayerCommand.txt | 1 + .../Round 113/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 113/PlayerCommand.txt | 1 + .../Round 114/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 114/PlayerCommand.txt | 1 + .../Round 115/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 115/PlayerCommand.txt | 1 + .../Round 116/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 116/PlayerCommand.txt | 1 + .../Round 117/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 117/PlayerCommand.txt | 1 + .../Round 118/OpponentCommand.txt | 1 + .../v300_iron_curtain/Round 118/PlayerCommand.txt | 1 + .../Round 000/OpponentCommand.txt | 1 + .../Round 000/PlayerCommand.txt | 1 + .../Round 001/OpponentCommand.txt | 1 + .../Round 001/PlayerCommand.txt | 1 + .../Round 002/OpponentCommand.txt | 1 + .../Round 002/PlayerCommand.txt | 1 + .../Round 003/OpponentCommand.txt | 1 + .../Round 003/PlayerCommand.txt | 1 + .../Round 004/OpponentCommand.txt | 1 + .../Round 004/PlayerCommand.txt | 1 + .../Round 005/OpponentCommand.txt | 1 + .../Round 005/PlayerCommand.txt | 1 + .../Round 006/OpponentCommand.txt | 1 + .../Round 006/PlayerCommand.txt | 1 + .../Round 007/OpponentCommand.txt | 1 + .../Round 007/PlayerCommand.txt | 1 + .../Round 008/OpponentCommand.txt | 1 + .../Round 008/PlayerCommand.txt | 1 + .../Round 009/OpponentCommand.txt | 1 + .../Round 009/PlayerCommand.txt | 1 + .../Round 010/OpponentCommand.txt | 1 + .../Round 010/PlayerCommand.txt | 1 + .../Round 011/OpponentCommand.txt | 1 + .../Round 011/PlayerCommand.txt | 1 + .../Round 012/OpponentCommand.txt | 1 + .../Round 012/PlayerCommand.txt | 1 + .../Round 013/OpponentCommand.txt | 1 + .../Round 013/PlayerCommand.txt | 1 + .../Round 014/OpponentCommand.txt | 1 + .../Round 014/PlayerCommand.txt | 1 + .../Round 015/OpponentCommand.txt | 1 + .../Round 015/PlayerCommand.txt | 1 + .../Round 016/OpponentCommand.txt | 1 + .../Round 016/PlayerCommand.txt | 1 + .../Round 017/OpponentCommand.txt | 1 + .../Round 017/PlayerCommand.txt | 1 + .../Round 018/OpponentCommand.txt | 1 + .../Round 018/PlayerCommand.txt | 1 + .../Round 019/OpponentCommand.txt | 1 + .../Round 019/PlayerCommand.txt | 1 + .../Round 020/OpponentCommand.txt | 1 + .../Round 020/PlayerCommand.txt | 1 + .../Round 021/OpponentCommand.txt | 1 + .../Round 021/PlayerCommand.txt | 1 + .../Round 022/OpponentCommand.txt | 1 + .../Round 022/PlayerCommand.txt | 1 + .../Round 023/OpponentCommand.txt | 1 + .../Round 023/PlayerCommand.txt | 1 + .../Round 024/OpponentCommand.txt | 1 + .../Round 024/PlayerCommand.txt | 1 + .../Round 025/OpponentCommand.txt | 1 + .../Round 025/PlayerCommand.txt | 1 + .../Round 026/OpponentCommand.txt | 1 + .../Round 026/PlayerCommand.txt | 1 + .../Round 027/OpponentCommand.txt | 1 + .../Round 027/PlayerCommand.txt | 1 + .../Round 028/OpponentCommand.txt | 1 + .../Round 028/PlayerCommand.txt | 1 + .../Round 029/OpponentCommand.txt | 1 + .../Round 029/PlayerCommand.txt | 1 + .../Round 030/OpponentCommand.txt | 1 + .../Round 030/PlayerCommand.txt | 1 + .../Round 031/OpponentCommand.txt | 1 + .../Round 031/PlayerCommand.txt | 1 + .../Round 032/OpponentCommand.txt | 1 + .../Round 032/PlayerCommand.txt | 1 + .../Round 033/OpponentCommand.txt | 1 + .../Round 033/PlayerCommand.txt | 1 + .../Round 034/OpponentCommand.txt | 1 + .../Round 034/PlayerCommand.txt | 1 + .../Round 035/OpponentCommand.txt | 1 + .../Round 035/PlayerCommand.txt | 1 + .../Round 036/OpponentCommand.txt | 1 + .../Round 036/PlayerCommand.txt | 1 + .../Round 037/OpponentCommand.txt | 1 + .../Round 037/PlayerCommand.txt | 1 + .../Round 038/OpponentCommand.txt | 1 + .../Round 038/PlayerCommand.txt | 1 + .../Round 039/OpponentCommand.txt | 1 + .../Round 039/PlayerCommand.txt | 1 + .../Round 040/OpponentCommand.txt | 1 + .../Round 040/PlayerCommand.txt | 1 + .../Round 041/OpponentCommand.txt | 1 + .../Round 041/PlayerCommand.txt | 1 + .../Round 042/OpponentCommand.txt | 1 + .../Round 042/PlayerCommand.txt | 1 + .../Round 043/OpponentCommand.txt | 1 + .../Round 043/PlayerCommand.txt | 1 + .../Round 044/OpponentCommand.txt | 1 + .../Round 044/PlayerCommand.txt | 1 + .../Round 045/OpponentCommand.txt | 1 + .../Round 045/PlayerCommand.txt | 1 + .../Round 046/OpponentCommand.txt | 1 + .../Round 046/PlayerCommand.txt | 1 + .../Round 047/OpponentCommand.txt | 1 + .../Round 047/PlayerCommand.txt | 1 + .../Round 048/OpponentCommand.txt | 1 + .../Round 048/PlayerCommand.txt | 1 + .../Round 049/OpponentCommand.txt | 1 + .../Round 049/PlayerCommand.txt | 1 + .../Round 050/OpponentCommand.txt | 1 + .../Round 050/PlayerCommand.txt | 1 + .../Round 051/OpponentCommand.txt | 1 + .../Round 051/PlayerCommand.txt | 1 + .../Round 052/OpponentCommand.txt | 1 + .../Round 052/PlayerCommand.txt | 1 + .../Round 053/OpponentCommand.txt | 1 + .../Round 053/PlayerCommand.txt | 1 + .../Round 054/OpponentCommand.txt | 1 + .../Round 054/PlayerCommand.txt | 1 + .../Round 055/OpponentCommand.txt | 1 + .../Round 055/PlayerCommand.txt | 1 + .../Round 056/OpponentCommand.txt | 1 + .../Round 056/PlayerCommand.txt | 1 + .../Round 057/OpponentCommand.txt | 1 + .../Round 057/PlayerCommand.txt | 1 + .../Round 058/OpponentCommand.txt | 1 + .../Round 058/PlayerCommand.txt | 1 + .../Round 059/OpponentCommand.txt | 1 + .../Round 059/PlayerCommand.txt | 1 + .../Round 060/OpponentCommand.txt | 1 + .../Round 060/PlayerCommand.txt | 1 + .../Round 061/OpponentCommand.txt | 1 + .../Round 061/PlayerCommand.txt | 1 + .../Round 062/OpponentCommand.txt | 1 + .../Round 062/PlayerCommand.txt | 1 + .../Round 063/OpponentCommand.txt | 1 + .../Round 063/PlayerCommand.txt | 1 + .../Round 064/OpponentCommand.txt | 1 + .../Round 064/PlayerCommand.txt | 1 + .../Round 065/OpponentCommand.txt | 1 + .../Round 065/PlayerCommand.txt | 1 + .../Round 066/OpponentCommand.txt | 1 + .../Round 066/PlayerCommand.txt | 1 + .../Round 067/OpponentCommand.txt | 1 + .../Round 067/PlayerCommand.txt | 1 + .../Round 068/OpponentCommand.txt | 1 + .../Round 068/PlayerCommand.txt | 1 + .../Round 069/OpponentCommand.txt | 1 + .../Round 069/PlayerCommand.txt | 1 + .../Round 070/OpponentCommand.txt | 1 + .../Round 070/PlayerCommand.txt | 1 + .../Round 071/OpponentCommand.txt | 1 + .../Round 071/PlayerCommand.txt | 1 + .../Round 072/OpponentCommand.txt | 1 + .../Round 072/PlayerCommand.txt | 1 + .../Round 073/OpponentCommand.txt | 1 + .../Round 073/PlayerCommand.txt | 1 + .../Round 074/OpponentCommand.txt | 1 + .../Round 074/PlayerCommand.txt | 1 + .../Round 075/OpponentCommand.txt | 1 + .../Round 075/PlayerCommand.txt | 1 + .../Round 000/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 000/PlayerCommand.txt | 1 + .../Round 001/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 001/PlayerCommand.txt | 1 + .../Round 002/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 002/PlayerCommand.txt | 1 + .../Round 003/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 003/PlayerCommand.txt | 1 + .../Round 004/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 004/PlayerCommand.txt | 1 + .../Round 005/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 005/PlayerCommand.txt | 1 + .../Round 006/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 006/PlayerCommand.txt | 1 + .../Round 007/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 007/PlayerCommand.txt | 1 + .../Round 008/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 008/PlayerCommand.txt | 1 + .../Round 009/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 009/PlayerCommand.txt | 1 + .../Round 010/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 010/PlayerCommand.txt | 1 + .../Round 011/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 011/PlayerCommand.txt | 1 + .../Round 012/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 012/PlayerCommand.txt | 1 + .../Round 013/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 013/PlayerCommand.txt | 1 + .../Round 014/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 014/PlayerCommand.txt | 1 + .../Round 015/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 015/PlayerCommand.txt | 1 + .../Round 016/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 016/PlayerCommand.txt | 1 + .../Round 017/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 017/PlayerCommand.txt | 1 + .../Round 018/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 018/PlayerCommand.txt | 1 + .../Round 019/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 019/PlayerCommand.txt | 1 + .../Round 020/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 020/PlayerCommand.txt | 1 + .../Round 021/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 021/PlayerCommand.txt | 1 + .../Round 022/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 022/PlayerCommand.txt | 1 + .../Round 023/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 023/PlayerCommand.txt | 1 + .../Round 024/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 024/PlayerCommand.txt | 1 + .../Round 025/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 025/PlayerCommand.txt | 1 + .../Round 026/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 026/PlayerCommand.txt | 1 + .../Round 027/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 027/PlayerCommand.txt | 1 + .../Round 028/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 028/PlayerCommand.txt | 1 + .../Round 029/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 029/PlayerCommand.txt | 1 + .../Round 030/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 030/PlayerCommand.txt | 1 + .../Round 031/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 031/PlayerCommand.txt | 1 + .../Round 032/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 032/PlayerCommand.txt | 1 + .../Round 033/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 033/PlayerCommand.txt | 1 + .../Round 034/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 034/PlayerCommand.txt | 1 + .../Round 035/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 035/PlayerCommand.txt | 1 + .../Round 036/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 036/PlayerCommand.txt | 1 + .../Round 037/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 037/PlayerCommand.txt | 1 + .../Round 038/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 038/PlayerCommand.txt | 1 + .../Round 039/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 039/PlayerCommand.txt | 1 + .../Round 040/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 040/PlayerCommand.txt | 1 + .../Round 041/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 041/PlayerCommand.txt | 1 + .../Round 042/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 042/PlayerCommand.txt | 1 + .../Round 043/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 043/PlayerCommand.txt | 1 + .../Round 044/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 044/PlayerCommand.txt | 1 + .../Round 045/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 045/PlayerCommand.txt | 1 + .../Round 046/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 046/PlayerCommand.txt | 1 + .../Round 047/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 047/PlayerCommand.txt | 1 + .../Round 048/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 048/PlayerCommand.txt | 1 + .../Round 049/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 049/PlayerCommand.txt | 1 + .../Round 050/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 050/PlayerCommand.txt | 1 + .../Round 051/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 051/PlayerCommand.txt | 1 + .../Round 052/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 052/PlayerCommand.txt | 1 + .../Round 053/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 053/PlayerCommand.txt | 1 + .../Round 054/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 054/PlayerCommand.txt | 1 + .../Round 055/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 055/PlayerCommand.txt | 1 + .../Round 056/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 056/PlayerCommand.txt | 1 + .../Round 057/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 057/PlayerCommand.txt | 1 + .../Round 058/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 058/PlayerCommand.txt | 1 + .../Round 059/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 059/PlayerCommand.txt | 1 + .../Round 060/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 060/PlayerCommand.txt | 1 + .../Round 061/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 061/PlayerCommand.txt | 1 + .../Round 062/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 062/PlayerCommand.txt | 1 + .../Round 063/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 063/PlayerCommand.txt | 1 + .../Round 064/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 064/PlayerCommand.txt | 1 + .../Round 065/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 065/PlayerCommand.txt | 1 + .../Round 066/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 066/PlayerCommand.txt | 1 + .../Round 067/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 067/PlayerCommand.txt | 1 + .../Round 068/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 068/PlayerCommand.txt | 1 + .../Round 069/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 069/PlayerCommand.txt | 1 + .../Round 070/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 070/PlayerCommand.txt | 1 + .../Round 071/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 071/PlayerCommand.txt | 1 + .../Round 072/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 072/PlayerCommand.txt | 1 + .../Round 073/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 073/PlayerCommand.txt | 1 + .../Round 074/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 074/PlayerCommand.txt | 1 + .../Round 075/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 075/PlayerCommand.txt | 1 + .../Round 076/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 076/PlayerCommand.txt | 1 + .../Round 077/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 077/PlayerCommand.txt | 1 + .../Round 078/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 078/PlayerCommand.txt | 1 + .../Round 079/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 079/PlayerCommand.txt | 1 + .../Round 080/OpponentCommand.txt | 1 + .../v300_normal_towers/Round 080/PlayerCommand.txt | 1 + Cargo.toml | 38 -- Makefile | 24 - bot.json | 8 - import-replay.sh | 21 - license.org | 22 - readme.org | 52 --- src/bin/perf-test.rs | 26 -- src/engine/bitwise_engine.rs | 483 -------------------- src/engine/command.rs | 66 --- src/engine/constants.rs | 52 --- src/engine/geometry.rs | 71 --- src/engine/mod.rs | 5 - src/engine/status.rs | 8 - src/input/json.rs | 191 -------- src/input/mod.rs | 1 - src/lib.rs | 20 - src/main.rs | 55 --- src/strategy/mod.rs | 3 - src/strategy/monte_carlo.rs | 505 --------------------- src/strategy/monte_carlo_tree.rs | 243 ---------- src/strategy/static_opening.rs | 21 - tests/live_comparison.rs | 68 --- tests/monte_carlo_test.rs | 34 -- tests/state0.json | 1 - .../Round 000/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 000/PlayerCommand.txt | 1 - .../Round 001/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 001/PlayerCommand.txt | 1 - .../Round 002/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 002/PlayerCommand.txt | 1 - .../Round 003/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 003/PlayerCommand.txt | 1 - .../Round 004/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 004/PlayerCommand.txt | 1 - .../Round 005/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 005/PlayerCommand.txt | 1 - .../Round 006/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 006/PlayerCommand.txt | 1 - .../Round 007/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 007/PlayerCommand.txt | 1 - .../Round 008/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 008/PlayerCommand.txt | 1 - .../Round 009/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 009/PlayerCommand.txt | 1 - .../Round 010/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 010/PlayerCommand.txt | 1 - .../Round 011/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 011/PlayerCommand.txt | 1 - .../Round 012/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 012/PlayerCommand.txt | 1 - .../Round 013/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 013/PlayerCommand.txt | 1 - .../Round 014/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 014/PlayerCommand.txt | 1 - .../Round 015/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 015/PlayerCommand.txt | 1 - .../Round 016/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 016/PlayerCommand.txt | 1 - .../Round 017/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 017/PlayerCommand.txt | 1 - .../Round 018/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 018/PlayerCommand.txt | 1 - .../Round 019/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 019/PlayerCommand.txt | 1 - .../Round 020/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 020/PlayerCommand.txt | 1 - .../Round 021/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 021/PlayerCommand.txt | 1 - .../Round 022/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 022/PlayerCommand.txt | 1 - .../Round 023/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 023/PlayerCommand.txt | 1 - .../Round 024/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 024/PlayerCommand.txt | 1 - .../Round 025/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 025/PlayerCommand.txt | 1 - .../Round 026/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 026/PlayerCommand.txt | 1 - .../Round 027/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 027/PlayerCommand.txt | 1 - .../Round 028/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 028/PlayerCommand.txt | 1 - .../Round 029/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 029/PlayerCommand.txt | 1 - .../Round 030/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 030/PlayerCommand.txt | 1 - .../Round 031/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 031/PlayerCommand.txt | 1 - .../Round 032/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 032/PlayerCommand.txt | 1 - .../Round 033/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 033/PlayerCommand.txt | 1 - .../Round 034/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 034/PlayerCommand.txt | 1 - .../Round 035/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 035/PlayerCommand.txt | 1 - .../Round 036/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 036/PlayerCommand.txt | 1 - .../Round 037/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 037/PlayerCommand.txt | 1 - .../Round 038/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 038/PlayerCommand.txt | 1 - .../Round 039/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 039/PlayerCommand.txt | 1 - .../Round 040/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 040/PlayerCommand.txt | 1 - .../Round 041/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 041/PlayerCommand.txt | 1 - .../Round 042/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 042/PlayerCommand.txt | 1 - .../Round 043/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 043/PlayerCommand.txt | 1 - .../Round 044/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 044/PlayerCommand.txt | 1 - .../Round 045/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 045/PlayerCommand.txt | 1 - .../Round 046/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 046/PlayerCommand.txt | 1 - .../Round 047/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 047/PlayerCommand.txt | 1 - .../Round 048/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 048/PlayerCommand.txt | 1 - .../Round 049/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 049/PlayerCommand.txt | 1 - .../Round 050/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 050/PlayerCommand.txt | 1 - .../Round 051/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 051/PlayerCommand.txt | 1 - .../Round 052/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 052/PlayerCommand.txt | 1 - .../Round 053/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 053/PlayerCommand.txt | 1 - .../Round 054/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 054/PlayerCommand.txt | 1 - .../Round 055/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 055/PlayerCommand.txt | 1 - .../Round 056/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 056/PlayerCommand.txt | 1 - .../Round 057/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 057/PlayerCommand.txt | 1 - .../Round 058/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 058/PlayerCommand.txt | 1 - .../Round 059/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 059/PlayerCommand.txt | 1 - .../Round 060/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 060/PlayerCommand.txt | 1 - .../Round 061/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 061/PlayerCommand.txt | 1 - .../Round 062/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 062/PlayerCommand.txt | 1 - .../Round 063/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 063/PlayerCommand.txt | 1 - .../Round 064/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 064/PlayerCommand.txt | 1 - .../Round 065/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 065/PlayerCommand.txt | 1 - .../Round 066/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 066/PlayerCommand.txt | 1 - .../Round 067/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 067/PlayerCommand.txt | 1 - .../Round 068/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 068/PlayerCommand.txt | 1 - .../Round 069/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 069/PlayerCommand.txt | 1 - .../Round 070/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 070/PlayerCommand.txt | 1 - .../Round 071/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 071/PlayerCommand.txt | 1 - .../Round 072/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 072/PlayerCommand.txt | 1 - .../Round 073/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 073/PlayerCommand.txt | 1 - .../Round 074/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 074/PlayerCommand.txt | 1 - .../Round 075/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 075/PlayerCommand.txt | 1 - .../Round 076/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 076/PlayerCommand.txt | 1 - .../Round 077/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 077/PlayerCommand.txt | 1 - .../Round 078/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 078/PlayerCommand.txt | 1 - .../Round 079/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 079/PlayerCommand.txt | 1 - .../Round 080/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 080/PlayerCommand.txt | 1 - .../Round 081/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 081/PlayerCommand.txt | 1 - .../Round 082/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 082/PlayerCommand.txt | 1 - .../Round 083/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 083/PlayerCommand.txt | 1 - .../Round 084/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 084/PlayerCommand.txt | 1 - .../Round 085/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 085/PlayerCommand.txt | 1 - .../Round 086/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 086/PlayerCommand.txt | 1 - .../Round 087/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 087/PlayerCommand.txt | 1 - .../Round 088/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 088/PlayerCommand.txt | 1 - .../Round 089/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 089/PlayerCommand.txt | 1 - .../Round 090/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 090/PlayerCommand.txt | 1 - .../Round 091/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 091/PlayerCommand.txt | 1 - .../Round 092/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 092/PlayerCommand.txt | 1 - .../Round 093/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 093/PlayerCommand.txt | 1 - .../Round 094/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 094/PlayerCommand.txt | 1 - .../Round 095/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 095/PlayerCommand.txt | 1 - .../Round 096/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 096/PlayerCommand.txt | 1 - .../Round 097/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 097/PlayerCommand.txt | 1 - .../Round 098/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 098/PlayerCommand.txt | 1 - .../Round 099/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 099/PlayerCommand.txt | 1 - .../Round 100/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 100/PlayerCommand.txt | 1 - .../Round 101/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 101/PlayerCommand.txt | 1 - .../Round 102/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 102/PlayerCommand.txt | 1 - .../Round 103/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 103/PlayerCommand.txt | 1 - .../Round 104/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 104/PlayerCommand.txt | 1 - .../Round 105/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 105/PlayerCommand.txt | 1 - .../Round 106/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 106/PlayerCommand.txt | 1 - .../Round 107/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 107/PlayerCommand.txt | 1 - .../Round 108/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 108/PlayerCommand.txt | 1 - .../Round 109/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 109/PlayerCommand.txt | 1 - .../Round 110/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 110/PlayerCommand.txt | 1 - .../Round 111/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 111/PlayerCommand.txt | 1 - .../Round 112/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 112/PlayerCommand.txt | 1 - .../Round 113/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 113/PlayerCommand.txt | 1 - .../Round 114/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 114/PlayerCommand.txt | 1 - .../Round 115/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 115/PlayerCommand.txt | 1 - .../Round 116/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 116/PlayerCommand.txt | 1 - .../Round 117/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 117/PlayerCommand.txt | 1 - .../Round 118/OpponentCommand.txt | 1 - .../v300_iron_curtain/Round 118/PlayerCommand.txt | 1 - .../Round 000/OpponentCommand.txt | 1 - .../Round 000/PlayerCommand.txt | 1 - .../Round 001/OpponentCommand.txt | 1 - .../Round 001/PlayerCommand.txt | 1 - .../Round 002/OpponentCommand.txt | 1 - .../Round 002/PlayerCommand.txt | 1 - .../Round 003/OpponentCommand.txt | 1 - .../Round 003/PlayerCommand.txt | 1 - .../Round 004/OpponentCommand.txt | 1 - .../Round 004/PlayerCommand.txt | 1 - .../Round 005/OpponentCommand.txt | 1 - .../Round 005/PlayerCommand.txt | 1 - .../Round 006/OpponentCommand.txt | 1 - .../Round 006/PlayerCommand.txt | 1 - .../Round 007/OpponentCommand.txt | 1 - .../Round 007/PlayerCommand.txt | 1 - .../Round 008/OpponentCommand.txt | 1 - .../Round 008/PlayerCommand.txt | 1 - .../Round 009/OpponentCommand.txt | 1 - .../Round 009/PlayerCommand.txt | 1 - .../Round 010/OpponentCommand.txt | 1 - .../Round 010/PlayerCommand.txt | 1 - .../Round 011/OpponentCommand.txt | 1 - .../Round 011/PlayerCommand.txt | 1 - .../Round 012/OpponentCommand.txt | 1 - .../Round 012/PlayerCommand.txt | 1 - .../Round 013/OpponentCommand.txt | 1 - .../Round 013/PlayerCommand.txt | 1 - .../Round 014/OpponentCommand.txt | 1 - .../Round 014/PlayerCommand.txt | 1 - .../Round 015/OpponentCommand.txt | 1 - .../Round 015/PlayerCommand.txt | 1 - .../Round 016/OpponentCommand.txt | 1 - .../Round 016/PlayerCommand.txt | 1 - .../Round 017/OpponentCommand.txt | 1 - .../Round 017/PlayerCommand.txt | 1 - .../Round 018/OpponentCommand.txt | 1 - .../Round 018/PlayerCommand.txt | 1 - .../Round 019/OpponentCommand.txt | 1 - .../Round 019/PlayerCommand.txt | 1 - .../Round 020/OpponentCommand.txt | 1 - .../Round 020/PlayerCommand.txt | 1 - .../Round 021/OpponentCommand.txt | 1 - .../Round 021/PlayerCommand.txt | 1 - .../Round 022/OpponentCommand.txt | 1 - .../Round 022/PlayerCommand.txt | 1 - .../Round 023/OpponentCommand.txt | 1 - .../Round 023/PlayerCommand.txt | 1 - .../Round 024/OpponentCommand.txt | 1 - .../Round 024/PlayerCommand.txt | 1 - .../Round 025/OpponentCommand.txt | 1 - .../Round 025/PlayerCommand.txt | 1 - .../Round 026/OpponentCommand.txt | 1 - .../Round 026/PlayerCommand.txt | 1 - .../Round 027/OpponentCommand.txt | 1 - .../Round 027/PlayerCommand.txt | 1 - .../Round 028/OpponentCommand.txt | 1 - .../Round 028/PlayerCommand.txt | 1 - .../Round 029/OpponentCommand.txt | 1 - .../Round 029/PlayerCommand.txt | 1 - .../Round 030/OpponentCommand.txt | 1 - .../Round 030/PlayerCommand.txt | 1 - .../Round 031/OpponentCommand.txt | 1 - .../Round 031/PlayerCommand.txt | 1 - .../Round 032/OpponentCommand.txt | 1 - .../Round 032/PlayerCommand.txt | 1 - .../Round 033/OpponentCommand.txt | 1 - .../Round 033/PlayerCommand.txt | 1 - .../Round 034/OpponentCommand.txt | 1 - .../Round 034/PlayerCommand.txt | 1 - .../Round 035/OpponentCommand.txt | 1 - .../Round 035/PlayerCommand.txt | 1 - .../Round 036/OpponentCommand.txt | 1 - .../Round 036/PlayerCommand.txt | 1 - .../Round 037/OpponentCommand.txt | 1 - .../Round 037/PlayerCommand.txt | 1 - .../Round 038/OpponentCommand.txt | 1 - .../Round 038/PlayerCommand.txt | 1 - .../Round 039/OpponentCommand.txt | 1 - .../Round 039/PlayerCommand.txt | 1 - .../Round 040/OpponentCommand.txt | 1 - .../Round 040/PlayerCommand.txt | 1 - .../Round 041/OpponentCommand.txt | 1 - .../Round 041/PlayerCommand.txt | 1 - .../Round 042/OpponentCommand.txt | 1 - .../Round 042/PlayerCommand.txt | 1 - .../Round 043/OpponentCommand.txt | 1 - .../Round 043/PlayerCommand.txt | 1 - .../Round 044/OpponentCommand.txt | 1 - .../Round 044/PlayerCommand.txt | 1 - .../Round 045/OpponentCommand.txt | 1 - .../Round 045/PlayerCommand.txt | 1 - .../Round 046/OpponentCommand.txt | 1 - .../Round 046/PlayerCommand.txt | 1 - .../Round 047/OpponentCommand.txt | 1 - .../Round 047/PlayerCommand.txt | 1 - .../Round 048/OpponentCommand.txt | 1 - .../Round 048/PlayerCommand.txt | 1 - .../Round 049/OpponentCommand.txt | 1 - .../Round 049/PlayerCommand.txt | 1 - .../Round 050/OpponentCommand.txt | 1 - .../Round 050/PlayerCommand.txt | 1 - .../Round 051/OpponentCommand.txt | 1 - .../Round 051/PlayerCommand.txt | 1 - .../Round 052/OpponentCommand.txt | 1 - .../Round 052/PlayerCommand.txt | 1 - .../Round 053/OpponentCommand.txt | 1 - .../Round 053/PlayerCommand.txt | 1 - .../Round 054/OpponentCommand.txt | 1 - .../Round 054/PlayerCommand.txt | 1 - .../Round 055/OpponentCommand.txt | 1 - .../Round 055/PlayerCommand.txt | 1 - .../Round 056/OpponentCommand.txt | 1 - .../Round 056/PlayerCommand.txt | 1 - .../Round 057/OpponentCommand.txt | 1 - .../Round 057/PlayerCommand.txt | 1 - .../Round 058/OpponentCommand.txt | 1 - .../Round 058/PlayerCommand.txt | 1 - .../Round 059/OpponentCommand.txt | 1 - .../Round 059/PlayerCommand.txt | 1 - .../Round 060/OpponentCommand.txt | 1 - .../Round 060/PlayerCommand.txt | 1 - .../Round 061/OpponentCommand.txt | 1 - .../Round 061/PlayerCommand.txt | 1 - .../Round 062/OpponentCommand.txt | 1 - .../Round 062/PlayerCommand.txt | 1 - .../Round 063/OpponentCommand.txt | 1 - .../Round 063/PlayerCommand.txt | 1 - .../Round 064/OpponentCommand.txt | 1 - .../Round 064/PlayerCommand.txt | 1 - .../Round 065/OpponentCommand.txt | 1 - .../Round 065/PlayerCommand.txt | 1 - .../Round 066/OpponentCommand.txt | 1 - .../Round 066/PlayerCommand.txt | 1 - .../Round 067/OpponentCommand.txt | 1 - .../Round 067/PlayerCommand.txt | 1 - .../Round 068/OpponentCommand.txt | 1 - .../Round 068/PlayerCommand.txt | 1 - .../Round 069/OpponentCommand.txt | 1 - .../Round 069/PlayerCommand.txt | 1 - .../Round 070/OpponentCommand.txt | 1 - .../Round 070/PlayerCommand.txt | 1 - .../Round 071/OpponentCommand.txt | 1 - .../Round 071/PlayerCommand.txt | 1 - .../Round 072/OpponentCommand.txt | 1 - .../Round 072/PlayerCommand.txt | 1 - .../Round 073/OpponentCommand.txt | 1 - .../Round 073/PlayerCommand.txt | 1 - .../Round 074/OpponentCommand.txt | 1 - .../Round 074/PlayerCommand.txt | 1 - .../Round 075/OpponentCommand.txt | 1 - .../Round 075/PlayerCommand.txt | 1 - .../Round 000/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 000/PlayerCommand.txt | 1 - .../Round 001/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 001/PlayerCommand.txt | 1 - .../Round 002/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 002/PlayerCommand.txt | 1 - .../Round 003/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 003/PlayerCommand.txt | 1 - .../Round 004/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 004/PlayerCommand.txt | 1 - .../Round 005/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 005/PlayerCommand.txt | 1 - .../Round 006/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 006/PlayerCommand.txt | 1 - .../Round 007/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 007/PlayerCommand.txt | 1 - .../Round 008/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 008/PlayerCommand.txt | 1 - .../Round 009/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 009/PlayerCommand.txt | 1 - .../Round 010/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 010/PlayerCommand.txt | 1 - .../Round 011/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 011/PlayerCommand.txt | 1 - .../Round 012/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 012/PlayerCommand.txt | 1 - .../Round 013/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 013/PlayerCommand.txt | 1 - .../Round 014/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 014/PlayerCommand.txt | 1 - .../Round 015/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 015/PlayerCommand.txt | 1 - .../Round 016/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 016/PlayerCommand.txt | 1 - .../Round 017/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 017/PlayerCommand.txt | 1 - .../Round 018/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 018/PlayerCommand.txt | 1 - .../Round 019/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 019/PlayerCommand.txt | 1 - .../Round 020/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 020/PlayerCommand.txt | 1 - .../Round 021/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 021/PlayerCommand.txt | 1 - .../Round 022/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 022/PlayerCommand.txt | 1 - .../Round 023/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 023/PlayerCommand.txt | 1 - .../Round 024/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 024/PlayerCommand.txt | 1 - .../Round 025/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 025/PlayerCommand.txt | 1 - .../Round 026/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 026/PlayerCommand.txt | 1 - .../Round 027/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 027/PlayerCommand.txt | 1 - .../Round 028/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 028/PlayerCommand.txt | 1 - .../Round 029/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 029/PlayerCommand.txt | 1 - .../Round 030/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 030/PlayerCommand.txt | 1 - .../Round 031/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 031/PlayerCommand.txt | 1 - .../Round 032/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 032/PlayerCommand.txt | 1 - .../Round 033/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 033/PlayerCommand.txt | 1 - .../Round 034/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 034/PlayerCommand.txt | 1 - .../Round 035/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 035/PlayerCommand.txt | 1 - .../Round 036/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 036/PlayerCommand.txt | 1 - .../Round 037/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 037/PlayerCommand.txt | 1 - .../Round 038/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 038/PlayerCommand.txt | 1 - .../Round 039/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 039/PlayerCommand.txt | 1 - .../Round 040/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 040/PlayerCommand.txt | 1 - .../Round 041/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 041/PlayerCommand.txt | 1 - .../Round 042/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 042/PlayerCommand.txt | 1 - .../Round 043/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 043/PlayerCommand.txt | 1 - .../Round 044/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 044/PlayerCommand.txt | 1 - .../Round 045/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 045/PlayerCommand.txt | 1 - .../Round 046/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 046/PlayerCommand.txt | 1 - .../Round 047/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 047/PlayerCommand.txt | 1 - .../Round 048/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 048/PlayerCommand.txt | 1 - .../Round 049/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 049/PlayerCommand.txt | 1 - .../Round 050/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 050/PlayerCommand.txt | 1 - .../Round 051/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 051/PlayerCommand.txt | 1 - .../Round 052/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 052/PlayerCommand.txt | 1 - .../Round 053/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 053/PlayerCommand.txt | 1 - .../Round 054/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 054/PlayerCommand.txt | 1 - .../Round 055/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 055/PlayerCommand.txt | 1 - .../Round 056/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 056/PlayerCommand.txt | 1 - .../Round 057/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 057/PlayerCommand.txt | 1 - .../Round 058/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 058/PlayerCommand.txt | 1 - .../Round 059/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 059/PlayerCommand.txt | 1 - .../Round 060/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 060/PlayerCommand.txt | 1 - .../Round 061/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 061/PlayerCommand.txt | 1 - .../Round 062/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 062/PlayerCommand.txt | 1 - .../Round 063/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 063/PlayerCommand.txt | 1 - .../Round 064/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 064/PlayerCommand.txt | 1 - .../Round 065/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 065/PlayerCommand.txt | 1 - .../Round 066/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 066/PlayerCommand.txt | 1 - .../Round 067/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 067/PlayerCommand.txt | 1 - .../Round 068/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 068/PlayerCommand.txt | 1 - .../Round 069/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 069/PlayerCommand.txt | 1 - .../Round 070/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 070/PlayerCommand.txt | 1 - .../Round 071/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 071/PlayerCommand.txt | 1 - .../Round 072/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 072/PlayerCommand.txt | 1 - .../Round 073/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 073/PlayerCommand.txt | 1 - .../Round 074/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 074/PlayerCommand.txt | 1 - .../Round 075/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 075/PlayerCommand.txt | 1 - .../Round 076/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 076/PlayerCommand.txt | 1 - .../Round 077/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 077/PlayerCommand.txt | 1 - .../Round 078/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 078/PlayerCommand.txt | 1 - .../Round 079/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 079/PlayerCommand.txt | 1 - .../Round 080/OpponentCommand.txt | 1 - .../v300_normal_towers/Round 080/PlayerCommand.txt | 1 - 1154 files changed, 2583 insertions(+), 2583 deletions(-) delete mode 100644 .gitignore create mode 100644 2018-tower-defence/.gitignore create mode 100644 2018-tower-defence/Cargo.toml create mode 100644 2018-tower-defence/Makefile create mode 100644 2018-tower-defence/bot.json create mode 100755 2018-tower-defence/import-replay.sh create mode 100644 2018-tower-defence/license.org create mode 100644 2018-tower-defence/readme.org create mode 100644 2018-tower-defence/src/bin/perf-test.rs create mode 100644 2018-tower-defence/src/engine/bitwise_engine.rs create mode 100644 2018-tower-defence/src/engine/command.rs create mode 100644 2018-tower-defence/src/engine/constants.rs create mode 100644 2018-tower-defence/src/engine/geometry.rs create mode 100644 2018-tower-defence/src/engine/mod.rs create mode 100644 2018-tower-defence/src/engine/status.rs create mode 100644 2018-tower-defence/src/input/json.rs create mode 100644 2018-tower-defence/src/input/mod.rs create mode 100644 2018-tower-defence/src/lib.rs create mode 100644 2018-tower-defence/src/main.rs create mode 100644 2018-tower-defence/src/strategy/mod.rs create mode 100644 2018-tower-defence/src/strategy/monte_carlo.rs create mode 100644 2018-tower-defence/src/strategy/monte_carlo_tree.rs create mode 100644 2018-tower-defence/src/strategy/static_opening.rs create mode 100644 2018-tower-defence/tests/live_comparison.rs create mode 100644 2018-tower-defence/tests/monte_carlo_test.rs create mode 100644 2018-tower-defence/tests/state0.json create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 000/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 000/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 001/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 001/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 002/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 002/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 003/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 003/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 004/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 004/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 005/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 005/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 006/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 006/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 007/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 007/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 008/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 008/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 009/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 009/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 010/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 010/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 011/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 011/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 012/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 012/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 013/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 013/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 014/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 014/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 015/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 015/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 016/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 016/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 017/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 017/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 018/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 018/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 019/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 019/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 020/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 020/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 021/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 021/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 022/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 022/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 023/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 023/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 024/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 024/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 025/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 025/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 026/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 026/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 027/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 027/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 028/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 028/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 029/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 029/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 030/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 030/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 031/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 031/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 032/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 032/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 033/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 033/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 034/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 034/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 035/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 035/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 036/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 036/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 037/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 037/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 038/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 038/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 039/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 039/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 040/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 040/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 041/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 041/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 042/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 042/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 043/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 043/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 044/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 044/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 045/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 045/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 046/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 046/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 047/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 047/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 048/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 048/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 049/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 049/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 050/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 050/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 051/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 051/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 052/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 052/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 053/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 053/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 054/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 054/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 055/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 055/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 056/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 056/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 057/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 057/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 058/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 058/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 059/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 059/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 060/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 060/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 061/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 061/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 062/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 062/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 063/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 063/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 064/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 064/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 065/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 065/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 066/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 066/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 067/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 067/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 068/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 068/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 069/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 069/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 070/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 070/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 071/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 071/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 072/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 072/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 073/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 073/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 074/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 074/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 075/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 075/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 076/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 076/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 077/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 077/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 078/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 078/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 079/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 079/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 080/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 080/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 081/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 081/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 082/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 082/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 083/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 083/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 084/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 084/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 085/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 085/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 086/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 086/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 087/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 087/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 088/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 088/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 089/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 089/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 090/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 090/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 091/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 091/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 092/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 092/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 093/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 093/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 094/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 094/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 095/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 095/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 096/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 096/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 097/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 097/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 098/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 098/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 099/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 099/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 100/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 100/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 101/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 101/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 102/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 102/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 103/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 103/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 104/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 104/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 105/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 105/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 106/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 106/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 107/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 107/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 108/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 108/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 109/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 109/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 110/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 110/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 111/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 111/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 112/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 112/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 113/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 113/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 114/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 114/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 115/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 115/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 116/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 116/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 117/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 117/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 118/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain/Round 118/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 000/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 000/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 001/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 001/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 002/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 002/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 003/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 003/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 004/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 004/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 005/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 005/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 006/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 006/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 007/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 007/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 008/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 008/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 009/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 009/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 010/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 010/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 011/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 011/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 012/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 012/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 013/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 013/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 014/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 014/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 015/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 015/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 016/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 016/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 017/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 017/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 018/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 018/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 019/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 019/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 020/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 020/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 021/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 021/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 022/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 022/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 023/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 023/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 024/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 024/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 025/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 025/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 026/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 026/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 027/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 027/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 028/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 028/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 029/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 029/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 030/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 030/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 031/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 031/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 032/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 032/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 033/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 033/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 034/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 034/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 035/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 035/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 036/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 036/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 037/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 037/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 038/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 038/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 039/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 039/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 040/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 040/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 041/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 041/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 042/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 042/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 043/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 043/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 044/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 044/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 045/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 045/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 046/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 046/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 047/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 047/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 048/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 048/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 049/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 049/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 050/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 050/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 051/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 051/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 052/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 052/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 053/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 053/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 054/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 054/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 055/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 055/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 056/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 056/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 057/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 057/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 058/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 058/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 059/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 059/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 060/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 060/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 061/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 061/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 062/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 062/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 063/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 063/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 064/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 064/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 065/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 065/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 066/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 066/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 067/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 067/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 068/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 068/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 069/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 069/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 070/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 070/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 071/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 071/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 072/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 072/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 073/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 073/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 074/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 074/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 075/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 075/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 076/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 076/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 077/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 077/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 078/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 078/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 079/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 079/PlayerCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 080/OpponentCommand.txt create mode 100644 2018-tower-defence/tests/v300_normal_towers/Round 080/PlayerCommand.txt delete mode 100644 Cargo.toml delete mode 100644 Makefile delete mode 100644 bot.json delete mode 100755 import-replay.sh delete mode 100644 license.org delete mode 100644 readme.org delete mode 100644 src/bin/perf-test.rs delete mode 100644 src/engine/bitwise_engine.rs delete mode 100644 src/engine/command.rs delete mode 100644 src/engine/constants.rs delete mode 100644 src/engine/geometry.rs delete mode 100644 src/engine/mod.rs delete mode 100644 src/engine/status.rs delete mode 100644 src/input/json.rs delete mode 100644 src/input/mod.rs delete mode 100644 src/lib.rs delete mode 100644 src/main.rs delete mode 100644 src/strategy/mod.rs delete mode 100644 src/strategy/monte_carlo.rs delete mode 100644 src/strategy/monte_carlo_tree.rs delete mode 100644 src/strategy/static_opening.rs delete mode 100644 tests/live_comparison.rs delete mode 100644 tests/monte_carlo_test.rs delete mode 100644 tests/state0.json delete mode 100644 tests/v300_iron_curtain/Round 000/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 000/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 001/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 001/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 002/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 002/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 003/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 003/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 004/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 004/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 005/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 005/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 006/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 006/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 007/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 007/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 008/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 008/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 009/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 009/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 010/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 010/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 011/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 011/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 012/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 012/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 013/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 013/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 014/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 014/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 015/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 015/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 016/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 016/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 017/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 017/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 018/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 018/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 019/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 019/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 020/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 020/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 021/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 021/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 022/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 022/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 023/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 023/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 024/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 024/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 025/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 025/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 026/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 026/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 027/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 027/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 028/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 028/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 029/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 029/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 030/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 030/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 031/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 031/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 032/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 032/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 033/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 033/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 034/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 034/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 035/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 035/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 036/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 036/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 037/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 037/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 038/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 038/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 039/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 039/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 040/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 040/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 041/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 041/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 042/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 042/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 043/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 043/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 044/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 044/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 045/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 045/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 046/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 046/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 047/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 047/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 048/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 048/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 049/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 049/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 050/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 050/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 051/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 051/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 052/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 052/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 053/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 053/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 054/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 054/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 055/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 055/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 056/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 056/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 057/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 057/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 058/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 058/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 059/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 059/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 060/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 060/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 061/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 061/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 062/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 062/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 063/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 063/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 064/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 064/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 065/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 065/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 066/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 066/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 067/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 067/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 068/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 068/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 069/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 069/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 070/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 070/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 071/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 071/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 072/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 072/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 073/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 073/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 074/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 074/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 075/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 075/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 076/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 076/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 077/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 077/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 078/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 078/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 079/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 079/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 080/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 080/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 081/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 081/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 082/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 082/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 083/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 083/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 084/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 084/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 085/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 085/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 086/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 086/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 087/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 087/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 088/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 088/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 089/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 089/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 090/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 090/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 091/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 091/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 092/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 092/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 093/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 093/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 094/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 094/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 095/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 095/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 096/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 096/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 097/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 097/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 098/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 098/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 099/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 099/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 100/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 100/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 101/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 101/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 102/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 102/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 103/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 103/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 104/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 104/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 105/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 105/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 106/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 106/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 107/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 107/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 108/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 108/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 109/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 109/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 110/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 110/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 111/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 111/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 112/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 112/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 113/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 113/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 114/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 114/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 115/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 115/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 116/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 116/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 117/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 117/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 118/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain/Round 118/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt delete mode 100644 tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 000/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 000/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 001/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 001/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 002/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 002/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 003/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 003/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 004/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 004/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 005/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 005/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 006/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 006/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 007/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 007/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 008/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 008/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 009/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 009/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 010/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 010/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 011/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 011/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 012/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 012/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 013/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 013/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 014/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 014/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 015/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 015/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 016/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 016/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 017/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 017/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 018/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 018/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 019/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 019/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 020/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 020/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 021/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 021/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 022/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 022/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 023/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 023/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 024/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 024/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 025/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 025/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 026/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 026/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 027/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 027/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 028/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 028/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 029/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 029/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 030/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 030/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 031/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 031/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 032/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 032/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 033/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 033/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 034/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 034/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 035/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 035/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 036/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 036/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 037/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 037/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 038/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 038/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 039/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 039/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 040/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 040/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 041/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 041/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 042/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 042/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 043/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 043/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 044/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 044/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 045/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 045/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 046/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 046/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 047/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 047/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 048/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 048/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 049/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 049/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 050/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 050/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 051/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 051/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 052/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 052/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 053/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 053/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 054/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 054/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 055/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 055/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 056/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 056/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 057/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 057/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 058/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 058/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 059/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 059/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 060/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 060/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 061/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 061/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 062/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 062/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 063/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 063/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 064/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 064/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 065/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 065/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 066/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 066/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 067/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 067/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 068/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 068/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 069/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 069/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 070/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 070/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 071/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 071/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 072/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 072/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 073/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 073/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 074/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 074/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 075/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 075/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 076/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 076/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 077/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 077/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 078/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 078/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 079/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 079/PlayerCommand.txt delete mode 100644 tests/v300_normal_towers/Round 080/OpponentCommand.txt delete mode 100644 tests/v300_normal_towers/Round 080/PlayerCommand.txt diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 54a07fd..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -target -command.txt -state.json - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - -# These are backup files generated by rustfmt -**/*.rs.bk -/perf.data -/perf.data.old -/submission.zip diff --git a/2018-tower-defence/.gitignore b/2018-tower-defence/.gitignore new file mode 100644 index 0000000..54a07fd --- /dev/null +++ b/2018-tower-defence/.gitignore @@ -0,0 +1,13 @@ +target +command.txt +state.json + +# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries +# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html +Cargo.lock + +# These are backup files generated by rustfmt +**/*.rs.bk +/perf.data +/perf.data.old +/submission.zip diff --git a/2018-tower-defence/Cargo.toml b/2018-tower-defence/Cargo.toml new file mode 100644 index 0000000..120aa54 --- /dev/null +++ b/2018-tower-defence/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "zombot" +version = "3.0.0" + +[dependencies] +serde_derive = "1.0.71" +serde = "1.0.71" +serde_json = "1.0.26" + +rand = "0.5.5" +time = "0.1.4" +rayon = "1.0.2" + +arrayvec = "0.4.7" + +lazy_static = { version = "1.1.0", optional = true } + +[dev-dependencies] +proptest = "0.8.4" + +[features] +benchmarking = [] +single-threaded = [] +debug-decisions = [] +reduced-time = [] +extended-time = [] + +energy-cutoff = [] +discard-poor-performers = [] +heuristic-random = ["lazy_static"] +full-monte-carlo-tree = [] +static-opening = [] +weighted-win-ratio = [] + +default = ["energy-cutoff", "discard-poor-performers", "static-opening", "weighted-win-ratio"] + +[profile.release] +debug = true diff --git a/2018-tower-defence/Makefile b/2018-tower-defence/Makefile new file mode 100644 index 0000000..b5005da --- /dev/null +++ b/2018-tower-defence/Makefile @@ -0,0 +1,24 @@ +default: build + +build: + cargo build --release + +test: + cargo test --release + +bench: + cargo run --release --features "benchmarking" --bin perf-test + +profile: + cargo build --release --features "benchmarking single-threaded extended-time" + mkdir -p target/profile + perf record -g target/release/perf-test + perf report + +clean: + cargo clean + +submission.zip: bot.json Cargo.lock Cargo.toml src + zip -r9 submission.zip bot.json Cargo.lock Cargo.toml src + +.PHONY: default build test bench profile clean diff --git a/2018-tower-defence/bot.json b/2018-tower-defence/bot.json new file mode 100644 index 0000000..14ed686 --- /dev/null +++ b/2018-tower-defence/bot.json @@ -0,0 +1,8 @@ +{ + "author": "Justin Worthe", + "email": "justin@worthe-it.co.za", + "nickName": "Justin", + "botLocation": "/target/release/", + "botFileName": "zombot", + "botLanguage": "rust" +} diff --git a/2018-tower-defence/import-replay.sh b/2018-tower-defence/import-replay.sh new file mode 100755 index 0000000..2a1b27e --- /dev/null +++ b/2018-tower-defence/import-replay.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +REPLAY_FOLDER=$1 +OUTPUT_FOLDER=$2 + +mkdir -p $OUTPUT_FOLDER + +for round_folder in $REPLAY_FOLDER/*; do + round_name=`basename "$round_folder"` + mkdir -p "$OUTPUT_FOLDER/$round_name" + + player_folders=( "$round_folder"/* ) + player_folder=${player_folders[0]} + cp "$player_folder/JsonMap.json" "$OUTPUT_FOLDER/$round_name/state.json" + cp "$player_folder/PlayerCommand.txt" "$OUTPUT_FOLDER/$round_name/PlayerCommand.txt" + + opponent_folder=${player_folders[1]} + cp "$opponent_folder/PlayerCommand.txt" "$OUTPUT_FOLDER/$round_name/OpponentCommand.txt" +done diff --git a/2018-tower-defence/license.org b/2018-tower-defence/license.org new file mode 100644 index 0000000..d643604 --- /dev/null +++ b/2018-tower-defence/license.org @@ -0,0 +1,22 @@ +* The MIT License + +Copyright 2018 Justin Worthe + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/2018-tower-defence/readme.org b/2018-tower-defence/readme.org new file mode 100644 index 0000000..e947202 --- /dev/null +++ b/2018-tower-defence/readme.org @@ -0,0 +1,52 @@ +* Entelect Challenge 2018 - Tower Defence - Rustbot + +This is the source code for my [[https://challenge.entelect.co.za/][Entelect Challenge]] 2018 bot. It did +really well, coming in 3rd place in the finals. + +** How does it work? + +I've put together a blog post with the high level overview of how I +got to this point and how it works [[https://www.offerzen.com/blog/coding-for-the-win-how-i-built-a-tower-defence-bot][here]]. I will be putting up more +articles diving into the details shortly. + +The short explanation is that it's a Monte Carlo Tree Search. All +possible moved I can make from the first state are generated. I then +iterate through the list of possible moved and play random games that +start with that move. The move that statistically wins the most random +games is taken as the best move. + +** Environment Setup + +The Rust compiler tool-chain can be downloaded from the Rust project +website. + +https://www.rust-lang.org/en-US/install.html + +** Compilation + +The bot is written in Rust, and compiled using Cargo. For the sake of +running the bot in the tournament, you have to compile using the +~--release~ flag (this is specified in [[./bot.json]]). + +#+BEGIN_SRC shell + cargo build --release +#+END_SRC + +After compilation, there will be an executable in ~target/release/~. + +** Other useful commands + +You can find other interesting commands that I used in writing the bot +in the [[./Makefile]]. Some notable ones are: + +- ~make bench~: compiles with the benchmarking feature turned on, and + runs my end to end benchmark. +- ~make profile~: similar to the benchmark, but runs single threaded, + for a longer time, and uses ~perf~ to gather statistics on the run. +- ~make submission.zip~: Creates the zip file to upload to the + Entelect Challenge servers. + +** License + +See [[./license.org]] + diff --git a/2018-tower-defence/src/bin/perf-test.rs b/2018-tower-defence/src/bin/perf-test.rs new file mode 100644 index 0000000..ee0c2be --- /dev/null +++ b/2018-tower-defence/src/bin/perf-test.rs @@ -0,0 +1,26 @@ +extern crate zombot; +extern crate time; +use time::{PreciseTime, Duration}; + +use zombot::*; +use zombot::engine::constants::*; + +const STATE_PATH: &str = "tests/state0.json"; + +use std::process; + +fn main() { + println!("Running bitwise engine"); + let start_time = PreciseTime::now(); + let state = match input::json::read_bitwise_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => { + println!("Error while parsing JSON file: {}", error); + process::exit(1); + } + }; + let max_time = Duration::milliseconds(MAX_TIME_MILLIS); + + #[cfg(feature = "full-monte-carlo-tree")] strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); + #[cfg(not(feature = "full-monte-carlo-tree"))] strategy::monte_carlo::choose_move(&state, start_time, max_time); +} diff --git a/2018-tower-defence/src/engine/bitwise_engine.rs b/2018-tower-defence/src/engine/bitwise_engine.rs new file mode 100644 index 0000000..694a309 --- /dev/null +++ b/2018-tower-defence/src/engine/bitwise_engine.rs @@ -0,0 +1,483 @@ +use engine::command::{Command, BuildingType}; +use engine::geometry::Point; +use engine::constants::*; +use engine::status::GameStatus; + +use arrayvec::ArrayVec; + +const LEFT_COL_MASK: u64 = 0x0101_0101_0101_0101; +const RIGHT_COL_MASK: u64 = 0x8080_8080_8080_8080; + +const ROW_MASKS: [u64; MAP_HEIGHT as usize] = [ + 0x0000_0000_0000_00ff, + 0x0000_0000_0000_ff00, + 0x0000_0000_00ff_0000, + 0x0000_0000_ff00_0000, + 0x0000_00ff_0000_0000, + 0x0000_ff00_0000_0000, + 0x00ff_0000_0000_0000, + 0xff00_0000_0000_0000, +]; + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct BitwiseGameState { + pub status: GameStatus, + pub player: Player, + pub opponent: Player, + pub round: u16 +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct Player { + pub energy: u16, + pub health: u8, + pub unconstructed: ArrayVec<[UnconstructedBuilding; MAX_CONCURRENT_CONSTRUCTION]>, + pub buildings: [u64; DEFENCE_HEALTH], + pub occupied: u64, + + pub energy_towers: u64, + + pub missile_towers: [u64; MISSILE_COOLDOWN_STATES], + pub firing_tower: usize, + + pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], + pub tesla_cooldowns: ArrayVec<[TeslaCooldown; TESLA_MAX]>, + + pub iron_curtain_available: bool, + pub iron_curtain_remaining: u8, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct UnconstructedBuilding { + pub pos: Point, + pub construction_time_left: u8, + pub building_type: BuildingType +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct TeslaCooldown { + pub pos: Point, + pub cooldown: u8, + pub age: u16 +} + + +impl BitwiseGameState { + pub fn simulate(&mut self, player_command: Command, opponent_command: Command) -> GameStatus { + self.player.perform_command(player_command); + self.opponent.perform_command(opponent_command); + + self.player.update_construction(); + self.opponent.update_construction(); + + self.player.add_missiles(); + self.opponent.add_missiles(); + + BitwiseGameState::fire_teslas(&mut self.player, &mut self.opponent); + + BitwiseGameState::move_and_collide_missiles(&mut self.player, &mut self.opponent.missiles); + BitwiseGameState::move_and_collide_missiles(&mut self.opponent, &mut self.player.missiles); + + BitwiseGameState::add_energy(&mut self.player); + BitwiseGameState::add_energy(&mut self.opponent); + + BitwiseGameState::update_iron_curtain(&mut self.player, self.round); + BitwiseGameState::update_iron_curtain(&mut self.opponent, self.round); + + self.round += 1; + + self.update_status(); + self.status + } +} + +fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { + // Adapted from https://graphics.stanford.edu/~seander/bithacks.html#SelectPosFromMSBRank + let v = !occupied; + + let mut r = u64::from(v.count_ones()) - i; + + let a: u64 = v - ((v >> 1) & (!0u64/3)); + let b: u64 = (a & (!0u64/5)) + ((a >> 2) & (!0u64/5)); + let c: u64 = (b + (b >> 4)) & (!0u64/0x11); + let d: u64 = (c + (c >> 8)) & (!0u64/0x101); + let mut t: u64 = (d >> 32) + (d >> 48); + + let mut s: u64 = 64; + s -= (t.wrapping_sub(r) & 256) >> 3; r -= t & (t.wrapping_sub(r) >> 8); + t = (d >> (s - 16)) & 0xff; + s -= (t.wrapping_sub(r) & 256) >> 4; r -= t & (t.wrapping_sub(r) >> 8); + t = (c >> (s - 8)) & 0xf; + s -= (t.wrapping_sub(r) & 256) >> 5; r -= t & (t.wrapping_sub(r) >> 8); + t = (b >> (s - 4)) & 0x7; + s -= (t.wrapping_sub(r) & 256) >> 6; r -= t & (t.wrapping_sub(r) >> 8); + t = (a >> (s - 2)) & 0x3; + s -= (t.wrapping_sub(r) & 256) >> 7; r -= t & (t.wrapping_sub(r) >> 8); + t = (v >> (s - 1)) & 0x1; + s -= (t.wrapping_sub(r) & 256) >> 8; + s = 65 - s; + + 64 - s as u8 +} + +impl BitwiseGameState { + pub fn new( + player: Player, opponent: Player, + round: u16 + ) -> BitwiseGameState { + BitwiseGameState { + status: GameStatus::Continue, + player, opponent, + round + } + } + + /** + * This is to make things more comparable when writing tests, not + * for actual use in the engine. + */ + #[cfg(debug_assertions)] + pub fn sort(&mut self) { + for i in 0..MISSILE_MAX_SINGLE_CELL { + for j in i+1..MISSILE_MAX_SINGLE_CELL { + let move_down1 = !self.player.missiles[i].0 & self.player.missiles[j].0; + self.player.missiles[i].0 |= move_down1; + self.player.missiles[j].0 &= !move_down1; + + let move_down2 = !self.player.missiles[i].1 & self.player.missiles[j].1; + self.player.missiles[i].1 |= move_down2; + self.player.missiles[j].1 &= !move_down2; + + let move_down3 = !self.opponent.missiles[i].0 & self.opponent.missiles[j].0; + self.opponent.missiles[i].0 |= move_down3; + self.opponent.missiles[j].0 &= !move_down3; + + let move_down4 = !self.opponent.missiles[i].1 & self.opponent.missiles[j].1; + self.opponent.missiles[i].1 |= move_down4; + self.opponent.missiles[j].1 &= !move_down4; + } + } + + self.player.unconstructed.sort_by_key(|b| b.pos); + self.opponent.unconstructed.sort_by_key(|b| b.pos); + + self.player.tesla_cooldowns.sort_by_key(|b| b.pos); + self.opponent.tesla_cooldowns.sort_by_key(|b| b.pos); + + + while self.player.firing_tower > 0 { + self.player.firing_tower -= 1; + let zero = self.player.missile_towers[0]; + for i in 1..self.player.missile_towers.len() { + self.player.missile_towers[i-1] = self.player.missile_towers[i]; + } + let end = self.player.missile_towers.len()-1; + self.player.missile_towers[end] = zero; + } + while self.opponent.firing_tower > 0 { + self.opponent.firing_tower -= 1; + let zero = self.opponent.missile_towers[0]; + for i in 1..self.opponent.missile_towers.len() { + self.opponent.missile_towers[i-1] = self.opponent.missile_towers[i]; + } + let end = self.opponent.missile_towers.len()-1; + self.opponent.missile_towers[end] = zero; + } + } + + #[cfg(debug_assertions)] + pub fn sorted(&self) -> BitwiseGameState { + let mut res = self.clone(); + res.sort(); + res + } + + fn update_iron_curtain(player: &mut Player, round: u16) { + if round != 0 && round % IRON_CURTAIN_UNLOCK_INTERVAL == 0 { + player.iron_curtain_available = true; + } + player.iron_curtain_remaining = player.iron_curtain_remaining.saturating_sub(1); + } + + fn fire_teslas(player: &mut Player, opponent: &mut Player) { + BitwiseGameState::fire_single_players_teslas_without_cleanup(player, opponent); + BitwiseGameState::fire_single_players_teslas_without_cleanup(opponent, player); + + BitwiseGameState::update_tesla_activity(player); + BitwiseGameState::update_tesla_activity(opponent); + } + + fn fire_single_players_teslas_without_cleanup(player: &mut Player, opponent: &mut Player) { + // It's technically more accurate to have this in, but for + // most practical purposes it's a moot point and it's faster + // without it. + // + // player.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); + for tesla in player.tesla_cooldowns.iter_mut() { + tesla.age += 1; + if tesla.cooldown > 0 { + tesla.cooldown -= 1; + } else if player.energy >= TESLA_FIRING_ENERGY && opponent.iron_curtain_remaining > 0 { + player.energy -= TESLA_FIRING_ENERGY; + tesla.cooldown = TESLA_COOLDOWN; + } else if player.energy >= TESLA_FIRING_ENERGY { + player.energy -= TESLA_FIRING_ENERGY; + tesla.cooldown = TESLA_COOLDOWN; + + if tesla.pos.to_bitfield() & RIGHT_COL_MASK != 0 { + opponent.health = opponent.health.saturating_sub(TESLA_DAMAGE); + } + + let x = tesla.pos.x(); + let y = tesla.pos.y(); + let missed_cells = (u32::from(SINGLE_MAP_WIDTH - x)).saturating_sub(2); + + let top_row = y.saturating_sub(1); + let top_row_mask = ROW_MASKS[top_row as usize]; + let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; + + let mut hits = 0; + for _ in 0..(if y == 0 || y == MAP_HEIGHT-1 { 2 } else { 3 }) { + hits |= destroy_mask & opponent.buildings[0]; + destroy_mask &= !hits; + destroy_mask <<= SINGLE_MAP_WIDTH; + } + BitwiseGameState::destroy_buildings(opponent, hits); + } + } + } + + fn move_and_collide_missiles(opponent: &mut Player, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { + let mut destroyed = 0; + let mut damaging = 0; + for _ in 0..MISSILE_SPEED { + for missile in player_missiles.iter_mut() { + let swapping_sides = if opponent.iron_curtain_remaining > 0 { 0 } else { missile.0 & RIGHT_COL_MASK }; + let about_to_hit_opponent = missile.1 & LEFT_COL_MASK; + + missile.0 = (missile.0 & !RIGHT_COL_MASK) << 1; + missile.1 = ((missile.1 & !LEFT_COL_MASK) >> 1) | swapping_sides; + + damaging = (damaging << 1) | about_to_hit_opponent; + + let mut hits = 0; + for health_tier in (0..DEFENCE_HEALTH).rev() { + hits = opponent.buildings[health_tier] & missile.1; + missile.1 &= !hits; + opponent.buildings[health_tier] &= !hits; + } + destroyed |= hits; + } + } + let damage = damaging.count_ones() as u8 * MISSILE_DAMAGE; + opponent.health = opponent.health.saturating_sub(damage); + + BitwiseGameState::destroy_buildings(opponent, destroyed); + BitwiseGameState::update_tesla_activity(opponent); + } + + fn destroy_buildings(buildings: &mut Player, hit_mask: u64) { + let deconstruct_mask = !hit_mask; + + buildings.energy_towers &= deconstruct_mask; + for tier in &mut buildings.missile_towers { + *tier &= deconstruct_mask; + } + for tier in &mut buildings.buildings { + *tier &= deconstruct_mask; + } + buildings.occupied &= deconstruct_mask; + } + + fn update_tesla_activity(buildings: &mut Player) { + let occupied = buildings.occupied; + buildings.tesla_cooldowns.retain(|t| (t.pos.to_bitfield() & occupied) != 0); + } + + + fn add_energy(player: &mut Player) { + player.energy += player.energy_generated(); + } + + fn update_status(&mut self) { + let player_dead = self.player.health == 0; + let opponent_dead = self.opponent.health == 0; + self.status = match (player_dead, opponent_dead) { + (true, true) => GameStatus::Draw, + (false, true) => GameStatus::PlayerWon, + (true, false) => GameStatus::OpponentWon, + (false, false) => GameStatus::Continue, + }; + } + +} + +impl Player { + pub fn count_teslas(&self) -> usize { + self.tesla_cooldowns.len() + + self.unconstructed.iter().filter(|t| t.building_type == BuildingType::Tesla).count() + } + + pub fn empty() -> Player { + Player { + health: 0, + energy: 0, + unconstructed: ArrayVec::new(), + buildings: [0; DEFENCE_HEALTH], + occupied: 0, + energy_towers: 0, + missile_towers: [0; MISSILE_COOLDOWN_STATES], + firing_tower: 0, + missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], + tesla_cooldowns: ArrayVec::new(), + iron_curtain_available: false, + iron_curtain_remaining: 0, + } + } + + pub fn energy_generated(&self) -> u16 { + ENERGY_GENERATED_BASE + self.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER + } + + pub fn has_max_teslas(&self) -> bool { + self.count_teslas() >= TESLA_MAX + } + + pub fn can_build_iron_curtain(&self) -> bool { + self.iron_curtain_available && self.iron_curtain_remaining == 0 + } + + pub fn can_build_iron_curtain_in(&self, round: u16, moves: u8) -> bool { + let unlocks = round % IRON_CURTAIN_UNLOCK_INTERVAL > round + u16::from(moves) % IRON_CURTAIN_UNLOCK_INTERVAL; + (self.iron_curtain_available || unlocks) && self.iron_curtain_remaining.saturating_sub(moves) == 0 + } + + pub fn unoccupied_cell_count(&self) -> usize { self.occupied.count_zeros() as usize } + pub fn location_of_unoccupied_cell(&self, i: usize) -> Point { + let bit = find_bit_index_from_rank(self.occupied, i as u64); + let point = Point { index: bit }; + debug_assert!(point.to_bitfield() & self.occupied == 0); + point + } + + + fn perform_command(&mut self, command: Command) { + match command { + Command::Nothing => {}, + Command::Build(p, b) => { + let bitfield = p.to_bitfield(); + + let price = match b { + BuildingType::Attack => MISSILE_PRICE, + BuildingType::Defence => DEFENCE_PRICE, + BuildingType::Energy => ENERGY_PRICE, + BuildingType::Tesla => TESLA_PRICE, + }; + let construction_time = match b { + BuildingType::Attack => MISSILE_CONSTRUCTION_TIME, + BuildingType::Defence => DEFENCE_CONSTRUCTION_TIME, + BuildingType::Energy => ENERGY_CONSTRUCTION_TIME, + BuildingType::Tesla => TESLA_CONSTRUCTION_TIME, + }; + + // This is used internally. I should not be making + // invalid moves! + debug_assert!(self.buildings[0] & bitfield == 0); + debug_assert!(p.x() < FULL_MAP_WIDTH && p.y() < MAP_HEIGHT); + debug_assert!(self.energy >= price); + debug_assert!(b != BuildingType::Tesla || + self.count_teslas() < TESLA_MAX); + + self.energy -= price; + self.unconstructed.push(UnconstructedBuilding { + pos: p, + construction_time_left: construction_time, + building_type: b + }); + self.occupied |= bitfield; + }, + Command::IronCurtain => { + debug_assert!(self.iron_curtain_available); + debug_assert!(self.energy >= IRON_CURTAIN_PRICE); + + self.energy -= IRON_CURTAIN_PRICE; + self.iron_curtain_available = false; + self.iron_curtain_remaining = IRON_CURTAIN_DURATION; + } + } + } + + fn update_construction(&mut self) { + let mut buildings_len = self.unconstructed.len(); + for i in (0..buildings_len).rev() { + if self.unconstructed[i].construction_time_left == 0 { + let building_type = self.unconstructed[i].building_type; + let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; + + let pos = self.unconstructed[i].pos; + let bitfield = pos.to_bitfield(); + + for health_tier in 0..health { + self.buildings[health_tier] |= bitfield; + } + if building_type == BuildingType::Energy { + self.energy_towers |= bitfield; + } + if building_type == BuildingType::Attack { + self.missile_towers[self.firing_tower] |= bitfield; + } + if building_type == BuildingType::Tesla { + self.tesla_cooldowns.push(TeslaCooldown { + pos, + cooldown: 0, + age: 0 + }); + } + + buildings_len -= 1; + self.unconstructed.swap(i, buildings_len); + } else { + self.unconstructed[i].construction_time_left -= 1 + } + } + self.unconstructed.truncate(buildings_len); + } + + fn add_missiles(&mut self) { + let mut missiles = self.missile_towers[self.firing_tower]; + for mut tier in &mut self.missiles { + let setting = !tier.0 & missiles; + tier.0 |= setting; + missiles &= !setting; + } + self.firing_tower = (self.firing_tower + 1) % MISSILE_COOLDOWN_STATES; + } + + fn any_missile_towers(&self) -> u64 { + self.missile_towers.iter().fold(0, |acc, next| acc | next) + } + + pub fn count_attack_towers_in_row(&self, y: u8) -> u16 { + let mask = ROW_MASKS[y as usize]; + (self.any_missile_towers() & mask).count_ones() as u16 + } + + pub fn count_energy_towers_in_row(&self, y: u8) -> u16 { + let mask = ROW_MASKS[y as usize]; + (self.energy_towers & mask).count_ones() as u16 + } + + pub fn count_healthy_defence_in_row(&self, y: u8) -> u16 { + let mask = ROW_MASKS[y as usize]; + (self.buildings[1] & mask).count_ones() as u16 + } + + pub fn count_towers_in_row(&self, y: u8) -> u16 { + let mask = ROW_MASKS[y as usize]; + (self.occupied & mask).count_ones() as u16 + } + + pub fn count_towers(&self) -> u32 { + self.occupied.count_ones() + } +} diff --git a/2018-tower-defence/src/engine/command.rs b/2018-tower-defence/src/engine/command.rs new file mode 100644 index 0000000..76cfaee --- /dev/null +++ b/2018-tower-defence/src/engine/command.rs @@ -0,0 +1,66 @@ +use std::fmt; +use super::constants::*; +use super::geometry::Point; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum Command { + Nothing, + Build(Point, BuildingType), + IronCurtain +} + +impl fmt::Display for Command { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match *self { + Command::Nothing => write!(f, ""), + Command::Build(p, b) => write!(f, "{},{},{}", p.x(), p.y(), b as u8), + Command::IronCurtain => write!(f, "0,0,5") + } + } +} + +impl Command { + pub fn cant_build_yet(self, energy: u16) -> bool { + use self::Command::*; + + match self { + Nothing => false, + Build(_, b) => b.cant_build_yet(energy), + IronCurtain => energy < IRON_CURTAIN_PRICE + } + } +} + + +#[repr(u8)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum BuildingType { + Defence = 0, + Attack = 1, + Energy = 2, + Tesla = 4, +} + +impl BuildingType { + pub fn all() -> [BuildingType; NUMBER_OF_BUILDING_TYPES] { + use self::BuildingType::*; + [Defence, Attack, Energy, Tesla] + } + + pub fn from_u8(id: u8) -> Option { + use std::mem; + if id <= 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } + } + + pub fn cant_build_yet(self, energy: u16) -> bool { + use self::BuildingType::*; + + let required = match self { + Defence => DEFENCE_PRICE, + Attack => MISSILE_PRICE, + Energy => ENERGY_PRICE, + Tesla => TESLA_PRICE + }; + energy < required + } +} diff --git a/2018-tower-defence/src/engine/constants.rs b/2018-tower-defence/src/engine/constants.rs new file mode 100644 index 0000000..a66c9e1 --- /dev/null +++ b/2018-tower-defence/src/engine/constants.rs @@ -0,0 +1,52 @@ +pub const FULL_MAP_WIDTH: u8 = 16; +pub const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; +pub const MAP_HEIGHT: u8 = 8; + +pub const MAX_MOVES: u16 = 400; +pub const INIT_SEED: [u8;16] = [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda]; + +pub const MISSILE_COOLDOWN: usize = 3; +pub const MISSILE_COOLDOWN_STATES: usize = MISSILE_COOLDOWN+1; +pub const MISSILE_SPEED: usize = 2; +pub const MISSILE_MAX_SINGLE_CELL: usize = SINGLE_MAP_WIDTH as usize / MISSILE_SPEED; +pub const MISSILE_DAMAGE: u8 = 5; +pub const MISSILE_PRICE: u16 = 30; +pub const MISSILE_CONSTRUCTION_TIME: u8 = 1; + +pub const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits +pub const DEFENCE_PRICE: u16 = 30; +pub const DEFENCE_CONSTRUCTION_TIME: u8 = 3; + +pub const TESLA_MAX: usize = 2; +pub const TESLA_COOLDOWN: u8 = 10; +pub const TESLA_FIRING_ENERGY: u16 = 100; +pub const TESLA_DAMAGE: u8 = 20; +pub const TESLA_PRICE: u16 = 100; +pub const TESLA_CONSTRUCTION_TIME: u8 = 10; + +pub const ENERGY_GENERATED_BASE: u16 = 5; +pub const ENERGY_GENERATED_TOWER: u16 = 3; +pub const ENERGY_PRICE: u16 = 20; +pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; + +pub const IRON_CURTAIN_PRICE: u16 = 100; +pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30; +pub const IRON_CURTAIN_DURATION: u8 = 6; + +pub const DECONSTRUCT_ENERGY: u16 = 5; + +pub const MAX_CONCURRENT_CONSTRUCTION: usize = 6; //2 teslas, and 3 of anything else, 1 extra because it's push here then update construction times + + +pub const NUMBER_OF_BUILDING_TYPES: usize = 4; +pub const NUMBER_OF_MAP_POSITIONS: usize = SINGLE_MAP_WIDTH as usize * MAP_HEIGHT as usize; +pub const NUMBER_OF_POSSIBLE_MOVES: usize = NUMBER_OF_MAP_POSITIONS * NUMBER_OF_BUILDING_TYPES + 2; + +#[cfg(not(any(feature = "reduced-time", feature = "extended-time")))] +pub const MAX_TIME_MILLIS: i64 = 1950; + +#[cfg(feature = "reduced-time")] +pub const MAX_TIME_MILLIS: i64 = 950; + +#[cfg(feature = "extended-time")] +pub const MAX_TIME_MILLIS: i64 = 19950; diff --git a/2018-tower-defence/src/engine/geometry.rs b/2018-tower-defence/src/engine/geometry.rs new file mode 100644 index 0000000..9cd1d90 --- /dev/null +++ b/2018-tower-defence/src/engine/geometry.rs @@ -0,0 +1,71 @@ +use engine::constants::*; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct Point { + pub index: u8 +} + +impl Point { + pub fn new(x: u8, y: u8) -> Point { + let flipped_x = if x >= SINGLE_MAP_WIDTH { + FULL_MAP_WIDTH - x - 1 + } else { + x + }; + Point { + index: y * SINGLE_MAP_WIDTH + flipped_x + } + } + + pub fn new_index(index: u8) -> Point { + Point { + index + } + } + + pub fn new_double_bitfield(x: u8, y: u8, is_left_player: bool) -> (u64, u64) { + let bitfield = Point::new(x, y).to_bitfield(); + if (x >= SINGLE_MAP_WIDTH) == is_left_player { + (0, bitfield) + } else { + (bitfield, 0) + } + } + + pub fn x(self) -> u8 { + self.index % SINGLE_MAP_WIDTH + } + + pub fn y(self) -> u8 { + self.index / SINGLE_MAP_WIDTH + } +} + +impl Point { + /** + * # Bitfields + * + * 0,0 is the top left point. + * >> (towards 0) moves bits towards the player that owns that side + * << (towards max) moves bits towards the opponent + * This involves mirroring the x dimension for the opponent's side + */ + + pub fn to_bitfield(self) -> u64 { + 1u64 << self.index + } +} + +use std::cmp::Ord; +use std::cmp::Ordering; + +impl PartialOrd for Point { + fn partial_cmp(&self, other: &Point) -> Option { + Some(self.cmp(other)) + } +} +impl Ord for Point { + fn cmp(&self, other: &Point) -> Ordering { + self.index.cmp(&other.index) + } +} diff --git a/2018-tower-defence/src/engine/mod.rs b/2018-tower-defence/src/engine/mod.rs new file mode 100644 index 0000000..f98ef6b --- /dev/null +++ b/2018-tower-defence/src/engine/mod.rs @@ -0,0 +1,5 @@ +pub mod command; +pub mod geometry; +pub mod bitwise_engine; +pub mod constants; +pub mod status; diff --git a/2018-tower-defence/src/engine/status.rs b/2018-tower-defence/src/engine/status.rs new file mode 100644 index 0000000..d6ee4dd --- /dev/null +++ b/2018-tower-defence/src/engine/status.rs @@ -0,0 +1,8 @@ +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum GameStatus { + Continue, + PlayerWon, + OpponentWon, + Draw +} + diff --git a/2018-tower-defence/src/input/json.rs b/2018-tower-defence/src/input/json.rs new file mode 100644 index 0000000..a71d49e --- /dev/null +++ b/2018-tower-defence/src/input/json.rs @@ -0,0 +1,191 @@ +use std::fs::File; +use std::io::prelude::*; +use serde_json; +use std::error::Error; + +use engine; +use engine::command; +use engine::bitwise_engine; +use engine::constants::*; + +pub fn read_bitwise_state_from_file(filename: &str) -> Result> { + let mut file = File::open(filename)?; + let mut content = String::new(); + file.read_to_string(&mut content)?; + let state: State = serde_json::from_str(content.as_ref())?; + + let engine_state = state.to_bitwise_engine(); + Ok(engine_state) +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct State { + game_details: GameDetails, + players: Vec, + game_map: Vec>, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameDetails { + round: u16 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct Player { + player_type: char, + energy: u16, + health: u8, + iron_curtain_available: bool, + active_iron_curtain_lifetime: i16 +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct GameCell { + x: u8, + y: u8, + buildings: Vec, + missiles: Vec, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct BuildingState { + health: u8, + construction_time_left: i16, + weapon_cooldown_time_left: u8, + building_type: String, + x: u8, + y: u8, + player_type: char +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct MissileState { + player_type: char +} + + +impl State { + fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { + let mut player = bitwise_engine::Player::empty(); + let mut opponent = bitwise_engine::Player::empty(); + + self.player().map_onto_engine(&mut player); + self.opponent().map_onto_engine(&mut opponent); + + for row in &self.game_map { + for cell in row { + let point = engine::geometry::Point::new(cell.x, cell.y); + for building in &cell.buildings { + let building_type = building.convert_building_type(); + + let mut bitwise_buildings = if building.player_type == 'A' { + &mut player + } else { + &mut opponent + }; + let bitfield = point.to_bitfield(); + + bitwise_buildings.occupied |= bitfield; + if building.construction_time_left >= 0 { + bitwise_buildings.unconstructed.push(building.to_bitwise_engine_unconstructed()); + } else { + for health_tier in 0..DEFENCE_HEALTH { + if building.health > health_tier as u8 * MISSILE_DAMAGE { + bitwise_buildings.buildings[health_tier] |= bitfield; + } + } + if building_type == command::BuildingType::Energy { + bitwise_buildings.energy_towers |= bitfield; + } + else if building_type == command::BuildingType::Attack { + for cooldown_tier in 0..MISSILE_COOLDOWN + 1 { + if building.weapon_cooldown_time_left == cooldown_tier as u8 { + bitwise_buildings.missile_towers[cooldown_tier] |= bitfield; + } + } + } + else if building_type == command::BuildingType::Tesla { + bitwise_buildings.tesla_cooldowns.push(bitwise_engine::TeslaCooldown { + pos: point, + cooldown: building.weapon_cooldown_time_left, + age: building.construction_time_left.abs() as u16 + }); + } + } + } + for missile in &cell.missiles { + let (mut left, mut right) = engine::geometry::Point::new_double_bitfield(cell.x, cell.y, missile.player_type == 'A'); + let mut bitwise_buildings = if missile.player_type == 'A' { + &mut player + } else { + &mut opponent + }; + + for mut tier in &mut bitwise_buildings.missiles { + let setting = (!tier.0 & left, !tier.1 & right); + tier.0 |= setting.0; + tier.1 |= setting.1; + left &= !setting.0; + right &= !setting.1; + } + } + } + } + + bitwise_engine::BitwiseGameState::new( + player, opponent, + self.game_details.round + ) + } + + fn player(&self) -> &Player { + self.players.iter() + .find(|p| p.player_type == 'A') + .expect("Player character did not appear in state.json") + } + + fn opponent(&self) -> &Player { + self.players.iter() + .find(|p| p.player_type == 'B') + .expect("Opponent character did not appear in state.json") + } +} + +impl BuildingState { + fn to_bitwise_engine_unconstructed(&self) -> bitwise_engine::UnconstructedBuilding { + bitwise_engine::UnconstructedBuilding { + pos: engine::geometry::Point::new(self.x, self.y), + construction_time_left: self.construction_time_left as u8, // > 0 check already happened + building_type: self.convert_building_type() + } + } + + fn convert_building_type(&self) -> command::BuildingType { + match self.building_type.as_ref() { + "ATTACK" => command::BuildingType::Attack, + "ENERGY" => command::BuildingType::Energy, + "TESLA" => command::BuildingType::Tesla, + _ => command::BuildingType::Defence, + } + } +} + + +impl Player { + fn map_onto_engine(&self, engine_player: &mut bitwise_engine::Player) { + engine_player.health = self.health; + engine_player.energy = self.energy; + engine_player.iron_curtain_available = self.iron_curtain_available; + engine_player.iron_curtain_remaining = if self.active_iron_curtain_lifetime < 0 { + 0 + } else { + self.active_iron_curtain_lifetime as u8 + }; + } +} diff --git a/2018-tower-defence/src/input/mod.rs b/2018-tower-defence/src/input/mod.rs new file mode 100644 index 0000000..22fdbb3 --- /dev/null +++ b/2018-tower-defence/src/input/mod.rs @@ -0,0 +1 @@ +pub mod json; diff --git a/2018-tower-defence/src/lib.rs b/2018-tower-defence/src/lib.rs new file mode 100644 index 0000000..6cd8730 --- /dev/null +++ b/2018-tower-defence/src/lib.rs @@ -0,0 +1,20 @@ +extern crate serde; +extern crate serde_json; + +#[macro_use] +extern crate serde_derive; + +extern crate rand; +extern crate time; + +extern crate rayon; + +extern crate arrayvec; + +#[macro_use] +#[cfg(feature = "heuristic-random")] +extern crate lazy_static; + +pub mod input; +pub mod engine; +pub mod strategy; diff --git a/2018-tower-defence/src/main.rs b/2018-tower-defence/src/main.rs new file mode 100644 index 0000000..4fa0366 --- /dev/null +++ b/2018-tower-defence/src/main.rs @@ -0,0 +1,55 @@ +extern crate zombot; +extern crate time; +use time::{PreciseTime, Duration}; + +use zombot::*; +use zombot::engine::constants::*; +use zombot::engine::command::Command; + +use std::error::Error; + +const STATE_PATH: &str = "state.json"; + +const COMMAND_PATH: &str = "command.txt"; + +use std::fs::File; +use std::io::prelude::*; +use std::process; + +fn write_command(filename: &str, command: Command) -> Result<(), Box > { + let mut file = File::create(filename)?; + write!(file, "{}", command)?; + Ok(()) +} + +fn main() { + let start_time = PreciseTime::now(); + let max_time = Duration::milliseconds(MAX_TIME_MILLIS); + + let state = match input::json::read_bitwise_state_from_file(STATE_PATH) { + Ok(ok) => ok, + Err(error) => { + println!("Error while parsing JSON file: {}", error); + process::exit(1); + } + }; + + let command = if cfg!(feature = "static-opening") && state.round < strategy::static_opening::STATIC_OPENING_LENGTH { + strategy::static_opening::choose_move(&state) + } else if cfg!(feature = "full-monte-carlo-tree") { + strategy::monte_carlo_tree::choose_move(&state, start_time, max_time) + } else { + strategy::monte_carlo::choose_move(&state, start_time, max_time) + }; + + match write_command(COMMAND_PATH, command) { + Ok(()) => {} + Err(error) => { + println!("Error while writing command file: {}", error); + process::exit(1); + } + } + + println!("Elapsed time: {}", start_time.to(PreciseTime::now())); +} + diff --git a/2018-tower-defence/src/strategy/mod.rs b/2018-tower-defence/src/strategy/mod.rs new file mode 100644 index 0000000..9ec41bb --- /dev/null +++ b/2018-tower-defence/src/strategy/mod.rs @@ -0,0 +1,3 @@ +pub mod monte_carlo; +pub mod monte_carlo_tree; +pub mod static_opening; diff --git a/2018-tower-defence/src/strategy/monte_carlo.rs b/2018-tower-defence/src/strategy/monte_carlo.rs new file mode 100644 index 0000000..adbb911 --- /dev/null +++ b/2018-tower-defence/src/strategy/monte_carlo.rs @@ -0,0 +1,505 @@ +use engine::command::*; +use engine::status::GameStatus; +use engine::bitwise_engine::{Player, BitwiseGameState}; +use engine::constants::*; + +use std::fmt; + +use rand::{Rng, XorShiftRng, SeedableRng}; + +use arrayvec::ArrayVec; + +use time::{Duration, PreciseTime}; + +#[cfg(not(feature = "single-threaded"))] +use rayon::prelude::*; + +#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 50; +#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 120; + +pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { + let mut command_scores = CommandScore::init_command_scores(state); + + let command = { + let best_command_score = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); + match best_command_score { + Some(best) if !best.starts_with_nothing => best.command, + _ => Command::Nothing + } + }; + + #[cfg(feature = "benchmarking")] + { + let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); + println!("Iterations: {}", total_iterations); + } + #[cfg(feature = "debug-decisions")] + { + debug_print_choices("ENERGY", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Energy) => Some((p, score.win_ratio())), + _ => None + }); + debug_print_choices("ATTACK", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Attack) => Some((p, score.win_ratio())), + _ => None + }); + debug_print_choices("DEFENCE", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Defence) => Some((p, score.win_ratio())), + _ => None + }); + debug_print_choices("TESLA", &command_scores, |score| match score.command { + Command::Build(p, BuildingType::Tesla) => Some((p, score.win_ratio())), + _ => None + }); + + println!("NOTHING"); + println!("{}", command_scores.iter().find(|c| c.command == Command::Nothing).map(|s| s.win_ratio()).unwrap_or(0)); + println!(); + + println!("IRON CURTAIN"); + println!("{}", command_scores.iter().find(|c| c.command == Command::IronCurtain).map(|s| s.win_ratio()).unwrap_or(0)); + println!(); + } + + command +} + +#[cfg(feature = "debug-decisions")] +fn debug_print_choices Option<(Point, i32)>>(label: &str, command_scores: &[CommandScore], extractor: F) { + println!("#+NAME: {}", label); + println!("#+PLOT: type:3d with:pm3d"); + let relevant_moves: Vec<(Point, i32)> = command_scores.iter() + .filter_map(extractor) + .collect(); + for y in 0..MAP_HEIGHT { + for x in 0..SINGLE_MAP_WIDTH { + let point = Point::new(x, y); + let score = relevant_moves.iter().find(|(p, _)| *p == point); + print!(" | {}", score.map(|(_,s)| s).cloned().unwrap_or(0)); + } + println!(" |"); + } + println!(); +} + +#[cfg(not(feature = "discard-poor-performers"))] +fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { + loop { + simulate_all_options_once(command_scores, state); + if start_time.to(PreciseTime::now()) > max_time { + break; + } + } + command_scores.iter().max_by_key(|&c| c.win_ratio()) +} + +#[cfg(feature = "discard-poor-performers")] +fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { + use std::cmp; + let min_options = cmp::min(command_scores.len(), 5); + + let maxes = [max_time / 3, max_time * 2 / 3, max_time]; + for (i, &max) in maxes.iter().enumerate() { + let new_length = cmp::max(min_options, command_scores.len() / (2usize.pow(i as u32))); + let active_scores = &mut command_scores[0..new_length]; + loop { + simulate_all_options_once(active_scores, state); + if start_time.to(PreciseTime::now()) > max { + break; + } + } + active_scores.sort_unstable_by_key(|c| -c.win_ratio()); + } + command_scores.first() +} + +#[cfg(feature = "single-threaded")] +fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &BitwiseGameState) { + command_scores.iter_mut() + .for_each(|score| { + let mut rng = XorShiftRng::from_seed(score.next_seed); + simulate_to_endstate(score, state, &mut rng); + }); +} + +#[cfg(not(feature = "single-threaded"))] +fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &BitwiseGameState) { + command_scores.par_iter_mut() + .for_each(|score| { + let mut rng = XorShiftRng::from_seed(score.next_seed); + simulate_to_endstate(score, state, &mut rng); + }); +} + +fn simulate_to_endstate(command_score: &mut CommandScore, state: &BitwiseGameState, rng: &mut R) { + let mut state_mut = state.clone(); + + let mut status = GameStatus::Continue; //state_mut.simulate(command_score.command, opponent_first); + let mut first_move_made = false; + + for _ in 0..MAX_MOVES { + if status != GameStatus::Continue { + break; + } + + let player_command = if first_move_made { + random_move(&state_mut.player, &state_mut.opponent, rng) + } else { + let do_nothing = command_score.command.cant_build_yet(state_mut.player.energy); + first_move_made = !do_nothing; + if do_nothing { Command::Nothing } else { command_score.command } + }; + let opponent_command = random_move(&state_mut.opponent, &state_mut.player, rng); + status = state_mut.simulate(player_command, opponent_command); + } + + let mut next_seed: [u8;16] = [0; 16]; + rng.fill_bytes(&mut next_seed); + match status { + GameStatus::PlayerWon => command_score.add_victory(state_mut.player.count_towers() as i32 - state_mut.opponent.count_towers() as i32, next_seed), + GameStatus::OpponentWon => command_score.add_defeat(state_mut.opponent.count_towers() as i32 - state_mut.player.count_towers() as i32, next_seed), + GameStatus::Continue => command_score.add_stalemate(next_seed), + GameStatus::Draw => command_score.add_draw(next_seed) + } +} + +#[cfg(feature = "heuristic-random")] +pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Command { + lazy_static! { + static ref MOVES: [Command; NUMBER_OF_POSSIBLE_MOVES] = { + let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; + m[1] = Command::IronCurtain; + let mut i = 2; + for b in &[BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla] { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + m[i] = Command::Build(point, *b); + i += 1; + } + } + m + }; + } + + let mut cdf_other = [0; 2]; + let mut cdf_energy = [0; NUMBER_OF_MAP_POSITIONS]; + let mut cdf_defence = [0; NUMBER_OF_MAP_POSITIONS]; + let mut cdf_attack = [0; NUMBER_OF_MAP_POSITIONS]; + let mut cdf_tesla = [0; NUMBER_OF_MAP_POSITIONS]; + + let mut attack_metric_per_row = [0; MAP_HEIGHT as usize]; + let mut defence_metric_per_row = [0; MAP_HEIGHT as usize]; + for y in 0..MAP_HEIGHT { + let opponent_energy = opponent.count_energy_towers_in_row(y); + let opponent_attack = opponent.count_attack_towers_in_row(y); + let opponent_towers = opponent.count_towers_in_row(y); + + let player_energy = player.count_energy_towers_in_row(y); + let player_attack = player.count_attack_towers_in_row(y); + let player_towers = player.count_towers_in_row(y); + + defence_metric_per_row[y as usize] = if opponent_attack == 0 { 0 } else { opponent_attack + player_towers }; + attack_metric_per_row[y as usize] = 8 + opponent_energy + opponent_towers + player_energy - player_attack; + } + + + let mut other_end: u16 = 0; + // Nothing + { + let weight = if player.can_build_iron_curtain() && player.energy < IRON_CURTAIN_PRICE { + 5 + } else { + 0 + }; + other_end += weight; + cdf_other[0] = other_end; + } + + // Iron Curtain + { + let weight = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { + 50 + } else { + 0 + }; + other_end += weight; + cdf_other[1] = other_end; + } + + // Energy + let mut energy_end: u16 = other_end; + let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || + player.energy <= ENERGY_STORAGE_CUTOFF; + if needs_energy && player.energy >= ENERGY_PRICE { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.occupied & point.to_bitfield() != 0 { + 0 + } else { + 2 + }; + + energy_end += weight; + cdf_energy[p as usize] = energy_end; + } + } + + // Defence + let mut defence_end: u16 = energy_end; + if player.energy >= DEFENCE_PRICE { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let y = usize::from(point.y()); + + let weight = if player.occupied & point.to_bitfield() != 0 || point.x() < 4 { + 0 + } else { + defence_metric_per_row[y] + }; + + defence_end += weight; + cdf_defence[p as usize] = defence_end; + } + } + + // Attack + let mut attack_end: u16 = defence_end; + if player.energy >= MISSILE_PRICE { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if player.occupied & point.to_bitfield() != 0 { + 0 + } else { + let y = usize::from(point.y()); + attack_metric_per_row[y] + }; + + attack_end += weight; + cdf_attack[p as usize] = attack_end; + } + } + + // Tesla + let mut tesla_end: u16 = attack_end; + let cant_tesla = player.has_max_teslas() || player.energy < TESLA_PRICE; + if !cant_tesla { + for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { + let point = Point::new_index(p); + let weight = if (player.occupied & point.to_bitfield() != 0) || point.y() < 7 { + 0 + } else { + 10 + }; + + tesla_end += weight; + cdf_tesla[p as usize] = tesla_end; + } + } + + let cumulative_distribution = tesla_end; + + if cumulative_distribution == 0 { + return Command::Nothing; + } + + let choice = rng.gen_range(0, cumulative_distribution); + + let index = match choice { + c if c < other_end => cdf_other.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + c if c < energy_end => 2 + cdf_energy.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + c if c < defence_end => 2 + NUMBER_OF_MAP_POSITIONS + cdf_defence.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + c if c < attack_end => 2 + 2 * NUMBER_OF_MAP_POSITIONS + cdf_attack.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + _ => 2 + 3 * NUMBER_OF_MAP_POSITIONS + cdf_tesla.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), + }; + + MOVES[index] +} + +#[cfg(not(feature = "heuristic-random"))] +pub fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { + let free_positions_count = player.unoccupied_cell_count(); + + let open_building_spot = free_positions_count > 0; + + let all_buildings = sensible_buildings(player, open_building_spot); + + let iron_curtain_count = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { 1 } else { 0 }; + let nothing_count = 1; + + let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); + + if building_choice_index < all_buildings.len() { + let position_choice = rng.gen_range(0, free_positions_count); + Command::Build( + player.location_of_unoccupied_cell(position_choice), + all_buildings[building_choice_index] + ) + } + else if building_choice_index == all_buildings.len() { + Command::Nothing + } else { + Command::IronCurtain + } +} + +#[derive(Debug)] +struct CommandScore { + command: Command, + starts_with_nothing: bool, + victory_score: i32, + victories: u32, + defeat_score: i32, + defeats: u32, + draws: u32, + stalemates: u32, + attempts: u32, + next_seed: [u8; 16] +} + +impl CommandScore { + fn new(command: Command, starts_with_nothing: bool) -> CommandScore { + CommandScore { + command, starts_with_nothing, + victory_score: 0, + victories: 0, + defeat_score: 0, + defeats: 0, + draws: 0, + stalemates: 0, + attempts: 0, + next_seed: INIT_SEED + } + } + + fn add_victory(&mut self, weight: i32, next_seed: [u8; 16]) { + use std::cmp; + self.victory_score += cmp::max(weight, 1); + self.victories += 1; + self.attempts += 1; + self.next_seed = next_seed; + } + + fn add_defeat(&mut self, weight: i32, next_seed: [u8; 16]) { + use std::cmp; + self.defeat_score += cmp::max(weight, 1); + self.defeats += 1; + self.attempts += 1; + self.next_seed = next_seed; + } + + fn add_draw(&mut self, next_seed: [u8; 16]) { + self.draws += 1; + self.attempts += 1; + self.next_seed = next_seed; + } + + fn add_stalemate(&mut self, next_seed: [u8; 16]) { + self.stalemates += 1; + self.attempts += 1; + self.next_seed = next_seed; + } + + #[cfg(feature = "weighted-win-ratio")] + fn win_ratio(&self) -> i32 { + (self.victory_score - self.defeat_score) * 10000 / (self.attempts as i32) + } + + #[cfg(not(feature = "weighted-win-ratio"))] + fn win_ratio(&self) -> i32 { + (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) + } + + fn init_command_scores(state: &BitwiseGameState) -> Vec { + let unoccupied_cells_count = state.player.unoccupied_cell_count(); + let unoccupied_cells = (0..unoccupied_cells_count) + .map(|i| state.player.location_of_unoccupied_cell(i)); + let energy_generated = state.player.energy_generated(); + + let mut all_buildings: ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> = ArrayVec::new(); + if DEFENCE_PRICE <= state.player.energy { + all_buildings.push(BuildingType::Defence); + } + if MISSILE_PRICE <= state.player.energy { + all_buildings.push(BuildingType::Attack); + } + if ENERGY_PRICE <= state.player.energy { + all_buildings.push(BuildingType::Energy); + } + if !state.player.has_max_teslas() && (TESLA_PRICE.saturating_sub(state.player.energy) / energy_generated < 4) { + all_buildings.push(BuildingType::Tesla); + } + + let building_command_count = unoccupied_cells.len()*all_buildings.len(); + + let mut commands = Vec::with_capacity(building_command_count + 1); + let time_to_curtain_energy = (IRON_CURTAIN_PRICE.saturating_sub(state.player.energy) / energy_generated) as u8; + + if time_to_curtain_energy < 4 && state.player.can_build_iron_curtain_in(state.round, time_to_curtain_energy) { + commands.push(CommandScore::new(Command::IronCurtain, state.player.energy < IRON_CURTAIN_PRICE)); + } + + for position in unoccupied_cells { + for &building in &all_buildings { + commands.push(CommandScore::new(Command::Build(position, building), building.cant_build_yet(state.player.energy))); + } + } + + commands + } +} + +impl fmt::Display for CommandScore { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{},{}", self.command, self.win_ratio()) + } +} + +#[cfg(all(not(feature = "heuristic-random"), not(feature = "energy-cutoff")))] +fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { + let mut result = ArrayVec::new(); + if !open_building_spot { + return result; + } + + if DEFENCE_PRICE <= player.energy { + result.push(BuildingType::Defence); + } + if MISSILE_PRICE <= player.energy { + result.push(BuildingType::Attack); + } + if ENERGY_PRICE <= player.energy { + result.push(BuildingType::Energy); + } + if TESLA_PRICE <= player.energy && !player.has_max_teslas() { + result.push(BuildingType::Tesla); + } + + result +} + +#[cfg(all(not(feature = "heuristic-random"), feature = "energy-cutoff"))] +fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { + let mut result = ArrayVec::new(); + if !open_building_spot { + return result; + } + + let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || + player.energy <= ENERGY_STORAGE_CUTOFF; + + if DEFENCE_PRICE <= player.energy { + result.push(BuildingType::Defence); + } + if MISSILE_PRICE <= player.energy { + result.push(BuildingType::Attack); + } + if ENERGY_PRICE <= player.energy && needs_energy { + result.push(BuildingType::Energy); + } + if TESLA_PRICE <= player.energy && !player.has_max_teslas() { + result.push(BuildingType::Tesla); + } + + result +} + diff --git a/2018-tower-defence/src/strategy/monte_carlo_tree.rs b/2018-tower-defence/src/strategy/monte_carlo_tree.rs new file mode 100644 index 0000000..24b2088 --- /dev/null +++ b/2018-tower-defence/src/strategy/monte_carlo_tree.rs @@ -0,0 +1,243 @@ +use engine::command::*; +use engine::status::GameStatus; +use engine::bitwise_engine::{Player, BitwiseGameState}; +use engine::constants::*; + +use rand::{Rng, XorShiftRng, SeedableRng}; +use time::{Duration, PreciseTime}; + +use strategy::monte_carlo; + +use arrayvec::ArrayVec; + +#[derive(Debug)] +struct NodeStats { + wins: f32, + losses: f32, + attempts: f32, + average: f32, + confidence: f32, + explored: Vec<(Command, NodeStats)>, + unexplored: Vec, +} + +impl NodeStats { + fn create_node(player: &Player) -> NodeStats { + let unoccupied_cells_count = player.unoccupied_cell_count(); + let unoccupied_cells = (0..unoccupied_cells_count) + .map(|i| player.location_of_unoccupied_cell(i)); + + let mut all_buildings: ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> = ArrayVec::new(); + if DEFENCE_PRICE <= player.energy { + all_buildings.push(BuildingType::Defence); + } + if MISSILE_PRICE <= player.energy { + all_buildings.push(BuildingType::Attack); + } + if ENERGY_PRICE <= player.energy { + all_buildings.push(BuildingType::Energy); + } + if TESLA_PRICE <= player.energy && !player.has_max_teslas() { + all_buildings.push(BuildingType::Tesla); + } + + let building_command_count = unoccupied_cells.len()*all_buildings.len(); + + let mut commands = Vec::with_capacity(building_command_count + 2); + + commands.push(Command::Nothing); + if IRON_CURTAIN_PRICE <= player.energy && player.can_build_iron_curtain() { + commands.push(Command::IronCurtain); + } + + for position in unoccupied_cells { + for &building in &all_buildings { + commands.push(Command::Build(position, building)); + } + } + + NodeStats { + wins: 0., + losses: 0., + attempts: 0., + average: 0., + confidence: 0., + explored: Vec::with_capacity(commands.len()), + unexplored: commands + } + } + + fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, NodeStats) { + debug_assert!(self.unexplored.is_empty()); + debug_assert!(self.explored.len() > 0); + let sqrt_n = self.attempts.sqrt(); + + let mut max_position = 0; + let mut max_value = self.explored[0].1.ucb(sqrt_n); + for i in 1..self.explored.len() { + let value = self.explored[i].1.ucb(sqrt_n); + if value > max_value { + max_position = i; + max_value = value; + } + } + &mut self.explored[max_position] + } + + fn ucb(&self, sqrt_n: f32) -> f32 { + self.average + sqrt_n * self.confidence + } + + fn add_node<'a>(&'a mut self, player: &Player, command: Command) -> &'a mut (Command, NodeStats) { + let node = NodeStats::create_node(player); + self.explored.push((command, node)); + self.unexplored.retain(|c| *c != command); + self.explored.last_mut().unwrap() + } + + fn add_victory(&mut self) { + self.attempts += 1.; + self.wins += 1.; + self.update_confidence(); + } + fn add_defeat(&mut self) { + self.attempts += 1.; + self.losses += 1.; + self.update_confidence(); + } + fn add_draw(&mut self) { + self.attempts += 1.; + self.update_confidence(); + } + fn update_confidence(&mut self) { + self.average = self.wins / self.attempts; + self.confidence = (2.0 / self.attempts).sqrt(); + } + + #[cfg(feature = "benchmarking")] + fn count_explored(&self) -> usize { + 1 + self.explored.iter().map(|(_, n)| n.count_explored()).sum::() + } +} + +pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { + let mut rng = XorShiftRng::from_seed(INIT_SEED); + + let mut root = NodeStats::create_node(&state.player); + + while start_time.to(PreciseTime::now()) < max_time { + tree_search(&state, &mut root, &mut rng); + } + + #[cfg(feature = "benchmarking")] + { + println!("Explored nodes: {}", root.count_explored()); + } + + let (command, _) = root.node_with_highest_ucb(); + command.clone() +} + +fn tree_search(state: &BitwiseGameState, stats: &mut NodeStats, rng: &mut R) -> GameStatus { + // root is opponent move + // node being added is player move + + if state.round >= MAX_MOVES { + return GameStatus::Draw + } + + if stats.unexplored.is_empty() { + let result = { + let (next_command, next_tree) = stats.node_with_highest_ucb(); + tree_search_opponent(state, next_tree, next_command.clone(), rng) + }; + match result { + GameStatus::PlayerWon => {stats.add_defeat()}, + GameStatus::OpponentWon => {stats.add_victory()}, + _ => {stats.add_draw()} + }; + result + } else { + let next_command = rng.choose(&stats.unexplored).expect("Partially explored had no options").clone(); + let result = { + let (_, next_stats) = stats.add_node(&state.opponent, next_command); + + let opponent_random = monte_carlo::random_move(&state.opponent, &state.player, rng); + let mut next_state = state.clone(); + next_state.simulate(next_command, opponent_random); + + let result = simulate_to_endstate(next_state, rng); + match result { + GameStatus::PlayerWon => {next_stats.add_victory()}, + GameStatus::OpponentWon => {next_stats.add_defeat()}, + _ => {next_stats.add_draw()} + }; + + result + }; + + match result { + GameStatus::PlayerWon => {stats.add_defeat()}, + GameStatus::OpponentWon => {stats.add_victory()}, + _ => {stats.add_draw()} + }; + result + } +} + +fn tree_search_opponent(state: &BitwiseGameState, stats: &mut NodeStats, player_command: Command, rng: &mut R) -> GameStatus { + // root is player move + // node being added is opponent move + + if stats.unexplored.is_empty() { + let result = { + let (next_command, next_tree) = stats.node_with_highest_ucb(); + let mut next_state = state.clone(); + next_state.simulate(player_command, next_command.clone()); + tree_search(&next_state, next_tree, rng) + }; + match result { + GameStatus::PlayerWon => {stats.add_victory()}, + GameStatus::OpponentWon => {stats.add_defeat()}, + _ => {stats.add_draw()} + }; + result + } else { + let next_command = rng.choose(&stats.unexplored).expect("Partially explored had no options").clone(); + let mut next_state = state.clone(); + next_state.simulate(player_command, next_command); + + let result = { + let (_, next_stats) = stats.add_node(&next_state.player, next_command); + + let result = simulate_to_endstate(next_state, rng); + match result { + GameStatus::PlayerWon => {next_stats.add_defeat()}, + GameStatus::OpponentWon => {next_stats.add_victory()}, + _ => {next_stats.add_draw()} + }; + + result + }; + + match result { + GameStatus::PlayerWon => {stats.add_victory()}, + GameStatus::OpponentWon => {stats.add_defeat()}, + _ => {stats.add_draw()} + }; + result + } +} + + +fn simulate_to_endstate(mut state: BitwiseGameState, rng: &mut R) -> GameStatus { + let mut status = GameStatus::Continue; + + while status == GameStatus::Continue && state.round < MAX_MOVES { + let player_command = monte_carlo::random_move(&state.player, &state.opponent, rng); + let opponent_command = monte_carlo::random_move(&state.opponent, &state.player, rng); + status = state.simulate(player_command, opponent_command); + } + status +} + diff --git a/2018-tower-defence/src/strategy/static_opening.rs b/2018-tower-defence/src/strategy/static_opening.rs new file mode 100644 index 0000000..f7e101c --- /dev/null +++ b/2018-tower-defence/src/strategy/static_opening.rs @@ -0,0 +1,21 @@ +use engine::geometry::*; +use engine::command::*; +use engine::bitwise_engine::*; + +pub const STATIC_OPENING_LENGTH: u16 = 12; + +pub fn choose_move(state: &BitwiseGameState) -> Command { + match state.round { + 0 => Command::Build(Point::new(0,0), BuildingType::Energy), + 3 => Command::Build(Point::new(0,1), BuildingType::Energy), + 5 => Command::Build(Point::new(0,2), BuildingType::Energy), + 7 => Command::Build(Point::new(0,3), BuildingType::Energy), + 9 => Command::Build(Point::new(0,4), BuildingType::Energy), + 10 => Command::Build(Point::new(0,5), BuildingType::Energy), + 11 => Command::Build(Point::new(0,6), BuildingType::Energy), + 12 => Command::Build(Point::new(0,7), BuildingType::Energy), + 13 => Command::Build(Point::new(1,0), BuildingType::Energy), + 14 => Command::Build(Point::new(1,7), BuildingType::Energy), + _ => Command::Nothing + } +} diff --git a/2018-tower-defence/tests/live_comparison.rs b/2018-tower-defence/tests/live_comparison.rs new file mode 100644 index 0000000..c85e3fe --- /dev/null +++ b/2018-tower-defence/tests/live_comparison.rs @@ -0,0 +1,68 @@ +extern crate zombot; + +use zombot::input::json; +use zombot::engine::command::{Command, BuildingType}; +use zombot::engine::geometry::Point; + +use std::fs::File; +use std::io::prelude::*; +use std::path::Path; + +#[test] +fn it_successfully_simulates_replay() { + test_from_replay(&Path::new("tests/v300_normal_towers")); +} + +#[test] +fn it_successfully_simulates_replay_with_iron_curtain() { + test_from_replay(&Path::new("tests/v300_iron_curtain")); +} + +#[test] +fn it_successfully_simulates_replay_with_iron_curtain_with_teslas() { + test_from_replay(&Path::new("tests/v300_iron_curtain_with_teslas")); +} + + +fn test_from_replay(replay_folder: &Path) { + let length = replay_folder.read_dir().unwrap().count()-1; + + let mut state = json::read_bitwise_state_from_file(&format!("{}/Round 000/state.json", replay_folder.display())).unwrap(); + + for i in 0..length { + let player = read_player_command(&format!("{}/Round {:03}/PlayerCommand.txt", replay_folder.display(), i)); + let opponent = read_opponent_command(&format!("{}/Round {:03}/OpponentCommand.txt", replay_folder.display(), i)); + let mut expected_state = json::read_bitwise_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder.display(), i+1)).unwrap(); + + state.simulate(player, opponent); + state.sort(); + expected_state.sort(); + + println!("State {}: {:?}", i+1, state); + assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); + } +} + +fn read_player_command(filename: &str) -> Command { + let mut file = File::open(filename).unwrap(); + let mut content = String::new(); + file.read_to_string(&mut content).unwrap(); + if content.trim() == "No Command" { + Command::Nothing + } + else { + let mut components = content.split(','); + let point = Point::new(components.next().unwrap().trim().parse().unwrap(), + components.next().unwrap().trim().parse().unwrap()); + let action_type = components.next().unwrap().trim().parse().unwrap(); + if action_type == 5 { + Command::IronCurtain + } else { + Command::Build(point, BuildingType::from_u8(action_type).unwrap()) + } + } +} + +fn read_opponent_command(filename: &str) -> Command { + read_player_command(filename) +} diff --git a/2018-tower-defence/tests/monte_carlo_test.rs b/2018-tower-defence/tests/monte_carlo_test.rs new file mode 100644 index 0000000..cec3256 --- /dev/null +++ b/2018-tower-defence/tests/monte_carlo_test.rs @@ -0,0 +1,34 @@ +extern crate zombot; +extern crate time; +use time::{PreciseTime, Duration}; + +use zombot::*; + +const STATE_PATH: &str = "tests/state0.json"; + +// there are assertions in the game engine, run when it's in debug mode +#[test] +fn it_does_a_normal_turn_successfully() { + let start_time = PreciseTime::now(); + 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(&state, start_time, max_time); + + assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) +} + +#[test] +fn it_does_a_normal_tree_serach_turn_successfully() { + let start_time = PreciseTime::now(); + 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_tree::choose_move(&state, start_time, max_time); + + assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) +} diff --git a/2018-tower-defence/tests/state0.json b/2018-tower-defence/tests/state0.json new file mode 100644 index 0000000..572fcf9 --- /dev/null +++ b/2018-tower-defence/tests/state0.json @@ -0,0 +1 @@ +{"gameDetails":{"round":0,"maxRounds":400,"mapWidth":16,"mapHeight":8,"roundIncomeEnergy":5,"buildingPrices":{"TESLA":100,"DEFENSE":30,"ATTACK":30,"ENERGY":20},"buildingsStats":{"TESLA":{"health":5,"constructionTime":10,"price":100,"weaponDamage":20,"weaponSpeed":0,"weaponCooldownPeriod":10,"energyGeneratedPerTurn":0,"destroyMultiplier":10,"constructionScore":20},"DEFENSE":{"health":20,"constructionTime":3,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":10},"ATTACK":{"health":5,"constructionTime":1,"price":30,"weaponDamage":5,"weaponSpeed":2,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":4},"ENERGY":{"health":5,"constructionTime":1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":3}},"ironCurtainStats":{"activeRounds":6,"resetPeriod":50,"price":150,"constructionScore":20}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0,"ironCurtainAvailable":false,"activeIronCurtainLifetime":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0,"ironCurtainAvailable":false,"activeIronCurtainLifetime":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}]],"teslaHitList":[],"ironcurtainHitList":[]} \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 000/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 000/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 001/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 001/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 002/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 002/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 003/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 003/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 004/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 004/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 005/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 005/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 006/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 006/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 007/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 007/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 008/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 008/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 009/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 009/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 010/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 010/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 011/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 011/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 012/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 012/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 013/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 013/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 014/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 014/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 015/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 015/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 016/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..10532f2 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 016/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 017/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..0f83bc0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 017/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 018/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 018/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 019/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 019/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 020/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..3ab3f32 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 020/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 021/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 021/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..433ff46 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 022/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 022/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..4371338 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 023/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 023/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 024/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..1260cea --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 024/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 025/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 025/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 026/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 026/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..8a842f9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 027/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 027/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 028/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..b2c26e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 028/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..08ceedf --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 029/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 029/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..9408cb0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 030/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 030/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 031/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 031/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 032/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 032/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 033/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 033/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..c37c6f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +1,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 034/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 034/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 035/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 035/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..8ac3a56 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 036/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 036/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 037/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 037/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 038/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..3fff544 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 038/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 039/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 039/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 040/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 040/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 041/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 041/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..5c3de37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +6,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 042/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 042/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..ad5f821 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 043/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 043/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 044/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..487bf6a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +7,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 044/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 045/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 045/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 046/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..055ca5b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 046/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 047/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..e874b1f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 047/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 048/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..75b785b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 048/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 049/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 049/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 050/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 050/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 051/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..d9e32bb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 051/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 052/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..226a1f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 052/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 053/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 053/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 054/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..1e7a5f9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 054/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..f3c8f77 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 055/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 055/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 056/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..b2c26e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 056/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 057/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 057/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..d9d71ea --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 058/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..722ec58 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +4,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 058/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 059/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..07b92b5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 059/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 060/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 060/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..117d6c2 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 061/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 061/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 062/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 062/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 063/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 063/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..9b9f49b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 064/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 064/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 065/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 065/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..26912c7 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 066/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..4f716a1 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 066/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 067/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 067/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..c27eaf9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 068/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..d9e32bb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +2,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 068/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..50688ac --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 069/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..ebfc684 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 069/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 070/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..c742585 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 070/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..16ddcd7 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 071/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 071/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 072/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 072/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 073/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..a91c23f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 073/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..95a4cf3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 074/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..daa46d9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 074/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 075/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 075/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..910a1ab --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 076/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 076/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 076/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 076/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 076/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 076/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 077/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 077/OpponentCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 077/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 077/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 077/PlayerCommand.txt new file mode 100644 index 0000000..e09f712 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 077/PlayerCommand.txt @@ -0,0 +1 @@ +5,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 078/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 078/OpponentCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 078/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 078/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 078/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 078/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 079/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 079/OpponentCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 079/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 079/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 079/PlayerCommand.txt new file mode 100644 index 0000000..f8007d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 079/PlayerCommand.txt @@ -0,0 +1 @@ +0,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 080/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 080/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 080/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 080/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 080/PlayerCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 080/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 081/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 081/OpponentCommand.txt new file mode 100644 index 0000000..4f8f464 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 081/OpponentCommand.txt @@ -0,0 +1 @@ +5,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 081/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 081/PlayerCommand.txt new file mode 100644 index 0000000..c49791c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 081/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 082/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 082/OpponentCommand.txt new file mode 100644 index 0000000..ce49ef6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 082/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 082/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 082/PlayerCommand.txt new file mode 100644 index 0000000..3ab3f32 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 082/PlayerCommand.txt @@ -0,0 +1 @@ +5,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 083/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 083/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 083/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 083/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 083/PlayerCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 083/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 084/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 084/OpponentCommand.txt new file mode 100644 index 0000000..b2c26e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 084/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 084/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 084/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 084/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 085/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 085/OpponentCommand.txt new file mode 100644 index 0000000..d51905f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 085/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 085/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 085/PlayerCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 085/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 086/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 086/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 086/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 086/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 086/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 086/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 087/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 087/OpponentCommand.txt new file mode 100644 index 0000000..b7adddf --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 087/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 087/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 087/PlayerCommand.txt new file mode 100644 index 0000000..c7d9109 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 087/PlayerCommand.txt @@ -0,0 +1 @@ +5,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 088/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 088/OpponentCommand.txt new file mode 100644 index 0000000..4b87d86 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 088/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 088/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 088/PlayerCommand.txt new file mode 100644 index 0000000..f238916 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 088/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 089/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 089/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 089/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 089/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 089/PlayerCommand.txt new file mode 100644 index 0000000..2a21cf5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 089/PlayerCommand.txt @@ -0,0 +1 @@ +3,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 090/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 090/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 090/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 090/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 090/PlayerCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 090/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 091/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 091/OpponentCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 091/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 091/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 091/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 091/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 092/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 092/OpponentCommand.txt new file mode 100644 index 0000000..7d08a5b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 092/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 092/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 092/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 092/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 093/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 093/OpponentCommand.txt new file mode 100644 index 0000000..7ae2a9c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 093/OpponentCommand.txt @@ -0,0 +1 @@ +6,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 093/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 093/PlayerCommand.txt new file mode 100644 index 0000000..5ee21e6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 093/PlayerCommand.txt @@ -0,0 +1 @@ +4,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 094/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 094/OpponentCommand.txt new file mode 100644 index 0000000..8ac3a56 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 094/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 094/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 094/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 094/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 095/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 095/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 095/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 095/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 095/PlayerCommand.txt new file mode 100644 index 0000000..6643b0d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 095/PlayerCommand.txt @@ -0,0 +1 @@ +5,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 096/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 096/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 096/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 096/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 096/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 096/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 097/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 097/OpponentCommand.txt new file mode 100644 index 0000000..ce49ef6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 097/OpponentCommand.txt @@ -0,0 +1 @@ +4,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 097/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 097/PlayerCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 097/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 098/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 098/OpponentCommand.txt new file mode 100644 index 0000000..c4e7948 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 098/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 098/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 098/PlayerCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 098/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 099/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 099/OpponentCommand.txt new file mode 100644 index 0000000..e2634f0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 099/OpponentCommand.txt @@ -0,0 +1 @@ +5,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 099/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 099/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 099/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 100/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 100/OpponentCommand.txt new file mode 100644 index 0000000..f82aafb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 100/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 100/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 100/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 100/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 101/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 101/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 101/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 101/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 101/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 101/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 102/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 102/OpponentCommand.txt new file mode 100644 index 0000000..910a1ab --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 102/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 102/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 102/PlayerCommand.txt new file mode 100644 index 0000000..8c5ef78 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 102/PlayerCommand.txt @@ -0,0 +1 @@ +4,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 103/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 103/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 103/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 103/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 103/PlayerCommand.txt new file mode 100644 index 0000000..b548cc7 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 103/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 104/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 104/OpponentCommand.txt new file mode 100644 index 0000000..ac6c42a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 104/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 104/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 104/PlayerCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 104/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 105/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 105/OpponentCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 105/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 105/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 105/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 105/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 106/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 106/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 106/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 106/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 106/PlayerCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 106/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 107/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 107/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 107/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 107/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 107/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 107/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 108/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 108/OpponentCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 108/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 108/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 108/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 108/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 109/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 109/OpponentCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 109/OpponentCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 109/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 109/PlayerCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 109/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 110/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 110/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 110/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 110/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 110/PlayerCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 110/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 111/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 111/OpponentCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 111/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 111/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 111/PlayerCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 111/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 112/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 112/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 112/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 112/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 112/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 112/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 113/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 113/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 113/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 113/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 113/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 113/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 114/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 114/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 114/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 114/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 114/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 114/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 115/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 115/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 115/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 115/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 115/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 115/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 116/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 116/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 116/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 116/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 116/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 116/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 117/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 117/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 117/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 117/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 117/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 117/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 118/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 118/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 118/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain/Round 118/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain/Round 118/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain/Round 118/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..9233a2a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..72ca43d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +0,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..4a9590d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +0,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..94bee18 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +0,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..36e6f4c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..36e6f4c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..48cfbfe --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..533b1c8 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +2,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..239b17a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +1,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..0b12f52 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +2,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..8ba7f16 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +1,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..601aa29 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +2,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..19fbb8f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +4,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..d9a0acb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +2,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..77bf522 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..1ba30d4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..ddc7f56 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..bee7857 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..43be3f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..bee7857 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..49dd99d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +1,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..5ff9de4 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +3,5,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..af58f31 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +2,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..743727a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..a2a45e9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..9f12d31 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +6,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..d9d71ea --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..412a2df --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..f238916 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +2,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..a91c23f --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..dd03d6a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +3,4,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..3de7cb6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +7,0,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..e638283 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +3,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..7d93635 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +2,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..07b92b5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +3,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..f24e83b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +4,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..7d08a5b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..a943cb9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +3,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..3775784 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..41d5370 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..5c88dd1 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..3de7cb6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,0,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..bee7857 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..b743516 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +4,7,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..474bb6c --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,4 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..674d299 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +6,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..0b1714b --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,5 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..0c3ccbf --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..b0f2a85 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +6,4,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..94d7b0a --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +6,5,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..b548cc7 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..22d278e --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..ca8db41 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +3,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 000/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 000/OpponentCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 000/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 000/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 000/PlayerCommand.txt new file mode 100644 index 0000000..6c57709 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 000/PlayerCommand.txt @@ -0,0 +1 @@ +1,7,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 001/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 001/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 001/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 001/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 001/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 001/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 002/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 002/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 002/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 002/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 002/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 002/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 003/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 003/OpponentCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 003/OpponentCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 003/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 003/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 003/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 004/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 004/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 004/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 004/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 004/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 004/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 005/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 005/OpponentCommand.txt new file mode 100644 index 0000000..7ca2987 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 005/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 005/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 005/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 005/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 006/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 006/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 006/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 006/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 006/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 006/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 007/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 007/OpponentCommand.txt new file mode 100644 index 0000000..a5bd5ef --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 007/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 007/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 007/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 007/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 008/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 008/OpponentCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 008/OpponentCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 008/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 008/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 008/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 009/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 009/OpponentCommand.txt new file mode 100644 index 0000000..4a8cf07 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 009/OpponentCommand.txt @@ -0,0 +1 @@ +4,0,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 009/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 009/PlayerCommand.txt new file mode 100644 index 0000000..d5cd851 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 009/PlayerCommand.txt @@ -0,0 +1 @@ +5,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 010/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 010/OpponentCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 010/OpponentCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 010/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 010/PlayerCommand.txt new file mode 100644 index 0000000..ab857c9 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 010/PlayerCommand.txt @@ -0,0 +1 @@ +7,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 011/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 011/OpponentCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 011/OpponentCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 011/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 011/PlayerCommand.txt new file mode 100644 index 0000000..4119710 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 011/PlayerCommand.txt @@ -0,0 +1 @@ +2,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 012/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 012/OpponentCommand.txt new file mode 100644 index 0000000..9b5a49a --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 012/OpponentCommand.txt @@ -0,0 +1 @@ +6,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 012/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 012/PlayerCommand.txt new file mode 100644 index 0000000..ea9e316 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 012/PlayerCommand.txt @@ -0,0 +1 @@ +6,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 013/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 013/OpponentCommand.txt new file mode 100644 index 0000000..87d322f --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 013/OpponentCommand.txt @@ -0,0 +1 @@ +3,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 013/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 013/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 013/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 014/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 014/OpponentCommand.txt new file mode 100644 index 0000000..d17d619 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 014/OpponentCommand.txt @@ -0,0 +1 @@ +5,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 014/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 014/PlayerCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 014/PlayerCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 015/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 015/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 015/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 015/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 015/PlayerCommand.txt new file mode 100644 index 0000000..e02c049 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 015/PlayerCommand.txt @@ -0,0 +1 @@ +3,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 016/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 016/OpponentCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 016/OpponentCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 016/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 016/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 016/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 017/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 017/OpponentCommand.txt new file mode 100644 index 0000000..ea179d3 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 017/OpponentCommand.txt @@ -0,0 +1 @@ +3,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 017/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 017/PlayerCommand.txt new file mode 100644 index 0000000..f23ef17 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 017/PlayerCommand.txt @@ -0,0 +1 @@ +4,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 018/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 018/OpponentCommand.txt new file mode 100644 index 0000000..0a612db --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 018/OpponentCommand.txt @@ -0,0 +1 @@ +5,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 018/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 018/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 018/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 019/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 019/OpponentCommand.txt new file mode 100644 index 0000000..b557a00 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 019/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 019/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 019/PlayerCommand.txt new file mode 100644 index 0000000..26912c7 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 019/PlayerCommand.txt @@ -0,0 +1 @@ +4,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 020/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 020/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 020/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 020/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 020/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 020/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 021/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 021/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 021/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 021/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 021/PlayerCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 021/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 022/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 022/OpponentCommand.txt new file mode 100644 index 0000000..8e935c8 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 022/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 022/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 022/PlayerCommand.txt new file mode 100644 index 0000000..8a6627b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 022/PlayerCommand.txt @@ -0,0 +1 @@ +1,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 023/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 023/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 023/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 023/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 023/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 023/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 024/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 024/OpponentCommand.txt new file mode 100644 index 0000000..d05a714 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 024/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 024/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 024/PlayerCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 024/PlayerCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 025/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 025/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 025/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 025/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 025/PlayerCommand.txt new file mode 100644 index 0000000..7388cff --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 025/PlayerCommand.txt @@ -0,0 +1 @@ +4,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 026/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 026/OpponentCommand.txt new file mode 100644 index 0000000..9477e06 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 026/OpponentCommand.txt @@ -0,0 +1 @@ +6,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 026/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 026/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 026/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 027/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 027/OpponentCommand.txt new file mode 100644 index 0000000..f217f6d --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 027/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 027/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 027/PlayerCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 027/PlayerCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 028/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 028/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 028/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 028/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 028/PlayerCommand.txt new file mode 100644 index 0000000..4dd67d5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 028/PlayerCommand.txt @@ -0,0 +1 @@ +1,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 029/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 029/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 029/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 029/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 029/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 029/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 030/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 030/OpponentCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 030/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 030/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 030/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 030/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 031/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 031/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 031/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 031/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 031/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 031/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 032/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 032/OpponentCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 032/OpponentCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 032/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 032/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 032/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 033/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 033/OpponentCommand.txt new file mode 100644 index 0000000..5e4b046 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 033/OpponentCommand.txt @@ -0,0 +1 @@ +0,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 033/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 033/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 033/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 034/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 034/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 034/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 034/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 034/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 034/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 035/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 035/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 035/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 035/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 035/PlayerCommand.txt new file mode 100644 index 0000000..153865b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 035/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 036/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 036/OpponentCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 036/OpponentCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 036/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 036/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 036/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 037/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 037/OpponentCommand.txt new file mode 100644 index 0000000..7ca2987 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 037/OpponentCommand.txt @@ -0,0 +1 @@ +1,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 037/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 037/PlayerCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 037/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 038/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 038/OpponentCommand.txt new file mode 100644 index 0000000..9f89a93 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 038/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 038/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 038/PlayerCommand.txt new file mode 100644 index 0000000..addc906 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 038/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 039/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 039/OpponentCommand.txt new file mode 100644 index 0000000..a825030 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 039/OpponentCommand.txt @@ -0,0 +1 @@ +1,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 039/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 039/PlayerCommand.txt new file mode 100644 index 0000000..3362217 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 039/PlayerCommand.txt @@ -0,0 +1 @@ +0,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 040/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 040/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 040/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 040/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 040/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 040/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 041/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 041/OpponentCommand.txt new file mode 100644 index 0000000..67f6e86 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 041/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 041/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 041/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 041/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 042/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 042/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 042/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 042/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 042/PlayerCommand.txt new file mode 100644 index 0000000..aa178b0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 042/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 043/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 043/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 043/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 043/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 043/PlayerCommand.txt new file mode 100644 index 0000000..55526f5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 043/PlayerCommand.txt @@ -0,0 +1 @@ +1,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 044/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 044/OpponentCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 044/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 044/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 044/PlayerCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 044/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 045/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 045/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 045/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 045/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 045/PlayerCommand.txt new file mode 100644 index 0000000..3177984 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 045/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 046/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 046/OpponentCommand.txt new file mode 100644 index 0000000..cb47d55 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 046/OpponentCommand.txt @@ -0,0 +1 @@ +0,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 046/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 046/PlayerCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 046/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 047/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 047/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 047/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 047/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 047/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 047/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 048/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 048/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 048/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 048/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 048/PlayerCommand.txt new file mode 100644 index 0000000..f1d02f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 048/PlayerCommand.txt @@ -0,0 +1 @@ +0,0,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 049/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 049/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 049/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 049/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 049/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 049/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 050/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 050/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 050/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 050/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 050/PlayerCommand.txt new file mode 100644 index 0000000..816366d --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 050/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 051/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 051/OpponentCommand.txt new file mode 100644 index 0000000..43be3f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 051/OpponentCommand.txt @@ -0,0 +1 @@ +2,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 051/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 051/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 051/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 052/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 052/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 052/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 052/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 052/PlayerCommand.txt new file mode 100644 index 0000000..17d7db2 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 052/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 053/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 053/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 053/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 053/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 053/PlayerCommand.txt new file mode 100644 index 0000000..0c3ccbf --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 053/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 054/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 054/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 054/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 054/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 054/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 054/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 055/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 055/OpponentCommand.txt new file mode 100644 index 0000000..b548cc7 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 055/OpponentCommand.txt @@ -0,0 +1 @@ +0,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 055/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 055/PlayerCommand.txt new file mode 100644 index 0000000..1084f37 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 055/PlayerCommand.txt @@ -0,0 +1 @@ +6,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 056/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 056/OpponentCommand.txt new file mode 100644 index 0000000..ac6c42a --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 056/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 056/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 056/PlayerCommand.txt new file mode 100644 index 0000000..61f66b5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 056/PlayerCommand.txt @@ -0,0 +1 @@ +3,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 057/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 057/OpponentCommand.txt new file mode 100644 index 0000000..4d83fd9 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 057/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 057/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 057/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 057/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 058/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 058/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 058/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 058/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 058/PlayerCommand.txt new file mode 100644 index 0000000..1571d81 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 058/PlayerCommand.txt @@ -0,0 +1 @@ +5,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 059/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 059/OpponentCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 059/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 059/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 059/PlayerCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 059/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 060/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 060/OpponentCommand.txt new file mode 100644 index 0000000..429fd32 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 060/OpponentCommand.txt @@ -0,0 +1 @@ +5,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 060/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 060/PlayerCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 060/PlayerCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 061/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 061/OpponentCommand.txt new file mode 100644 index 0000000..ccd082b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 061/OpponentCommand.txt @@ -0,0 +1 @@ +6,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 061/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 061/PlayerCommand.txt new file mode 100644 index 0000000..0c3ccbf --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 061/PlayerCommand.txt @@ -0,0 +1 @@ +4,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 062/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 062/OpponentCommand.txt new file mode 100644 index 0000000..49c1201 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 062/OpponentCommand.txt @@ -0,0 +1 @@ +7,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 062/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 062/PlayerCommand.txt new file mode 100644 index 0000000..722ec58 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 062/PlayerCommand.txt @@ -0,0 +1 @@ +4,2,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 063/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 063/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 063/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 063/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 063/PlayerCommand.txt new file mode 100644 index 0000000..c602c71 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 063/PlayerCommand.txt @@ -0,0 +1 @@ +2,0,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 064/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 064/OpponentCommand.txt new file mode 100644 index 0000000..3dee0c6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 064/OpponentCommand.txt @@ -0,0 +1 @@ +6,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 064/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 064/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 064/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 065/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 065/OpponentCommand.txt new file mode 100644 index 0000000..a7503e5 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 065/OpponentCommand.txt @@ -0,0 +1 @@ +7,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 065/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 065/PlayerCommand.txt new file mode 100644 index 0000000..a81a341 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 065/PlayerCommand.txt @@ -0,0 +1 @@ +7,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 066/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 066/OpponentCommand.txt new file mode 100644 index 0000000..a6f3f91 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 066/OpponentCommand.txt @@ -0,0 +1 @@ +2,6,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 066/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 066/PlayerCommand.txt new file mode 100644 index 0000000..b77a79c --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 066/PlayerCommand.txt @@ -0,0 +1 @@ +2,3,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 067/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 067/OpponentCommand.txt new file mode 100644 index 0000000..bb03eca --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 067/OpponentCommand.txt @@ -0,0 +1 @@ +5,3,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 067/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 067/PlayerCommand.txt new file mode 100644 index 0000000..7f7238b --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 067/PlayerCommand.txt @@ -0,0 +1 @@ +6,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 068/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 068/OpponentCommand.txt new file mode 100644 index 0000000..e874b1f --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 068/OpponentCommand.txt @@ -0,0 +1 @@ +1,6,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 068/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 068/PlayerCommand.txt new file mode 100644 index 0000000..b0fd0dc --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 068/PlayerCommand.txt @@ -0,0 +1 @@ +0,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 069/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 069/OpponentCommand.txt new file mode 100644 index 0000000..46660d6 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 069/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 069/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 069/PlayerCommand.txt new file mode 100644 index 0000000..ddc7f56 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 069/PlayerCommand.txt @@ -0,0 +1 @@ +7,5,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 070/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 070/OpponentCommand.txt new file mode 100644 index 0000000..dc922cc --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 070/OpponentCommand.txt @@ -0,0 +1 @@ +1,5,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 070/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 070/PlayerCommand.txt new file mode 100644 index 0000000..93ec9b2 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 070/PlayerCommand.txt @@ -0,0 +1 @@ +6,5,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 071/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 071/OpponentCommand.txt new file mode 100644 index 0000000..ee791e3 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 071/OpponentCommand.txt @@ -0,0 +1 @@ +4,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 071/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 071/PlayerCommand.txt new file mode 100644 index 0000000..3ca9676 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 071/PlayerCommand.txt @@ -0,0 +1 @@ +7,3,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 072/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 072/OpponentCommand.txt new file mode 100644 index 0000000..b4e7071 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 072/OpponentCommand.txt @@ -0,0 +1 @@ +5,1,0 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 072/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 072/PlayerCommand.txt new file mode 100644 index 0000000..3d765f0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 072/PlayerCommand.txt @@ -0,0 +1 @@ +5,5,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 073/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 073/OpponentCommand.txt new file mode 100644 index 0000000..a01c7f4 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 073/OpponentCommand.txt @@ -0,0 +1 @@ +7,4,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 073/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 073/PlayerCommand.txt new file mode 100644 index 0000000..08ceedf --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 073/PlayerCommand.txt @@ -0,0 +1 @@ +4,5,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 074/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 074/OpponentCommand.txt new file mode 100644 index 0000000..10532f2 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 074/OpponentCommand.txt @@ -0,0 +1 @@ +0,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 074/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 074/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 074/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 075/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 075/OpponentCommand.txt new file mode 100644 index 0000000..08ecb10 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 075/OpponentCommand.txt @@ -0,0 +1 @@ +3,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 075/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 075/PlayerCommand.txt new file mode 100644 index 0000000..c41707e --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 075/PlayerCommand.txt @@ -0,0 +1 @@ +7,7,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 076/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 076/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 076/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 076/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 076/PlayerCommand.txt new file mode 100644 index 0000000..85eacdb --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 076/PlayerCommand.txt @@ -0,0 +1 @@ +3,2,2 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 077/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 077/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 077/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 077/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 077/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 077/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 078/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 078/OpponentCommand.txt new file mode 100644 index 0000000..1c0a0b0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 078/OpponentCommand.txt @@ -0,0 +1 @@ +1,2,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 078/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 078/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 078/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 079/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 079/OpponentCommand.txt new file mode 100644 index 0000000..8bb009c --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 079/OpponentCommand.txt @@ -0,0 +1 @@ +6,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 079/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 079/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 079/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 080/OpponentCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 080/OpponentCommand.txt new file mode 100644 index 0000000..323dbb1 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 080/OpponentCommand.txt @@ -0,0 +1 @@ +7,1,1 \ No newline at end of file diff --git a/2018-tower-defence/tests/v300_normal_towers/Round 080/PlayerCommand.txt b/2018-tower-defence/tests/v300_normal_towers/Round 080/PlayerCommand.txt new file mode 100644 index 0000000..bdb74d0 --- /dev/null +++ b/2018-tower-defence/tests/v300_normal_towers/Round 080/PlayerCommand.txt @@ -0,0 +1 @@ +No Command \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index 120aa54..0000000 --- a/Cargo.toml +++ /dev/null @@ -1,38 +0,0 @@ -[package] -name = "zombot" -version = "3.0.0" - -[dependencies] -serde_derive = "1.0.71" -serde = "1.0.71" -serde_json = "1.0.26" - -rand = "0.5.5" -time = "0.1.4" -rayon = "1.0.2" - -arrayvec = "0.4.7" - -lazy_static = { version = "1.1.0", optional = true } - -[dev-dependencies] -proptest = "0.8.4" - -[features] -benchmarking = [] -single-threaded = [] -debug-decisions = [] -reduced-time = [] -extended-time = [] - -energy-cutoff = [] -discard-poor-performers = [] -heuristic-random = ["lazy_static"] -full-monte-carlo-tree = [] -static-opening = [] -weighted-win-ratio = [] - -default = ["energy-cutoff", "discard-poor-performers", "static-opening", "weighted-win-ratio"] - -[profile.release] -debug = true diff --git a/Makefile b/Makefile deleted file mode 100644 index b5005da..0000000 --- a/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -default: build - -build: - cargo build --release - -test: - cargo test --release - -bench: - cargo run --release --features "benchmarking" --bin perf-test - -profile: - cargo build --release --features "benchmarking single-threaded extended-time" - mkdir -p target/profile - perf record -g target/release/perf-test - perf report - -clean: - cargo clean - -submission.zip: bot.json Cargo.lock Cargo.toml src - zip -r9 submission.zip bot.json Cargo.lock Cargo.toml src - -.PHONY: default build test bench profile clean diff --git a/bot.json b/bot.json deleted file mode 100644 index 14ed686..0000000 --- a/bot.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "author": "Justin Worthe", - "email": "justin@worthe-it.co.za", - "nickName": "Justin", - "botLocation": "/target/release/", - "botFileName": "zombot", - "botLanguage": "rust" -} diff --git a/import-replay.sh b/import-replay.sh deleted file mode 100755 index 2a1b27e..0000000 --- a/import-replay.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -e - -REPLAY_FOLDER=$1 -OUTPUT_FOLDER=$2 - -mkdir -p $OUTPUT_FOLDER - -for round_folder in $REPLAY_FOLDER/*; do - round_name=`basename "$round_folder"` - mkdir -p "$OUTPUT_FOLDER/$round_name" - - player_folders=( "$round_folder"/* ) - player_folder=${player_folders[0]} - cp "$player_folder/JsonMap.json" "$OUTPUT_FOLDER/$round_name/state.json" - cp "$player_folder/PlayerCommand.txt" "$OUTPUT_FOLDER/$round_name/PlayerCommand.txt" - - opponent_folder=${player_folders[1]} - cp "$opponent_folder/PlayerCommand.txt" "$OUTPUT_FOLDER/$round_name/OpponentCommand.txt" -done diff --git a/license.org b/license.org deleted file mode 100644 index d643604..0000000 --- a/license.org +++ /dev/null @@ -1,22 +0,0 @@ -* The MIT License - -Copyright 2018 Justin Worthe - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/readme.org b/readme.org deleted file mode 100644 index e947202..0000000 --- a/readme.org +++ /dev/null @@ -1,52 +0,0 @@ -* Entelect Challenge 2018 - Tower Defence - Rustbot - -This is the source code for my [[https://challenge.entelect.co.za/][Entelect Challenge]] 2018 bot. It did -really well, coming in 3rd place in the finals. - -** How does it work? - -I've put together a blog post with the high level overview of how I -got to this point and how it works [[https://www.offerzen.com/blog/coding-for-the-win-how-i-built-a-tower-defence-bot][here]]. I will be putting up more -articles diving into the details shortly. - -The short explanation is that it's a Monte Carlo Tree Search. All -possible moved I can make from the first state are generated. I then -iterate through the list of possible moved and play random games that -start with that move. The move that statistically wins the most random -games is taken as the best move. - -** Environment Setup - -The Rust compiler tool-chain can be downloaded from the Rust project -website. - -https://www.rust-lang.org/en-US/install.html - -** Compilation - -The bot is written in Rust, and compiled using Cargo. For the sake of -running the bot in the tournament, you have to compile using the -~--release~ flag (this is specified in [[./bot.json]]). - -#+BEGIN_SRC shell - cargo build --release -#+END_SRC - -After compilation, there will be an executable in ~target/release/~. - -** Other useful commands - -You can find other interesting commands that I used in writing the bot -in the [[./Makefile]]. Some notable ones are: - -- ~make bench~: compiles with the benchmarking feature turned on, and - runs my end to end benchmark. -- ~make profile~: similar to the benchmark, but runs single threaded, - for a longer time, and uses ~perf~ to gather statistics on the run. -- ~make submission.zip~: Creates the zip file to upload to the - Entelect Challenge servers. - -** License - -See [[./license.org]] - diff --git a/src/bin/perf-test.rs b/src/bin/perf-test.rs deleted file mode 100644 index ee0c2be..0000000 --- a/src/bin/perf-test.rs +++ /dev/null @@ -1,26 +0,0 @@ -extern crate zombot; -extern crate time; -use time::{PreciseTime, Duration}; - -use zombot::*; -use zombot::engine::constants::*; - -const STATE_PATH: &str = "tests/state0.json"; - -use std::process; - -fn main() { - println!("Running bitwise engine"); - let start_time = PreciseTime::now(); - let state = match input::json::read_bitwise_state_from_file(STATE_PATH) { - Ok(ok) => ok, - Err(error) => { - println!("Error while parsing JSON file: {}", error); - process::exit(1); - } - }; - let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - - #[cfg(feature = "full-monte-carlo-tree")] strategy::monte_carlo_tree::choose_move(&state, start_time, max_time); - #[cfg(not(feature = "full-monte-carlo-tree"))] strategy::monte_carlo::choose_move(&state, start_time, max_time); -} diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs deleted file mode 100644 index 694a309..0000000 --- a/src/engine/bitwise_engine.rs +++ /dev/null @@ -1,483 +0,0 @@ -use engine::command::{Command, BuildingType}; -use engine::geometry::Point; -use engine::constants::*; -use engine::status::GameStatus; - -use arrayvec::ArrayVec; - -const LEFT_COL_MASK: u64 = 0x0101_0101_0101_0101; -const RIGHT_COL_MASK: u64 = 0x8080_8080_8080_8080; - -const ROW_MASKS: [u64; MAP_HEIGHT as usize] = [ - 0x0000_0000_0000_00ff, - 0x0000_0000_0000_ff00, - 0x0000_0000_00ff_0000, - 0x0000_0000_ff00_0000, - 0x0000_00ff_0000_0000, - 0x0000_ff00_0000_0000, - 0x00ff_0000_0000_0000, - 0xff00_0000_0000_0000, -]; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct BitwiseGameState { - pub status: GameStatus, - pub player: Player, - pub opponent: Player, - pub round: u16 -} - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct Player { - pub energy: u16, - pub health: u8, - pub unconstructed: ArrayVec<[UnconstructedBuilding; MAX_CONCURRENT_CONSTRUCTION]>, - pub buildings: [u64; DEFENCE_HEALTH], - pub occupied: u64, - - pub energy_towers: u64, - - pub missile_towers: [u64; MISSILE_COOLDOWN_STATES], - pub firing_tower: usize, - - pub missiles: [(u64, u64); MISSILE_MAX_SINGLE_CELL], - pub tesla_cooldowns: ArrayVec<[TeslaCooldown; TESLA_MAX]>, - - pub iron_curtain_available: bool, - pub iron_curtain_remaining: u8, -} - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct UnconstructedBuilding { - pub pos: Point, - pub construction_time_left: u8, - pub building_type: BuildingType -} - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub struct TeslaCooldown { - pub pos: Point, - pub cooldown: u8, - pub age: u16 -} - - -impl BitwiseGameState { - pub fn simulate(&mut self, player_command: Command, opponent_command: Command) -> GameStatus { - self.player.perform_command(player_command); - self.opponent.perform_command(opponent_command); - - self.player.update_construction(); - self.opponent.update_construction(); - - self.player.add_missiles(); - self.opponent.add_missiles(); - - BitwiseGameState::fire_teslas(&mut self.player, &mut self.opponent); - - BitwiseGameState::move_and_collide_missiles(&mut self.player, &mut self.opponent.missiles); - BitwiseGameState::move_and_collide_missiles(&mut self.opponent, &mut self.player.missiles); - - BitwiseGameState::add_energy(&mut self.player); - BitwiseGameState::add_energy(&mut self.opponent); - - BitwiseGameState::update_iron_curtain(&mut self.player, self.round); - BitwiseGameState::update_iron_curtain(&mut self.opponent, self.round); - - self.round += 1; - - self.update_status(); - self.status - } -} - -fn find_bit_index_from_rank(occupied: u64, i: u64) -> u8 { - // Adapted from https://graphics.stanford.edu/~seander/bithacks.html#SelectPosFromMSBRank - let v = !occupied; - - let mut r = u64::from(v.count_ones()) - i; - - let a: u64 = v - ((v >> 1) & (!0u64/3)); - let b: u64 = (a & (!0u64/5)) + ((a >> 2) & (!0u64/5)); - let c: u64 = (b + (b >> 4)) & (!0u64/0x11); - let d: u64 = (c + (c >> 8)) & (!0u64/0x101); - let mut t: u64 = (d >> 32) + (d >> 48); - - let mut s: u64 = 64; - s -= (t.wrapping_sub(r) & 256) >> 3; r -= t & (t.wrapping_sub(r) >> 8); - t = (d >> (s - 16)) & 0xff; - s -= (t.wrapping_sub(r) & 256) >> 4; r -= t & (t.wrapping_sub(r) >> 8); - t = (c >> (s - 8)) & 0xf; - s -= (t.wrapping_sub(r) & 256) >> 5; r -= t & (t.wrapping_sub(r) >> 8); - t = (b >> (s - 4)) & 0x7; - s -= (t.wrapping_sub(r) & 256) >> 6; r -= t & (t.wrapping_sub(r) >> 8); - t = (a >> (s - 2)) & 0x3; - s -= (t.wrapping_sub(r) & 256) >> 7; r -= t & (t.wrapping_sub(r) >> 8); - t = (v >> (s - 1)) & 0x1; - s -= (t.wrapping_sub(r) & 256) >> 8; - s = 65 - s; - - 64 - s as u8 -} - -impl BitwiseGameState { - pub fn new( - player: Player, opponent: Player, - round: u16 - ) -> BitwiseGameState { - BitwiseGameState { - status: GameStatus::Continue, - player, opponent, - round - } - } - - /** - * This is to make things more comparable when writing tests, not - * for actual use in the engine. - */ - #[cfg(debug_assertions)] - pub fn sort(&mut self) { - for i in 0..MISSILE_MAX_SINGLE_CELL { - for j in i+1..MISSILE_MAX_SINGLE_CELL { - let move_down1 = !self.player.missiles[i].0 & self.player.missiles[j].0; - self.player.missiles[i].0 |= move_down1; - self.player.missiles[j].0 &= !move_down1; - - let move_down2 = !self.player.missiles[i].1 & self.player.missiles[j].1; - self.player.missiles[i].1 |= move_down2; - self.player.missiles[j].1 &= !move_down2; - - let move_down3 = !self.opponent.missiles[i].0 & self.opponent.missiles[j].0; - self.opponent.missiles[i].0 |= move_down3; - self.opponent.missiles[j].0 &= !move_down3; - - let move_down4 = !self.opponent.missiles[i].1 & self.opponent.missiles[j].1; - self.opponent.missiles[i].1 |= move_down4; - self.opponent.missiles[j].1 &= !move_down4; - } - } - - self.player.unconstructed.sort_by_key(|b| b.pos); - self.opponent.unconstructed.sort_by_key(|b| b.pos); - - self.player.tesla_cooldowns.sort_by_key(|b| b.pos); - self.opponent.tesla_cooldowns.sort_by_key(|b| b.pos); - - - while self.player.firing_tower > 0 { - self.player.firing_tower -= 1; - let zero = self.player.missile_towers[0]; - for i in 1..self.player.missile_towers.len() { - self.player.missile_towers[i-1] = self.player.missile_towers[i]; - } - let end = self.player.missile_towers.len()-1; - self.player.missile_towers[end] = zero; - } - while self.opponent.firing_tower > 0 { - self.opponent.firing_tower -= 1; - let zero = self.opponent.missile_towers[0]; - for i in 1..self.opponent.missile_towers.len() { - self.opponent.missile_towers[i-1] = self.opponent.missile_towers[i]; - } - let end = self.opponent.missile_towers.len()-1; - self.opponent.missile_towers[end] = zero; - } - } - - #[cfg(debug_assertions)] - pub fn sorted(&self) -> BitwiseGameState { - let mut res = self.clone(); - res.sort(); - res - } - - fn update_iron_curtain(player: &mut Player, round: u16) { - if round != 0 && round % IRON_CURTAIN_UNLOCK_INTERVAL == 0 { - player.iron_curtain_available = true; - } - player.iron_curtain_remaining = player.iron_curtain_remaining.saturating_sub(1); - } - - fn fire_teslas(player: &mut Player, opponent: &mut Player) { - BitwiseGameState::fire_single_players_teslas_without_cleanup(player, opponent); - BitwiseGameState::fire_single_players_teslas_without_cleanup(opponent, player); - - BitwiseGameState::update_tesla_activity(player); - BitwiseGameState::update_tesla_activity(opponent); - } - - fn fire_single_players_teslas_without_cleanup(player: &mut Player, opponent: &mut Player) { - // It's technically more accurate to have this in, but for - // most practical purposes it's a moot point and it's faster - // without it. - // - // player.tesla_cooldowns.sort_unstable_by(|a, b| b.age.cmp(&a.age)); - for tesla in player.tesla_cooldowns.iter_mut() { - tesla.age += 1; - if tesla.cooldown > 0 { - tesla.cooldown -= 1; - } else if player.energy >= TESLA_FIRING_ENERGY && opponent.iron_curtain_remaining > 0 { - player.energy -= TESLA_FIRING_ENERGY; - tesla.cooldown = TESLA_COOLDOWN; - } else if player.energy >= TESLA_FIRING_ENERGY { - player.energy -= TESLA_FIRING_ENERGY; - tesla.cooldown = TESLA_COOLDOWN; - - if tesla.pos.to_bitfield() & RIGHT_COL_MASK != 0 { - opponent.health = opponent.health.saturating_sub(TESLA_DAMAGE); - } - - let x = tesla.pos.x(); - let y = tesla.pos.y(); - let missed_cells = (u32::from(SINGLE_MAP_WIDTH - x)).saturating_sub(2); - - let top_row = y.saturating_sub(1); - let top_row_mask = ROW_MASKS[top_row as usize]; - let mut destroy_mask = top_row_mask.wrapping_shl(missed_cells) & top_row_mask; - - let mut hits = 0; - for _ in 0..(if y == 0 || y == MAP_HEIGHT-1 { 2 } else { 3 }) { - hits |= destroy_mask & opponent.buildings[0]; - destroy_mask &= !hits; - destroy_mask <<= SINGLE_MAP_WIDTH; - } - BitwiseGameState::destroy_buildings(opponent, hits); - } - } - } - - fn move_and_collide_missiles(opponent: &mut Player, player_missiles: &mut [(u64, u64); MISSILE_MAX_SINGLE_CELL]) { - let mut destroyed = 0; - let mut damaging = 0; - for _ in 0..MISSILE_SPEED { - for missile in player_missiles.iter_mut() { - let swapping_sides = if opponent.iron_curtain_remaining > 0 { 0 } else { missile.0 & RIGHT_COL_MASK }; - let about_to_hit_opponent = missile.1 & LEFT_COL_MASK; - - missile.0 = (missile.0 & !RIGHT_COL_MASK) << 1; - missile.1 = ((missile.1 & !LEFT_COL_MASK) >> 1) | swapping_sides; - - damaging = (damaging << 1) | about_to_hit_opponent; - - let mut hits = 0; - for health_tier in (0..DEFENCE_HEALTH).rev() { - hits = opponent.buildings[health_tier] & missile.1; - missile.1 &= !hits; - opponent.buildings[health_tier] &= !hits; - } - destroyed |= hits; - } - } - let damage = damaging.count_ones() as u8 * MISSILE_DAMAGE; - opponent.health = opponent.health.saturating_sub(damage); - - BitwiseGameState::destroy_buildings(opponent, destroyed); - BitwiseGameState::update_tesla_activity(opponent); - } - - fn destroy_buildings(buildings: &mut Player, hit_mask: u64) { - let deconstruct_mask = !hit_mask; - - buildings.energy_towers &= deconstruct_mask; - for tier in &mut buildings.missile_towers { - *tier &= deconstruct_mask; - } - for tier in &mut buildings.buildings { - *tier &= deconstruct_mask; - } - buildings.occupied &= deconstruct_mask; - } - - fn update_tesla_activity(buildings: &mut Player) { - let occupied = buildings.occupied; - buildings.tesla_cooldowns.retain(|t| (t.pos.to_bitfield() & occupied) != 0); - } - - - fn add_energy(player: &mut Player) { - player.energy += player.energy_generated(); - } - - fn update_status(&mut self) { - let player_dead = self.player.health == 0; - let opponent_dead = self.opponent.health == 0; - self.status = match (player_dead, opponent_dead) { - (true, true) => GameStatus::Draw, - (false, true) => GameStatus::PlayerWon, - (true, false) => GameStatus::OpponentWon, - (false, false) => GameStatus::Continue, - }; - } - -} - -impl Player { - pub fn count_teslas(&self) -> usize { - self.tesla_cooldowns.len() - + self.unconstructed.iter().filter(|t| t.building_type == BuildingType::Tesla).count() - } - - pub fn empty() -> Player { - Player { - health: 0, - energy: 0, - unconstructed: ArrayVec::new(), - buildings: [0; DEFENCE_HEALTH], - occupied: 0, - energy_towers: 0, - missile_towers: [0; MISSILE_COOLDOWN_STATES], - firing_tower: 0, - missiles: [(0,0); MISSILE_MAX_SINGLE_CELL], - tesla_cooldowns: ArrayVec::new(), - iron_curtain_available: false, - iron_curtain_remaining: 0, - } - } - - pub fn energy_generated(&self) -> u16 { - ENERGY_GENERATED_BASE + self.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER - } - - pub fn has_max_teslas(&self) -> bool { - self.count_teslas() >= TESLA_MAX - } - - pub fn can_build_iron_curtain(&self) -> bool { - self.iron_curtain_available && self.iron_curtain_remaining == 0 - } - - pub fn can_build_iron_curtain_in(&self, round: u16, moves: u8) -> bool { - let unlocks = round % IRON_CURTAIN_UNLOCK_INTERVAL > round + u16::from(moves) % IRON_CURTAIN_UNLOCK_INTERVAL; - (self.iron_curtain_available || unlocks) && self.iron_curtain_remaining.saturating_sub(moves) == 0 - } - - pub fn unoccupied_cell_count(&self) -> usize { self.occupied.count_zeros() as usize } - pub fn location_of_unoccupied_cell(&self, i: usize) -> Point { - let bit = find_bit_index_from_rank(self.occupied, i as u64); - let point = Point { index: bit }; - debug_assert!(point.to_bitfield() & self.occupied == 0); - point - } - - - fn perform_command(&mut self, command: Command) { - match command { - Command::Nothing => {}, - Command::Build(p, b) => { - let bitfield = p.to_bitfield(); - - let price = match b { - BuildingType::Attack => MISSILE_PRICE, - BuildingType::Defence => DEFENCE_PRICE, - BuildingType::Energy => ENERGY_PRICE, - BuildingType::Tesla => TESLA_PRICE, - }; - let construction_time = match b { - BuildingType::Attack => MISSILE_CONSTRUCTION_TIME, - BuildingType::Defence => DEFENCE_CONSTRUCTION_TIME, - BuildingType::Energy => ENERGY_CONSTRUCTION_TIME, - BuildingType::Tesla => TESLA_CONSTRUCTION_TIME, - }; - - // This is used internally. I should not be making - // invalid moves! - debug_assert!(self.buildings[0] & bitfield == 0); - debug_assert!(p.x() < FULL_MAP_WIDTH && p.y() < MAP_HEIGHT); - debug_assert!(self.energy >= price); - debug_assert!(b != BuildingType::Tesla || - self.count_teslas() < TESLA_MAX); - - self.energy -= price; - self.unconstructed.push(UnconstructedBuilding { - pos: p, - construction_time_left: construction_time, - building_type: b - }); - self.occupied |= bitfield; - }, - Command::IronCurtain => { - debug_assert!(self.iron_curtain_available); - debug_assert!(self.energy >= IRON_CURTAIN_PRICE); - - self.energy -= IRON_CURTAIN_PRICE; - self.iron_curtain_available = false; - self.iron_curtain_remaining = IRON_CURTAIN_DURATION; - } - } - } - - fn update_construction(&mut self) { - let mut buildings_len = self.unconstructed.len(); - for i in (0..buildings_len).rev() { - if self.unconstructed[i].construction_time_left == 0 { - let building_type = self.unconstructed[i].building_type; - let health = if building_type == BuildingType::Defence { DEFENCE_HEALTH } else { 1 }; - - let pos = self.unconstructed[i].pos; - let bitfield = pos.to_bitfield(); - - for health_tier in 0..health { - self.buildings[health_tier] |= bitfield; - } - if building_type == BuildingType::Energy { - self.energy_towers |= bitfield; - } - if building_type == BuildingType::Attack { - self.missile_towers[self.firing_tower] |= bitfield; - } - if building_type == BuildingType::Tesla { - self.tesla_cooldowns.push(TeslaCooldown { - pos, - cooldown: 0, - age: 0 - }); - } - - buildings_len -= 1; - self.unconstructed.swap(i, buildings_len); - } else { - self.unconstructed[i].construction_time_left -= 1 - } - } - self.unconstructed.truncate(buildings_len); - } - - fn add_missiles(&mut self) { - let mut missiles = self.missile_towers[self.firing_tower]; - for mut tier in &mut self.missiles { - let setting = !tier.0 & missiles; - tier.0 |= setting; - missiles &= !setting; - } - self.firing_tower = (self.firing_tower + 1) % MISSILE_COOLDOWN_STATES; - } - - fn any_missile_towers(&self) -> u64 { - self.missile_towers.iter().fold(0, |acc, next| acc | next) - } - - pub fn count_attack_towers_in_row(&self, y: u8) -> u16 { - let mask = ROW_MASKS[y as usize]; - (self.any_missile_towers() & mask).count_ones() as u16 - } - - pub fn count_energy_towers_in_row(&self, y: u8) -> u16 { - let mask = ROW_MASKS[y as usize]; - (self.energy_towers & mask).count_ones() as u16 - } - - pub fn count_healthy_defence_in_row(&self, y: u8) -> u16 { - let mask = ROW_MASKS[y as usize]; - (self.buildings[1] & mask).count_ones() as u16 - } - - pub fn count_towers_in_row(&self, y: u8) -> u16 { - let mask = ROW_MASKS[y as usize]; - (self.occupied & mask).count_ones() as u16 - } - - pub fn count_towers(&self) -> u32 { - self.occupied.count_ones() - } -} diff --git a/src/engine/command.rs b/src/engine/command.rs deleted file mode 100644 index 76cfaee..0000000 --- a/src/engine/command.rs +++ /dev/null @@ -1,66 +0,0 @@ -use std::fmt; -use super::constants::*; -use super::geometry::Point; - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum Command { - Nothing, - Build(Point, BuildingType), - IronCurtain -} - -impl fmt::Display for Command { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match *self { - Command::Nothing => write!(f, ""), - Command::Build(p, b) => write!(f, "{},{},{}", p.x(), p.y(), b as u8), - Command::IronCurtain => write!(f, "0,0,5") - } - } -} - -impl Command { - pub fn cant_build_yet(self, energy: u16) -> bool { - use self::Command::*; - - match self { - Nothing => false, - Build(_, b) => b.cant_build_yet(energy), - IronCurtain => energy < IRON_CURTAIN_PRICE - } - } -} - - -#[repr(u8)] -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum BuildingType { - Defence = 0, - Attack = 1, - Energy = 2, - Tesla = 4, -} - -impl BuildingType { - pub fn all() -> [BuildingType; NUMBER_OF_BUILDING_TYPES] { - use self::BuildingType::*; - [Defence, Attack, Energy, Tesla] - } - - pub fn from_u8(id: u8) -> Option { - use std::mem; - if id <= 4 && id != 3 { Some(unsafe { mem::transmute(id) }) } else { None } - } - - pub fn cant_build_yet(self, energy: u16) -> bool { - use self::BuildingType::*; - - let required = match self { - Defence => DEFENCE_PRICE, - Attack => MISSILE_PRICE, - Energy => ENERGY_PRICE, - Tesla => TESLA_PRICE - }; - energy < required - } -} diff --git a/src/engine/constants.rs b/src/engine/constants.rs deleted file mode 100644 index a66c9e1..0000000 --- a/src/engine/constants.rs +++ /dev/null @@ -1,52 +0,0 @@ -pub const FULL_MAP_WIDTH: u8 = 16; -pub const SINGLE_MAP_WIDTH: u8 = FULL_MAP_WIDTH/2; -pub const MAP_HEIGHT: u8 = 8; - -pub const MAX_MOVES: u16 = 400; -pub const INIT_SEED: [u8;16] = [0x7b, 0x6a, 0xe1, 0xf4, 0x41, 0x3c, 0xe9, 0x0f, 0x67, 0x81, 0x67, 0x99, 0x77, 0x0a, 0x6b, 0xda]; - -pub const MISSILE_COOLDOWN: usize = 3; -pub const MISSILE_COOLDOWN_STATES: usize = MISSILE_COOLDOWN+1; -pub const MISSILE_SPEED: usize = 2; -pub const MISSILE_MAX_SINGLE_CELL: usize = SINGLE_MAP_WIDTH as usize / MISSILE_SPEED; -pub const MISSILE_DAMAGE: u8 = 5; -pub const MISSILE_PRICE: u16 = 30; -pub const MISSILE_CONSTRUCTION_TIME: u8 = 1; - -pub const DEFENCE_HEALTH: usize = 4; // '20' health is 4 hits -pub const DEFENCE_PRICE: u16 = 30; -pub const DEFENCE_CONSTRUCTION_TIME: u8 = 3; - -pub const TESLA_MAX: usize = 2; -pub const TESLA_COOLDOWN: u8 = 10; -pub const TESLA_FIRING_ENERGY: u16 = 100; -pub const TESLA_DAMAGE: u8 = 20; -pub const TESLA_PRICE: u16 = 100; -pub const TESLA_CONSTRUCTION_TIME: u8 = 10; - -pub const ENERGY_GENERATED_BASE: u16 = 5; -pub const ENERGY_GENERATED_TOWER: u16 = 3; -pub const ENERGY_PRICE: u16 = 20; -pub const ENERGY_CONSTRUCTION_TIME: u8 = 1; - -pub const IRON_CURTAIN_PRICE: u16 = 100; -pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30; -pub const IRON_CURTAIN_DURATION: u8 = 6; - -pub const DECONSTRUCT_ENERGY: u16 = 5; - -pub const MAX_CONCURRENT_CONSTRUCTION: usize = 6; //2 teslas, and 3 of anything else, 1 extra because it's push here then update construction times - - -pub const NUMBER_OF_BUILDING_TYPES: usize = 4; -pub const NUMBER_OF_MAP_POSITIONS: usize = SINGLE_MAP_WIDTH as usize * MAP_HEIGHT as usize; -pub const NUMBER_OF_POSSIBLE_MOVES: usize = NUMBER_OF_MAP_POSITIONS * NUMBER_OF_BUILDING_TYPES + 2; - -#[cfg(not(any(feature = "reduced-time", feature = "extended-time")))] -pub const MAX_TIME_MILLIS: i64 = 1950; - -#[cfg(feature = "reduced-time")] -pub const MAX_TIME_MILLIS: i64 = 950; - -#[cfg(feature = "extended-time")] -pub const MAX_TIME_MILLIS: i64 = 19950; diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs deleted file mode 100644 index 9cd1d90..0000000 --- a/src/engine/geometry.rs +++ /dev/null @@ -1,71 +0,0 @@ -use engine::constants::*; - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub struct Point { - pub index: u8 -} - -impl Point { - pub fn new(x: u8, y: u8) -> Point { - let flipped_x = if x >= SINGLE_MAP_WIDTH { - FULL_MAP_WIDTH - x - 1 - } else { - x - }; - Point { - index: y * SINGLE_MAP_WIDTH + flipped_x - } - } - - pub fn new_index(index: u8) -> Point { - Point { - index - } - } - - pub fn new_double_bitfield(x: u8, y: u8, is_left_player: bool) -> (u64, u64) { - let bitfield = Point::new(x, y).to_bitfield(); - if (x >= SINGLE_MAP_WIDTH) == is_left_player { - (0, bitfield) - } else { - (bitfield, 0) - } - } - - pub fn x(self) -> u8 { - self.index % SINGLE_MAP_WIDTH - } - - pub fn y(self) -> u8 { - self.index / SINGLE_MAP_WIDTH - } -} - -impl Point { - /** - * # Bitfields - * - * 0,0 is the top left point. - * >> (towards 0) moves bits towards the player that owns that side - * << (towards max) moves bits towards the opponent - * This involves mirroring the x dimension for the opponent's side - */ - - pub fn to_bitfield(self) -> u64 { - 1u64 << self.index - } -} - -use std::cmp::Ord; -use std::cmp::Ordering; - -impl PartialOrd for Point { - fn partial_cmp(&self, other: &Point) -> Option { - Some(self.cmp(other)) - } -} -impl Ord for Point { - fn cmp(&self, other: &Point) -> Ordering { - self.index.cmp(&other.index) - } -} diff --git a/src/engine/mod.rs b/src/engine/mod.rs deleted file mode 100644 index f98ef6b..0000000 --- a/src/engine/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub mod command; -pub mod geometry; -pub mod bitwise_engine; -pub mod constants; -pub mod status; diff --git a/src/engine/status.rs b/src/engine/status.rs deleted file mode 100644 index d6ee4dd..0000000 --- a/src/engine/status.rs +++ /dev/null @@ -1,8 +0,0 @@ -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum GameStatus { - Continue, - PlayerWon, - OpponentWon, - Draw -} - diff --git a/src/input/json.rs b/src/input/json.rs deleted file mode 100644 index a71d49e..0000000 --- a/src/input/json.rs +++ /dev/null @@ -1,191 +0,0 @@ -use std::fs::File; -use std::io::prelude::*; -use serde_json; -use std::error::Error; - -use engine; -use engine::command; -use engine::bitwise_engine; -use engine::constants::*; - -pub fn read_bitwise_state_from_file(filename: &str) -> Result> { - let mut file = File::open(filename)?; - let mut content = String::new(); - file.read_to_string(&mut content)?; - let state: State = serde_json::from_str(content.as_ref())?; - - let engine_state = state.to_bitwise_engine(); - Ok(engine_state) -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct State { - game_details: GameDetails, - players: Vec, - game_map: Vec>, -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct GameDetails { - round: u16 -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct Player { - player_type: char, - energy: u16, - health: u8, - iron_curtain_available: bool, - active_iron_curtain_lifetime: i16 -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct GameCell { - x: u8, - y: u8, - buildings: Vec, - missiles: Vec, -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct BuildingState { - health: u8, - construction_time_left: i16, - weapon_cooldown_time_left: u8, - building_type: String, - x: u8, - y: u8, - player_type: char -} - -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -struct MissileState { - player_type: char -} - - -impl State { - fn to_bitwise_engine(&self) -> bitwise_engine::BitwiseGameState { - let mut player = bitwise_engine::Player::empty(); - let mut opponent = bitwise_engine::Player::empty(); - - self.player().map_onto_engine(&mut player); - self.opponent().map_onto_engine(&mut opponent); - - for row in &self.game_map { - for cell in row { - let point = engine::geometry::Point::new(cell.x, cell.y); - for building in &cell.buildings { - let building_type = building.convert_building_type(); - - let mut bitwise_buildings = if building.player_type == 'A' { - &mut player - } else { - &mut opponent - }; - let bitfield = point.to_bitfield(); - - bitwise_buildings.occupied |= bitfield; - if building.construction_time_left >= 0 { - bitwise_buildings.unconstructed.push(building.to_bitwise_engine_unconstructed()); - } else { - for health_tier in 0..DEFENCE_HEALTH { - if building.health > health_tier as u8 * MISSILE_DAMAGE { - bitwise_buildings.buildings[health_tier] |= bitfield; - } - } - if building_type == command::BuildingType::Energy { - bitwise_buildings.energy_towers |= bitfield; - } - else if building_type == command::BuildingType::Attack { - for cooldown_tier in 0..MISSILE_COOLDOWN + 1 { - if building.weapon_cooldown_time_left == cooldown_tier as u8 { - bitwise_buildings.missile_towers[cooldown_tier] |= bitfield; - } - } - } - else if building_type == command::BuildingType::Tesla { - bitwise_buildings.tesla_cooldowns.push(bitwise_engine::TeslaCooldown { - pos: point, - cooldown: building.weapon_cooldown_time_left, - age: building.construction_time_left.abs() as u16 - }); - } - } - } - for missile in &cell.missiles { - let (mut left, mut right) = engine::geometry::Point::new_double_bitfield(cell.x, cell.y, missile.player_type == 'A'); - let mut bitwise_buildings = if missile.player_type == 'A' { - &mut player - } else { - &mut opponent - }; - - for mut tier in &mut bitwise_buildings.missiles { - let setting = (!tier.0 & left, !tier.1 & right); - tier.0 |= setting.0; - tier.1 |= setting.1; - left &= !setting.0; - right &= !setting.1; - } - } - } - } - - bitwise_engine::BitwiseGameState::new( - player, opponent, - self.game_details.round - ) - } - - fn player(&self) -> &Player { - self.players.iter() - .find(|p| p.player_type == 'A') - .expect("Player character did not appear in state.json") - } - - fn opponent(&self) -> &Player { - self.players.iter() - .find(|p| p.player_type == 'B') - .expect("Opponent character did not appear in state.json") - } -} - -impl BuildingState { - fn to_bitwise_engine_unconstructed(&self) -> bitwise_engine::UnconstructedBuilding { - bitwise_engine::UnconstructedBuilding { - pos: engine::geometry::Point::new(self.x, self.y), - construction_time_left: self.construction_time_left as u8, // > 0 check already happened - building_type: self.convert_building_type() - } - } - - fn convert_building_type(&self) -> command::BuildingType { - match self.building_type.as_ref() { - "ATTACK" => command::BuildingType::Attack, - "ENERGY" => command::BuildingType::Energy, - "TESLA" => command::BuildingType::Tesla, - _ => command::BuildingType::Defence, - } - } -} - - -impl Player { - fn map_onto_engine(&self, engine_player: &mut bitwise_engine::Player) { - engine_player.health = self.health; - engine_player.energy = self.energy; - engine_player.iron_curtain_available = self.iron_curtain_available; - engine_player.iron_curtain_remaining = if self.active_iron_curtain_lifetime < 0 { - 0 - } else { - self.active_iron_curtain_lifetime as u8 - }; - } -} diff --git a/src/input/mod.rs b/src/input/mod.rs deleted file mode 100644 index 22fdbb3..0000000 --- a/src/input/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod json; diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index 6cd8730..0000000 --- a/src/lib.rs +++ /dev/null @@ -1,20 +0,0 @@ -extern crate serde; -extern crate serde_json; - -#[macro_use] -extern crate serde_derive; - -extern crate rand; -extern crate time; - -extern crate rayon; - -extern crate arrayvec; - -#[macro_use] -#[cfg(feature = "heuristic-random")] -extern crate lazy_static; - -pub mod input; -pub mod engine; -pub mod strategy; diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 4fa0366..0000000 --- a/src/main.rs +++ /dev/null @@ -1,55 +0,0 @@ -extern crate zombot; -extern crate time; -use time::{PreciseTime, Duration}; - -use zombot::*; -use zombot::engine::constants::*; -use zombot::engine::command::Command; - -use std::error::Error; - -const STATE_PATH: &str = "state.json"; - -const COMMAND_PATH: &str = "command.txt"; - -use std::fs::File; -use std::io::prelude::*; -use std::process; - -fn write_command(filename: &str, command: Command) -> Result<(), Box > { - let mut file = File::create(filename)?; - write!(file, "{}", command)?; - Ok(()) -} - -fn main() { - let start_time = PreciseTime::now(); - let max_time = Duration::milliseconds(MAX_TIME_MILLIS); - - let state = match input::json::read_bitwise_state_from_file(STATE_PATH) { - Ok(ok) => ok, - Err(error) => { - println!("Error while parsing JSON file: {}", error); - process::exit(1); - } - }; - - let command = if cfg!(feature = "static-opening") && state.round < strategy::static_opening::STATIC_OPENING_LENGTH { - strategy::static_opening::choose_move(&state) - } else if cfg!(feature = "full-monte-carlo-tree") { - strategy::monte_carlo_tree::choose_move(&state, start_time, max_time) - } else { - strategy::monte_carlo::choose_move(&state, start_time, max_time) - }; - - match write_command(COMMAND_PATH, command) { - Ok(()) => {} - Err(error) => { - println!("Error while writing command file: {}", error); - process::exit(1); - } - } - - println!("Elapsed time: {}", start_time.to(PreciseTime::now())); -} - diff --git a/src/strategy/mod.rs b/src/strategy/mod.rs deleted file mode 100644 index 9ec41bb..0000000 --- a/src/strategy/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod monte_carlo; -pub mod monte_carlo_tree; -pub mod static_opening; diff --git a/src/strategy/monte_carlo.rs b/src/strategy/monte_carlo.rs deleted file mode 100644 index adbb911..0000000 --- a/src/strategy/monte_carlo.rs +++ /dev/null @@ -1,505 +0,0 @@ -use engine::command::*; -use engine::status::GameStatus; -use engine::bitwise_engine::{Player, BitwiseGameState}; -use engine::constants::*; - -use std::fmt; - -use rand::{Rng, XorShiftRng, SeedableRng}; - -use arrayvec::ArrayVec; - -use time::{Duration, PreciseTime}; - -#[cfg(not(feature = "single-threaded"))] -use rayon::prelude::*; - -#[cfg(feature = "energy-cutoff")] pub const ENERGY_PRODUCTION_CUTOFF: u16 = 50; -#[cfg(feature = "energy-cutoff")] pub const ENERGY_STORAGE_CUTOFF: u16 = 120; - -pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { - let mut command_scores = CommandScore::init_command_scores(state); - - let command = { - let best_command_score = simulate_options_to_timeout(&mut command_scores, state, start_time, max_time); - match best_command_score { - Some(best) if !best.starts_with_nothing => best.command, - _ => Command::Nothing - } - }; - - #[cfg(feature = "benchmarking")] - { - let total_iterations: u32 = command_scores.iter().map(|c| c.attempts).sum(); - println!("Iterations: {}", total_iterations); - } - #[cfg(feature = "debug-decisions")] - { - debug_print_choices("ENERGY", &command_scores, |score| match score.command { - Command::Build(p, BuildingType::Energy) => Some((p, score.win_ratio())), - _ => None - }); - debug_print_choices("ATTACK", &command_scores, |score| match score.command { - Command::Build(p, BuildingType::Attack) => Some((p, score.win_ratio())), - _ => None - }); - debug_print_choices("DEFENCE", &command_scores, |score| match score.command { - Command::Build(p, BuildingType::Defence) => Some((p, score.win_ratio())), - _ => None - }); - debug_print_choices("TESLA", &command_scores, |score| match score.command { - Command::Build(p, BuildingType::Tesla) => Some((p, score.win_ratio())), - _ => None - }); - - println!("NOTHING"); - println!("{}", command_scores.iter().find(|c| c.command == Command::Nothing).map(|s| s.win_ratio()).unwrap_or(0)); - println!(); - - println!("IRON CURTAIN"); - println!("{}", command_scores.iter().find(|c| c.command == Command::IronCurtain).map(|s| s.win_ratio()).unwrap_or(0)); - println!(); - } - - command -} - -#[cfg(feature = "debug-decisions")] -fn debug_print_choices Option<(Point, i32)>>(label: &str, command_scores: &[CommandScore], extractor: F) { - println!("#+NAME: {}", label); - println!("#+PLOT: type:3d with:pm3d"); - let relevant_moves: Vec<(Point, i32)> = command_scores.iter() - .filter_map(extractor) - .collect(); - for y in 0..MAP_HEIGHT { - for x in 0..SINGLE_MAP_WIDTH { - let point = Point::new(x, y); - let score = relevant_moves.iter().find(|(p, _)| *p == point); - print!(" | {}", score.map(|(_,s)| s).cloned().unwrap_or(0)); - } - println!(" |"); - } - println!(); -} - -#[cfg(not(feature = "discard-poor-performers"))] -fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { - loop { - simulate_all_options_once(command_scores, state); - if start_time.to(PreciseTime::now()) > max_time { - break; - } - } - command_scores.iter().max_by_key(|&c| c.win_ratio()) -} - -#[cfg(feature = "discard-poor-performers")] -fn simulate_options_to_timeout<'a>(command_scores: &'a mut Vec, state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Option<&'a CommandScore> { - use std::cmp; - let min_options = cmp::min(command_scores.len(), 5); - - let maxes = [max_time / 3, max_time * 2 / 3, max_time]; - for (i, &max) in maxes.iter().enumerate() { - let new_length = cmp::max(min_options, command_scores.len() / (2usize.pow(i as u32))); - let active_scores = &mut command_scores[0..new_length]; - loop { - simulate_all_options_once(active_scores, state); - if start_time.to(PreciseTime::now()) > max { - break; - } - } - active_scores.sort_unstable_by_key(|c| -c.win_ratio()); - } - command_scores.first() -} - -#[cfg(feature = "single-threaded")] -fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &BitwiseGameState) { - command_scores.iter_mut() - .for_each(|score| { - let mut rng = XorShiftRng::from_seed(score.next_seed); - simulate_to_endstate(score, state, &mut rng); - }); -} - -#[cfg(not(feature = "single-threaded"))] -fn simulate_all_options_once(command_scores: &mut[CommandScore], state: &BitwiseGameState) { - command_scores.par_iter_mut() - .for_each(|score| { - let mut rng = XorShiftRng::from_seed(score.next_seed); - simulate_to_endstate(score, state, &mut rng); - }); -} - -fn simulate_to_endstate(command_score: &mut CommandScore, state: &BitwiseGameState, rng: &mut R) { - let mut state_mut = state.clone(); - - let mut status = GameStatus::Continue; //state_mut.simulate(command_score.command, opponent_first); - let mut first_move_made = false; - - for _ in 0..MAX_MOVES { - if status != GameStatus::Continue { - break; - } - - let player_command = if first_move_made { - random_move(&state_mut.player, &state_mut.opponent, rng) - } else { - let do_nothing = command_score.command.cant_build_yet(state_mut.player.energy); - first_move_made = !do_nothing; - if do_nothing { Command::Nothing } else { command_score.command } - }; - let opponent_command = random_move(&state_mut.opponent, &state_mut.player, rng); - status = state_mut.simulate(player_command, opponent_command); - } - - let mut next_seed: [u8;16] = [0; 16]; - rng.fill_bytes(&mut next_seed); - match status { - GameStatus::PlayerWon => command_score.add_victory(state_mut.player.count_towers() as i32 - state_mut.opponent.count_towers() as i32, next_seed), - GameStatus::OpponentWon => command_score.add_defeat(state_mut.opponent.count_towers() as i32 - state_mut.player.count_towers() as i32, next_seed), - GameStatus::Continue => command_score.add_stalemate(next_seed), - GameStatus::Draw => command_score.add_draw(next_seed) - } -} - -#[cfg(feature = "heuristic-random")] -pub fn random_move(player: &Player, opponent: &Player, rng: &mut R) -> Command { - lazy_static! { - static ref MOVES: [Command; NUMBER_OF_POSSIBLE_MOVES] = { - let mut m = [Command::Nothing; NUMBER_OF_POSSIBLE_MOVES]; - m[1] = Command::IronCurtain; - let mut i = 2; - for b in &[BuildingType::Energy, BuildingType::Defence, BuildingType::Attack, BuildingType::Tesla] { - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let point = Point::new_index(p); - m[i] = Command::Build(point, *b); - i += 1; - } - } - m - }; - } - - let mut cdf_other = [0; 2]; - let mut cdf_energy = [0; NUMBER_OF_MAP_POSITIONS]; - let mut cdf_defence = [0; NUMBER_OF_MAP_POSITIONS]; - let mut cdf_attack = [0; NUMBER_OF_MAP_POSITIONS]; - let mut cdf_tesla = [0; NUMBER_OF_MAP_POSITIONS]; - - let mut attack_metric_per_row = [0; MAP_HEIGHT as usize]; - let mut defence_metric_per_row = [0; MAP_HEIGHT as usize]; - for y in 0..MAP_HEIGHT { - let opponent_energy = opponent.count_energy_towers_in_row(y); - let opponent_attack = opponent.count_attack_towers_in_row(y); - let opponent_towers = opponent.count_towers_in_row(y); - - let player_energy = player.count_energy_towers_in_row(y); - let player_attack = player.count_attack_towers_in_row(y); - let player_towers = player.count_towers_in_row(y); - - defence_metric_per_row[y as usize] = if opponent_attack == 0 { 0 } else { opponent_attack + player_towers }; - attack_metric_per_row[y as usize] = 8 + opponent_energy + opponent_towers + player_energy - player_attack; - } - - - let mut other_end: u16 = 0; - // Nothing - { - let weight = if player.can_build_iron_curtain() && player.energy < IRON_CURTAIN_PRICE { - 5 - } else { - 0 - }; - other_end += weight; - cdf_other[0] = other_end; - } - - // Iron Curtain - { - let weight = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { - 50 - } else { - 0 - }; - other_end += weight; - cdf_other[1] = other_end; - } - - // Energy - let mut energy_end: u16 = other_end; - let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || - player.energy <= ENERGY_STORAGE_CUTOFF; - if needs_energy && player.energy >= ENERGY_PRICE { - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let point = Point::new_index(p); - let weight = if player.occupied & point.to_bitfield() != 0 { - 0 - } else { - 2 - }; - - energy_end += weight; - cdf_energy[p as usize] = energy_end; - } - } - - // Defence - let mut defence_end: u16 = energy_end; - if player.energy >= DEFENCE_PRICE { - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let point = Point::new_index(p); - let y = usize::from(point.y()); - - let weight = if player.occupied & point.to_bitfield() != 0 || point.x() < 4 { - 0 - } else { - defence_metric_per_row[y] - }; - - defence_end += weight; - cdf_defence[p as usize] = defence_end; - } - } - - // Attack - let mut attack_end: u16 = defence_end; - if player.energy >= MISSILE_PRICE { - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let point = Point::new_index(p); - let weight = if player.occupied & point.to_bitfield() != 0 { - 0 - } else { - let y = usize::from(point.y()); - attack_metric_per_row[y] - }; - - attack_end += weight; - cdf_attack[p as usize] = attack_end; - } - } - - // Tesla - let mut tesla_end: u16 = attack_end; - let cant_tesla = player.has_max_teslas() || player.energy < TESLA_PRICE; - if !cant_tesla { - for p in 0..NUMBER_OF_MAP_POSITIONS as u8 { - let point = Point::new_index(p); - let weight = if (player.occupied & point.to_bitfield() != 0) || point.y() < 7 { - 0 - } else { - 10 - }; - - tesla_end += weight; - cdf_tesla[p as usize] = tesla_end; - } - } - - let cumulative_distribution = tesla_end; - - if cumulative_distribution == 0 { - return Command::Nothing; - } - - let choice = rng.gen_range(0, cumulative_distribution); - - let index = match choice { - c if c < other_end => cdf_other.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), - c if c < energy_end => 2 + cdf_energy.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), - c if c < defence_end => 2 + NUMBER_OF_MAP_POSITIONS + cdf_defence.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), - c if c < attack_end => 2 + 2 * NUMBER_OF_MAP_POSITIONS + cdf_attack.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), - _ => 2 + 3 * NUMBER_OF_MAP_POSITIONS + cdf_tesla.iter().position(|&c| c > choice).expect("Random number has exceeded cumulative distribution"), - }; - - MOVES[index] -} - -#[cfg(not(feature = "heuristic-random"))] -pub fn random_move(player: &Player, _opponent: &Player, rng: &mut R) -> Command { - let free_positions_count = player.unoccupied_cell_count(); - - let open_building_spot = free_positions_count > 0; - - let all_buildings = sensible_buildings(player, open_building_spot); - - let iron_curtain_count = if player.can_build_iron_curtain() && player.energy >= IRON_CURTAIN_PRICE { 1 } else { 0 }; - let nothing_count = 1; - - let building_choice_index = rng.gen_range(0, all_buildings.len() + nothing_count + iron_curtain_count); - - if building_choice_index < all_buildings.len() { - let position_choice = rng.gen_range(0, free_positions_count); - Command::Build( - player.location_of_unoccupied_cell(position_choice), - all_buildings[building_choice_index] - ) - } - else if building_choice_index == all_buildings.len() { - Command::Nothing - } else { - Command::IronCurtain - } -} - -#[derive(Debug)] -struct CommandScore { - command: Command, - starts_with_nothing: bool, - victory_score: i32, - victories: u32, - defeat_score: i32, - defeats: u32, - draws: u32, - stalemates: u32, - attempts: u32, - next_seed: [u8; 16] -} - -impl CommandScore { - fn new(command: Command, starts_with_nothing: bool) -> CommandScore { - CommandScore { - command, starts_with_nothing, - victory_score: 0, - victories: 0, - defeat_score: 0, - defeats: 0, - draws: 0, - stalemates: 0, - attempts: 0, - next_seed: INIT_SEED - } - } - - fn add_victory(&mut self, weight: i32, next_seed: [u8; 16]) { - use std::cmp; - self.victory_score += cmp::max(weight, 1); - self.victories += 1; - self.attempts += 1; - self.next_seed = next_seed; - } - - fn add_defeat(&mut self, weight: i32, next_seed: [u8; 16]) { - use std::cmp; - self.defeat_score += cmp::max(weight, 1); - self.defeats += 1; - self.attempts += 1; - self.next_seed = next_seed; - } - - fn add_draw(&mut self, next_seed: [u8; 16]) { - self.draws += 1; - self.attempts += 1; - self.next_seed = next_seed; - } - - fn add_stalemate(&mut self, next_seed: [u8; 16]) { - self.stalemates += 1; - self.attempts += 1; - self.next_seed = next_seed; - } - - #[cfg(feature = "weighted-win-ratio")] - fn win_ratio(&self) -> i32 { - (self.victory_score - self.defeat_score) * 10000 / (self.attempts as i32) - } - - #[cfg(not(feature = "weighted-win-ratio"))] - fn win_ratio(&self) -> i32 { - (self.victories as i32 - self.defeats as i32) * 10000 / (self.attempts as i32) - } - - fn init_command_scores(state: &BitwiseGameState) -> Vec { - let unoccupied_cells_count = state.player.unoccupied_cell_count(); - let unoccupied_cells = (0..unoccupied_cells_count) - .map(|i| state.player.location_of_unoccupied_cell(i)); - let energy_generated = state.player.energy_generated(); - - let mut all_buildings: ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> = ArrayVec::new(); - if DEFENCE_PRICE <= state.player.energy { - all_buildings.push(BuildingType::Defence); - } - if MISSILE_PRICE <= state.player.energy { - all_buildings.push(BuildingType::Attack); - } - if ENERGY_PRICE <= state.player.energy { - all_buildings.push(BuildingType::Energy); - } - if !state.player.has_max_teslas() && (TESLA_PRICE.saturating_sub(state.player.energy) / energy_generated < 4) { - all_buildings.push(BuildingType::Tesla); - } - - let building_command_count = unoccupied_cells.len()*all_buildings.len(); - - let mut commands = Vec::with_capacity(building_command_count + 1); - let time_to_curtain_energy = (IRON_CURTAIN_PRICE.saturating_sub(state.player.energy) / energy_generated) as u8; - - if time_to_curtain_energy < 4 && state.player.can_build_iron_curtain_in(state.round, time_to_curtain_energy) { - commands.push(CommandScore::new(Command::IronCurtain, state.player.energy < IRON_CURTAIN_PRICE)); - } - - for position in unoccupied_cells { - for &building in &all_buildings { - commands.push(CommandScore::new(Command::Build(position, building), building.cant_build_yet(state.player.energy))); - } - } - - commands - } -} - -impl fmt::Display for CommandScore { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{},{}", self.command, self.win_ratio()) - } -} - -#[cfg(all(not(feature = "heuristic-random"), not(feature = "energy-cutoff")))] -fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { - let mut result = ArrayVec::new(); - if !open_building_spot { - return result; - } - - if DEFENCE_PRICE <= player.energy { - result.push(BuildingType::Defence); - } - if MISSILE_PRICE <= player.energy { - result.push(BuildingType::Attack); - } - if ENERGY_PRICE <= player.energy { - result.push(BuildingType::Energy); - } - if TESLA_PRICE <= player.energy && !player.has_max_teslas() { - result.push(BuildingType::Tesla); - } - - result -} - -#[cfg(all(not(feature = "heuristic-random"), feature = "energy-cutoff"))] -fn sensible_buildings(player: &Player, open_building_spot: bool) -> ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> { - let mut result = ArrayVec::new(); - if !open_building_spot { - return result; - } - - let needs_energy = player.energy_generated() <= ENERGY_PRODUCTION_CUTOFF || - player.energy <= ENERGY_STORAGE_CUTOFF; - - if DEFENCE_PRICE <= player.energy { - result.push(BuildingType::Defence); - } - if MISSILE_PRICE <= player.energy { - result.push(BuildingType::Attack); - } - if ENERGY_PRICE <= player.energy && needs_energy { - result.push(BuildingType::Energy); - } - if TESLA_PRICE <= player.energy && !player.has_max_teslas() { - result.push(BuildingType::Tesla); - } - - result -} - diff --git a/src/strategy/monte_carlo_tree.rs b/src/strategy/monte_carlo_tree.rs deleted file mode 100644 index 24b2088..0000000 --- a/src/strategy/monte_carlo_tree.rs +++ /dev/null @@ -1,243 +0,0 @@ -use engine::command::*; -use engine::status::GameStatus; -use engine::bitwise_engine::{Player, BitwiseGameState}; -use engine::constants::*; - -use rand::{Rng, XorShiftRng, SeedableRng}; -use time::{Duration, PreciseTime}; - -use strategy::monte_carlo; - -use arrayvec::ArrayVec; - -#[derive(Debug)] -struct NodeStats { - wins: f32, - losses: f32, - attempts: f32, - average: f32, - confidence: f32, - explored: Vec<(Command, NodeStats)>, - unexplored: Vec, -} - -impl NodeStats { - fn create_node(player: &Player) -> NodeStats { - let unoccupied_cells_count = player.unoccupied_cell_count(); - let unoccupied_cells = (0..unoccupied_cells_count) - .map(|i| player.location_of_unoccupied_cell(i)); - - let mut all_buildings: ArrayVec<[BuildingType; NUMBER_OF_BUILDING_TYPES]> = ArrayVec::new(); - if DEFENCE_PRICE <= player.energy { - all_buildings.push(BuildingType::Defence); - } - if MISSILE_PRICE <= player.energy { - all_buildings.push(BuildingType::Attack); - } - if ENERGY_PRICE <= player.energy { - all_buildings.push(BuildingType::Energy); - } - if TESLA_PRICE <= player.energy && !player.has_max_teslas() { - all_buildings.push(BuildingType::Tesla); - } - - let building_command_count = unoccupied_cells.len()*all_buildings.len(); - - let mut commands = Vec::with_capacity(building_command_count + 2); - - commands.push(Command::Nothing); - if IRON_CURTAIN_PRICE <= player.energy && player.can_build_iron_curtain() { - commands.push(Command::IronCurtain); - } - - for position in unoccupied_cells { - for &building in &all_buildings { - commands.push(Command::Build(position, building)); - } - } - - NodeStats { - wins: 0., - losses: 0., - attempts: 0., - average: 0., - confidence: 0., - explored: Vec::with_capacity(commands.len()), - unexplored: commands - } - } - - fn node_with_highest_ucb<'a>(&'a mut self) -> &'a mut (Command, NodeStats) { - debug_assert!(self.unexplored.is_empty()); - debug_assert!(self.explored.len() > 0); - let sqrt_n = self.attempts.sqrt(); - - let mut max_position = 0; - let mut max_value = self.explored[0].1.ucb(sqrt_n); - for i in 1..self.explored.len() { - let value = self.explored[i].1.ucb(sqrt_n); - if value > max_value { - max_position = i; - max_value = value; - } - } - &mut self.explored[max_position] - } - - fn ucb(&self, sqrt_n: f32) -> f32 { - self.average + sqrt_n * self.confidence - } - - fn add_node<'a>(&'a mut self, player: &Player, command: Command) -> &'a mut (Command, NodeStats) { - let node = NodeStats::create_node(player); - self.explored.push((command, node)); - self.unexplored.retain(|c| *c != command); - self.explored.last_mut().unwrap() - } - - fn add_victory(&mut self) { - self.attempts += 1.; - self.wins += 1.; - self.update_confidence(); - } - fn add_defeat(&mut self) { - self.attempts += 1.; - self.losses += 1.; - self.update_confidence(); - } - fn add_draw(&mut self) { - self.attempts += 1.; - self.update_confidence(); - } - fn update_confidence(&mut self) { - self.average = self.wins / self.attempts; - self.confidence = (2.0 / self.attempts).sqrt(); - } - - #[cfg(feature = "benchmarking")] - fn count_explored(&self) -> usize { - 1 + self.explored.iter().map(|(_, n)| n.count_explored()).sum::() - } -} - -pub fn choose_move(state: &BitwiseGameState, start_time: PreciseTime, max_time: Duration) -> Command { - let mut rng = XorShiftRng::from_seed(INIT_SEED); - - let mut root = NodeStats::create_node(&state.player); - - while start_time.to(PreciseTime::now()) < max_time { - tree_search(&state, &mut root, &mut rng); - } - - #[cfg(feature = "benchmarking")] - { - println!("Explored nodes: {}", root.count_explored()); - } - - let (command, _) = root.node_with_highest_ucb(); - command.clone() -} - -fn tree_search(state: &BitwiseGameState, stats: &mut NodeStats, rng: &mut R) -> GameStatus { - // root is opponent move - // node being added is player move - - if state.round >= MAX_MOVES { - return GameStatus::Draw - } - - if stats.unexplored.is_empty() { - let result = { - let (next_command, next_tree) = stats.node_with_highest_ucb(); - tree_search_opponent(state, next_tree, next_command.clone(), rng) - }; - match result { - GameStatus::PlayerWon => {stats.add_defeat()}, - GameStatus::OpponentWon => {stats.add_victory()}, - _ => {stats.add_draw()} - }; - result - } else { - let next_command = rng.choose(&stats.unexplored).expect("Partially explored had no options").clone(); - let result = { - let (_, next_stats) = stats.add_node(&state.opponent, next_command); - - let opponent_random = monte_carlo::random_move(&state.opponent, &state.player, rng); - let mut next_state = state.clone(); - next_state.simulate(next_command, opponent_random); - - let result = simulate_to_endstate(next_state, rng); - match result { - GameStatus::PlayerWon => {next_stats.add_victory()}, - GameStatus::OpponentWon => {next_stats.add_defeat()}, - _ => {next_stats.add_draw()} - }; - - result - }; - - match result { - GameStatus::PlayerWon => {stats.add_defeat()}, - GameStatus::OpponentWon => {stats.add_victory()}, - _ => {stats.add_draw()} - }; - result - } -} - -fn tree_search_opponent(state: &BitwiseGameState, stats: &mut NodeStats, player_command: Command, rng: &mut R) -> GameStatus { - // root is player move - // node being added is opponent move - - if stats.unexplored.is_empty() { - let result = { - let (next_command, next_tree) = stats.node_with_highest_ucb(); - let mut next_state = state.clone(); - next_state.simulate(player_command, next_command.clone()); - tree_search(&next_state, next_tree, rng) - }; - match result { - GameStatus::PlayerWon => {stats.add_victory()}, - GameStatus::OpponentWon => {stats.add_defeat()}, - _ => {stats.add_draw()} - }; - result - } else { - let next_command = rng.choose(&stats.unexplored).expect("Partially explored had no options").clone(); - let mut next_state = state.clone(); - next_state.simulate(player_command, next_command); - - let result = { - let (_, next_stats) = stats.add_node(&next_state.player, next_command); - - let result = simulate_to_endstate(next_state, rng); - match result { - GameStatus::PlayerWon => {next_stats.add_defeat()}, - GameStatus::OpponentWon => {next_stats.add_victory()}, - _ => {next_stats.add_draw()} - }; - - result - }; - - match result { - GameStatus::PlayerWon => {stats.add_victory()}, - GameStatus::OpponentWon => {stats.add_defeat()}, - _ => {stats.add_draw()} - }; - result - } -} - - -fn simulate_to_endstate(mut state: BitwiseGameState, rng: &mut R) -> GameStatus { - let mut status = GameStatus::Continue; - - while status == GameStatus::Continue && state.round < MAX_MOVES { - let player_command = monte_carlo::random_move(&state.player, &state.opponent, rng); - let opponent_command = monte_carlo::random_move(&state.opponent, &state.player, rng); - status = state.simulate(player_command, opponent_command); - } - status -} - diff --git a/src/strategy/static_opening.rs b/src/strategy/static_opening.rs deleted file mode 100644 index f7e101c..0000000 --- a/src/strategy/static_opening.rs +++ /dev/null @@ -1,21 +0,0 @@ -use engine::geometry::*; -use engine::command::*; -use engine::bitwise_engine::*; - -pub const STATIC_OPENING_LENGTH: u16 = 12; - -pub fn choose_move(state: &BitwiseGameState) -> Command { - match state.round { - 0 => Command::Build(Point::new(0,0), BuildingType::Energy), - 3 => Command::Build(Point::new(0,1), BuildingType::Energy), - 5 => Command::Build(Point::new(0,2), BuildingType::Energy), - 7 => Command::Build(Point::new(0,3), BuildingType::Energy), - 9 => Command::Build(Point::new(0,4), BuildingType::Energy), - 10 => Command::Build(Point::new(0,5), BuildingType::Energy), - 11 => Command::Build(Point::new(0,6), BuildingType::Energy), - 12 => Command::Build(Point::new(0,7), BuildingType::Energy), - 13 => Command::Build(Point::new(1,0), BuildingType::Energy), - 14 => Command::Build(Point::new(1,7), BuildingType::Energy), - _ => Command::Nothing - } -} diff --git a/tests/live_comparison.rs b/tests/live_comparison.rs deleted file mode 100644 index c85e3fe..0000000 --- a/tests/live_comparison.rs +++ /dev/null @@ -1,68 +0,0 @@ -extern crate zombot; - -use zombot::input::json; -use zombot::engine::command::{Command, BuildingType}; -use zombot::engine::geometry::Point; - -use std::fs::File; -use std::io::prelude::*; -use std::path::Path; - -#[test] -fn it_successfully_simulates_replay() { - test_from_replay(&Path::new("tests/v300_normal_towers")); -} - -#[test] -fn it_successfully_simulates_replay_with_iron_curtain() { - test_from_replay(&Path::new("tests/v300_iron_curtain")); -} - -#[test] -fn it_successfully_simulates_replay_with_iron_curtain_with_teslas() { - test_from_replay(&Path::new("tests/v300_iron_curtain_with_teslas")); -} - - -fn test_from_replay(replay_folder: &Path) { - let length = replay_folder.read_dir().unwrap().count()-1; - - let mut state = json::read_bitwise_state_from_file(&format!("{}/Round 000/state.json", replay_folder.display())).unwrap(); - - for i in 0..length { - let player = read_player_command(&format!("{}/Round {:03}/PlayerCommand.txt", replay_folder.display(), i)); - let opponent = read_opponent_command(&format!("{}/Round {:03}/OpponentCommand.txt", replay_folder.display(), i)); - let mut expected_state = json::read_bitwise_state_from_file(&format!("{}/Round {:03}/state.json", replay_folder.display(), i+1)).unwrap(); - - state.simulate(player, opponent); - state.sort(); - expected_state.sort(); - - println!("State {}: {:?}", i+1, state); - assert_eq!(state, expected_state, "\nFailed on state {}\n", i+1); - } -} - -fn read_player_command(filename: &str) -> Command { - let mut file = File::open(filename).unwrap(); - let mut content = String::new(); - file.read_to_string(&mut content).unwrap(); - if content.trim() == "No Command" { - Command::Nothing - } - else { - let mut components = content.split(','); - let point = Point::new(components.next().unwrap().trim().parse().unwrap(), - components.next().unwrap().trim().parse().unwrap()); - let action_type = components.next().unwrap().trim().parse().unwrap(); - if action_type == 5 { - Command::IronCurtain - } else { - Command::Build(point, BuildingType::from_u8(action_type).unwrap()) - } - } -} - -fn read_opponent_command(filename: &str) -> Command { - read_player_command(filename) -} diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs deleted file mode 100644 index cec3256..0000000 --- a/tests/monte_carlo_test.rs +++ /dev/null @@ -1,34 +0,0 @@ -extern crate zombot; -extern crate time; -use time::{PreciseTime, Duration}; - -use zombot::*; - -const STATE_PATH: &str = "tests/state0.json"; - -// there are assertions in the game engine, run when it's in debug mode -#[test] -fn it_does_a_normal_turn_successfully() { - let start_time = PreciseTime::now(); - 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(&state, start_time, max_time); - - assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) -} - -#[test] -fn it_does_a_normal_tree_serach_turn_successfully() { - let start_time = PreciseTime::now(); - 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_tree::choose_move(&state, start_time, max_time); - - assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50)) -} diff --git a/tests/state0.json b/tests/state0.json deleted file mode 100644 index 572fcf9..0000000 --- a/tests/state0.json +++ /dev/null @@ -1 +0,0 @@ -{"gameDetails":{"round":0,"maxRounds":400,"mapWidth":16,"mapHeight":8,"roundIncomeEnergy":5,"buildingPrices":{"TESLA":100,"DEFENSE":30,"ATTACK":30,"ENERGY":20},"buildingsStats":{"TESLA":{"health":5,"constructionTime":10,"price":100,"weaponDamage":20,"weaponSpeed":0,"weaponCooldownPeriod":10,"energyGeneratedPerTurn":0,"destroyMultiplier":10,"constructionScore":20},"DEFENSE":{"health":20,"constructionTime":3,"price":30,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":10},"ATTACK":{"health":5,"constructionTime":1,"price":30,"weaponDamage":5,"weaponSpeed":2,"weaponCooldownPeriod":3,"energyGeneratedPerTurn":0,"destroyMultiplier":1,"constructionScore":4},"ENERGY":{"health":5,"constructionTime":1,"price":20,"weaponDamage":0,"weaponSpeed":0,"weaponCooldownPeriod":0,"energyGeneratedPerTurn":3,"destroyMultiplier":1,"constructionScore":3}},"ironCurtainStats":{"activeRounds":6,"resetPeriod":50,"price":150,"constructionScore":20}},"players":[{"playerType":"A","energy":20,"health":100,"hitsTaken":0,"score":0,"ironCurtainAvailable":false,"activeIronCurtainLifetime":0},{"playerType":"B","energy":20,"health":100,"hitsTaken":0,"score":0,"ironCurtainAvailable":false,"activeIronCurtainLifetime":0}],"gameMap":[[{"x":0,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":0,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":0,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":1,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":1,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":2,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":2,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":3,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":3,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":4,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":4,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":5,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":5,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":6,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":6,"buildings":[],"missiles":[],"cellOwner":"B"}],[{"x":0,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":1,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":2,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":3,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":4,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":5,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":6,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":7,"y":7,"buildings":[],"missiles":[],"cellOwner":"A"},{"x":8,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":9,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":10,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":11,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":12,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":13,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":14,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"},{"x":15,"y":7,"buildings":[],"missiles":[],"cellOwner":"B"}]],"teslaHitList":[],"ironcurtainHitList":[]} \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 000/OpponentCommand.txt b/tests/v300_iron_curtain/Round 000/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/v300_iron_curtain/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 000/PlayerCommand.txt b/tests/v300_iron_curtain/Round 000/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_iron_curtain/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 001/OpponentCommand.txt b/tests/v300_iron_curtain/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 001/PlayerCommand.txt b/tests/v300_iron_curtain/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 002/OpponentCommand.txt b/tests/v300_iron_curtain/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 002/PlayerCommand.txt b/tests/v300_iron_curtain/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 003/OpponentCommand.txt b/tests/v300_iron_curtain/Round 003/OpponentCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/v300_iron_curtain/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 003/PlayerCommand.txt b/tests/v300_iron_curtain/Round 003/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/v300_iron_curtain/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 004/OpponentCommand.txt b/tests/v300_iron_curtain/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 004/PlayerCommand.txt b/tests/v300_iron_curtain/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 005/OpponentCommand.txt b/tests/v300_iron_curtain/Round 005/OpponentCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/v300_iron_curtain/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 005/PlayerCommand.txt b/tests/v300_iron_curtain/Round 005/PlayerCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/v300_iron_curtain/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 006/OpponentCommand.txt b/tests/v300_iron_curtain/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 006/PlayerCommand.txt b/tests/v300_iron_curtain/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 007/OpponentCommand.txt b/tests/v300_iron_curtain/Round 007/OpponentCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/v300_iron_curtain/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 007/PlayerCommand.txt b/tests/v300_iron_curtain/Round 007/PlayerCommand.txt deleted file mode 100644 index 4d83fd9..0000000 --- a/tests/v300_iron_curtain/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 008/OpponentCommand.txt b/tests/v300_iron_curtain/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 008/PlayerCommand.txt b/tests/v300_iron_curtain/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 009/OpponentCommand.txt b/tests/v300_iron_curtain/Round 009/OpponentCommand.txt deleted file mode 100644 index d9a0acb..0000000 --- a/tests/v300_iron_curtain/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 009/PlayerCommand.txt b/tests/v300_iron_curtain/Round 009/PlayerCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/v300_iron_curtain/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 010/OpponentCommand.txt b/tests/v300_iron_curtain/Round 010/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 010/PlayerCommand.txt b/tests/v300_iron_curtain/Round 010/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 011/OpponentCommand.txt b/tests/v300_iron_curtain/Round 011/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/v300_iron_curtain/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 011/PlayerCommand.txt b/tests/v300_iron_curtain/Round 011/PlayerCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/v300_iron_curtain/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 012/OpponentCommand.txt b/tests/v300_iron_curtain/Round 012/OpponentCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/v300_iron_curtain/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 012/PlayerCommand.txt b/tests/v300_iron_curtain/Round 012/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 013/OpponentCommand.txt b/tests/v300_iron_curtain/Round 013/OpponentCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/v300_iron_curtain/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 013/PlayerCommand.txt b/tests/v300_iron_curtain/Round 013/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 014/OpponentCommand.txt b/tests/v300_iron_curtain/Round 014/OpponentCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/v300_iron_curtain/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 014/PlayerCommand.txt b/tests/v300_iron_curtain/Round 014/PlayerCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/v300_iron_curtain/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 015/OpponentCommand.txt b/tests/v300_iron_curtain/Round 015/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 015/PlayerCommand.txt b/tests/v300_iron_curtain/Round 015/PlayerCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/v300_iron_curtain/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 016/OpponentCommand.txt b/tests/v300_iron_curtain/Round 016/OpponentCommand.txt deleted file mode 100644 index 10532f2..0000000 --- a/tests/v300_iron_curtain/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 016/PlayerCommand.txt b/tests/v300_iron_curtain/Round 016/PlayerCommand.txt deleted file mode 100644 index 1c0a0b0..0000000 --- a/tests/v300_iron_curtain/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 017/OpponentCommand.txt b/tests/v300_iron_curtain/Round 017/OpponentCommand.txt deleted file mode 100644 index 0f83bc0..0000000 --- a/tests/v300_iron_curtain/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 017/PlayerCommand.txt b/tests/v300_iron_curtain/Round 017/PlayerCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/v300_iron_curtain/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 018/OpponentCommand.txt b/tests/v300_iron_curtain/Round 018/OpponentCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/v300_iron_curtain/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 018/PlayerCommand.txt b/tests/v300_iron_curtain/Round 018/PlayerCommand.txt deleted file mode 100644 index 75b785b..0000000 --- a/tests/v300_iron_curtain/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 019/OpponentCommand.txt b/tests/v300_iron_curtain/Round 019/OpponentCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 019/PlayerCommand.txt b/tests/v300_iron_curtain/Round 019/PlayerCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/v300_iron_curtain/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 020/OpponentCommand.txt b/tests/v300_iron_curtain/Round 020/OpponentCommand.txt deleted file mode 100644 index 3ab3f32..0000000 --- a/tests/v300_iron_curtain/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 020/PlayerCommand.txt b/tests/v300_iron_curtain/Round 020/PlayerCommand.txt deleted file mode 100644 index a943cb9..0000000 --- a/tests/v300_iron_curtain/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 021/OpponentCommand.txt b/tests/v300_iron_curtain/Round 021/OpponentCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/v300_iron_curtain/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 021/PlayerCommand.txt b/tests/v300_iron_curtain/Round 021/PlayerCommand.txt deleted file mode 100644 index 433ff46..0000000 --- a/tests/v300_iron_curtain/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 022/OpponentCommand.txt b/tests/v300_iron_curtain/Round 022/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/v300_iron_curtain/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 022/PlayerCommand.txt b/tests/v300_iron_curtain/Round 022/PlayerCommand.txt deleted file mode 100644 index 4371338..0000000 --- a/tests/v300_iron_curtain/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 023/OpponentCommand.txt b/tests/v300_iron_curtain/Round 023/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/v300_iron_curtain/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 023/PlayerCommand.txt b/tests/v300_iron_curtain/Round 023/PlayerCommand.txt deleted file mode 100644 index d9a0acb..0000000 --- a/tests/v300_iron_curtain/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 024/OpponentCommand.txt b/tests/v300_iron_curtain/Round 024/OpponentCommand.txt deleted file mode 100644 index 1260cea..0000000 --- a/tests/v300_iron_curtain/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 024/PlayerCommand.txt b/tests/v300_iron_curtain/Round 024/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/v300_iron_curtain/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 025/OpponentCommand.txt b/tests/v300_iron_curtain/Round 025/OpponentCommand.txt deleted file mode 100644 index 8ba7f16..0000000 --- a/tests/v300_iron_curtain/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 025/PlayerCommand.txt b/tests/v300_iron_curtain/Round 025/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 026/OpponentCommand.txt b/tests/v300_iron_curtain/Round 026/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/v300_iron_curtain/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 026/PlayerCommand.txt b/tests/v300_iron_curtain/Round 026/PlayerCommand.txt deleted file mode 100644 index 8a842f9..0000000 --- a/tests/v300_iron_curtain/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 027/OpponentCommand.txt b/tests/v300_iron_curtain/Round 027/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/v300_iron_curtain/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 027/PlayerCommand.txt b/tests/v300_iron_curtain/Round 027/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/v300_iron_curtain/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 028/OpponentCommand.txt b/tests/v300_iron_curtain/Round 028/OpponentCommand.txt deleted file mode 100644 index b2c26e5..0000000 --- a/tests/v300_iron_curtain/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 028/PlayerCommand.txt b/tests/v300_iron_curtain/Round 028/PlayerCommand.txt deleted file mode 100644 index 08ceedf..0000000 --- a/tests/v300_iron_curtain/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 029/OpponentCommand.txt b/tests/v300_iron_curtain/Round 029/OpponentCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/v300_iron_curtain/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 029/PlayerCommand.txt b/tests/v300_iron_curtain/Round 029/PlayerCommand.txt deleted file mode 100644 index 9408cb0..0000000 --- a/tests/v300_iron_curtain/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 030/OpponentCommand.txt b/tests/v300_iron_curtain/Round 030/OpponentCommand.txt deleted file mode 100644 index 75b785b..0000000 --- a/tests/v300_iron_curtain/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 030/PlayerCommand.txt b/tests/v300_iron_curtain/Round 030/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/v300_iron_curtain/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 031/OpponentCommand.txt b/tests/v300_iron_curtain/Round 031/OpponentCommand.txt deleted file mode 100644 index d51905f..0000000 --- a/tests/v300_iron_curtain/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 031/PlayerCommand.txt b/tests/v300_iron_curtain/Round 031/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_iron_curtain/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 032/OpponentCommand.txt b/tests/v300_iron_curtain/Round 032/OpponentCommand.txt deleted file mode 100644 index 9233a2a..0000000 --- a/tests/v300_iron_curtain/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 032/PlayerCommand.txt b/tests/v300_iron_curtain/Round 032/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/v300_iron_curtain/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 033/OpponentCommand.txt b/tests/v300_iron_curtain/Round 033/OpponentCommand.txt deleted file mode 100644 index c27eaf9..0000000 --- a/tests/v300_iron_curtain/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 033/PlayerCommand.txt b/tests/v300_iron_curtain/Round 033/PlayerCommand.txt deleted file mode 100644 index c37c6f4..0000000 --- a/tests/v300_iron_curtain/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 034/OpponentCommand.txt b/tests/v300_iron_curtain/Round 034/OpponentCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/v300_iron_curtain/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 034/PlayerCommand.txt b/tests/v300_iron_curtain/Round 034/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 035/OpponentCommand.txt b/tests/v300_iron_curtain/Round 035/OpponentCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/v300_iron_curtain/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 035/PlayerCommand.txt b/tests/v300_iron_curtain/Round 035/PlayerCommand.txt deleted file mode 100644 index 8ac3a56..0000000 --- a/tests/v300_iron_curtain/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 036/OpponentCommand.txt b/tests/v300_iron_curtain/Round 036/OpponentCommand.txt deleted file mode 100644 index b7adddf..0000000 --- a/tests/v300_iron_curtain/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 036/PlayerCommand.txt b/tests/v300_iron_curtain/Round 036/PlayerCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/v300_iron_curtain/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 037/OpponentCommand.txt b/tests/v300_iron_curtain/Round 037/OpponentCommand.txt deleted file mode 100644 index 8a6627b..0000000 --- a/tests/v300_iron_curtain/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 037/PlayerCommand.txt b/tests/v300_iron_curtain/Round 037/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/v300_iron_curtain/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 038/OpponentCommand.txt b/tests/v300_iron_curtain/Round 038/OpponentCommand.txt deleted file mode 100644 index 3fff544..0000000 --- a/tests/v300_iron_curtain/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 038/PlayerCommand.txt b/tests/v300_iron_curtain/Round 038/PlayerCommand.txt deleted file mode 100644 index 4119710..0000000 --- a/tests/v300_iron_curtain/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 039/OpponentCommand.txt b/tests/v300_iron_curtain/Round 039/OpponentCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/v300_iron_curtain/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 039/PlayerCommand.txt b/tests/v300_iron_curtain/Round 039/PlayerCommand.txt deleted file mode 100644 index 41d5370..0000000 --- a/tests/v300_iron_curtain/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 040/OpponentCommand.txt b/tests/v300_iron_curtain/Round 040/OpponentCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/v300_iron_curtain/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 040/PlayerCommand.txt b/tests/v300_iron_curtain/Round 040/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/v300_iron_curtain/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 041/OpponentCommand.txt b/tests/v300_iron_curtain/Round 041/OpponentCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/v300_iron_curtain/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 041/PlayerCommand.txt b/tests/v300_iron_curtain/Round 041/PlayerCommand.txt deleted file mode 100644 index 5c3de37..0000000 --- a/tests/v300_iron_curtain/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 042/OpponentCommand.txt b/tests/v300_iron_curtain/Round 042/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/v300_iron_curtain/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 042/PlayerCommand.txt b/tests/v300_iron_curtain/Round 042/PlayerCommand.txt deleted file mode 100644 index ad5f821..0000000 --- a/tests/v300_iron_curtain/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 043/OpponentCommand.txt b/tests/v300_iron_curtain/Round 043/OpponentCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/v300_iron_curtain/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 043/PlayerCommand.txt b/tests/v300_iron_curtain/Round 043/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_iron_curtain/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 044/OpponentCommand.txt b/tests/v300_iron_curtain/Round 044/OpponentCommand.txt deleted file mode 100644 index 487bf6a..0000000 --- a/tests/v300_iron_curtain/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 044/PlayerCommand.txt b/tests/v300_iron_curtain/Round 044/PlayerCommand.txt deleted file mode 100644 index d05a714..0000000 --- a/tests/v300_iron_curtain/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 045/OpponentCommand.txt b/tests/v300_iron_curtain/Round 045/OpponentCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/v300_iron_curtain/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 045/PlayerCommand.txt b/tests/v300_iron_curtain/Round 045/PlayerCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/v300_iron_curtain/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 046/OpponentCommand.txt b/tests/v300_iron_curtain/Round 046/OpponentCommand.txt deleted file mode 100644 index 055ca5b..0000000 --- a/tests/v300_iron_curtain/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 046/PlayerCommand.txt b/tests/v300_iron_curtain/Round 046/PlayerCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/v300_iron_curtain/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 047/OpponentCommand.txt b/tests/v300_iron_curtain/Round 047/OpponentCommand.txt deleted file mode 100644 index e874b1f..0000000 --- a/tests/v300_iron_curtain/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 047/PlayerCommand.txt b/tests/v300_iron_curtain/Round 047/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 048/OpponentCommand.txt b/tests/v300_iron_curtain/Round 048/OpponentCommand.txt deleted file mode 100644 index 75b785b..0000000 --- a/tests/v300_iron_curtain/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 048/PlayerCommand.txt b/tests/v300_iron_curtain/Round 048/PlayerCommand.txt deleted file mode 100644 index 49c1201..0000000 --- a/tests/v300_iron_curtain/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 049/OpponentCommand.txt b/tests/v300_iron_curtain/Round 049/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/v300_iron_curtain/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 049/PlayerCommand.txt b/tests/v300_iron_curtain/Round 049/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 050/OpponentCommand.txt b/tests/v300_iron_curtain/Round 050/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/v300_iron_curtain/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 050/PlayerCommand.txt b/tests/v300_iron_curtain/Round 050/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/v300_iron_curtain/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 051/OpponentCommand.txt b/tests/v300_iron_curtain/Round 051/OpponentCommand.txt deleted file mode 100644 index d9e32bb..0000000 --- a/tests/v300_iron_curtain/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 051/PlayerCommand.txt b/tests/v300_iron_curtain/Round 051/PlayerCommand.txt deleted file mode 100644 index 16ddcd7..0000000 --- a/tests/v300_iron_curtain/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 052/OpponentCommand.txt b/tests/v300_iron_curtain/Round 052/OpponentCommand.txt deleted file mode 100644 index 226a1f4..0000000 --- a/tests/v300_iron_curtain/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 052/PlayerCommand.txt b/tests/v300_iron_curtain/Round 052/PlayerCommand.txt deleted file mode 100644 index 41d5370..0000000 --- a/tests/v300_iron_curtain/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 053/OpponentCommand.txt b/tests/v300_iron_curtain/Round 053/OpponentCommand.txt deleted file mode 100644 index 4a8cf07..0000000 --- a/tests/v300_iron_curtain/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 053/PlayerCommand.txt b/tests/v300_iron_curtain/Round 053/PlayerCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/v300_iron_curtain/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 054/OpponentCommand.txt b/tests/v300_iron_curtain/Round 054/OpponentCommand.txt deleted file mode 100644 index 1e7a5f9..0000000 --- a/tests/v300_iron_curtain/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 054/PlayerCommand.txt b/tests/v300_iron_curtain/Round 054/PlayerCommand.txt deleted file mode 100644 index f3c8f77..0000000 --- a/tests/v300_iron_curtain/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 055/OpponentCommand.txt b/tests/v300_iron_curtain/Round 055/OpponentCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/v300_iron_curtain/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 055/PlayerCommand.txt b/tests/v300_iron_curtain/Round 055/PlayerCommand.txt deleted file mode 100644 index 0a612db..0000000 --- a/tests/v300_iron_curtain/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 056/OpponentCommand.txt b/tests/v300_iron_curtain/Round 056/OpponentCommand.txt deleted file mode 100644 index b2c26e5..0000000 --- a/tests/v300_iron_curtain/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 056/PlayerCommand.txt b/tests/v300_iron_curtain/Round 056/PlayerCommand.txt deleted file mode 100644 index a6f3f91..0000000 --- a/tests/v300_iron_curtain/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 057/OpponentCommand.txt b/tests/v300_iron_curtain/Round 057/OpponentCommand.txt deleted file mode 100644 index 429fd32..0000000 --- a/tests/v300_iron_curtain/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 057/PlayerCommand.txt b/tests/v300_iron_curtain/Round 057/PlayerCommand.txt deleted file mode 100644 index d9d71ea..0000000 --- a/tests/v300_iron_curtain/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 058/OpponentCommand.txt b/tests/v300_iron_curtain/Round 058/OpponentCommand.txt deleted file mode 100644 index 722ec58..0000000 --- a/tests/v300_iron_curtain/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 058/PlayerCommand.txt b/tests/v300_iron_curtain/Round 058/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_iron_curtain/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 059/OpponentCommand.txt b/tests/v300_iron_curtain/Round 059/OpponentCommand.txt deleted file mode 100644 index 07b92b5..0000000 --- a/tests/v300_iron_curtain/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 059/PlayerCommand.txt b/tests/v300_iron_curtain/Round 059/PlayerCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/v300_iron_curtain/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 060/OpponentCommand.txt b/tests/v300_iron_curtain/Round 060/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/v300_iron_curtain/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 060/PlayerCommand.txt b/tests/v300_iron_curtain/Round 060/PlayerCommand.txt deleted file mode 100644 index 117d6c2..0000000 --- a/tests/v300_iron_curtain/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 061/OpponentCommand.txt b/tests/v300_iron_curtain/Round 061/OpponentCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/v300_iron_curtain/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 061/PlayerCommand.txt b/tests/v300_iron_curtain/Round 061/PlayerCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/v300_iron_curtain/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 062/OpponentCommand.txt b/tests/v300_iron_curtain/Round 062/OpponentCommand.txt deleted file mode 100644 index 08ecb10..0000000 --- a/tests/v300_iron_curtain/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 062/PlayerCommand.txt b/tests/v300_iron_curtain/Round 062/PlayerCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_iron_curtain/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 063/OpponentCommand.txt b/tests/v300_iron_curtain/Round 063/OpponentCommand.txt deleted file mode 100644 index 816366d..0000000 --- a/tests/v300_iron_curtain/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 063/PlayerCommand.txt b/tests/v300_iron_curtain/Round 063/PlayerCommand.txt deleted file mode 100644 index 9b9f49b..0000000 --- a/tests/v300_iron_curtain/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 064/OpponentCommand.txt b/tests/v300_iron_curtain/Round 064/OpponentCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_iron_curtain/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 064/PlayerCommand.txt b/tests/v300_iron_curtain/Round 064/PlayerCommand.txt deleted file mode 100644 index 8a6627b..0000000 --- a/tests/v300_iron_curtain/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 065/OpponentCommand.txt b/tests/v300_iron_curtain/Round 065/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/v300_iron_curtain/Round 065/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 065/PlayerCommand.txt b/tests/v300_iron_curtain/Round 065/PlayerCommand.txt deleted file mode 100644 index 26912c7..0000000 --- a/tests/v300_iron_curtain/Round 065/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 066/OpponentCommand.txt b/tests/v300_iron_curtain/Round 066/OpponentCommand.txt deleted file mode 100644 index 4f716a1..0000000 --- a/tests/v300_iron_curtain/Round 066/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 066/PlayerCommand.txt b/tests/v300_iron_curtain/Round 066/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 066/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 067/OpponentCommand.txt b/tests/v300_iron_curtain/Round 067/OpponentCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain/Round 067/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 067/PlayerCommand.txt b/tests/v300_iron_curtain/Round 067/PlayerCommand.txt deleted file mode 100644 index c27eaf9..0000000 --- a/tests/v300_iron_curtain/Round 067/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 068/OpponentCommand.txt b/tests/v300_iron_curtain/Round 068/OpponentCommand.txt deleted file mode 100644 index d9e32bb..0000000 --- a/tests/v300_iron_curtain/Round 068/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 068/PlayerCommand.txt b/tests/v300_iron_curtain/Round 068/PlayerCommand.txt deleted file mode 100644 index 50688ac..0000000 --- a/tests/v300_iron_curtain/Round 068/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 069/OpponentCommand.txt b/tests/v300_iron_curtain/Round 069/OpponentCommand.txt deleted file mode 100644 index ebfc684..0000000 --- a/tests/v300_iron_curtain/Round 069/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 069/PlayerCommand.txt b/tests/v300_iron_curtain/Round 069/PlayerCommand.txt deleted file mode 100644 index 41d5370..0000000 --- a/tests/v300_iron_curtain/Round 069/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 070/OpponentCommand.txt b/tests/v300_iron_curtain/Round 070/OpponentCommand.txt deleted file mode 100644 index c742585..0000000 --- a/tests/v300_iron_curtain/Round 070/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 070/PlayerCommand.txt b/tests/v300_iron_curtain/Round 070/PlayerCommand.txt deleted file mode 100644 index 16ddcd7..0000000 --- a/tests/v300_iron_curtain/Round 070/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 071/OpponentCommand.txt b/tests/v300_iron_curtain/Round 071/OpponentCommand.txt deleted file mode 100644 index 4a8cf07..0000000 --- a/tests/v300_iron_curtain/Round 071/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 071/PlayerCommand.txt b/tests/v300_iron_curtain/Round 071/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 071/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 072/OpponentCommand.txt b/tests/v300_iron_curtain/Round 072/OpponentCommand.txt deleted file mode 100644 index 1c0a0b0..0000000 --- a/tests/v300_iron_curtain/Round 072/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 072/PlayerCommand.txt b/tests/v300_iron_curtain/Round 072/PlayerCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/v300_iron_curtain/Round 072/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 073/OpponentCommand.txt b/tests/v300_iron_curtain/Round 073/OpponentCommand.txt deleted file mode 100644 index a91c23f..0000000 --- a/tests/v300_iron_curtain/Round 073/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 073/PlayerCommand.txt b/tests/v300_iron_curtain/Round 073/PlayerCommand.txt deleted file mode 100644 index 95a4cf3..0000000 --- a/tests/v300_iron_curtain/Round 073/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 074/OpponentCommand.txt b/tests/v300_iron_curtain/Round 074/OpponentCommand.txt deleted file mode 100644 index daa46d9..0000000 --- a/tests/v300_iron_curtain/Round 074/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 074/PlayerCommand.txt b/tests/v300_iron_curtain/Round 074/PlayerCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_iron_curtain/Round 074/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 075/OpponentCommand.txt b/tests/v300_iron_curtain/Round 075/OpponentCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/v300_iron_curtain/Round 075/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 075/PlayerCommand.txt b/tests/v300_iron_curtain/Round 075/PlayerCommand.txt deleted file mode 100644 index 910a1ab..0000000 --- a/tests/v300_iron_curtain/Round 075/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 076/OpponentCommand.txt b/tests/v300_iron_curtain/Round 076/OpponentCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_iron_curtain/Round 076/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 076/PlayerCommand.txt b/tests/v300_iron_curtain/Round 076/PlayerCommand.txt deleted file mode 100644 index 4119710..0000000 --- a/tests/v300_iron_curtain/Round 076/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 077/OpponentCommand.txt b/tests/v300_iron_curtain/Round 077/OpponentCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_iron_curtain/Round 077/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 077/PlayerCommand.txt b/tests/v300_iron_curtain/Round 077/PlayerCommand.txt deleted file mode 100644 index e09f712..0000000 --- a/tests/v300_iron_curtain/Round 077/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 078/OpponentCommand.txt b/tests/v300_iron_curtain/Round 078/OpponentCommand.txt deleted file mode 100644 index 77bf522..0000000 --- a/tests/v300_iron_curtain/Round 078/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 078/PlayerCommand.txt b/tests/v300_iron_curtain/Round 078/PlayerCommand.txt deleted file mode 100644 index 41d5370..0000000 --- a/tests/v300_iron_curtain/Round 078/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 079/OpponentCommand.txt b/tests/v300_iron_curtain/Round 079/OpponentCommand.txt deleted file mode 100644 index e02c049..0000000 --- a/tests/v300_iron_curtain/Round 079/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 079/PlayerCommand.txt b/tests/v300_iron_curtain/Round 079/PlayerCommand.txt deleted file mode 100644 index f8007d6..0000000 --- a/tests/v300_iron_curtain/Round 079/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 080/OpponentCommand.txt b/tests/v300_iron_curtain/Round 080/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/v300_iron_curtain/Round 080/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 080/PlayerCommand.txt b/tests/v300_iron_curtain/Round 080/PlayerCommand.txt deleted file mode 100644 index 08ecb10..0000000 --- a/tests/v300_iron_curtain/Round 080/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 081/OpponentCommand.txt b/tests/v300_iron_curtain/Round 081/OpponentCommand.txt deleted file mode 100644 index 4f8f464..0000000 --- a/tests/v300_iron_curtain/Round 081/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 081/PlayerCommand.txt b/tests/v300_iron_curtain/Round 081/PlayerCommand.txt deleted file mode 100644 index c49791c..0000000 --- a/tests/v300_iron_curtain/Round 081/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 082/OpponentCommand.txt b/tests/v300_iron_curtain/Round 082/OpponentCommand.txt deleted file mode 100644 index ce49ef6..0000000 --- a/tests/v300_iron_curtain/Round 082/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 082/PlayerCommand.txt b/tests/v300_iron_curtain/Round 082/PlayerCommand.txt deleted file mode 100644 index 3ab3f32..0000000 --- a/tests/v300_iron_curtain/Round 082/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 083/OpponentCommand.txt b/tests/v300_iron_curtain/Round 083/OpponentCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain/Round 083/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 083/PlayerCommand.txt b/tests/v300_iron_curtain/Round 083/PlayerCommand.txt deleted file mode 100644 index b4e7071..0000000 --- a/tests/v300_iron_curtain/Round 083/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 084/OpponentCommand.txt b/tests/v300_iron_curtain/Round 084/OpponentCommand.txt deleted file mode 100644 index b2c26e5..0000000 --- a/tests/v300_iron_curtain/Round 084/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 084/PlayerCommand.txt b/tests/v300_iron_curtain/Round 084/PlayerCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_iron_curtain/Round 084/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 085/OpponentCommand.txt b/tests/v300_iron_curtain/Round 085/OpponentCommand.txt deleted file mode 100644 index d51905f..0000000 --- a/tests/v300_iron_curtain/Round 085/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 085/PlayerCommand.txt b/tests/v300_iron_curtain/Round 085/PlayerCommand.txt deleted file mode 100644 index 4d83fd9..0000000 --- a/tests/v300_iron_curtain/Round 085/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 086/OpponentCommand.txt b/tests/v300_iron_curtain/Round 086/OpponentCommand.txt deleted file mode 100644 index dd03d6a..0000000 --- a/tests/v300_iron_curtain/Round 086/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 086/PlayerCommand.txt b/tests/v300_iron_curtain/Round 086/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/v300_iron_curtain/Round 086/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 087/OpponentCommand.txt b/tests/v300_iron_curtain/Round 087/OpponentCommand.txt deleted file mode 100644 index b7adddf..0000000 --- a/tests/v300_iron_curtain/Round 087/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 087/PlayerCommand.txt b/tests/v300_iron_curtain/Round 087/PlayerCommand.txt deleted file mode 100644 index c7d9109..0000000 --- a/tests/v300_iron_curtain/Round 087/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 088/OpponentCommand.txt b/tests/v300_iron_curtain/Round 088/OpponentCommand.txt deleted file mode 100644 index 4b87d86..0000000 --- a/tests/v300_iron_curtain/Round 088/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 088/PlayerCommand.txt b/tests/v300_iron_curtain/Round 088/PlayerCommand.txt deleted file mode 100644 index f238916..0000000 --- a/tests/v300_iron_curtain/Round 088/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 089/OpponentCommand.txt b/tests/v300_iron_curtain/Round 089/OpponentCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/v300_iron_curtain/Round 089/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 089/PlayerCommand.txt b/tests/v300_iron_curtain/Round 089/PlayerCommand.txt deleted file mode 100644 index 2a21cf5..0000000 --- a/tests/v300_iron_curtain/Round 089/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 090/OpponentCommand.txt b/tests/v300_iron_curtain/Round 090/OpponentCommand.txt deleted file mode 100644 index 94d7b0a..0000000 --- a/tests/v300_iron_curtain/Round 090/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 090/PlayerCommand.txt b/tests/v300_iron_curtain/Round 090/PlayerCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/v300_iron_curtain/Round 090/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 091/OpponentCommand.txt b/tests/v300_iron_curtain/Round 091/OpponentCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/v300_iron_curtain/Round 091/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 091/PlayerCommand.txt b/tests/v300_iron_curtain/Round 091/PlayerCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_iron_curtain/Round 091/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 092/OpponentCommand.txt b/tests/v300_iron_curtain/Round 092/OpponentCommand.txt deleted file mode 100644 index 7d08a5b..0000000 --- a/tests/v300_iron_curtain/Round 092/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 092/PlayerCommand.txt b/tests/v300_iron_curtain/Round 092/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 092/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 093/OpponentCommand.txt b/tests/v300_iron_curtain/Round 093/OpponentCommand.txt deleted file mode 100644 index 7ae2a9c..0000000 --- a/tests/v300_iron_curtain/Round 093/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 093/PlayerCommand.txt b/tests/v300_iron_curtain/Round 093/PlayerCommand.txt deleted file mode 100644 index 5ee21e6..0000000 --- a/tests/v300_iron_curtain/Round 093/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 094/OpponentCommand.txt b/tests/v300_iron_curtain/Round 094/OpponentCommand.txt deleted file mode 100644 index 8ac3a56..0000000 --- a/tests/v300_iron_curtain/Round 094/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 094/PlayerCommand.txt b/tests/v300_iron_curtain/Round 094/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_iron_curtain/Round 094/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 095/OpponentCommand.txt b/tests/v300_iron_curtain/Round 095/OpponentCommand.txt deleted file mode 100644 index a6f3f91..0000000 --- a/tests/v300_iron_curtain/Round 095/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 095/PlayerCommand.txt b/tests/v300_iron_curtain/Round 095/PlayerCommand.txt deleted file mode 100644 index 6643b0d..0000000 --- a/tests/v300_iron_curtain/Round 095/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 096/OpponentCommand.txt b/tests/v300_iron_curtain/Round 096/OpponentCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/v300_iron_curtain/Round 096/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 096/PlayerCommand.txt b/tests/v300_iron_curtain/Round 096/PlayerCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_iron_curtain/Round 096/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 097/OpponentCommand.txt b/tests/v300_iron_curtain/Round 097/OpponentCommand.txt deleted file mode 100644 index ce49ef6..0000000 --- a/tests/v300_iron_curtain/Round 097/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 097/PlayerCommand.txt b/tests/v300_iron_curtain/Round 097/PlayerCommand.txt deleted file mode 100644 index a943cb9..0000000 --- a/tests/v300_iron_curtain/Round 097/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 098/OpponentCommand.txt b/tests/v300_iron_curtain/Round 098/OpponentCommand.txt deleted file mode 100644 index c4e7948..0000000 --- a/tests/v300_iron_curtain/Round 098/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 098/PlayerCommand.txt b/tests/v300_iron_curtain/Round 098/PlayerCommand.txt deleted file mode 100644 index 429fd32..0000000 --- a/tests/v300_iron_curtain/Round 098/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 099/OpponentCommand.txt b/tests/v300_iron_curtain/Round 099/OpponentCommand.txt deleted file mode 100644 index e2634f0..0000000 --- a/tests/v300_iron_curtain/Round 099/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 099/PlayerCommand.txt b/tests/v300_iron_curtain/Round 099/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_iron_curtain/Round 099/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 100/OpponentCommand.txt b/tests/v300_iron_curtain/Round 100/OpponentCommand.txt deleted file mode 100644 index f82aafb..0000000 --- a/tests/v300_iron_curtain/Round 100/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 100/PlayerCommand.txt b/tests/v300_iron_curtain/Round 100/PlayerCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_iron_curtain/Round 100/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 101/OpponentCommand.txt b/tests/v300_iron_curtain/Round 101/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/v300_iron_curtain/Round 101/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 101/PlayerCommand.txt b/tests/v300_iron_curtain/Round 101/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 101/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 102/OpponentCommand.txt b/tests/v300_iron_curtain/Round 102/OpponentCommand.txt deleted file mode 100644 index 910a1ab..0000000 --- a/tests/v300_iron_curtain/Round 102/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 102/PlayerCommand.txt b/tests/v300_iron_curtain/Round 102/PlayerCommand.txt deleted file mode 100644 index 8c5ef78..0000000 --- a/tests/v300_iron_curtain/Round 102/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 103/OpponentCommand.txt b/tests/v300_iron_curtain/Round 103/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/v300_iron_curtain/Round 103/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 103/PlayerCommand.txt b/tests/v300_iron_curtain/Round 103/PlayerCommand.txt deleted file mode 100644 index b548cc7..0000000 --- a/tests/v300_iron_curtain/Round 103/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 104/OpponentCommand.txt b/tests/v300_iron_curtain/Round 104/OpponentCommand.txt deleted file mode 100644 index ac6c42a..0000000 --- a/tests/v300_iron_curtain/Round 104/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 104/PlayerCommand.txt b/tests/v300_iron_curtain/Round 104/PlayerCommand.txt deleted file mode 100644 index e638283..0000000 --- a/tests/v300_iron_curtain/Round 104/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 105/OpponentCommand.txt b/tests/v300_iron_curtain/Round 105/OpponentCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_iron_curtain/Round 105/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 105/PlayerCommand.txt b/tests/v300_iron_curtain/Round 105/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_iron_curtain/Round 105/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 106/OpponentCommand.txt b/tests/v300_iron_curtain/Round 106/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 106/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 106/PlayerCommand.txt b/tests/v300_iron_curtain/Round 106/PlayerCommand.txt deleted file mode 100644 index f24e83b..0000000 --- a/tests/v300_iron_curtain/Round 106/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 107/OpponentCommand.txt b/tests/v300_iron_curtain/Round 107/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 107/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 107/PlayerCommand.txt b/tests/v300_iron_curtain/Round 107/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 107/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 108/OpponentCommand.txt b/tests/v300_iron_curtain/Round 108/OpponentCommand.txt deleted file mode 100644 index 0b1714b..0000000 --- a/tests/v300_iron_curtain/Round 108/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 108/PlayerCommand.txt b/tests/v300_iron_curtain/Round 108/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 108/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 109/OpponentCommand.txt b/tests/v300_iron_curtain/Round 109/OpponentCommand.txt deleted file mode 100644 index 4119710..0000000 --- a/tests/v300_iron_curtain/Round 109/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 109/PlayerCommand.txt b/tests/v300_iron_curtain/Round 109/PlayerCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/v300_iron_curtain/Round 109/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 110/OpponentCommand.txt b/tests/v300_iron_curtain/Round 110/OpponentCommand.txt deleted file mode 100644 index dd03d6a..0000000 --- a/tests/v300_iron_curtain/Round 110/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 110/PlayerCommand.txt b/tests/v300_iron_curtain/Round 110/PlayerCommand.txt deleted file mode 100644 index 9f89a93..0000000 --- a/tests/v300_iron_curtain/Round 110/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 111/OpponentCommand.txt b/tests/v300_iron_curtain/Round 111/OpponentCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/v300_iron_curtain/Round 111/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 111/PlayerCommand.txt b/tests/v300_iron_curtain/Round 111/PlayerCommand.txt deleted file mode 100644 index 0b1714b..0000000 --- a/tests/v300_iron_curtain/Round 111/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 112/OpponentCommand.txt b/tests/v300_iron_curtain/Round 112/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 112/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 112/PlayerCommand.txt b/tests/v300_iron_curtain/Round 112/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 112/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 113/OpponentCommand.txt b/tests/v300_iron_curtain/Round 113/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 113/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 113/PlayerCommand.txt b/tests/v300_iron_curtain/Round 113/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 113/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 114/OpponentCommand.txt b/tests/v300_iron_curtain/Round 114/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 114/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 114/PlayerCommand.txt b/tests/v300_iron_curtain/Round 114/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 114/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 115/OpponentCommand.txt b/tests/v300_iron_curtain/Round 115/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 115/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 115/PlayerCommand.txt b/tests/v300_iron_curtain/Round 115/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 115/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 116/OpponentCommand.txt b/tests/v300_iron_curtain/Round 116/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 116/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 116/PlayerCommand.txt b/tests/v300_iron_curtain/Round 116/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 116/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 117/OpponentCommand.txt b/tests/v300_iron_curtain/Round 117/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 117/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 117/PlayerCommand.txt b/tests/v300_iron_curtain/Round 117/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 117/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 118/OpponentCommand.txt b/tests/v300_iron_curtain/Round 118/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 118/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain/Round 118/PlayerCommand.txt b/tests/v300_iron_curtain/Round 118/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain/Round 118/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt deleted file mode 100644 index 9233a2a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt deleted file mode 100644 index 9233a2a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt deleted file mode 100644 index 72ca43d..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt deleted file mode 100644 index 72ca43d..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt deleted file mode 100644 index 4a9590d..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt deleted file mode 100644 index 94bee18..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt deleted file mode 100644 index 8ba7f16..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt deleted file mode 100644 index 36e6f4c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt deleted file mode 100644 index 36e6f4c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt deleted file mode 100644 index 48cfbfe..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt deleted file mode 100644 index 474bb6c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt deleted file mode 100644 index 474bb6c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt deleted file mode 100644 index 533b1c8..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt deleted file mode 100644 index 239b17a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt deleted file mode 100644 index 0b12f52..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt deleted file mode 100644 index 8ba7f16..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt deleted file mode 100644 index 601aa29..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt deleted file mode 100644 index 19fbb8f..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt deleted file mode 100644 index 8a6627b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt deleted file mode 100644 index 8a6627b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt deleted file mode 100644 index 1c0a0b0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt deleted file mode 100644 index d9a0acb..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt deleted file mode 100644 index a6f3f91..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt deleted file mode 100644 index 77bf522..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt deleted file mode 100644 index 429fd32..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt deleted file mode 100644 index 1ba30d4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt deleted file mode 100644 index ddc7f56..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt deleted file mode 100644 index 0b1714b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt deleted file mode 100644 index 0b1714b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt deleted file mode 100644 index 9f89a93..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt deleted file mode 100644 index bee7857..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt deleted file mode 100644 index 94d7b0a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt deleted file mode 100644 index 43be3f4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt deleted file mode 100644 index bee7857..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt deleted file mode 100644 index 49dd99d..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt deleted file mode 100644 index 5ff9de4..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,5,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt deleted file mode 100644 index af58f31..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt deleted file mode 100644 index 743727a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt deleted file mode 100644 index a2a45e9..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt deleted file mode 100644 index 9f12d31..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt deleted file mode 100644 index d9d71ea..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt deleted file mode 100644 index 412a2df..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt deleted file mode 100644 index f238916..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt deleted file mode 100644 index a91c23f..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt deleted file mode 100644 index 474bb6c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt deleted file mode 100644 index dd03d6a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,4,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt deleted file mode 100644 index 9f89a93..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt deleted file mode 100644 index 08ecb10..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt deleted file mode 100644 index 3de7cb6..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt deleted file mode 100644 index 49c1201..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt deleted file mode 100644 index 816366d..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt deleted file mode 100644 index e638283..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt deleted file mode 100644 index 7d93635..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt deleted file mode 100644 index 07b92b5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt deleted file mode 100644 index f24e83b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt deleted file mode 100644 index 7d08a5b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt deleted file mode 100644 index a943cb9..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt deleted file mode 100644 index 3775784..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt deleted file mode 100644 index 41d5370..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt deleted file mode 100644 index 5c88dd1..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt deleted file mode 100644 index 3de7cb6..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,0,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt deleted file mode 100644 index 9f89a93..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt deleted file mode 100644 index bee7857..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt deleted file mode 100644 index b743516..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,7,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt deleted file mode 100644 index 474bb6c..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,4 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt deleted file mode 100644 index 674d299..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt deleted file mode 100644 index 0b1714b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt deleted file mode 100644 index 0b1714b..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,5 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt deleted file mode 100644 index 0c3ccbf..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt deleted file mode 100644 index b0f2a85..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,4,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt deleted file mode 100644 index 94d7b0a..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt deleted file mode 100644 index b548cc7..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 065/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt deleted file mode 100644 index b4e7071..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 065/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 066/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 066/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt deleted file mode 100644 index 22d278e..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 067/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt deleted file mode 100644 index ca8db41..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 067/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,7,2 \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 068/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 068/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 069/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 069/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 070/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 070/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 071/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 071/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 072/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 072/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 073/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 073/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 074/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 074/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 075/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt b/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_iron_curtain_with_teslas/Round 075/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 000/OpponentCommand.txt b/tests/v300_normal_towers/Round 000/OpponentCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/v300_normal_towers/Round 000/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 000/PlayerCommand.txt b/tests/v300_normal_towers/Round 000/PlayerCommand.txt deleted file mode 100644 index 6c57709..0000000 --- a/tests/v300_normal_towers/Round 000/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,7,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 001/OpponentCommand.txt b/tests/v300_normal_towers/Round 001/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 001/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 001/PlayerCommand.txt b/tests/v300_normal_towers/Round 001/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 001/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 002/OpponentCommand.txt b/tests/v300_normal_towers/Round 002/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 002/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 002/PlayerCommand.txt b/tests/v300_normal_towers/Round 002/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 002/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 003/OpponentCommand.txt b/tests/v300_normal_towers/Round 003/OpponentCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_normal_towers/Round 003/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 003/PlayerCommand.txt b/tests/v300_normal_towers/Round 003/PlayerCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_normal_towers/Round 003/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 004/OpponentCommand.txt b/tests/v300_normal_towers/Round 004/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 004/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 004/PlayerCommand.txt b/tests/v300_normal_towers/Round 004/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 004/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 005/OpponentCommand.txt b/tests/v300_normal_towers/Round 005/OpponentCommand.txt deleted file mode 100644 index 7ca2987..0000000 --- a/tests/v300_normal_towers/Round 005/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 005/PlayerCommand.txt b/tests/v300_normal_towers/Round 005/PlayerCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/v300_normal_towers/Round 005/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 006/OpponentCommand.txt b/tests/v300_normal_towers/Round 006/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 006/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 006/PlayerCommand.txt b/tests/v300_normal_towers/Round 006/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 006/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 007/OpponentCommand.txt b/tests/v300_normal_towers/Round 007/OpponentCommand.txt deleted file mode 100644 index a5bd5ef..0000000 --- a/tests/v300_normal_towers/Round 007/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 007/PlayerCommand.txt b/tests/v300_normal_towers/Round 007/PlayerCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/v300_normal_towers/Round 007/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 008/OpponentCommand.txt b/tests/v300_normal_towers/Round 008/OpponentCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 008/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 008/PlayerCommand.txt b/tests/v300_normal_towers/Round 008/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 008/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 009/OpponentCommand.txt b/tests/v300_normal_towers/Round 009/OpponentCommand.txt deleted file mode 100644 index 4a8cf07..0000000 --- a/tests/v300_normal_towers/Round 009/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 009/PlayerCommand.txt b/tests/v300_normal_towers/Round 009/PlayerCommand.txt deleted file mode 100644 index d5cd851..0000000 --- a/tests/v300_normal_towers/Round 009/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 010/OpponentCommand.txt b/tests/v300_normal_towers/Round 010/OpponentCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_normal_towers/Round 010/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 010/PlayerCommand.txt b/tests/v300_normal_towers/Round 010/PlayerCommand.txt deleted file mode 100644 index ab857c9..0000000 --- a/tests/v300_normal_towers/Round 010/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 011/OpponentCommand.txt b/tests/v300_normal_towers/Round 011/OpponentCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_normal_towers/Round 011/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 011/PlayerCommand.txt b/tests/v300_normal_towers/Round 011/PlayerCommand.txt deleted file mode 100644 index 4119710..0000000 --- a/tests/v300_normal_towers/Round 011/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 012/OpponentCommand.txt b/tests/v300_normal_towers/Round 012/OpponentCommand.txt deleted file mode 100644 index 9b5a49a..0000000 --- a/tests/v300_normal_towers/Round 012/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 012/PlayerCommand.txt b/tests/v300_normal_towers/Round 012/PlayerCommand.txt deleted file mode 100644 index ea9e316..0000000 --- a/tests/v300_normal_towers/Round 012/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 013/OpponentCommand.txt b/tests/v300_normal_towers/Round 013/OpponentCommand.txt deleted file mode 100644 index 87d322f..0000000 --- a/tests/v300_normal_towers/Round 013/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 013/PlayerCommand.txt b/tests/v300_normal_towers/Round 013/PlayerCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/v300_normal_towers/Round 013/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 014/OpponentCommand.txt b/tests/v300_normal_towers/Round 014/OpponentCommand.txt deleted file mode 100644 index d17d619..0000000 --- a/tests/v300_normal_towers/Round 014/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 014/PlayerCommand.txt b/tests/v300_normal_towers/Round 014/PlayerCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/v300_normal_towers/Round 014/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 015/OpponentCommand.txt b/tests/v300_normal_towers/Round 015/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 015/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 015/PlayerCommand.txt b/tests/v300_normal_towers/Round 015/PlayerCommand.txt deleted file mode 100644 index e02c049..0000000 --- a/tests/v300_normal_towers/Round 015/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 016/OpponentCommand.txt b/tests/v300_normal_towers/Round 016/OpponentCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/v300_normal_towers/Round 016/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 016/PlayerCommand.txt b/tests/v300_normal_towers/Round 016/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 016/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 017/OpponentCommand.txt b/tests/v300_normal_towers/Round 017/OpponentCommand.txt deleted file mode 100644 index ea179d3..0000000 --- a/tests/v300_normal_towers/Round 017/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 017/PlayerCommand.txt b/tests/v300_normal_towers/Round 017/PlayerCommand.txt deleted file mode 100644 index f23ef17..0000000 --- a/tests/v300_normal_towers/Round 017/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 018/OpponentCommand.txt b/tests/v300_normal_towers/Round 018/OpponentCommand.txt deleted file mode 100644 index 0a612db..0000000 --- a/tests/v300_normal_towers/Round 018/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 018/PlayerCommand.txt b/tests/v300_normal_towers/Round 018/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 018/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 019/OpponentCommand.txt b/tests/v300_normal_towers/Round 019/OpponentCommand.txt deleted file mode 100644 index b557a00..0000000 --- a/tests/v300_normal_towers/Round 019/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 019/PlayerCommand.txt b/tests/v300_normal_towers/Round 019/PlayerCommand.txt deleted file mode 100644 index 26912c7..0000000 --- a/tests/v300_normal_towers/Round 019/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 020/OpponentCommand.txt b/tests/v300_normal_towers/Round 020/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/v300_normal_towers/Round 020/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 020/PlayerCommand.txt b/tests/v300_normal_towers/Round 020/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_normal_towers/Round 020/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 021/OpponentCommand.txt b/tests/v300_normal_towers/Round 021/OpponentCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_normal_towers/Round 021/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 021/PlayerCommand.txt b/tests/v300_normal_towers/Round 021/PlayerCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/v300_normal_towers/Round 021/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 022/OpponentCommand.txt b/tests/v300_normal_towers/Round 022/OpponentCommand.txt deleted file mode 100644 index 8e935c8..0000000 --- a/tests/v300_normal_towers/Round 022/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 022/PlayerCommand.txt b/tests/v300_normal_towers/Round 022/PlayerCommand.txt deleted file mode 100644 index 8a6627b..0000000 --- a/tests/v300_normal_towers/Round 022/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 023/OpponentCommand.txt b/tests/v300_normal_towers/Round 023/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 023/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 023/PlayerCommand.txt b/tests/v300_normal_towers/Round 023/PlayerCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/v300_normal_towers/Round 023/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 024/OpponentCommand.txt b/tests/v300_normal_towers/Round 024/OpponentCommand.txt deleted file mode 100644 index d05a714..0000000 --- a/tests/v300_normal_towers/Round 024/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 024/PlayerCommand.txt b/tests/v300_normal_towers/Round 024/PlayerCommand.txt deleted file mode 100644 index 49c1201..0000000 --- a/tests/v300_normal_towers/Round 024/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 025/OpponentCommand.txt b/tests/v300_normal_towers/Round 025/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 025/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 025/PlayerCommand.txt b/tests/v300_normal_towers/Round 025/PlayerCommand.txt deleted file mode 100644 index 7388cff..0000000 --- a/tests/v300_normal_towers/Round 025/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 026/OpponentCommand.txt b/tests/v300_normal_towers/Round 026/OpponentCommand.txt deleted file mode 100644 index 9477e06..0000000 --- a/tests/v300_normal_towers/Round 026/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 026/PlayerCommand.txt b/tests/v300_normal_towers/Round 026/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 026/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 027/OpponentCommand.txt b/tests/v300_normal_towers/Round 027/OpponentCommand.txt deleted file mode 100644 index f217f6d..0000000 --- a/tests/v300_normal_towers/Round 027/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 027/PlayerCommand.txt b/tests/v300_normal_towers/Round 027/PlayerCommand.txt deleted file mode 100644 index 08ecb10..0000000 --- a/tests/v300_normal_towers/Round 027/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 028/OpponentCommand.txt b/tests/v300_normal_towers/Round 028/OpponentCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_normal_towers/Round 028/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 028/PlayerCommand.txt b/tests/v300_normal_towers/Round 028/PlayerCommand.txt deleted file mode 100644 index 4dd67d5..0000000 --- a/tests/v300_normal_towers/Round 028/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 029/OpponentCommand.txt b/tests/v300_normal_towers/Round 029/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 029/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 029/PlayerCommand.txt b/tests/v300_normal_towers/Round 029/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 029/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 030/OpponentCommand.txt b/tests/v300_normal_towers/Round 030/OpponentCommand.txt deleted file mode 100644 index 9f89a93..0000000 --- a/tests/v300_normal_towers/Round 030/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 030/PlayerCommand.txt b/tests/v300_normal_towers/Round 030/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_normal_towers/Round 030/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 031/OpponentCommand.txt b/tests/v300_normal_towers/Round 031/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/v300_normal_towers/Round 031/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 031/PlayerCommand.txt b/tests/v300_normal_towers/Round 031/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 031/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 032/OpponentCommand.txt b/tests/v300_normal_towers/Round 032/OpponentCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/v300_normal_towers/Round 032/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 032/PlayerCommand.txt b/tests/v300_normal_towers/Round 032/PlayerCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_normal_towers/Round 032/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 033/OpponentCommand.txt b/tests/v300_normal_towers/Round 033/OpponentCommand.txt deleted file mode 100644 index 5e4b046..0000000 --- a/tests/v300_normal_towers/Round 033/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 033/PlayerCommand.txt b/tests/v300_normal_towers/Round 033/PlayerCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/v300_normal_towers/Round 033/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 034/OpponentCommand.txt b/tests/v300_normal_towers/Round 034/OpponentCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/v300_normal_towers/Round 034/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 034/PlayerCommand.txt b/tests/v300_normal_towers/Round 034/PlayerCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/v300_normal_towers/Round 034/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 035/OpponentCommand.txt b/tests/v300_normal_towers/Round 035/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 035/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 035/PlayerCommand.txt b/tests/v300_normal_towers/Round 035/PlayerCommand.txt deleted file mode 100644 index 153865b..0000000 --- a/tests/v300_normal_towers/Round 035/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 036/OpponentCommand.txt b/tests/v300_normal_towers/Round 036/OpponentCommand.txt deleted file mode 100644 index 3177984..0000000 --- a/tests/v300_normal_towers/Round 036/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 036/PlayerCommand.txt b/tests/v300_normal_towers/Round 036/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 036/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 037/OpponentCommand.txt b/tests/v300_normal_towers/Round 037/OpponentCommand.txt deleted file mode 100644 index 7ca2987..0000000 --- a/tests/v300_normal_towers/Round 037/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 037/PlayerCommand.txt b/tests/v300_normal_towers/Round 037/PlayerCommand.txt deleted file mode 100644 index 1571d81..0000000 --- a/tests/v300_normal_towers/Round 037/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 038/OpponentCommand.txt b/tests/v300_normal_towers/Round 038/OpponentCommand.txt deleted file mode 100644 index 9f89a93..0000000 --- a/tests/v300_normal_towers/Round 038/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 038/PlayerCommand.txt b/tests/v300_normal_towers/Round 038/PlayerCommand.txt deleted file mode 100644 index addc906..0000000 --- a/tests/v300_normal_towers/Round 038/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 039/OpponentCommand.txt b/tests/v300_normal_towers/Round 039/OpponentCommand.txt deleted file mode 100644 index a825030..0000000 --- a/tests/v300_normal_towers/Round 039/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 039/PlayerCommand.txt b/tests/v300_normal_towers/Round 039/PlayerCommand.txt deleted file mode 100644 index 3362217..0000000 --- a/tests/v300_normal_towers/Round 039/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 040/OpponentCommand.txt b/tests/v300_normal_towers/Round 040/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 040/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 040/PlayerCommand.txt b/tests/v300_normal_towers/Round 040/PlayerCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/v300_normal_towers/Round 040/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 041/OpponentCommand.txt b/tests/v300_normal_towers/Round 041/OpponentCommand.txt deleted file mode 100644 index 67f6e86..0000000 --- a/tests/v300_normal_towers/Round 041/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 041/PlayerCommand.txt b/tests/v300_normal_towers/Round 041/PlayerCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/v300_normal_towers/Round 041/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 042/OpponentCommand.txt b/tests/v300_normal_towers/Round 042/OpponentCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/v300_normal_towers/Round 042/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 042/PlayerCommand.txt b/tests/v300_normal_towers/Round 042/PlayerCommand.txt deleted file mode 100644 index aa178b0..0000000 --- a/tests/v300_normal_towers/Round 042/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 043/OpponentCommand.txt b/tests/v300_normal_towers/Round 043/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 043/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 043/PlayerCommand.txt b/tests/v300_normal_towers/Round 043/PlayerCommand.txt deleted file mode 100644 index 55526f5..0000000 --- a/tests/v300_normal_towers/Round 043/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 044/OpponentCommand.txt b/tests/v300_normal_towers/Round 044/OpponentCommand.txt deleted file mode 100644 index b4e7071..0000000 --- a/tests/v300_normal_towers/Round 044/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 044/PlayerCommand.txt b/tests/v300_normal_towers/Round 044/PlayerCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/v300_normal_towers/Round 044/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 045/OpponentCommand.txt b/tests/v300_normal_towers/Round 045/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 045/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 045/PlayerCommand.txt b/tests/v300_normal_towers/Round 045/PlayerCommand.txt deleted file mode 100644 index 3177984..0000000 --- a/tests/v300_normal_towers/Round 045/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 046/OpponentCommand.txt b/tests/v300_normal_towers/Round 046/OpponentCommand.txt deleted file mode 100644 index cb47d55..0000000 --- a/tests/v300_normal_towers/Round 046/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 046/PlayerCommand.txt b/tests/v300_normal_towers/Round 046/PlayerCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 046/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 047/OpponentCommand.txt b/tests/v300_normal_towers/Round 047/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 047/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 047/PlayerCommand.txt b/tests/v300_normal_towers/Round 047/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_normal_towers/Round 047/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 048/OpponentCommand.txt b/tests/v300_normal_towers/Round 048/OpponentCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_normal_towers/Round 048/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 048/PlayerCommand.txt b/tests/v300_normal_towers/Round 048/PlayerCommand.txt deleted file mode 100644 index f1d02f4..0000000 --- a/tests/v300_normal_towers/Round 048/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,0,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 049/OpponentCommand.txt b/tests/v300_normal_towers/Round 049/OpponentCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/v300_normal_towers/Round 049/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 049/PlayerCommand.txt b/tests/v300_normal_towers/Round 049/PlayerCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/v300_normal_towers/Round 049/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 050/OpponentCommand.txt b/tests/v300_normal_towers/Round 050/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/v300_normal_towers/Round 050/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 050/PlayerCommand.txt b/tests/v300_normal_towers/Round 050/PlayerCommand.txt deleted file mode 100644 index 816366d..0000000 --- a/tests/v300_normal_towers/Round 050/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 051/OpponentCommand.txt b/tests/v300_normal_towers/Round 051/OpponentCommand.txt deleted file mode 100644 index 43be3f4..0000000 --- a/tests/v300_normal_towers/Round 051/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 051/PlayerCommand.txt b/tests/v300_normal_towers/Round 051/PlayerCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/v300_normal_towers/Round 051/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 052/OpponentCommand.txt b/tests/v300_normal_towers/Round 052/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 052/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 052/PlayerCommand.txt b/tests/v300_normal_towers/Round 052/PlayerCommand.txt deleted file mode 100644 index 17d7db2..0000000 --- a/tests/v300_normal_towers/Round 052/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 053/OpponentCommand.txt b/tests/v300_normal_towers/Round 053/OpponentCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_normal_towers/Round 053/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 053/PlayerCommand.txt b/tests/v300_normal_towers/Round 053/PlayerCommand.txt deleted file mode 100644 index 0c3ccbf..0000000 --- a/tests/v300_normal_towers/Round 053/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 054/OpponentCommand.txt b/tests/v300_normal_towers/Round 054/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 054/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 054/PlayerCommand.txt b/tests/v300_normal_towers/Round 054/PlayerCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/v300_normal_towers/Round 054/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 055/OpponentCommand.txt b/tests/v300_normal_towers/Round 055/OpponentCommand.txt deleted file mode 100644 index b548cc7..0000000 --- a/tests/v300_normal_towers/Round 055/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,6,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 055/PlayerCommand.txt b/tests/v300_normal_towers/Round 055/PlayerCommand.txt deleted file mode 100644 index 1084f37..0000000 --- a/tests/v300_normal_towers/Round 055/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 056/OpponentCommand.txt b/tests/v300_normal_towers/Round 056/OpponentCommand.txt deleted file mode 100644 index ac6c42a..0000000 --- a/tests/v300_normal_towers/Round 056/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 056/PlayerCommand.txt b/tests/v300_normal_towers/Round 056/PlayerCommand.txt deleted file mode 100644 index 61f66b5..0000000 --- a/tests/v300_normal_towers/Round 056/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 057/OpponentCommand.txt b/tests/v300_normal_towers/Round 057/OpponentCommand.txt deleted file mode 100644 index 4d83fd9..0000000 --- a/tests/v300_normal_towers/Round 057/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 057/PlayerCommand.txt b/tests/v300_normal_towers/Round 057/PlayerCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/v300_normal_towers/Round 057/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 058/OpponentCommand.txt b/tests/v300_normal_towers/Round 058/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 058/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 058/PlayerCommand.txt b/tests/v300_normal_towers/Round 058/PlayerCommand.txt deleted file mode 100644 index 1571d81..0000000 --- a/tests/v300_normal_towers/Round 058/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 059/OpponentCommand.txt b/tests/v300_normal_towers/Round 059/OpponentCommand.txt deleted file mode 100644 index b4e7071..0000000 --- a/tests/v300_normal_towers/Round 059/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 059/PlayerCommand.txt b/tests/v300_normal_towers/Round 059/PlayerCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 059/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 060/OpponentCommand.txt b/tests/v300_normal_towers/Round 060/OpponentCommand.txt deleted file mode 100644 index 429fd32..0000000 --- a/tests/v300_normal_towers/Round 060/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,6,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 060/PlayerCommand.txt b/tests/v300_normal_towers/Round 060/PlayerCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_normal_towers/Round 060/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 061/OpponentCommand.txt b/tests/v300_normal_towers/Round 061/OpponentCommand.txt deleted file mode 100644 index ccd082b..0000000 --- a/tests/v300_normal_towers/Round 061/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 061/PlayerCommand.txt b/tests/v300_normal_towers/Round 061/PlayerCommand.txt deleted file mode 100644 index 0c3ccbf..0000000 --- a/tests/v300_normal_towers/Round 061/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 062/OpponentCommand.txt b/tests/v300_normal_towers/Round 062/OpponentCommand.txt deleted file mode 100644 index 49c1201..0000000 --- a/tests/v300_normal_towers/Round 062/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 062/PlayerCommand.txt b/tests/v300_normal_towers/Round 062/PlayerCommand.txt deleted file mode 100644 index 722ec58..0000000 --- a/tests/v300_normal_towers/Round 062/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,2,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 063/OpponentCommand.txt b/tests/v300_normal_towers/Round 063/OpponentCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_normal_towers/Round 063/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 063/PlayerCommand.txt b/tests/v300_normal_towers/Round 063/PlayerCommand.txt deleted file mode 100644 index c602c71..0000000 --- a/tests/v300_normal_towers/Round 063/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,0,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 064/OpponentCommand.txt b/tests/v300_normal_towers/Round 064/OpponentCommand.txt deleted file mode 100644 index 3dee0c6..0000000 --- a/tests/v300_normal_towers/Round 064/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 064/PlayerCommand.txt b/tests/v300_normal_towers/Round 064/PlayerCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/v300_normal_towers/Round 064/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 065/OpponentCommand.txt b/tests/v300_normal_towers/Round 065/OpponentCommand.txt deleted file mode 100644 index a7503e5..0000000 --- a/tests/v300_normal_towers/Round 065/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 065/PlayerCommand.txt b/tests/v300_normal_towers/Round 065/PlayerCommand.txt deleted file mode 100644 index a81a341..0000000 --- a/tests/v300_normal_towers/Round 065/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 066/OpponentCommand.txt b/tests/v300_normal_towers/Round 066/OpponentCommand.txt deleted file mode 100644 index a6f3f91..0000000 --- a/tests/v300_normal_towers/Round 066/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,6,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 066/PlayerCommand.txt b/tests/v300_normal_towers/Round 066/PlayerCommand.txt deleted file mode 100644 index b77a79c..0000000 --- a/tests/v300_normal_towers/Round 066/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -2,3,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 067/OpponentCommand.txt b/tests/v300_normal_towers/Round 067/OpponentCommand.txt deleted file mode 100644 index bb03eca..0000000 --- a/tests/v300_normal_towers/Round 067/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,3,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 067/PlayerCommand.txt b/tests/v300_normal_towers/Round 067/PlayerCommand.txt deleted file mode 100644 index 7f7238b..0000000 --- a/tests/v300_normal_towers/Round 067/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 068/OpponentCommand.txt b/tests/v300_normal_towers/Round 068/OpponentCommand.txt deleted file mode 100644 index e874b1f..0000000 --- a/tests/v300_normal_towers/Round 068/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,6,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 068/PlayerCommand.txt b/tests/v300_normal_towers/Round 068/PlayerCommand.txt deleted file mode 100644 index b0fd0dc..0000000 --- a/tests/v300_normal_towers/Round 068/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 069/OpponentCommand.txt b/tests/v300_normal_towers/Round 069/OpponentCommand.txt deleted file mode 100644 index 46660d6..0000000 --- a/tests/v300_normal_towers/Round 069/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 069/PlayerCommand.txt b/tests/v300_normal_towers/Round 069/PlayerCommand.txt deleted file mode 100644 index ddc7f56..0000000 --- a/tests/v300_normal_towers/Round 069/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 070/OpponentCommand.txt b/tests/v300_normal_towers/Round 070/OpponentCommand.txt deleted file mode 100644 index dc922cc..0000000 --- a/tests/v300_normal_towers/Round 070/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,5,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 070/PlayerCommand.txt b/tests/v300_normal_towers/Round 070/PlayerCommand.txt deleted file mode 100644 index 93ec9b2..0000000 --- a/tests/v300_normal_towers/Round 070/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 071/OpponentCommand.txt b/tests/v300_normal_towers/Round 071/OpponentCommand.txt deleted file mode 100644 index ee791e3..0000000 --- a/tests/v300_normal_towers/Round 071/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 071/PlayerCommand.txt b/tests/v300_normal_towers/Round 071/PlayerCommand.txt deleted file mode 100644 index 3ca9676..0000000 --- a/tests/v300_normal_towers/Round 071/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,3,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 072/OpponentCommand.txt b/tests/v300_normal_towers/Round 072/OpponentCommand.txt deleted file mode 100644 index b4e7071..0000000 --- a/tests/v300_normal_towers/Round 072/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,1,0 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 072/PlayerCommand.txt b/tests/v300_normal_towers/Round 072/PlayerCommand.txt deleted file mode 100644 index 3d765f0..0000000 --- a/tests/v300_normal_towers/Round 072/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -5,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 073/OpponentCommand.txt b/tests/v300_normal_towers/Round 073/OpponentCommand.txt deleted file mode 100644 index a01c7f4..0000000 --- a/tests/v300_normal_towers/Round 073/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,4,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 073/PlayerCommand.txt b/tests/v300_normal_towers/Round 073/PlayerCommand.txt deleted file mode 100644 index 08ceedf..0000000 --- a/tests/v300_normal_towers/Round 073/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -4,5,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 074/OpponentCommand.txt b/tests/v300_normal_towers/Round 074/OpponentCommand.txt deleted file mode 100644 index 10532f2..0000000 --- a/tests/v300_normal_towers/Round 074/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -0,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 074/PlayerCommand.txt b/tests/v300_normal_towers/Round 074/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 074/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 075/OpponentCommand.txt b/tests/v300_normal_towers/Round 075/OpponentCommand.txt deleted file mode 100644 index 08ecb10..0000000 --- a/tests/v300_normal_towers/Round 075/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 075/PlayerCommand.txt b/tests/v300_normal_towers/Round 075/PlayerCommand.txt deleted file mode 100644 index c41707e..0000000 --- a/tests/v300_normal_towers/Round 075/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,7,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 076/OpponentCommand.txt b/tests/v300_normal_towers/Round 076/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/v300_normal_towers/Round 076/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 076/PlayerCommand.txt b/tests/v300_normal_towers/Round 076/PlayerCommand.txt deleted file mode 100644 index 85eacdb..0000000 --- a/tests/v300_normal_towers/Round 076/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -3,2,2 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 077/OpponentCommand.txt b/tests/v300_normal_towers/Round 077/OpponentCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/v300_normal_towers/Round 077/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 077/PlayerCommand.txt b/tests/v300_normal_towers/Round 077/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 077/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 078/OpponentCommand.txt b/tests/v300_normal_towers/Round 078/OpponentCommand.txt deleted file mode 100644 index 1c0a0b0..0000000 --- a/tests/v300_normal_towers/Round 078/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -1,2,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 078/PlayerCommand.txt b/tests/v300_normal_towers/Round 078/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 078/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 079/OpponentCommand.txt b/tests/v300_normal_towers/Round 079/OpponentCommand.txt deleted file mode 100644 index 8bb009c..0000000 --- a/tests/v300_normal_towers/Round 079/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -6,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 079/PlayerCommand.txt b/tests/v300_normal_towers/Round 079/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 079/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 080/OpponentCommand.txt b/tests/v300_normal_towers/Round 080/OpponentCommand.txt deleted file mode 100644 index 323dbb1..0000000 --- a/tests/v300_normal_towers/Round 080/OpponentCommand.txt +++ /dev/null @@ -1 +0,0 @@ -7,1,1 \ No newline at end of file diff --git a/tests/v300_normal_towers/Round 080/PlayerCommand.txt b/tests/v300_normal_towers/Round 080/PlayerCommand.txt deleted file mode 100644 index bdb74d0..0000000 --- a/tests/v300_normal_towers/Round 080/PlayerCommand.txt +++ /dev/null @@ -1 +0,0 @@ -No Command \ No newline at end of file -- cgit v1.2.3