crimsonland 0.1.0.dev1__py3-none-any.whl → 0.1.0.dev2__py3-none-any.whl

crimson/cli.py

@@ -202,8 +202,9 @@ def cmd_view(
     run_view(view, width=width, height=height, title=title, fps=fps)
 
 
-@app.command("game")
+@app.callback(invoke_without_command=True)
 def cmd_game(
+    ctx: typer.Context,
     width: int | None = typer.Option(None, help="window width (default: use crimson.cfg)"),
     height: int | None = typer.Option(None, help="window height (default: use crimson.cfg)"),
     fps: int = typer.Option(60, help="target fps"),
@@ -221,7 +222,9 @@ def cmd_game(
         help="assets root (default: base-dir; missing .paq files are downloaded)",
     ),
 ) -> None:
-    """Run the reimplementation game flow."""
+    """Run the reimplementation game flow (default command)."""
+    if ctx.invoked_subcommand:
+        return
     from .game import GameConfig, run_game
 
     config = GameConfig(

crimson/views/arsenal_debug.py

@@ -5,9 +5,7 @@ import random
 
 import pyray as rl
 
-from grim.audio import AudioState, init_audio_state, shutdown_audio, update_audio
-from grim.config import ensure_crimson_cfg
-from grim.console import ConsoleLog, ConsoleState
+from grim.audio import AudioState, shutdown_audio, update_audio
 from grim.fonts.small import SmallFontData, draw_small_text, load_small_font
 from grim.view import View, ViewContext
 
@@ -15,7 +13,6 @@ from ..creatures.spawn import SpawnId
 from ..game_modes import GameMode
 from ..game_world import GameWorld
 from ..gameplay import PlayerInput, weapon_assign_player
-from ..paths import default_runtime_dir
 from ..projectiles import ProjectileTypeId
 from ..ui.cursor import draw_aim_cursor
 from ..weapon_sfx import resolve_weapon_sfx_ref
@@ -25,6 +22,7 @@ from ..weapons import (
     Weapon,
     projectile_type_id_from_weapon_id,
 )
+from .audio_bootstrap import init_view_audio
 from .registry import register_view
 
 
@@ -284,32 +282,13 @@ class ArsenalDebugView:
         except Exception:
             self._small = None
 
-        runtime_dir = default_runtime_dir()
-        if runtime_dir.is_dir():
-            try:
-                self._world.config = ensure_crimson_cfg(runtime_dir)
-            except Exception:
-                self._world.config = None
-        else:
-            self._world.config = None
-
-        if self._world.config is not None:
-            try:
-                self._console = ConsoleState(
-                    base_dir=runtime_dir,
-                    log=ConsoleLog(base_dir=runtime_dir),
-                    assets_dir=self._assets_root,
-                )
-                self._audio = init_audio_state(self._world.config, self._assets_root, self._console)
-                self._audio_rng = random.Random(0xBEEF)
-                self._world.audio = self._audio
-                self._world.audio_rng = self._audio_rng
-            except Exception:
-                self._audio = None
-                self._audio_rng = None
-                self._console = None
-                self._world.audio = None
-                self._world.audio_rng = None
+        bootstrap = init_view_audio(self._assets_root)
+        self._world.config = bootstrap.config
+        self._console = bootstrap.console
+        self._audio = bootstrap.audio
+        self._audio_rng = bootstrap.audio_rng
+        self._world.audio = self._audio
+        self._world.audio_rng = self._audio_rng
 
         self._world.open()
         self._aim_texture = self._world._load_texture(

crimson/views/audio_bootstrap.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+import random
+
+from grim.audio import AudioState, init_audio_state
+from grim.config import CrimsonConfig, ensure_crimson_cfg
+from grim.console import ConsoleLog, ConsoleState
+
+from ..assets_fetch import download_missing_paqs
+from ..paths import default_runtime_dir
+
+
+@dataclass(slots=True)
+class ViewAudioBootstrap:
+    config: CrimsonConfig | None
+    console: ConsoleState | None
+    audio: AudioState | None
+    audio_rng: random.Random | None
+
+
+def init_view_audio(assets_dir: Path, *, seed: int = 0xBEEF) -> ViewAudioBootstrap:
+    runtime_dir = default_runtime_dir()
+    runtime_dir.mkdir(parents=True, exist_ok=True)
+    try:
+        config = ensure_crimson_cfg(runtime_dir)
+    except Exception:
+        return ViewAudioBootstrap(None, None, None, None)
+
+    console = ConsoleState(
+        base_dir=runtime_dir,
+        log=ConsoleLog(base_dir=runtime_dir),
+        assets_dir=assets_dir,
+    )
+    try:
+        download_missing_paqs(assets_dir, console)
+    except Exception as exc:
+        console.log.log(f"assets: download failed: {exc}")
+        console.log.flush()
+
+    try:
+        audio = init_audio_state(config, assets_dir, console)
+    except Exception:
+        return ViewAudioBootstrap(config, console, None, None)
+
+    return ViewAudioBootstrap(config, console, audio, random.Random(seed))

crimson/views/projectile_render_debug.py

@@ -6,17 +6,15 @@ import random
 
 import pyray as rl
 
-from grim.audio import AudioState, init_audio_state, shutdown_audio
-from grim.config import ensure_crimson_cfg
-from grim.console import ConsoleLog, ConsoleState
+from grim.audio import AudioState, shutdown_audio
 from grim.fonts.small import SmallFontData, draw_small_text, load_small_font
 from grim.view import View, ViewContext
 
 from ..game_world import GameWorld
 from ..gameplay import PlayerInput, player_update, weapon_assign_player
-from ..paths import default_runtime_dir
 from ..ui.cursor import draw_aim_cursor
 from ..weapons import WEAPON_TABLE
+from .audio_bootstrap import init_view_audio
 from .registry import register_view
 
 
@@ -203,32 +201,13 @@ class ProjectileRenderDebugView:
         except Exception:
             self._small = None
 
-        runtime_dir = default_runtime_dir()
-        if runtime_dir.is_dir():
-            try:
-                self._world.config = ensure_crimson_cfg(runtime_dir)
-            except Exception:
-                self._world.config = None
-        else:
-            self._world.config = None
-
-        if self._world.config is not None:
-            try:
-                self._console = ConsoleState(
-                    base_dir=runtime_dir,
-                    log=ConsoleLog(base_dir=runtime_dir),
-                    assets_dir=self._assets_root,
-                )
-                self._audio = init_audio_state(self._world.config, self._assets_root, self._console)
-                self._audio_rng = random.Random(0xBEEF)
-                self._world.audio = self._audio
-                self._world.audio_rng = self._audio_rng
-            except Exception:
-                self._audio = None
-                self._audio_rng = None
-                self._console = None
-                self._world.audio = None
-                self._world.audio_rng = None
+        bootstrap = init_view_audio(self._assets_root)
+        self._world.config = bootstrap.config
+        self._console = bootstrap.console
+        self._audio = bootstrap.audio
+        self._audio_rng = bootstrap.audio_rng
+        self._world.audio = self._audio
+        self._world.audio_rng = self._audio_rng
 
         self._world.open()
         self._aim_texture = self._world._load_texture(

{crimsonland-0.1.0.dev1.dist-info → crimsonland-0.1.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: crimsonland
-Version: 0.1.0.dev1
+Version: 0.1.0.dev2
 Requires-Dist: construct>=2.10.70
 Requires-Dist: pillow>=12.1.0
 Requires-Dist: platformdirs>=4.5.1

{crimsonland-0.1.0.dev1.dist-info → crimsonland-0.1.0.dev2.dist-info}/RECORD

@@ -4,7 +4,7 @@ crimson/atlas.py,sha256=hEcCHhPvguXAI6eH_G9Q8rpiX7M5akZ8fgJjMogmYrA,2401
 crimson/audio_router.py,sha256=LLCYI9oUoPHbmh_pjW4Ey1Bk33_nNnYK5qwroCbnEPQ,4616
 crimson/bonuses.py,sha256=owwYIRHRu1Kymtt4eEvpd62JwWAg8LOe20vDuPFB5SU,5094
 crimson/camera.py,sha256=VxTNXTh0qHh5VR1OpkiXr-QcgEWPrWw0A3PFyQFqDkY,2278
-crimson/cli.py,sha256=UbDqUVPoOvh2udY_uxJ6yvQLpVEBkG-1YhBudKcoKDM,14485
+crimson/cli.py,sha256=Pu4RM_bjGtUgIE_5zZs0uWFY9O8YkhJDseRcVMMPJ8k,14595
 crimson/creatures/__init__.py,sha256=RJwwR_w98zC_kHF9CwkhzSlf0xjpiP0JU87W4awdAAM,233
 crimson/creatures/ai.py,sha256=oCuUkDe6Kxya1dThUthEy8GIuObAUjDv8WPfe17HYV4,6353
 crimson/creatures/anim.py,sha256=E7MAR9vFBrvmIYrOfPr36UohsfROZZL00jgRvZQf6nc,4971
@@ -82,7 +82,8 @@ crimson/ui/perk_menu.py,sha256=FdbwG_B7UyZmPVdvZho0nJNvkAVc0VVHM2TSrY4eTfM,12740
 crimson/views/__init__.py,sha256=1UWCzBSsgIeOtcKxqM4Vf12JEfPHKfb9KRZgl2TB84Q,1880
 crimson/views/aim_debug.py,sha256=2ldQ1MJO8AeG0i9x4ZJ3YLyp1X-HY_nJ0E1mY8jFF7Q,10873
 crimson/views/animations.py,sha256=iI6uTpYS-lbjnpqz_ihETm5q09V6RqjO7YHqaGjovPc,10660
-crimson/views/arsenal_debug.py,sha256=MOpQObtuXN43W53GzFBr5l_BC0l7hfkee4237AGvXAQ,14554
+crimson/views/arsenal_debug.py,sha256=BWxjrrVF2dP5aa6GSaihzbNDIIS0OOXNyxgyvwqm4RU,13713
+crimson/views/audio_bootstrap.py,sha256=a2qM91biyI-LlSiIhEceJ8ptYJy-xQ2-b-YjeyXWx7w,1408
 crimson/views/bonuses.py,sha256=dbGx0IBjMMpqrnuVjBUkscxHq6uErCxAkEAb3uDhFqQ,7454
 crimson/views/camera_debug.py,sha256=Vi6jANGQpXMK0bpL7hX_QQI_6Rl97ykElaoAuXd06YY,14025
 crimson/views/camera_shake.py,sha256=miYxPJcVChv5P2AdbAWTEsrjZR0SAszqClLMbmrgg-0,8148
@@ -99,7 +100,7 @@ crimson/views/perks.py,sha256=Uac31DVvHZvjDmMrHpfvkg7LVpXw76xKL1BqwaLAsHU,15052
 crimson/views/player.py,sha256=pj1_hFZ7VRUDfZYdUI1b-EpA7FdoBhhKM3Jk4x4s-GI,16540
 crimson/views/player_sprite_debug.py,sha256=DDU6kl9sfhZ2nVXzBbsPSUKdIutHf5YNs2DrNQPRb2Q,11158
 crimson/views/projectile_fx.py,sha256=XIp3Zq82Pz6g-B30qa6-nlKF_dseLNoQNSUPhj9Y4i8,23148
-crimson/views/projectile_render_debug.py,sha256=kgfNXwd-p8htPXQRKwFOky9wSUnXeoQHoPUmgOFpm3Y,14889
+crimson/views/projectile_render_debug.py,sha256=CBSkUbflOSdrauyX1WucZ96CdYVBt_2QmGlx7i-KijM,14048
 crimson/views/projectiles.py,sha256=k5zD_9614_-M4qYpnwKUS23fUUrjJS2Wzm7ZalOSKnU,8067
 crimson/views/quest_title_overlay.py,sha256=EbMvXvYqagLLXmhaM7PC0fhxxhHGYGYI2ytgYiWqAd4,3338
 crimson/views/registry.py,sha256=Kxc_aQMWOAjI6Uq_SRkb0AmYQxyVmM6rxT3UF74irzs,930
@@ -132,7 +133,7 @@ grim/sfx.py,sha256=cpn2Mmeio7BSDgbStSft-eZchO9Ot2MrK6iXJqxlLqU,7836
 grim/sfx_map.py,sha256=FM5iBzKkG30Vtu78SRavVNgXMbGK7ZFcQ8i6lgMlzVw,4697
 grim/terrain_render.py,sha256=EZ7ySYJyTZwXcrJx1mKbY3ewZtPi7Y270XnZgGJyZG8,31509
 grim/view.py,sha256=oF4pHZehBqOxPjKMU28TDg3qATh_amMIRJp-vMQnpn4,334
-crimsonland-0.1.0.dev1.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-crimsonland-0.1.0.dev1.dist-info/entry_points.txt,sha256=jzzcExxiE9xpt4Iw2nbB1lwTv2Zj4H14WJTIPMkAjoE,77
-crimsonland-0.1.0.dev1.dist-info/METADATA,sha256=haZKto26DpNaPBn-jCWBUGh1XcAECPOoe5q_rsNHOMs,243
-crimsonland-0.1.0.dev1.dist-info/RECORD,,
+crimsonland-0.1.0.dev2.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+crimsonland-0.1.0.dev2.dist-info/entry_points.txt,sha256=jzzcExxiE9xpt4Iw2nbB1lwTv2Zj4H14WJTIPMkAjoE,77
+crimsonland-0.1.0.dev2.dist-info/METADATA,sha256=v1L2sbICNVlC-4x6fodRwHtT2l4PGNP52yffTJEtcpw,243
+crimsonland-0.1.0.dev2.dist-info/RECORD,,