Assign aircraft to squadrons rather than bases.

This is needed to support the upcoming squadron transfers, since
squadrons need to bring their aircraft with them.

https://github.com/dcs-liberation/dcs_liberation/issues/1145

gen/aircraft.py

@@ -108,7 +108,7 @@ from .naming import namegen
 
 if TYPE_CHECKING:
     from game import Game
-    from game.squadrons import Pilot
+    from game.squadrons import Pilot, Squadron
 
 WARM_START_HELI_ALT = meters(500)
 WARM_START_ALTITUDE = meters(3000)
@@ -594,8 +594,7 @@ class AircraftConflictGenerator:
     def spawn_unused_aircraft(
         self, player_country: Country, enemy_country: Country
     ) -> None:
-        inventories = self.game.aircraft_inventory.inventories
-        for control_point, inventory in inventories.items():
+        for control_point in self.game.theater.controlpoints:
             if not isinstance(control_point, Airfield):
                 continue
 
@@ -605,11 +604,9 @@ class AircraftConflictGenerator:
             else:
                 country = enemy_country
 
-            for aircraft, available in inventory.all_aircraft:
+            for squadron in control_point.squadrons:
                 try:
-                    self._spawn_unused_at(
-                        control_point, country, faction, aircraft, available
-                    )
+                    self._spawn_unused_at(control_point, country, faction, squadron)
                 except NoParkingSlotError:
                     # If we run out of parking, stop spawning aircraft.
                     return
@@ -619,17 +616,16 @@ class AircraftConflictGenerator:
         control_point: Airfield,
         country: Country,
         faction: Faction,
-        aircraft: AircraftType,
-        number: int,
+        squadron: Squadron,
     ) -> None:
-        for _ in range(number):
+        for _ in range(squadron.untasked_aircraft):
             # Creating a flight even those this isn't a fragged mission lets us
             # reuse the existing debriefing code.
             # TODO: Special flight type?
             flight = Flight(
                 Package(control_point),
                 faction.country,
-                self.game.air_wing_for(control_point.captured).squadron_for(aircraft),
+                squadron,
                 1,
                 FlightType.BARCAP,
                 "Cold",
@@ -641,16 +637,13 @@ class AircraftConflictGenerator:
             group = self._generate_at_airport(
                 name=namegen.next_aircraft_name(country, control_point.id, flight),
                 side=country,
-                unit_type=aircraft.dcs_unit_type,
+                unit_type=squadron.aircraft.dcs_unit_type,
                 count=1,
                 start_type="Cold",
                 airport=control_point.airport,
             )
 
-            if aircraft in faction.liveries_overrides:
-                livery = random.choice(faction.liveries_overrides[aircraft])
-                for unit in group.units:
-                    unit.livery_id = livery
+            self._setup_livery(flight, group)
 
             group.uncontrolled = True
             self.unit_map.add_aircraft(group, flight)

gen/flights/flight.py

@@ -290,6 +290,7 @@ class Flight:
         self.package = package
         self.country = country
         self.squadron = squadron
+        self.squadron.claim_inventory(count)
         if roster is None:
             self.roster = FlightRoster(self.squadron, initial_size=count)
         else:
@@ -338,6 +339,7 @@ class Flight:
         return self.flight_plan.waypoints[1:]
 
     def resize(self, new_size: int) -> None:
+        self.squadron.claim_inventory(new_size - self.count)
         self.roster.resize(new_size)
 
     def set_pilot(self, index: int, pilot: Optional[Pilot]) -> None:
@@ -347,8 +349,9 @@ class Flight:
     def missing_pilots(self) -> int:
         return self.roster.missing_pilots
 
-    def clear_roster(self) -> None:
+    def return_pilots_and_aircraft(self) -> None:
         self.roster.clear()
+        self.squadron.claim_inventory(-self.count)
 
     def __repr__(self) -> str:
         if self.custom_name: