refactor of previous commits

refactor to enum

typing and many other fixes

fix tests

attempt to fix some typescript

more typescript fixes

more typescript test fixes

revert all API changes

update to pydcs

mypy fixes

Use properties to check if player is blue/red/neutral

update requirements.txt

black -_-

bump pydcs and fix mypy

add opponent property

bump pydcs

game/sim/combat/aircombat.py

@@ -46,7 +46,7 @@ class AirCombat(JoinableCombat):
         blue_flights = []
         red_flights = []
         for flight in self.flights:
-            if flight.squadron.player:
+            if flight.squadron.player.is_blue:
                 blue_flights.append(str(flight))
             else:
                 red_flights.append(str(flight))
@@ -71,7 +71,7 @@ class AirCombat(JoinableCombat):
         blue = []
         red = []
         for flight in self.flights:
-            if flight.squadron.player:
+            if flight.squadron.player.is_blue:
                 blue.append(flight)
             else:
                 red.append(flight)

game/sim/combat/combatinitiator.py

@@ -6,6 +6,7 @@ from collections.abc import Iterator
 from datetime import timedelta
 from typing import Optional, TYPE_CHECKING
 
+from game.theater.player import Player
 from .aircombat import AirCombat
 from .aircraftengagementzones import AircraftEngagementZones
 from .atip import AtIp
@@ -31,8 +32,10 @@ class CombatInitiator:
     def update_active_combats(self) -> None:
         blue_a2a = AircraftEngagementZones.from_ato(self.game.blue.ato)
         red_a2a = AircraftEngagementZones.from_ato(self.game.red.ato)
-        blue_sam = SamEngagementZones.from_theater(self.game.theater, player=True)
-        red_sam = SamEngagementZones.from_theater(self.game.theater, player=False)
+        blue_sam = SamEngagementZones.from_theater(
+            self.game.theater, player=Player.BLUE
+        )
+        red_sam = SamEngagementZones.from_theater(self.game.theater, player=Player.RED)
 
         # Check each vulnerable flight to see if it has initiated combat. If any flight
         # initiates combat, a single FrozenCombat will be created for all involved
@@ -46,7 +49,7 @@ class CombatInitiator:
             if flight.state.in_combat:
                 return
 
-            if flight.squadron.player:
+            if flight.squadron.player.is_blue:
                 a2a = red_a2a
                 own_a2a = blue_a2a
                 sam = red_sam

game/sim/combat/samengagementzones.py

@@ -9,7 +9,7 @@ from shapely.ops import unary_union
 from game.utils import dcs_to_shapely_point
 
 if TYPE_CHECKING:
-    from game.theater import ConflictTheater, TheaterGroundObject
+    from game.theater import ConflictTheater, TheaterGroundObject, Player
     from game.threatzones import ThreatPoly
 
 
@@ -31,7 +31,9 @@ class SamEngagementZones:
                 yield tgo
 
     @classmethod
-    def from_theater(cls, theater: ConflictTheater, player: bool) -> SamEngagementZones:
+    def from_theater(
+        cls, theater: ConflictTheater, player: Player
+    ) -> SamEngagementZones:
         commit_regions = []
         individual_zones = []
         for cp in theater.control_points_for(player):

game/sim/gameupdateevents.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
     from game.ato import Flight, Package
     from game.navmesh import NavMesh
     from game.sim.combat import FrozenCombat
-    from game.theater import ControlPoint, FrontLine, TheaterGroundObject
+    from game.theater import ControlPoint, FrontLine, TheaterGroundObject, Player
     from game.threatzones import ThreatZones
     from game.theater.iadsnetwork.iadsnetwork import IadsNetworkNode
 
@@ -24,9 +24,9 @@ class GameUpdateEvents:
     updated_combats: list[FrozenCombat] = field(default_factory=list)
     ended_combats: list[FrozenCombat] = field(default_factory=list)
     updated_flight_positions: list[tuple[Flight, Point]] = field(default_factory=list)
-    navmesh_updates: dict[bool, NavMesh] = field(default_factory=dict)
+    navmesh_updates: dict[Player, NavMesh] = field(default_factory=dict)
     unculled_zones_updated: list[Point] = field(default_factory=list)
-    threat_zones_updated: dict[bool, ThreatZones] = field(default_factory=dict)
+    threat_zones_updated: dict[Player, ThreatZones] = field(default_factory=dict)
     new_flights: set[Flight] = field(default_factory=set)
     updated_flights: set[Flight] = field(default_factory=set)
     deleted_flights: set[UUID] = field(default_factory=set)
@@ -70,7 +70,7 @@ class GameUpdateEvents:
         self.updated_flight_positions.append((flight, new_position))
         return self
 
-    def update_navmesh(self, player: bool, navmesh: NavMesh) -> GameUpdateEvents:
+    def update_navmesh(self, player: Player, navmesh: NavMesh) -> GameUpdateEvents:
         self.navmesh_updates[player] = navmesh
         return self
 
@@ -78,7 +78,9 @@ class GameUpdateEvents:
         self.unculled_zones_updated = zones
         return self
 
-    def update_threat_zones(self, player: bool, zones: ThreatZones) -> GameUpdateEvents:
+    def update_threat_zones(
+        self, player: Player, zones: ThreatZones
+    ) -> GameUpdateEvents:
         self.threat_zones_updated[player] = zones
         return self
 

game/sim/missionresultsprocessor.py

@@ -145,7 +145,7 @@ class MissionResultsProcessor:
     def commit_captures(self, debriefing: Debriefing, events: GameUpdateEvents) -> None:
         for captured in debriefing.base_captures:
             try:
-                if captured.captured_by_player:
+                if captured.captured_by_player.is_blue:
                     self.game.message(
                         f"{captured.control_point} captured!",
                         f"We took control of {captured.control_point}.",