Machines

marl_factory_grid/modules/items/__init__.py

@@ -0,0 +1,4 @@
+from .actions import ItemAction
+from .entitites import Item, DropOffLocation
+from .groups import DropOffLocations, Items, Inventory, Inventories
+from .rules import ItemRules

marl_factory_grid/modules/items/entitites.py

@@ -8,6 +8,8 @@ from marl_factory_grid.modules.items import constants as i
 
 class Item(Entity):
 
+    var_can_collide = False
+
     def render(self):
         return RenderEntity(i.ITEM, self.tile.pos) if self.pos != c.VALUE_NO_POS else None
 
@@ -38,6 +40,22 @@ class Item(Entity):
 
 class DropOffLocation(Entity):
 
+    @property
+    def var_can_collide(self):
+        return False
+
+    @property
+    def var_can_move(self):
+        return False
+
+    @property
+    def var_is_blocking_light(self):
+        return False
+
+    @property
+    def var_has_position(self):
+        return True
+
     def render(self):
         return RenderEntity(i.DROP_OFF, self.tile.pos)
 

marl_factory_grid/modules/items/groups.py

@@ -17,15 +17,6 @@ class Items(PositionMixin, EnvObjects):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-    def spawn_items(self, tiles: List[Floor]):
-        items = [self._entity(tile) for tile in tiles]
-        self.add_items(items)
-
-    def despawn_items(self, items: List[Item]):
-        items = [items] if isinstance(items, Item) else items
-        for item in items:
-            del self[item]
-
 
 class Inventory(IsBoundMixin, EnvObjects):
 
@@ -58,11 +49,7 @@ class Inventory(IsBoundMixin, EnvObjects):
 class Inventories(HasBoundedMixin, Objects):
 
     _entity = Inventory
-    can_move = False
-
-    @property
-    def obs_pairs(self):
-        return [(x.name, x) for x in self]
+    var_can_move = False
 
     def __init__(self, size, *args, **kwargs):
         super(Inventories, self).__init__(*args, **kwargs)
@@ -70,7 +57,7 @@ class Inventories(HasBoundedMixin, Objects):
         self._obs = None
         self._lazy_eval_transforms = []
 
-    def spawn_inventories(self, agents):
+    def spawn(self, agents):
         inventories = [self._entity(agent, self.size,)
                        for _, agent in enumerate(agents)]
         self.add_items(inventories)

marl_factory_grid/modules/items/rules.py

@@ -18,7 +18,7 @@ class ItemRules(Rule):
         self.max_dropoff_storage_size = max_dropoff_storage_size
         self.n_locations = n_locations
 
-    def on_init(self, state):
+    def on_init(self, state, lvl_map):
         self.trigger_drop_off_location_spawn(state)
         self._next_item_spawn = self.spawn_frequency
         self.trigger_inventory_spawn(state)
@@ -42,7 +42,7 @@ class ItemRules(Rule):
     def trigger_item_spawn(self, state):
         if item_to_spawns := max(0, (self.n_items - len(state[i.ITEM]))):
             empty_tiles = state[c.FLOOR].empty_tiles[:item_to_spawns]
-            state[i.ITEM].spawn_items(empty_tiles)
+            state[i.ITEM].spawn(empty_tiles)
             self._next_item_spawn = self.spawn_frequency
             state.print(f'{item_to_spawns} new items have been spawned; next spawn in {self._next_item_spawn}')
             return len(empty_tiles)
@@ -52,7 +52,7 @@ class ItemRules(Rule):
 
     @staticmethod
     def trigger_inventory_spawn(state):
-        state[i.INVENTORY].spawn_inventories(state[c.AGENT])
+        state[i.INVENTORY].spawn(state[c.AGENT])
 
     def tick_post_step(self, state) -> List[TickResult]:
         for item in list(state[i.ITEM].values()):