Merge branch 'main' of https://gitea.sustancia.synology.me/jaildesigner/coffee_crisis_arcade_edition

Afegit outline al text 2x
corregit el marcador durant el Player::State::RECOVER
2025-08-24 14:37:32 +02:00 · 2025-08-24 14:37:30 +02:00 · 2025-08-24 10:51:10 +02:00 · 2025-08-24 10:51:07 +02:00 · 2025-08-23 21:06:20 +02:00 · 2025-08-23 20:05:16 +02:00
14 changed files with 85 additions and 81 deletions
--- a/config/assets.txt
+++ b/config/assets.txt
@@ -52,6 +52,7 @@ SOUND|${PREFIX}/data/sound/notify.wav
 SOUND|${PREFIX}/data/sound/player_collision.wav
 SOUND|${PREFIX}/data/sound/power_ball_explosion.wav
 SOUND|${PREFIX}/data/sound/service_menu_adjust.wav
+SOUND|${PREFIX}/data/sound/service_menu_back.wav
 SOUND|${PREFIX}/data/sound/service_menu_move.wav
 SOUND|${PREFIX}/data/sound/service_menu_select.wav
 SOUND|${PREFIX}/data/sound/stage_change.wav
@@ -174,6 +175,7 @@ BITMAP|${PREFIX}/data/gfx/player/hit.png

 # Fuentes de texto
 BITMAP|${PREFIX}/data/font/04b_25_2x.png
+BITMAP|${PREFIX}/data/font/04b_25_2x_white.png
 BITMAP|${PREFIX}/data/font/04b_25_flat_2x.png
 BITMAP|${PREFIX}/data/font/04b_25_flat.png
 BITMAP|${PREFIX}/data/font/04b_25_grey.png
--- a/data/font/04b_25_2x_white.png
+++ b/data/font/04b_25_2x_white.png
--- a/data/sound/click-2.wav
+++ b/data/sound/click-2.wav
--- a/data/sound/click-3.wav
+++ b/data/sound/click-3.wav
--- a/data/sound/service_menu_back.wav
+++ b/data/sound/service_menu_back.wav
--- a/data/sound/service_menu_move.wav
+++ b/data/sound/service_menu_move.wav
--- a/resources.pack
+++ b/resources.pack
--- a/source/enter_name.cpp
+++ b/source/enter_name.cpp
@@ -45,7 +45,10 @@ void EnterName::incPosition() {
    } else if (position_ > 0)       // No es necesario verificar position_ < MAX_NAME_LENGTH
    {
        // Copiamos el índice del carácter anterior si es posible.
-        character_index_[position_] = character_index_[position_ - 1];
+        //character_index_[position_] = character_index_[position_ - 1];
+        
+        // Ponemos el caracter "espacio"
+        character_index_[position_] = 0;
    } else {
        // Si position_ es 0, inicializamos el carácter actual.
        character_index_[position_] = 0;
@@ -149,7 +152,7 @@ auto EnterName::getRandomName() -> std::string {
 }
 // Obtiene el nombre final introducido
 auto EnterName::getFinalName() -> std::string {
-    auto name = trim(name_.substr(0, position_));
+    auto name = trim(name_.substr(0, position_ + 1)); // Devuelve el texto intruducido incluyendo el del selector
    if (name.empty()) {
        name = getRandomName();
    }
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -624,6 +624,9 @@ void Player::setPlayingState(State state) {

    switch (playing_state_) {
        case State::RECOVER: {
+            score_ = 0; // Pon los puntos a cero para que no se vea en el marcador
+            score_multiplier_ = 1.0F;
+            setScoreboardMode(Scoreboard::Mode::SCORE);
            break;
        }
        case State::RESPAWNING: {
@@ -781,19 +784,19 @@ void Player::updateInvulnerable() {
    if (playing_state_ == State::PLAYING && invulnerable_) {
        if (invulnerable_counter_ > 0) {
            --invulnerable_counter_;
-            
+
            // Frecuencia fija de parpadeo (como el original)
            constexpr int blink_speed = 8;
-            
+
            // Calcula proporción decreciente: menos textura blanca hacia el final
            // Al inicio: 50-50, hacia el final: 70-30 (menos blanco)
            float progress = 1.0f - (static_cast<float>(invulnerable_counter_) / INVULNERABLE_COUNTER);
-            int white_frames = static_cast<int>((0.5f - progress * 0.2f) * blink_speed);  
-            
+            int white_frames = static_cast<int>((0.5f - progress * 0.2f) * blink_speed);
+
            // Alterna entre texturas con proporción variable
            bool should_show_invulnerable = (invulnerable_counter_ % blink_speed) < white_frames;
            size_t target_texture = should_show_invulnerable ? INVULNERABLE_TEXTURE : coffees_;
-            
+
            // Solo cambia textura si es diferente (optimización)
            if (player_sprite_->getActiveTexture() != target_texture) {
                player_sprite_->setActiveTexture(target_texture);
--- a/source/resource.cpp
+++ b/source/resource.cpp
@@ -661,7 +661,8 @@ void Resource::createTextTextures() {
        {"game_text_5000_points", "5.000"},
        {"game_text_powerup", Lang::getText("[GAME_TEXT] 4")},
        {"game_text_one_hit", Lang::getText("[GAME_TEXT] 5")},
-        {"game_text_stop", Lang::getText("[GAME_TEXT] 6")}};
+        {"game_text_stop", Lang::getText("[GAME_TEXT] 6")},
+        {"game_text_1000000_points", Lang::getText("[GAME_TEXT] 8")}};

    auto text1 = getText("04b_25_enhanced");
    for (const auto &s : strings1) {
@@ -669,27 +670,17 @@ void Resource::createTextTextures() {
        printWithDots("Texture : ", s.name, "[  DONE  ]");
    }

-    // Texturas de tamaño normal
-    std::vector<NameAndText> strings2 = {
-        {"game_text_1000000_points", Lang::getText("[GAME_TEXT] 8")}};
-
-    auto text2 = getText("04b_25");
-    for (const auto &s : strings2) {
-        textures_.emplace_back(s.name, text2->writeDXToTexture(Text::STROKE, s.text, -2, Colors::NO_COLOR_MOD, 1, param.game.item_text_outline_color));
-        printWithDots("Texture : ", s.name, "[  DONE  ]");
-    }
-
    // Texturas de tamaño doble
-    std::vector<NameAndText> strings3 = {
+    std::vector<NameAndText> strings2 = {
        {"game_text_100000_points", "100.000"},
        {"game_text_get_ready", Lang::getText("[GAME_TEXT] 7")},
        {"game_text_last_stage", Lang::getText("[GAME_TEXT] 3")},
        {"game_text_congratulations", Lang::getText("[GAME_TEXT] 1")},
        {"game_text_game_over", "Game Over"}};

-    auto text3 = getText("04b_25_2x");
-    for (const auto &s : strings3) {
-        textures_.emplace_back(s.name, text3->writeToTexture(s.text, 1, -4));
+    auto text2 = getText("04b_25_2x_enhanced");
+    for (const auto &s : strings2) {
+        textures_.emplace_back(s.name, text2->writeDXToTexture(Text::STROKE, s.text, -4, Colors::NO_COLOR_MOD, 1, param.game.item_text_outline_color));
        printWithDots("Texture : ", s.name, "[  DONE  ]");
    }
 }
@@ -713,6 +704,7 @@ void Resource::createText() {
        {"04b_25_enhanced", "04b_25.png", "04b_25.txt", "04b_25_white.png"},  // Nueva fuente con textura blanca
        {"04b_25_white", "04b_25_white.png", "04b_25.txt"},
        {"04b_25_2x", "04b_25_2x.png", "04b_25_2x.txt"},
+        {"04b_25_2x_enhanced", "04b_25_2x.png", "04b_25_2x.txt", "04b_25_2x_white.png"},// Nueva fuente con textura blanca
        {"04b_25_metal", "04b_25_metal.png", "04b_25.txt"},
        {"04b_25_grey", "04b_25_grey.png", "04b_25.txt"},
        {"04b_25_flat", "04b_25_flat.png", "04b_25.txt"},
--- a/source/scoreboard.cpp
+++ b/source/scoreboard.cpp
@@ -37,10 +37,7 @@ auto Scoreboard::get() -> Scoreboard * {

 // Constructor
 Scoreboard::Scoreboard()
-    : renderer_(Screen::get()->getRenderer()),
-      game_power_meter_texture_(Resource::get()->getTexture("game_power_meter.png")),
-      power_meter_sprite_(std::make_unique<Sprite>(game_power_meter_texture_)),
-      text_scoreboard_(Resource::get()->getText("8bithud")) {
+    : renderer_(Screen::get()->getRenderer()), game_power_meter_texture_(Resource::get()->getTexture("game_power_meter.png")), power_meter_sprite_(std::make_unique<Sprite>(game_power_meter_texture_)), text_(Resource::get()->getText("8bithud")), enter_name_text_(Resource::get()->getText("smb2")) {
    // Inicializa variables
    for (size_t i = 0; i < static_cast<size_t>(Id::SIZE); ++i) {
        name_.at(i).clear();
@@ -198,50 +195,50 @@ void Scoreboard::renderPanelContent(size_t panel_index) {

 void Scoreboard::renderScoreMode(size_t panel_index) {
    // SCORE
-    text_scoreboard_->writeDX(Text::COLOR | Text::CENTER, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
-    text_scoreboard_->writeDX(Text::COLOR | Text::CENTER, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);
+    text_->writeDX(Text::COLOR | Text::CENTER, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
+    text_->writeDX(Text::COLOR | Text::CENTER, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);

    // MULT
-    text_scoreboard_->writeDX(Text::COLOR | Text::CENTER, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 3"), 1, text_color1_);
-    text_scoreboard_->writeDX(Text::COLOR | Text::CENTER, slot4_4_.x, slot4_4_.y, "x" + std::to_string(mult_.at(panel_index)).substr(0, 3), 1, text_color2_);
+    text_->writeDX(Text::COLOR | Text::CENTER, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 3"), 1, text_color1_);
+    text_->writeDX(Text::COLOR | Text::CENTER, slot4_4_.x, slot4_4_.y, "x" + std::to_string(mult_.at(panel_index)).substr(0, 3), 1, text_color2_);
 }

 void Scoreboard::renderDemoMode() {
    // DEMO MODE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 6"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 6"), 1, text_color1_);

    // PRESS START TO PLAY
    if (time_counter_ % 10 < 8) {
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 8"), 1, text_color1_);
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 9"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 8"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 9"), 1, text_color1_);
    }
 }

 void Scoreboard::renderWaitingMode() {
    // GAME OVER
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"), 1, text_color1_);

    // PRESS START TO PLAY
    if (time_counter_ % 10 < 8) {
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 8"), 1, text_color1_);
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 9"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 8"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 9"), 1, text_color1_);
    }
 }

 void Scoreboard::renderGameOverMode() {
    // GAME OVER
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"), 1, text_color1_);

    // PLEASE WAIT
    if (time_counter_ % 10 < 8) {
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 12"), 1, text_color1_);
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 13"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 12"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, Lang::getText("[SCOREBOARD] 13"), 1, text_color1_);
    }
 }

 void Scoreboard::renderStageInfoMode() {
    // STAGE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, Lang::getText("[SCOREBOARD] 5") + " " + std::to_string(stage_), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, Lang::getText("[SCOREBOARD] 5") + " " + std::to_string(stage_), 1, text_color1_);

    // POWERMETER
    power_meter_sprite_->setSpriteClip(0, 0, 40, 7);
@@ -250,76 +247,75 @@ void Scoreboard::renderStageInfoMode() {
    power_meter_sprite_->render();

    // HI-SCORE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 4"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 4"), 1, text_color1_);
    const std::string NAME = hi_score_name_.empty() ? "" : hi_score_name_ + " - ";
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, NAME + updateScoreText(hi_score_), 1, text_color2_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, NAME + updateScoreText(hi_score_), 1, text_color2_);
 }

 void Scoreboard::renderContinueMode(size_t panel_index) {
    // SCORE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);

    // CONTINUE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 10"), 1, text_color1_);
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_.at(panel_index)), 1, text_color2_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 10"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_.at(panel_index)), 1, text_color2_);
 }

 void Scoreboard::renderEnterNameMode(size_t panel_index) {
    // SCORE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);

    // ENTER NAME
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);

    renderNameInputField(panel_index);
 }

 void Scoreboard::renderNameInputField(size_t panel_index) {
-    SDL_FRect rect = {enter_name_pos_.x, enter_name_pos_.y, 5.0F, 7.0F};
+    SDL_FRect rect = {
+        .x = enter_name_pos_.x,
+        .y = enter_name_pos_.y,
+        .w = static_cast<float>(enter_name_text_->getCharacterSize() - 2),
+        .h = static_cast<float>(enter_name_text_->getCharacterSize())};

    // Recorre todos los slots de letras del nombre
    for (size_t j = 0; j < NAME_SIZE; ++j) {
-        // Selecciona el color
-        const Color COLOR = j < selector_pos_.at(panel_index) ? text_color2_ : text_color1_;
-
-        if (j != selector_pos_.at(panel_index) || time_counter_ % 3 == 0) {
-            // Dibuja la linea
-            if (j >= selector_pos_.at(panel_index)) {
-                SDL_SetRenderDrawColor(renderer_, COLOR.r, COLOR.g, COLOR.b, 255);
-                SDL_RenderLine(renderer_, rect.x, rect.y + rect.h, rect.x + rect.w, rect.y + rect.h);
-            }
-
-            // Dibuja la letra
-            if (j < record_name_.at(panel_index).size()) {
-                text_scoreboard_->writeColored(rect.x, rect.y, record_name_.at(panel_index).substr(j, 1), COLOR);
-            }
+        // Dibuja la linea. Si coincide con el selector solo se dibuja 2 de cada 4 veces
+        if (j != selector_pos_.at(panel_index) || time_counter_ % 4 >= 2) {
+            SDL_SetRenderDrawColor(renderer_, text_color1_.r, text_color1_.g, text_color1_.b, 255);
+            SDL_RenderLine(renderer_, rect.x, rect.y + rect.h, rect.x + rect.w, rect.y + rect.h);
        }
-        rect.x += 7;
+
+        // Dibuja la letra
+        if (j < record_name_.at(panel_index).size()) {
+            enter_name_text_->writeColored(rect.x, rect.y, record_name_.at(panel_index).substr(j, 1), text_color2_);
+        }
+        rect.x += enter_name_text_->getCharacterSize();
    }
 }

 void Scoreboard::renderShowNameMode(size_t panel_index) {
    // SCORE
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y, name_.at(panel_index), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_2_.x, slot4_2_.y, updateScoreText(score_.at(panel_index)), 1, text_color2_);

    // NAME
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y, Lang::getText("[SCOREBOARD] 11"), 1, text_color1_);

-    /* TEXTO CENTRADO */
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, record_name_.at(panel_index), 1, Colors::getColorLikeKnightRider(name_colors_, loop_counter_ / 5));
+    // NOMBRE INTRODUCIDO
+    enter_name_text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y, record_name_.at(panel_index), 1, Colors::getColorLikeKnightRider(name_colors_, loop_counter_ / 5));
 }

 void Scoreboard::renderGameCompletedMode(size_t panel_index) {
    // GAME OVER
-    text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"), 1, text_color1_);
+    text_->writeDX(Text::CENTER | Text::COLOR, slot4_1_.x, slot4_1_.y + 4, Lang::getText("[SCOREBOARD] 7"), 1, text_color1_);

    // SCORE
    if (time_counter_ % 10 < 8) {
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 14"), 1, text_color1_);
-        text_scoreboard_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, updateScoreText(score_.at(panel_index)), 1, text_color2_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_3_.x, slot4_3_.y - 2, Lang::getText("[SCOREBOARD] 14"), 1, text_color1_);
+        text_->writeDX(Text::CENTER | Text::COLOR, slot4_4_.x, slot4_4_.y - 2, updateScoreText(score_.at(panel_index)), 1, text_color2_);
    }
 }

@@ -379,7 +375,7 @@ void Scoreboard::recalculateAnchors() {
    slot4_4_ = {.x = COL, .y = ROW4};

    // Primer cuadrado para poner el nombre de record
-    const int ENTER_NAME_LENGTH = text_scoreboard_->length(std::string(NAME_SIZE, 'A'));
+    const int ENTER_NAME_LENGTH = enter_name_text_->length(std::string(NAME_SIZE, 'A'));
    enter_name_pos_.x = COL - (ENTER_NAME_LENGTH / 2);
    enter_name_pos_.y = ROW4;

--- a/source/scoreboard.h
+++ b/source/scoreboard.h
@@ -73,7 +73,8 @@ class Scoreboard {
        SDL_Renderer *renderer_;                             // El renderizador de la ventana
        std::shared_ptr<Texture> game_power_meter_texture_;  // Textura con el marcador de poder de la fase
        std::unique_ptr<Sprite> power_meter_sprite_;         // Sprite para el medidor de poder de la fase
-        std::shared_ptr<Text> text_scoreboard_;              // Fuente para el marcador del juego
+        std::shared_ptr<Text> text_;                         // Fuente para el marcador del juego
+        std::shared_ptr<Text> enter_name_text_;              // Fuente para la introducción de nombre del jugador
        SDL_Texture *background_ = nullptr;                  // Textura para dibujar el marcador
        std::vector<SDL_Texture *> panel_texture_;           // Texturas para dibujar cada panel

--- a/source/sections/game.cpp
+++ b/source/sections/game.cpp
@@ -285,11 +285,11 @@ void Game::updateStage() {
        if (current_stage_index == total_stages - 1) {  // Penúltima fase (será la última)
            createMessage(paths, Resource::get()->getTexture("game_text_last_stage"));
        } else {
-            auto text = Resource::get()->getText("04b_25_2x");
+            auto text = Resource::get()->getText("04b_25_2x_enhanced");
            const std::string CAPTION = Lang::getText("[GAME_TEXT] 2") +
                std::to_string(total_stages - current_stage_index) +
                Lang::getText("[GAME_TEXT] 2A");
-            createMessage(paths, text->writeToTexture(CAPTION, 1, -4));
+            createMessage(paths, text->writeDXToTexture(Text::STROKE, CAPTION, -4, Colors::NO_COLOR_MOD, 1, param.game.item_text_outline_color));
        }
    }

@@ -606,6 +606,7 @@ void Game::handleItemDrop(const std::shared_ptr<Balloon> &balloon, const std::sh

    if (DROPPED_ITEM != ItemType::COFFEE_MACHINE) {
        createItem(DROPPED_ITEM, balloon->getPosX(), balloon->getPosY());
+        playSound("item_drop.wav");
    } else {
        createItem(DROPPED_ITEM, player->getPosX(), param.game.game_area.rect.y - Item::COFFEE_MACHINE_HEIGHT);
        coffee_machine_enabled_ = true;
@@ -733,7 +734,6 @@ auto Game::dropItem() -> ItemType {
 // Crea un objeto item
 void Game::createItem(ItemType type, float x, float y) {
    items_.emplace_back(std::make_unique<Item>(type, x, y, param.game.play_area.rect, item_textures_[static_cast<int>(type) - 1], item_animations_[static_cast<int>(type) - 1]));
-    playSound("item_drop.wav");
 }

 // Vacia el vector de items
@@ -1424,9 +1424,11 @@ void Game::handleNameInput(const std::shared_ptr<Player> &player) {
        } else if (player->getEnterNamePositionOverflow()) {
            player->setInput(Input::Action::START);
            player->setPlayingState(Player::State::SHOWING_NAME);
+            playSound("service_menu_select.wav");
            updateHiScoreName();
        } else {
            player->setInput(Input::Action::RIGHT);
+            playSound("service_menu_select.wav");
        }
    } else if (input_->checkAction(Input::Action::FIRE_CENTER, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad()) ||
        input_->checkAction(Input::Action::FIRE_RIGHT, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
@@ -1434,17 +1436,21 @@ void Game::handleNameInput(const std::shared_ptr<Player> &player) {
            player->setPlayingState(Player::State::CONTINUE);
        } else {
            player->setInput(Input::Action::LEFT);
+            playSound("service_menu_back.wav");
        }
    } else if (input_->checkAction(Input::Action::UP, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
        player->setInput(Input::Action::UP);
+        playSound("service_menu_move.wav");
    } else if (input_->checkAction(Input::Action::DOWN, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
        player->setInput(Input::Action::DOWN);
+        playSound("service_menu_move.wav");
    } else if (input_->checkAction(Input::Action::START, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
        if (player->isShowingName()) {
            player->setPlayingState(Player::State::CONTINUE);
        } else {
            player->setInput(Input::Action::START);
            player->setPlayingState(Player::State::SHOWING_NAME);
+            playSound("service_menu_select.wav");
            updateHiScoreName();
        }
    }
--- a/source/ui/service_menu.cpp
+++ b/source/ui/service_menu.cpp
@@ -49,16 +49,17 @@ void ServiceMenu::toggle() {
        return;
    }

-    playBackSound();
-
+    
    if (!enabled_) {  // Si está cerrado, abrir
        reset();
        Options::gamepad_manager.assignAndLinkGamepads();
        renderer_->show(this);
        setEnabledInternal(true);
+        playSelectSound();
    } else {  // Si está abierto, cerrar
        renderer_->hide();
        setEnabledInternal(false);
+        playBackSound();
    }
 }

@@ -518,7 +519,7 @@ void ServiceMenu::adjustListValues() {
 void ServiceMenu::playAdjustSound() { Audio::get()->playSound("service_menu_adjust.wav", Audio::Group::INTERFACE); }
 void ServiceMenu::playMoveSound() { Audio::get()->playSound("service_menu_move.wav", Audio::Group::INTERFACE); }
 void ServiceMenu::playSelectSound() { Audio::get()->playSound("service_menu_select.wav", Audio::Group::INTERFACE); }
-void ServiceMenu::playBackSound() { Audio::get()->playSound("service_menu_select.wav", Audio::Group::INTERFACE); }
+void ServiceMenu::playBackSound() { Audio::get()->playSound("service_menu_back.wav", Audio::Group::INTERFACE); }

 // Devuelve el nombre del grupo como string para el título
 auto ServiceMenu::settingsGroupToString(SettingsGroup group) -> std::string {
Author	SHA1	Message	Date
Sergio Valor	6e81b6e60c	Merge branch 'main' of https://gitea.sustancia.synology.me/jaildesigner/coffee_crisis_arcade_edition	2025-08-24 14:37:32 +02:00
Sergio Valor	74f6fe3501	Afegit outline al text 2x corregit el marcador durant el Player::State::RECOVER	2025-08-24 14:37:30 +02:00
Sergio Valor	dfdb679054	Merge branch 'main' of https://gitea.sustancia.synology.me/JailDesigner/coffee_crisis_arcade_edition	2025-08-24 10:51:10 +02:00
Sergio Valor	26ed479306	delete	2025-08-24 10:51:07 +02:00
Sergio Valor	32e9da55ef	Afegit so de service_menu_back Retocats els audios de service menu Afegit so a ENTER NAME Arreglos visuals a ENTER NAME	2025-08-23 21:06:20 +02:00
Sergio Valor	610083578e	style: eliminat soroll de drop item amb maquina de café Quan ix una maquina de café ja no se sent el so de drop item per a millorar l'experiència sonora del joc. Resol #91	2025-08-23 20:05:16 +02:00