crimsonland 0.1.0.dev6__py3-none-any.whl → 0.1.0.dev8__py3-none-any.whl

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))

crimson/creatures/anim.py

@@ -28,6 +28,7 @@ _CREATURE_CORPSE_FRAMES: dict[int, int] = {
     3: 1,  # spider sp1
     4: 2,  # spider sp2
     5: 7,  # trooper
+    7: 6,  # ping-pong strip corpse fallback
 }
 
 

crimson/game.py

@@ -789,6 +789,7 @@ class SurvivalGameView:
             ViewContext(assets_dir=state.assets_dir),
             texture_cache=state.texture_cache,
             config=state.config,
+            console=state.console,
             audio=state.audio,
             audio_rng=state.rng,
         )
@@ -848,6 +849,7 @@ class RushGameView:
             ViewContext(assets_dir=state.assets_dir),
             texture_cache=state.texture_cache,
             config=state.config,
+            console=state.console,
             audio=state.audio,
             audio_rng=state.rng,
         )
@@ -905,6 +907,7 @@ class TypoShooterGameView:
             ViewContext(assets_dir=state.assets_dir),
             texture_cache=state.texture_cache,
             config=state.config,
+            console=state.console,
             audio=state.audio,
             audio_rng=state.rng,
         )
@@ -962,6 +965,7 @@ class TutorialGameView:
             ViewContext(assets_dir=state.assets_dir),
             texture_cache=state.texture_cache,
             config=state.config,
+            console=state.console,
             audio=state.audio,
             audio_rng=state.rng,
             demo_mode_active=state.demo_enabled,
@@ -1011,6 +1015,7 @@ class QuestGameView:
             ViewContext(assets_dir=state.assets_dir),
             texture_cache=state.texture_cache,
             config=state.config,
+            console=state.console,
             audio=state.audio,
             audio_rng=state.rng,
             demo_mode_active=state.demo_enabled,

crimson/gameplay.py

@@ -159,8 +159,11 @@ class BonusHudSlot:
     bonus_id: int = 0
     label: str = ""
     icon_id: int = -1
+    slide_x: float = -184.0
     timer_ref: _TimerRef | None = None
     timer_ref_alt: _TimerRef | None = None
+    timer_value: float = 0.0
+    timer_value_alt: float = 0.0
 
 
 BONUS_HUD_SLOT_COUNT = 16
@@ -199,8 +202,11 @@ class BonusHudState:
         slot.bonus_id = int(bonus_id)
         slot.label = label
         slot.icon_id = int(icon_id)
+        slot.slide_x = -184.0
         slot.timer_ref = timer_ref
         slot.timer_ref_alt = timer_ref_alt
+        slot.timer_value = 0.0
+        slot.timer_value_alt = 0.0
 
 
 @dataclass(slots=True)
@@ -358,11 +364,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 +421,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 +432,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
 
@@ -2321,8 +2362,8 @@ def bonus_apply(
     return
 
 
-def bonus_hud_update(state: GameplayState, players: list[PlayerState]) -> None:
-    """Refresh HUD slots based on current timer values."""
+def bonus_hud_update(state: GameplayState, players: list[PlayerState], *, dt: float = 0.0) -> None:
+    """Refresh HUD slots based on current timer values + advance slide animation."""
 
     def _timer_value(ref: _TimerRef | None) -> float:
         if ref is None:
@@ -2336,16 +2377,35 @@ def bonus_hud_update(state: GameplayState, players: list[PlayerState]) -> None:
             return float(getattr(players[idx], ref.key, 0.0) or 0.0)
         return 0.0
 
-    for slot in state.bonus_hud.slots:
+    player_count = len(players)
+    dt = max(0.0, float(dt))
+
+    for slot_index, slot in enumerate(state.bonus_hud.slots):
         if not slot.active:
             continue
-        timer = _timer_value(slot.timer_ref)
-        if slot.timer_ref_alt is not None:
-            timer = max(timer, _timer_value(slot.timer_ref_alt))
-        if timer <= 0.0:
+        timer = max(0.0, _timer_value(slot.timer_ref))
+        timer_alt = max(0.0, _timer_value(slot.timer_ref_alt)) if (slot.timer_ref_alt is not None and player_count > 1) else 0.0
+        slot.timer_value = float(timer)
+        slot.timer_value_alt = float(timer_alt)
+
+        if timer > 0.0 or timer_alt > 0.0:
+            slot.slide_x += dt * 350.0
+        else:
+            slot.slide_x -= dt * 320.0
+
+        if slot.slide_x > -2.0:
+            slot.slide_x = -2.0
+
+        if slot.slide_x < -184.0 and not any(other.active for other in state.bonus_hud.slots[slot_index + 1 :]):
             slot.active = False
+            slot.bonus_id = 0
+            slot.label = ""
+            slot.icon_id = -1
+            slot.slide_x = -184.0
             slot.timer_ref = None
             slot.timer_ref_alt = None
+            slot.timer_value = 0.0
+            slot.timer_value_alt = 0.0
 
 
 def bonus_telekinetic_update(
@@ -2460,6 +2520,6 @@ def bonus_update(
         state.bonuses.freeze = max(0.0, state.bonuses.freeze - dt)
 
     if update_hud:
-        bonus_hud_update(state, players)
+        bonus_hud_update(state, players, dt=dt)
 
     return pickups

crimson/modes/base_gameplay_mode.py

@@ -8,14 +8,17 @@ import pyray as rl
 
 from grim.assets import PaqTextureCache
 from grim.audio import AudioState, update_audio
+from grim.console import ConsoleState
 from grim.config import CrimsonConfig
 from grim.fonts.small import SmallFontData, draw_small_text, load_small_font, measure_small_text_width
 from grim.view import ViewContext
 
+from ..gameplay import _creature_find_in_radius, perk_count_get
 from ..game_world import GameWorld
 from ..persistence.highscores import HighScoreRecord
+from ..perks import PerkId
 from ..ui.game_over import GameOverUi
-from ..ui.hud import HudAssets, load_hud_assets
+from ..ui.hud import HudAssets, draw_target_health_bar, load_hud_assets
 
 if TYPE_CHECKING:
     from ..persistence.save_status import GameStatus
@@ -45,6 +48,7 @@ class BaseGameplayMode:
         hardcore: bool = False,
         texture_cache: PaqTextureCache | None = None,
         config: CrimsonConfig | None = None,
+        console: ConsoleState | None = None,
         audio: AudioState | None = None,
         audio_rng: random.Random | None = None,
     ) -> None:
@@ -54,7 +58,9 @@ class BaseGameplayMode:
         self._small: SmallFontData | None = None
         self._hud_assets: HudAssets | None = None
 
+        self._default_game_mode_id = int(default_game_mode_id)
         self._config = config
+        self._console = console
         self._base_dir = config.path.parent if config is not None else Path.cwd()
 
         self.close_requested = False
@@ -90,6 +96,74 @@ class BaseGameplayMode:
         self._last_dt_ms = 0.0
         self._screen_fade: _ScreenFade | None = None
 
+    def _cvar_float(self, name: str, default: float = 0.0) -> float:
+        console = self._console
+        if console is None:
+            return float(default)
+        cvar = console.cvars.get(name)
+        if cvar is None:
+            return float(default)
+        return float(cvar.value_f)
+
+    def _hud_small_indicators(self) -> bool:
+        return self._cvar_float("cv_uiSmallIndicators", 0.0) != 0.0
+
+    def _config_game_mode_id(self) -> int:
+        config = self._config
+        if config is None:
+            return int(self._default_game_mode_id)
+        try:
+            value = config.data.get("game_mode", self._default_game_mode_id)
+            return int(value or self._default_game_mode_id)
+        except Exception:
+            return int(self._default_game_mode_id)
+
+    def _draw_target_health_bar(self, *, alpha: float = 1.0) -> None:
+        creatures = getattr(self._creatures, "entries", [])
+        if not creatures:
+            return
+
+        if perk_count_get(self._player, PerkId.DOCTOR) <= 0:
+            return
+
+        target_idx = _creature_find_in_radius(
+            creatures,
+            pos_x=float(getattr(self._player, "aim_x", 0.0)),
+            pos_y=float(getattr(self._player, "aim_y", 0.0)),
+            radius=12.0,
+            start_index=0,
+        )
+        if target_idx == -1:
+            return
+
+        creature = creatures[target_idx]
+        if not bool(getattr(creature, "active", False)):
+            return
+        hp = float(getattr(creature, "hp", 0.0))
+        max_hp = float(getattr(creature, "max_hp", 0.0))
+        if hp <= 0.0 or max_hp <= 0.0:
+            return
+
+        ratio = hp / max_hp
+        if ratio < 0.0:
+            ratio = 0.0
+        if ratio > 1.0:
+            ratio = 1.0
+
+        x0, y0 = self._world.world_to_screen(float(creature.x) - 32.0, float(creature.y) + 32.0)
+        x1, _y1 = self._world.world_to_screen(float(creature.x) + 32.0, float(creature.y) + 32.0)
+        width = float(x1) - float(x0)
+        if width <= 1e-3:
+            return
+        draw_target_health_bar(
+            x=float(x0),
+            y=float(y0),
+            width=width,
+            ratio=ratio,
+            alpha=float(alpha),
+            scale=width / 64.0,
+        )
+
     def _bind_world(self) -> None:
         self._state = self._world.state
         self._creatures = self._world.creatures