zombie-escape 1.14.4__py3-none-any.whl → 1.15.2__py3-none-any.whl

zombie_escape/locales/ui.ja.json

@@ -9,14 +9,15 @@
     "fonts": {
       "primary": {
         "resource": "assets/fonts/misaki_gothic.ttf",
-        "scale": 0.7
+        "scale": 0.7,
+        "line_height_scale": 1.4
       }
     },
     "menu": {
       "settings": "設定",
       "quit": "終了",
       "locked_suffix": "[Locked]",
-      "window_hint": "[キーでウィンドウを小さく、]キーで大きく。\nF: フルスクリーン切替。",
+      "window_hint": "[キーで1段階縮小（400x300）、]キーで1段階拡大。\nF: フルスクリーン切替。",
       "seed_label": "シード: %{value}",
       "seed_hint": "数字キーで入力、BSでクリア",
       "seed_empty": "(自動)",
@@ -24,7 +25,7 @@
         "stage_select": "ステージ",
         "resources": "リソース"
       },
-      "readme": "README を開く",
+      "readme": "README/ライセンス",
       "readme_stage6": "ステージ6以降の説明を開く",
       "hints": {
         "navigate": "上下: 項目選択",
@@ -34,7 +35,7 @@
       "option_help": {
         "settings": "設定画面を開いて言語や補助オプションを変更します。",
         "quit": "ゲームを終了します。",
-        "readme": "GitHub の README ページをブラウザで開きます。",
+        "readme": "GitHub の README ページをブラウザで開きます。ライセンス情報もここから確認できます",
         "readme_stage6": "ステージ6以降の説明ページをブラウザで開きます。"
       }
     },
@@ -67,7 +68,8 @@
       },
       "stage5": {
         "name": "#5 持久戦",
-        "description": "燃料なし。20分耐え、夜明けになったら徒歩で脱出せよ。"
+        "description": "燃料なし。20分耐え、夜明けになったら徒歩で脱出せよ。",
+        "intro": "（屋内に燃料はなさそうだ...\n夜明けまで耐えるしかないか。）"
       },
       "stage6": {
         "name": "#6 追ってくる影",
@@ -94,6 +96,7 @@
       "stage10": {
         "name": "#10 感染爆発",
         "description": "建物に避難した生存者の中にゾンビが紛れ込んでいた。",
+        "intro": "（広いフロアに避難者が密集している\n...嫌な予感がする。）",
         "survivor_conversion_messages": [
           "痛いぃ！",
           "無理！無理！",
@@ -128,7 +131,8 @@
       },
       "stage15": {
         "name": "#15 分断ライン",
-        "description": "建物中央を分断する危険地帯。横断には注意。"
+        "description": "建物中央を分断する危険地帯。横断には注意。",
+        "intro": "天井付近にメンテナンスハッチが\nぼんやりと見えている。"
       },
       "stage16": {
         "name": "#16 奈落",
@@ -145,6 +149,11 @@
       "stage19": {
         "name": "#19 回廊",
         "description": "細い通路が連なるフロア。"
+      },
+      "stage20": {
+        "name": "#20 救出要請",
+        "description": "合流して車で脱出せよ。",
+        "intro": "「... \nみんな中にいるはずだ。\n合流してくれ。」"
       }
     },
     "status": {
@@ -173,9 +182,9 @@
       "find_fuel": "燃料を探す",
       "find_car": "車を探す",
       "escape": "建物から脱出する",
+      "merge_buddy_single": "相棒と合流する",
+      "merge_buddy_multi": "同僚と合流する（合流済: %{count}/%{limit}人）",
       "pickup_buddy": "相棒を救出する",
-      "find_buddy": "相棒を探す",
-      "escape_with_buddy": "相棒を車に乗せて脱出する",
       "board_buddy": "相棒を車に乗せる",
       "buddy_onboard": "相棒乗車中: %{count}",
       "escape_with_survivors": "生存者を車に乗せて脱出する",
@@ -188,6 +197,7 @@
         "menu": "メニュー",
         "localization": "言語設定",
         "player_support": "サポート",
+        "visual": "視覚",
         "tougher_enemies": "強敵"
       },
       "rows": {
@@ -195,6 +205,7 @@
         "language": "テキスト言語",
         "footprints": "足跡",
         "car_hint": "車のヒント",
+        "shadows": "影の表示",
         "fast_zombies": "高速ゾンビ",
         "steel_beams": "鉄筋"
       },

zombie_escape/localization.py

@@ -27,6 +27,7 @@ class LanguageOption:
 class FontSettings:
     resource: str | None
     scale: float = 1.0
+    line_height_scale: float = 1.0
 
     def scaled_size(self, base_size: int) -> int:
         return max(1, round(base_size * self.scale))
@@ -122,11 +123,16 @@ def get_font_settings(*, name: str = "primary") -> FontSettings:
     data = fonts.get(name, {}) if isinstance(fonts, dict) else {}
     resource = data.get("resource") or DEFAULT_FONT_RESOURCE
     scale_raw = data.get("scale", DEFAULT_FONT_SCALE)
+    line_height_raw = data.get("line_height_scale", 1.0)
     try:
         scale = float(scale_raw)
     except (TypeError, ValueError):
         scale = DEFAULT_FONT_SCALE
-    return FontSettings(resource=resource, scale=scale)
+    try:
+        line_height_scale = float(line_height_raw)
+    except (TypeError, ValueError):
+        line_height_scale = 1.0
+    return FontSettings(resource=resource, scale=scale, line_height_scale=line_height_scale)
 
 
 def _qualify_key(key: str) -> str:

zombie_escape/models.py

@@ -20,6 +20,7 @@ from .localization import translate as tr
 
 if TYPE_CHECKING:  # pragma: no cover - typing-only imports
     from .entities import Camera, Car, Flashlight, FuelCan, Player, Shoes
+    from .level_blueprints import Blueprint
 
 
 @dataclass
@@ -27,6 +28,8 @@ class LevelLayout:
     """Container for level layout rectangles and cell sets."""
 
     field_rect: pygame.Rect
+    grid_cols: int
+    grid_rows: int
     outside_cells: set[tuple[int, int]]
     walkable_cells: list[tuple[int, int]]
     outer_wall_cells: set[tuple[int, int]]
@@ -77,7 +80,8 @@ class ProgressState:
 
     game_over: bool
     game_won: bool
-    game_over_message: str | None
+    timed_message: "TimedMessage | None"
+    fade_in_started_at_ms: int | None
     game_over_at: int | None
     scaled_overview: surface.Surface | None
     overview_created: bool
@@ -91,9 +95,9 @@ class ProgressState:
     ambient_palette_key: str
     hint_expires_at: int
     hint_target_type: str | None
-    fuel_message_until: int
     buddy_rescued: int
     buddy_onboard: int
+    buddy_merged_count: int
     survivors_onboard: int
     survivors_rescued: int
     survivor_messages: list
@@ -115,6 +119,17 @@ class ProgressState:
     player_wall_target_ttl: int
 
 
+@dataclass(frozen=True)
+class TimedMessage:
+    """Timed HUD message with styling and behavior."""
+
+    text: str
+    expires_at_ms: int
+    clear_on_input: bool
+    color: tuple[int, int, int] | None
+    align: str
+
+
 @dataclass
 class Groups:
     """Sprite groups container."""
@@ -136,8 +151,7 @@ class GameData:
     fog: dict
     stage: Stage
     cell_size: int
-    level_width: int
-    level_height: int
+    blueprint: Blueprint | None = None
     fuel: FuelCan | None = None
     flashlights: list[Flashlight] | None = None
     shoes: list[Shoes] | None = None
@@ -154,9 +168,10 @@ class Stage:
     name_key: str
     description_key: str
     available: bool = True
+    intro_key: str | None = None
 
     # Map layout
-    tile_size: int = 50
+    cell_size: int = 50
     grid_cols: int = DEFAULT_GRID_COLS
     grid_rows: int = DEFAULT_GRID_ROWS
     wall_algorithm: str = "default"
@@ -180,7 +195,7 @@ class Stage:
     waiting_car_target_count: int = 1
 
     # Zombie spawning/aging
-    # - initial_interior_spawn_rate: fraction of interior floor tiles to seed.
+    # - initial_interior_spawn_rate: fraction of interior floor cells to seed.
     # - spawn weights: pick area by weight (normalized).
     # - zombie ratios: pick variant by weight (normalized).
     spawn_interval_ms: int = ZOMBIE_SPAWN_DELAY_MS

zombie_escape/render/__init__.py

@@ -25,6 +25,6 @@ __all__ = [
     "show_message",
     "show_message_wrapped",
     "wrap_text",
-    "_draw_status_bar",
-    "_get_fog_scale",
+    "_draw_status_bar",  # export for testing
+    "_get_fog_scale",  # export for testing
 ]

zombie_escape/render/core.py

@@ -11,7 +11,6 @@ from pygame import sprite, surface
 from ..colors import (
     FOOTPRINT_COLOR,
     LIGHT_GRAY,
-    ORANGE,
     WHITE,
     YELLOW,
     get_environment_palette,
@@ -21,7 +20,7 @@ from ..entities import (
     Player,
 )
 from ..entities_constants import INTERNAL_WALL_BEVEL_DEPTH, ZOMBIE_RADIUS
-from ..font_utils import load_font
+from ..font_utils import load_font, render_text_scaled
 from ..gameplay_constants import DEFAULT_FLASHLIGHT_SPAWN_COUNT
 from ..localization import get_font_settings
 from ..localization import translate as tr
@@ -32,6 +31,7 @@ from ..render_constants import (
     FALLING_DUST_COLOR,
     FALLING_WHIRLWIND_COLOR,
     FALLING_ZOMBIE_COLOR,
+    GAMEPLAY_FONT_SIZE,
     PITFALL_ABYSS_COLOR,
     PITFALL_EDGE_DEPTH_OFFSET,
     PITFALL_EDGE_METAL_COLOR,
@@ -39,11 +39,13 @@ from ..render_constants import (
     PITFALL_EDGE_STRIPE_SPACING,
     PLAYER_SHADOW_ALPHA_MULT,
     PLAYER_SHADOW_RADIUS_MULT,
+    FADE_IN_DURATION_MS,
 )
 from .hud import (
     _build_objective_lines,
     _draw_endurance_timer,
     _draw_hint_indicator,
+    _draw_timed_message,
     _draw_inventory_icons,
     _draw_objective,
     _draw_status_bar,
@@ -65,11 +67,19 @@ def show_message(
     size: int,
     color: tuple[int, int, int],
     position: tuple[int, int],
+    *,
+    scale_factor: int = 1,
 ) -> None:
     try:
         font_settings = get_font_settings()
-        font = load_font(font_settings.resource, font_settings.scaled_size(size))
-        text_surface = font.render(text, False, color)
+        scaled_size = font_settings.scaled_size(size)
+        text_surface = render_text_scaled(
+            font_settings.resource,
+            scaled_size,
+            text,
+            color,
+            scale_factor=scale_factor,
+        )
         text_rect = text_surface.get_rect(center=position)
 
         # Add a semi-transparent background rectangle for better visibility
@@ -84,6 +94,23 @@ def show_message(
         print(f"Error rendering font or surface: {e}")
 
 
+def _draw_fade_in_overlay(screen: surface.Surface, state: GameData | Any) -> None:
+    started_at = getattr(state, "fade_in_started_at_ms", None)
+    if started_at is None:
+        return
+    elapsed = max(0, int(state.elapsed_play_ms) - int(started_at))
+    if elapsed <= 0:
+        alpha = 255
+    else:
+        alpha = int(255 * max(0.0, 1.0 - (elapsed / FADE_IN_DURATION_MS)))
+    if alpha <= 0:
+        return
+    overlay = pygame.Surface(screen.get_size())
+    overlay.fill((0, 0, 0))
+    overlay.set_alpha(alpha)
+    screen.blit(overlay, (0, 0))
+
+
 def wrap_long_segment(segment: str, font: pygame.font.Font, max_width: int) -> list[str]:
     lines: list[str] = []
     current = ""
@@ -137,16 +164,30 @@ def blit_wrapped_text(
     color: tuple[int, int, int],
     topleft: tuple[int, int],
     max_width: int,
+    *,
+    resource: str | None = None,
+    size: int | None = None,
+    scale_factor: int = 1,
+    line_height_scale: float = 1.0,
 ) -> None:
     """Render text with simple wrapping constrained to max_width."""
 
     x, y = topleft
-    line_height = font.get_linesize()
+    line_height = int(round(font.get_linesize() * line_height_scale))
     for line in wrap_text(text, font, max_width):
         if not line:
             y += line_height
             continue
-        rendered = font.render(line, False, color)
+        if resource is not None and size is not None:
+            rendered = render_text_scaled(
+                resource,
+                size,
+                line,
+                color,
+                scale_factor=scale_factor,
+            )
+        else:
+            rendered = font.render(line, False, color)
         target.blit(rendered, (x, y))
         y += line_height
 
@@ -224,14 +265,14 @@ def draw_pause_overlay(screen: pygame.Surface) -> None:
     show_message(
         screen,
         tr("hud.paused"),
-        18,
+        GAMEPLAY_FONT_SIZE,
         WHITE,
         (screen_width // 2, 28),
     )
     show_message(
         screen,
         tr("hud.pause_hint"),
-        16,
+        GAMEPLAY_FONT_SIZE,
         LIGHT_GRAY,
         (screen_width // 2, screen_height // 2 + 70),
     )
@@ -291,7 +332,7 @@ def _get_hatch_pattern(
     *,
     color: tuple[int, int, int, int] | None = None,
 ) -> surface.Surface:
-    """Return cached dot hatch tile surface (Bayer-ordered, optionally chunky)."""
+    """Return cached dot hatch cell surface (Bayer-ordered, optionally chunky)."""
     cache = fog_data.setdefault("hatch_patterns", {})
     key = (thickness, color)
     if key in cache:
@@ -491,10 +532,11 @@ def _draw_falling_fx(
     falling_zombies: list[FallingZombie],
     flashlight_count: int,
     dust_rings: list[DustRing],
+    now_ms: int,
 ) -> None:
     if not falling_zombies and not dust_rings:
         return
-    now = pygame.time.get_ticks()
+    now = now_ms
     for fall in falling_zombies:
         pre_fx_ms = max(0, fall.pre_fx_ms)
         fall_duration_ms = max(1, fall.fall_duration_ms)
@@ -719,6 +761,7 @@ def _draw_entities(
     player: Player,
     *,
     has_fuel: bool,
+    show_fuel_indicator: bool,
 ) -> pygame.Rect:
     screen_rect_inflated = screen.get_rect().inflate(100, 100)
     player_screen_rect: pygame.Rect | None = None
@@ -728,12 +771,13 @@ def _draw_entities(
             screen.blit(entity.image, sprite_screen_rect)
         if entity is player:
             player_screen_rect = sprite_screen_rect
-            _draw_fuel_indicator(
-                screen,
-                player_screen_rect,
-                has_fuel=has_fuel,
-                in_car=player.in_car,
-            )
+            if show_fuel_indicator:
+                _draw_fuel_indicator(
+                    screen,
+                    player_screen_rect,
+                    has_fuel=has_fuel,
+                    in_car=player.in_car,
+                )
     return player_screen_rect or camera.apply_rect(player.rect)
 
 
@@ -797,25 +841,6 @@ def _draw_fog_of_war(
     )
 
 
-def _draw_need_fuel_message(
-    screen: surface.Surface,
-    assets: RenderAssets,
-    *,
-    has_fuel: bool,
-    fuel_message_until: int,
-    elapsed_play_ms: int,
-) -> None:
-    if has_fuel or fuel_message_until <= elapsed_play_ms:
-        return
-    show_message(
-        screen,
-        tr("hud.need_fuel"),
-        18,
-        ORANGE,
-        (assets.screen_width // 2, assets.screen_height // 2),
-    )
-
-
 def draw(
     assets: RenderAssets,
     screen: surface.Surface,
@@ -857,54 +882,58 @@ def draw(
         game_data.layout.fall_spawn_cells,
         game_data.layout.pitfall_cells,
     )
-    shadow_layer = _get_shadow_layer(screen.get_size())
-    shadow_layer.fill((0, 0, 0, 0))
-    drew_shadow = _draw_wall_shadows(
-        shadow_layer,
-        camera,
-        wall_cells=game_data.layout.wall_cells,
-        wall_group=game_data.groups.wall_group,
-        outer_wall_cells=game_data.layout.outer_wall_cells,
-        cell_size=game_data.cell_size,
-        light_source_pos=(None if (stage and stage.endurance_stage and state.dawn_ready) else fov_target.rect.center)
-        if fov_target
-        else None,
-    )
-    drew_shadow |= _draw_entity_shadows(
-        shadow_layer,
-        camera,
-        all_sprites,
-        light_source_pos=fov_target.rect.center if fov_target else None,
-        exclude_car=active_car if player.in_car else None,
-        outside_cells=outside_cells,
-        cell_size=game_data.cell_size,
-    )
-    player_shadow_alpha = max(1, int(ENTITY_SHADOW_ALPHA * PLAYER_SHADOW_ALPHA_MULT))
-    player_shadow_radius = int(ZOMBIE_RADIUS * PLAYER_SHADOW_RADIUS_MULT)
-    if player.in_car:
-        drew_shadow |= _draw_single_entity_shadow(
+    shadows_enabled = config.get("visual", {}).get("shadows", {}).get("enabled", True)
+    if shadows_enabled:
+        shadow_layer = _get_shadow_layer(screen.get_size())
+        shadow_layer.fill((0, 0, 0, 0))
+        drew_shadow = _draw_wall_shadows(
             shadow_layer,
             camera,
-            entity=active_car,
-            light_source_pos=fov_target.rect.center if fov_target else None,
-            outside_cells=outside_cells,
+            wall_cells=game_data.layout.wall_cells,
+            wall_group=game_data.groups.wall_group,
+            outer_wall_cells=game_data.layout.outer_wall_cells,
             cell_size=game_data.cell_size,
-            shadow_radius=player_shadow_radius,
-            alpha=player_shadow_alpha,
+            light_source_pos=(
+                None if (stage and stage.endurance_stage and state.dawn_ready) else fov_target.rect.center
+            )
+            if fov_target
+            else None,
         )
-    else:
-        drew_shadow |= _draw_single_entity_shadow(
+        drew_shadow |= _draw_entity_shadows(
             shadow_layer,
             camera,
-            entity=player,
+            all_sprites,
             light_source_pos=fov_target.rect.center if fov_target else None,
+            exclude_car=active_car if player.in_car else None,
             outside_cells=outside_cells,
             cell_size=game_data.cell_size,
-            shadow_radius=player_shadow_radius,
-            alpha=player_shadow_alpha,
         )
-    if drew_shadow:
-        screen.blit(shadow_layer, (0, 0))
+        player_shadow_alpha = max(1, int(ENTITY_SHADOW_ALPHA * PLAYER_SHADOW_ALPHA_MULT))
+        player_shadow_radius = int(ZOMBIE_RADIUS * PLAYER_SHADOW_RADIUS_MULT)
+        if player.in_car:
+            drew_shadow |= _draw_single_entity_shadow(
+                shadow_layer,
+                camera,
+                entity=active_car,
+                light_source_pos=fov_target.rect.center if fov_target else None,
+                outside_cells=outside_cells,
+                cell_size=game_data.cell_size,
+                shadow_radius=player_shadow_radius,
+                alpha=player_shadow_alpha,
+            )
+        else:
+            drew_shadow |= _draw_single_entity_shadow(
+                shadow_layer,
+                camera,
+                entity=player,
+                light_source_pos=fov_target.rect.center if fov_target else None,
+                outside_cells=outside_cells,
+                cell_size=game_data.cell_size,
+                shadow_radius=player_shadow_radius,
+                alpha=player_shadow_alpha,
+            )
+        if drew_shadow:
+            screen.blit(shadow_layer, (0, 0))
     _draw_footprints(
         screen,
         camera,
@@ -918,6 +947,7 @@ def draw(
         all_sprites,
         player,
         has_fuel=has_fuel,
+        show_fuel_indicator=not (stage and stage.endurance_stage),
     )
 
     _draw_falling_fx(
@@ -926,6 +956,7 @@ def draw(
         state.falling_zombies,
         state.flashlight_count,
         state.dust_rings,
+        state.elapsed_play_ms,
     )
 
     _draw_hint_indicator(
@@ -948,13 +979,6 @@ def draw(
         flashlight_count=flashlight_count,
         dawn_ready=state.dawn_ready,
     )
-    _draw_need_fuel_message(
-        screen,
-        assets,
-        has_fuel=has_fuel,
-        fuel_message_until=state.fuel_message_until,
-        elapsed_play_ms=state.elapsed_play_ms,
-    )
 
     objective_lines = _build_objective_lines(
         stage=stage,
@@ -962,7 +986,7 @@ def draw(
         player=player,
         active_car=active_car,
         has_fuel=has_fuel,
-        buddy_onboard=state.buddy_onboard,
+        buddy_merged_count=state.buddy_merged_count,
         buddy_required=stage.buddy_required_count if stage else 0,
         survivors_onboard=state.survivors_onboard,
     )
@@ -990,3 +1014,11 @@ def draw(
         show_fps=state.show_fps,
         fps=fps,
     )
+
+    _draw_fade_in_overlay(screen, state)
+    _draw_timed_message(
+        screen,
+        assets,
+        message=state.timed_message,
+        elapsed_play_ms=state.elapsed_play_ms,
+    )