diff --git a/assets/textures/entities/player/none/0.png b/assets/textures/entities/player/none/0.png index b7720ab..31e6c8b 100644 Binary files a/assets/textures/entities/player/none/0.png and b/assets/textures/entities/player/none/0.png differ diff --git a/assets/textures/entities/player/none/1.png b/assets/textures/entities/player/none/1.png index 38bf925..2e9c9f4 100644 Binary files a/assets/textures/entities/player/none/1.png and b/assets/textures/entities/player/none/1.png differ diff --git a/assets/textures/entities/player/none/2.png b/assets/textures/entities/player/none/2.png deleted file mode 100644 index 0979bff..0000000 Binary files a/assets/textures/entities/player/none/2.png and /dev/null differ diff --git a/assets/textures/entities/player/none/layers.pdn b/assets/textures/entities/player/none/layers.pdn new file mode 100644 index 0000000..13b5a45 Binary files /dev/null and b/assets/textures/entities/player/none/layers.pdn differ diff --git a/assets/textures/entities/player/walking/0.png b/assets/textures/entities/player/walking/0.png new file mode 100644 index 0000000..d8e6e75 Binary files /dev/null and b/assets/textures/entities/player/walking/0.png differ diff --git a/assets/textures/entities/player/walking/1.png b/assets/textures/entities/player/walking/1.png new file mode 100644 index 0000000..91bc1d9 Binary files /dev/null and b/assets/textures/entities/player/walking/1.png differ diff --git a/assets/textures/entities/player/walking/2.png b/assets/textures/entities/player/walking/2.png new file mode 100644 index 0000000..a2d060a Binary files /dev/null and b/assets/textures/entities/player/walking/2.png differ diff --git a/assets/textures/entities/player/walking/3.png b/assets/textures/entities/player/walking/3.png new file mode 100644 index 0000000..91bc1d9 Binary files /dev/null and b/assets/textures/entities/player/walking/3.png differ diff --git a/src/engine/event_handler.py b/src/engine/event_handler.py index 538fa04..de045a6 100644 --- a/src/engine/event_handler.py +++ b/src/engine/event_handler.py @@ -23,14 +23,19 @@ class EventHandler: self.key_pressed.remove(e.key) player = self.engine.entity_manager.get_by_name("player") + player.link_animation("player_none") if K_RIGHT in self.key_pressed: player.move(2, 0, self.engine.map_manager) + player.link_animation("player_walking") if K_LEFT in self.key_pressed: player.move(-2, 0, self.engine.map_manager) + player.link_animation("player_walking") if K_UP in self.key_pressed: player.move(0, -2, self.engine.map_manager) + player.link_animation("player_walking") if K_DOWN in self.key_pressed: player.move(0, 2, self.engine.map_manager) + player.link_animation("player_walking") if K_x in self.key_pressed: self.engine.camera.target_zoom *= 1.01 if K_c in self.key_pressed: diff --git a/src/engine/renderer.py b/src/engine/renderer.py index 7ff6a8c..04df9a7 100644 --- a/src/engine/renderer.py +++ b/src/engine/renderer.py @@ -1,7 +1,7 @@ import math from pygame import display, image, surface, transform, draw -from pygame.locals import RESIZABLE, SRCALPHA +from pygame.locals import RESIZABLE, SRCALPHA, FULLSCREEN import src.engine.engine as engine from src.engine.animation import Anim @@ -13,7 +13,9 @@ class Renderer: def __init__(self, core: 'engine.Engine'): self.engine = core - self.window = display.set_mode((600, 600), RESIZABLE) + self.window_type = FULLSCREEN + self.window_size = (display.Info().current_w, display.Info().current_h) if self.window_type == FULLSCREEN else (600, 600) + self.window = display.set_mode(self.window_size, self.window_type) self.tiles = [] self.tile_size = 0 self.animations: dict[str: Anim] = {} @@ -57,8 +59,8 @@ class Renderer: gui_surface.fill((0, 0, 0, 0)) self.render_layer(0, rendered_surface) - self.render_entities(rendered_surface, gui_surface, delta) self.render_layer(1, rendered_surface) + self.render_entities(rendered_surface, gui_surface, delta) self.render_layer(2, rendered_surface) # Enfin, on redimensionne notre surface et on la colle sur la fenêtre principale diff --git a/src/main.py b/src/main.py index af6e2fb..9319668 100644 --- a/src/main.py +++ b/src/main.py @@ -15,6 +15,8 @@ class Game(Engine): self.create_player_entity() self.load_boss_fight_assets() + self.DEBUG_MODE = True + self.game_state = GameState.NORMAL def create_player_entity(self): @@ -23,9 +25,13 @@ class Game(Engine): anim.load_animation_from_directory("assets/textures/entities/player/none") self.renderer.register_animation(anim, "player_none") + anim = Anim(0.1) + anim.load_animation_from_directory("assets/textures/entities/player/walking") + self.renderer.register_animation(anim, "player_walking") + player = self.entity_manager.register_entity("player") player.link_animation("player_none") - player.collision_rect = [-7, -7, 7, 7] + player.collision_rect = [-6, -7, 6, 16] player.set_default_life(10)