jaildesigner-jailgames/orni-attack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'tweaks/varis': nau ferida en roig i retorn al logo en acabar la partida

Browse Source
This commit is contained in:
Sergio Valor
2026-05-29 19:55:11 +02:00
parent f4567a2e82 d7a9bd4ab2
commit 6f29731679
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/entities/player/player.yaml
+1 -1
View File
@@ -43,7 +43,7 @@ visual_thrust:
colors: colors:
normal: [255, 255, 255] # blanc neutre normal: [255, 255, 255] # blanc neutre
hurt: [255, 220, 60] # daurat (estat ferit) hurt: [255, 0, 0] # roig pur (estat ferit)
weapon: weapon:
bullet_speed: 700.0 # velocitat escalar de la bullet (px/s) bullet_speed: 700.0 # velocitat escalar de la bullet (px/s)
source/game/entities/ship.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ void Ship::draw() const {
const float THRUST_MODULATOR = 1.0F + (VISUAL_PUSH / config_.visual_thrust.scale_divisor); const float THRUST_MODULATOR = 1.0F + (VISUAL_PUSH / config_.visual_thrust.scale_divisor);
const float SCALE = config_.shape.scale * THRUST_MODULATOR; 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; SDL_Color color = config_.colors.normal;
if (hurt_timer_ > 0.0F) { if (hurt_timer_ > 0.0F) {
const float CYCLE = 1.0F / config_.hurt.blink_hz; const float CYCLE = 1.0F / config_.hurt.blink_hz;
source/game/scenes/game_scene.cpp
+1 -1
View File
@@ -484,7 +484,7 @@ auto GameScene::stepGameOver(float delta_time) -> bool {
game_over_timer_ -= delta_time; game_over_timer_ -= delta_time;
if (game_over_timer_ <= 0.0F) { if (game_over_timer_ <= 0.0F) {
Audio::get()->stopMusic(); Audio::get()->stopMusic();
context_.setNextScene(SceneType::TITLE); context_.setNextScene(SceneType::LOGO);
return true; return true;
} }