Move FlightJs out of MapModel.

game/sim/gameupdateevents.py

@@ -1,55 +1,91 @@
 from __future__ import annotations
 
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
+from uuid import UUID
 
 from dcs import Point
 
 if TYPE_CHECKING:
-    from game.ato import Flight
+    from game.ato import Flight, Package
     from game.sim.combat import FrozenCombat
 
 
+@dataclass
 class GameUpdateEvents:
-    def __init__(self) -> None:
-        self.simulation_complete = False
-        self.new_combats: list[FrozenCombat] = []
-        self.updated_combats: list[FrozenCombat] = []
-        self.updated_flights: list[tuple[Flight, Point]] = []
-        self.navmesh_updates: set[bool] = set()
-        self.unculled_zones_updated: bool = False
-        self.threat_zones_updated: bool = False
+    simulation_complete = False
+    new_combats: list[FrozenCombat] = field(default_factory=list)
+    updated_combats: list[FrozenCombat] = field(default_factory=list)
+    updated_flight_positions: list[tuple[Flight, Point]] = field(default_factory=list)
+    navmesh_updates: set[bool] = field(default_factory=set)
+    unculled_zones_updated: bool = False
+    threat_zones_updated: bool = False
+    new_flights: set[Flight] = field(default_factory=set)
+    updated_flights: set[UUID] = field(default_factory=set)
+    deleted_flights: set[UUID] = field(default_factory=set)
+    selected_flight: UUID | None = None
+    deselected_flight: bool = False
 
     @property
     def empty(self) -> bool:
-        return not any(
-            [
-                self.simulation_complete,
-                self.new_combats,
-                self.updated_combats,
-                self.updated_flights,
-                self.navmesh_updates,
-                self.unculled_zones_updated,
-                self.threat_zones_updated,
-            ]
-        )
+        return self == GameUpdateEvents()
 
-    def complete_simulation(self) -> None:
+    def complete_simulation(self) -> GameUpdateEvents:
         self.simulation_complete = True
+        return self
 
-    def new_combat(self, combat: FrozenCombat) -> None:
+    def new_combat(self, combat: FrozenCombat) -> GameUpdateEvents:
         self.new_combats.append(combat)
+        return self
 
-    def update_combat(self, combat: FrozenCombat) -> None:
+    def update_combat(self, combat: FrozenCombat) -> GameUpdateEvents:
         self.updated_combats.append(combat)
+        return self
 
-    def update_flight(self, flight: Flight, new_position: Point) -> None:
-        self.updated_flights.append((flight, new_position))
+    def update_flight_position(
+        self, flight: Flight, new_position: Point
+    ) -> GameUpdateEvents:
+        self.updated_flight_positions.append((flight, new_position))
+        return self
 
-    def update_navmesh(self, player: bool) -> None:
+    def update_navmesh(self, player: bool) -> GameUpdateEvents:
         self.navmesh_updates.add(player)
+        return self
 
-    def update_unculled_zones(self) -> None:
+    def update_unculled_zones(self) -> GameUpdateEvents:
         self.unculled_zones_updated = True
+        return self
 
-    def update_threat_zones(self) -> None:
+    def update_threat_zones(self) -> GameUpdateEvents:
         self.threat_zones_updated = True
+        return self
+
+    def new_flight(self, flight: Flight) -> GameUpdateEvents:
+        self.new_flights.add(flight)
+        return self
+
+    def update_flight(self, flight: Flight) -> GameUpdateEvents:
+        self.updated_flights.add(flight.id)
+        return self
+
+    def update_flights_in_package(self, package: Package) -> GameUpdateEvents:
+        self.updated_flights.update({f.id for f in package.flights})
+        return self
+
+    def delete_flight(self, flight: Flight) -> GameUpdateEvents:
+        self.deleted_flights.add(flight.id)
+        return self
+
+    def delete_flights_in_package(self, package: Package) -> GameUpdateEvents:
+        self.deleted_flights.update({f.id for f in package.flights})
+        return self
+
+    def select_flight(self, flight: Flight) -> GameUpdateEvents:
+        self.selected_flight = flight.id
+        self.deselected_flight = False
+        return self
+
+    def deselect_flight(self) -> GameUpdateEvents:
+        self.deselected_flight = True
+        self.selected_flight = None
+        return self