Merge pull request #23 from Agent-LucIA/fix/improve_moving_units

fix(#12): improve units movement
LuxAI-Gamers · Sep 4, 2021 · 3282b50 · 3282b50
2 parents 5d77f5b + 49cc8af
commit 3282b50
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/lucia.py b/lucia.py
@@ -47,7 +47,7 @@ def _init_my_turn(self, game_state, observation):
         self._width = game_state.map_width
         self._height = game_state.map.height
         self._player = game_state.players[observation.player]
-        self._opponent = game_state.players[observation.player]
+        self._opponent = game_state.players[(observation.player+1)%2]
         self._n_units = len(game_state.players[observation.player].units)
 
 
@@ -125,5 +125,6 @@ def _write_notes(self):
                               height = self._height,
                               player = self._player,
                               n_units = self._n_units,
-                              units_map = self._units_map
+                              units_map = self._units_map,
+                              tiles_assigned = []
                               )
diff --git a/worker/tasks/find_nearest_resource.py b/worker/tasks/find_nearest_resource.py
@@ -45,6 +45,9 @@ def find_all_resources(self, map, height, width):
     def find_closest_resources(self, object, player):
         """
         """
+
+        tiles_assigned = self._blackboard.get_value('tiles_assigned')
+
         closest_dist = math.inf
         closest_resource_tile = None
         for resource_tile in self._resource_tiles:
@@ -57,6 +60,9 @@ def find_closest_resources(self, object, player):
                 and not player.researched_uranium()):
                 continue
 
+            if resource_tile.pos in tiles_assigned:
+                continue
+
             dist = resource_tile.pos.distance_to(object.pos)
             if dist < closest_dist:
                 closest_dist = dist

diff --git a/worker/tasks/move_to_position.py b/worker/tasks/move_to_position.py
@@ -36,7 +36,8 @@ def run(self):
                                             object)
 
         updated = self.update_blackboard(direction,
-                                         object)
+                                         object,
+                                         target_position)
 
         return True if updated else False
 
@@ -90,7 +91,7 @@ def get_final_position(self,posible_pos,object):
         return direction
 
 
-    def update_blackboard(self, direction, object):
+    def update_blackboard(self, direction, object, target_position):
 
         if direction:
             old_pos = object.pos
@@ -103,6 +104,7 @@ def update_blackboard(self, direction, object):
 
             self._blackboard.set_values(units_map=units_map)
             self._blackboard.append_values(actions=movement)
+            self._blackboard.append_values(tiles_assigned=target_position)
             self._blackboard.set_values(position=None)
             return True
         else: