crimsonland 0.1.0.dev7__py3-none-any.whl → 0.1.0.dev9__py3-none-any.whl

crimson/modes/quest_mode.py

@@ -7,24 +7,42 @@ import pyray as rl
 
 from grim.assets import PaqTextureCache
 from grim.audio import AudioState
+from grim.console import ConsoleState
 from grim.config import CrimsonConfig
 from grim.fonts.grim_mono import GrimMonoFont, load_grim_mono_font
 from grim.view import ViewContext
 
 from ..game_modes import GameMode
-from ..gameplay import most_used_weapon_id_for_player, weapon_assign_player
+from ..gameplay import most_used_weapon_id_for_player, perk_selection_current_choices, perk_selection_pick, weapon_assign_player
 from ..input_codes import config_keybinds, input_code_is_down, input_code_is_pressed, player_move_fire_binds
 from ..persistence.save_status import GameStatus
+from ..perks import PerkId, perk_display_description, perk_display_name
 from ..quests import quest_by_level
 from ..quests.runtime import build_quest_spawn_table, tick_quest_completion_transition
 from ..quests.timeline import quest_spawn_table_empty, tick_quest_mode_spawns
 from ..quests.types import QuestContext, QuestDefinition, SpawnEntry
 from ..terrain_assets import terrain_texture_by_id
 from ..ui.cursor import draw_aim_cursor, draw_menu_cursor
-from ..ui.hud import draw_hud_overlay, hud_ui_scale
-from ..ui.perk_menu import PerkMenuAssets, load_perk_menu_assets
+from ..ui.hud import draw_hud_overlay, hud_flags_for_game_mode
+from ..ui.perk_menu import (
+    PerkMenuAssets,
+    PerkMenuLayout,
+    UiButtonState,
+    button_draw,
+    button_update,
+    button_width,
+    draw_menu_item,
+    draw_menu_panel,
+    draw_ui_text,
+    load_perk_menu_assets,
+    menu_item_hit_rect,
+    perk_menu_compute_layout,
+    ui_origin,
+    ui_scale,
+    wrap_ui_text,
+)
 from ..views.quest_title_overlay import draw_quest_title_overlay
-from .base_gameplay_mode import BaseGameplayMode
+from .base_gameplay_mode import BaseGameplayMode, _clamp
 
 WORLD_SIZE = 1024.0
 QUEST_TITLE_FADE_IN_MS = 500.0
@@ -32,6 +50,36 @@ QUEST_TITLE_HOLD_MS = 1000.0
 QUEST_TITLE_FADE_OUT_MS = 500.0
 QUEST_TITLE_TOTAL_MS = QUEST_TITLE_FADE_IN_MS + QUEST_TITLE_HOLD_MS + QUEST_TITLE_FADE_OUT_MS
 
+UI_TEXT_SCALE = 1.0
+UI_TEXT_COLOR = rl.Color(220, 220, 220, 255)
+UI_HINT_COLOR = rl.Color(140, 140, 140, 255)
+UI_SPONSOR_COLOR = rl.Color(255, 255, 255, int(255 * 0.5))
+
+PERK_PROMPT_MAX_TIMER_MS = 200.0
+PERK_PROMPT_OUTSET_X = 50.0
+# Perk prompt bar geometry comes from `ui_menu_assets_init` + `ui_menu_layout_init`:
+# - `ui_menu_item_element` is set_rect(512x64, offset -72,-60)
+# - the perk prompt mutates quad coords: x = (x - 300) * 0.75, y = y * 0.75
+PERK_PROMPT_BAR_SCALE = 0.75
+PERK_PROMPT_BAR_BASE_OFFSET_X = -72.0
+PERK_PROMPT_BAR_BASE_OFFSET_Y = -60.0
+PERK_PROMPT_BAR_SHIFT_X = -300.0
+
+# `ui_textLevelUp` is set_rect(75x25, offset -230,-27), then its quad coords are:
+# x = x * 0.85 - 46, y = y * 0.85 - 4
+PERK_PROMPT_LEVEL_UP_SCALE = 0.85
+PERK_PROMPT_LEVEL_UP_BASE_OFFSET_X = -230.0
+PERK_PROMPT_LEVEL_UP_BASE_OFFSET_Y = -27.0
+PERK_PROMPT_LEVEL_UP_BASE_W = 75.0
+PERK_PROMPT_LEVEL_UP_BASE_H = 25.0
+PERK_PROMPT_LEVEL_UP_SHIFT_X = -46.0
+PERK_PROMPT_LEVEL_UP_SHIFT_Y = -4.0
+
+PERK_PROMPT_TEXT_MARGIN_X = 16.0
+PERK_PROMPT_TEXT_OFFSET_Y = 8.0
+
+PERK_MENU_TRANSITION_MS = 500.0
+
 
 @dataclass(slots=True)
 class _QuestRunState:
@@ -99,6 +147,7 @@ class QuestMode(BaseGameplayMode):
         demo_mode_active: bool = False,
         texture_cache: PaqTextureCache | None = None,
         config: CrimsonConfig | None = None,
+        console: ConsoleState | None = None,
         audio: AudioState | None = None,
         audio_rng: random.Random | None = None,
     ) -> None:
@@ -111,32 +160,51 @@ class QuestMode(BaseGameplayMode):
             hardcore=False,
             texture_cache=texture_cache,
             config=config,
+            console=console,
             audio=audio,
             audio_rng=audio_rng,
         )
         self._quest = _QuestRunState()
         self._selected_level: str | None = None
         self._outcome: QuestRunOutcome | None = None
-        self._ui_assets: PerkMenuAssets | None = None
+        self._perk_menu_assets: PerkMenuAssets | None = None
         self._grim_mono: GrimMonoFont | None = None
 
+        self._perk_prompt_timer_ms = 0.0
+        self._perk_prompt_hover = False
+        self._perk_prompt_pulse = 0.0
+        self._perk_menu_open = False
+        self._perk_menu_selected = 0
+        self._perk_menu_timeline_ms = 0.0
+        self._perk_ui_layout = PerkMenuLayout()
+        self._perk_cancel_button = UiButtonState("Cancel")
+
     def open(self) -> None:
         super().open()
         self._quest = _QuestRunState()
         self._outcome = None
-        self._ui_assets = load_perk_menu_assets(self._assets_root)
-        if self._ui_assets.missing:
-            self._missing_assets.extend(self._ui_assets.missing)
+        self._perk_menu_assets = load_perk_menu_assets(self._assets_root)
+        if self._perk_menu_assets.missing:
+            self._missing_assets.extend(self._perk_menu_assets.missing)
         try:
             self._grim_mono = load_grim_mono_font(self._assets_root, self._missing_assets)
         except Exception:
             self._grim_mono = None
 
+        self._perk_prompt_timer_ms = 0.0
+        self._perk_prompt_hover = False
+        self._perk_prompt_pulse = 0.0
+        self._perk_menu_open = False
+        self._perk_menu_selected = 0
+        self._perk_menu_timeline_ms = 0.0
+        self._perk_ui_layout = PerkMenuLayout()
+        self._perk_cancel_button = UiButtonState("Cancel")
+
     def close(self) -> None:
         if self._grim_mono is not None:
             rl.unload_texture(self._grim_mono.texture)
             self._grim_mono = None
-        self._ui_assets = None
+        self._perk_menu_assets = None
         super().close()
 
     def select_level(self, level: str | None) -> None:
@@ -229,6 +297,11 @@ class QuestMode(BaseGameplayMode):
                 status.increment_quest_play_count(idx)
 
     def _handle_input(self) -> None:
+        if self._perk_menu_open and rl.is_key_pressed(rl.KeyboardKey.KEY_ESCAPE):
+            self._world.audio_router.play_sfx("sfx_ui_buttonclick")
+            self._close_perk_menu()
+            return
+
         if rl.is_key_pressed(rl.KeyboardKey.KEY_TAB):
             self._paused = not self._paused
 
@@ -274,22 +347,381 @@ class QuestMode(BaseGameplayMode):
             reload_pressed=bool(reload_pressed),
         )
 
+    def _perk_prompt_label(self) -> str:
+        if self._config is not None and not bool(int(self._config.data.get("ui_info_texts", 1) or 0)):
+            return ""
+        pending = int(self._state.perk_selection.pending_count)
+        if pending <= 0:
+            return ""
+        suffix = f" ({pending})" if pending > 1 else ""
+        return f"Press Mouse2 to pick a perk{suffix}"
+
+    def _perk_prompt_hinge(self) -> tuple[float, float]:
+        screen_w = float(rl.get_screen_width())
+        hinge_x = screen_w + PERK_PROMPT_OUTSET_X
+        hinge_y = 80.0 if int(screen_w) == 640 else 40.0
+        return hinge_x, hinge_y
+
+    def _perk_prompt_rect(self, label: str, *, scale: float = UI_TEXT_SCALE) -> rl.Rectangle:
+        hinge_x, hinge_y = self._perk_prompt_hinge()
+        if self._perk_menu_assets is not None and self._perk_menu_assets.menu_item is not None:
+            tex = self._perk_menu_assets.menu_item
+            bar_w = float(tex.width) * PERK_PROMPT_BAR_SCALE
+            bar_h = float(tex.height) * PERK_PROMPT_BAR_SCALE
+            local_x = (PERK_PROMPT_BAR_BASE_OFFSET_X + PERK_PROMPT_BAR_SHIFT_X) * PERK_PROMPT_BAR_SCALE
+            local_y = PERK_PROMPT_BAR_BASE_OFFSET_Y * PERK_PROMPT_BAR_SCALE
+            return rl.Rectangle(
+                float(hinge_x + local_x),
+                float(hinge_y + local_y),
+                float(bar_w),
+                float(bar_h),
+            )
+
+        margin = 16.0 * scale
+        text_w = float(self._ui_text_width(label, scale))
+        text_h = float(self._ui_line_height(scale))
+        x = float(rl.get_screen_width()) - margin - text_w
+        y = margin
+        return rl.Rectangle(x, y, text_w, text_h)
+
+    def _open_perk_menu(self) -> None:
+        if self._perk_menu_open:
+            return
+        players = self._world.players
+        choices = perk_selection_current_choices(
+            self._state,
+            players,
+            self._state.perk_selection,
+            game_mode=int(GameMode.QUESTS),
+            player_count=len(players),
+        )
+        if not choices:
+            self._perk_menu_open = False
+            return
+        self._world.audio_router.play_sfx("sfx_ui_panelclick")
+        self._perk_menu_open = True
+        self._perk_menu_selected = 0
+
+    def _close_perk_menu(self) -> None:
+        self._perk_menu_open = False
+        if int(self._state.perk_selection.pending_count) > 0:
+            # Reset the prompt swing so each pending perk replays the intro.
+            self._perk_prompt_timer_ms = 0.0
+            self._perk_prompt_hover = False
+            self._perk_prompt_pulse = 0.0
+
+    def _perk_menu_handle_input(self, dt_frame: float, dt_ms: float) -> None:
+        if self._perk_menu_assets is None:
+            self._close_perk_menu()
+            return
+
+        perk_state = self._state.perk_selection
+        players = self._world.players
+        choices = perk_selection_current_choices(
+            self._state,
+            players,
+            perk_state,
+            game_mode=int(GameMode.QUESTS),
+            player_count=len(players),
+        )
+        if not choices:
+            self._close_perk_menu()
+            return
+        if self._perk_menu_selected >= len(choices):
+            self._perk_menu_selected = 0
+
+        if rl.is_key_pressed(rl.KeyboardKey.KEY_DOWN):
+            self._perk_menu_selected = (self._perk_menu_selected + 1) % len(choices)
+        if rl.is_key_pressed(rl.KeyboardKey.KEY_UP):
+            self._perk_menu_selected = (self._perk_menu_selected - 1) % len(choices)
+
+        screen_w = float(rl.get_screen_width())
+        screen_h = float(rl.get_screen_height())
+        scale = ui_scale(screen_w, screen_h)
+        origin_x, origin_y = ui_origin(screen_w, screen_h, scale)
+        menu_t = _clamp(self._perk_menu_timeline_ms / PERK_MENU_TRANSITION_MS, 0.0, 1.0)
+        slide_x = (menu_t - 1.0) * (self._perk_ui_layout.panel_w * scale)
+
+        mouse = self._ui_mouse_pos()
+        click = rl.is_mouse_button_pressed(rl.MouseButton.MOUSE_BUTTON_LEFT)
+
+        master_owned = int(self._player.perk_counts[int(PerkId.PERK_MASTER)]) > 0
+        expert_owned = int(self._player.perk_counts[int(PerkId.PERK_EXPERT)]) > 0
+        computed = perk_menu_compute_layout(
+            self._perk_ui_layout,
+            screen_w=screen_w,
+            origin_x=origin_x + slide_x,
+            origin_y=origin_y,
+            scale=scale,
+            choice_count=len(choices),
+            expert_owned=expert_owned,
+            master_owned=master_owned,
+        )
+
+        fx_toggle = int(self._config.data.get("fx_toggle", 0) or 0) if self._config is not None else 0
+        for idx, perk_id in enumerate(choices):
+            label = perk_display_name(int(perk_id), fx_toggle=fx_toggle)
+            item_x = computed.list_x
+            item_y = computed.list_y + float(idx) * computed.list_step_y
+            rect = menu_item_hit_rect(self._small, label, x=item_x, y=item_y, scale=scale)
+            if rl.check_collision_point_rec(mouse, rect):
+                self._perk_menu_selected = idx
+                if click:
+                    self._world.audio_router.play_sfx("sfx_ui_buttonclick")
+                    picked = perk_selection_pick(
+                        self._state,
+                        players,
+                        perk_state,
+                        idx,
+                        game_mode=int(GameMode.QUESTS),
+                        player_count=len(players),
+                        dt=dt_frame,
+                        creatures=self._creatures.entries,
+                    )
+                    if picked is not None:
+                        self._world.audio_router.play_sfx("sfx_ui_bonus")
+                    self._close_perk_menu()
+                    return
+                break
+
+        cancel_w = button_width(self._small, self._perk_cancel_button.label, scale=scale, force_wide=self._perk_cancel_button.force_wide)
+        cancel_x = computed.cancel_x
+        button_y = computed.cancel_y
+
+        if button_update(
+            self._perk_cancel_button,
+            x=cancel_x,
+            y=button_y,
+            width=cancel_w,
+            dt_ms=dt_ms,
+            mouse=mouse,
+            click=click,
+        ):
+            self._world.audio_router.play_sfx("sfx_ui_buttonclick")
+            self._close_perk_menu()
+            return
+
+        if rl.is_key_pressed(rl.KeyboardKey.KEY_ENTER) or rl.is_key_pressed(rl.KeyboardKey.KEY_SPACE):
+            self._world.audio_router.play_sfx("sfx_ui_buttonclick")
+            picked = perk_selection_pick(
+                self._state,
+                players,
+                perk_state,
+                self._perk_menu_selected,
+                game_mode=int(GameMode.QUESTS),
+                player_count=len(players),
+                dt=dt_frame,
+                creatures=self._creatures.entries,
+            )
+            if picked is not None:
+                self._world.audio_router.play_sfx("sfx_ui_bonus")
+            self._close_perk_menu()
+
+    def _draw_perk_prompt(self) -> None:
+        if self._perk_menu_open or self._perk_menu_timeline_ms > 1e-3:
+            return
+        if not any(player.health > 0.0 for player in self._world.players):
+            return
+        pending = int(self._state.perk_selection.pending_count)
+        if pending <= 0:
+            return
+        label = self._perk_prompt_label()
+        if not label:
+            return
+
+        alpha = float(self._perk_prompt_timer_ms) / PERK_PROMPT_MAX_TIMER_MS
+        if alpha <= 1e-3:
+            return
+
+        hinge_x, hinge_y = self._perk_prompt_hinge()
+        # Prompt swings counter-clockwise; raylib's Y-down makes positive rotation clockwise.
+        rot_deg = -(1.0 - alpha) * 90.0
+        tint = rl.Color(255, 255, 255, int(255 * alpha))
+
+        text_w = float(self._ui_text_width(label, UI_TEXT_SCALE))
+        x = float(rl.get_screen_width()) - PERK_PROMPT_TEXT_MARGIN_X - text_w
+        y = hinge_y + PERK_PROMPT_TEXT_OFFSET_Y
+        color = rl.Color(UI_TEXT_COLOR.r, UI_TEXT_COLOR.g, UI_TEXT_COLOR.b, int(255 * alpha))
+        draw_ui_text(self._small, label, x, y, scale=UI_TEXT_SCALE, color=color)
+
+        if self._perk_menu_assets is not None and self._perk_menu_assets.menu_item is not None:
+            tex = self._perk_menu_assets.menu_item
+            bar_w = float(tex.width) * PERK_PROMPT_BAR_SCALE
+            bar_h = float(tex.height) * PERK_PROMPT_BAR_SCALE
+            local_x = (PERK_PROMPT_BAR_BASE_OFFSET_X + PERK_PROMPT_BAR_SHIFT_X) * PERK_PROMPT_BAR_SCALE
+            local_y = PERK_PROMPT_BAR_BASE_OFFSET_Y * PERK_PROMPT_BAR_SCALE
+            src = rl.Rectangle(float(tex.width), 0.0, -float(tex.width), float(tex.height))
+            dst = rl.Rectangle(float(hinge_x), float(hinge_y), float(bar_w), float(bar_h))
+            origin = rl.Vector2(float(-local_x), float(-local_y))
+            rl.draw_texture_pro(tex, src, dst, origin, rot_deg, tint)
+
+        if self._perk_menu_assets is not None and self._perk_menu_assets.title_level_up is not None:
+            tex = self._perk_menu_assets.title_level_up
+            local_x = PERK_PROMPT_LEVEL_UP_BASE_OFFSET_X * PERK_PROMPT_LEVEL_UP_SCALE + PERK_PROMPT_LEVEL_UP_SHIFT_X
+            local_y = PERK_PROMPT_LEVEL_UP_BASE_OFFSET_Y * PERK_PROMPT_LEVEL_UP_SCALE + PERK_PROMPT_LEVEL_UP_SHIFT_Y
+            w = PERK_PROMPT_LEVEL_UP_BASE_W * PERK_PROMPT_LEVEL_UP_SCALE
+            h = PERK_PROMPT_LEVEL_UP_BASE_H * PERK_PROMPT_LEVEL_UP_SCALE
+            pulse_alpha = (100.0 + float(int(self._perk_prompt_pulse * 155.0 / 1000.0))) / 255.0
+            pulse_alpha = max(0.0, min(1.0, pulse_alpha))
+            label_alpha = max(0.0, min(1.0, alpha * pulse_alpha))
+            pulse_tint = rl.Color(255, 255, 255, int(255 * label_alpha))
+            src = rl.Rectangle(0.0, 0.0, float(tex.width), float(tex.height))
+            dst = rl.Rectangle(float(hinge_x), float(hinge_y), float(w), float(h))
+            origin = rl.Vector2(float(-local_x), float(-local_y))
+            rl.draw_texture_pro(tex, src, dst, origin, rot_deg, pulse_tint)
+            if label_alpha > 0.0:
+                rl.begin_blend_mode(rl.BLEND_ADDITIVE)
+                rl.draw_texture_pro(tex, src, dst, origin, rot_deg, pulse_tint)
+                rl.end_blend_mode()
+
+    def _draw_perk_menu(self) -> None:
+        menu_t = _clamp(self._perk_menu_timeline_ms / PERK_MENU_TRANSITION_MS, 0.0, 1.0)
+        if menu_t <= 1e-3:
+            return
+        if self._perk_menu_assets is None:
+            return
+
+        perk_state = self._state.perk_selection
+        players = self._world.players
+        choices = perk_selection_current_choices(
+            self._state,
+            players,
+            perk_state,
+            game_mode=int(GameMode.QUESTS),
+            player_count=len(players),
+        )
+        if not choices:
+            return
+
+        screen_w = float(rl.get_screen_width())
+        screen_h = float(rl.get_screen_height())
+        scale = ui_scale(screen_w, screen_h)
+        origin_x, origin_y = ui_origin(screen_w, screen_h, scale)
+        slide_x = (menu_t - 1.0) * (self._perk_ui_layout.panel_w * scale)
+
+        master_owned = int(self._player.perk_counts[int(PerkId.PERK_MASTER)]) > 0
+        expert_owned = int(self._player.perk_counts[int(PerkId.PERK_EXPERT)]) > 0
+        computed = perk_menu_compute_layout(
+            self._perk_ui_layout,
+            screen_w=screen_w,
+            origin_x=origin_x + slide_x,
+            origin_y=origin_y,
+            scale=scale,
+            choice_count=len(choices),
+            expert_owned=expert_owned,
+            master_owned=master_owned,
+        )
+
+        panel_tex = self._perk_menu_assets.menu_panel
+        if panel_tex is not None:
+            draw_menu_panel(panel_tex, dst=computed.panel)
+
+        title_tex = self._perk_menu_assets.title_pick_perk
+        if title_tex is not None:
+            src = rl.Rectangle(0.0, 0.0, float(title_tex.width), float(title_tex.height))
+            rl.draw_texture_pro(title_tex, src, computed.title, rl.Vector2(0.0, 0.0), 0.0, rl.WHITE)
+
+        sponsor = None
+        if master_owned:
+            sponsor = "extra perks sponsored by the Perk Master"
+        elif expert_owned:
+            sponsor = "extra perk sponsored by the Perk Expert"
+        if sponsor:
+            draw_ui_text(self._small, sponsor, computed.sponsor_x, computed.sponsor_y, scale=scale, color=UI_SPONSOR_COLOR)
+
+        mouse = self._ui_mouse_pos()
+        fx_toggle = int(self._config.data.get("fx_toggle", 0) or 0) if self._config is not None else 0
+        for idx, perk_id in enumerate(choices):
+            label = perk_display_name(int(perk_id), fx_toggle=fx_toggle)
+            item_x = computed.list_x
+            item_y = computed.list_y + float(idx) * computed.list_step_y
+            rect = menu_item_hit_rect(self._small, label, x=item_x, y=item_y, scale=scale)
+            hovered = rl.check_collision_point_rec(mouse, rect) or (idx == self._perk_menu_selected)
+            draw_menu_item(self._small, label, x=item_x, y=item_y, scale=scale, hovered=hovered)
+
+        selected = choices[self._perk_menu_selected]
+        desc = perk_display_description(int(selected), fx_toggle=fx_toggle)
+        desc_x = float(computed.desc.x)
+        desc_y = float(computed.desc.y)
+        desc_w = float(computed.desc.width)
+        desc_h = float(computed.desc.height)
+        desc_scale = scale * 0.85
+        desc_lines = wrap_ui_text(self._small, desc, max_width=desc_w, scale=desc_scale)
+        line_h = float(self._small.cell_size * desc_scale) if self._small is not None else float(20 * desc_scale)
+        y = desc_y
+        for line in desc_lines:
+            if y + line_h > desc_y + desc_h:
+                break
+            draw_ui_text(self._small, line, desc_x, y, scale=desc_scale, color=UI_TEXT_COLOR)
+            y += line_h
+
+        cancel_w = button_width(self._small, self._perk_cancel_button.label, scale=scale, force_wide=self._perk_cancel_button.force_wide)
+        cancel_x = computed.cancel_x
+        button_y = computed.cancel_y
+        button_draw(self._perk_menu_assets, self._small, self._perk_cancel_button, x=cancel_x, y=button_y, width=cancel_w, scale=scale)
+
     def update(self, dt: float) -> None:
         self._update_audio(dt)
 
-        dt_frame = self._tick_frame(dt)[0]
-        dt_ms = float(dt_frame * 1000.0)
+        dt_frame, dt_ui_ms = self._tick_frame(dt)
         self._handle_input()
 
         if self.close_requested:
             return
 
         any_alive = any(player.health > 0.0 for player in self._world.players)
-        dt_world = 0.0 if self._paused or (not any_alive) else dt_frame
+        perk_pending = int(self._state.perk_selection.pending_count) > 0 and any_alive
+
+        self._perk_prompt_hover = False
+        if self._perk_menu_open:
+            self._perk_menu_handle_input(dt_frame, dt_ui_ms)
+
+        perk_menu_active = self._perk_menu_open or self._perk_menu_timeline_ms > 1e-3
+
+        if (not perk_menu_active) and perk_pending and (not self._paused):
+            label = self._perk_prompt_label()
+            if label:
+                rect = self._perk_prompt_rect(label)
+                self._perk_prompt_hover = rl.check_collision_point_rec(self._ui_mouse_pos(), rect)
+
+            keybinds = config_keybinds(self._config)
+            if not keybinds:
+                keybinds = (0x11, 0x1F, 0x1E, 0x20, 0x100)
+            _up_key, _down_key, _left_key, _right_key, fire_key = player_move_fire_binds(keybinds, 0)
+
+            pick_key = 0x101
+            if self._config is not None:
+                pick_key = int(self._config.data.get("keybind_pick_perk", pick_key) or pick_key)
+
+            if input_code_is_pressed(pick_key) and (not input_code_is_down(fire_key)):
+                self._perk_prompt_pulse = 1000.0
+                self._open_perk_menu()
+            elif self._perk_prompt_hover and input_code_is_pressed(fire_key):
+                self._perk_prompt_pulse = 1000.0
+                self._open_perk_menu()
+
+        perk_menu_active = self._perk_menu_open or self._perk_menu_timeline_ms > 1e-3
+
+        if not self._paused:
+            pulse_delta = dt_ui_ms * (6.0 if self._perk_prompt_hover else -2.0)
+            self._perk_prompt_pulse = _clamp(self._perk_prompt_pulse + pulse_delta, 0.0, 1000.0)
+
+        prompt_active = perk_pending and (not perk_menu_active) and (not self._paused)
+        if prompt_active:
+            self._perk_prompt_timer_ms = _clamp(self._perk_prompt_timer_ms + dt_ui_ms, 0.0, PERK_PROMPT_MAX_TIMER_MS)
+        else:
+            self._perk_prompt_timer_ms = _clamp(self._perk_prompt_timer_ms - dt_ui_ms, 0.0, PERK_PROMPT_MAX_TIMER_MS)
+
+        if self._perk_menu_open:
+            self._perk_menu_timeline_ms = _clamp(self._perk_menu_timeline_ms + dt_ui_ms, 0.0, PERK_MENU_TRANSITION_MS)
+        else:
+            self._perk_menu_timeline_ms = _clamp(self._perk_menu_timeline_ms - dt_ui_ms, 0.0, PERK_MENU_TRANSITION_MS)
+
+        dt_world = 0.0 if self._paused or (not any_alive) or perk_menu_active else dt_frame
         if dt_world <= 0.0:
             return
 
-        self._quest.quest_name_timer_ms += dt_ms
+        self._quest.quest_name_timer_ms += dt_world * 1000.0
 
         input_state = self._build_input()
         self._world.update(
@@ -405,11 +837,17 @@ class QuestMode(BaseGameplayMode):
             self.close_requested = True
 
     def draw(self) -> None:
-        self._world.draw(draw_aim_indicators=True)
+        perk_menu_active = self._perk_menu_open or self._perk_menu_timeline_ms > 1e-3
+        self._world.draw(draw_aim_indicators=not perk_menu_active)
         self._draw_screen_fade()
 
         hud_bottom = 0.0
-        if self._hud_assets is not None:
+        if (not perk_menu_active) and self._hud_assets is not None:
+            total = int(self._quest.total_spawn_count)
+            kills = int(self._creatures.kill_count)
+            quest_progress_ratio = float(kills) / float(total) if total > 0 else None
+            hud_flags = hud_flags_for_game_mode(self._config_game_mode_id())
+            self._draw_target_health_bar()
             hud_bottom = draw_hud_overlay(
                 self._hud_assets,
                 player=self._player,
@@ -418,31 +856,14 @@ class QuestMode(BaseGameplayMode):
                 elapsed_ms=float(self._quest.spawn_timeline_ms),
                 font=self._small,
                 frame_dt_ms=self._last_dt_ms,
-                show_xp=False,
-                show_time=True,
+                show_health=hud_flags.show_health,
+                show_weapon=hud_flags.show_weapon,
+                show_xp=hud_flags.show_xp,
+                show_time=hud_flags.show_time,
+                show_quest_hud=hud_flags.show_quest_hud,
+                quest_progress_ratio=quest_progress_ratio,
+                small_indicators=self._hud_small_indicators(),
             )
-            total = int(self._quest.total_spawn_count)
-            if total > 0:
-                kills = int(self._creatures.kill_count)
-                ratio = max(0.0, min(1.0, float(kills) / float(total)))
-                scale = hud_ui_scale(float(rl.get_screen_width()), float(rl.get_screen_height()))
-                bar_x = 255.0 * scale
-                bar_y = 30.0 * scale
-                bar_w = 120.0 * scale
-                bar_h = 6.0 * scale
-                bg = rl.Color(40, 40, 48, 200)
-                fg = rl.Color(220, 220, 220, 240)
-                rl.draw_rectangle(int(bar_x), int(bar_y), int(bar_w), int(bar_h), bg)
-                inner_w = max(0.0, bar_w - 2.0 * scale)
-                inner_h = max(0.0, bar_h - 2.0 * scale)
-                rl.draw_rectangle(
-                    int(bar_x + scale),
-                    int(bar_y + scale),
-                    int(inner_w * ratio),
-                    int(inner_h),
-                    fg,
-                )
-                self._draw_ui_text(f"{kills}/{total}", bar_x + bar_w + 8.0 * scale, bar_y - 3.0 * scale, rl.Color(220, 220, 220, 255), scale=0.8 * scale)
 
         self._draw_quest_title()
 
@@ -455,15 +876,21 @@ class QuestMode(BaseGameplayMode):
             warn = "Missing HUD assets: " + ", ".join(self._hud_missing)
             self._draw_ui_text(warn, 24.0, warn_y, rl.Color(240, 80, 80, 255), scale=0.8)
 
-        self._draw_aim_cursor()
-        if self._paused:
+        self._draw_perk_prompt()
+        self._draw_perk_menu()
+
+        if perk_menu_active:
+            self._draw_game_cursor()
+        elif self._paused:
             self._draw_game_cursor()
             x = 18.0
             y = max(18.0, hud_bottom + 10.0)
-            self._draw_ui_text("paused (TAB)", x, y, rl.Color(140, 140, 140, 255))
+            self._draw_ui_text("paused (TAB)", x, y, UI_HINT_COLOR)
+        else:
+            self._draw_aim_cursor()
 
     def _draw_game_cursor(self) -> None:
-        assets = self._ui_assets
+        assets = self._perk_menu_assets
         cursor_tex = assets.cursor if assets is not None else None
         draw_menu_cursor(
             self._world.particles_texture,
@@ -474,7 +901,7 @@ class QuestMode(BaseGameplayMode):
         )
 
     def _draw_aim_cursor(self) -> None:
-        assets = self._ui_assets
+        assets = self._perk_menu_assets
         aim_tex = assets.aim if assets is not None else None
         draw_aim_cursor(
             self._world.particles_texture,

crimson/modes/rush_mode.py

@@ -7,6 +7,7 @@ import pyray as rl
 
 from grim.assets import PaqTextureCache
 from grim.audio import AudioState
+from grim.console import ConsoleState
 from grim.config import CrimsonConfig
 from grim.view import ViewContext
 
@@ -16,7 +17,7 @@ from ..gameplay import PlayerInput, most_used_weapon_id_for_player, weapon_assig
 from ..input_codes import config_keybinds, input_code_is_down, input_code_is_pressed, player_move_fire_binds
 from ..persistence.highscores import HighScoreRecord
 from ..ui.cursor import draw_aim_cursor, draw_menu_cursor
-from ..ui.hud import draw_hud_overlay
+from ..ui.hud import draw_hud_overlay, hud_flags_for_game_mode
 from ..ui.perk_menu import load_perk_menu_assets
 from .base_gameplay_mode import BaseGameplayMode
 
@@ -42,6 +43,7 @@ class RushMode(BaseGameplayMode):
         *,
         texture_cache: PaqTextureCache | None = None,
         config: CrimsonConfig | None = None,
+        console: ConsoleState | None = None,
         audio: AudioState | None = None,
         audio_rng: random.Random | None = None,
     ) -> None:
@@ -54,6 +56,7 @@ class RushMode(BaseGameplayMode):
             hardcore=False,
             texture_cache=texture_cache,
             config=config,
+            console=console,
             audio=audio,
             audio_rng=audio_rng,
         )
@@ -255,6 +258,8 @@ class RushMode(BaseGameplayMode):
 
         hud_bottom = 0.0
         if (not self._game_over_active) and self._hud_assets is not None:
+            hud_flags = hud_flags_for_game_mode(self._config_game_mode_id())
+            self._draw_target_health_bar()
             hud_bottom = draw_hud_overlay(
                 self._hud_assets,
                 player=self._player,
@@ -263,8 +268,12 @@ class RushMode(BaseGameplayMode):
                 elapsed_ms=self._rush.elapsed_ms,
                 font=self._small,
                 frame_dt_ms=self._last_dt_ms,
-                show_xp=False,
-                show_time=True,
+                show_health=hud_flags.show_health,
+                show_weapon=hud_flags.show_weapon,
+                show_xp=hud_flags.show_xp,
+                show_time=hud_flags.show_time,
+                show_quest_hud=hud_flags.show_quest_hud,
+                small_indicators=self._hud_small_indicators(),
             )
 
         if not self._game_over_active: