WIP: removing tiles

marl_factory_grid/modules/destinations/entitites.py

@@ -9,7 +9,6 @@ from marl_factory_grid.modules.destinations import constants as d
 
 
 class Destination(Entity):
-
     var_can_move = False
     var_can_collide = False
     var_has_position = True
@@ -40,9 +39,9 @@ class Destination(Entity):
     def leave(self, agent: Agent):
         del self._per_agent_times[agent.name]
 
-    @property
-    def is_considered_reached(self):
-        agent_at_position = any(c.AGENT.lower() in x.name.lower() for x in self.tile.guests_that_can_collide)
+    def is_considered_reached(self, state):
+        agent_at_position = any(
+            c.AGENT.lower() in x.name.lower() for x in state.entities.pos_dict[self.pos] if x.var_can_collide)
         return (agent_at_position and not self.dwell_time) or any(x == 0 for x in self._per_agent_times.values())
 
     def agent_is_dwelling(self, agent: Agent):
@@ -68,9 +67,9 @@ class BoundDestination(BoundEntityMixin, Destination):
         self.bind_to(entity)
         super().__init__(*args, **kwargs)
 
-
     @property
     def is_considered_reached(self):
-        agent_at_position = any(self.bound_entity == x for x in self.tile.guests_that_can_collide)
+        agent_at_position = any(
+            self.bound_entity == x for x in self.state.entities.pos_dict[self.pos] if x.var_can_collide)
         return (agent_at_position and not self.dwell_time) \
             or any(x == 0 for x in self._per_agent_times[self.bound_entity.name])

marl_factory_grid/modules/destinations/groups.py

@@ -1,10 +1,11 @@
 from marl_factory_grid.environment.groups.env_objects import EnvObjects
 from marl_factory_grid.environment.groups.mixins import PositionMixin, HasBoundMixin
 from marl_factory_grid.modules.destinations.entitites import Destination, BoundDestination
+from marl_factory_grid.environment import constants as c
+from marl_factory_grid.modules.destinations import constants as d
 
 
 class Destinations(PositionMixin, EnvObjects):
-
     _entity = Destination
     is_blocking_light: bool = False
     can_collide: bool = False
@@ -15,9 +16,19 @@ class Destinations(PositionMixin, EnvObjects):
     def __repr__(self):
         return super(Destinations, self).__repr__()
 
+    @staticmethod
+    def trigger_destination_spawn(n_dests, state):
+        coordinates = state.entities.floorlist[:n_dests]
+        if destinations := [Destination(pos) for pos in coordinates]:
+            state[d.DESTINATION].add_items(destinations)
+            state.print(f'{n_dests} new destinations have been spawned')
+            return c.VALID
+        else:
+            state.print('No Destiantions are spawning, limit is reached.')
+            return c.NOT_VALID
+
 
 class BoundDestinations(HasBoundMixin, Destinations):
-
     _entity = BoundDestination
 
     def __init__(self, *args, **kwargs):

marl_factory_grid/modules/destinations/rules.py

@@ -12,12 +12,12 @@ class DestinationReach(Rule):
     def __init__(self, n_dests: int = 1, tiles: Union[List, None] = None):
         super(DestinationReach, self).__init__()
         self.n_dests = n_dests or len(tiles)
-        self._tiles = tiles
+        # self._tiles = tiles
 
     def tick_step(self, state) -> List[TickResult]:
 
         for dest in list(state[d.DESTINATION].values()):
-            if dest.is_considered_reached:
+            if dest.is_considered_reached(state):
                 dest.change_parent_collection(state[d.DEST_REACHED])
                 state.print(f'{dest.name} is reached now, removing...')
             else:
@@ -34,7 +34,7 @@ class DestinationReach(Rule):
     def tick_post_step(self, state) -> List[TickResult]:
         results = list()
         for reached_dest in state[d.DEST_REACHED]:
-            for guest in reached_dest.tile.guests:
+            for guest in state.entities.pos_dict[reached_dest].values():     # reached_dest.tile.guests:
                 if guest in state[c.AGENT]:
                     state.print(f'{guest.name} just reached destination at {guest.pos}')
                     state[d.DEST_REACHED].delete_env_object(reached_dest)
@@ -79,7 +79,7 @@ class DestinationSpawn(Rule):
     def on_init(self, state, lvl_map):
         # noinspection PyAttributeOutsideInit
         self._dest_spawn_timer = self.spawn_frequency
-        self.trigger_destination_spawn(self.n_dests, state)
+        state[d.DESTINATION].trigger_destination_spawn(self.n_dests, state)
         pass
 
     def tick_pre_step(self, state) -> List[TickResult]:
@@ -91,13 +91,3 @@ class DestinationSpawn(Rule):
                 validity = state.rules['DestinationReach'].trigger_destination_spawn(n_dest_spawn, state)
                 return [TickResult(self.name, validity=validity, entity=None, value=n_dest_spawn)]
 
-    @staticmethod
-    def trigger_destination_spawn(n_dests, state, tiles=None):
-        tiles = tiles or state[c.FLOOR].empty_tiles[:n_dests]
-        if destinations := [Destination(tile) for tile in tiles]:
-            state[d.DESTINATION].add_items(destinations)
-            state.print(f'{n_dests} new destinations have been spawned')
-            return c.VALID
-        else:
-            state.print('No Destiantions are spawning, limit is reached.')
-            return c.NOT_VALID