Factor out Coalition from Game.

gen/aircraft.py

@@ -22,7 +22,6 @@ from dcs.planes import (
     C_101EB,
     F_14B,
     JF_17,
-    PlaneType,
     Su_33,
     Tu_22M3,
 )
@@ -262,8 +261,8 @@ class AircraftConflictGenerator:
     @cached_property
     def use_client(self) -> bool:
         """True if Client should be used instead of Player."""
-        blue_clients = self.client_slots_in_ato(self.game.blue_ato)
-        red_clients = self.client_slots_in_ato(self.game.red_ato)
+        blue_clients = self.client_slots_in_ato(self.game.blue.ato)
+        red_clients = self.client_slots_in_ato(self.game.red.ato)
         return blue_clients + red_clients > 1
 
     @staticmethod
@@ -601,12 +600,11 @@ class AircraftConflictGenerator:
             if not isinstance(control_point, Airfield):
                 continue
 
+            faction = self.game.coalition_for(control_point.captured).faction
             if control_point.captured:
                 country = player_country
-                faction = self.game.player_faction
             else:
                 country = enemy_country
-                faction = self.game.enemy_faction
 
             for aircraft, available in inventory.all_aircraft:
                 try:
@@ -699,11 +697,7 @@ class AircraftConflictGenerator:
         if flight.from_cp.cptype != ControlPointType.AIRBASE:
             return
 
-        if flight.from_cp.captured:
-            coalition = self.game.get_player_coalition_id()
-        else:
-            coalition = self.game.get_enemy_coalition_id()
-
+        coalition = self.game.coalition_for(flight.departure.captured).coalition_id
         trigger.add_condition(CoalitionHasAirdrome(coalition, flight.from_cp.id))
 
     def generate_planned_flight(

gen/airsupportgen.py

@@ -105,6 +105,8 @@ class AirSupportConflictGenerator:
             else self.conflict.red_cp
         )
 
+        country = self.mission.country(self.game.blue.country_name)
+
         if not self.game.settings.disable_legacy_tanker:
             fallback_tanker_number = 0
 
@@ -130,10 +132,8 @@ class AirSupportConflictGenerator:
                     tanker_heading, TANKER_DISTANCE
                 )
                 tanker_group = self.mission.refuel_flight(
-                    country=self.mission.country(self.game.player_country),
-                    name=namegen.next_tanker_name(
-                        self.mission.country(self.game.player_country), tanker_unit_type
-                    ),
+                    country=country,
+                    name=namegen.next_tanker_name(country, tanker_unit_type),
                     airport=None,
                     plane_type=unit_type,
                     position=tanker_position,
@@ -211,10 +211,8 @@ class AirSupportConflictGenerator:
                 return
 
             awacs_flight = self.mission.awacs_flight(
-                country=self.mission.country(self.game.player_country),
-                name=namegen.next_awacs_name(
-                    self.mission.country(self.game.player_country)
-                ),
+                country=country,
+                name=namegen.next_awacs_name(country),
                 plane_type=unit_type,
                 altitude=AWACS_ALT,
                 airport=None,

gen/armor.py

@@ -144,16 +144,16 @@ class GroundConflictGenerator:
         )
 
         # Add JTAC
-        if self.game.player_faction.has_jtac:
+        if self.game.blue.faction.has_jtac:
             n = "JTAC" + str(self.conflict.blue_cp.id) + str(self.conflict.red_cp.id)
             code = 1688 - len(self.jtacs)
 
-            utype = self.game.player_faction.jtac_unit
+            utype = self.game.blue.faction.jtac_unit
             if utype is None:
                 utype = AircraftType.named("MQ-9 Reaper")
 
             jtac = self.mission.flight_group(
-                country=self.mission.country(self.game.player_country),
+                country=self.mission.country(self.game.blue.country_name),
                 name=n,
                 aircraft_type=utype.dcs_unit_type,
                 position=position[0],
@@ -715,7 +715,7 @@ class GroundConflictGenerator:
             if is_player
             else int(heading_sum(heading, 90))
         )
-        country = self.game.player_country if is_player else self.game.enemy_country
+        country = self.game.coalition_for(is_player).country_name
         for group in groups:
             if group.role == CombatGroupRole.ARTILLERY:
                 distance_from_frontline = (

gen/cargoshipgen.py

@@ -24,12 +24,13 @@ class CargoShipGenerator:
 
     def generate(self) -> None:
         # Reset the count to make generation deterministic.
-        for ship in self.game.transfers.cargo_ships:
-            self.generate_cargo_ship(ship)
+        for coalition in self.game.coalitions:
+            for ship in coalition.transfers.cargo_ships:
+                self.generate_cargo_ship(ship)
 
     def generate_cargo_ship(self, ship: CargoShip) -> ShipGroup:
         country = self.mission.country(
-            self.game.player_country if ship.player_owned else self.game.enemy_country
+            self.game.coalition_for(ship.player_owned).country_name
         )
         waypoints = ship.route
         group = self.mission.ship_group(

gen/convoygen.py

@@ -27,8 +27,9 @@ class ConvoyGenerator:
 
     def generate(self) -> None:
         # Reset the count to make generation deterministic.
-        for convoy in self.game.transfers.convoys:
-            self.generate_convoy(convoy)
+        for coalition in self.game.coalitions:
+            for convoy in coalition.transfers.convoys:
+                self.generate_convoy(convoy)
 
     def generate_convoy(self, convoy: Convoy) -> VehicleGroup:
         group = self._create_mixed_unit_group(
@@ -53,9 +54,7 @@ class ConvoyGenerator:
         units: dict[GroundUnitType, int],
         for_player: bool,
     ) -> VehicleGroup:
-        country = self.mission.country(
-            self.game.player_country if for_player else self.game.enemy_country
-        )
+        country = self.mission.country(self.game.coalition_for(for_player).country_name)
 
         unit_types = list(units.items())
         main_unit_type, main_unit_count = unit_types[0]

gen/flights/ai_flight_planner.py

@@ -228,7 +228,7 @@ class CoalitionMissionPlanner:
         self.game = game
         self.is_player = is_player
         self.objective_finder = ObjectiveFinder(self.game, self.is_player)
-        self.ato = self.game.blue_ato if is_player else self.game.red_ato
+        self.ato = self.game.coalition_for(is_player).ato
         self.threat_zones = self.game.threat_zone_for(not self.is_player)
         self.procurement_requests = self.game.procurement_requests_for(self.is_player)
         self.faction: Faction = self.game.faction_for(self.is_player)

gen/forcedoptionsgen.py

@@ -38,8 +38,8 @@ class ForcedOptionsGenerator:
             self.mission.forced_options.labels = ForcedOptions.Labels.None_
 
     def _set_unrestricted_satnav(self) -> None:
-        blue = self.game.player_faction
-        red = self.game.enemy_faction
+        blue = self.game.blue.faction
+        red = self.game.red.faction
         if blue.unrestricted_satnav or red.unrestricted_satnav:
             self.mission.forced_options.unrestricted_satnav = True
 

gen/groundobjectsgen.py

@@ -25,7 +25,7 @@ from typing import (
 from dcs import Mission, Point, unitgroup
 from dcs.action import SceneryDestructionZone
 from dcs.country import Country
-from dcs.point import StaticPoint, MovingPoint
+from dcs.point import StaticPoint
 from dcs.statics import Fortification, fortification_map, warehouse_map
 from dcs.task import (
     ActivateBeaconCommand,
@@ -36,8 +36,8 @@ from dcs.task import (
 )
 from dcs.triggers import TriggerStart, TriggerZone
 from dcs.unit import Ship, Unit, Vehicle, SingleHeliPad
-from dcs.unitgroup import Group, ShipGroup, StaticGroup, VehicleGroup
-from dcs.unittype import StaticType, UnitType, ShipType, VehicleType
+from dcs.unitgroup import ShipGroup, StaticGroup, VehicleGroup
+from dcs.unittype import StaticType, ShipType, VehicleType
 from dcs.vehicles import vehicle_map
 
 from game import db
@@ -587,13 +587,7 @@ class HelipadGenerator:
         self.tacan_registry = tacan_registry
 
     def generate(self) -> None:
-
-        if self.cp.captured:
-            country_name = self.game.player_country
-        else:
-            country_name = self.game.enemy_country
-        country = self.m.country(country_name)
-
+        country = self.m.country(self.game.coalition_for(self.cp.captured).country_name)
         for i, helipad in enumerate(self.cp.helipads):
             name = self.cp.name + "_helipad_" + str(i)
             logging.info("Generating helipad : " + name)
@@ -636,12 +630,7 @@ class GroundObjectsGenerator:
 
     def generate(self) -> None:
         for cp in self.game.theater.controlpoints:
-            if cp.captured:
-                country_name = self.game.player_country
-            else:
-                country_name = self.game.enemy_country
-            country = self.m.country(country_name)
-
+            country = self.m.country(self.game.coalition_for(cp.captured).country_name)
             HelipadGenerator(
                 self.m, cp, self.game, self.radio_registry, self.tacan_registry
             ).generate()

gen/visualgen.py

@@ -97,7 +97,7 @@ class VisualGenerator:
                             break
 
                         self.mission.static_group(
-                            self.mission.country(self.game.enemy_country),
+                            self.mission.country(self.game.red.country_name),
                             "",
                             _type=v,
                             position=pos,