diff --git a/art/images/grass.png b/art/images/background/grass0.png similarity index 100% rename from art/images/grass.png rename to art/images/background/grass0.png diff --git a/art/images/blau1.kra b/art/images/blau1.kra deleted file mode 100644 index ea14ba2..0000000 Binary files a/art/images/blau1.kra and /dev/null differ diff --git a/art/images/blau1.png b/art/images/blau1.png deleted file mode 100644 index 8c831a4..0000000 Binary files a/art/images/blau1.png and /dev/null differ diff --git a/art/images/blau2.png b/art/images/blau2.png deleted file mode 100644 index ad3a521..0000000 Binary files a/art/images/blau2.png and /dev/null differ diff --git a/art/images/blau3.png b/art/images/blau3.png deleted file mode 100644 index 6432f79..0000000 Binary files a/art/images/blau3.png and /dev/null differ diff --git a/art/images/dirt1.png b/art/images/dirt1.png deleted file mode 100644 index fad8f07..0000000 Binary files a/art/images/dirt1.png and /dev/null differ diff --git a/art/images/dirt2.png b/art/images/dirt2.png deleted file mode 100644 index b73418f..0000000 Binary files a/art/images/dirt2.png and /dev/null differ diff --git a/art/images/river1.png b/art/images/river1.png deleted file mode 100644 index 33fbb7f..0000000 Binary files a/art/images/river1.png and /dev/null differ diff --git a/art/images/rot1.png b/art/images/rot1.png deleted file mode 100644 index 209753c..0000000 Binary files a/art/images/rot1.png and /dev/null differ diff --git a/art/images/rot2.png b/art/images/rot2.png deleted file mode 100644 index 4b76d59..0000000 Binary files a/art/images/rot2.png and /dev/null differ diff --git a/art/images/rot3.png b/art/images/rot3.png deleted file mode 100644 index a892101..0000000 Binary files a/art/images/rot3.png and /dev/null differ diff --git a/art/sprite files/oldmanattack.png b/art/images/sprite files/oldmanattack.png similarity index 100% rename from art/sprite files/oldmanattack.png rename to art/images/sprite files/oldmanattack.png diff --git a/art/sprite files/oldmanwalk.png b/art/images/sprite files/oldmanwalk.png similarity index 100% rename from art/sprite files/oldmanwalk.png rename to art/images/sprite files/oldmanwalk.png diff --git a/main.py b/main.py index f4796ed..2085c61 100644 --- a/main.py +++ b/main.py @@ -14,6 +14,7 @@ def setUp(config): else: screen = pygame.display.set_mode(config["res"]) clock = pygame.time.Clock() + pygame.display.set_caption('Between The Pages') return screen, clock, True, True, "start.png", [] def readConfig(): @@ -30,13 +31,15 @@ def genRooms(WIDTH, HEIGHT, type:str, objects:list): room_objects = [] #room_objects = [Obstacle('dirt', 'boulder', 'art/images/dirt2.png', False, 32, 32, WIDTH=WIDTH - 64, HEIGHT=HEIGHT - 64)] room_objects.append(Obstacle('river', 'water', 'art/images/river.png', True, random.randint(32, round(WIDTH * 0.75)), 32, WIDTH=96, HEIGHT=round(HEIGHT * 0.66))) + room_backgrounds = [f'art/images/background/{type}{i}.png' for i in range(1)] + print(objects) rooms = [ - Room(type, 'normal', f'art/images/{type}.png', [objects[0], objects[1], objects[2], [room_objects[random.randint(0, len(room_objects) - 1)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, False], 0), - Room(type, 'normal', f'art/images/{type}.png', [objects[0], objects[1], objects[2], [room_objects[random.randint(0, len(room_objects) - 1)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, False], 1), - Room(type, 'normal', f'art/images/{type}.png', [objects[0], objects[1], objects[2], [room_objects[random.randint(0, len(room_objects) - 1)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, False], 2), - ] - return rooms + Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, True], j) + for j in range(random.randint(5, 10)) + ] + #rooms =Room(type, 'normal', room_backgrounds[random.randint(0, 4)], [objects[0], objects[1], objects[2], [room_objects[random.randint(0, len(room_objects) - 1)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, True], j) + return rooms def play(screen, clock, running, background, isblack, WIDTH, HEIGHT): main = [MainCharacter('Herbert', 100, 'oldman.png', 500, 500, 20, 5, 1, 1, 50)]