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

zombie_escape/gameplay/survivors.py

@@ -16,15 +16,11 @@ from ..entities_constants import (
     SURVIVOR_RADIUS,
     ZOMBIE_RADIUS,
 )
-from .constants import (
-    SURVIVOR_CONVERSION_LINE_KEYS,
-    SURVIVOR_MESSAGE_DURATION_MS,
-    SURVIVOR_SPEED_PENALTY_PER_PASSENGER,
-)
-from ..localization import translate as tr
+from .constants import SURVIVOR_MESSAGE_DURATION_MS, SURVIVOR_SPEED_PENALTY_PER_PASSENGER
+from ..localization import translate as tr, translate_dict, translate_list
 from ..models import GameData, ProgressState
 from ..rng import get_rng
-from ..entities import Survivor, spritecollideany_walls, WallIndex
+from ..entities import Survivor, Zombie, spritecollideany_walls, WallIndex
 from .spawn import _create_zombie
 from .utils import find_nearby_offscreen_spawn_position, rect_visible_on_screen
 
@@ -51,6 +47,10 @@ def update_survivors(
             wall_group,
             wall_index=wall_index,
             cell_size=game_data.cell_size,
+            wall_cells=game_data.layout.wall_cells,
+            bevel_corners=game_data.layout.bevel_corners,
+            grid_cols=game_data.stage.grid_cols,
+            grid_rows=game_data.stage.grid_rows,
             level_width=game_data.level_width,
             level_height=game_data.level_height,
         )
@@ -150,11 +150,40 @@ def add_survivor_message(game_data: GameData, text: str) -> None:
     game_data.state.survivor_messages.append({"text": text, "expires_at": expires})
 
 
-def random_survivor_conversion_line() -> str:
-    if not SURVIVOR_CONVERSION_LINE_KEYS:
+def _normalize_legacy_conversion_lines(data: dict[str, Any]) -> list[str]:
+    numbered: list[tuple[int, str]] = []
+    others: list[tuple[str, str]] = []
+    for key, value in data.items():
+        if not value:
+            continue
+        text = str(value)
+        if isinstance(key, str) and key.startswith("line"):
+            suffix = key[4:]
+            if suffix.isdigit():
+                numbered.append((int(suffix), text))
+                continue
+        others.append((str(key), text))
+    numbered.sort(key=lambda item: item[0])
+    others.sort(key=lambda item: item[0])
+    return [text for _, text in numbered] + [text for _, text in others]
+
+
+def _get_survivor_conversion_messages(stage_id: str) -> list[str]:
+    key = f"stages.{stage_id}.survivor_conversion_messages"
+    raw = translate_list(key)
+    if raw:
+        return [str(item) for item in raw if item]
+    legacy = translate_dict(f"stages.{stage_id}.conversion_lines")
+    if legacy:
+        return _normalize_legacy_conversion_lines(legacy)
+    return []
+
+
+def random_survivor_conversion_line(stage_id: str) -> str:
+    lines = _get_survivor_conversion_messages(stage_id)
+    if not lines:
         return ""
-    key = RNG.choice(SURVIVOR_CONVERSION_LINE_KEYS)
-    return tr(key)
+    return RNG.choice(lines)
 
 
 def cleanup_survivor_messages(state: ProgressState) -> None:
@@ -224,7 +253,7 @@ def handle_survivor_zombie_collisions(
         min_x = survivor.rect.centerx - search_radius
         max_x = survivor.rect.centerx + search_radius
         start_idx = bisect_left(zombie_xs, min_x)
-        collided = False
+        collided_zombie: Zombie | None = None
         for idx in range(start_idx, len(zombies)):
             zombie_x = zombie_xs[idx]
             if zombie_x > max_x:
@@ -237,10 +266,10 @@ def handle_survivor_zombie_collisions(
                 continue
             dx = zombie_x - survivor.rect.centerx
             if dx * dx + dy * dy <= search_radius_sq:
-                collided = True
+                collided_zombie = zombie
                 break
 
-        if not collided:
+        if collided_zombie is None:
             continue
         if not rect_visible_on_screen(camera, survivor.rect):
             spawn_pos = find_nearby_offscreen_spawn_position(
@@ -250,13 +279,15 @@ def handle_survivor_zombie_collisions(
             survivor.teleport(spawn_pos)
             continue
         survivor.kill()
-        line = random_survivor_conversion_line()
+        line = random_survivor_conversion_line(game_data.stage.id)
         if line:
             add_survivor_message(game_data, line)
         new_zombie = _create_zombie(
             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)),
         )
         zombie_group.add(new_zombie)
         game_data.groups.all_sprites.add(new_zombie, layer=1)

zombie_escape/input_utils.py

@@ -0,0 +1,167 @@
+from __future__ import annotations
+
+from typing import Tuple
+
+import pygame
+
+DEADZONE = 0.25
+JOY_BUTTON_A = 0
+JOY_BUTTON_BACK = 6
+JOY_BUTTON_START = 7
+JOY_BUTTON_RB = 5
+
+CONTROLLER_AVAILABLE = hasattr(pygame, "controller")
+CONTROLLER_DEVICE_ADDED = getattr(pygame, "CONTROLLERDEVICEADDED", None)
+CONTROLLER_DEVICE_REMOVED = getattr(pygame, "CONTROLLERDEVICEREMOVED", None)
+CONTROLLER_BUTTON_DOWN = getattr(pygame, "CONTROLLERBUTTONDOWN", None)
+CONTROLLER_BUTTON_A = getattr(pygame, "CONTROLLER_BUTTON_A", None)
+CONTROLLER_BUTTON_BACK = getattr(pygame, "CONTROLLER_BUTTON_BACK", None)
+CONTROLLER_BUTTON_START = getattr(pygame, "CONTROLLER_BUTTON_START", None)
+CONTROLLER_BUTTON_DPAD_UP = getattr(pygame, "CONTROLLER_BUTTON_DPAD_UP", None)
+CONTROLLER_BUTTON_DPAD_DOWN = getattr(pygame, "CONTROLLER_BUTTON_DPAD_DOWN", None)
+CONTROLLER_BUTTON_DPAD_LEFT = getattr(pygame, "CONTROLLER_BUTTON_DPAD_LEFT", None)
+CONTROLLER_BUTTON_DPAD_RIGHT = getattr(pygame, "CONTROLLER_BUTTON_DPAD_RIGHT", None)
+CONTROLLER_BUTTON_RB = getattr(pygame, "CONTROLLER_BUTTON_RIGHTSHOULDER", None)
+CONTROLLER_AXIS_LEFTX = getattr(pygame, "CONTROLLER_AXIS_LEFTX", None)
+CONTROLLER_AXIS_LEFTY = getattr(pygame, "CONTROLLER_AXIS_LEFTY", None)
+CONTROLLER_AXIS_TRIGGERRIGHT = getattr(
+    pygame, "CONTROLLER_AXIS_TRIGGERRIGHT", None
+)
+
+
+def init_first_controller() -> pygame.controller.Controller | None:
+    if not CONTROLLER_AVAILABLE:
+        return None
+    try:
+        if pygame.controller.get_count() > 0:
+            controller = pygame.controller.Controller(0)
+            if not controller.get_init():
+                controller.init()
+            return controller
+    except pygame.error:
+        return None
+    return None
+
+
+def init_first_joystick() -> pygame.joystick.Joystick | None:
+    try:
+        if pygame.joystick.get_count() > 0:
+            joystick = pygame.joystick.Joystick(0)
+            if not joystick.get_init():
+                joystick.init()
+            return joystick
+    except pygame.error:
+        return None
+    return None
+
+
+def is_confirm_event(event: pygame.event.Event) -> bool:
+    if CONTROLLER_BUTTON_DOWN is not None and event.type == CONTROLLER_BUTTON_DOWN:
+        return CONTROLLER_BUTTON_A is not None and event.button == CONTROLLER_BUTTON_A
+    if event.type == pygame.JOYBUTTONDOWN:
+        return event.button == JOY_BUTTON_A
+    return False
+
+
+def is_start_event(event: pygame.event.Event) -> bool:
+    if CONTROLLER_BUTTON_DOWN is not None and event.type == CONTROLLER_BUTTON_DOWN:
+        return (
+            CONTROLLER_BUTTON_START is not None
+            and event.button == CONTROLLER_BUTTON_START
+        )
+    if event.type == pygame.JOYBUTTONDOWN:
+        return event.button == JOY_BUTTON_START
+    return False
+
+
+def is_select_event(event: pygame.event.Event) -> bool:
+    if CONTROLLER_BUTTON_DOWN is not None and event.type == CONTROLLER_BUTTON_DOWN:
+        return (
+            CONTROLLER_BUTTON_BACK is not None
+            and event.button == CONTROLLER_BUTTON_BACK
+        )
+    if event.type == pygame.JOYBUTTONDOWN:
+        return event.button == JOY_BUTTON_BACK
+    return False
+
+
+def read_gamepad_move(
+    controller: pygame.controller.Controller | None,
+    joystick: pygame.joystick.Joystick | None,
+    *,
+    deadzone: float = DEADZONE,
+) -> Tuple[float, float]:
+    x = 0.0
+    y = 0.0
+    if controller and controller.get_init():
+        if CONTROLLER_AXIS_LEFTX is None or CONTROLLER_AXIS_LEFTY is None:
+            return 0.0, 0.0
+        x = float(controller.get_axis(CONTROLLER_AXIS_LEFTX))
+        y = float(controller.get_axis(CONTROLLER_AXIS_LEFTY))
+        if abs(x) < deadzone:
+            x = 0.0
+        if abs(y) < deadzone:
+            y = 0.0
+        if (
+            CONTROLLER_BUTTON_DPAD_LEFT is not None
+            and controller.get_button(CONTROLLER_BUTTON_DPAD_LEFT)
+        ):
+            x = -1.0
+        elif (
+            CONTROLLER_BUTTON_DPAD_RIGHT is not None
+            and controller.get_button(CONTROLLER_BUTTON_DPAD_RIGHT)
+        ):
+            x = 1.0
+        if (
+            CONTROLLER_BUTTON_DPAD_UP is not None
+            and controller.get_button(CONTROLLER_BUTTON_DPAD_UP)
+        ):
+            y = -1.0
+        elif (
+            CONTROLLER_BUTTON_DPAD_DOWN is not None
+            and controller.get_button(CONTROLLER_BUTTON_DPAD_DOWN)
+        ):
+            y = 1.0
+        return x, y
+
+    if joystick and joystick.get_init():
+        if joystick.get_numaxes() >= 2:
+            x = float(joystick.get_axis(0))
+            y = float(joystick.get_axis(1))
+            if abs(x) < deadzone:
+                x = 0.0
+            if abs(y) < deadzone:
+                y = 0.0
+        if joystick.get_numhats() > 0:
+            hat_x, hat_y = joystick.get_hat(0)
+            if hat_x:
+                x = float(hat_x)
+            if hat_y:
+                y = float(-hat_y)
+    return x, y
+
+
+def is_accel_active(
+    keys: pygame.key.ScancodeWrapper,
+    controller: pygame.controller.Controller | None,
+    joystick: pygame.joystick.Joystick | None,
+) -> bool:
+    if keys[pygame.K_LSHIFT] or keys[pygame.K_RSHIFT]:
+        return True
+    if controller and controller.get_init():
+        if (
+            CONTROLLER_BUTTON_RB is not None
+            and controller.get_button(CONTROLLER_BUTTON_RB)
+        ):
+            return True
+        if CONTROLLER_AXIS_TRIGGERRIGHT is not None:
+            if controller.get_axis(CONTROLLER_AXIS_TRIGGERRIGHT) > DEADZONE:
+                return True
+    if joystick and joystick.get_init():
+        if joystick.get_numbuttons() > JOY_BUTTON_RB:
+            if joystick.get_button(JOY_BUTTON_RB):
+                return True
+        if joystick.get_numaxes() > 5:
+            if joystick.get_axis(5) > DEADZONE:
+                return True
+    return False

zombie_escape/level_blueprints.py

@@ -6,6 +6,7 @@ EXITS_PER_SIDE = 1  # currently fixed to 1 per side (can be tuned)
 NUM_WALL_LINES = 80  # reduced density (roughly 1/5 of previous 450)
 WALL_MIN_LEN = 3
 WALL_MAX_LEN = 10
+SPARSE_WALL_DENSITY = 0.10
 SPAWN_MARGIN = 3  # keep spawns away from walls/edges
 SPAWN_ZOMBIES = 3
 
@@ -201,10 +202,37 @@ def _place_walls_grid_wire(grid: list[list[str]]) -> None:
                 grid[y][x] = "1"
 
 
+def _place_walls_sparse(grid: list[list[str]]) -> None:
+    """Place isolated wall tiles at a low density, avoiding adjacency."""
+    cols, rows = len(grid[0]), len(grid)
+    forbidden = _collect_exit_adjacent_cells(grid)
+    for y in range(2, rows - 2):
+        for x in range(2, cols - 2):
+            if (x, y) in forbidden:
+                continue
+            if grid[y][x] != ".":
+                continue
+            if RNG.random() >= SPARSE_WALL_DENSITY:
+                continue
+            if (
+                grid[y - 1][x] == "1"
+                or grid[y + 1][x] == "1"
+                or grid[y][x - 1] == "1"
+                or grid[y][x + 1] == "1"
+                or grid[y - 1][x - 1] == "1"
+                or grid[y - 1][x + 1] == "1"
+                or grid[y + 1][x - 1] == "1"
+                or grid[y + 1][x + 1] == "1"
+            ):
+                continue
+            grid[y][x] = "1"
+
+
 WALL_ALGORITHMS = {
     "default": _place_walls_default,
     "empty": _place_walls_empty,
     "grid_wire": _place_walls_grid_wire,
+    "sparse": _place_walls_sparse,
 }
 
 

zombie_escape/locales/ui.en.json

@@ -28,7 +28,7 @@
       "hints": {
         "navigate": "Up/Down: choose an option",
         "page_switch": "Left/Right: switch stage groups",
-        "confirm": "Enter/Space: activate selection"
+        "confirm": "Enter/Space/South: activate selection"
       },
       "option_help": {
         "settings": "Open Settings to adjust assists and localization.",
@@ -56,7 +56,12 @@
           "line1": "It hurts!",
           "line2": "I can't hold on!",
           "line3": "Stay back!"
-        }
+        },
+        "survivor_conversion_messages": [
+          "It hurts!",
+          "I can't hold on!",
+          "Stay back!"
+        ]
       },
       "stage5": {
         "name": "#5 Survive Until Dawn",
@@ -75,8 +80,33 @@
         "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."
+        "name": "#9 Evacuate Survivors 2",
+        "description": "Evacuate like stage 4, but narrow corridors. Requires fuel.",
+        "survivor_conversion_messages": [
+          "It hurts!",
+          "I can't hold on!",
+          "Stay back!",
+          "Stop!"
+        ]
+      },
+      "stage10": {
+        "name": "#10 Outbreak",
+        "description": "Zombies have infiltrated a building where survivors took shelter.",
+        "survivor_conversion_messages": [
+          "It hurts!",
+          "I can't hold on!",
+          "Stay back!",
+          "Stop!",
+          "Whoa!",
+          "Eeeeek!",
+          "Noooo!",
+          "Help me!",
+          "Get away!",
+          "Someone help!",
+          "Don't touch me!",
+          "No, no, no!",
+          "Please!"
+        ]
       }
     },
     "status": {
@@ -91,10 +121,10 @@
     "hud": {
       "need_fuel": "Need fuel to drive!",
       "paused": "PAUSED",
-      "resume_hint": "Press P or click to resume",
+      "pause_hint": "P/Start: Resume · ESC/Select: Return to Title",
       "survival_timer_label": "Until dawn %{time}",
       "time_accel": ">> 4x",
-      "time_accel_hint": "Hold Shift: 4x"
+      "time_accel_hint": "Hold Shift/R1: 4x"
     },
     "survivors": {
       "too_many_aboard": "Too many aboard!"
@@ -117,11 +147,13 @@
     "settings": {
       "title": "Settings",
       "sections": {
+        "menu": "Menu",
         "localization": "Localization",
         "player_support": "Player support",
         "tougher_enemies": "Tougher enemies"
       },
       "rows": {
+        "return_to_title": "Return to Title",
         "language": "Language",
         "footprints": "Footprints",
         "car_hint": "Car hint",
@@ -131,9 +163,9 @@
       "hints": {
         "navigate": "Up/Down: select a setting",
         "adjust": "Left/Right: set value",
-        "toggle": "Space/Enter: toggle value",
+        "toggle": "Space/Enter/South: toggle value",
         "reset": "R: reset to defaults",
-        "exit": "Esc/Backspace: save and return",
+        "exit": "Esc/BS/Select: save and return",
         "fullscreen": "F: toggle fullscreen"
       },
       "config_path": "Config: %{path}",
@@ -146,7 +178,7 @@
     "game_over": {
       "win": "YOU ESCAPED!",
       "lose": "GAME OVER",
-      "prompt": "ESC/SPACE: Title · R: Retry",
+      "prompt": "ESC/SPACE/Select/South: Title · R: Retry",
       "scream": "AAAAHHH!!",
       "survivors_summary": "Evacuated: %{count}",
       "survival_duration": "Time survived %{time}"

zombie_escape/locales/ui.ja.json

@@ -28,7 +28,7 @@
       "hints": {
         "navigate": "上下: 項目選択",
         "page_switch": "左右: ステージ群切替",
-        "confirm": "Enter/Space: 決定または実行"
+        "confirm": "Enter/Space/South: 決定または実行"
       },
       "option_help": {
         "settings": "設定画面を開いて言語や補助オプションを変更します。",
@@ -56,7 +56,12 @@
           "line1": "痛いぃ！",
           "line2": "無理！無理！",
           "line3": "来るなぁ！"
-        }
+        },
+        "survivor_conversion_messages": [
+          "痛いぃ！",
+          "無理！無理！",
+          "来るなぁ！"
+        ]
       },
       "stage5": {
         "name": "#5 持久戦",
@@ -76,7 +81,32 @@
       },
       "stage9": {
         "name": "#9 生存者救出 2",
-        "description": "ステージ4と同じだが、狭い通路。燃料も必要。"
+        "description": "ステージ4と同じだが、狭い通路。燃料も必要。",
+        "survivor_conversion_messages": [
+          "痛いぃ！",
+          "無理！無理！",
+          "来るなぁ！",
+          "やめてぇ！"
+        ]
+      },
+      "stage10": {
+        "name": "#10 感染爆発",
+        "description": "建物に避難した生存者の中にゾンビが紛れ込んでいた。",
+        "survivor_conversion_messages": [
+          "痛いぃ！",
+          "無理！無理！",
+          "来るなぁ！",
+          "やめてぇ！",
+          "うわっ！",
+          "ひいいぃ",
+          "いやああ",
+          "助けて！",
+          "近寄るな！",
+          "誰か！",
+          "触るな！",
+          "やだ、やだ！",
+          "誰かー！"
+        ]
       }
     },
     "status": {
@@ -91,10 +121,10 @@
     "hud": {
       "need_fuel": "燃料が必要です！",
       "paused": "一時停止",
-      "resume_hint": "Pキーかクリックで再開",
+      "pause_hint": "P/Start: ゲーム再開  ESC/Select: タイトルに戻る",
       "survival_timer_label": "夜明けまであと %{time}",
       "time_accel": ">> 4x",
-      "time_accel_hint": "Shiftキー押下: 4x"
+      "time_accel_hint": "Shift/R1押下: 4x"
     },
     "survivors": {
       "too_many_aboard": "定員オーバー！"
@@ -117,11 +147,13 @@
     "settings": {
       "title": "設定",
       "sections": {
+        "menu": "メニュー",
         "localization": "言語設定",
         "player_support": "サポート",
         "tougher_enemies": "強敵"
       },
       "rows": {
+        "return_to_title": "タイトルに戻る",
         "language": "テキスト言語",
         "footprints": "足跡",
         "car_hint": "車のヒント",
@@ -131,9 +163,9 @@
       "hints": {
         "navigate": "上下: 項目選択",
         "adjust": "左右: 値の設定",
-        "toggle": "スペース／エンター: 値のトグル",
+        "toggle": "Space/Enter/South: 値のトグル",
         "reset": "R: デフォルト設定に戻す",
-        "exit": "Esc/BS: セーブして戻る",
+        "exit": "Esc/BS/Select: セーブして戻る",
         "fullscreen": "F: フルスクリーン切替"
       },
       "config_path": "設定ファイル: %{path}",
@@ -146,7 +178,7 @@
     "game_over": {
       "win": "脱出成功！",
       "lose": "ゲームオーバー",
-      "prompt": "ESC/Space: タイトルへ  R: 再挑戦",
+      "prompt": "ESC/Space/Select/South: タイトルへ  R: 再挑戦",
       "scream": "ぎゃあーーー!!",
       "survivors_summary": "救出人数: %{count}",
       "survival_duration": "逃げ延びた時間 %{time}"

zombie_escape/localization.py

@@ -108,6 +108,13 @@ def translate_dict(key: str) -> dict[str, Any]:
     return result if isinstance(result, dict) else {}
 
 
+def translate_list(key: str) -> list[Any]:
+    if not _CONFIGURED:
+        set_language(_CURRENT_LANGUAGE)
+    result = _lookup_locale_value(key)
+    return result if isinstance(result, list) else []
+
+
 def get_font_settings(*, name: str = "primary") -> FontSettings:
     _get_language_options()  # ensure locale data is loaded
     locale_data = _LOCALE_DATA.get(_CURRENT_LANGUAGE) or _LOCALE_DATA.get(
@@ -128,6 +135,26 @@ def _qualify_key(key: str) -> str:
     return key if key.startswith("ui.") else f"ui.{key}"
 
 
+def _lookup_locale_value(key: str) -> Any:
+    locale_data = _LOCALE_DATA.get(_CURRENT_LANGUAGE) or _LOCALE_DATA.get(
+        DEFAULT_LANGUAGE, {}
+    )
+    if not isinstance(locale_data, dict):
+        return None
+    qualified = _qualify_key(key)
+    path = qualified.split(".")
+    if path and path[0] == "ui":
+        path = path[1:]
+    current: Any = locale_data
+    for segment in path:
+        if not isinstance(current, dict):
+            return None
+        current = current.get(segment)
+        if current is None:
+            return None
+    return current
+
+
 def _get_language_options() -> tuple[LanguageOption, ...]:
     global _LANGUAGE_OPTIONS
     if _LANGUAGE_OPTIONS is not None:
@@ -182,5 +209,6 @@ __all__ = [
     "language_options",
     "set_language",
     "translate",
+    "translate_list",
     "translate_dict",
 ]

zombie_escape/models.py

@@ -26,6 +26,8 @@ class LevelLayout:
     outside_rects: list[pygame.Rect]
     walkable_cells: list[pygame.Rect]
     outer_wall_cells: set[tuple[int, int]]
+    wall_cells: set[tuple[int, int]]
+    bevel_corners: dict[tuple[int, int], tuple[bool, bool, bool, bool]]
 
 
 @dataclass

zombie_escape/screens/game_over.py

@@ -14,6 +14,7 @@ from ..render import (
     _draw_status_bar,
     show_message,
 )
+from ..input_utils import is_confirm_event, is_select_event
 from ..screens import (
     ScreenID,
     ScreenTransition,
@@ -181,3 +182,6 @@ def game_over_screen(
                         stage=stage,
                         seed=state.seed,
                     )
+            if event.type in (pygame.CONTROLLERBUTTONDOWN, pygame.JOYBUTTONDOWN):
+                if is_select_event(event) or is_confirm_event(event):
+                    return ScreenTransition(ScreenID.TITLE)