Adds prettier user-facing aircraft names. (#726)

This makes the names of the aircraft displayed to the player in the UI more verbose and readable.

It allows allows specific countries to display an aircraft's name differently. An example of this would be the JF-17 Thunder, which is known in China as the FC-1 Fierce Dragon - this now displays correctly in the Liberation UI.

gen/aircraft.py

@@ -262,6 +262,9 @@ class FlightData:
     #: The package that the flight belongs to.
     package: Package
 
+    #: The country that the flight belongs to.
+    country: str
+
     flight_type: FlightType
 
     #: All units in the flight.
@@ -299,7 +302,7 @@ class FlightData:
 
     joker_fuel: Optional[int]
 
-    def __init__(self, package: Package, flight_type: FlightType,
+    def __init__(self, package: Package, country: str, flight_type: FlightType,
                  units: List[FlyingUnit], size: int, friendly: bool,
                  departure_delay: timedelta, departure: RunwayData,
                  arrival: RunwayData, divert: Optional[RunwayData],
@@ -308,6 +311,7 @@ class FlightData:
                  bingo_fuel: Optional[int],
                  joker_fuel: Optional[int]) -> None:
         self.package = package
+        self.country = country
         self.flight_type = flight_type
         self.units = units
         self.size = size
@@ -778,6 +782,7 @@ class AircraftConflictGenerator:
 
         self.flights.append(FlightData(
             package=package,
+            country=faction.country,
             flight_type=flight.flight_type,
             units=group.units,
             size=len(group.units),
@@ -984,7 +989,7 @@ class AircraftConflictGenerator:
             # 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), aircraft, 1,
+            flight = Flight(Package(control_point), faction.country, aircraft, 1,
                             FlightType.BARCAP, "Cold", departure=control_point,
                             arrival=control_point, divert=None)
 

gen/flights/ai_flight_planner.py

@@ -173,9 +173,11 @@ class PackageBuilder:
                  closest_airfields: ClosestAirfields,
                  global_inventory: GlobalAircraftInventory,
                  is_player: bool,
+                 package_country: str,
                  start_type: str) -> None:
         self.closest_airfields = closest_airfields
         self.is_player = is_player
+        self.package_country = package_country
         self.package = Package(location)
         self.allocator = AircraftAllocator(closest_airfields, global_inventory,
                                            is_player)
@@ -199,7 +201,7 @@ class PackageBuilder:
         else:
             start_type = self.start_type
 
-        flight = Flight(self.package, aircraft, plan.num_aircraft, plan.task,
+        flight = Flight(self.package, self.package_country, aircraft, plan.num_aircraft, plan.task,
                         start_type, departure=airfield, arrival=airfield,
                         divert=self.find_divert_field(aircraft, airfield))
         self.package.add_flight(flight)
@@ -629,11 +631,17 @@ class CoalitionMissionPlanner:
         else:
             start_type = "Warm"
 
+        if self.is_player:
+            package_country = self.game.player_country
+        else:
+            package_country = self.game.enemy_country
+
         builder = PackageBuilder(
             mission.location,
             self.objective_finder.closest_airfields_to(mission.location),
             self.game.aircraft_inventory,
             self.is_player,
+            package_country,
             start_type
         )
 

gen/flights/flight.py

@@ -136,12 +136,13 @@ class FlightWaypoint:
 
 class Flight:
 
-    def __init__(self, package: Package, unit_type: Type[FlyingType],
+    def __init__(self, package: Package, country: str, unit_type: Type[FlyingType],
                  count: int, flight_type: FlightType, start_type: str,
                  departure: ControlPoint, arrival: ControlPoint,
                  divert: Optional[ControlPoint],
                  custom_name: Optional[str] = None) -> None:
         self.package = package
+        self.country = country
         self.unit_type = unit_type
         self.count = count
         self.departure = departure
@@ -179,3 +180,9 @@ class Flight:
         if self.custom_name:
             return f"{self.custom_name} {self.count} x {name}"
         return f"[{self.flight_type}] {self.count} x {name}"
+
+    def __str__(self):
+        name = db.unit_pretty_name(self.country, 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}"