From dd6a57c7018614a4733e5a6a9c1cd0a6df16caf7 Mon Sep 17 00:00:00 2001 From: Anna Nowak Date: Mon, 25 Mar 2019 12:58:06 +0100 Subject: [PATCH 1/3] Added out of map cells as obstacles --- game.py | 1 + utils.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/game.py b/game.py index 5613622..fe9e8ba 100644 --- a/game.py +++ b/game.py @@ -29,6 +29,7 @@ display.set_caption('Smieciarz WMI') utils.generate_grass(all_sprites) utils.generate_houses(all_sprites, obstacles_coords) utils.generate_landfills(all_sprites, obstacles_coords) +utils.add_frame_as_obstacles(obstacles_coords) gc = utils.generate_garbage_collector(all_sprites, obstacles_coords) ## diff --git a/utils.py b/utils.py index 6046c2b..09475fe 100644 --- a/utils.py +++ b/utils.py @@ -12,6 +12,12 @@ from sprites.garbage_collector import Garbage_collector def generate_rand_coordinates(max_x, max_y): return (random.randint(0, max_x), random.randint(0, (max_y))) +def add_frame_as_obstacles(obstacles_coords): + for x in range(0, home_amount + 1): + obstacles_coords.append((x,-1)) + obstacles_coords.append((-1,x)) + obstacles_coords.append((PLAY_WIDTH//CELL_SIZE,x)) + obstacles_coords.append((x,PLAY_HEIGHT//CELL_SIZE)) ##GENERATE GRASS################################################################## def generate_grass(all_sprites): From 7d13d98757904a9e00dfa736764b147fbf55fd86 Mon Sep 17 00:00:00 2001 From: Anna Nowak Date: Mon, 25 Mar 2019 13:44:16 +0100 Subject: [PATCH 2/3] Half repaired map-generating --- config.py | 2 +- game.py | 2 +- utils.py | 23 +++++++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/config.py b/config.py index fd67c20..6bb4bb0 100644 --- a/config.py +++ b/config.py @@ -22,5 +22,5 @@ def set_home_amount(): home_amount = set_home_amount() -PLAY_WIDTH = home_amount*CELL_SIZE +PLAY_WIDTH = (home_amount+2)*CELL_SIZE PLAY_HEIGHT = PLAY_WIDTH diff --git a/game.py b/game.py index fe9e8ba..d8cbb23 100644 --- a/game.py +++ b/game.py @@ -27,8 +27,8 @@ display.set_caption('Smieciarz WMI') ## # Generate level utils.generate_grass(all_sprites) -utils.generate_houses(all_sprites, obstacles_coords) utils.generate_landfills(all_sprites, obstacles_coords) +utils.generate_houses(all_sprites, obstacles_coords) utils.add_frame_as_obstacles(obstacles_coords) gc = utils.generate_garbage_collector(all_sprites, obstacles_coords) ## diff --git a/utils.py b/utils.py index 09475fe..590a4da 100644 --- a/utils.py +++ b/utils.py @@ -40,7 +40,7 @@ def generate_houses(all_sprites, obstacles_coords): while(home_counter != 0): x, y = generate_rand_coordinates( (PLAY_WIDTH//CELL_SIZE)-1, (PLAY_HEIGHT//CELL_SIZE)-1) - if((x, y) not in obstacles_coords): + if(((x, y) or (x,y-1)) not in obstacles_coords): houses.append(House(x, y, 10, 10, 10)) obstacles_coords.append((x, y)) home_counter = home_counter - 1 @@ -55,13 +55,20 @@ def generate_houses(all_sprites, obstacles_coords): def generate_landfills(all_sprites, obstacles_coords): landfills = [] landfill_counter = 3 - while(landfill_counter != 0): - x, y = generate_rand_coordinates( - (PLAY_WIDTH//CELL_SIZE)-1, (PLAY_HEIGHT//CELL_SIZE)-1) - if((x, y) not in obstacles_coords): - landfills.append(Landfill(x, y, landfill_counter-1)) - obstacles_coords.append((x, y)) - landfill_counter = landfill_counter - 1 + +# while(landfill_counter != 0): +# x, y = generate_rand_coordinates( +# (PLAY_WIDTH//CELL_SIZE)-1, (PLAY_HEIGHT//CELL_SIZE)-1) +# if((x, y) not in obstacles_coords): +# landfills.append(Landfill(x, y, landfill_counter-1)) +# obstacles_coords.append((x, y)) +# landfill_counter = landfill_counter - 1 + y=0 + for x in range(landfill_counter): + landfills.append(Landfill(x,y,x)) + obstacles_coords.append((x,y)) + + for item in landfills: all_sprites.add(item) From c2149f9a9d5fa61db0cf56004d8491e17142bf6c Mon Sep 17 00:00:00 2001 From: Anna Nowak Date: Mon, 25 Mar 2019 14:07:25 +0100 Subject: [PATCH 3/3] 3/4 repaired map-generating --- utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils.py b/utils.py index 590a4da..2cdb777 100644 --- a/utils.py +++ b/utils.py @@ -40,7 +40,8 @@ def generate_houses(all_sprites, obstacles_coords): while(home_counter != 0): x, y = generate_rand_coordinates( (PLAY_WIDTH//CELL_SIZE)-1, (PLAY_HEIGHT//CELL_SIZE)-1) - if(((x, y) or (x,y-1)) not in obstacles_coords): + if(((x, y) or (x+1,y)) not in obstacles_coords): + print(x,y) houses.append(House(x, y, 10, 10, 10)) obstacles_coords.append((x, y)) home_counter = home_counter - 1