s473616/Machine_learning_2023
1
0
Fork 0
forked from s473601/Machine_learning_2023
Code Issues Pull Requests Projects Releases Wiki Activity

Added the cleaning ability to vacuum and container_filling status now is visible.

Browse Source
This commit is contained in:
Pavel 2023-04-10 18:43:16 +02:00
parent 2929495348
commit 3b761e41ab
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
domain/commands/vacuum_move_command.py
View File

@ -30,5 +30,9 @@ class VacuumMoveCommand(Command):
if self.world.is_obstacle_at(end_x, end_y): if self.world.is_obstacle_at(end_x, end_y):
return return
if self.world.is_garbage_at(end_x, end_y):
self.vacuum.increase_container_filling()
self.world.dust[end_x][end_y].pop()
self.vacuum.x = end_x self.vacuum.x = end_x
self.vacuum.y = end_y self.vacuum.y = end_y

3
domain/entities/vacuum.py
View File

@ -9,4 +9,7 @@ class Vacuum(Entity):
self.cleaning_detergent = 100 self.cleaning_detergent = 100
self.container_filling = 0 self.container_filling = 0
def increase_container_filling(self) -> None:
self.container_filling += 10
# TODO VACUUM: add more properties # TODO VACUUM: add more properties

5
domain/world.py
View File

@ -2,7 +2,7 @@ from domain.entities.entity import Entity
class World: class World:
def __init__(self, width: int, height: int): def __init__(self, width: int, height: int) -> object:
self.width = width self.width = width
self.height = height self.height = height
self.dust = [[[] for j in range(height)] for i in range(width)] self.dust = [[[] for j in range(height)] for i in range(width)]
@ -24,3 +24,6 @@ class World:
def is_obstacle_at(self, x: int, y: int) -> bool: def is_obstacle_at(self, x: int, y: int) -> bool:
return bool(self.obstacles[x][y]) return bool(self.obstacles[x][y])
def is_garbage_at(self, x: int, y: int) -> bool:
return bool(self.dust[x][y])

8
view/renderer.py
View File

@ -31,6 +31,7 @@ class Renderer:
pygame.display.set_caption("AI Vacuum Cleaner") pygame.display.set_caption("AI Vacuum Cleaner")
self.screen = pygame.display.set_mode((self.width, self.height)) self.screen = pygame.display.set_mode((self.width, self.height))
self.font = pygame.font.SysFont('Arial', 26, bold=True)
self.sprites = { self.sprites = {
"VACUUM": pygame.transform.scale(pygame.image.load("media/sprites/vacuum.png"), "VACUUM": pygame.transform.scale(pygame.image.load("media/sprites/vacuum.png"),
@ -92,10 +93,17 @@ class Renderer:
def draw_entity(self, entity: Entity): def draw_entity(self, entity: Entity):
sprite = self.sprites.get(entity.type, None) sprite = self.sprites.get(entity.type, None)
draw_pos = (entity.x * self.tile_width, entity.y * self.tile_height) draw_pos = (entity.x * self.tile_width, entity.y * self.tile_height)
if "PEEL" in entity.type:
draw_pos = ((entity.x - 0.1) * self.tile_width, (entity.y - 0.25) * self.tile_height)
if "PLANT" in entity.type: if "PLANT" in entity.type:
draw_pos = ((entity.x - 0.1) * self.tile_width, (entity.y - 0.25) * self.tile_height) draw_pos = ((entity.x - 0.1) * self.tile_width, (entity.y - 0.25) * self.tile_height)
if "CAT" in entity.type and isinstance(entity, Cat): if "CAT" in entity.type and isinstance(entity, Cat):
sprite = self.cat_direction_sprite[entity.direction] sprite = self.cat_direction_sprite[entity.direction]
if "VACUUM" in entity.type:
# Add text displaying container filling level
text_surface = self.font.render(f"Filling: {entity.container_filling}%", True, Color("black"))
text_pos = (draw_pos[0] + self.tile_width / 2 - text_surface.get_width() / 2, draw_pos[1] + self.tile_height)
self.screen.blit(text_surface, text_pos)
self.screen.blit(sprite, draw_pos) self.screen.blit(sprite, draw_pos)
def draw_sprite(self, x: int, y: int, sprite_name: str): def draw_sprite(self, x: int, y: int, sprite_name: str):