crimsonland 0.1.0.dev1__tar.gz → 0.1.0.dev7__tar.gz

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/PKG-INFO

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

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "crimsonland"
-version = "0.1.0.dev1"
+version = "0.1.0.dev7"
 requires-python = ">=3.13"
 dependencies = [
     "construct>=2.10.70",

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/src/crimson/audio_router.py

@@ -9,7 +9,7 @@ from grim.audio import AudioState, play_sfx, trigger_game_tune
 from .creatures.spawn import CreatureTypeId
 from .game_modes import GameMode
 from .weapon_sfx import resolve_weapon_sfx_ref
-from .weapons import WEAPON_BY_ID
+from .weapons import WEAPON_BY_ID, WeaponId
 
 _MAX_HIT_SFX_PER_FRAME = 4
 _MAX_DEATH_SFX_PER_FRAME = 3
@@ -96,7 +96,17 @@ class AudioRouter:
             return
 
         if int(getattr(player, "shot_seq", 0)) > int(prev_shot_seq):
-            self.play_sfx(resolve_weapon_sfx_ref(weapon.fire_sound))
+            if float(getattr(player, "fire_bullets_timer", 0.0)) > 0.0:
+                # player_update (crimsonland.exe): when Fire Bullets is active, the regular per-weapon
+                # shot sfx is suppressed and replaced by Fire Bullets + Plasma Minigun fire sfx.
+                fire_bullets = WEAPON_BY_ID.get(int(WeaponId.FIRE_BULLETS))
+                plasma_minigun = WEAPON_BY_ID.get(int(WeaponId.PLASMA_MINIGUN))
+                if fire_bullets is not None:
+                    self.play_sfx(resolve_weapon_sfx_ref(fire_bullets.fire_sound))
+                if plasma_minigun is not None:
+                    self.play_sfx(resolve_weapon_sfx_ref(plasma_minigun.fire_sound))
+            else:
+                self.play_sfx(resolve_weapon_sfx_ref(weapon.fire_sound))
 
         reload_active = bool(getattr(player, "reload_active", False))
         reload_timer = float(getattr(player, "reload_timer", 0.0))
@@ -111,7 +121,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)
 

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/src/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(

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/src/crimson/demo.py

@@ -690,8 +690,8 @@ 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.lifetime, 0.0, 1.0)
-                radius = proj.speed * t * 80.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)
                 rl.draw_circle_lines(int(sx), int(sy), max(1.0, radius * scale), color)

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/src/crimson/effects.py

@@ -261,7 +261,7 @@ class ParticlePool:
             entry.age = alpha
             entry.scale_x = shade
             entry.scale_y = shade
-            entry.scale_z = shade
+            # Native only updates scale_x/scale_y; scale_z stays at its spawn value (1.0).
 
             alive = entry.intensity > (0.0 if style == 0 else 0.8)
             if not alive:

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/src/crimson/game_world.py

@@ -31,7 +31,7 @@ from .render.world_renderer import WorldRenderer
 from .audio_router import AudioRouter
 from .perks import PerkId
 from .projectiles import ProjectileTypeId
-from .sim.world_defs import BEAM_TYPES, CREATURE_ASSET
+from .sim.world_defs import BEAM_TYPES, CREATURE_ASSET, ION_TYPES
 from .sim.world_state import ProjectileHit, WorldState
 from .weapons import WEAPON_TABLE
 from .game_modes import GameMode
@@ -510,19 +510,8 @@ class GameWorld:
                         pos_y=float(target_y) + dir_y * dist * 20.0,
                         rand=rand,
                     )
-            elif type_id in BEAM_TYPES:
-                if self.ground is not None and self.fx_textures is not None:
-                    size = float(int(rand()) % 18 + 18)
-                    rotation = float(int(rand()) % 628) * 0.01
-                    self.fx_queue.add(
-                        effect_id=0x01,
-                        pos_x=float(hit_x),
-                        pos_y=float(hit_y),
-                        width=size,
-                        height=size,
-                        rotation=rotation,
-                        rgba=(0.7, 0.9, 1.0, 1.0),
-                    )
+            elif type_id in ION_TYPES:
+                pass
             elif not freeze_active:
                 for _ in range(3):
                     spread = float(int(rand()) % 0x14 - 10) * 0.1

{crimsonland-0.1.0.dev1 → crimsonland-0.1.0.dev7}/src/crimson/gameplay.py

@@ -64,8 +64,8 @@ class PlayerState:
     health: float = 100.0
     size: float = 50.0
 
-    move_speed_multiplier: float = 2.0
-    long_distance_runner_timer: float = 0.0
+    speed_multiplier: float = 2.0
+    move_speed: float = 0.0
     move_phase: float = 0.0
     heading: float = 0.0
     death_timer: float = 16.0
@@ -358,11 +358,49 @@ class BonusPool:
             return None
 
         rng = state.rng
-        if rng.rand() % 9 != 1:
-            if not any(perk_active(player, PerkId.BONUS_MAGNET) for player in players):
-                return None
-            if rng.rand() % 10 != 2:
-                return None
+        # Native special-case: while any player has Pistol, 3/4 chance to force a Weapon drop.
+        if players and any(int(player.weapon_id) == int(WeaponId.PISTOL) for player in players):
+            if (int(rng.rand()) & 3) < 3:
+                entry = self.spawn_at_pos(
+                    pos_x,
+                    pos_y,
+                    state=state,
+                    players=players,
+                    world_width=world_width,
+                    world_height=world_height,
+                )
+                if entry is None:
+                    return None
+
+                entry.bonus_id = int(BonusId.WEAPON)
+                weapon_id = int(weapon_pick_random_available(state))
+                entry.amount = int(weapon_id)
+                if weapon_id == int(WeaponId.PISTOL):
+                    weapon_id = int(weapon_pick_random_available(state))
+                    entry.amount = int(weapon_id)
+
+                matches = sum(1 for bonus in self._entries if bonus.bonus_id == entry.bonus_id)
+                if matches > 1:
+                    self._clear_entry(entry)
+                    return None
+
+                if entry.amount == int(WeaponId.PISTOL) or (players and perk_active(players[0], PerkId.MY_FAVOURITE_WEAPON)):
+                    self._clear_entry(entry)
+                    return None
+
+                return entry
+
+        base_roll = int(rng.rand())
+        if base_roll % 9 != 1:
+            allow_without_magnet = False
+            if players and int(players[0].weapon_id) == int(WeaponId.PISTOL):
+                allow_without_magnet = int(rng.rand()) % 5 == 1
+
+            if not allow_without_magnet:
+                if not (players and perk_active(players[0], PerkId.BONUS_MAGNET)):
+                    return None
+                if int(rng.rand()) % 10 != 2:
+                    return None
 
         entry = self.spawn_at_pos(
             pos_x,
@@ -377,11 +415,9 @@ class BonusPool:
 
         if entry.bonus_id == int(BonusId.WEAPON):
             near_sq = BONUS_WEAPON_NEAR_RADIUS * BONUS_WEAPON_NEAR_RADIUS
-            for player in players:
-                if _distance_sq(pos_x, pos_y, player.pos_x, player.pos_y) < near_sq:
-                    entry.bonus_id = int(BonusId.POINTS)
-                    entry.amount = 100
-                    break
+            if players and _distance_sq(pos_x, pos_y, players[0].pos_x, players[0].pos_y) < near_sq:
+                entry.bonus_id = int(BonusId.POINTS)
+                entry.amount = 100
 
         if entry.bonus_id != int(BonusId.POINTS):
             matches = sum(1 for bonus in self._entries if bonus.bonus_id == entry.bonus_id)
@@ -390,10 +426,9 @@ class BonusPool:
                 return None
 
         if entry.bonus_id == int(BonusId.WEAPON):
-            for player in players:
-                if entry.amount == player.weapon_id:
-                    self._clear_entry(entry)
-                    return None
+            if players and entry.amount == players[0].weapon_id:
+                self._clear_entry(entry)
+                return None
 
         return entry
 
@@ -1592,6 +1627,7 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
 
     firing_during_reload = False
     ammo_cost = 1.0
+    is_fire_bullets = float(player.fire_bullets_timer) > 0.0
     if player.reload_timer > 0.0:
         if player.ammo <= 0 and player.experience > 0:
             if perk_active(player, PerkId.REGRESSION_BULLETS):
@@ -1616,7 +1652,7 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
         else:
             return
 
-    if player.ammo <= 0 and not firing_during_reload:
+    if player.ammo <= 0 and not firing_during_reload and not is_fire_bullets:
         player_start_reload(player, state)
         return
 
@@ -1624,20 +1660,18 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
     fire_bullets_weapon = weapon_entry_for_projectile_type_id(int(ProjectileTypeId.FIRE_BULLETS))
 
     shot_cooldown = float(weapon.shot_cooldown) if weapon.shot_cooldown is not None else 0.0
-    spread_inc = float(weapon.spread_heat_inc) if weapon.spread_heat_inc is not None else 0.0
-    spread_inc *= 1.3
-    if player.fire_bullets_timer > 0.0 and pellet_count == 1 and fire_bullets_weapon is not None:
+    spread_heat_base = float(weapon.spread_heat_inc) if weapon.spread_heat_inc is not None else 0.0
+    if is_fire_bullets and pellet_count == 1 and fire_bullets_weapon is not None and fire_bullets_weapon.spread_heat_inc is not None:
+        spread_heat_base = float(fire_bullets_weapon.spread_heat_inc)
+
+    if is_fire_bullets and pellet_count == 1 and fire_bullets_weapon is not None:
         shot_cooldown = (
             float(fire_bullets_weapon.shot_cooldown)
             if fire_bullets_weapon.shot_cooldown is not None
             else 0.0
         )
-        spread_inc = (
-            float(fire_bullets_weapon.spread_heat_inc)
-            if fire_bullets_weapon.spread_heat_inc is not None
-            else 0.0
-        )
-        spread_inc *= 1.3
+
+    spread_inc = spread_heat_base * 1.3
 
     if perk_active(player, PerkId.FASTSHOT):
         shot_cooldown *= 0.88
@@ -1657,6 +1691,7 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
     aim_jitter_x = aim_x + math.cos(dir_angle) * offset
     aim_jitter_y = aim_y + math.sin(dir_angle) * offset
     shot_angle = math.atan2(aim_jitter_y - float(player.pos_y), aim_jitter_x - float(player.pos_x)) + math.pi / 2.0
+    particle_angle = shot_angle - math.pi / 2.0
 
     muzzle_x = player.pos_x + player.aim_dir_x * 16.0
     muzzle_y = player.pos_y + player.aim_dir_y * 16.0
@@ -1676,14 +1711,12 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
             return 0.0013
         return 0.0015
 
-    if player.fire_bullets_timer > 0.0:
+    if is_fire_bullets:
         pellets = max(1, int(pellet_count))
         shot_count = pellets
         meta = _projectile_meta_for_type_id(ProjectileTypeId.FIRE_BULLETS)
         for _ in range(pellets):
-            angle = shot_angle
-            if pellets > 1:
-                angle += float(int(state.rng.rand()) % 200 - 100) * 0.0015
+            angle = shot_angle + float(int(state.rng.rand()) % 200 - 100) * 0.0015
             state.projectiles.spawn(
                 pos_x=muzzle_x,
                 pos_y=muzzle_y,
@@ -1713,16 +1746,16 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
         state.secondary_projectiles.spawn(pos_x=muzzle_x, pos_y=muzzle_y, angle=shot_angle, type_id=4, owner_id=owner_id)
     elif weapon_id == WeaponId.FLAMETHROWER:
         # Flamethrower -> fast particle weapon (style 0), fractional ammo drain.
-        state.particles.spawn_particle(pos_x=muzzle_x, pos_y=muzzle_y, angle=dir_angle, intensity=1.0, owner_id=owner_id)
+        state.particles.spawn_particle(pos_x=muzzle_x, pos_y=muzzle_y, angle=particle_angle, intensity=1.0, owner_id=owner_id)
         ammo_cost = 0.1
     elif weapon_id == WeaponId.BLOW_TORCH:
         # Blow Torch -> fast particle weapon (style 1), fractional ammo drain.
-        particle_id = state.particles.spawn_particle(pos_x=muzzle_x, pos_y=muzzle_y, angle=dir_angle, intensity=1.0, owner_id=owner_id)
+        particle_id = state.particles.spawn_particle(pos_x=muzzle_x, pos_y=muzzle_y, angle=particle_angle, intensity=1.0, owner_id=owner_id)
         state.particles.entries[particle_id].style_id = 1
         ammo_cost = 0.05
     elif weapon_id == WeaponId.HR_FLAMER:
         # HR Flamer -> fast particle weapon (style 2), fractional ammo drain.
-        particle_id = state.particles.spawn_particle(pos_x=muzzle_x, pos_y=muzzle_y, angle=dir_angle, intensity=1.0, owner_id=owner_id)
+        particle_id = state.particles.spawn_particle(pos_x=muzzle_x, pos_y=muzzle_y, angle=particle_angle, intensity=1.0, owner_id=owner_id)
         state.particles.entries[particle_id].style_id = 2
         ammo_cost = 0.1
     elif weapon_id == WeaponId.BUBBLEGUN:
@@ -1833,15 +1866,17 @@ def player_fire_weapon(player: PlayerState, input_state: PlayerInput, dt: float,
         player.spread_heat = min(0.48, max(0.0, player.spread_heat + spread_inc))
 
     muzzle_inc = float(weapon.spread_heat_inc) if weapon.spread_heat_inc is not None else 0.0
+    if is_fire_bullets and pellet_count == 1 and fire_bullets_weapon is not None and fire_bullets_weapon.spread_heat_inc is not None:
+        muzzle_inc = float(fire_bullets_weapon.spread_heat_inc)
     player.muzzle_flash_alpha = min(1.0, player.muzzle_flash_alpha)
     player.muzzle_flash_alpha = min(1.0, player.muzzle_flash_alpha + muzzle_inc)
     player.muzzle_flash_alpha = min(0.8, player.muzzle_flash_alpha)
 
     player.shot_seq += 1
-    if not firing_during_reload and state.bonuses.reflex_boost <= 0.0:
+    if (not firing_during_reload) and state.bonuses.reflex_boost <= 0.0 and not is_fire_bullets:
         player.ammo = max(0.0, float(player.ammo) - float(ammo_cost))
-        if player.ammo <= 0.0:
-            player_start_reload(player, state)
+    if (not firing_during_reload) and player.ammo <= 0.0 and player.reload_timer <= 0.0:
+        player_start_reload(player, state)
 
 
 def player_update(player: PlayerState, input_state: PlayerInput, dt: float, state: GameplayState, *, world_size: float = 1024.0) -> None:
@@ -1885,35 +1920,50 @@ def player_update(player: PlayerState, input_state: PlayerInput, dt: float, stat
         player.aim_heading = math.atan2(aim_dir_y, aim_dir_x) + math.pi / 2.0
 
     # Movement.
-    move_x, move_y = _normalize(float(input_state.move_x), float(input_state.move_y))
-    moving = move_x != 0.0 or move_y != 0.0
-    runner_bonus = 0.0
-    if perk_active(player, PerkId.LONG_DISTANCE_RUNNER):
-        if moving:
-            player.long_distance_runner_timer = min(1.2, float(player.long_distance_runner_timer) + dt)
+    raw_move_x = float(input_state.move_x)
+    raw_move_y = float(input_state.move_y)
+    raw_mag = math.hypot(raw_move_x, raw_move_y)
+    moving_input = raw_mag > 0.2
+
+    if moving_input:
+        inv = 1.0 / raw_mag if raw_mag > 1e-9 else 0.0
+        move_x = raw_move_x * inv
+        move_y = raw_move_y * inv
+        player.heading = math.atan2(move_y, move_x) + math.pi / 2.0
+        if perk_active(player, PerkId.LONG_DISTANCE_RUNNER):
+            if player.move_speed < 2.0:
+                player.move_speed = float(player.move_speed + dt * 4.0)
+            player.move_speed = float(player.move_speed + dt)
+            if player.move_speed > 2.8:
+                player.move_speed = 2.8
         else:
-            player.long_distance_runner_timer = max(0.0, float(player.long_distance_runner_timer) - dt * 15.0)
-        runner_bonus = max(0.0, min(0.8, float(player.long_distance_runner_timer) - 0.4))
+            player.move_speed = float(player.move_speed + dt * 5.0)
+            if player.move_speed > 2.0:
+                player.move_speed = 2.0
     else:
-        player.long_distance_runner_timer = 0.0
+        player.move_speed = float(player.move_speed - dt * 15.0)
+        if player.move_speed < 0.0:
+            player.move_speed = 0.0
+        move_x = math.cos(player.heading - math.pi / 2.0)
+        move_y = math.sin(player.heading - math.pi / 2.0)
+
+    if player.weapon_id == WeaponId.MEAN_MINIGUN and player.move_speed > 0.8:
+        player.move_speed = 0.8
 
-    speed_multiplier = float(player.move_speed_multiplier + runner_bonus)
+    speed_multiplier = float(player.speed_multiplier)
     if player.speed_bonus_timer > 0.0:
         speed_multiplier += 1.0
-    speed = 120.0 * speed_multiplier
+
+    speed = player.move_speed * speed_multiplier * 25.0
+    if moving_input:
+        speed *= min(1.0, raw_mag)
     if perk_active(player, PerkId.ALTERNATE_WEAPON):
         speed *= 0.8
+
     player.pos_x = _clamp(player.pos_x + move_x * speed * dt, 0.0, float(world_size))
     player.pos_y = _clamp(player.pos_y + move_y * speed * dt, 0.0, float(world_size))
 
-    if moving:
-        player.heading = math.atan2(move_y, move_x) + math.pi / 2.0
-
-    move_dist = math.hypot(player.pos_x - prev_x, player.pos_y - prev_y)
-    if move_dist > 1e-9:
-        # Port of `move_phase += frame_dt * move_speed * 19.0` (player_update).
-        move_speed = move_dist / dt / 120.0
-        player.move_phase += dt * move_speed * 19.0
+    player.move_phase += dt * player.move_speed * 19.0
 
     stationary = abs(player.pos_x - prev_x) <= 1e-9 and abs(player.pos_y - prev_y) <= 1e-9
     reload_scale = 1.0