Merge branch 'main' into refactor_rename

# Conflicts:
#	marl_factory_grid/environment/entity/entity.py
#	marl_factory_grid/modules/destinations/entitites.py
#	marl_factory_grid/modules/doors/entitites.py
#	marl_factory_grid/modules/items/groups.py

marl_factory_grid/modules/doors/__init__.py

@@ -1,4 +1,4 @@
 from .actions import DoorUse
 from .entitites import Door, DoorIndicator
 from .groups import Doors
-from .rule_door_auto_close import DoorAutoClose
+from .rules import DoorAutoClose, DoorIndicateArea

marl_factory_grid/modules/doors/actions.py

@@ -13,8 +13,9 @@ class DoorUse(Action):
 
     def do(self, entity, state) -> Union[None, ActionResult]:
         # Check if agent really is standing on a door:
-        e = state.entities.get_near_pos(entity.pos)
+        e = state.entities.get_entities_near_pos(entity.pos)
         try:
+            # Only one door opens TODO introcude loop
             door = next(x for x in e if x.name.startswith(d.DOOR))
             valid = door.use()
             state.print(f'{entity.name} just used a {door.name} at {door.pos}')

marl_factory_grid/modules/doors/entitites.py

@@ -1,5 +1,5 @@
 from marl_factory_grid.environment.entity.entity import Entity
-from marl_factory_grid.utils.render import RenderEntity
+from marl_factory_grid.utils.utility_classes import RenderEntity
 from marl_factory_grid.environment import constants as c
 
 from marl_factory_grid.modules.doors import constants as d
@@ -41,7 +41,7 @@ class Door(Entity):
     def str_state(self):
         return 'open' if self.is_open else 'closed'
 
-    def __init__(self, *args, closed_on_init=True, auto_close_interval=10, indicate_area=False, **kwargs):
+    def __init__(self, *args, closed_on_init=True, auto_close_interval=10, **kwargs):
         self._status = d.STATE_CLOSED
         super(Door, self).__init__(*args, **kwargs)
         self.auto_close_interval = auto_close_interval
@@ -50,8 +50,6 @@ class Door(Entity):
             self._open()
         else:
             self._close()
-        if indicate_area:
-            self._collection.add_items([DoorIndicator(x) for x in self.state.entities.neighboring_positions(self.pos)])
 
     def summarize_state(self):
         state_dict = super().summarize_state()

marl_factory_grid/modules/doors/rules.py

@@ -1,7 +1,8 @@
 from marl_factory_grid.environment.rules import Rule
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.utils.results import TickResult
-from marl_factory_grid.modules.doors import constants as d
+from . import constants as d
+from .entitites import DoorIndicator
 
 
 class DoorAutoClose(Rule):
@@ -19,3 +20,13 @@ class DoorAutoClose(Rule):
             return [TickResult(self.name, validity=c.VALID, value=0)]
         state.print('There are no doors, but you loaded the corresponding Module')
         return []
+
+
+class DoorIndicateArea(Rule):
+
+    def __init__(self):
+        super().__init__()
+
+    def on_init(self, state, lvl_map):
+        for door in state[d.DOORS]:
+            state[d.DOORS].add_items([DoorIndicator(x) for x in state.entities.neighboring_positions(door.pos)])