From 924e7b46ca226b93f6d1eaf7628eec3a8c0df251 Mon Sep 17 00:00:00 2001
From: czorekk <bartek.wieczorek@outlook.com>
Date: Fri, 8 Apr 2022 02:17:02 +0200
Subject: [PATCH] camera can adjust to map size now, added test map generator

---
 main.py              |  8 +++-----
 map_new/map_new.py   |  8 +-------
 map_new/map_utils.py | 32 +++++++++++++-------------------
 settings.py          | 10 +++++++++-
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/main.py b/main.py
index c30caf6..42c41e8 100644
--- a/main.py
+++ b/main.py
@@ -39,6 +39,7 @@ class Game():
     def new(self):
         # initialize all variables and do all the setup for a new game
 
+        # sprite groups
         self.roadTiles, self.wallTiles = map_new.getTiles()
 
         self.all_sprites = pg.sprite.Group()
@@ -50,7 +51,7 @@ class Game():
             if tile_object.name == 'wall':
                 Obstacle(self, tile_object.x, tile_object.y, tile_object.width, tile_object.height)
 
-        self.camera = Camera(self.map.width, self.map.height)
+        self.camera = Camera(MAP_WIDTH_PX, MAP_HEIGHT_PX)
         self.draw_debug = False
         
 
@@ -81,7 +82,7 @@ class Game():
 
     def draw(self):
         pg.display.set_caption("{:.2f}".format(self.clock.get_fps()))
-        # self.screen.blit(self.new_surface, self.camera.apply_rect(self.map_rect))
+
         map_new.renderTiles(self.roadTiles, self.screen, self.camera)
         map_new.renderTiles(self.wallTiles, self.screen, self.camera, self.draw_debug)
         
@@ -89,9 +90,6 @@ class Game():
             self.screen.blit(sprite.image, self.camera.apply(sprite))
             if self.draw_debug:
                 pg.draw.rect(self.screen, CYAN, self.camera.apply_rect(sprite.hit_rect), 1)
-        # if self.draw_debug:
-        #     for wall in self.walls:
-        #         pg.draw.rect(self.screen, CYAN, self.camera.apply_rect(wall.rect), 1)
         
         pg.display.flip()
 
diff --git a/map_new/map_new.py b/map_new/map_new.py
index 5b5d796..f854a17 100644
--- a/map_new/map_new.py
+++ b/map_new/map_new.py
@@ -3,14 +3,8 @@ from map_new import map_pattern
 import pygame as pg
 from settings import *
 
-# def getMap():
-#     array = map_utils.getBlankMapArray()
-#     pattern = map_pattern.getPattern()
-#     surface = map_utils.makeSurfaceMap(array, pattern)
-#     return surface
-
 def getTiles():
-    array = map_utils.getBlankMapArray()
+    array = map_utils.generateMap()
     pattern = map_pattern.getPattern()
     tiles = map_utils.getSprites(array, pattern)
     return tiles
diff --git a/map_new/map_utils.py b/map_new/map_utils.py
index fc85fb2..f5f1a1e 100644
--- a/map_new/map_utils.py
+++ b/map_new/map_utils.py
@@ -1,36 +1,28 @@
+import random
 import pygame as pg
+from settings import *
 from map_new.tile import Tile
 
-MAP_WIDTH = 5
-MAP_HEIGHT = 5
-
-TILE_SIZE_PX = 64
-
 # tworzenie pustego arraya o podanych wymiarach
 def getBlankMapArray():
     map = [[0 for x in range(0,MAP_WIDTH)] for y in range (0,MAP_HEIGHT)]
-
-    map[0][1] = 1
-    map[0][2] = 1
-
     return map
 
-# tworzenie surface poprzed czytanie arraya i wedle niego wypelnianie konkretnymi tile'ami
-# def makeSurfaceMap(map, pattern):
-#     surface = pg.Surface((MAP_WIDTH * TILE_SIZE_PX, MAP_HEIGHT * TILE_SIZE_PX))
-
-#     for i in range(len(map)):
-#         offsetY = i * TILE_SIZE_PX
-#         for j in range(len(map[i])):
-#             offsetX = j * TILE_SIZE_PX
-#             surface.blit(pattern[map[i][j]], (offsetX, offsetY))
-#     return surface
+# generowanie obiektow na mapie
+def generateMap():
+    map = getBlankMapArray()
+    for i in range(0, 20):
+        x = random.randint(0, MAP_WIDTH-1)
+        y = random.randint(0, MAP_HEIGHT-1)
+        map[y][x] = 1
+    return map
 
 # tworzenie grup sprite'ow
 def getSprites(map, pattern):
     roadTiles = pg.sprite.Group()
     wallTiles = pg.sprite.Group()
 
+    #objechanie tablicy i generowanie tile'a na danych kordach
     for i in range(len(map)):
         offsetY = i * TILE_SIZE_PX
         for j in range(len(map[i])):
@@ -41,6 +33,7 @@ def getSprites(map, pattern):
                 roadTiles.add(tile)
             else:
                 wallTiles.add(tile)
+
     return roadTiles, wallTiles
 
 
@@ -49,3 +42,4 @@ def getSprites(map, pattern):
 
 
 
+
diff --git a/settings.py b/settings.py
index 0f7e860..e5be6e6 100644
--- a/settings.py
+++ b/settings.py
@@ -26,4 +26,12 @@ PLAYER_ROT_SPEED = 200
 PLAYER_IMG = 'garbagetruck/trashmaster_v2.png'
 PLAYER_HIT_RECT = pg.Rect(0, 0, 50, 50)
 PLAYER_WIDTH = 64
-PLAYER_HEIGHT = 32
\ No newline at end of file
+PLAYER_HEIGHT = 32
+
+#map settings
+MAP_WIDTH = 20
+MAP_HEIGHT = 20
+
+TILE_SIZE_PX = 64
+MAP_WIDTH_PX = MAP_WIDTH * TILE_SIZE_PX
+MAP_HEIGHT_PX = MAP_HEIGHT * TILE_SIZE_PX
\ No newline at end of file