zombie-escape 1.3.1__tar.gz → 1.3.6__tar.gz

{zombie_escape-1.3.1 → zombie_escape-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zombie-escape
-Version: 1.3.1
+Version: 1.3.6
 Summary: Top-down zombie survival game built with pygame.
 Project-URL: Homepage, https://github.com/tos-kamiya/zombie-escape
 Author-email: Toshihiro Kamiya <kamiya@mbj.nifty.com>
@@ -48,6 +48,7 @@ This game is a simple 2D top-down action game where the player aims to escape by
 -   **Quit Game:** `ESC` key
 -   **Restart:** `R` key (on Game Over/Clear screen)
 -   **Window Scale (title/settings only):** `[` to shrink, `]` to enlarge
+-   **Time Acceleration:** Hold either `Shift` key to run the entire world 4x faster; release to return to normal speed.
 
 ## Settings (Title Screen)
 
@@ -56,7 +57,6 @@ Open **Settings** from the title to toggle gameplay assists:
 -   **Footprints:** Leave breadcrumb trails so you can backtrack in the dark.
 -   **Fast zombies:** Allow faster zombie variants; each zombie rolls a random speed between the normal and fast ranges.
 -   **Car hint:** After a delay, show a small triangle pointing toward the fuel (Stage 2 before pickup) or the car.
--   **Flashlight pickups:** Enable flashlight spawns that expand your visible radius when collected.
 -   **Steel beams:** Adds tougher single-cell obstacles (5% density) that block movement; hidden when stacked with an inner wall until that wall is destroyed.
 
 ### Shared Seeds
@@ -73,6 +73,7 @@ At the title screen you can pick a stage:
 - **Stage 2: Fuel Run** — you start with no fuel; find a fuel can first, pick it up, then find the car and escape.
 - **Stage 3: Rescue Buddy** — same fuel hunt as Stage 2 (you begin empty) plus grab your buddy, pick them up with the car, then escape together.
 - **Stage 4: Evacuate Survivors** — start fueled, find the car, gather nearby civilians, and escape before zombies reach them. Stage 4 sprinkles extra parked cars across the map; slamming into one while already driving fully repairs your current ride and adds five more safe seats.
+- **Stage 5: Survive Until Dawn** — every car is bone-dry. Endure until the sun rises while the horde presses in from every direction. Once dawn hits, outdoor zombies carbonize and you must walk out through an existing exterior gap to win; cars remain unusable.
 
 An objective reminder is shown at the top-left during play.
 
@@ -88,8 +89,8 @@ An objective reminder is shown at the top-left during play.
     -   After roughly 5 minutes of play, a small triangle near the player points toward the objective: fuel first (Stage 2 before pickup), car after fuel is collected (Stage 2/3), or car directly (Stage 1/4).
 -   **Walls:** Outer walls are gray; inner walls are beige.
     -   **Outer Walls:** Walls surrounding the stage that are nearly indestructible. Each side has at least three openings (exits).
-    -   **Inner Walls:** Beige walls randomly placed inside the building. Inner wall segments each have durability. **The player can break these walls** by repeatedly colliding with a segment to reduce its durability; when it reaches 0, the segment is destroyed and disappears. The car cannot break walls.
--   **Flashlight:** Picking one up boosts your visible radius by 35%.
+    -   **Inner Walls:** Beige walls randomly placed inside the building. Inner wall segments each have durability. **The player can break these walls** by repeatedly colliding with a segment to reduce its durability; when it reaches 0, the segment is destroyed and disappears. Zombies can also wear down walls, but far more slowly. The car cannot break walls.
+-   **Flashlight:** Each pickup expands your visible radius by about 20% (grab two to reach the max boost).
 -   **Steel Beam (optional):** A square post with crossed diagonals; same collision as inner walls but with triple durability. Spawns independently of inner walls (may overlap them). If an inner wall covers a beam, the beam appears once the wall is destroyed.
 -   **Fuel Can (Stages 2 & 3):** A yellow jerrycan that only spawns on the fuel-run stages. Pick it up before driving the car; once collected the on-player indicator appears until you refuel the car.
 -   **Buddy (Stage 3):** A green circle survivor who spawns somewhere in the building and waits.
@@ -104,8 +105,10 @@ An objective reminder is shown at the top-left during play.
 ### Win/Lose Conditions
 
 -   **Win Condition:** Escape the stage (level) boundaries while inside the car.
+    - Stage 1 and Stage 4 follow the base rule: find the car (already fueled) and drive out.
     - Stage 2 also requires that you have collected the fuel can before driving out.
     - Stage 3 requires both fuel and having picked up your buddy with the car before driving out.
+    - Stage 5 has no working cars; survive until dawn, then walk out through an exterior opening on foot.
 -   **Lose Condition:**
     -   The player is touched by a zombie while *not* inside a car.
     -   In Stage 3, if your buddy is caught (when visible), it's game over.
@@ -133,6 +136,10 @@ Launch using the following command line:
 zombie-escape
 ```
 
+### Debug Mode
+
+<!-- For Stage 5 balancing or capture needs, run `zombie-escape --debug`. This hides the pause overlay and starts survival stages with 3 minutes remaining so you can immediately test late-night behavior. -->
+
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE.txt](LICENSE.txt) file for details.

{zombie_escape-1.3.1 → zombie_escape-1.3.6}/README.md

@@ -27,6 +27,7 @@ This game is a simple 2D top-down action game where the player aims to escape by
 -   **Quit Game:** `ESC` key
 -   **Restart:** `R` key (on Game Over/Clear screen)
 -   **Window Scale (title/settings only):** `[` to shrink, `]` to enlarge
+-   **Time Acceleration:** Hold either `Shift` key to run the entire world 4x faster; release to return to normal speed.
 
 ## Settings (Title Screen)
 
@@ -35,7 +36,6 @@ Open **Settings** from the title to toggle gameplay assists:
 -   **Footprints:** Leave breadcrumb trails so you can backtrack in the dark.
 -   **Fast zombies:** Allow faster zombie variants; each zombie rolls a random speed between the normal and fast ranges.
 -   **Car hint:** After a delay, show a small triangle pointing toward the fuel (Stage 2 before pickup) or the car.
--   **Flashlight pickups:** Enable flashlight spawns that expand your visible radius when collected.
 -   **Steel beams:** Adds tougher single-cell obstacles (5% density) that block movement; hidden when stacked with an inner wall until that wall is destroyed.
 
 ### Shared Seeds
@@ -52,6 +52,7 @@ At the title screen you can pick a stage:
 - **Stage 2: Fuel Run** — you start with no fuel; find a fuel can first, pick it up, then find the car and escape.
 - **Stage 3: Rescue Buddy** — same fuel hunt as Stage 2 (you begin empty) plus grab your buddy, pick them up with the car, then escape together.
 - **Stage 4: Evacuate Survivors** — start fueled, find the car, gather nearby civilians, and escape before zombies reach them. Stage 4 sprinkles extra parked cars across the map; slamming into one while already driving fully repairs your current ride and adds five more safe seats.
+- **Stage 5: Survive Until Dawn** — every car is bone-dry. Endure until the sun rises while the horde presses in from every direction. Once dawn hits, outdoor zombies carbonize and you must walk out through an existing exterior gap to win; cars remain unusable.
 
 An objective reminder is shown at the top-left during play.
 
@@ -67,8 +68,8 @@ An objective reminder is shown at the top-left during play.
     -   After roughly 5 minutes of play, a small triangle near the player points toward the objective: fuel first (Stage 2 before pickup), car after fuel is collected (Stage 2/3), or car directly (Stage 1/4).
 -   **Walls:** Outer walls are gray; inner walls are beige.
     -   **Outer Walls:** Walls surrounding the stage that are nearly indestructible. Each side has at least three openings (exits).
-    -   **Inner Walls:** Beige walls randomly placed inside the building. Inner wall segments each have durability. **The player can break these walls** by repeatedly colliding with a segment to reduce its durability; when it reaches 0, the segment is destroyed and disappears. The car cannot break walls.
--   **Flashlight:** Picking one up boosts your visible radius by 35%.
+    -   **Inner Walls:** Beige walls randomly placed inside the building. Inner wall segments each have durability. **The player can break these walls** by repeatedly colliding with a segment to reduce its durability; when it reaches 0, the segment is destroyed and disappears. Zombies can also wear down walls, but far more slowly. The car cannot break walls.
+-   **Flashlight:** Each pickup expands your visible radius by about 20% (grab two to reach the max boost).
 -   **Steel Beam (optional):** A square post with crossed diagonals; same collision as inner walls but with triple durability. Spawns independently of inner walls (may overlap them). If an inner wall covers a beam, the beam appears once the wall is destroyed.
 -   **Fuel Can (Stages 2 & 3):** A yellow jerrycan that only spawns on the fuel-run stages. Pick it up before driving the car; once collected the on-player indicator appears until you refuel the car.
 -   **Buddy (Stage 3):** A green circle survivor who spawns somewhere in the building and waits.
@@ -83,8 +84,10 @@ An objective reminder is shown at the top-left during play.
 ### Win/Lose Conditions
 
 -   **Win Condition:** Escape the stage (level) boundaries while inside the car.
+    - Stage 1 and Stage 4 follow the base rule: find the car (already fueled) and drive out.
     - Stage 2 also requires that you have collected the fuel can before driving out.
     - Stage 3 requires both fuel and having picked up your buddy with the car before driving out.
+    - Stage 5 has no working cars; survive until dawn, then walk out through an exterior opening on foot.
 -   **Lose Condition:**
     -   The player is touched by a zombie while *not* inside a car.
     -   In Stage 3, if your buddy is caught (when visible), it's game over.
@@ -112,6 +115,10 @@ Launch using the following command line:
 zombie-escape
 ```
 
+### Debug Mode
+
+<!-- For Stage 5 balancing or capture needs, run `zombie-escape --debug`. This hides the pause overlay and starts survival stages with 3 minutes remaining so you can immediately test late-night behavior. -->
+
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE.txt](LICENSE.txt) file for details.

{zombie_escape-1.3.1 → zombie_escape-1.3.6}/src/zombie_escape/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2025-present Toshihiro Kamiya <kamiya@mbj.nifty.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "1.3.1"
+__version__ = "1.3.6"

zombie_escape-1.3.6/src/zombie_escape/colors.py

@@ -0,0 +1,166 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+# Basic palette
+WHITE: tuple[int, int, int] = (255, 255, 255)
+BLACK: tuple[int, int, int] = (0, 0, 0)
+RED: tuple[int, int, int] = (255, 0, 0)
+GREEN: tuple[int, int, int] = (0, 255, 0)
+BLUE: tuple[int, int, int] = (0, 0, 255)
+GRAY: tuple[int, int, int] = (100, 100, 100)
+LIGHT_GRAY: tuple[int, int, int] = (200, 200, 200)
+YELLOW: tuple[int, int, int] = (255, 255, 0)
+ORANGE: tuple[int, int, int] = (255, 165, 0)
+DARK_RED: tuple[int, int, int] = (139, 0, 0)
+
+
+@dataclass(frozen=True)
+class EnvironmentPalette:
+    """Collection of colors that define the ambient environment."""
+
+    floor_primary: tuple[int, int, int]
+    floor_secondary: tuple[int, int, int]
+    outside: tuple[int, int, int]
+    inner_wall: tuple[int, int, int]
+    inner_wall_border: tuple[int, int, int]
+    outer_wall: tuple[int, int, int]
+    outer_wall_border: tuple[int, int, int]
+
+
+def _clamp(value: float) -> int:
+    return max(0, min(255, int(value)))
+
+
+def _adjust_color(
+    color: tuple[int, int, int], *, brightness: float = 1.0, saturation: float = 1.0
+) -> tuple[int, int, int]:
+    """Return color tinted by brightness/saturation multipliers."""
+
+    r, g, b = color
+    gray = 0.2126 * r + 0.7152 * g + 0.0722 * b
+    def mix(component: int) -> int:
+        value = gray + (component - gray) * saturation
+        value *= brightness
+        return _clamp(value)
+
+    return mix(r), mix(g), mix(b)
+
+
+DEFAULT_AMBIENT_PALETTE_KEY = "default"
+NO_FLASHLIGHT_PALETTE_KEY = "no_flashlight"
+DAWN_AMBIENT_PALETTE_KEY = "dawn"
+
+# Base palette used throughout gameplay (matches the previous constants).
+_DEFAULT_ENVIRONMENT_PALETTE = EnvironmentPalette(
+    floor_primary=(43, 57, 70),
+    floor_secondary=(50, 64, 79),
+    outside=(32, 60, 40),
+    inner_wall=(125, 101, 78),
+    inner_wall_border=(136, 110, 85),
+    outer_wall=(136, 135, 128),
+    outer_wall_border=(147, 146, 138),
+)
+
+# Dark, desaturated palette that sells the "alone without a flashlight" vibe.
+_GLOOM_ENVIRONMENT_PALETTE = EnvironmentPalette(
+    floor_primary=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.floor_primary, brightness=0.725, saturation=0.675
+    ),
+    floor_secondary=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.floor_secondary, brightness=0.74, saturation=0.65
+    ),
+    outside=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.outside, brightness=0.7, saturation=0.625
+    ),
+    inner_wall=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.inner_wall, brightness=0.775, saturation=0.7
+    ),
+    inner_wall_border=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.inner_wall_border, brightness=0.775, saturation=0.7
+    ),
+    outer_wall=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.outer_wall, brightness=0.75, saturation=0.675
+    ),
+    outer_wall_border=_adjust_color(
+        _DEFAULT_ENVIRONMENT_PALETTE.outer_wall_border, brightness=0.75, saturation=0.675
+    ),
+)
+
+_DAWN_ENVIRONMENT_PALETTE = EnvironmentPalette(
+    floor_primary=(58, 70, 84),
+    floor_secondary=(66, 78, 92),
+    outside=(118, 140, 104),
+    inner_wall=(125, 101, 78),
+    inner_wall_border=(136, 110, 85),
+    outer_wall=(136, 135, 128),
+    outer_wall_border=(147, 146, 138),
+)
+
+ENVIRONMENT_PALETTES: dict[str, EnvironmentPalette] = {
+    DEFAULT_AMBIENT_PALETTE_KEY: _DEFAULT_ENVIRONMENT_PALETTE,
+    NO_FLASHLIGHT_PALETTE_KEY: _GLOOM_ENVIRONMENT_PALETTE,
+    DAWN_AMBIENT_PALETTE_KEY: _DAWN_ENVIRONMENT_PALETTE,
+}
+
+
+def get_environment_palette(key: str | None) -> EnvironmentPalette:
+    """Return the color palette for the provided key (falls back to default)."""
+
+    if not key:
+        return ENVIRONMENT_PALETTES[DEFAULT_AMBIENT_PALETTE_KEY]
+    return ENVIRONMENT_PALETTES.get(key, ENVIRONMENT_PALETTES[DEFAULT_AMBIENT_PALETTE_KEY])
+
+
+def ambient_palette_key_for_flashlights(count: int) -> str:
+    """Return the palette key for the provided flashlight inventory count."""
+
+    return (
+        DEFAULT_AMBIENT_PALETTE_KEY
+        if max(0, count) > 0
+        else NO_FLASHLIGHT_PALETTE_KEY
+    )
+
+
+# World colors (default palette versions preserved for backwards compatibility).
+INTERNAL_WALL_COLOR: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.inner_wall
+INTERNAL_WALL_BORDER_COLOR: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.inner_wall_border
+OUTER_WALL_COLOR: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.outer_wall
+OUTER_WALL_BORDER_COLOR: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.outer_wall_border
+FLOOR_COLOR_PRIMARY: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.floor_primary
+FLOOR_COLOR_SECONDARY: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.floor_secondary
+FLOOR_COLOR_OUTSIDE: tuple[int, int, int] = _DEFAULT_ENVIRONMENT_PALETTE.outside
+FOOTPRINT_COLOR: tuple[int, int, int] = (110, 200, 255)
+STEEL_BEAM_COLOR: tuple[int, int, int] = (110, 50, 50)
+STEEL_BEAM_LINE_COLOR: tuple[int, int, int] = (180, 90, 90)
+
+
+__all__ = [
+    "WHITE",
+    "BLACK",
+    "RED",
+    "GREEN",
+    "BLUE",
+    "GRAY",
+    "LIGHT_GRAY",
+    "YELLOW",
+    "ORANGE",
+    "DARK_RED",
+    "DAWN_AMBIENT_PALETTE_KEY",
+    "INTERNAL_WALL_COLOR",
+    "INTERNAL_WALL_BORDER_COLOR",
+    "OUTER_WALL_COLOR",
+    "OUTER_WALL_BORDER_COLOR",
+    "FLOOR_COLOR_PRIMARY",
+    "FLOOR_COLOR_SECONDARY",
+    "FLOOR_COLOR_OUTSIDE",
+    "FOOTPRINT_COLOR",
+    "STEEL_BEAM_COLOR",
+    "STEEL_BEAM_LINE_COLOR",
+    "EnvironmentPalette",
+    "DEFAULT_AMBIENT_PALETTE_KEY",
+    "NO_FLASHLIGHT_PALETTE_KEY",
+    "ENVIRONMENT_PALETTES",
+    "get_environment_palette",
+    "ambient_palette_key_for_flashlights",
+]

{zombie_escape-1.3.1 → zombie_escape-1.3.6}/src/zombie_escape/config.py

@@ -13,9 +13,7 @@ DEFAULT_CONFIG: dict[str, Any] = {
     "footprints": {"enabled": True},
     "fast_zombies": {"enabled": False, "ratio": 0.1},
     "car_hint": {"enabled": True, "delay_ms": 180_000},
-    "flashlight": {"enabled": True, "bonus_scale": 1.35},
     "steel_beams": {"enabled": False, "chance": 0.05},
-    "debug": {"hide_pause_overlay": False},
 }
 
 

{zombie_escape-1.3.1 → zombie_escape-1.3.6}/src/zombie_escape/constants.py

@@ -2,23 +2,26 @@
 
 from __future__ import annotations
 
-from .config import DEFAULT_CONFIG
 from .level_blueprints import GRID_COLS, GRID_ROWS, TILE_SIZE
 from .render_assets import FogRing, RenderAssets
 
 # --- Screen and window configuration ---
-LOGICAL_SCREEN_WIDTH = 400
-LOGICAL_SCREEN_HEIGHT = 300
-RENDER_SCREEN_WIDTH = 400
-RENDER_SCREEN_HEIGHT = 300
+SCREEN_WIDTH = 400  # Base logical render width
+SCREEN_HEIGHT = 300  # Base logical render height
 DEFAULT_WINDOW_SCALE = 2.0  # Keep ~800x600 OS window while rendering at 400x300
 WINDOW_SCALE_MIN = 1.0
 WINDOW_SCALE_MAX = DEFAULT_WINDOW_SCALE * 2  # Allow up to 1600x1200 windows
-SCREEN_WIDTH = LOGICAL_SCREEN_WIDTH  # Logical render width
-SCREEN_HEIGHT = LOGICAL_SCREEN_HEIGHT  # Logical render height
 FPS = 60
 STATUS_BAR_HEIGHT = 18
 
+# --- 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
+
 # --- Level dimensions derived from blueprint grid ---
 LEVEL_GRID_COLS = GRID_COLS
 LEVEL_GRID_ROWS = GRID_ROWS
@@ -27,18 +30,27 @@ LEVEL_WIDTH = LEVEL_GRID_COLS * CELL_SIZE
 LEVEL_HEIGHT = LEVEL_GRID_ROWS * CELL_SIZE
 
 # --- Player and companion settings ---
-PLAYER_RADIUS = 6
+HUMANOID_RADIUS = 6
+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 = 80
+FOV_RADIUS = 124  # approximate legacy FOV (80) * 1.55 cap
 FOG_RADIUS_SCALE = 1.2
-FOG_MAX_RADIUS_FACTOR = 1.55
 FOG_HATCH_PIXEL_SCALE = 2
-COMPANION_RADIUS = PLAYER_RADIUS
+COMPANION_RADIUS = HUMANOID_RADIUS
 COMPANION_FOLLOW_SPEED = PLAYER_SPEED * 0.7
 COMPANION_COLOR = (0, 200, 70)
 
 # --- Survivor settings (Stage 4) ---
-SURVIVOR_RADIUS = PLAYER_RADIUS - 1
+SURVIVOR_RADIUS = HUMANOID_RADIUS
 SURVIVOR_COLOR = (220, 220, 255)
 SURVIVOR_APPROACH_RADIUS = 48
 SURVIVOR_APPROACH_SPEED = PLAYER_SPEED * 0.35
@@ -56,12 +68,9 @@ SURVIVOR_CONVERSION_LINE_KEYS = [
 SURVIVOR_STAGE_WAITING_CAR_COUNT = 2
 
 # --- Flashlight settings ---
-DEFAULT_FLASHLIGHT_BONUS_SCALE = float(
-    DEFAULT_CONFIG.get("flashlight", {}).get("bonus_scale", 1.35)
-)
+FLASHLIGHT_FOG_SCALE_STEP = 0.3
 FLASHLIGHT_WIDTH = 10
 FLASHLIGHT_HEIGHT = 8
-FLASHLIGHT_PICKUP_RADIUS = 13
 DEFAULT_FLASHLIGHT_SPAWN_COUNT = 2
 
 # --- Footprint settings ---
@@ -74,19 +83,21 @@ FOOTPRINT_MAX = 320
 FOOTPRINT_MIN_FADE = 0.3
 
 # --- Zombie settings ---
-ZOMBIE_RADIUS = 6
+ZOMBIE_RADIUS = HUMANOID_RADIUS
 ZOMBIE_SPEED = 0.6
 NORMAL_ZOMBIE_SPEED_JITTER = 0.15
-ZOMBIE_SPAWN_DELAY_MS = 5000
+ZOMBIE_SPAWN_DELAY_MS = 4000
 MAX_ZOMBIES = 400
 INITIAL_ZOMBIES_INSIDE = 15
 ZOMBIE_INTERIOR_SPAWN_RATE = 0.015
 ZOMBIE_SPAWN_PLAYER_BUFFER = 140
 ZOMBIE_MODE_CHANGE_INTERVAL_MS = 5000
-ZOMBIE_SIGHT_RANGE = FOV_RADIUS * 2.0
+ZOMBIE_SIGHT_RANGE = FOV_RADIUS * 1.2
 FAST_ZOMBIE_BASE_SPEED = PLAYER_SPEED * 0.77
 FAST_ZOMBIE_SPEED_JITTER = 0.075
 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
 
 # --- Car and fuel settings ---
 CAR_WIDTH = 15
@@ -98,22 +109,23 @@ CAR_ZOMBIE_DAMAGE = 1
 CAR_HINT_DELAY_MS_DEFAULT = 300000
 FUEL_CAN_WIDTH = 11
 FUEL_CAN_HEIGHT = 15
-FUEL_PICKUP_RADIUS = 12
 FUEL_HINT_DURATION_MS = 1600
 
 # --- Wall and beam settings ---
 INTERNAL_WALL_GRID_SNAP = CELL_SIZE
-INTERNAL_WALL_HEALTH = 40
-OUTER_WALL_HEALTH = 9999
-STEEL_BEAM_HEALTH = INTERNAL_WALL_HEALTH * 2
+INTERNAL_WALL_HEALTH = 40 * 100
+OUTER_WALL_HEALTH = 999999
+STEEL_BEAM_HEALTH = int(INTERNAL_WALL_HEALTH * 1.5)
+PLAYER_WALL_DAMAGE = 100
+ZOMBIE_WALL_DAMAGE = 1
 
 # --- Rendering assets shared with draw routines ---
 FOG_RINGS = [
-    FogRing(radius_factor=0.82, thickness=2),
-    FogRing(radius_factor=0.99, thickness=4),
-    FogRing(radius_factor=1.16, thickness=6),
-    FogRing(radius_factor=1.33, thickness=8),
-    FogRing(radius_factor=1.5, thickness=12),
+    FogRing(radius_factor=0.529, thickness=2),
+    FogRing(radius_factor=0.639, thickness=4),
+    FogRing(radius_factor=0.748, thickness=6),
+    FogRing(radius_factor=0.858, thickness=8),
+    FogRing(radius_factor=0.968, thickness=12),
 ]
 
 RENDER_ASSETS = RenderAssets(
@@ -123,7 +135,6 @@ RENDER_ASSETS = RenderAssets(
     player_radius=PLAYER_RADIUS,
     fov_radius=FOV_RADIUS,
     fog_radius_scale=FOG_RADIUS_SCALE,
-    fog_max_radius_factor=FOG_MAX_RADIUS_FACTOR,
     fog_hatch_pixel_scale=FOG_HATCH_PIXEL_SCALE,
     fog_rings=FOG_RINGS,
     footprint_radius=FOOTPRINT_RADIUS,
@@ -131,32 +142,25 @@ RENDER_ASSETS = RenderAssets(
     footprint_lifetime_ms=FOOTPRINT_LIFETIME_MS,
     footprint_min_fade=FOOTPRINT_MIN_FADE,
     internal_wall_grid_snap=INTERNAL_WALL_GRID_SNAP,
-    default_flashlight_bonus_scale=DEFAULT_FLASHLIGHT_BONUS_SCALE,
+    flashlight_bonus_step=FLASHLIGHT_FOG_SCALE_STEP,
 )
 
 __all__ = [
-    "LOGICAL_SCREEN_WIDTH",
-    "LOGICAL_SCREEN_HEIGHT",
-    "RENDER_SCREEN_WIDTH",
-    "RENDER_SCREEN_HEIGHT",
     "DEFAULT_WINDOW_SCALE",
     "WINDOW_SCALE_MIN",
     "WINDOW_SCALE_MAX",
     "SCREEN_WIDTH",
     "SCREEN_HEIGHT",
     "FPS",
-    "STATUS_BAR_HEIGHT",
     "LEVEL_GRID_COLS",
     "LEVEL_GRID_ROWS",
     "CELL_SIZE",
     "LEVEL_WIDTH",
     "LEVEL_HEIGHT",
+    "HUMANOID_RADIUS",
+    "interaction_radius",
     "PLAYER_RADIUS",
     "PLAYER_SPEED",
-    "FOV_RADIUS",
-    "FOG_RADIUS_SCALE",
-    "FOG_MAX_RADIUS_FACTOR",
-    "FOG_HATCH_PIXEL_SCALE",
     "COMPANION_RADIUS",
     "COMPANION_FOLLOW_SPEED",
     "COMPANION_COLOR",
@@ -172,18 +176,18 @@ __all__ = [
     "SURVIVOR_MESSAGE_DURATION_MS",
     "SURVIVOR_CONVERSION_LINE_KEYS",
     "SURVIVOR_STAGE_WAITING_CAR_COUNT",
-    "DEFAULT_FLASHLIGHT_BONUS_SCALE",
+    "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",
     "FLASHLIGHT_WIDTH",
     "FLASHLIGHT_HEIGHT",
-    "FLASHLIGHT_PICKUP_RADIUS",
     "DEFAULT_FLASHLIGHT_SPAWN_COUNT",
-    "FOOTPRINT_RADIUS",
-    "FOOTPRINT_OVERVIEW_RADIUS",
     "FOOTPRINT_COLOR",
     "FOOTPRINT_STEP_DISTANCE",
-    "FOOTPRINT_LIFETIME_MS",
     "FOOTPRINT_MAX",
-    "FOOTPRINT_MIN_FADE",
     "ZOMBIE_RADIUS",
     "ZOMBIE_SPEED",
     "NORMAL_ZOMBIE_SPEED_JITTER",
@@ -197,6 +201,9 @@ __all__ = [
     "FAST_ZOMBIE_BASE_SPEED",
     "FAST_ZOMBIE_SPEED_JITTER",
     "ZOMBIE_SEPARATION_DISTANCE",
+    "ZOMBIE_AGING_DURATION_FRAMES",
+    "ZOMBIE_AGING_MIN_SPEED_RATIO",
+    "car_body_radius",
     "CAR_WIDTH",
     "CAR_HEIGHT",
     "CAR_SPEED",
@@ -206,12 +213,11 @@ __all__ = [
     "CAR_HINT_DELAY_MS_DEFAULT",
     "FUEL_CAN_WIDTH",
     "FUEL_CAN_HEIGHT",
-    "FUEL_PICKUP_RADIUS",
     "FUEL_HINT_DURATION_MS",
-    "INTERNAL_WALL_GRID_SNAP",
     "INTERNAL_WALL_HEALTH",
     "OUTER_WALL_HEALTH",
     "STEEL_BEAM_HEALTH",
-    "FOG_RINGS",
+    "PLAYER_WALL_DAMAGE",
+    "ZOMBIE_WALL_DAMAGE",
     "RENDER_ASSETS",
 ]