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

crimson/audio_router.py

@@ -111,7 +111,9 @@ class AudioRouter:
         beam_types: frozenset[int],
         rand: Callable[[], int],
     ) -> str | None:
-        if type_id in beam_types:
+        weapon = WEAPON_BY_ID.get(int(type_id))
+        ammo_class = weapon.ammo_class if weapon is not None else None
+        if ammo_class == 4:
             return "sfx_shock_hit_01"
         return self._rand_choice(rand, _BULLET_HIT_SFX)
 

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/projectiles.py

@@ -65,6 +65,7 @@ class ProjectileTypeId(IntEnum):
     ION_CANNON = 0x17
     SHRINKIFIER = 0x18
     BLADE_GUN = 0x19
+    SPIDER_PLASMA = 0x1A
     PLASMA_CANNON = 0x1C
     SPLITTER_GUN = 0x1D
     PLAGUE_SPREADER = 0x29

crimson/render/world_renderer.py

@@ -17,7 +17,14 @@ from ..effects_atlas import EFFECT_ID_ATLAS_TABLE_BY_ID, SIZE_CODE_GRID
 from ..gameplay import bonus_find_aim_hover_entry, perk_active
 from ..perks import PerkId
 from ..projectiles import ProjectileTypeId
-from ..sim.world_defs import BEAM_TYPES, CREATURE_ANIM, CREATURE_ASSET, KNOWN_PROJ_FRAMES
+from ..sim.world_defs import (
+    BEAM_TYPES,
+    CREATURE_ANIM,
+    CREATURE_ASSET,
+    ION_TYPES,
+    KNOWN_PROJ_FRAMES,
+    PLASMA_PARTICLE_TYPES,
+)
 from ..weapons import WEAPON_BY_ID
 
 if TYPE_CHECKING:
@@ -683,6 +690,366 @@ class WorldRenderer:
             if drawn:
                 return
 
+        if type_id in PLASMA_PARTICLE_TYPES and self.particles_texture is not None:
+            particles_texture = self.particles_texture
+            atlas = EFFECT_ID_ATLAS_TABLE_BY_ID.get(0x0D)
+            if atlas is not None:
+                grid = SIZE_CODE_GRID.get(int(atlas.size_code))
+                if grid:
+                    cell_w = float(particles_texture.width) / float(grid)
+                    cell_h = float(particles_texture.height) / float(grid)
+                    frame = int(atlas.frame)
+                    col = frame % grid
+                    row = frame // grid
+                    src = rl.Rectangle(
+                        cell_w * float(col),
+                        cell_h * float(row),
+                        max(0.0, cell_w - 2.0),
+                        max(0.0, cell_h - 2.0),
+                    )
+
+                    speed_scale = float(getattr(proj, "speed_scale", 1.0))
+                    fx_detail_1 = bool(self.config.data.get("fx_detail_1", 0)) if self.config is not None else True
+
+                    rgb = (1.0, 1.0, 1.0)
+                    spacing = 2.1
+                    seg_limit = 3
+                    tail_size = 12.0
+                    head_size = 16.0
+                    head_alpha_mul = 0.45
+                    aura_rgb = rgb
+                    aura_size = 120.0
+                    aura_alpha_mul = 0.15
+
+                    if type_id == int(ProjectileTypeId.PLASMA_RIFLE):
+                        spacing = 2.5
+                        seg_limit = 8
+                        tail_size = 22.0
+                        head_size = 56.0
+                        aura_size = 256.0
+                        aura_alpha_mul = 0.3
+                    elif type_id == int(ProjectileTypeId.PLASMA_MINIGUN):
+                        spacing = 2.1
+                        seg_limit = 3
+                        tail_size = 12.0
+                        head_size = 16.0
+                        aura_size = 120.0
+                        aura_alpha_mul = 0.15
+                    elif type_id == int(ProjectileTypeId.PLASMA_CANNON):
+                        spacing = 2.6
+                        seg_limit = 18
+                        tail_size = 44.0
+                        head_size = 84.0
+                        aura_size = 256.0
+                        # In the decompile, cannon reuses the tail alpha for the aura (0.4).
+                        aura_alpha_mul = 0.4
+                    elif type_id == int(ProjectileTypeId.SPIDER_PLASMA):
+                        rgb = (0.3, 1.0, 0.3)
+                        aura_rgb = rgb
+                    elif type_id == int(ProjectileTypeId.SHRINKIFIER):
+                        rgb = (0.3, 0.3, 1.0)
+                        aura_rgb = rgb
+
+                    if life >= 0.4:
+                        # Reconstruct the tail length heuristic used by the native render path.
+                        seg_count = int(float(getattr(proj, "base_damage", 0.0)))
+                        if seg_count < 0:
+                            seg_count = 0
+                        seg_count //= 5
+                        if seg_count > seg_limit:
+                            seg_count = seg_limit
+
+                        # The stored projectile angle is rotated by +pi/2 vs travel direction.
+                        dir_x = math.cos(angle + math.pi / 2.0) * speed_scale
+                        dir_y = math.sin(angle + math.pi / 2.0) * speed_scale
+
+                        tail_tint = self._color_from_rgba((rgb[0], rgb[1], rgb[2], alpha * 0.4))
+                        head_tint = self._color_from_rgba((rgb[0], rgb[1], rgb[2], alpha * head_alpha_mul))
+                        aura_tint = self._color_from_rgba((aura_rgb[0], aura_rgb[1], aura_rgb[2], alpha * aura_alpha_mul))
+
+                        rl.begin_blend_mode(rl.BLEND_ADDITIVE)
+
+                        if seg_count > 0:
+                            size = tail_size * scale
+                            origin = rl.Vector2(size * 0.5, size * 0.5)
+                            step_x = dir_x * spacing
+                            step_y = dir_y * spacing
+                            for idx in range(seg_count):
+                                px = pos_x + float(idx) * step_x
+                                py = pos_y + float(idx) * step_y
+                                psx, psy = self.world_to_screen(px, py)
+                                dst = rl.Rectangle(float(psx), float(psy), float(size), float(size))
+                                rl.draw_texture_pro(particles_texture, src, dst, origin, 0.0, tail_tint)
+
+                        size = head_size * scale
+                        origin = rl.Vector2(size * 0.5, size * 0.5)
+                        dst = rl.Rectangle(float(sx), float(sy), float(size), float(size))
+                        rl.draw_texture_pro(particles_texture, src, dst, origin, 0.0, head_tint)
+
+                        if fx_detail_1:
+                            size = aura_size * scale
+                            origin = rl.Vector2(size * 0.5, size * 0.5)
+                            dst = rl.Rectangle(float(sx), float(sy), float(size), float(size))
+                            rl.draw_texture_pro(particles_texture, src, dst, origin, 0.0, aura_tint)
+
+                        rl.end_blend_mode()
+                        return
+
+                    fade = clamp(life * 2.5, 0.0, 1.0)
+                    fade_alpha = fade * alpha
+                    if fade_alpha > 1e-3:
+                        tint = self._color_from_rgba((1.0, 1.0, 1.0, fade_alpha))
+                        size = 56.0 * scale
+                        dst = rl.Rectangle(float(sx), float(sy), float(size), float(size))
+                        origin = rl.Vector2(size * 0.5, size * 0.5)
+                        rl.begin_blend_mode(rl.BLEND_ADDITIVE)
+                        rl.draw_texture_pro(particles_texture, src, dst, origin, 0.0, tint)
+                        rl.end_blend_mode()
+                    return
+
+        if type_id in BEAM_TYPES and texture is not None:
+            # Ion weapons and Fire Bullets use the projs.png streak effect (and Ion adds chain arcs on impact).
+            grid = 4
+            frame = 2
+
+            is_fire_bullets = type_id == int(ProjectileTypeId.FIRE_BULLETS)
+            is_ion = type_id in ION_TYPES
+
+            ox = float(getattr(proj, "origin_x", pos_x))
+            oy = float(getattr(proj, "origin_y", pos_y))
+            dx = pos_x - ox
+            dy = pos_y - oy
+            dist = math.hypot(dx, dy)
+            if dist <= 1e-6:
+                return
+
+            dir_x = dx / dist
+            dir_y = dy / dist
+
+            # In the native renderer, Ion Gun Master increases the chain effect thickness and reach.
+            perk_scale = 1.0
+            if any(perk_active(player, PerkId.ION_GUN_MASTER) for player in self.players):
+                perk_scale = 1.2
+
+            if life >= 0.4:
+                base_alpha = alpha
+                effect_scale = 1.0
+            else:
+                fade = clamp(life * 2.5, 0.0, 1.0)
+                base_alpha = fade * alpha
+                if type_id == int(ProjectileTypeId.ION_MINIGUN):
+                    effect_scale = 1.05
+                elif type_id == int(ProjectileTypeId.ION_RIFLE):
+                    effect_scale = 2.2
+                elif type_id == int(ProjectileTypeId.ION_CANNON):
+                    effect_scale = 3.5
+                else:
+                    effect_scale = 0.8
+
+            if base_alpha <= 1e-3:
+                return
+
+            streak_rgb = (1.0, 0.6, 0.1) if is_fire_bullets else (0.5, 0.6, 1.0)
+            head_rgb = (1.0, 1.0, 0.7)
+
+            # Only draw the last 256 units of the path.
+            start = 0.0
+            span = dist
+            if dist > 256.0:
+                start = dist - 256.0
+                span = 256.0
+
+            step = min(effect_scale * 3.1, 9.0)
+            sprite_scale = effect_scale * scale
+
+            rl.begin_blend_mode(rl.BLEND_ADDITIVE)
+
+            s = start
+            while s < dist:
+                t = (s - start) / span if span > 1e-6 else 1.0
+                seg_alpha = t * base_alpha
+                if seg_alpha > 1e-3:
+                    px = ox + dir_x * s
+                    py = oy + dir_y * s
+                    psx, psy = self.world_to_screen(px, py)
+                    tint = self._color_from_rgba((streak_rgb[0], streak_rgb[1], streak_rgb[2], seg_alpha))
+                    self._draw_atlas_sprite(
+                        texture,
+                        grid=grid,
+                        frame=frame,
+                        x=psx,
+                        y=psy,
+                        scale=sprite_scale,
+                        rotation_rad=angle,
+                        tint=tint,
+                    )
+                s += step
+
+            head_tint = self._color_from_rgba((head_rgb[0], head_rgb[1], head_rgb[2], base_alpha))
+            self._draw_atlas_sprite(
+                texture,
+                grid=grid,
+                frame=frame,
+                x=sx,
+                y=sy,
+                scale=sprite_scale,
+                rotation_rad=angle,
+                tint=head_tint,
+            )
+
+            # Ion-only: impact core + chain arcs. (Fire Bullets renders an extra particles.png overlay in a later pass.)
+            if is_fire_bullets and life >= 0.4 and self.particles_texture is not None:
+                particles_texture = self.particles_texture
+                atlas = EFFECT_ID_ATLAS_TABLE_BY_ID.get(0x0D)
+                if atlas is not None:
+                    grid = SIZE_CODE_GRID.get(int(atlas.size_code))
+                    if grid:
+                        cell_w = float(particles_texture.width) / float(grid)
+                        cell_h = float(particles_texture.height) / float(grid)
+                        frame = int(atlas.frame)
+                        col = frame % grid
+                        row = frame // grid
+                        src = rl.Rectangle(
+                            cell_w * float(col),
+                            cell_h * float(row),
+                            max(0.0, cell_w - 2.0),
+                            max(0.0, cell_h - 2.0),
+                        )
+                        tint = self._color_from_rgba((1.0, 1.0, 1.0, alpha))
+                        size = 64.0 * scale
+                        dst = rl.Rectangle(float(sx), float(sy), float(size), float(size))
+                        origin = rl.Vector2(size * 0.5, size * 0.5)
+                        rl.draw_texture_pro(particles_texture, src, dst, origin, float(angle * _RAD_TO_DEG), tint)
+
+            if is_ion and life < 0.4:
+                core_tint = self._color_from_rgba((0.5, 0.6, 1.0, base_alpha))
+                self._draw_atlas_sprite(
+                    texture,
+                    grid=grid,
+                    frame=frame,
+                    x=sx,
+                    y=sy,
+                    scale=1.0 * scale,
+                    rotation_rad=angle,
+                    tint=core_tint,
+                )
+
+                if type_id == int(ProjectileTypeId.ION_RIFLE):
+                    radius = 88.0
+                elif type_id == int(ProjectileTypeId.ION_MINIGUN):
+                    radius = 60.0
+                else:
+                    radius = 128.0
+                radius *= perk_scale
+
+                # Pick a stable set of targets so the arc visuals don't flicker.
+                candidates: list[tuple[float, object]] = []
+                for creature in self.creatures.entries:
+                    if not creature.active or float(creature.hp) <= 0.0:
+                        continue
+                    if float(getattr(creature, "hitbox_size", 0.0)) < 5.0:
+                        continue
+                    d = math.hypot(float(creature.x) - pos_x, float(creature.y) - pos_y)
+                    threshold = float(creature.size) * 0.142857149 + 3.0
+                    if d > radius + threshold:
+                        continue
+                    candidates.append((d, creature))
+
+                candidates.sort(key=lambda item: item[0])
+                targets = [creature for _d, creature in candidates[:8]]
+
+                inner = 10.0 * perk_scale * scale
+                outer = 14.0 * perk_scale * scale
+                u = 0.625
+                v0 = 0.0
+                v1 = 0.25
+
+                glow_targets: list[object] = []
+                rl.rl_set_texture(texture.id)
+                rl.rl_begin(rl.RL_QUADS)
+
+                for creature in targets:
+                    tx, ty = self.world_to_screen(float(creature.x), float(creature.y))
+                    ddx = tx - sx
+                    ddy = ty - sy
+                    dlen = math.hypot(ddx, ddy)
+                    if dlen <= 1e-3:
+                        continue
+                    glow_targets.append(creature)
+                    inv = 1.0 / dlen
+                    nx = ddx * inv
+                    ny = ddy * inv
+                    px = -ny
+                    py = nx
+
+                    # Outer strip (softer).
+                    half = outer * 0.5
+                    off_x = px * half
+                    off_y = py * half
+                    x0 = sx - off_x
+                    y0 = sy - off_y
+                    x1 = sx + off_x
+                    y1 = sy + off_y
+                    x2 = tx + off_x
+                    y2 = ty + off_y
+                    x3 = tx - off_x
+                    y3 = ty - off_y
+
+                    outer_tint = self._color_from_rgba((0.5, 0.6, 1.0, base_alpha * 0.5))
+                    rl.rl_color4ub(outer_tint.r, outer_tint.g, outer_tint.b, outer_tint.a)
+                    rl.rl_tex_coord2f(u, v0)
+                    rl.rl_vertex2f(x0, y0)
+                    rl.rl_tex_coord2f(u, v1)
+                    rl.rl_vertex2f(x1, y1)
+                    rl.rl_tex_coord2f(u, v1)
+                    rl.rl_vertex2f(x2, y2)
+                    rl.rl_tex_coord2f(u, v0)
+                    rl.rl_vertex2f(x3, y3)
+
+                    # Inner strip (brighter).
+                    half = inner * 0.5
+                    off_x = px * half
+                    off_y = py * half
+                    x0 = sx - off_x
+                    y0 = sy - off_y
+                    x1 = sx + off_x
+                    y1 = sy + off_y
+                    x2 = tx + off_x
+                    y2 = ty + off_y
+                    x3 = tx - off_x
+                    y3 = ty - off_y
+
+                    inner_tint = self._color_from_rgba((0.5, 0.6, 1.0, base_alpha))
+                    rl.rl_color4ub(inner_tint.r, inner_tint.g, inner_tint.b, inner_tint.a)
+                    rl.rl_tex_coord2f(u, v0)
+                    rl.rl_vertex2f(x0, y0)
+                    rl.rl_tex_coord2f(u, v1)
+                    rl.rl_vertex2f(x1, y1)
+                    rl.rl_tex_coord2f(u, v1)
+                    rl.rl_vertex2f(x2, y2)
+                    rl.rl_tex_coord2f(u, v0)
+                    rl.rl_vertex2f(x3, y3)
+
+                rl.rl_end()
+                rl.rl_set_texture(0)
+
+                for creature in glow_targets:
+                    tx, ty = self.world_to_screen(float(creature.x), float(creature.y))
+                    target_tint = self._color_from_rgba((0.5, 0.6, 1.0, base_alpha))
+                    self._draw_atlas_sprite(
+                        texture,
+                        grid=grid,
+                        frame=frame,
+                        x=tx,
+                        y=ty,
+                        scale=sprite_scale,
+                        rotation_rad=0.0,
+                        tint=target_tint,
+                    )
+
+            rl.end_blend_mode()
+            return
+
         mapping = KNOWN_PROJ_FRAMES.get(type_id)
         if texture is None or mapping is None:
             rl.draw_circle(int(sx), int(sy), max(1.0, 3.0 * scale), rl.Color(240, 220, 160, int(255 * alpha + 0.5)))
@@ -699,36 +1066,6 @@ class WorldRenderer:
         elif type_id == ProjectileTypeId.BLADE_GUN:
             color = rl.Color(240, 120, 255, 255)
 
-        if type_id in BEAM_TYPES and life >= 0.4:
-            ox = float(getattr(proj, "origin_x", 0.0))
-            oy = float(getattr(proj, "origin_y", 0.0))
-            dx = float(getattr(proj, "pos_x", 0.0)) - ox
-            dy = float(getattr(proj, "pos_y", 0.0)) - oy
-            dist = math.hypot(dx, dy)
-            if dist > 1e-6:
-                step = 14.0
-                seg_count = max(1, int(dist // step) + 1)
-                dir_x = dx / dist
-                dir_y = dy / dist
-                for idx in range(seg_count):
-                    t = float(idx) / float(max(1, seg_count - 1))
-                    px = ox + dir_x * dist * t
-                    py = oy + dir_y * dist * t
-                    seg_alpha = int(clamp(220.0 * (1.0 - t * 0.75) * alpha, 0.0, 255.0) + 0.5)
-                    tint = rl.Color(color.r, color.g, color.b, seg_alpha)
-                    psx, psy = self.world_to_screen(px, py)
-                    self._draw_atlas_sprite(
-                        texture,
-                        grid=grid,
-                        frame=frame,
-                        x=psx,
-                        y=psy,
-                        scale=0.55 * scale,
-                        rotation_rad=angle,
-                        tint=tint,
-                    )
-                return
-
         alpha_byte = int(clamp(clamp(life / 0.4, 0.0, 1.0) * 255.0 * alpha, 0.0, 255.0) + 0.5)
         tint = rl.Color(color.r, color.g, color.b, alpha_byte)
         self._draw_atlas_sprite(

crimson/sim/world_defs.py

@@ -43,14 +43,25 @@ KNOWN_PROJ_FRAMES: dict[int, tuple[int, int]] = {
     ProjectileTypeId.ION_RIFLE: (4, 2),
 }
 
-BEAM_TYPES = frozenset(
+PLASMA_PARTICLE_TYPES = frozenset(
+    {
+        ProjectileTypeId.PLASMA_RIFLE,
+        ProjectileTypeId.PLASMA_MINIGUN,
+        ProjectileTypeId.PLASMA_CANNON,
+        ProjectileTypeId.SPIDER_PLASMA,
+        ProjectileTypeId.SHRINKIFIER,
+    }
+)
+
+ION_TYPES = frozenset(
     {
         ProjectileTypeId.ION_RIFLE,
         ProjectileTypeId.ION_MINIGUN,
         ProjectileTypeId.ION_CANNON,
-        ProjectileTypeId.SHRINKIFIER,
-        ProjectileTypeId.FIRE_BULLETS,
-        ProjectileTypeId.BLADE_GUN,
-        ProjectileTypeId.SPLITTER_GUN,
     }
 )
+
+FIRE_BULLETS_TYPES = frozenset({ProjectileTypeId.FIRE_BULLETS})
+
+# "Beam" in the original renderer is really the Ion/Fire streak + chain UV family.
+BEAM_TYPES = ION_TYPES | FIRE_BULLETS_TYPES

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.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: crimsonland
-Version: 0.1.0.dev1
+Version: 0.1.0.dev3
 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.dev3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 crimson/__init__.py,sha256=dij6OQ6Wctqur9P00ojTTZw6IaUNeZagPX4-2Qqr-Kw,367
 crimson/assets_fetch.py,sha256=z4vFH9h-RIwc2o6uKGzEtUaOdhUDSX6Art-WU6tNjd0,1864
 crimson/atlas.py,sha256=hEcCHhPvguXAI6eH_G9Q8rpiX7M5akZ8fgJjMogmYrA,2401
-crimson/audio_router.py,sha256=LLCYI9oUoPHbmh_pjW4Ey1Bk33_nNnYK5qwroCbnEPQ,4616
+crimson/audio_router.py,sha256=XauJvjT_qAooPKBo4d8NVe9HRWHzZDD8PCzmsWrASic,4729
 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
@@ -46,7 +46,7 @@ crimson/persistence/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVO
 crimson/persistence/highscores.py,sha256=i3eU_Vlu-Bn6kZHDWNMzUoJXvzkqOnPp_UFOeZXclYU,13026
 crimson/persistence/save_status.py,sha256=s-FZONO6JVYRULewtlxoIwATTy3P7rLy-vsVBfSKPk4,7748
 crimson/player_damage.py,sha256=cECZO65NJwARoYdtsbvZBM8vQNs_8AVO4xa0omX0pGg,2215
-crimson/projectiles.py,sha256=HrT7peHvOAvXAmFyTDGZnn7gm7ZbDGz58WG0tDLCKU8,40104
+crimson/projectiles.py,sha256=rxgfcJcszSMIHv8Y6pxWqZ2sXogiOk8tAQSruLRM8Gc,40129
 crimson/quests/__init__.py,sha256=pKCkH0o1XIGDN9h6yNNaqvWek2CybEZRpejYRooULj8,375
 crimson/quests/helpers.py,sha256=TeZWhIy2x8Zs9S-vYRBOEZ7pkHNMr5YJ-wi4vYQ2q2M,3625
 crimson/quests/registry.py,sha256=Cees1QBN0VYTB-XyQtvZ1b4SykB-i4tAnWF6WSV-1pg,1478
@@ -61,9 +61,9 @@ crimson/quests/timeline.py,sha256=leK898fPt3zq52v-O6dK4c-wJBcY-E6v-y57Fk3kJ3Q,40
 crimson/quests/types.py,sha256=iSrz8VSiRZh1pUDSyq37ir7B28c0HF8DjdF6OJ3FoBo,1772
 crimson/render/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 crimson/render/terrain_fx.py,sha256=MpBV6ukGwGqDluIO86BQhHRVWUvcFOi8MV-z_TfLsiw,2705
-crimson/render/world_renderer.py,sha256=T3aQFa9gonzypiN-jZk-aZtG-pU6I6GazuRuNSx_yLk,58589
+crimson/render/world_renderer.py,sha256=dp6vNsYiH1td6xoxNCgoSC1He-By2sy6RP6rdAp9gSs,73026
 crimson/sim/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
-crimson/sim/world_defs.py,sha256=xkf4NpgSCIR5zmK_sLnoej28XYvDVYSSLcbvxsB2FWQ,1907
+crimson/sim/world_defs.py,sha256=HiMl--THnII3BTpt6mWAd20Xu-SRzCyHcs5pCR8aMbU,2195
 crimson/sim/world_state.py,sha256=kCaNJ28J5OGd_Pg-0Log5IsLjRSeKHeteSrIB7eHPhY,15607
 crimson/terrain_assets.py,sha256=X19LN3EZSkiz4uRvQfra3NtAXKAA8SMQ-nvOBlrspwE,670
 crimson/tutorial/__init__.py,sha256=SDDZKRpkQBqyVMU9U03DN242t8lo8ThLuWHmbVrP69k,333
@@ -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.dev3.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+crimsonland-0.1.0.dev3.dist-info/entry_points.txt,sha256=jzzcExxiE9xpt4Iw2nbB1lwTv2Zj4H14WJTIPMkAjoE,77
+crimsonland-0.1.0.dev3.dist-info/METADATA,sha256=a41mEtPKIFi7ZlCS1FchQjc5Ii6GeGxJM_rJxJDeBns,243
+crimsonland-0.1.0.dev3.dist-info/RECORD,,