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

zombie_escape/render.py

@@ -5,29 +5,28 @@ from enum import Enum
 from typing import Any, Callable
 
 import pygame
-from pygame import sprite, surface
 import pygame.surfarray as pg_surfarray  # type: ignore
+from pygame import sprite, surface
 
 from .colors import (
     BLACK,
     BLUE,
     FOOTPRINT_COLOR,
-    INTERNAL_WALL_COLOR,
     LIGHT_GRAY,
     ORANGE,
     YELLOW,
     get_environment_palette,
 )
+from .entities import Camera, Car, Flashlight, FuelCan, Player, Survivor, Wall
+from .font_utils import load_font
 from .gameplay_constants import (
     DEFAULT_FLASHLIGHT_SPAWN_COUNT,
     SURVIVAL_FAKE_CLOCK_RATIO,
 )
-from .entities import Camera, Car, Flashlight, FuelCan, Player, Survivor
-from .font_utils import load_font
 from .localization import get_font_settings
 from .localization import translate as tr
 from .models import GameData, Stage
-from .render_assets import RenderAssets
+from .render_assets import RenderAssets, resolve_wall_colors
 
 
 def show_message(
@@ -76,8 +75,18 @@ def draw_level_overview(
     dark_floor = tuple(max(0, int(channel * 0.55)) for channel in base_floor)
     surface.fill(dark_floor)
     for wall in wall_group:
-        color = getattr(wall, "base_color", INTERNAL_WALL_COLOR)
-        pygame.draw.rect(surface, color, wall.rect)
+        if not isinstance(wall, Wall):
+            raise TypeError("wall_group must contain Wall instances")
+        if wall.max_health > 0:
+            health_ratio = max(0.0, min(1.0, wall.health / wall.max_health))
+        else:
+            health_ratio = 0.0
+        fill_color, _ = resolve_wall_colors(
+            health_ratio=health_ratio,
+            palette_category=wall.palette_category,
+            palette=palette,
+        )
+        pygame.draw.rect(surface, fill_color, wall.rect)
     now = pygame.time.get_ticks()
     for fp in footprints:
         age = now - fp["time"]
@@ -133,7 +142,7 @@ def draw_level_overview(
             surface.blit(parked.image, parked_rect)
 
 
-def get_fog_scale(
+def _get_fog_scale(
     assets: RenderAssets,
     stage: Stage | None,
     flashlight_count: int,
@@ -162,12 +171,12 @@ class FogProfile(Enum):
         self.flashlight_count = flashlight_count
         self.color = color
 
-    def scale(self, assets: RenderAssets, stage: Stage | None) -> float:
+    def _scale(self, assets: RenderAssets, stage: Stage | None) -> float:
         count = max(0, min(self.flashlight_count, _max_flashlight_pickups()))
-        return get_fog_scale(assets, stage, count)
+        return _get_fog_scale(assets, stage, count)
 
     @staticmethod
-    def from_flashlight_count(count: int) -> "FogProfile":
+    def _from_flashlight_count(count: int) -> "FogProfile":
         safe_count = max(0, count)
         if safe_count >= 2:
             return FogProfile.DARK2
@@ -193,7 +202,7 @@ def prewarm_fog_overlays(
         )
 
 
-def get_hatch_pattern(
+def _get_hatch_pattern(
     fog_data: dict[str, Any],
     thickness: int,
     *,
@@ -248,7 +257,7 @@ def _get_fog_overlay_surfaces(
     if key in overlays:
         return overlays[key]
 
-    scale = profile.scale(assets, stage)
+    scale = profile._scale(assets, stage)
     max_radius = int(assets.fov_radius * scale)
     padding = 32
     coverage_width = max(assets.screen_width * 2, max_radius * 2)
@@ -265,7 +274,7 @@ def _get_fog_overlay_surfaces(
     ring_surfaces: list[surface.Surface] = []
     for ring in assets.fog_rings:
         ring_surface = pygame.Surface((width, height), pygame.SRCALPHA)
-        pattern = get_hatch_pattern(
+        pattern = _get_hatch_pattern(
             fog_data,
             ring.thickness,
             pixel_scale=assets.fog_hatch_pixel_scale,
@@ -393,7 +402,7 @@ def _draw_hint_arrow(
     pygame.draw.polygon(screen, color, [tip, left, right])
 
 
-def draw_status_bar(
+def _draw_status_bar(
     screen: surface.Surface,
     assets: RenderAssets,
     config: dict[str, Any],
@@ -483,8 +492,8 @@ def draw(
 
     camera = game_data.camera
     stage = game_data.stage
-    outer_rect = game_data.areas.outer_rect
-    outside_rects = game_data.areas.outside_rects or []
+    outer_rect = game_data.layout.outer_rect
+    outside_rects = game_data.layout.outside_rects or []
     all_sprites = game_data.groups.all_sprites
     fog_surfaces = game_data.fog
     footprints = state.footprints
@@ -492,12 +501,12 @@ def draw(
     flashlight_count = state.flashlight_count
     elapsed_play_ms = state.elapsed_play_ms
     fuel_message_until = state.fuel_message_until
-    buddy_rescued = state.buddy_rescued
     buddy_onboard = state.buddy_onboard
     buddy_required = stage.buddy_required_count if stage else 0
     survivors_onboard = state.survivors_onboard
     survivor_messages = list(state.survivor_messages)
     zombie_group = game_data.groups.zombie_group
+    active_car = game_data.car if game_data.car and game_data.car.alive() else None
 
     palette = get_environment_palette(state.ambient_palette_key)
     screen.fill(palette.outside)
@@ -604,7 +613,7 @@ def draw(
         pygame.draw.rect(screen, (180, 160, 40), indicator_rect, width=1)
 
     if hint_target and player:
-        current_fov_scale = get_fog_scale(
+        current_fov_scale = _get_fog_scale(
             assets,
             stage,
             flashlight_count,
@@ -633,7 +642,7 @@ def draw(
         if state.dawn_ready:
             profile = FogProfile.DAWN
         else:
-            profile = FogProfile.from_flashlight_count(flashlight_count)
+            profile = FogProfile._from_flashlight_count(flashlight_count)
         overlay = _get_fog_overlay_surfaces(
             fog_surfaces,
             assets,
@@ -763,16 +772,22 @@ def draw(
         else:
             objective_lines.append(tr("objectives.survive_until_dawn"))
     elif stage and stage.buddy_required_count > 0:
-        if stage.requires_fuel and not has_fuel:
-            objective_lines.append(tr("objectives.find_fuel"))
-        elif not player.in_car:
-            objective_lines.append(tr("objectives.find_car"))
+        buddy_ready = buddy_onboard >= buddy_required
+        if not active_car:
+            objective_lines.append(tr("objectives.pickup_buddy"))
+            if stage.requires_fuel and not has_fuel:
+                objective_lines.append(tr("objectives.find_fuel"))
+            else:
+                objective_lines.append(tr("objectives.find_car"))
         else:
-            if buddy_rescued < buddy_required:
-                objective_lines.append(tr("objectives.escape_with_buddy"))
+            if stage.requires_fuel and not has_fuel:
+                objective_lines.append(tr("objectives.find_fuel"))
+            elif not buddy_ready:
+                objective_lines.append(tr("objectives.board_buddy"))
                 objective_lines.append(
                     tr("objectives.buddy_onboard", count=buddy_onboard)
                 )
+                objective_lines.append(tr("objectives.escape"))
             else:
                 objective_lines.append(tr("objectives.escape"))
     elif stage and stage.requires_fuel and not has_fuel:
@@ -815,7 +830,7 @@ def draw(
         _render_survival_timer()
     else:
         _render_time_accel_indicator()
-    draw_status_bar(
+    _draw_status_bar(
         screen,
         assets,
         config,