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 +- 3 files changed, 24 insertions(+), 7 deletions(-) (limited to 'src/engine') 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 -- cgit v1.2.3