zombie-escape 1.5.4__py3-none-any.whl → 1.7.1__py3-none-any.whl

zombie_escape/gameplay_constants.py

@@ -2,177 +2,29 @@
 
 from __future__ import annotations
 
-from .screen_constants import FPS
-
 # --- Survival stage settings ---
 SURVIVAL_TIME_ACCEL_SUBSTEPS = 4
 SURVIVAL_TIME_ACCEL_MAX_SUBSTEP = 1.0 / 30.0
 SURVIVAL_FAKE_CLOCK_RATIO = 12.0  # 20 min -> 4 hr clock
-SURVIVAL_NEAR_SPAWN_MIN_DISTANCE = 140
-SURVIVAL_NEAR_SPAWN_MAX_DISTANCE = 280
-SURVIVAL_NEAR_SPAWN_CAMERA_MARGIN = 20
-
-# --- Player and buddy settings ---
-HUMANOID_RADIUS = 6
-HUMANOID_OUTLINE_COLOR = (0, 80, 200)
-HUMANOID_OUTLINE_WIDTH = 1
-
-
-def interaction_radius(width: float, height: float) -> float:
-    """Approximate interaction reach for a humanoid and an object."""
-    return HUMANOID_RADIUS + (width + height) / 4
-
-
-def car_body_radius(width: float, height: float) -> float:
-    """Approximate car collision radius using only its own dimensions."""
-    return min(width, height) / 2
-
-
-PLAYER_RADIUS = HUMANOID_RADIUS
-PLAYER_SPEED = 1.4
-FOV_RADIUS = 124  # approximate legacy FOV (80) * 1.55 cap
-BUDDY_RADIUS = HUMANOID_RADIUS
-BUDDY_FOLLOW_SPEED = PLAYER_SPEED * 0.7
-BUDDY_COLOR = (0, 180, 63)
 
 # --- Survivor settings (Stage 4) ---
-SURVIVOR_RADIUS = HUMANOID_RADIUS
-SURVIVOR_COLOR = (198, 198, 198)
-SURVIVOR_APPROACH_RADIUS = 48
-SURVIVOR_APPROACH_SPEED = PLAYER_SPEED * 0.35
 SURVIVOR_SPAWN_RATE = 0.07
-SURVIVOR_MAX_SAFE_PASSENGERS = 5
-SURVIVOR_SPEED_PENALTY_PER_PASSENGER = 0.08
-SURVIVOR_MIN_SPEED_FACTOR = 0.35
-SURVIVOR_OVERLOAD_DAMAGE_RATIO = 0.2
-SURVIVOR_MESSAGE_DURATION_MS = 2000
-SURVIVOR_CONVERSION_LINE_KEYS = [
-    "stages.stage4.conversion_lines.line1",
-    "stages.stage4.conversion_lines.line2",
-    "stages.stage4.conversion_lines.line3",
-]
-SURVIVOR_STAGE_WAITING_CAR_COUNT = 2
 
 # --- Flashlight settings ---
-FLASHLIGHT_WIDTH = 10
-FLASHLIGHT_HEIGHT = 8
 DEFAULT_FLASHLIGHT_SPAWN_COUNT = 2
 
-# --- Footprint settings (gameplay) ---
-FOOTPRINT_STEP_DISTANCE = 40
-FOOTPRINT_MAX = 320
-
 # --- Zombie settings ---
-ZOMBIE_RADIUS = HUMANOID_RADIUS
-ZOMBIE_SPEED = PLAYER_SPEED * 0.45
 ZOMBIE_SPAWN_DELAY_MS = 4000
-MAX_ZOMBIES = 400
-ZOMBIE_SPAWN_PLAYER_BUFFER = 140
-ZOMBIE_WANDER_INTERVAL_MS = 5000
-ZOMBIE_SIGHT_RANGE = FOV_RADIUS * 1.2
-ZOMBIE_TRACKER_SIGHT_RANGE = ZOMBIE_SIGHT_RANGE * 0.2
-FAST_ZOMBIE_BASE_SPEED = PLAYER_SPEED * 0.77
-ZOMBIE_SEPARATION_DISTANCE = ZOMBIE_RADIUS * 2.2
-ZOMBIE_AGING_DURATION_FRAMES = FPS * 60 * 6  # ~6 minutes at target framerate
-ZOMBIE_AGING_MIN_SPEED_RATIO = 0.3
-ZOMBIE_TRACKER_SCENT_RADIUS = 70
-ZOMBIE_TRACKER_WANDER_INTERVAL_MS = 2500
-ZOMBIE_TRACKER_AGING_DURATION_FRAMES = ZOMBIE_AGING_DURATION_FRAMES
-ZOMBIE_WALL_FOLLOW_SENSOR_DISTANCE = 24
-ZOMBIE_WALL_FOLLOW_PROBE_ANGLE_DEG = 45
-ZOMBIE_WALL_FOLLOW_PROBE_STEP = 2.0
-ZOMBIE_WALL_FOLLOW_TARGET_GAP = 4.0
-ZOMBIE_WALL_FOLLOW_LOST_WALL_MS = 2500
 
 # --- Car and fuel settings ---
-CAR_WIDTH = 15
-CAR_HEIGHT = 25
-CAR_SPEED = 2
-CAR_HEALTH = 20
-CAR_WALL_DAMAGE = 1
-CAR_ZOMBIE_DAMAGE = 1
 CAR_HINT_DELAY_MS_DEFAULT = 300000
-FUEL_CAN_WIDTH = 11
-FUEL_CAN_HEIGHT = 15
-FUEL_HINT_DURATION_MS = 1600
-
-# --- Wall and beam settings ---
-INTERNAL_WALL_HEALTH = 40 * 100
-INTERNAL_WALL_BEVEL_DEPTH = 14
-OUTER_WALL_HEALTH = 999999
-STEEL_BEAM_HEALTH = int(INTERNAL_WALL_HEALTH * 1.5)
-PLAYER_WALL_DAMAGE = 100
-ZOMBIE_WALL_DAMAGE = 1
 
 __all__ = [
     "SURVIVAL_TIME_ACCEL_SUBSTEPS",
     "SURVIVAL_TIME_ACCEL_MAX_SUBSTEP",
     "SURVIVAL_FAKE_CLOCK_RATIO",
-    "SURVIVAL_NEAR_SPAWN_MIN_DISTANCE",
-    "SURVIVAL_NEAR_SPAWN_MAX_DISTANCE",
-    "SURVIVAL_NEAR_SPAWN_CAMERA_MARGIN",
-    "HUMANOID_RADIUS",
-    "HUMANOID_OUTLINE_COLOR",
-    "HUMANOID_OUTLINE_WIDTH",
-    "interaction_radius",
-    "car_body_radius",
-    "PLAYER_RADIUS",
-    "PLAYER_SPEED",
-    "FOV_RADIUS",
-    "BUDDY_RADIUS",
-    "BUDDY_FOLLOW_SPEED",
-    "BUDDY_COLOR",
-    "SURVIVOR_RADIUS",
-    "SURVIVOR_COLOR",
-    "SURVIVOR_APPROACH_RADIUS",
-    "SURVIVOR_APPROACH_SPEED",
     "SURVIVOR_SPAWN_RATE",
-    "SURVIVOR_MAX_SAFE_PASSENGERS",
-    "SURVIVOR_SPEED_PENALTY_PER_PASSENGER",
-    "SURVIVOR_MIN_SPEED_FACTOR",
-    "SURVIVOR_OVERLOAD_DAMAGE_RATIO",
-    "SURVIVOR_MESSAGE_DURATION_MS",
-    "SURVIVOR_CONVERSION_LINE_KEYS",
-    "SURVIVOR_STAGE_WAITING_CAR_COUNT",
-    "FLASHLIGHT_WIDTH",
-    "FLASHLIGHT_HEIGHT",
     "DEFAULT_FLASHLIGHT_SPAWN_COUNT",
-    "FOOTPRINT_STEP_DISTANCE",
-    "FOOTPRINT_MAX",
-    "ZOMBIE_RADIUS",
-    "ZOMBIE_SPEED",
     "ZOMBIE_SPAWN_DELAY_MS",
-    "MAX_ZOMBIES",
-    "ZOMBIE_SPAWN_PLAYER_BUFFER",
-    "ZOMBIE_WANDER_INTERVAL_MS",
-    "ZOMBIE_SIGHT_RANGE",
-    "ZOMBIE_TRACKER_SIGHT_RANGE",
-    "FAST_ZOMBIE_BASE_SPEED",
-    "ZOMBIE_SEPARATION_DISTANCE",
-    "ZOMBIE_AGING_DURATION_FRAMES",
-    "ZOMBIE_AGING_MIN_SPEED_RATIO",
-    "ZOMBIE_TRACKER_SCENT_RADIUS",
-    "ZOMBIE_TRACKER_WANDER_INTERVAL_MS",
-    "ZOMBIE_TRACKER_AGING_DURATION_FRAMES",
-    "ZOMBIE_WALL_FOLLOW_SENSOR_DISTANCE",
-    "ZOMBIE_WALL_FOLLOW_PROBE_ANGLE_DEG",
-    "ZOMBIE_WALL_FOLLOW_PROBE_STEP",
-    "ZOMBIE_WALL_FOLLOW_TARGET_GAP",
-    "ZOMBIE_WALL_FOLLOW_LOST_WALL_MS",
-    "CAR_WIDTH",
-    "CAR_HEIGHT",
-    "CAR_SPEED",
-    "CAR_HEALTH",
-    "CAR_WALL_DAMAGE",
-    "CAR_ZOMBIE_DAMAGE",
     "CAR_HINT_DELAY_MS_DEFAULT",
-    "FUEL_CAN_WIDTH",
-    "FUEL_CAN_HEIGHT",
-    "FUEL_HINT_DURATION_MS",
-    "INTERNAL_WALL_HEALTH",
-    "INTERNAL_WALL_BEVEL_DEPTH",
-    "OUTER_WALL_HEALTH",
-    "STEEL_BEAM_HEALTH",
-    "PLAYER_WALL_DAMAGE",
-    "ZOMBIE_WALL_DAMAGE",
 ]

zombie_escape/level_blueprints.py

@@ -1,6 +1,5 @@
 # Blueprint generator for randomized layouts.
 
-from .level_constants import GRID_COLS, GRID_ROWS
 from .rng import get_rng
 
 EXITS_PER_SIDE = 1  # currently fixed to 1 per side (can be tuned)
@@ -63,7 +62,7 @@ def _place_exits(grid: list[list[str]], exits_per_side: int) -> None:
     rng = RNG.randint
     used = set()
 
-    def pick_pos(side: str) -> tuple[int, int]:
+    def _pick_pos(side: str) -> tuple[int, int]:
         if side in ("top", "bottom"):
             x = rng(2, cols - 3)
             y = 1 if side == "top" else rows - 2
@@ -74,17 +73,17 @@ def _place_exits(grid: list[list[str]], exits_per_side: int) -> None:
 
     for side in ("top", "bottom", "left", "right"):
         for _ in range(exits_per_side):
-            x, y = pick_pos(side)
+            x, y = _pick_pos(side)
             # avoid duplicates; retry a few times
             for _ in range(10):
                 if (x, y) not in used:
                     break
-                x, y = pick_pos(side)
+                x, y = _pick_pos(side)
             used.add((x, y))
             grid[y][x] = "E"
 
 
-def _place_internal_walls(grid: list[list[str]]) -> None:
+def _place_walls_default(grid: list[list[str]]) -> None:
     cols, rows = len(grid[0]), len(grid)
     rng = RNG.randint
     # Avoid placing walls adjacent to exits: collect forbidden cells (exits + neighbors)
@@ -111,6 +110,104 @@ def _place_internal_walls(grid: list[list[str]]) -> None:
                     grid[y + i][x] = "1"
 
 
+def _place_walls_empty(grid: list[list[str]]) -> None:
+    """Place no internal walls (open floor plan)."""
+    pass
+
+
+def _place_walls_grid_wire(grid: list[list[str]]) -> None:
+    """
+    Place walls using a 2-pass approach with independent layers.
+    Vertical and horizontal walls are generated on separate grids to ensure
+    one orientation doesn't block the other during generation.
+    Finally, they are merged.
+    Strictly forbids parallel adjacency within the same orientation layer.
+    """
+    cols, rows = len(grid[0]), len(grid)
+    rng = RNG.randint
+    forbidden = _collect_exit_adjacent_cells(grid)
+
+    # Temporary grids for independent generation
+    # They only track the internal walls ("1").
+    grid_v = [["." for _ in range(cols)] for _ in range(rows)]
+    grid_h = [["." for _ in range(cols)] for _ in range(rows)]
+
+    # Use a similar density to default.
+    lines_per_pass = int(NUM_WALL_LINES * 0.7)
+
+    # --- Pass 1: Vertical Walls (on grid_v) ---
+    for _ in range(lines_per_pass):
+        length = rng(WALL_MIN_LEN, WALL_MAX_LEN)
+        x = rng(2, cols - 3)
+        y = rng(2, rows - 2 - length)
+
+        can_place = True
+        for i in range(length):
+            cy = y + i
+            # 1. Global forbidden check (exits, outer walls in main grid)
+            if (x, cy) in forbidden:
+                can_place = False
+                break
+            if grid[cy][x] not in (".",):
+                can_place = False
+                break
+            # 2. Local self-overlap check
+            if grid_v[cy][x] != ".":
+                can_place = False
+                break
+            # 3. Parallel adjacency check (only against other vertical walls)
+            if grid_v[cy][x - 1] == "1" or grid_v[cy][x + 1] == "1":
+                can_place = False
+                break
+
+        if can_place:
+            for i in range(length):
+                grid_v[y + i][x] = "1"
+
+    # --- Pass 2: Horizontal Walls (on grid_h) ---
+    for _ in range(lines_per_pass):
+        length = rng(WALL_MIN_LEN, WALL_MAX_LEN)
+        x = rng(2, cols - 2 - length)
+        y = rng(2, rows - 3)
+
+        can_place = True
+        for i in range(length):
+            cx = x + i
+            # 1. Global forbidden check
+            if (cx, y) in forbidden:
+                can_place = False
+                break
+            if grid[y][cx] not in (".",):
+                can_place = False
+                break
+            # 2. Local self-overlap check
+            if grid_h[y][cx] != ".":
+                can_place = False
+                break
+            # 3. Parallel adjacency check (only against other horizontal walls)
+            if grid_h[y - 1][cx] == "1" or grid_h[y + 1][cx] == "1":
+                can_place = False
+                break
+
+        if can_place:
+            for i in range(length):
+                grid_h[y][x + i] = "1"
+
+    # --- Merge Phase ---
+    for y in range(rows):
+        for x in range(cols):
+            # If either layer has a wall, and the main grid is empty, place it.
+            if (grid_v[y][x] == "1" or grid_h[y][x] == "1") and grid[y][x] == ".":
+                grid[y][x] = "1"
+
+
+WALL_ALGORITHMS = {
+    "default": _place_walls_default,
+    "empty": _place_walls_empty,
+    "grid_wire": _place_walls_grid_wire,
+}
+
+
 def _place_steel_beams(
     grid: list[list[str]], *, chance: float = STEEL_BEAM_CHANCE
 ) -> set[tuple[int, int]]:
@@ -150,10 +247,22 @@ def _pick_empty_cell(
     return cols // 2, rows // 2
 
 
-def generate_random_blueprint(steel_chance: float) -> dict:
-    grid = _init_grid(GRID_COLS, GRID_ROWS)
+def _generate_random_blueprint(
+    steel_chance: float, *, cols: int, rows: int, wall_algo: str = "default"
+) -> dict:
+    grid = _init_grid(cols, rows)
     _place_exits(grid, EXITS_PER_SIDE)
-    _place_internal_walls(grid)
+
+    # Select and run the wall placement algorithm
+    if wall_algo not in WALL_ALGORITHMS:
+        print(
+            f"WARNING: Unknown wall algorithm '{wall_algo}'. Falling back to 'default'."
+        )
+        wall_algo = "default"
+
+    algo_func = WALL_ALGORITHMS[wall_algo]
+    algo_func(grid)
+
     steel_beams = _place_steel_beams(grid, chance=steel_chance)
 
     # Spawns: player, car, zombies
@@ -169,11 +278,15 @@ def generate_random_blueprint(steel_chance: float) -> dict:
     return {"grid": blueprint_rows, "steel_cells": steel_beams}
 
 
-def choose_blueprint(config: dict) -> dict:
+def choose_blueprint(
+    config: dict, *, cols: int, rows: int, wall_algo: str = "default"
+) -> dict:
     # Currently only random generation; hook for future variants.
     steel_conf = config.get("steel_beams", {})
     try:
         steel_chance = float(steel_conf.get("chance", STEEL_BEAM_CHANCE))
     except (TypeError, ValueError):
         steel_chance = STEEL_BEAM_CHANCE
-    return generate_random_blueprint(steel_chance=steel_chance)
+    return _generate_random_blueprint(
+        steel_chance=steel_chance, cols=cols, rows=rows, wall_algo=wall_algo
+    )

zombie_escape/level_constants.py

@@ -2,19 +2,12 @@
 
 from __future__ import annotations
 
-GRID_COLS = 48
-GRID_ROWS = 30
-TILE_SIZE = 50  # world units per cell; adjust to scale the whole map
-
-CELL_SIZE = TILE_SIZE
-LEVEL_WIDTH = GRID_COLS * CELL_SIZE
-LEVEL_HEIGHT = GRID_ROWS * CELL_SIZE
+DEFAULT_GRID_COLS = 48
+DEFAULT_GRID_ROWS = 30
+DEFAULT_TILE_SIZE = 50  # world units per cell; adjust to scale the whole map
 
 __all__ = [
-    "GRID_COLS",
-    "GRID_ROWS",
-    "TILE_SIZE",
-    "CELL_SIZE",
-    "LEVEL_WIDTH",
-    "LEVEL_HEIGHT",
+    "DEFAULT_GRID_COLS",
+    "DEFAULT_GRID_ROWS",
+    "DEFAULT_TILE_SIZE",
 ]

zombie_escape/locales/ui.en.json

@@ -9,7 +9,7 @@
     "fonts": {
       "primary": {
         "resource": "assets/fonts/Silkscreen-Regular.ttf",
-        "scale": 0.7
+        "scale": 0.75
       }
     },
     "menu": {
@@ -69,6 +69,14 @@
       "stage7": {
         "name": "#7 Rescue Buddy 2",
         "description": "Rescue your buddy. Wall-hugging zombies appear."
+      },
+      "stage8": {
+        "name": "#8 Assembly Floor",
+        "description": "Narrow corridors. Get surrounded, and there’s no escape."
+      },
+      "stage9": {
+        "name": "# Evacuate Survivors 2",
+        "description": "Evacuate like stage 4, but narrow corridors. Requires fuel."
       }
     },
     "status": {
@@ -100,6 +108,7 @@
       "pickup_buddy": "Pick up your buddy",
       "find_buddy": "Find your buddy",
       "escape_with_buddy": "Get your buddy in the car and escape",
+      "board_buddy": "Get your buddy in the car",
       "buddy_onboard": "Buddy onboard: %{count}",
       "escape_with_survivors": "Escape with the survivors aboard",
       "survivors_onboard": "Survivors aboard: %{count}/%{limit}",

zombie_escape/locales/ui.ja.json

@@ -67,8 +67,16 @@
         "description": "ステージ2と同じだが、一部のゾンビが足跡を追う。"
       },
       "stage7": {
-        "name": "#7 相棒を救え2",
+        "name": "#7 相棒を救え 2",
         "description": "はぐれた相棒を救え。壁沿いゾンビが出現。"
+      },
+      "stage8": {
+        "name": "#8 組立工程",
+        "description": "狭い通路。挟まれると逃げ場なし。"
+      },
+      "stage9": {
+        "name": "#9 生存者救出 2",
+        "description": "ステージ4と同じだが、狭い通路。燃料も必要。"
       }
     },
     "status": {
@@ -100,6 +108,7 @@
       "pickup_buddy": "相棒を救出する",
       "find_buddy": "相棒を探す",
       "escape_with_buddy": "相棒を車に乗せて脱出する",
+      "board_buddy": "相棒を車に乗せる",
       "buddy_onboard": "相棒乗車中: %{count}",
       "escape_with_survivors": "生存者を車に乗せて脱出する",
       "survivors_onboard": "乗車中: %{count}/%{limit}",

zombie_escape/models.py

@@ -8,11 +8,9 @@ from typing import TYPE_CHECKING
 import pygame
 from pygame import sprite, surface
 
-from .gameplay_constants import (
-    SURVIVOR_SPAWN_RATE,
-    ZOMBIE_AGING_DURATION_FRAMES,
-    ZOMBIE_SPAWN_DELAY_MS,
-)
+from .entities_constants import ZOMBIE_AGING_DURATION_FRAMES
+from .gameplay_constants import SURVIVOR_SPAWN_RATE, ZOMBIE_SPAWN_DELAY_MS
+from .level_constants import DEFAULT_GRID_COLS, DEFAULT_GRID_ROWS
 from .localization import translate as tr
 
 if TYPE_CHECKING:  # pragma: no cover - typing-only imports
@@ -20,8 +18,8 @@ if TYPE_CHECKING:  # pragma: no cover - typing-only imports
 
 
 @dataclass
-class Areas:
-    """Container for level area rectangles."""
+class LevelLayout:
+    """Container for level layout rectangles and cell sets."""
 
     outer_rect: tuple[int, int, int, int]
     inner_rect: tuple[int, int, int, int]
@@ -83,9 +81,12 @@ class GameData:
     state: ProgressState
     groups: Groups
     camera: Camera
-    areas: Areas
+    layout: LevelLayout
     fog: dict
     stage: Stage
+    cell_size: int
+    level_width: int
+    level_height: int
     fuel: FuelCan | None = None
     flashlights: list[Flashlight] | None = None
     player: Player | None = None
@@ -100,6 +101,9 @@ class Stage:
     name_key: str
     description_key: str
     available: bool = True
+    tile_size: int = 50
+    grid_cols: int = DEFAULT_GRID_COLS
+    grid_rows: int = DEFAULT_GRID_ROWS
     requires_fuel: bool = False
     buddy_required_count: int = 0
     rescue_stage: bool = False
@@ -115,6 +119,8 @@ class Stage:
     zombie_wall_follower_ratio: float = 0.0
     zombie_normal_ratio: float = 1.0
     zombie_aging_duration_frames: int = ZOMBIE_AGING_DURATION_FRAMES
+    waiting_car_target_count: int = 1
+    wall_algorithm: str = "default"
 
     @property
     def name(self) -> str:
@@ -126,7 +132,7 @@ class Stage:
 
 
 __all__ = [
-    "Areas",
+    "LevelLayout",
     "ProgressState",
     "Groups",
     "GameData",