steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-06-24 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP: object, entity rework

Browse Source
This commit is contained in:
Chanumask
2023-10-19 17:25:31 +02:00
parent 8709b093b8
commit 8d6dcd70ae
18 changed files with 155 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
marl_factory_grid/modules/batteries/entitites.py
View File

@ -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):

6
marl_factory_grid/modules/batteries/groups.py
View File

@ -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