From 78a0200856a4e017f3f6134de5dc928186e09c8d Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 26 Nov 2025 13:57:25 +0100 Subject: [PATCH] refactor de noms de resources en data/ --- config/assets.yaml | 8 ++++---- data/enemies/{code.yaml => code_animations.yaml} | 2 +- data/enemies/{code.gif => code_spritesheet.gif} | Bin data/player/{player.yaml => player_animations.yaml} | 2 +- data/player/{player.gif => player_spritesheet.gif} | Bin data/room/03.yaml | 2 +- source/core/system/director.cpp | 2 -- source/game/defaults.hpp | 1 - source/game/gameplay/scoreboard.cpp | 3 +-- source/game/options.hpp | 1 - source/game/scenes/game.cpp | 2 +- 11 files changed, 9 insertions(+), 14 deletions(-) rename data/enemies/{code.yaml => code_animations.yaml} (79%) rename data/enemies/{code.gif => code_spritesheet.gif} (100%) rename data/player/{player.yaml => player_animations.yaml} (88%) rename data/player/{player.gif => player_spritesheet.gif} (100%) diff --git a/config/assets.yaml b/config/assets.yaml index b858c04..304e133 100644 --- a/config/assets.yaml +++ b/config/assets.yaml @@ -66,9 +66,9 @@ assets: # PLAYER player: - type: BITMAP - path: ${PREFIX}/data/player/player.gif + path: ${PREFIX}/data/player/player_spritesheet.gif - type: ANIMATION - path: ${PREFIX}/data/player/player.yaml + path: ${PREFIX}/data/player/player_animations.yaml # MUSIC music: @@ -110,6 +110,6 @@ assets: # ENEMIES enemies: - type: BITMAP - path: ${PREFIX}/data/enemies/code.gif + path: ${PREFIX}/data/enemies/code_spritesheet.gif - type: ANIMATION - path: ${PREFIX}/data/enemies/code.yaml \ No newline at end of file + path: ${PREFIX}/data/enemies/code_animations.yaml \ No newline at end of file diff --git a/data/enemies/code.yaml b/data/enemies/code_animations.yaml similarity index 79% rename from data/enemies/code.yaml rename to data/enemies/code_animations.yaml index 01f0817..f8db523 100644 --- a/data/enemies/code.yaml +++ b/data/enemies/code_animations.yaml @@ -1,5 +1,5 @@ # code animation -tileSetFile: code.gif +tileSetFile: code_spritesheet.gif frameWidth: 16 frameHeight: 16 diff --git a/data/enemies/code.gif b/data/enemies/code_spritesheet.gif similarity index 100% rename from data/enemies/code.gif rename to data/enemies/code_spritesheet.gif diff --git a/data/player/player.yaml b/data/player/player_animations.yaml similarity index 88% rename from data/player/player.yaml rename to data/player/player_animations.yaml index e35efa4..426594c 100644 --- a/data/player/player.yaml +++ b/data/player/player_animations.yaml @@ -1,5 +1,5 @@ # player animation -tileSetFile: player.gif +tileSetFile: player_spritesheet.gif frameWidth: 8 frameHeight: 16 diff --git a/data/player/player.gif b/data/player/player_spritesheet.gif similarity index 100% rename from data/player/player.gif rename to data/player/player_spritesheet.gif diff --git a/data/room/03.yaml b/data/room/03.yaml index ff177e1..b992271 100644 --- a/data/room/03.yaml +++ b/data/room/03.yaml @@ -76,7 +76,7 @@ collisionmap: # Enemigos en esta habitación enemies: - - animation: code.yaml + - animation: code_animations.yaml position: {x: 1, y: 17} velocity: {x: 24.0, y: 0} boundaries: diff --git a/source/core/system/director.cpp b/source/core/system/director.cpp index 19ad2a8..b7b5d97 100644 --- a/source/core/system/director.cpp +++ b/source/core/system/director.cpp @@ -182,8 +182,6 @@ auto Director::checkProgramArguments(std::vector const& args) -> st Options::cheats.infinite_lives = Options::Cheat::State::ENABLED; } else if (argument == "--invincible") { Options::cheats.invincible = Options::Cheat::State::ENABLED; - } else if (argument == "--altSkin") { - Options::cheats.alternate_skin = Options::Cheat::State::ENABLED; } } diff --git a/source/game/defaults.hpp b/source/game/defaults.hpp index c4ed93e..6fb55f4 100644 --- a/source/game/defaults.hpp +++ b/source/game/defaults.hpp @@ -73,7 +73,6 @@ constexpr const char* NOTIFY = "notify.wav"; // Sonido de notificación namespace Cheat { constexpr bool INFINITE_LIVES = false; // Vidas infinitas desactivadas por defecto constexpr bool INVINCIBLE = false; // Invencibilidad desactivada por defecto -constexpr bool ALTERNATE_SKIN = false; // Skin alternativa desactivada por defecto } // namespace Cheat // --- CONTROLS --- diff --git a/source/game/gameplay/scoreboard.cpp b/source/game/gameplay/scoreboard.cpp index 62d7a55..b361045 100644 --- a/source/game/gameplay/scoreboard.cpp +++ b/source/game/gameplay/scoreboard.cpp @@ -21,8 +21,7 @@ Scoreboard::Scoreboard(std::shared_ptr data) constexpr float SURFACE_HEIGHT = ScoreboardArea::HEIGHT; // Reserva memoria para los objetos - const auto& player_animation_data = Resource::Cache::get()->getAnimationData(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.yaml" : "player.yaml"); - player_sprite_ = std::make_shared(player_animation_data); + player_sprite_ = std::make_shared(Resource::Cache::get()->getAnimationData("player_animations.yaml")); player_sprite_->setCurrentAnimation("walk_menu"); surface_ = std::make_shared(SURFACE_WIDTH, SURFACE_HEIGHT); diff --git a/source/game/options.hpp b/source/game/options.hpp index 3bb9014..19ea9a3 100644 --- a/source/game/options.hpp +++ b/source/game/options.hpp @@ -38,7 +38,6 @@ struct Cheat { State infinite_lives{Defaults::Cheat::INFINITE_LIVES ? State::ENABLED : State::DISABLED}; // Indica si el jugador dispone de vidas infinitas State invincible{Defaults::Cheat::INVINCIBLE ? State::ENABLED : State::DISABLED}; // Indica si el jugador puede morir - State alternate_skin{Defaults::Cheat::ALTERNATE_SKIN ? State::ENABLED : State::DISABLED}; // Indica si se usa una skin diferente para el jugador // Método para comprobar si alguno de los trucos está activo [[nodiscard]] auto enabled() const -> bool { diff --git a/source/game/scenes/game.cpp b/source/game/scenes/game.cpp index d9bcfc7..0b16e17 100644 --- a/source/game/scenes/game.cpp +++ b/source/game/scenes/game.cpp @@ -661,7 +661,7 @@ void Game::togglePause() { // Inicializa al jugador void Game::initPlayer(const Player::SpawnData& spawn_point, std::shared_ptr room) { - const Player::Data PLAYER{.spawn_data = spawn_point, .animations_path = "player.yaml", .room = std::move(room)}; + const Player::Data PLAYER{.spawn_data = spawn_point, .animations_path = "player_animations.yaml", .room = std::move(room)}; player_ = std::make_shared(PLAYER); }