crimsonland 0.1.0.dev12__py3-none-any.whl → 0.1.0.dev14__py3-none-any.whl

crimson/modes/tutorial_mode.py

@@ -21,7 +21,9 @@ from ..perks import PerkId, perk_display_description, perk_display_name
 from ..tutorial.timeline import TutorialFrameActions, TutorialState, tick_tutorial_timeline
 from ..ui.cursor import draw_aim_cursor, draw_menu_cursor
 from ..ui.hud import draw_hud_overlay, hud_flags_for_game_mode, hud_ui_scale
+from ..ui.menu_panel import draw_classic_menu_panel
 from ..ui.perk_menu import (
+    PERK_MENU_TRANSITION_MS,
     PerkMenuAssets,
     PerkMenuLayout,
     UiButtonState,
@@ -29,10 +31,10 @@ from ..ui.perk_menu import (
     button_update,
     button_width,
     draw_menu_item,
-    draw_menu_panel,
     draw_ui_text,
     load_perk_menu_assets,
     menu_item_hit_rect,
+    perk_menu_panel_slide_x,
     perk_menu_compute_layout,
     ui_origin,
     ui_scale,
@@ -282,6 +284,8 @@ class TutorialMode(BaseGameplayMode):
         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 = perk_menu_panel_slide_x(self._perk_menu_timeline_ms, width=self._perk_ui_layout.panel_w)
+        slide_x = perk_menu_panel_slide_x(self._perk_menu_timeline_ms, width=self._perk_ui_layout.panel_w)
 
         mouse = self._ui_mouse_pos()
         click = rl.is_mouse_button_pressed(rl.MouseButton.MOUSE_BUTTON_LEFT)
@@ -297,6 +301,7 @@ class TutorialMode(BaseGameplayMode):
             choice_count=len(choices),
             expert_owned=expert_owned,
             master_owned=master_owned,
+            panel_slide_x=slide_x,
         )
 
         fx_toggle = int(self._config.data.get("fx_toggle", 0) or 0) if self._config is not None else 0
@@ -361,9 +366,9 @@ class TutorialMode(BaseGameplayMode):
             self._perk_menu_handle_input(dt_frame, dt_ui_ms)
 
         if self._perk_menu_open:
-            self._perk_menu_timeline_ms = _clamp(self._perk_menu_timeline_ms + dt_ui_ms, 0.0, 200.0)
+            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, 200.0)
+            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 perk_menu_active else dt_frame
 
@@ -604,12 +609,13 @@ class TutorialMode(BaseGameplayMode):
             choice_count=len(choices),
             expert_owned=expert_owned,
             master_owned=master_owned,
+            panel_slide_x=slide_x,
         )
 
         panel_tex = assets.menu_panel
         if panel_tex is not None:
             fx_detail = bool(int(self._config.data.get("fx_detail_0", 0) or 0)) if self._config is not None else False
-            draw_menu_panel(panel_tex, dst=computed.panel, shadow=fx_detail)
+            draw_classic_menu_panel(panel_tex, dst=computed.panel, shadow=fx_detail)
 
         title_tex = assets.title_pick_perk
         if title_tex is not None:

crimson/ui/menu_panel.py

@@ -0,0 +1,127 @@
+from __future__ import annotations
+
+import pyray as rl
+
+from .shadow import UI_SHADOW_OFFSET, draw_ui_quad_shadow
+
+
+# Classic menu panel is rendered from the *inset* inner region of ui_menuPanel:
+#   - X inset: 1px on each side (uv 1/512 .. 511/512) => 510px wide
+#   - Y inset: 1px on each side (uv 1/256 .. 255/256) => 254px tall
+#
+# When a panel is taller than the base height, the original stretches it using a
+# 3-slice: [top][mid][bottom]. The source slice boundaries are at y=130 and y=150
+# in the texture (see grim UVs in ui_render_trace).
+MENU_PANEL_INSET = 1.0
+MENU_PANEL_SRC_SLICE_Y1 = 130.0
+MENU_PANEL_SRC_SLICE_Y2 = 150.0
+
+# Destination slice heights observed in the original at scale=1.0 (1024x768).
+MENU_PANEL_DST_TOP_H = 138.0
+MENU_PANEL_DST_BOTTOM_H = 116.0
+
+
+def draw_classic_menu_panel(
+    texture: rl.Texture2D,
+    *,
+    dst: rl.Rectangle,
+    tint: rl.Color = rl.WHITE,
+    shadow: bool = False,
+) -> None:
+    """
+    Draw a classic menu panel (ui_menuPanel) with the same slicing behavior as the original.
+
+    - Uses inset source rect (1px border skipped) to match the vertex/UV inset.
+    - Uses 3-slice only when dst is taller than (top + bottom); otherwise draws a single quad.
+    """
+
+    tex_w = float(texture.width)
+    tex_h = float(texture.height)
+    if tex_w <= 0.0 or tex_h <= 0.0:
+        return
+
+    inset = MENU_PANEL_INSET
+    src_x = inset
+    src_y = inset
+    src_w = max(0.0, tex_w - inset * 2.0)
+    src_h = max(0.0, tex_h - inset * 2.0)
+
+    # Scale slice heights with the panel width (menu panel uses the same scale factor).
+    # dst.width is already in our "inset" width space (510 at scale=1.0).
+    scale = (float(dst.width) / 510.0) if float(dst.width) != 0.0 else 1.0
+    top_h = MENU_PANEL_DST_TOP_H * scale
+    bottom_h = MENU_PANEL_DST_BOTTOM_H * scale
+    mid_h = float(dst.height) - top_h - bottom_h
+
+    origin = rl.Vector2(0.0, 0.0)
+
+    if mid_h <= 0.0:
+        src = rl.Rectangle(src_x, src_y, src_w, src_h)
+        if shadow:
+            draw_ui_quad_shadow(
+                texture=texture,
+                src=src,
+                dst=rl.Rectangle(
+                    float(dst.x + UI_SHADOW_OFFSET),
+                    float(dst.y + UI_SHADOW_OFFSET),
+                    float(dst.width),
+                    float(dst.height),
+                ),
+                origin=origin,
+                rotation_deg=0.0,
+            )
+        rl.draw_texture_pro(texture, src, dst, origin, 0.0, tint)
+        return
+
+    # Source slice rects (in texture pixels, with 1px inset).
+    src_top = rl.Rectangle(src_x, src_y, src_w, max(0.0, MENU_PANEL_SRC_SLICE_Y1 - inset))
+    src_mid = rl.Rectangle(src_x, MENU_PANEL_SRC_SLICE_Y1, src_w, max(0.0, MENU_PANEL_SRC_SLICE_Y2 - MENU_PANEL_SRC_SLICE_Y1))
+    src_bot = rl.Rectangle(src_x, MENU_PANEL_SRC_SLICE_Y2, src_w, max(0.0, (tex_h - inset) - MENU_PANEL_SRC_SLICE_Y2))
+
+    # Destination slices.
+    dst_top = rl.Rectangle(float(dst.x), float(dst.y), float(dst.width), float(top_h))
+    dst_mid = rl.Rectangle(float(dst.x), float(dst.y) + float(top_h), float(dst.width), float(mid_h))
+    dst_bot = rl.Rectangle(float(dst.x), float(dst.y) + float(top_h) + float(mid_h), float(dst.width), float(bottom_h))
+
+    if shadow:
+        draw_ui_quad_shadow(
+            texture=texture,
+            src=src_top,
+            dst=rl.Rectangle(
+                float(dst_top.x + UI_SHADOW_OFFSET),
+                float(dst_top.y + UI_SHADOW_OFFSET),
+                float(dst_top.width),
+                float(dst_top.height),
+            ),
+            origin=origin,
+            rotation_deg=0.0,
+        )
+        draw_ui_quad_shadow(
+            texture=texture,
+            src=src_mid,
+            dst=rl.Rectangle(
+                float(dst_mid.x + UI_SHADOW_OFFSET),
+                float(dst_mid.y + UI_SHADOW_OFFSET),
+                float(dst_mid.width),
+                float(dst_mid.height),
+            ),
+            origin=origin,
+            rotation_deg=0.0,
+        )
+        draw_ui_quad_shadow(
+            texture=texture,
+            src=src_bot,
+            dst=rl.Rectangle(
+                float(dst_bot.x + UI_SHADOW_OFFSET),
+                float(dst_bot.y + UI_SHADOW_OFFSET),
+                float(dst_bot.width),
+                float(dst_bot.height),
+            ),
+            origin=origin,
+            rotation_deg=0.0,
+        )
+
+    rl.draw_texture_pro(texture, src_top, dst_top, origin, 0.0, tint)
+    rl.draw_texture_pro(texture, src_mid, dst_mid, origin, 0.0, tint)
+    rl.draw_texture_pro(texture, src_bot, dst_bot, origin, 0.0, tint)
+

crimson/ui/perk_menu.py

@@ -9,15 +9,19 @@ import pyray as rl
 from grim.assets import TextureLoader
 from grim.fonts.small import SmallFontData, draw_small_text, measure_small_text_width
 
-from .shadow import UI_SHADOW_OFFSET, draw_ui_quad_shadow
+from .menu_panel import draw_classic_menu_panel
 
 
 UI_BASE_WIDTH = 640.0
 UI_BASE_HEIGHT = 480.0
 
-
-MENU_PANEL_SLICE_Y1 = 130.0
-MENU_PANEL_SLICE_Y2 = 150.0
+# Perk selection screen panel uses ui_element-style timeline animation:
+# - fully hidden until end_ms
+# - slides in over (end_ms..start_ms)
+# - fully visible at start_ms
+PERK_MENU_ANIM_START_MS = 400.0
+PERK_MENU_ANIM_END_MS = 100.0
+PERK_MENU_TRANSITION_MS = PERK_MENU_ANIM_START_MS
 
 # Layout offsets from the classic game (perk selection screen), derived from
 # `perk_selection_screen_update` (see analysis/ghidra + BN).
@@ -45,11 +49,13 @@ MENU_DESC_RIGHT_X = 480.0
 @dataclass(slots=True)
 class PerkMenuLayout:
     # Coordinates live in the original 640x480 UI space.
-    # Matches the classic menu panel: pos (-45, 110) + offset (20, -82).
-    panel_x: float = -25.0
-    panel_y: float = 28.0
-    panel_w: float = 512.0
-    panel_h: float = 379.0
+    # Capture (1024x768) shows the perk menu panel uses the 3-slice variant:
+    #   open bbox (-108,119) -> (402,497)
+    # which corresponds to ui_element pos (-45,110) + geom (-63,-81) and size 510x378.
+    panel_x: float = -108.0
+    panel_y: float = 29.0
+    panel_w: float = 510.0
+    panel_h: float = 378.0
 
 
 @dataclass(slots=True)
@@ -145,88 +151,47 @@ def perk_menu_compute_layout(
         cancel_y=float(cancel_y),
     )
 
-
-def draw_menu_panel(
-    texture: rl.Texture,
+def ui_element_slide_x(
+    t_ms: float,
     *,
-    dst: rl.Rectangle,
-    tint: rl.Color = rl.WHITE,
-    shadow: bool = False,
-) -> None:
-    scale = float(dst.width) / float(texture.width)
-    top_h = MENU_PANEL_SLICE_Y1 * scale
-    bottom_h = (float(texture.height) - MENU_PANEL_SLICE_Y2) * scale
-    mid_h = float(dst.height) - top_h - bottom_h
-    if mid_h < 0.0:
-        src = rl.Rectangle(0.0, 0.0, float(texture.width), float(texture.height))
-        if shadow:
-            draw_ui_quad_shadow(
-                texture=texture,
-                src=src,
-                dst=rl.Rectangle(
-                    float(dst.x + UI_SHADOW_OFFSET),
-                    float(dst.y + UI_SHADOW_OFFSET),
-                    float(dst.width),
-                    float(dst.height),
-                ),
-                origin=rl.Vector2(0.0, 0.0),
-                rotation_deg=0.0,
-            )
-        rl.draw_texture_pro(texture, src, dst, rl.Vector2(0.0, 0.0), 0.0, tint)
-        return
+    start_ms: float,
+    end_ms: float,
+    width: float,
+    direction_flag: int = 0,
+) -> float:
+    """
+    Slide offset helper matching ui_element_update semantics (see MenuView._ui_element_anim).
+
+    direction_flag=0: slide from left  (-width -> 0)
+    direction_flag=1: slide from right (+width -> 0)
+    """
+
+    if start_ms <= end_ms or width <= 0.0:
+        return 0.0
+
+    width = abs(float(width))
+    t = float(t_ms)
+    if t < float(end_ms):
+        slide = width
+    elif t < float(start_ms):
+        elapsed = t - float(end_ms)
+        span = float(start_ms) - float(end_ms)
+        p = elapsed / span if span > 1e-6 else 1.0
+        slide = (1.0 - p) * width
+    else:
+        slide = 0.0
 
-    src_w = float(texture.width)
-    src_h = float(texture.height)
-
-    src_top = rl.Rectangle(0.0, 0.0, src_w, MENU_PANEL_SLICE_Y1)
-    src_mid = rl.Rectangle(0.0, MENU_PANEL_SLICE_Y1, src_w, MENU_PANEL_SLICE_Y2 - MENU_PANEL_SLICE_Y1)
-    src_bot = rl.Rectangle(0.0, MENU_PANEL_SLICE_Y2, src_w, src_h - MENU_PANEL_SLICE_Y2)
-
-    dst_top = rl.Rectangle(float(dst.x), float(dst.y), float(dst.width), top_h)
-    dst_mid = rl.Rectangle(float(dst.x), float(dst.y) + top_h, float(dst.width), mid_h)
-    dst_bot = rl.Rectangle(float(dst.x), float(dst.y) + top_h + mid_h, float(dst.width), bottom_h)
-
-    origin = rl.Vector2(0.0, 0.0)
-    if shadow:
-        draw_ui_quad_shadow(
-            texture=texture,
-            src=src_top,
-            dst=rl.Rectangle(
-                float(dst_top.x + UI_SHADOW_OFFSET),
-                float(dst_top.y + UI_SHADOW_OFFSET),
-                float(dst_top.width),
-                float(dst_top.height),
-            ),
-            origin=origin,
-            rotation_deg=0.0,
-        )
-        draw_ui_quad_shadow(
-            texture=texture,
-            src=src_mid,
-            dst=rl.Rectangle(
-                float(dst_mid.x + UI_SHADOW_OFFSET),
-                float(dst_mid.y + UI_SHADOW_OFFSET),
-                float(dst_mid.width),
-                float(dst_mid.height),
-            ),
-            origin=origin,
-            rotation_deg=0.0,
-        )
-        draw_ui_quad_shadow(
-            texture=texture,
-            src=src_bot,
-            dst=rl.Rectangle(
-                float(dst_bot.x + UI_SHADOW_OFFSET),
-                float(dst_bot.y + UI_SHADOW_OFFSET),
-                float(dst_bot.width),
-                float(dst_bot.height),
-            ),
-            origin=origin,
-            rotation_deg=0.0,
-        )
-    rl.draw_texture_pro(texture, src_top, dst_top, origin, 0.0, tint)
-    rl.draw_texture_pro(texture, src_mid, dst_mid, origin, 0.0, tint)
-    rl.draw_texture_pro(texture, src_bot, dst_bot, origin, 0.0, tint)
+    return slide if int(direction_flag) else -slide
+
+
+def perk_menu_panel_slide_x(t_ms: float, *, width: float) -> float:
+    return ui_element_slide_x(
+        t_ms,
+        start_ms=PERK_MENU_ANIM_START_MS,
+        end_ms=PERK_MENU_ANIM_END_MS,
+        width=width,
+        direction_flag=0,
+    )
 
 
 @dataclass(slots=True)

crimson/ui/quest_results.py

@@ -21,6 +21,7 @@ from ..persistence.highscores import (
     upsert_highscore_record,
 )
 from ..quests.results import QuestFinalTime, QuestResultsBreakdownAnim, tick_quest_results_breakdown_anim
+from .menu_panel import draw_classic_menu_panel
 from .perk_menu import (
     PerkMenuAssets,
     UiButtonState,
@@ -28,7 +29,6 @@ from .perk_menu import (
     button_update,
     button_width,
     cursor_draw,
-    draw_menu_panel,
     draw_ui_text,
     load_perk_menu_assets,
 )
@@ -55,7 +55,7 @@ def _menu_widescreen_y_shift(layout_w: float) -> float:
 # `quest_results_screen_update` base layout (Crimsonland classic UI panel).
 # Values are derived from `ui_menu_assets_init` + `ui_menu_layout_init` and how
 # the quest results screen composes `ui_menuPanel` geometry:
-#   panel_left = geom_x0 + pos_x + 180 + slide_x
+#   panel_left = geom_x0 + pos_x + slide_x
 #   panel_top  = geom_y0 + pos_y
 #
 # Where:
@@ -66,10 +66,9 @@ QUEST_RESULTS_PANEL_POS_X = -45.0
 QUEST_RESULTS_PANEL_POS_Y = 110.0
 QUEST_RESULTS_PANEL_GEOM_X0 = -63.0
 QUEST_RESULTS_PANEL_GEOM_Y0 = -81.0
-QUEST_RESULTS_PANEL_BASE_X = 180.0
 
-QUEST_RESULTS_PANEL_W = 512.0
-QUEST_RESULTS_PANEL_H = 379.0
+QUEST_RESULTS_PANEL_W = 510.0
+QUEST_RESULTS_PANEL_H = 378.0
 
 TEXTURE_TOP_BANNER_W = 256.0
 TEXTURE_TOP_BANNER_H = 64.0
@@ -77,7 +76,11 @@ TEXTURE_TOP_BANNER_H = 64.0
 INPUT_BOX_W = 166.0
 INPUT_BOX_H = 18.0
 
-PANEL_SLIDE_DURATION_MS = 250.0
+# Capture (1024x768) shows the quest results panel uses the same ui_element
+# timeline pattern as other screens: fully hidden until 100ms, then slides in
+# over 300ms (end=100, start=400).
+PANEL_SLIDE_START_MS = 400.0
+PANEL_SLIDE_END_MS = 100.0
 
 COLOR_TEXT = rl.Color(255, 255, 255, 255)
 COLOR_TEXT_MUTED = rl.Color(255, 255, 255, int(255 * 0.8))
@@ -101,11 +104,6 @@ def _poll_text_input(max_len: int, *, allow_space: bool = True) -> str:
     return out
 
 
-def _ease_out_cubic(t: float) -> float:
-    t = max(0.0, min(1.0, float(t)))
-    return 1.0 - (1.0 - t) ** 3
-
-
 def _format_ordinal(value_1_based: int) -> str:
     value = int(value_1_based)
     if value % 100 in (11, 12, 13):
@@ -289,11 +287,18 @@ class QuestResultsUi:
             rl.draw_text(text, int(x), int(y), int(20 * scale), color)
 
     def _panel_layout(self, *, screen_w: float, scale: float) -> tuple[rl.Rectangle, float, float]:
-        t = self._intro_ms / PANEL_SLIDE_DURATION_MS if PANEL_SLIDE_DURATION_MS > 1e-6 else 1.0
-        eased = _ease_out_cubic(t)
-        panel_slide_x = -QUEST_RESULTS_PANEL_W * (1.0 - eased)
+        # Match MenuView._ui_element_anim offset math (linear, with a 100ms hold hidden).
+        t_ms = float(self._intro_ms)
+        if t_ms < PANEL_SLIDE_END_MS:
+            panel_slide_x = -QUEST_RESULTS_PANEL_W
+        elif t_ms < PANEL_SLIDE_START_MS:
+            span = float(PANEL_SLIDE_START_MS - PANEL_SLIDE_END_MS)
+            p = (t_ms - PANEL_SLIDE_END_MS) / span if span > 1e-6 else 1.0
+            panel_slide_x = -((1.0 - p) * QUEST_RESULTS_PANEL_W)
+        else:
+            panel_slide_x = 0.0
 
-        left = (QUEST_RESULTS_PANEL_GEOM_X0 + QUEST_RESULTS_PANEL_POS_X + QUEST_RESULTS_PANEL_BASE_X + panel_slide_x) * scale
+        left = (QUEST_RESULTS_PANEL_GEOM_X0 + QUEST_RESULTS_PANEL_POS_X + panel_slide_x) * scale
         layout_w = screen_w / scale if scale else screen_w
         widescreen_shift_y = _menu_widescreen_y_shift(layout_w)
         top = (QUEST_RESULTS_PANEL_GEOM_Y0 + QUEST_RESULTS_PANEL_POS_Y + widescreen_shift_y) * scale
@@ -328,8 +333,8 @@ class QuestResultsUi:
                 return action
             return None
 
-        self._intro_ms = min(PANEL_SLIDE_DURATION_MS, self._intro_ms + dt_ms)
-        if (not self._panel_open_sfx_played) and play_sfx is not None and self._intro_ms >= PANEL_SLIDE_DURATION_MS - 1e-3:
+        self._intro_ms = min(PANEL_SLIDE_START_MS, self._intro_ms + dt_ms)
+        if (not self._panel_open_sfx_played) and play_sfx is not None and self._intro_ms >= PANEL_SLIDE_START_MS - 1e-3:
             play_sfx("sfx_ui_panelclick")
             self._panel_open_sfx_played = True
         if self._consume_enter:
@@ -507,7 +512,8 @@ class QuestResultsUi:
         panel, left, top = self._panel_layout(screen_w=screen_w, scale=scale)
 
         if self.assets.menu_panel is not None:
-            draw_menu_panel(self.assets.menu_panel, dst=panel, tint=rl.WHITE)
+            fx_detail = bool(int(self.config.data.get("fx_detail_0", 0) or 0))
+            draw_classic_menu_panel(self.assets.menu_panel, dst=panel, tint=rl.WHITE, shadow=fx_detail)
 
         banner_x = left + 22.0 * scale
         banner_y = top + 36.0 * scale

crimson/views/perk_menu_debug.py

@@ -6,6 +6,7 @@ from grim.fonts.small import SmallFontData, load_small_font, measure_small_text_
 from grim.view import View, ViewContext
 
 from ..perks import PERK_BY_ID, PerkId, perk_display_description, perk_display_name
+from ..ui.menu_panel import draw_classic_menu_panel
 from ..ui.perk_menu import (
     PerkMenuAssets,
     PerkMenuLayout,
@@ -14,7 +15,6 @@ from ..ui.perk_menu import (
     button_update,
     button_width,
     cursor_draw,
-    draw_menu_panel,
     draw_menu_item,
     draw_ui_text,
     load_perk_menu_assets,
@@ -336,7 +336,7 @@ class PerkMenuDebugView:
                 )
 
                 if self._assets.menu_panel is not None:
-                    draw_menu_panel(self._assets.menu_panel, dst=computed.panel)
+                    draw_classic_menu_panel(self._assets.menu_panel, dst=computed.panel)
 
                 if self._assets.title_pick_perk is not None:
                     tex = self._assets.title_pick_perk

crimson/views/perks.py

@@ -8,6 +8,7 @@ from grim.view import ViewContext
 from ..game_modes import GameMode
 from ..gameplay import GameplayState, PlayerState, perk_selection_current_choices, perk_selection_pick, survival_check_level_up
 from ..perks import PERK_BY_ID, PerkId, perk_display_description, perk_display_name
+from ..ui.menu_panel import draw_classic_menu_panel
 from ..ui.perk_menu import (
     PerkMenuLayout,
     UiButtonState,
@@ -15,7 +16,6 @@ from ..ui.perk_menu import (
     button_update,
     button_width,
     cursor_draw,
-    draw_menu_panel,
     draw_menu_item,
     draw_ui_text,
     load_perk_menu_assets,
@@ -300,7 +300,7 @@ class PerkSelectionView:
 
         panel_tex = self._ui_assets.menu_panel
         if panel_tex is not None:
-            draw_menu_panel(panel_tex, dst=computed.panel)
+            draw_classic_menu_panel(panel_tex, dst=computed.panel)
 
         title_tex = self._ui_assets.title_pick_perk
         if title_tex is not None: