From ace8f744407bf81d99e9c6eed8b5c3ad9a06bd92 Mon Sep 17 00:00:00 2001 From: andrzej Date: Thu, 7 May 2020 21:35:24 +0200 Subject: [PATCH] Poprawki --- main.py | 1 - warehouse.py | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/main.py b/main.py index a476d89..6243e62 100644 --- a/main.py +++ b/main.py @@ -49,7 +49,6 @@ class MainGameFrame: for x in range(self.warehouse_map.width): for y in range(self.warehouse_map.height): self.draw_field(x, y) - self.draw_target(1, 1) def draw_target(self, x, y): target_screen_position = ( diff --git a/warehouse.py b/warehouse.py index 08843bf..e3de507 100644 --- a/warehouse.py +++ b/warehouse.py @@ -191,25 +191,27 @@ class Warehouse: racks.append(y) return racks - - def place_packages(self, no_of_packages): + def place_packages(self, no_of_packages: int): packages = [] for i in range(no_of_packages): - pack_x, pack_y = self._set_package_position() + new_package_size = random.randrange(1, 10) + pack_x, pack_y = self._set_package_position(new_package_size) package_field = self.tiles[pack_x][pack_y] new_package = Pack(lays_on_field=package_field) categ_seed = random.random() if categ_seed > 0.8: new_package.category = "freezed" - new_package.set_status() - new_package.size = random.randrange(1, 10) + # new_package.set_status() + new_package.size = new_package_size if package_field.category.name in self.storage_types: package_field.capacity -= new_package.size packages.append(new_package) return packages - def _set_package_position(self): + + def _set_package_position(self, pack_size: int): starting_x, starting_y = random.randrange(self.width), random.randrange(self.height) - while not isinstance(self.tiles[starting_x][starting_y], Tile): + while not isinstance(self.tiles[starting_x][starting_y], Tile) \ + and self.tiles[starting_x][starting_y].size - pack_size < 0: starting_x, starting_y = random.randrange(self.width), random.randrange( self.height) return starting_x, starting_y