zombie-escape 1.8.0__py3-none-any.whl → 1.10.0__py3-none-any.whl

zombie_escape/gameplay/survivors.py

@@ -17,10 +17,11 @@ from ..entities_constants import (
     ZOMBIE_RADIUS,
 )
 from .constants import SURVIVOR_MESSAGE_DURATION_MS, SURVIVOR_SPEED_PENALTY_PER_PASSENGER
-from ..localization import translate as tr, translate_dict, translate_list
+from ..localization import translate_dict, translate_list
 from ..models import GameData, ProgressState
 from ..rng import get_rng
-from ..entities import Survivor, Zombie, spritecollideany_walls, WallIndex
+from ..entities import Survivor, Zombie, spritecollideany_walls
+from ..world_grid import WallIndex
 from .spawn import _create_zombie
 from .utils import find_nearby_offscreen_spawn_position, rect_visible_on_screen
 
@@ -286,8 +287,8 @@ def handle_survivor_zombie_collisions(
             config,
             start_pos=survivor.rect.center,
             stage=game_data.stage,
-            tracker=bool(getattr(collided_zombie, "tracker", False)),
-            wall_follower=bool(getattr(collided_zombie, "wall_follower", False)),
+            tracker=collided_zombie.tracker,
+            wall_follower=collided_zombie.wall_follower,
         )
         zombie_group.add(new_zombie)
         game_data.groups.all_sprites.add(new_zombie, layer=1)

zombie_escape/gameplay/utils.py

@@ -108,7 +108,9 @@ def find_nearby_offscreen_spawn_position(
         jitter_x = RNG.uniform(-cell.width * 0.35, cell.width * 0.35)
         jitter_y = RNG.uniform(-cell.height * 0.35, cell.height * 0.35)
         candidate = (int(cell.centerx + jitter_x), int(cell.centery + jitter_y))
-        if player is not None and (min_distance_sq is not None or max_distance_sq is not None):
+        if player is not None and (
+            min_distance_sq is not None or max_distance_sq is not None
+        ):
             dx = candidate[0] - player.x
             dy = candidate[1] - player.y
             dist_sq = dx * dx + dy * dy
@@ -119,6 +121,22 @@ def find_nearby_offscreen_spawn_position(
         if view_rect is not None and view_rect.collidepoint(candidate):
             continue
         return candidate
+    if player is not None and (min_distance_sq is not None or max_distance_sq is not None):
+        for _ in range(20):
+            cell = RNG.choice(walkable_cells)
+            center = (cell.centerx, cell.centery)
+            if view_rect is not None and view_rect.collidepoint(center):
+                continue
+            dx = center[0] - player.x
+            dy = center[1] - player.y
+            dist_sq = dx * dx + dy * dy
+            if min_distance_sq is not None and dist_sq < min_distance_sq:
+                continue
+            if max_distance_sq is not None and dist_sq > max_distance_sq:
+                continue
+            fallback_x = RNG.uniform(-cell.width * 0.2, cell.width * 0.2)
+            fallback_y = RNG.uniform(-cell.height * 0.2, cell.height * 0.2)
+            return (int(cell.centerx + fallback_x), int(cell.centery + fallback_y))
     fallback_cell = RNG.choice(walkable_cells)
     fallback_x = RNG.uniform(-fallback_cell.width * 0.35, fallback_cell.width * 0.35)
     fallback_y = RNG.uniform(-fallback_cell.height * 0.35, fallback_cell.height * 0.35)

zombie_escape/locales/ui.en.json

@@ -107,6 +107,18 @@
           "No, no, no!",
           "Please!"
         ]
+      },
+      "stage11": {
+        "name": "#11 Don't Look Back!",
+        "description": "Left or right. Trust your instinct."
+      },
+      "stage12": {
+        "name": "#12 OVERHEAD HAZARD",
+        "description": "An open factory floor. Zombies may fall from above."
+      },
+      "stage13": {
+        "name": "#13 Rescue Buddy 3",
+        "description": "Rescue your buddy. Zombies may fall from above."
       }
     },
     "status": {
@@ -122,7 +134,7 @@
       "need_fuel": "Need fuel to drive!",
       "paused": "PAUSED",
       "pause_hint": "P/Start: Resume · ESC/Select: Return to Title",
-      "survival_timer_label": "Until dawn %{time}",
+      "endurance_timer_label": "Until dawn %{time}",
       "time_accel": ">> 4x",
       "time_accel_hint": "Hold Shift/R1: 4x"
     },
@@ -181,7 +193,7 @@
       "prompt": "ESC/SPACE/Select/South: Title · R: Retry",
       "scream": "AAAAHHH!!",
       "survivors_summary": "Evacuated: %{count}",
-      "survival_duration": "Time survived %{time}"
+      "endurance_duration": "Time survived %{time}"
     }
   }
 }

zombie_escape/locales/ui.ja.json

@@ -107,6 +107,18 @@
           "やだ、やだ！",
           "誰かー！"
         ]
+      },
+      "stage11": {
+        "name": "#11 振り返るな！",
+        "description": "右か左か。直感を信じて。"
+      },
+      "stage12": {
+        "name": "#12 頭上注意",
+        "description": "吹き抜けの工場。落ちてくるゾンビあり。"
+      },
+      "stage13": {
+        "name": "#13 相棒を救え 3",
+        "description": "はぐれた相棒を救え。ゾンビの落下あり。"
       }
     },
     "status": {
@@ -122,7 +134,7 @@
       "need_fuel": "燃料が必要です！",
       "paused": "一時停止",
       "pause_hint": "P/Start: ゲーム再開  ESC/Select: タイトルに戻る",
-      "survival_timer_label": "夜明けまであと %{time}",
+      "endurance_timer_label": "夜明けまであと %{time}",
       "time_accel": ">> 4x",
       "time_accel_hint": "Shift/R1押下: 4x"
     },
@@ -181,7 +193,7 @@
       "prompt": "ESC/Space/Select/South: タイトルへ  R: 再挑戦",
       "scream": "ぎゃあーーー!!",
       "survivors_summary": "救出人数: %{count}",
-      "survival_duration": "逃げ延びた時間 %{time}"
+      "endurance_duration": "逃げ延びた時間 %{time}"
     }
   }
 }

zombie_escape/models.py

@@ -9,7 +9,11 @@ import pygame
 from pygame import sprite, surface
 
 from .entities_constants import ZOMBIE_AGING_DURATION_FRAMES
-from .gameplay_constants import SURVIVOR_SPAWN_RATE, ZOMBIE_SPAWN_DELAY_MS
+from .gameplay_constants import (
+    DEFAULT_FLASHLIGHT_SPAWN_COUNT,
+    SURVIVOR_SPAWN_RATE,
+    ZOMBIE_SPAWN_DELAY_MS,
+)
 from .level_constants import DEFAULT_GRID_COLS, DEFAULT_GRID_ROWS
 from .localization import translate as tr
 
@@ -27,9 +31,42 @@ class LevelLayout:
     walkable_cells: list[pygame.Rect]
     outer_wall_cells: set[tuple[int, int]]
     wall_cells: set[tuple[int, int]]
+    fall_spawn_cells: set[tuple[int, int]]
     bevel_corners: dict[tuple[int, int], tuple[bool, bool, bool, bool]]
 
 
+@dataclass
+class FallingZombie:
+    """Represents a zombie falling toward a target position."""
+
+    start_pos: tuple[int, int]
+    target_pos: tuple[int, int]
+    started_at_ms: int
+    pre_fx_ms: int
+    fall_duration_ms: int
+    dust_duration_ms: int
+    tracker: bool
+    wall_follower: bool
+    dust_started: bool = False
+
+
+@dataclass
+class DustRing:
+    """Short-lived dust ring spawned on impact."""
+
+    pos: tuple[int, int]
+    started_at_ms: int
+    duration_ms: int
+
+
+@dataclass(frozen=True)
+class Footprint:
+    """Tracked player footprint."""
+
+    pos: tuple[float, float]
+    time: int
+
+
 @dataclass
 class ProgressState:
     """Game progress/state flags."""
@@ -40,8 +77,8 @@ class ProgressState:
     game_over_at: int | None
     scaled_overview: surface.Surface | None
     overview_created: bool
-    footprints: list
-    last_footprint_pos: tuple | None
+    footprints: list[Footprint]
+    last_footprint_pos: tuple[float, float] | None
     elapsed_play_ms: int
     has_fuel: bool
     flashlight_count: int
@@ -56,14 +93,17 @@ class ProgressState:
     survivor_messages: list
     survivor_capacity: int
     seed: int | None
-    survival_elapsed_ms: int
-    survival_goal_ms: int
+    endurance_elapsed_ms: int
+    endurance_goal_ms: int
     dawn_ready: bool
     dawn_prompt_at: int | None
     time_accel_active: bool
     last_zombie_spawn_time: int
     dawn_carbonized: bool
     debug_mode: bool
+    falling_zombies: list[FallingZombie]
+    falling_spawn_carry: int
+    dust_rings: list[DustRing]
 
 
 @dataclass
@@ -109,14 +149,17 @@ class Stage:
     requires_fuel: bool = False
     buddy_required_count: int = 0
     rescue_stage: bool = False
-    survival_stage: bool = False
-    survival_goal_ms: int = 0
+    endurance_stage: bool = False
+    endurance_goal_ms: int = 0
     fuel_spawn_count: int = 1
+    initial_flashlight_count: int = DEFAULT_FLASHLIGHT_SPAWN_COUNT
     survivor_spawn_rate: float = SURVIVOR_SPAWN_RATE
     spawn_interval_ms: int = ZOMBIE_SPAWN_DELAY_MS
     initial_interior_spawn_rate: float = 0.015
     exterior_spawn_weight: float = 1.0
     interior_spawn_weight: float = 0.0
+    interior_fall_spawn_weight: float = 0.0
+    fall_spawn_zones: list[tuple[int, int, int, int]] = field(default_factory=list)
     zombie_tracker_ratio: float = 0.0
     zombie_wall_follower_ratio: float = 0.0
     zombie_normal_ratio: float = 1.0
@@ -135,6 +178,8 @@ class Stage:
 
 __all__ = [
     "LevelLayout",
+    "FallingZombie",
+    "DustRing",
     "ProgressState",
     "Groups",
     "GameData",