s473601/Machine_learning_2023
3
0
Fork 1
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Added maximum mount of container_filling value, it's 100% - one pell it's 25%.

Browse Source
This commit is contained in:
Pavel 2023-04-14 00:25:35 +02:00
parent 029bcb1986
commit 7dd2190c76
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
domain/commands/vacuum_move_command.py
View File

@ -31,6 +31,7 @@ class VacuumMoveCommand(Command):
return return
if self.world.is_garbage_at(end_x, end_y): if self.world.is_garbage_at(end_x, end_y):
if self.vacuum.get_container_filling() < 100:
self.vacuum.increase_container_filling() self.vacuum.increase_container_filling()
self.world.dust[end_x][end_y].pop() self.world.dust[end_x][end_y].pop()

5
domain/entities/vacuum.py
View File

@ -10,9 +10,12 @@ class Vacuum(Entity):
self.container_filling = 0 self.container_filling = 0
def increase_container_filling(self) -> None: def increase_container_filling(self) -> None:
self.container_filling += 10 self.container_filling += 25
def dump_trash(self) -> None: def dump_trash(self) -> None:
self.container_filling = 0 self.container_filling = 0
def get_container_filling(self):
return self.container_filling
# TODO VACUUM: add more properties # TODO VACUUM: add more properties

3
main.py
View File

@ -63,7 +63,6 @@ class Main:
def update(self): def update(self):
self.commands.append(RandomCatMoveCommand(self.world, self.world.cat)) self.commands.append(RandomCatMoveCommand(self.world, self.world.cat))
for command in self.commands: for command in self.commands:
command.run() command.run()
self.commands.clear() self.commands.clear()
@ -76,7 +75,7 @@ def generate_world(tiles_x: int, tiles_y: int) -> World:
temp_y = randint(0, tiles_y - 1) temp_y = randint(0, tiles_y - 1)
world.add_entity(Entity(temp_x, temp_y, "PEEL")) world.add_entity(Entity(temp_x, temp_y, "PEEL"))
world.vacuum = Vacuum(1, 1) world.vacuum = Vacuum(1, 1)
world.doc_station = Doc_Station(9, 9) world.doc_station = Doc_Station(9, 8)
world.cat = Cat(7, 8) world.cat = Cat(7, 8)
world.add_entity(world.cat) world.add_entity(world.cat)
world.add_entity(Entity(2, 8, "PLANT1")) world.add_entity(Entity(2, 8, "PLANT1"))