crimsonland 0.1.0.dev6__py3-none-any.whl → 0.1.0.dev7__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/gameplay.py

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

{crimsonland-0.1.0.dev6.dist-info → crimsonland-0.1.0.dev7.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 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=XauJvjT_qAooPKBo4d8NVe9HRWHzZDD8PCzmsWrASic,4729
+crimson/audio_router.py,sha256=4lccGu5044WQ5sMz9yfZd4loSgEMDqXJWGvMmHyMGt0,5449
 crimson/bonuses.py,sha256=owwYIRHRu1Kymtt4eEvpd62JwWAg8LOe20vDuPFB5SU,5094
 crimson/camera.py,sha256=VxTNXTh0qHh5VR1OpkiXr-QcgEWPrWw0A3PFyQFqDkY,2278
 crimson/cli.py,sha256=Pu4RM_bjGtUgIE_5zZs0uWFY9O8YkhJDseRcVMMPJ8k,14595
@@ -31,7 +31,7 @@ crimson/frontend/transitions.py,sha256=-sAJUDqNZ943zXlqtvJ6jCg2YH8dSi8k7qK8caAfO
 crimson/game.py,sha256=_nPXvZDgu2sqEPk00ww9qx7nD8eQIXlIvU-yKfBuUA8,97537
 crimson/game_modes.py,sha256=qW7Tt97lSBmGrt0F17Ni5h8vRyngBzyS9XwWM1TFIEI,255
 crimson/game_world.py,sha256=nfKGcm3LHChPGLHJsurDFAATrHmhRvTmgxcLzUN9m5I,25440
-crimson/gameplay.py,sha256=CtTCxwXWa66RjQS7MKa240J4Mzmel68H0wP0lqOre1s,87546
+crimson/gameplay.py,sha256=M4ZymFV7WNF7C8zjQN179TNILDNVccfREZeymbuHD4A,89098
 crimson/input_codes.py,sha256=PmSWFZIit8unTBWk3uwifpHWMuk0qMg1ueKX3MGC7D0,5379
 crimson/modes/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 crimson/modes/base_gameplay_mode.py,sha256=kmXJxkGnCKV5QZL_y5ML7r-p4bw7hMswKseG9XUn2jo,7555
@@ -133,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.dev6.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-crimsonland-0.1.0.dev6.dist-info/entry_points.txt,sha256=jzzcExxiE9xpt4Iw2nbB1lwTv2Zj4H14WJTIPMkAjoE,77
-crimsonland-0.1.0.dev6.dist-info/METADATA,sha256=xh-O_q3NLT4mfdymSlZ0e6l0g08ACM5Fdd2IMZNqstg,243
-crimsonland-0.1.0.dev6.dist-info/RECORD,,
+crimsonland-0.1.0.dev7.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+crimsonland-0.1.0.dev7.dist-info/entry_points.txt,sha256=jzzcExxiE9xpt4Iw2nbB1lwTv2Zj4H14WJTIPMkAjoE,77
+crimsonland-0.1.0.dev7.dist-info/METADATA,sha256=6zsYDOJkNTgz5xZz1aIWW8BhL8aEcqZFKarztRyetBw,243
+crimsonland-0.1.0.dev7.dist-info/RECORD,,