crimsonland 0.1.0.dev15__py3-none-any.whl → 0.1.0.dev16__py3-none-any.whl

crimson/demo.py

@@ -12,8 +12,10 @@ from grim.assets import PaqTextureCache, load_paq_entries
 from grim.config import CrimsonConfig
 from grim.fonts.grim_mono import GrimMonoFont, draw_grim_mono_text, load_grim_mono_font
 from grim.fonts.small import SmallFontData, draw_small_text, load_small_font, measure_small_text_width
+from grim.math import clamp, distance_sq
 
 from grim.rand import Crand
+from .creatures.spawn import RANDOM_HEADING_SENTINEL
 from .game_world import GameWorld
 from .gameplay import PlayerInput, PlayerState, weapon_assign_player
 from .ui.cursor import draw_menu_cursor
@@ -65,20 +67,6 @@ def _weapon_name(weapon_id: int) -> str:
     return f"weapon_{weapon_id}"
 
 
-def _clamp(value: float, lo: float, hi: float) -> float:
-    if value < lo:
-        return lo
-    if value > hi:
-        return hi
-    return value
-
-
-def _distance_sq(x0: float, y0: float, x1: float, y1: float) -> float:
-    dx = x1 - x0
-    dy = y1 - y0
-    return dx * dx + dy * dy
-
-
 def _normalize(dx: float, dy: float) -> tuple[float, float, float]:
     d = math.hypot(dx, dy)
     if d <= 1e-6:
@@ -335,7 +323,7 @@ class DemoView:
         #   - per-corner color slots, with a sin^2 pulse at bottom-right
 
         def _to_u8(value: float) -> int:
-            return int(_clamp(value, 0.0, 1.0) * 255.0 + 0.5)
+            return int(clamp(value, 0.0, 1.0) * 255.0 + 0.5)
 
         c0 = rl.Color(_to_u8(0.0), _to_u8(0.0), _to_u8(0.0), _to_u8(1.0))
         c1 = rl.Color(_to_u8(0.0), _to_u8(0.0), _to_u8(0.3), _to_u8(1.0))
@@ -551,12 +539,17 @@ class DemoView:
 
     def _spawn(self, spawn_id: int, x: float, y: float, *, heading: float = 0.0) -> None:
         x, y = self._wrap_pos(x, y)
+        detail_preset = 5
+        if self._world.config is not None:
+            detail_preset = int(self._world.config.data.get("detail_preset", 5) or 5)
         self._world.creatures.spawn_template(
             int(spawn_id),
             (x, y),
             float(heading),
             self._spawn_rng,
             rand=self._spawn_rng.rand,
+            state=self._world.state,
+            detail_preset=detail_preset,
         )
 
     def _setup_variant_0(self) -> None:
@@ -573,8 +566,8 @@ class DemoView:
         i = 0
         while y < 1696:
             col = i % 2
-            self._spawn(0x38, float((col + 2) * 64), float(y), heading=-100.0)
-            self._spawn(0x38, float(col * 64 + 798), float(y), heading=-100.0)
+            self._spawn(0x38, float((col + 2) * 64), float(y), heading=RANDOM_HEADING_SENTINEL)
+            self._spawn(0x38, float(col * 64 + 798), float(y), heading=RANDOM_HEADING_SENTINEL)
             y += 80
             i += 1
 
@@ -592,11 +585,11 @@ class DemoView:
         for idx in range(20):
             x = float(self._crand_mod(200) + 32)
             y = float(self._crand_mod(899) + 64)
-            self._spawn(0x34, x, y, heading=-100.0)
+            self._spawn(0x34, x, y, heading=RANDOM_HEADING_SENTINEL)
             if idx % 3 != 0:
                 x2 = float(self._crand_mod(30) + 32)
                 y2 = float(self._crand_mod(899) + 64)
-                self._spawn(0x35, x2, y2, heading=-100.0)
+                self._spawn(0x35, x2, y2, heading=RANDOM_HEADING_SENTINEL)
 
     def _setup_variant_2(self) -> None:
         self._demo_time_limit_ms = 5000
@@ -607,10 +600,10 @@ class DemoView:
         i = 0
         while y < 848:
             col = i % 2
-            self._spawn(0x41, float(col * 64 + 32), float(y), heading=-100.0)
-            self._spawn(0x41, float((col + 2) * 64), float(y), heading=-100.0)
-            self._spawn(0x41, float(col * 64 - 64), float(y), heading=-100.0)
-            self._spawn(0x41, float((col + 12) * 64), float(y), heading=-100.0)
+            self._spawn(0x41, float(col * 64 + 32), float(y), heading=RANDOM_HEADING_SENTINEL)
+            self._spawn(0x41, float((col + 2) * 64), float(y), heading=RANDOM_HEADING_SENTINEL)
+            self._spawn(0x41, float(col * 64 - 64), float(y), heading=RANDOM_HEADING_SENTINEL)
+            self._spawn(0x41, float((col + 12) * 64), float(y), heading=RANDOM_HEADING_SENTINEL)
             y += 60
             i += 1
 
@@ -706,7 +699,7 @@ class DemoView:
                 rl.draw_circle(int(sx), int(sy), radius, rl.Color(200, 120, 255, 255))
                 continue
             if proj.type_id == 3:
-                t = _clamp(proj.vel_x, 0.0, 1.0)
+                t = clamp(proj.vel_x, 0.0, 1.0)
                 radius = proj.vel_y * t * 80.0
                 alpha = int((1.0 - t) * 180.0)
                 color = rl.Color(200, 120, 255, alpha)
@@ -715,15 +708,15 @@ class DemoView:
         for beam in self._beams:
             x0, y0 = self._world_to_screen(beam.x0, beam.y0)
             x1, y1 = self._world_to_screen(beam.x1, beam.y1)
-            alpha = int(_clamp(beam.life / 0.08, 0.0, 1.0) * 255.0)
+            alpha = int(clamp(beam.life / 0.08, 0.0, 1.0) * 255.0)
             color = rl.Color(120, 220, 255, alpha)
             rl.draw_line_ex(rl.Vector2(x0, y0), rl.Vector2(x1, y1), 2.0 * scale, color)
 
         for fx in self._explosions:
             t = fx.elapsed / fx.duration if fx.duration > 0 else 1.0
-            radius = fx.max_radius * _clamp(t, 0.0, 1.0)
+            radius = fx.max_radius * clamp(t, 0.0, 1.0)
             sx, sy = self._world_to_screen(fx.x, fx.y)
-            alpha = int((1.0 - _clamp(t, 0.0, 1.0)) * 180.0)
+            alpha = int((1.0 - clamp(t, 0.0, 1.0)) * 180.0)
             color = rl.Color(255, 180, 100, alpha) if fx.kind == "rocket" else rl.Color(200, 120, 255, alpha)
             rl.draw_circle_lines(int(sx), int(sy), max(1.0, radius * scale), color)
 
@@ -765,7 +758,7 @@ class DemoView:
             flags = creature.flags
 
             def _to_u8(value: float) -> int:
-                return int(_clamp(value, 0.0, 1.0) * 255.0 + 0.5)
+                return int(clamp(value, 0.0, 1.0) * 255.0 + 0.5)
 
             tint = rl.WHITE
             if creature.tint is not None and any(v is not None for v in creature.tint):
@@ -786,7 +779,7 @@ class DemoView:
                 scale_x,
                 scale_y,
                 tint=tint,
-                size_scale=_clamp(creature.size / 64.0, 0.25, 2.0),
+                size_scale=clamp(creature.size / 64.0, 0.25, 2.0),
             )
 
     def _draw_sprite(
@@ -863,7 +856,7 @@ class DemoView:
             alpha = var_2c * 0.05
         if timeline_ms > limit_ms - 500:
             alpha = float(limit_ms - timeline_ms) * 0.002
-        alpha = _clamp(alpha, 0.0, 1.0)
+        alpha = clamp(alpha, 0.0, 1.0)
 
         scale = 0.8
         text_w = float(len(msg)) * 12.8
@@ -875,9 +868,9 @@ class DemoView:
         bar_x = 64.0
         bar_y = var_2c + 72.0
 
-        bg_alpha = int(round(_clamp(alpha * 0.5, 0.0, 1.0) * 255.0))
-        bar_alpha = int(round(_clamp(alpha * 0.8, 0.0, 1.0) * 255.0))
-        txt_alpha = int(round(_clamp(alpha, 0.0, 1.0) * 255.0))
+        bg_alpha = int(round(clamp(alpha * 0.5, 0.0, 1.0) * 255.0))
+        bar_alpha = int(round(clamp(alpha * 0.8, 0.0, 1.0) * 255.0))
+        txt_alpha = int(round(clamp(alpha, 0.0, 1.0) * 255.0))
 
         rl.draw_rectangle_rec(
             rl.Rectangle(bg_x, bg_y, text_w + 12.0, 30.0),
@@ -886,7 +879,7 @@ class DemoView:
 
         progress = 0.0
         if limit_ms > 0:
-            progress = _clamp(float(timeline_ms) / float(limit_ms), 0.0, 1.0)
+            progress = clamp(float(timeline_ms) / float(limit_ms), 0.0, 1.0)
         rl.draw_rectangle_rec(
             rl.Rectangle(bar_x, bar_y, text_w * progress, 3.0),
             rl.Color(128, 26, 26, bar_alpha),
@@ -1000,7 +993,7 @@ class DemoView:
         for idx, creature in enumerate(self._world.creatures.entries):
             if not (creature.active and creature.hp > 0.0):
                 continue
-            d = _distance_sq(x, y, creature.x, creature.y)
+            d = distance_sq(x, y, creature.x, creature.y)
             if best_idx is None or d < best_dist:
                 best_idx = idx
                 best_dist = d
@@ -1044,7 +1037,7 @@ class DemoView:
         best_idx = None
         best_dist = 0.0
         for idx, player in enumerate(self._players):
-            d = _distance_sq(x, y, player.x, player.y)
+            d = distance_sq(x, y, player.x, player.y)
             if best_idx is None or d < best_dist:
                 best_idx = idx
                 best_dist = d
@@ -1056,7 +1049,7 @@ class DemoView:
         for idx, creature in enumerate(self._creatures):
             if creature.hp <= 0.0:
                 continue
-            d = _distance_sq(x, y, creature.x, creature.y)
+            d = distance_sq(x, y, creature.x, creature.y)
             if best_idx is None or d < best_dist:
                 best_idx = idx
                 best_dist = d
@@ -1082,7 +1075,7 @@ class DemoView:
             spawn_events.append((child_template_id, owner.x, owner.y))
 
         for child_template_id, x, y in spawn_events:
-            self._spawn(child_template_id, x, y, heading=-100.0)
+            self._spawn(child_template_id, x, y, heading=RANDOM_HEADING_SENTINEL)
 
     def _update_creatures(self, dt: float, dt_ms: int) -> None:
         if not self._creatures or not self._players:
@@ -1136,8 +1129,8 @@ class DemoView:
             creature.vy = direction_y * dt * creature.move_scale * speed
 
             radius = max(0.0, creature.size)
-            creature.x = _clamp(creature.x + creature.vx, radius, WORLD_SIZE - radius)
-            creature.y = _clamp(creature.y + creature.vy, radius, WORLD_SIZE - radius)
+            creature.x = clamp(creature.x + creature.vx, radius, WORLD_SIZE - radius)
+            creature.y = clamp(creature.y + creature.vy, radius, WORLD_SIZE - radius)
 
     def _select_player_target(self, player: DemoPlayer) -> int | None:
         candidate = self._nearest_creature_index(player.x, player.y)
@@ -1218,8 +1211,8 @@ class DemoView:
             speed = 150.0
             player.vx = mnx * speed
             player.vy = mny * speed
-            player.x = _clamp(player.x + player.vx * dt, 0.0, WORLD_SIZE)
-            player.y = _clamp(player.y + player.vy * dt, 0.0, WORLD_SIZE)
+            player.x = clamp(player.x + player.vx * dt, 0.0, WORLD_SIZE)
+            player.y = clamp(player.y + player.vy * dt, 0.0, WORLD_SIZE)
 
             self._player_fire(player, target)
 
@@ -1367,12 +1360,12 @@ class DemoView:
 
     def _apply_explosion_damage(self, fx: DemoExplosion) -> None:
         t = fx.elapsed / fx.duration if fx.duration > 0 else 1.0
-        radius = fx.max_radius * _clamp(t, 0.0, 1.0)
+        radius = fx.max_radius * clamp(t, 0.0, 1.0)
         rsq = radius * radius
         for creature in self._creatures:
             if creature.hp <= 0.0:
                 continue
-            if _distance_sq(fx.x, fx.y, creature.x, creature.y) <= rsq:
+            if distance_sq(fx.x, fx.y, creature.x, creature.y) <= rsq:
                 creature.hp -= fx.damage_per_tick
 
     def _update_camera(self, dt: float) -> None:
@@ -1406,6 +1399,6 @@ class DemoView:
         if desired_y < min_y:
             desired_y = min_y
 
-        t = _clamp(dt * 6.0, 0.0, 1.0)
+        t = clamp(dt * 6.0, 0.0, 1.0)
         self._camera_x = _lerp(self._camera_x, desired_x, t)
         self._camera_y = _lerp(self._camera_y, desired_y, t)

crimson/effects.py

@@ -4,6 +4,8 @@ from dataclasses import dataclass
 import math
 from typing import Callable, Protocol
 
+from grim.math import clamp
+
 __all__ = [
     "FX_QUEUE_CAPACITY",
     "FX_QUEUE_MAX_COUNT",
@@ -35,14 +37,6 @@ FX_QUEUE_ROTATED_CAPACITY = 0x40
 FX_QUEUE_ROTATED_MAX_COUNT = 0x3F
 
 
-def _clamp(value: float, lo: float, hi: float) -> float:
-    if value < lo:
-        return lo
-    if value > hi:
-        return hi
-    return value
-
-
 def _default_rand() -> int:
     return 0
 
@@ -256,7 +250,7 @@ class ParticlePool:
                 entry.vel_x = math.cos(entry.angle) * speed
                 entry.vel_y = math.sin(entry.angle) * speed
 
-            alpha = _clamp(entry.intensity, 0.0, 1.0)
+            alpha = clamp(entry.intensity, 0.0, 1.0)
             shade = 1.0 - max(entry.intensity, 0.0) * 0.95
             entry.age = alpha
             entry.scale_x = shade
@@ -305,10 +299,10 @@ class ParticlePool:
                         tint_sum = float(getattr(creature, "tint_r", 1.0)) + float(getattr(creature, "tint_g", 1.0)) + float(getattr(creature, "tint_b", 1.0))
                         if tint_sum > 1.6:
                             factor = 1.0 - max(entry.intensity, 0.0) * 0.01
-                            creature.tint_r = _clamp(float(getattr(creature, "tint_r", 1.0)) * factor, 0.0, 1.0)
-                            creature.tint_g = _clamp(float(getattr(creature, "tint_g", 1.0)) * factor, 0.0, 1.0)
-                            creature.tint_b = _clamp(float(getattr(creature, "tint_b", 1.0)) * factor, 0.0, 1.0)
-                            creature.tint_a = _clamp(float(getattr(creature, "tint_a", 1.0)) * factor, 0.0, 1.0)
+                            creature.tint_r = clamp(float(getattr(creature, "tint_r", 1.0)) * factor, 0.0, 1.0)
+                            creature.tint_g = clamp(float(getattr(creature, "tint_g", 1.0)) * factor, 0.0, 1.0)
+                            creature.tint_b = clamp(float(getattr(creature, "tint_b", 1.0)) * factor, 0.0, 1.0)
+                            creature.tint_a = clamp(float(getattr(creature, "tint_a", 1.0)) * factor, 0.0, 1.0)
 
         return expired
 

crimson/frontend/high_scores_layout.py

@@ -24,3 +24,84 @@ HS_BUTTON_STEP_Y = 33.0
 
 HS_BACK_BUTTON_X = 400.0  # x0=302
 HS_BACK_BUTTON_Y = 301.0  # y0=495
+
+# Quest-mode high score selector arrow (left panel).
+# state_14:High scores - Quests: ui_arrow.jaz bbox [351,256]..[383,272]
+# left panel top-left at 1024x768 is (-98,194).
+HS_QUEST_ARROW_X = 449.0
+HS_QUEST_ARROW_Y = 62.0
+
+# Right panel (Quests): options + dropdown widgets.
+# right panel top-left at 1024x768 is (630,209).
+HS_RIGHT_CHECK_X = 44.0  # ui_checkOn bbox [674,253]..[690,269]
+HS_RIGHT_CHECK_Y = 44.0
+HS_RIGHT_SHOW_INTERNET_X = 66.0  # "Show internet scores" at (696,254)
+HS_RIGHT_SHOW_INTERNET_Y = 45.0
+
+HS_RIGHT_NUMBER_PLAYERS_X = 46.0  # "Number of players" at (676,273)
+HS_RIGHT_NUMBER_PLAYERS_Y = 64.0
+HS_RIGHT_GAME_MODE_X = 174.0  # "Game mode" at (804,273)
+HS_RIGHT_GAME_MODE_Y = 64.0
+HS_RIGHT_SHOW_SCORES_X = 44.0  # "Show scores:" at (674,315)
+HS_RIGHT_SHOW_SCORES_Y = 106.0
+HS_RIGHT_SCORE_LIST_X = 44.0  # "Selected score list:" at (674,359)
+HS_RIGHT_SCORE_LIST_Y = 150.0
+
+# Closed dropdown widgets (borders + value text + arrow icon).
+HS_RIGHT_PLAYER_COUNT_WIDGET_X = 46.0  # x=676
+HS_RIGHT_PLAYER_COUNT_WIDGET_Y = 78.0  # y=287
+HS_RIGHT_PLAYER_COUNT_WIDGET_W = 102.0
+HS_RIGHT_PLAYER_COUNT_VALUE_X = 50.0  # "1 player" at (680,288)
+HS_RIGHT_PLAYER_COUNT_VALUE_Y = 79.0
+HS_RIGHT_PLAYER_COUNT_DROP_X = 131.0  # ui_dropOff bbox [761,287]..[777,303]
+HS_RIGHT_PLAYER_COUNT_DROP_Y = 78.0
+
+HS_RIGHT_GAME_MODE_WIDGET_X = 174.0  # x=804
+HS_RIGHT_GAME_MODE_WIDGET_Y = 78.0  # y=287
+HS_RIGHT_GAME_MODE_WIDGET_W = 95.0
+HS_RIGHT_GAME_MODE_VALUE_X = 178.0  # "Quests" at (808,288)
+HS_RIGHT_GAME_MODE_VALUE_Y = 79.0
+HS_RIGHT_GAME_MODE_DROP_X = 252.0  # ui_dropOff bbox [882,287]..[898,303]
+HS_RIGHT_GAME_MODE_DROP_Y = 78.0
+
+HS_RIGHT_SHOW_SCORES_WIDGET_X = 44.0  # x=674
+HS_RIGHT_SHOW_SCORES_WIDGET_Y = 120.0  # y=329
+HS_RIGHT_SHOW_SCORES_WIDGET_W = 134.0
+HS_RIGHT_SHOW_SCORES_VALUE_X = 48.0  # "Best of all time" at (678,330)
+HS_RIGHT_SHOW_SCORES_VALUE_Y = 121.0
+HS_RIGHT_SHOW_SCORES_DROP_X = 161.0  # ui_dropOff bbox [791,329]..[807,345]
+HS_RIGHT_SHOW_SCORES_DROP_Y = 120.0
+
+HS_RIGHT_SCORE_LIST_WIDGET_X = 44.0  # x=674
+HS_RIGHT_SCORE_LIST_WIDGET_Y = 164.0  # y=373
+HS_RIGHT_SCORE_LIST_WIDGET_W = 174.0
+HS_RIGHT_SCORE_LIST_VALUE_X = 48.0  # "default" at (678,374)
+HS_RIGHT_SCORE_LIST_VALUE_Y = 165.0
+HS_RIGHT_SCORE_LIST_DROP_X = 201.0  # ui_dropOff bbox [831,373]..[847,389]
+HS_RIGHT_SCORE_LIST_DROP_Y = 164.0
+
+# Right panel (Survival): local score details + weapon icon.
+HS_LOCAL_NAME_X = 78.0  # "banteg" at (708,253)
+HS_LOCAL_NAME_Y = 44.0
+HS_LOCAL_LABEL_X = 78.0  # "Local score" at (708,267)
+HS_LOCAL_LABEL_Y = 58.0
+HS_LOCAL_DATE_X = 193.0  # "31. Jan 2026" at (823,281)
+HS_LOCAL_DATE_Y = 72.0
+HS_LOCAL_SCORE_LABEL_X = 105.0  # "Score" at (735,299)
+HS_LOCAL_SCORE_LABEL_Y = 90.0
+HS_LOCAL_TIME_LABEL_X = 192.0  # "Game time" at (822,299)
+HS_LOCAL_TIME_LABEL_Y = 90.0
+HS_LOCAL_SCORE_VALUE_X = 105.0  # "27874" at (735,314)
+HS_LOCAL_SCORE_VALUE_Y = 105.0
+HS_LOCAL_TIME_VALUE_X = 226.0  # "3:28" at (856,318)
+HS_LOCAL_TIME_VALUE_Y = 109.0
+HS_LOCAL_RANK_X = 94.0  # "Rank: 2nd" at (724,329)
+HS_LOCAL_RANK_Y = 120.0
+HS_LOCAL_WICON_X = 90.0  # ui_wicons bbox [720,355]..[784,387]
+HS_LOCAL_WICON_Y = 146.0
+HS_LOCAL_FRAGS_X = 200.0  # "Frags: 441" at (830,356)
+HS_LOCAL_FRAGS_Y = 147.0
+HS_LOCAL_HIT_X = 200.0  # "Hit %: 64%" at (830,370)
+HS_LOCAL_HIT_Y = 161.0
+HS_LOCAL_WEAPON_X = 90.0  # "Sawed-off Shotgun" at (720,387)
+HS_LOCAL_WEAPON_Y = 178.0

crimson/frontend/panels/base.py

@@ -179,7 +179,7 @@ class PanelMenuView:
         self._draw_panel()
         self._draw_entry(entry)
         self._draw_sign()
-        self._draw_title_text()
+        self._draw_contents()
         _draw_menu_cursor(self._state, pulse_time=self._cursor_pulse_time)
 
     def take_action(self) -> str | None:
@@ -187,6 +187,9 @@ class PanelMenuView:
         self._pending_action = None
         return action
 
+    def _draw_contents(self) -> None:
+        self._draw_title_text()
+
     def _draw_title_text(self) -> None:
         x = 32
         y = 140

crimson/frontend/panels/controls.py

@@ -12,9 +12,7 @@ from ..menu import (
     MENU_PANEL_HEIGHT,
     MENU_PANEL_WIDTH,
     MenuView,
-    _draw_menu_cursor,
 )
-from ..transitions import _draw_screen_fade
 from ...ui.menu_panel import draw_classic_menu_panel
 from .base import PANEL_TIMELINE_END_MS, PANEL_TIMELINE_START_MS, PanelMenuView
 from ...input_codes import config_keybinds, input_code_name, player_move_fire_binds
@@ -61,19 +59,6 @@ class ControlsMenuView(PanelMenuView):
         self._check_on = cache.get_or_load("ui_checkOn", "ui/ui_checkOn.jaz").texture
         self._check_off = cache.get_or_load("ui_checkOff", "ui/ui_checkOff.jaz").texture
 
-    def draw(self) -> None:
-        self._draw_background()
-        _draw_screen_fade(self._state)
-        assets = self._assets
-        entry = self._entry
-        if assets is None or entry is None:
-            return
-        self._draw_panel()
-        self._draw_entry(entry)
-        self._draw_sign()
-        self._draw_contents()
-        _draw_menu_cursor(self._state, pulse_time=self._cursor_pulse_time)
-
     def _ensure_small_font(self) -> SmallFontData:
         if self._small_font is not None:
             return self._small_font