From cf525c5c4b645bbcf9edba5ca21c806dab58b9fc Mon Sep 17 00:00:00 2001 From: Maksymilian Szygenda Date: Sun, 23 Apr 2023 15:34:29 +0200 Subject: [PATCH 1/4] Update 'city.py' --- city.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/city.py b/city.py index 0036dab..7bd08bd 100644 --- a/city.py +++ b/city.py @@ -27,7 +27,12 @@ class City: def render_city(self, game_context: GameContext) -> None: self._render_streets(game_context) + self._render_nodes(game_context) def _render_streets(self, game_context: GameContext) -> None: for street in self.streets: - street.render(game_context) \ No newline at end of file + street.render(game_context) + + def _render_nodes(self, game_context: GameContext) -> None: + for node in self.nodes: + node.render(game_context) \ No newline at end of file -- 2.20.1 From 9f7ca5d0edd96d2ca036a91c894c1883ab0842d2 Mon Sep 17 00:00:00 2001 From: Maksymilian Szygenda Date: Sun, 23 Apr 2023 15:35:37 +0200 Subject: [PATCH 2/4] Update 'city.py' --- city.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/city.py b/city.py index 7bd08bd..b16c6ab 100644 --- a/city.py +++ b/city.py @@ -12,14 +12,14 @@ class Node: self.can = can class City: - nodes: List[Node] + nodes: List[GarbageCan] streets: List[Street] def __init__(self) -> None: self.nodes = [] self.streets = [] - def add_node(self, node: Node) -> None: + def add_node(self, node: GarbageCan) -> None: self.nodes.append(node) def add_street(self, street: Street) -> None: -- 2.20.1 From 2fbf2be1d7041faaaafa98a0ee2028b6a1261fb6 Mon Sep 17 00:00:00 2001 From: Maksymilian Szygenda Date: Sun, 23 Apr 2023 15:37:22 +0200 Subject: [PATCH 3/4] Update 'startup.py' --- startup.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/startup.py b/startup.py index 607bb9f..68db23e 100644 --- a/startup.py +++ b/startup.py @@ -5,6 +5,8 @@ import pygame from typing import Tuple, List from street import Street, StreetType from garbageTruck import GarbageTruck +from garbageCan import GarbageCan + def startup(game_context: GameContext): render_background(game_context) @@ -23,10 +25,13 @@ def render_background(game_context: GameContext): game_context.canvas.blit(pygame_bg_image, (0, 0)) def create_city() -> City: - city: City = City() + city: City = City() streets = create_streets() + trashcans = create_trashcans() for s in streets: city.add_street(s) + for t in trashcans: + city.add_node(t) return city def create_streets() -> List[Street]: @@ -41,4 +46,15 @@ def create_streets() -> List[Street]: streets.append(Street(3, 25, 23, StreetType.HORIZONTAL)) streets.append(Street(17, 30, 13, StreetType.VERTICAL)) streets.append(Street(17, 23, 25, StreetType.VERTICAL)) - return streets \ No newline at end of file + return streets + +def create_trashcans() -> List[GarbageCan]: + trashcans = [] + trashcans.append(GarbageCan((9, 4))) + trashcans.append(GarbageCan((9, 15))) + trashcans.append(GarbageCan((12, 22))) + trashcans.append(GarbageCan((3, 24))) + trashcans.append(GarbageCan((17, 9))) + trashcans.append(GarbageCan((24, 17))) + trashcans.append(GarbageCan((26, 4))) + return trashcans \ No newline at end of file -- 2.20.1 From b78f3cfa7b637120a0a760bb58d01d55f6660d73 Mon Sep 17 00:00:00 2001 From: Maksymilian Szygenda Date: Sun, 23 Apr 2023 15:40:34 +0200 Subject: [PATCH 4/4] Update 'startup.py' --- startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup.py b/startup.py index 68db23e..03e782b 100644 --- a/startup.py +++ b/startup.py @@ -25,7 +25,7 @@ def render_background(game_context: GameContext): game_context.canvas.blit(pygame_bg_image, (0, 0)) def create_city() -> City: - city: City = City() + city: City = City() streets = create_streets() trashcans = create_trashcans() for s in streets: -- 2.20.1