WIP: removing tiles

marl_factory_grid/utils/states.py

@@ -1,8 +1,7 @@
-from typing import List, Dict
+from typing import List, Dict, Tuple
 
 import numpy as np
 
-
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.environment.entity.wall_floor import Floor
 from marl_factory_grid.environment.rules import Rule
@@ -108,8 +107,22 @@ class Gamestate(object):
                 results.extend(on_check_done_result)
         return results
 
-    def get_all_tiles_with_collisions(self) -> List[Floor]: # -> List[Tuple(Int,Int)]
-        tiles = [self[c.FLOOR].by_pos(pos) for pos, e in self.entities.pos_dict.items()
-                 if sum([x.var_can_collide for x in e]) > 1]
-        # tiles = [x for x in self[c.FLOOR] if len(x.guests_that_can_collide) > 1]
-        return tiles
+    # def get_all_tiles_with_collisions(self) -> List[Floor]:
+    #     tiles = [self[c.FLOOR].by_pos(pos) for pos, e in self.entities.pos_dict.items()
+    #              if sum([x.var_can_collide for x in e]) > 1]
+    #     # tiles = [x for x in self[c.FLOOR] if len(x.guests_that_can_collide) > 1]
+    #     return tiles
+
+    def get_all_pos_with_collisions(self) -> List[Tuple[(int, int)]]:
+        positions = [pos for pos, e in self.entities.pos_dict.items()
+                     if sum([x.var_can_collide for x in e]) > 1]
+        return positions
+
+    def check_move_validity(self, moving_entity, position):
+        #         if (guest.name not in self._guests and not self.is_blocked)
+        #         and not (guest.var_is_blocking_pos and self.is_occupied()):
+        if moving_entity.pos != position and not any(
+                entity.var_is_blocking_pos for entity in self.entities.pos_dict[position]) and not (
+                moving_entity.var_is_blocking_pos and moving_entity.is_occupied()):
+            return True
+        return False