From 088f0aeb23789ace5e9b77e75d5c23f5442e4cdc Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin@worthe-it.co.za>
Date: Sat, 9 Jun 2018 10:27:29 +0200
Subject: Added pruning of buying energy buildings behind a feature flag

---
 src/strategy/mod.rs         |  1 -
 src/strategy/monte_carlo.rs |  6 +++---
 src/strategy/sample.rs      | 40 ----------------------------------------
 3 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 src/strategy/sample.rs

(limited to 'src/strategy')

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<R: Rng>(command_score: &mut CommandScore, settings: &Gam
 }
 
 fn random_player_move<R: Rng>(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<R: Rng>(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<CommandScore> {
-        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