Merge branch 'tweaks/varis': nau ferida en roig i retorn al logo en acabar la partida
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user