From 2dfd18653d7ee0ab387c0e6937ae7fb3f1bd1b65 Mon Sep 17 00:00:00 2001 From: ErfanFaravani Date: Tue, 28 Jan 2020 15:59:49 +0330 Subject: [PATCH] range and damage upgrade check added --- world.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/world.py b/world.py index c30fab1..678ef58 100644 --- a/world.py +++ b/world.py @@ -358,8 +358,8 @@ def get_player_units(self, player_id): # return a list of units in a cell def get_cell_units(self, cell=None, row=None, col=None): - if cell == None: - if row == None and col == None: + if cell is None: + if row is None and col is None: return None cell = self.map.get_cell(row, col) return cell.units @@ -674,11 +674,19 @@ def get_player_died_units(self, player_id): return self.get_player_by_id(player_id).dead_units def has_player_used_ranged_upgrade(self, player_id): - if self.turn_updates.got_range_upgrade is not None: - return True + for u in self.get_player_by_id(player_id).dead_units: + if u.was_range_upgraded: + return True + for u in self.get_player_by_id(player_id).units: + if u.was_range_upgraded: + return True return False def has_player_used_damage_upgrade(self, player_id): - if self.turn_updates.got_damage_upgrade is not None: - return True + for u in self.get_player_by_id(player_id).dead_units: + if u.was_damage_upgraded: + return True + for u in self.get_player_by_id(player_id).units: + if u.was_damage_upgraded: + return True return False