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 --- src/engine/mod.rs | 8 ++++---- src/main.rs | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'src') 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