Move front lines out of MapModel.

game/sim/gameloop.py

@@ -68,8 +68,9 @@ class GameLoop:
 
     def complete_with_results(self, debriefing: Debriefing) -> None:
         self.pause()
-        self.sim.process_results(debriefing)
+        self.sim.process_results(debriefing, self.events)
         self.completed = True
+        self.send_update(rate_limit=False)
 
     def send_update(self, rate_limit: bool) -> None:
         # We don't skip empty events because we still want the tick in the Qt part of

game/sim/gameupdateevents.py

@@ -9,6 +9,7 @@ from dcs import Point
 if TYPE_CHECKING:
     from game.ato import Flight, Package
     from game.sim.combat import FrozenCombat
+    from game.theater import FrontLine
 
 
 @dataclass
@@ -26,6 +27,9 @@ class GameUpdateEvents:
     deleted_flights: set[UUID] = field(default_factory=set)
     selected_flight: UUID | None = None
     deselected_flight: bool = False
+    new_front_lines: set[FrontLine] = field(default_factory=set)
+    updated_front_lines: set[UUID] = field(default_factory=set)
+    deleted_front_lines: set[UUID] = field(default_factory=set)
     shutting_down: bool = False
 
     @property
@@ -95,6 +99,18 @@ class GameUpdateEvents:
         self.selected_flight = None
         return self
 
+    def new_front_line(self, front_line: FrontLine) -> GameUpdateEvents:
+        self.new_front_lines.add(front_line)
+        return self
+
+    def update_front_line(self, front_line: FrontLine) -> GameUpdateEvents:
+        self.updated_front_lines.add(front_line.id)
+        return self
+
+    def delete_front_line(self, front_line: FrontLine) -> GameUpdateEvents:
+        self.deleted_front_lines.add(front_line.id)
+        return self
+
     def shut_down(self) -> GameUpdateEvents:
         self.shutting_down = True
         return self

game/sim/missionresultsprocessor.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 from game.debriefing import Debriefing
 from game.ground_forces.combat_stance import CombatStance
 from game.theater import ControlPoint
+from .gameupdateevents import GameUpdateEvents
 from ..ato.airtaaskingorder import AirTaskingOrder
 
 if TYPE_CHECKING:
@@ -21,7 +22,7 @@ class MissionResultsProcessor:
     def __init__(self, game: Game) -> None:
         self.game = game
 
-    def commit(self, debriefing: Debriefing) -> None:
+    def commit(self, debriefing: Debriefing, events: GameUpdateEvents) -> None:
         logging.info("Committing mission results")
         self.commit_air_losses(debriefing)
         self.commit_pilot_experience()
@@ -31,8 +32,8 @@ class MissionResultsProcessor:
         self.commit_airlift_losses(debriefing)
         self.commit_ground_losses(debriefing)
         self.commit_damaged_runways(debriefing)
-        self.commit_captures(debriefing)
-        self.commit_front_line_battle_impact(debriefing)
+        self.commit_captures(debriefing, events)
+        self.commit_front_line_battle_impact(debriefing, events)
         self.record_carcasses(debriefing)
 
     def commit_air_losses(self, debriefing: Debriefing) -> None:
@@ -141,7 +142,7 @@ class MissionResultsProcessor:
         for damaged_runway in debriefing.damaged_runways:
             damaged_runway.damage_runway()
 
-    def commit_captures(self, debriefing: Debriefing) -> None:
+    def commit_captures(self, debriefing: Debriefing, events: GameUpdateEvents) -> None:
         for captured in debriefing.base_captures:
             try:
                 if captured.captured_by_player:
@@ -155,7 +156,9 @@ class MissionResultsProcessor:
                         f"The enemy took control of {captured.control_point}.",
                     )
 
-                captured.control_point.capture(self.game, captured.captured_by_player)
+                captured.control_point.capture(
+                    self.game, events, captured.captured_by_player
+                )
                 logging.info(f"Will run redeploy for {captured.control_point}")
                 self.redeploy_units(captured.control_point)
             except Exception:
@@ -165,10 +168,16 @@ class MissionResultsProcessor:
         for destroyed_unit in debriefing.state_data.destroyed_statics:
             self.game.add_destroyed_units(destroyed_unit)
 
-    def commit_front_line_battle_impact(self, debriefing: Debriefing) -> None:
+    def commit_front_line_battle_impact(
+        self, debriefing: Debriefing, events: GameUpdateEvents
+    ) -> None:
         for cp in self.game.theater.player_points():
             enemy_cps = [e for e in cp.connected_points if not e.captured]
             for enemy_cp in enemy_cps:
+                front_line = cp.front_line_with(enemy_cp)
+                front_line.update_position()
+                events.update_front_line(front_line)
+
                 print(
                     "Compute frontline progression for : "
                     + cp.name

game/sim/missionsimulation.py

@@ -66,14 +66,14 @@ class MissionSimulation:
         debriefing.merge_simulation_results(self.aircraft_simulation.results)
         return debriefing
 
-    def process_results(self, debriefing: Debriefing) -> None:
+    def process_results(self, debriefing: Debriefing, events: GameUpdateEvents) -> None:
         if self.unit_map is None:
             raise RuntimeError(
                 "Simulation has no unit map. Results processing began before a mission "
                 "was generated."
             )
 
-        MissionResultsProcessor(self.game).commit(debriefing)
+        MissionResultsProcessor(self.game).commit(debriefing, events)
 
     def finish(self) -> None:
         self.unit_map = None