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 --- tests/expressive_to_bitwise_comparison.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/expressive_to_bitwise_comparison.rs') 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, -- cgit v1.2.3