Passengers who are about to make the game end blink for the last 10 seconds of waiting

Author: yanfengliu

PROGRESS.md

@@ -46,6 +46,9 @@ Tests:
 - Added mediator regression coverage for first-arriving eligible metro boarding and travel-plan reassignment to the arriving line.
 - Increased station cap from 10 to 20 by updating `num_stations` in `src/config.py` (unlock milestones now generate up to 20 stations).
 - Updated path unlock milestones to `[0, 90, 300, 650]` in `src/config.py` and adjusted affected unlock-threshold tests in env/gameplay/graph suites.
+- Added pre-timeout passenger warning blink: passengers in the last 10 seconds before `passenger_max_wait_time_ms` now blink on/off in station queues.
+- Threaded render-time wait thresholds through holder/station rendering so passenger warning blink is deterministic from mediator time.
+- Added station rendering regression coverage for warning passenger blink visibility phases.
 
 Tests:
 - `python -m unittest -v`

src/config.py

@@ -38,6 +38,8 @@
 passenger_spawning_interval_step = 10 * framerate
 passenger_display_buffer = 3 * passenger_size
 passenger_max_wait_time_ms = 60_000
+passenger_blink_warning_time_ms = 10_000
+passenger_blink_interval_ms = 250
 max_waiting_passengers = 20
 
 # metro

src/entity/holder.py

@@ -23,7 +23,12 @@ def __init__(self, shape: Shape, capacity: int, id: str) -> None:
     def __repr__(self) -> str:
         return self.id
 
-    def draw(self, surface: pygame.surface.Surface):
+    def draw(
+        self,
+        surface: pygame.surface.Surface,
+        current_time_ms: int | None = None,
+        passenger_max_wait_time_ms: int | None = None,
+    ):
         # draw self
         self.shape.draw(surface, self.position)
 
@@ -42,7 +47,11 @@ def draw(self, surface: pygame.surface.Surface):
                 )
             )
 
-            passenger.draw(surface)
+            passenger.draw(
+                surface,
+                current_time_ms=current_time_ms,
+                max_wait_time_ms=passenger_max_wait_time_ms,
+            )
 
             if col < (self.passengers_per_row - 1):
                 col += 1

src/entity/passenger.py

@@ -1,4 +1,5 @@
 import pygame
+from config import passenger_blink_interval_ms, passenger_blink_warning_time_ms
 from geometry.point import Point
 from geometry.shape import Shape
 from shortuuid import uuid  # type: ignore
@@ -18,5 +19,27 @@ def __repr__(self) -> str:
     def __hash__(self) -> int:
         return hash(self.id)
 
-    def draw(self, surface: pygame.surface.Surface):
+    def is_in_warning_window(self, max_wait_time_ms: int) -> bool:
+        return (
+            self.wait_ms < max_wait_time_ms
+            and (max_wait_time_ms - self.wait_ms) <= passenger_blink_warning_time_ms
+        )
+
+    def is_warning_blink_visible(self, current_time_ms: int) -> bool:
+        phase_index = int(current_time_ms / passenger_blink_interval_ms)
+        return phase_index % 2 == 0
+
+    def draw(
+        self,
+        surface: pygame.surface.Surface,
+        current_time_ms: int | None = None,
+        max_wait_time_ms: int | None = None,
+    ):
+        if (
+            current_time_ms is not None
+            and max_wait_time_ms is not None
+            and self.is_in_warning_window(max_wait_time_ms)
+            and not self.is_warning_blink_visible(current_time_ms)
+        ):
+            return
         self.destination_shape.draw(surface, self.position)

src/entity/station.py

@@ -56,10 +56,15 @@ def draw(
         self,
         surface: pygame.surface.Surface,
         current_time_ms: int | None = None,
+        passenger_max_wait_time_ms: int | None = None,
     ) -> None:
         if (
             current_time_ms is not None
             and not self.is_unlock_blink_visible(current_time_ms)
         ):
             return
-        super().draw(surface)
+        super().draw(
+            surface,
+            current_time_ms=current_time_ms,
+            passenger_max_wait_time_ms=passenger_max_wait_time_ms,
+        )

src/mediator.py

@@ -188,7 +188,11 @@ def render(self, screen: pygame.surface.Surface) -> None:
             path_order = idx - (active_path_count // 2)
             path.draw(screen, path_order)
         for station in self.stations:
-            station.draw(screen, self.time_ms)
+            station.draw(
+                screen,
+                self.time_ms,
+                passenger_max_wait_time_ms=self.passenger_max_wait_time_ms,
+            )
         for metro in self.metros:
             metro.draw(screen)
         for button in self.buttons:

test/test_station.py

@@ -6,7 +6,13 @@
 sys.path.append(os.path.dirname(os.path.realpath(__file__)) + "/../src")
 
 import pygame
-from config import passenger_display_buffer, passenger_size, station_color, station_size
+from config import (
+    passenger_display_buffer,
+    passenger_max_wait_time_ms,
+    passenger_size,
+    station_color,
+    station_size,
+)
 from entity.get_entity import get_metros
 from entity.metro import Metro
 from entity.passenger import Passenger
@@ -96,6 +102,28 @@ def test_station_unlock_blink_hides_shape_during_off_phase(self):
         station.draw(self.screen, current_time_ms=200)
         station.shape.draw.assert_not_called()
 
+    def test_station_draw_hides_warning_passenger_during_off_phase(self):
+        station = Station(Circle(station_color, station_size), Point(0, 0))
+        passenger = Passenger(Circle((0, 0, 0), 3))
+        passenger.wait_ms = passenger_max_wait_time_ms - 5_000
+        station.add_passenger(passenger)
+        passenger.destination_shape.draw = MagicMock()
+
+        station.draw(
+            self.screen,
+            current_time_ms=0,
+            passenger_max_wait_time_ms=passenger_max_wait_time_ms,
+        )
+        passenger.destination_shape.draw.assert_called_once()
+
+        passenger.destination_shape.draw.reset_mock()
+        station.draw(
+            self.screen,
+            current_time_ms=250,
+            passenger_max_wait_time_ms=passenger_max_wait_time_ms,
+        )
+        passenger.destination_shape.draw.assert_not_called()
+
 
 if __name__ == "__main__":
     unittest.main()