steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-11-02 13:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP: removing tiles

Browse Source
This commit is contained in:
Chanumask
2023-09-26 10:35:41 +02:00
parent 04af996232
commit 3bf3246aeb
12 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
marl_factory_grid/utils/level_parser.py
View File

@@ -35,11 +35,13 @@ class LevelParser(object):
entities = Entities()
# Walls
walls = Walls.from_coordinates(self.get_coordinates_for_symbol(c.SYMBOL_WALL), self.size)
# walls = self.get_coordinates_for_symbol(c.SYMBOL_WALL)
entities.add_items({c.WALL: walls})
# Floor
floor = Floors.from_coordinates(self.get_coordinates_for_symbol(c.SYMBOL_WALL, negate=True), self.size)
entities.add_items({c.FLOOR: floor})
# entities.add_items({c.WALL: self.get_coordinates_for_symbol(c.SYMBOL_WALL, negative=True)})
# All other
for es_name in self.e_p_dict:
@@ -55,6 +57,8 @@ class LevelParser(object):
e = e_class.from_coordinates(np.argwhere(level_array == c.VALUE_OCCUPIED_CELL).tolist(),
entities[c.FLOOR], self.size, entity_kwargs=e_kwargs
)
# e_coords = (np.argwhere(level_array == c.VALUE_OCCUPIED_CELL).tolist()) # braucht e_class?
# entities.add_items({e.name: e_coords})
else:
raise ValueError(f'No {e_class} (Symbol: {e_class.symbol}) could be found!\n'
f'Check your level file!')

9
marl_factory_grid/utils/states.py
View File

@@ -59,11 +59,10 @@ class Gamestate(object):
@property
def moving_entites(self):
return [y for x in self.entities for y in x if x.var_can_move]
return [y for x in self.entities for y in x if x.var_can_move] # wird das aus dem String gelesen?
def __init__(self, entitites, rules: Dict[str, dict], env_seed=69, verbose=False):
self.entities = entitites
self.NO_POS_TILE = Floor(c.VALUE_NO_POS)
def __init__(self, entities, rules: Dict[str, dict], env_seed=69, verbose=False):
self.entities = entities
self.curr_step = 0
self.curr_actions = None
self.verbose = verbose
@@ -109,7 +108,7 @@ class Gamestate(object):
results.extend(on_check_done_result)
return results
def get_all_tiles_with_collisions(self) -> List[Floor]:
def get_all_tiles_with_collisions(self) -> List[Floor]: # -> List[Tuple(Int,Int)]
tiles = [self[c.FLOOR].by_pos(pos) for pos, e in self.entities.pos_dict.items()
if sum([x.var_can_collide for x in e]) > 1]
# tiles = [x for x in self[c.FLOOR] if len(x.guests_that_can_collide) > 1]