Wrap the pydcs FlyingType in our own AircraftType.

This is an attempt to remove a lot of our supposedly unnecessary error
handling. Every aircraft should have a price, a description, a name,
etc; and none of those should require carrying around the faction's
country as context.

This moves all the data for aircraft into yaml files (only one converted
here as an example). Most of the "extended unit info" isn't actually
being read yet.

To replace the renaming of units based on the county, we instead
generate multiple types of each unit when necessary. The CF-18 is just
as much a first-class type as the F/A-18 is.

This doesn't work in its current state because it does break all the
existing names for aircraft that are used in the faction and squadron
files, and we no longer let those errors go as a warning. It will be an
annoying one time switch, but it allows us to define the names that get
used in these files instead of being sensitive to changes as they happen
in pydcs, and allows faction designers to specifically choose, for
example, the Su-22 instead of the Su-17.

One thing not handled by this is aircraft task capability. This is
because the lists in ai_flight_planner_db.py are a priority list, and to
move it out to a yaml file we'd need to assign a weight to it that would
be used to stack rank each aircraft. That's doable, but it makes it much
more difficult to see the ordering of aircraft at a glance, and much
more annoying to move aircraft around in the priority list. I don't
think this is worth doing, and the priority lists will remain in their
own separate lists.

This includes the converted I used to convert all the old unit info and
factions to the new format. This doesn't need to live long, but we may
want to reuse it in the future so we want it in the version history.

gen/flights/ai_flight_planner.py

@@ -17,14 +17,10 @@ from typing import (
     Set,
     TYPE_CHECKING,
     Tuple,
-    Type,
     TypeVar,
-    Union,
 )
 
-from dcs.unittype import FlyingType
-
-from game.factions.faction import Faction
+from game.dcs.aircrafttype import AircraftType
 from game.infos.information import Information
 from game.procurement import AircraftProcurementRequest
 from game.profiling import logged_duration, MultiEventTracer
@@ -256,7 +252,7 @@ class PackageBuilder:
         return True
 
     def find_divert_field(
-        self, aircraft: Type[FlyingType], arrival: ControlPoint
+        self, aircraft: AircraftType, arrival: ControlPoint
     ) -> Optional[ControlPoint]:
         divert_limit = nautical_miles(150)
         for airfield in self.closest_airfields.operational_airfields_within(
@@ -867,7 +863,7 @@ class CoalitionMissionPlanner:
         for cp in self.objective_finder.friendly_control_points():
             inventory = self.game.aircraft_inventory.for_control_point(cp)
             for aircraft, available in inventory.all_aircraft:
-                self.message("Unused aircraft", f"{available} {aircraft.id} from {cp}")
+                self.message("Unused aircraft", f"{available} {aircraft} from {cp}")
 
     def plan_flight(
         self,

gen/flights/ai_flight_planner_db.py

@@ -104,6 +104,7 @@ from dcs.planes import (
 )
 from dcs.unittype import FlyingType
 
+from game.dcs.aircrafttype import AircraftType
 from gen.flights.flight import FlightType
 from pydcs_extensions.a4ec.a4ec import A_4E_C
 from pydcs_extensions.f22a.f22a import F_22A
@@ -415,7 +416,7 @@ REFUELING_CAPABALE = [
 ]
 
 
-def aircraft_for_task(task: FlightType) -> List[Type[FlyingType]]:
+def dcs_types_for_task(task: FlightType) -> list[Type[FlyingType]]:
     cap_missions = (FlightType.BARCAP, FlightType.TARCAP, FlightType.SWEEP)
     if task in cap_missions:
         return CAP_CAPABLE
@@ -450,7 +451,15 @@ def aircraft_for_task(task: FlightType) -> List[Type[FlyingType]]:
         return []
 
 
-def tasks_for_aircraft(aircraft: Type[FlyingType]) -> list[FlightType]:
+def aircraft_for_task(task: FlightType) -> list[AircraftType]:
+    dcs_types = dcs_types_for_task(task)
+    types: list[AircraftType] = []
+    for dcs_type in dcs_types:
+        types.extend(AircraftType.for_dcs_type(dcs_type))
+    return types
+
+
+def tasks_for_aircraft(aircraft: AircraftType) -> list[FlightType]:
     tasks = []
     for task in FlightType:
         if aircraft in aircraft_for_task(task):

gen/flights/flight.py

@@ -1,16 +1,15 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
 from datetime import timedelta
 from enum import Enum
-from typing import List, Optional, TYPE_CHECKING, Type, Union
+from typing import List, Optional, TYPE_CHECKING, Union
 
 from dcs.mapping import Point
 from dcs.point import MovingPoint, PointAction
 from dcs.unit import Unit
-from dcs.unittype import FlyingType
 
 from game import db
+from game.dcs.aircrafttype import AircraftType
 from game.squadrons import Pilot, Squadron
 from game.theater.controlpoint import ControlPoint, MissionTarget
 from game.utils import Distance, meters
@@ -300,7 +299,7 @@ class Flight:
         return self.roster.player_count
 
     @property
-    def unit_type(self) -> Type[FlyingType]:
+    def unit_type(self) -> AircraftType:
         return self.squadron.aircraft
 
     @property
@@ -325,13 +324,11 @@ class Flight:
         self.roster.clear()
 
     def __repr__(self):
-        name = db.unit_type_name(self.unit_type)
         if self.custom_name:
-            return f"{self.custom_name} {self.count} x {name}"
-        return f"[{self.flight_type}] {self.count} x {name}"
+            return f"{self.custom_name} {self.count} x {self.unit_type}"
+        return f"[{self.flight_type}] {self.count} x {self.unit_type}"
 
     def __str__(self):
-        name = db.unit_get_expanded_info(self.country, self.unit_type, "name")
         if self.custom_name:
-            return f"{self.custom_name} {self.count} x {name}"
-        return f"[{self.flight_type}] {self.count} x {name}"
+            return f"{self.custom_name} {self.count} x {self.unit_type}"
+        return f"[{self.flight_type}] {self.count} x {self.unit_type}"

gen/flights/loadouts.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
 import datetime
-from typing import Optional, List, Iterator, Type, TYPE_CHECKING, Mapping
-
-from dcs.unittype import FlyingType
+from typing import Optional, List, Iterator, TYPE_CHECKING, Mapping
 
 from game.data.weapons import Weapon, Pylon
+from game.dcs.aircrafttype import AircraftType
 
 if TYPE_CHECKING:
     from gen.flights.flight import Flight
@@ -27,9 +26,7 @@ class Loadout:
     def derive_custom(self, name: str) -> Loadout:
         return Loadout(name, self.pylons, self.date, is_custom=True)
 
-    def degrade_for_date(
-        self, unit_type: Type[FlyingType], date: datetime.date
-    ) -> Loadout:
+    def degrade_for_date(self, unit_type: AircraftType, date: datetime.date) -> Loadout:
         if self.date is not None and self.date <= date:
             return Loadout(self.name, self.pylons, self.date)
 
@@ -61,7 +58,7 @@ class Loadout:
         #       {"CLSID": class ID, "num": pylon number}
         #   "tasks": List (as a dict) of task IDs the payload is used by.
         # }
-        payloads = flight.unit_type.load_payloads()
+        payloads = flight.unit_type.dcs_unit_type.load_payloads()
         for payload in payloads.values():
             name = payload["name"]
             pylons = payload["pylons"]
@@ -126,8 +123,8 @@ class Loadout:
         for name in cls.default_loadout_names_for(flight):
             # This operation is cached, but must be called before load_by_name will
             # work.
-            flight.unit_type.load_payloads()
-            payload = flight.unit_type.loadout_by_name(name)
+            flight.unit_type.dcs_unit_type.load_payloads()
+            payload = flight.unit_type.dcs_unit_type.loadout_by_name(name)
             if payload is not None:
                 return Loadout(
                     name,

gen/flights/traveltime.py

@@ -25,16 +25,13 @@ if TYPE_CHECKING:
 class GroundSpeed:
     @classmethod
     def for_flight(cls, flight: Flight, altitude: Distance) -> Speed:
-        if not issubclass(flight.unit_type, FlyingType):
-            raise TypeError("Flight has non-flying unit")
-
         # TODO: Expose both a cruise speed and target speed.
         # The cruise speed can be used for ascent, hold, join, and RTB to save
         # on fuel, but mission speed will be fast enough to keep the flight
         # safer.
 
         # DCS's max speed is in kph at 0 MSL.
-        max_speed = kph(flight.unit_type.max_speed)
+        max_speed = flight.unit_type.max_speed
         if max_speed > SPEED_OF_SOUND_AT_SEA_LEVEL:
             # Aircraft is supersonic. Limit to mach 0.85 to conserve fuel and
             # account for heavily loaded jets.