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 --- tests/expressive_to_bitwise_comparison.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 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