diff --git a/art/image files/dooor.kra b/art/image files/dooor.kra new file mode 100644 index 0000000..dea49d1 Binary files /dev/null and b/art/image files/dooor.kra differ diff --git a/art/image files/door.kra b/art/image files/door.kra new file mode 100644 index 0000000..82c52ce Binary files /dev/null and b/art/image files/door.kra differ diff --git a/art/image files/startscreen.kra b/art/image files/startscreen.kra new file mode 100644 index 0000000..a709c3e Binary files /dev/null and b/art/image files/startscreen.kra differ diff --git a/art/images/background/door_boss.png b/art/images/background/door_boss.png new file mode 100644 index 0000000..75c5a37 Binary files /dev/null and b/art/images/background/door_boss.png differ diff --git a/art/images/background/door_normal.png b/art/images/background/door_normal.png new file mode 100644 index 0000000..89ab1b8 Binary files /dev/null and b/art/images/background/door_normal.png differ diff --git a/art/images/background/startscreen.png b/art/images/background/startscreen.png new file mode 100644 index 0000000..64f279a Binary files /dev/null and b/art/images/background/startscreen.png differ diff --git a/art/images/icon.png b/art/images/icon.png new file mode 100644 index 0000000..5c58017 Binary files /dev/null and b/art/images/icon.png differ diff --git a/main.py b/main.py index 16f5d2f..3642aba 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,9 @@ def setUp(config): 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", [] + with open('art/images/icon.png', 'r') as i: + pygame.display.set_icon(pygame.image.load(i)) + return screen, clock, True, True, "startscreen.png", [] def readConfig(): with open('config.json', 'r') as c: @@ -33,9 +35,10 @@ def genRooms(WIDTH, HEIGHT, type:str, objects:list): room_objects.append(Obstacle('river', 'water', 'art/images/background/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)] rooms = [ - Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], objects[3], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, True], j) + Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], objects[3], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, j) for j in range(random.randint(5, 10)) ] + rooms.append(Room(type, 'boss', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], [], [], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, 88)) #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 @@ -100,6 +103,7 @@ def play(screen, clock, running, background, isblack, WIDTH, HEIGHT): objects[0][0].book.addspell('windslash') scene.update(False, objects) + scene.draw(screen) else: objects[0][0].book.hidden = not freeze @@ -119,7 +123,7 @@ def village(screen, clock, running, background, isblack, WIDTH, HEIGHT): Obstacle('house', 'Interactable', 'art/images/background/house.png', False, 500, 150, WIDTH=180, HEIGHT=160)] npcs = [NPC('oldlady', 100, 'people/oldlady.png', 0, 200, 200)] objects = [main, mobs, npcs, weapons, others] - room = Room('village', 'village', 'art/images/background/village.png', objects, WIDTH - 64, HEIGHT - 64, [True, True, True, True], 0) + room = Room('village', 'village', 'art/images/background/village.png', objects, WIDTH - 64, HEIGHT - 64, 0) freeze = True #Gameplay is freezed in certain situations main[0].health.health = 20 @@ -189,7 +193,7 @@ def house(screen, clock, running, background, isblack, WIDTH, HEIGHT): others = [] npcs = [NPC('oldman', 100, 'people/reddy.png', 0, 200, 200)] objects = [main, mobs, npcs, weapons, others] - room = Room('house', 'house', 'art/images/background/insideHouse.png', objects, WIDTH - 64, HEIGHT - 64, [True, True, True, True], 0) + room = Room('house', 'house', 'art/images/background/insideHouse.png', objects, WIDTH - 64, HEIGHT - 64, 0) freeze = False #Gameplay is freezed in certain situations while running: @@ -288,7 +292,7 @@ def options(screen, clock, running, background, isblack, WIDTH, HEIGHT): def menu(screen, clock, running, background, isblack, WIDTH, HEIGHT): objects = [] - objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2, 160, 64, 'textbox.png', 'medieval', 48, "Play", village, attributes=[screen, clock, running, background, isblack, WIDTH, HEIGHT])) + objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2, 160, 64, 'textbox.png', 'medieval', 48, "Play", play, attributes=[screen, clock, running, background, isblack, WIDTH, HEIGHT])) #objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2 - 72, 160, 64, 'textbox.png', 'medieval', 48, "Options", uwu)) objects.append(Button(WIDTH / 2 - 80, HEIGHT / 2 + 72, 160, 64, 'textbox.png', 'medieval', 48, "Exit game", quitGame)) while running: