WIP: object, entity rework

marl_factory_grid/modules/batteries/entitites.py

@@ -1,5 +1,5 @@
 from marl_factory_grid.environment.entity.mixin import BoundEntityMixin
-from marl_factory_grid.environment.entity.object import EnvObject
+from marl_factory_grid.environment.entity.object import EnvObject, Object
 from marl_factory_grid.environment.entity.entity import Entity
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.utils.render import RenderEntity
@@ -7,7 +7,7 @@ from marl_factory_grid.utils.render import RenderEntity
 from marl_factory_grid.modules.batteries import constants as b
 
 
-class Battery(BoundEntityMixin, EnvObject):
+class Battery(Object):
 
     @property
     def is_discharged(self):

marl_factory_grid/modules/batteries/groups.py

@@ -1,9 +1,9 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin, HasBoundMixin
 from marl_factory_grid.modules.batteries.entitites import Pod, Battery
 
 
-class Batteries(HasBoundMixin, EnvObjects):
+class Batteries(Collection):
 
     _entity = Battery
     is_blocking_light: bool = False
@@ -21,7 +21,7 @@ class Batteries(HasBoundMixin, EnvObjects):
         self.add_items(batteries)
 
 
-class ChargePods(PositionMixin, EnvObjects):
+class ChargePods(PositionMixin, Collection):
 
     _entity = Pod
 

marl_factory_grid/modules/clean_up/groups.py

@@ -1,4 +1,4 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.environment.entity.wall_floor import Floor
 from marl_factory_grid.modules.clean_up.entitites import DirtPile
@@ -6,7 +6,7 @@ from marl_factory_grid.modules.clean_up.entitites import DirtPile
 from marl_factory_grid.environment import constants as c
 
 
-class DirtPiles(PositionMixin, EnvObjects):
+class DirtPiles(PositionMixin, Collection):
     _entity = DirtPile
     is_blocking_light: bool = False
     can_collide: bool = False

marl_factory_grid/modules/destinations/groups.py

@@ -1,11 +1,11 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.modules.destinations.entitites import Destination
 from marl_factory_grid.environment import constants as c
 from marl_factory_grid.modules.destinations import constants as d
 
 
-class Destinations(PositionMixin, EnvObjects):
+class Destinations(PositionMixin, Collection):
     _entity = Destination
     is_blocking_light: bool = False
     can_collide: bool = False

marl_factory_grid/modules/doors/entitites.py

@@ -51,7 +51,7 @@ class Door(Entity):
         else:
             self._close()
         if indicate_area:
-            self._collection.add_items([DoorIndicator(x) for x in self.tile.neighboring_floor])
+            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/groups.py

@@ -1,12 +1,12 @@
 from typing import Union
 
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from marl_factory_grid.modules.doors import constants as d
 from marl_factory_grid.modules.doors.entitites import Door
 
 
-class Doors(PositionMixin, EnvObjects):
+class Doors(PositionMixin, Collection):
 
     symbol = d.SYMBOL_DOOR
     _entity = Door

marl_factory_grid/modules/items/groups.py

@@ -1,14 +1,14 @@
 from marl_factory_grid.modules.items import constants as i
 from marl_factory_grid.environment import constants as c
 
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.objects import Objects
 from marl_factory_grid.environment.groups.mixins import PositionMixin, IsBoundMixin, HasBoundMixin
 from marl_factory_grid.environment.entity.agent import Agent
 from marl_factory_grid.modules.items.entitites import Item, DropOffLocation
 
 
-class Items(PositionMixin, EnvObjects):
+class Items(PositionMixin, Collection):
     _entity = Item
     is_blocking_light: bool = False
     can_collide: bool = False
@@ -28,7 +28,7 @@ class Items(PositionMixin, EnvObjects):
             return 0
 
 
-class Inventory(IsBoundMixin, EnvObjects):
+class Inventory(IsBoundMixin, Collection):
     _accepted_objects = Item
 
     @property
@@ -90,7 +90,7 @@ class Inventories(HasBoundMixin, Objects):
         state[i.INVENTORY].spawn(state[c.AGENT])
 
 
-class DropOffLocations(PositionMixin, EnvObjects):
+class DropOffLocations(PositionMixin, Collection):
     _entity = DropOffLocation
     is_blocking_light: bool = False
     can_collide: bool = False

marl_factory_grid/modules/machines/groups.py

@@ -1,10 +1,10 @@
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 
 from .entitites import Machine
 
 
-class Machines(PositionMixin, EnvObjects):
+class Machines(PositionMixin, Collection):
 
     _entity = Machine
     is_blocking_light: bool = False

marl_factory_grid/modules/maintenance/groups.py

@@ -2,7 +2,7 @@ from typing import List
 
 from .entities import Maintainer
 from marl_factory_grid.environment.entity.wall_floor import Floor
-from marl_factory_grid.environment.groups.env_objects import EnvObjects
+from marl_factory_grid.environment.groups.env_objects import Collection
 from marl_factory_grid.environment.groups.mixins import PositionMixin
 from ..machines.actions import MachineAction
 from ...utils.states import Gamestate
@@ -10,7 +10,7 @@ from ...utils.states import Gamestate
 from ..machines import constants as mc
 
 
-class Maintainers(PositionMixin, EnvObjects):
+class Maintainers(PositionMixin, Collection):
 
     _entity = Maintainer
     var_can_collide = True