diff --git a/__pycache__/common.cpython-314.pyc b/__pycache__/common.cpython-314.pyc index c46cf7e..7087e3f 100644 Binary files a/__pycache__/common.cpython-314.pyc and b/__pycache__/common.cpython-314.pyc differ diff --git a/__pycache__/eb_engine.cpython-314.pyc b/__pycache__/eb_engine.cpython-314.pyc index 9ac0886..221639c 100644 Binary files a/__pycache__/eb_engine.cpython-314.pyc and b/__pycache__/eb_engine.cpython-314.pyc differ diff --git a/common.py b/common.py index a71beb8..8b15edc 100644 --- a/common.py +++ b/common.py @@ -1,3 +1,4 @@ +import os import json import uuid from dataclasses import dataclass, field diff --git a/def_map.json b/def_map.json index 7846886..f6abf41 100644 --- a/def_map.json +++ b/def_map.json @@ -6,7 +6,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -18,7 +18,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -30,7 +30,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -42,7 +42,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -54,7 +54,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -66,7 +66,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -78,7 +78,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -90,7 +90,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -102,7 +102,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -114,7 +114,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -128,7 +128,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -140,7 +140,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -152,7 +152,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -164,7 +164,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -176,7 +176,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -188,7 +188,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -200,7 +200,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -212,7 +212,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -224,7 +224,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -236,7 +236,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -250,7 +250,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -262,7 +262,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -274,7 +274,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -286,7 +286,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -298,7 +298,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -310,7 +310,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -322,7 +322,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -334,7 +334,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -346,7 +346,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -358,7 +358,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -372,7 +372,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -384,7 +384,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -396,7 +396,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -408,7 +408,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -420,7 +420,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -432,7 +432,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -444,7 +444,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -456,7 +456,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -468,7 +468,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -480,7 +480,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -494,7 +494,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -506,7 +506,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -518,7 +518,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -530,7 +530,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -542,7 +542,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -554,7 +554,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -566,7 +566,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -578,7 +578,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -590,7 +590,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -602,7 +602,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -616,7 +616,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -628,7 +628,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -640,7 +640,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -652,7 +652,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -664,7 +664,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -676,7 +676,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -688,7 +688,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -700,7 +700,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -712,7 +712,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -724,7 +724,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -738,7 +738,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -750,7 +750,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -762,7 +762,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -774,7 +774,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -786,7 +786,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -798,7 +798,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -810,7 +810,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -822,7 +822,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -834,7 +834,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -846,7 +846,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -860,7 +860,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -872,7 +872,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -884,7 +884,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -896,7 +896,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -908,7 +908,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -920,7 +920,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -932,7 +932,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -944,7 +944,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -956,7 +956,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} @@ -968,7 +968,7 @@ "terrain_obj": { "id": "1", "name": "2", - "sprite": "grass_small.png" + "sprite": "grass_small" }, "creature_obj": {}, "item_obj": {} diff --git a/eb_engine.py b/eb_engine.py index 76bbee8..e291d59 100644 --- a/eb_engine.py +++ b/eb_engine.py @@ -1,9 +1,14 @@ -from common import pygame, json, uuid, deepcopy, dataclass, field +from common import pygame, os, json, uuid, deepcopy, dataclass, field import eb_objects import eb_terrain import eb_creatures + + cell_classes = {"Ground": eb_terrain.Ground} +main_dir = os.path.dirname(os.path.abspath(__file__)) +sprites_dir = os.path.join(main_dir, "res", "sprites") +#file_path = os.path.join(main_dir, "res", "sprites", "grass_small.png") @dataclass class Cell: @@ -35,23 +40,33 @@ class Map: final_cell = Cell(cell_classes[cell["type"]](**cell["cell"]["terrain_obj"])) self.cells[line].append(deepcopy(final_cell)) - def draw(self, screen): + def draw(self, screen, sprites, grid = True): for l in range(len(self.cells)): for i, cell in enumerate(self.cells[l]): x = int((i * self.size + self.cam_x) * self.scale) y = int((l * self.size + self.cam_y) * self.scale) w = int(self.size * self.scale - self.cell_dist) h = int(self.size * self.scale - self.cell_dist) - pygame.draw.rect(screen, self.color, pygame.Rect(x, y, w, h), self.bord) + if grid: + pygame.draw.rect(screen, self.color, pygame.Rect(x, y, w, h), self.bord) + sp = sprites[cell.terrain_obj.sprite].get_rect(center = (x + w/2, y + h/2)) + screen.blit(sprites[cell.terrain_obj.sprite], sp) class Engine: - def __init__(self, width, height, scale_size = 5, camera_pos = pygame.Vector2(0, 0)): + def __init__(self, width, height, sprites = {}): self.width = width self.height = height - self.scale_size = scale_size - + self.sprites = sprites + pygame.init() + def load_sprites(self, folder_path = sprites_dir): + for filename in os.listdir(folder_path): + if filename.lower().endswith('.png'): + name = os.path.splitext(filename)[0] + self.sprites[name] = pygame.image.load(os.path.join(folder_path, filename)).convert_alpha() + + def main_loop(self): ''' #o = eb_terrain.Ground(1, 1, 1) @@ -62,17 +77,18 @@ class Engine: ''' easy_map = Map("def_map.json") - # pygame setup - pygame.init() + screen = pygame.display.set_mode((self.width, self.height)) clock = pygame.time.Clock() running = True - dt = 0 + unlock = True camera_step = 10 scale_step = 0.1 - player_pos = pygame.Vector2(screen.get_width() / 2, screen.get_height() / 2) + + self.load_sprites() + #gr = pygame.image.load(file_path).convert_alpha() while running: # poll for events @@ -84,30 +100,29 @@ class Engine: # fill the screen with a color to wipe away anything from last frame screen.fill("chartreuse4") - easy_map.draw(screen) + easy_map.draw(screen, self.sprites) - keys = pygame.key.get_pressed() - if keys[pygame.K_w]: - easy_map.cam_y -= camera_step - if keys[pygame.K_s]: - easy_map.cam_y += camera_step - if keys[pygame.K_a]: - easy_map.cam_x -= camera_step - if keys[pygame.K_d]: - easy_map.cam_x += camera_step - if keys[pygame.K_q]: - easy_map.scale += scale_step - if keys[pygame.K_e]: - easy_map.scale -= scale_step + if unlock: + keys = pygame.key.get_pressed() + if keys[pygame.K_w]: + easy_map.cam_y -= camera_step + if keys[pygame.K_s]: + easy_map.cam_y += camera_step + if keys[pygame.K_a]: + easy_map.cam_x -= camera_step + if keys[pygame.K_d]: + easy_map.cam_x += camera_step + if keys[pygame.K_q]: + easy_map.scale += scale_step + if keys[pygame.K_e]: + easy_map.scale -= scale_step + if keys[pygame.K_ESCAPE]: + running = False # flip() the display to put your work on screen - #pygame.time.wait(20) pygame.display.flip() - # limits FPS to 60 - # dt is delta time in seconds since last frame, used for framerate- - # independent physics. - dt = clock.tick(60) / 1000 + clock.tick(60) pygame.quit() \ No newline at end of file diff --git a/res/maps/map_editor.py b/res/maps/map_editor.py index 4baf62b..8b55f27 100644 --- a/res/maps/map_editor.py +++ b/res/maps/map_editor.py @@ -4,7 +4,7 @@ from copy import deepcopy width = 10 height = 8 -grass_def = {"id": "1", "name": "2", "sprite": "grass_small.png"} +grass_def = {"id": "1", "name": "2", "sprite": "grass_small"} cell_def = {"type": "Ground", "cell": {"terrain_obj": grass_def, "creature_obj": {}, "item_obj": {}}} out = {} diff --git a/res/sprites/grass.jpg b/res/sprites/grass.jpg deleted file mode 100644 index f82cd98..0000000 Binary files a/res/sprites/grass.jpg and /dev/null differ diff --git a/res/sprites/grass.png b/res/sprites/grass.png new file mode 100644 index 0000000..8585ff3 Binary files /dev/null and b/res/sprites/grass.png differ diff --git a/res/sprites/grass_small.png b/res/sprites/grass_small.png new file mode 100644 index 0000000..fd8ade7 Binary files /dev/null and b/res/sprites/grass_small.png differ diff --git a/res/sprites/grasss_small.jpg b/res/sprites/grasss_small.jpg deleted file mode 100644 index e464a1f..0000000 Binary files a/res/sprites/grasss_small.jpg and /dev/null differ