WIP: object, entity rework

marl_factory_grid/environment/entity/entity.py

@@ -1,21 +1,57 @@
 import abc
+from collections import defaultdict
 
+from .object import Object
 from .. import constants as c
-from .object import EnvObject
 from ...utils.render import RenderEntity
 from ...utils.results import ActionResult
 
 
-class Entity(EnvObject, abc.ABC):
+class Entity(Object, abc.ABC):
     """Full Env Entity that lives on the environment Grid. Doors, Items, DirtPile etc..."""
 
+    _u_idx = defaultdict(lambda: 0)
+
     @property
     def state(self):
         return self._status or ActionResult(entity=self, identifier=c.NOOP, validity=c.VALID, reward=0)
 
+    # @property
+    # def var_has_position(self):
+    #     return self.pos != c.VALUE_NO_POS
+    var_has_position: bool = True
+
     @property
-    def var_has_position(self):
-        return self.pos != c.VALUE_NO_POS
+    def var_is_blocking_light(self):
+        try:
+            return self._collection.var_is_blocking_light or False
+        except AttributeError:
+            return False
+
+    # var_is_blocking_light: bool = True
+
+    @property
+    def var_can_move(self):
+        try:
+            return self._collection.var_can_move or False
+        except AttributeError:
+            return False
+
+    @property
+    def var_is_blocking_pos(self):
+        try:
+            return self._collection.var_is_blocking_pos or False
+        except AttributeError:
+            return False
+
+    @property
+    def var_can_collide(self):
+        try:
+            return self._collection.var_can_collide or False
+        except AttributeError:
+            return False
+
+    # var_can_collide: bool = True
 
     @property
     def x(self):
@@ -29,10 +65,6 @@ class Entity(EnvObject, abc.ABC):
     def pos(self):
         return self._pos
 
-    @property
-    def tile(self):
-        return self._tile  # wall_n_floors funktionalität
-
     # @property
     # def last_tile(self):
     #     try:
@@ -71,7 +103,7 @@ class Entity(EnvObject, abc.ABC):
                 print(f'Objects of {self.__class__.__name__} can not be bound to other entities.')
                 exit()
 
-    def summarize_state(self) -> dict:  # tile=str(self.tile.name)
+    def summarize_state(self) -> dict:
         return dict(name=str(self.name), x=int(self.x), y=int(self.y), can_collide=bool(self.var_can_collide))
 
     @abc.abstractmethod
@@ -80,3 +112,43 @@ class Entity(EnvObject, abc.ABC):
 
     def __repr__(self):
         return super(Entity, self).__repr__() + f'(@{self.pos})'
+
+    @property
+    def obs_tag(self):
+        try:
+            return self._collection.name or self.name
+        except AttributeError:
+            return self.name
+
+    @property
+    def encoding(self):
+        return c.VALUE_OCCUPIED_CELL
+
+    def change_parent_collection(self, other_collection):
+        other_collection.add_item(self)
+        self._collection.delete_env_object(self)
+        self._collection = other_collection
+        return self._collection == other_collection
+
+    @classmethod
+    def from_coordinates(cls, positions: [(int, int)], *args, entity_kwargs=None, **kwargs, ):
+        collection = cls(*args, **kwargs)
+        collection.add_items(
+            [cls._entity(tuple(pos), **entity_kwargs if entity_kwargs is not None else {}) for pos in positions])
+        return collection
+
+    def notify_del_entity(self, entity):
+        try:
+            self.pos_dict[entity.pos].remove(entity)
+        except (ValueError, AttributeError):
+            pass
+
+    def by_pos(self, pos: (int, int)):
+        pos = tuple(pos)
+        try:
+            return self.state.entities.pos_dict[pos]
+            # return next(e for e in self if e.pos == pos)
+        except StopIteration:
+            pass
+        except ValueError:
+            print()