From ab5489a080ad834ec4d47dd2722c274850d285e1 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 29 May 2026 19:12:53 +0200 Subject: [PATCH 1/2] tweak(nau): la nau ferida parpelleja en roig pur en lloc de daurat --- data/entities/player/player.yaml | 2 +- source/game/entities/ship.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/entities/player/player.yaml b/data/entities/player/player.yaml index 27503e6..5efc6fe 100644 --- a/data/entities/player/player.yaml +++ b/data/entities/player/player.yaml @@ -43,7 +43,7 @@ visual_thrust: colors: normal: [255, 255, 255] # blanc neutre - hurt: [255, 220, 60] # daurat (estat ferit) + hurt: [255, 0, 0] # roig pur (estat ferit) weapon: bullet_speed: 700.0 # velocitat escalar de la bullet (px/s) diff --git a/source/game/entities/ship.cpp b/source/game/entities/ship.cpp index daf99d6..baa9ce0 100644 --- a/source/game/entities/ship.cpp +++ b/source/game/entities/ship.cpp @@ -162,7 +162,7 @@ void Ship::draw() const { const float THRUST_MODULATOR = 1.0F + (VISUAL_PUSH / config_.visual_thrust.scale_divisor); const float SCALE = config_.shape.scale * THRUST_MODULATOR; - // Parpelleig daurat mentre està ferida: alterna color normal ↔ color hurt. + // Parpelleig mentre està ferida: alterna color normal ↔ color hurt. SDL_Color color = config_.colors.normal; if (hurt_timer_ > 0.0F) { const float CYCLE = 1.0F / config_.hurt.blink_hz; From d7a9bd4ab2632a39850c3f762dd42faa290dc72e Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 29 May 2026 19:13:07 +0200 Subject: [PATCH 2/2] =?UTF-8?q?tweak(game=20over):=20en=20acabar=20la=20pa?= =?UTF-8?q?rtida=20es=20torna=20al=20logo=20en=20lloc=20del=20t=C3=ADtol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/game/scenes/game_scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/game/scenes/game_scene.cpp b/source/game/scenes/game_scene.cpp index 173ec8e..1790d10 100644 --- a/source/game/scenes/game_scene.cpp +++ b/source/game/scenes/game_scene.cpp @@ -484,7 +484,7 @@ auto GameScene::stepGameOver(float delta_time) -> bool { game_over_timer_ -= delta_time; if (game_over_timer_ <= 0.0F) { Audio::get()->stopMusic(); - context_.setNextScene(SceneType::TITLE); + context_.setNextScene(SceneType::LOGO); return true; }