Game now ends with 1 passenger waiting over 40 s

Author: yanfengliu

GAME_RULES.md

@@ -67,8 +67,8 @@ This document summarizes the game rules currently implemented in code.
 
 ## Game Over
 
-- A passenger is considered over-waiting at 60 seconds or more of station wait time.
-- Game over occurs when 20 or more passengers are over-waiting.
+- A passenger is considered over-waiting at 40 seconds or more of station wait time.
+- Game over occurs when 1 or more passengers are over-waiting.
 - On game over:
   - Simulation time and gameplay updates stop.
   - A game-over overlay appears with final score.

src/config.py

@@ -44,10 +44,10 @@
 passenger_spawning_start_step = 1
 passenger_spawning_interval_step = 15 * framerate
 passenger_display_buffer = 3 * passenger_size
-passenger_max_wait_time_ms = 60_000
+passenger_max_wait_time_ms = 40_000
 passenger_blink_warning_time_ms = 10_000
 passenger_blink_interval_ms = 250
-max_waiting_passengers = 20
+max_waiting_passengers = 1
 
 # metro
 num_metros = 4

test/test_mediator.py

@@ -496,6 +496,61 @@ def test_increment_time_scales_with_game_speed_multiplier(self):
         mediator.move_passengers.assert_called_once_with(400)
         mediator.update_waiting_and_game_over.assert_called_once_with(400)
 
+    def test_update_waiting_game_over_at_passenger_max_wait_boundary(self):
+        mediator = Mediator()
+        station = Station(Circle(station_color, station_size), Point(0, 0))
+        mediator.stations = [station]
+        passenger = Passenger(Circle(station_color, station_size))
+        station.add_passenger(passenger)
+
+        mediator.passenger_max_wait_time_ms = 100
+        mediator.max_waiting_passengers = 1
+
+        mediator.update_waiting_and_game_over(99)
+        self.assertEqual(passenger.wait_ms, 99)
+        self.assertFalse(mediator.is_game_over)
+
+        mediator.update_waiting_and_game_over(1)
+        self.assertEqual(passenger.wait_ms, 100)
+        self.assertTrue(mediator.is_game_over)
+
+    def test_update_waiting_game_over_respects_max_waiting_passengers(self):
+        mediator = Mediator()
+        station = Station(Circle(station_color, station_size), Point(0, 0))
+        mediator.stations = [station]
+        passenger_a = Passenger(Circle(station_color, station_size))
+        passenger_b = Passenger(Circle(station_color, station_size))
+        station.add_passenger(passenger_a)
+        station.add_passenger(passenger_b)
+
+        mediator.passenger_max_wait_time_ms = 100
+        mediator.max_waiting_passengers = 2
+        passenger_a.wait_ms = 100
+        passenger_b.wait_ms = 99
+
+        mediator.update_waiting_and_game_over(0)
+        self.assertFalse(mediator.is_game_over)
+
+        mediator.update_waiting_and_game_over(1)
+        self.assertTrue(mediator.is_game_over)
+
+    def test_update_waiting_ignores_metro_passengers_for_game_over(self):
+        mediator = Mediator()
+        station = Station(Circle(station_color, station_size), Point(0, 0))
+        mediator.stations = [station]
+        metro = Metro()
+        passenger = Passenger(Circle(station_color, station_size))
+        passenger.wait_ms = 10_000
+        metro.add_passenger(passenger)
+        mediator.metros = [metro]
+        mediator.passengers = [passenger]
+
+        mediator.passenger_max_wait_time_ms = 1
+        mediator.max_waiting_passengers = 1
+
+        mediator.update_waiting_and_game_over(0)
+        self.assertFalse(mediator.is_game_over)
+
     def test_move_passengers_covers_all_transfers(self):
         mediator, station_a, station_b, path, metro = self._build_two_station_mediator()
         mediator.update_unlocked_num_paths = MagicMock()