Add custom flight names

Mildly breaks save compat with 2.3; All existing flight dialogs will be
broken, passing the turn or recreating all the flights in the UI will
allow you to continue

gen/armor.py

@@ -206,7 +206,7 @@ class GroundConflictGenerator:
                         u = random.choice(manpads)
                         self.mission.vehicle_group(
                             side,
-                            namegen.next_infantry_name(side, cp, u), u,
+                            namegen.next_infantry_name(side, cp.id, u), u,
                             position=infantry_position,
                             group_size=1,
                             heading=forward_heading,
@@ -220,7 +220,7 @@ class GroundConflictGenerator:
         u = random.choice(possible_infantry_units)
         self.mission.vehicle_group(
                 side,
-                namegen.next_infantry_name(side, cp, u), u,
+                namegen.next_infantry_name(side, cp.id, u), u,
                 position=infantry_position,
                 group_size=1,
                 heading=forward_heading,
@@ -231,7 +231,7 @@ class GroundConflictGenerator:
             position = infantry_position.random_point_within(55, 5)
             self.mission.vehicle_group(
                 side,
-                namegen.next_infantry_name(side, cp, u), u,
+                namegen.next_infantry_name(side, cp.id, u), u,
                 position=position,
                 group_size=1,
                 heading=forward_heading,

gen/flights/flight.py

@@ -137,7 +137,8 @@ class Flight:
     def __init__(self, package: Package, unit_type: Type[FlyingType],
                  count: int, flight_type: FlightType, start_type: str,
                  departure: ControlPoint, arrival: ControlPoint,
-                 divert: Optional[ControlPoint]) -> None:
+                 divert: Optional[ControlPoint],
+                 custom_name: Optional[str] = None) -> None:
         self.package = package
         self.unit_type = unit_type
         self.count = count
@@ -151,6 +152,7 @@ class Flight:
         self.start_type = start_type
         self.use_custom_loadout = False
         self.client_count = 0
+        self.custom_name = custom_name
 
         # Will be replaced with a more appropriate FlightPlan by
         # FlightPlanBuilder, but an empty flight plan the flight begins with an
@@ -172,4 +174,6 @@ class Flight:
 
     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}"

gen/naming.py

@@ -1,12 +1,18 @@
-from game import db
-from gen.flights.flight import Flight
 import random
 
-ALPHA_MILITARY = ["Alpha","Bravo","Charlie","Delta","Echo","Foxtrot",
-                  "Golf","Hotel","India","Juliet","Kilo","Lima","Mike",
-                  "November","Oscar","Papa","Quebec","Romeo","Sierra",
-                  "Tango","Uniform","Victor","Whisky","XRay","Yankee",
-                  "Zulu","Zero"]
+from dcs.country import Country
+from dcs.unittype import UnitType
+
+from game import db
+
+from gen.flights.flight import Flight
+
+ALPHA_MILITARY = ["Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot",
+                  "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike",
+                  "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra",
+                  "Tango", "Uniform", "Victor", "Whisky", "XRay", "Yankee",
+                  "Zulu", "Zero"]
+
 
 class NameGenerator:
     number = 0
@@ -47,36 +53,44 @@ class NameGenerator:
     def reset(self):
         self.number = 0
         self.ANIMALS = NameGenerator.ANIMALS.copy()
-    
+
     def reset_numbers(self):
         self.number = 0
         self.infantry_number = 0
 
-    def next_aircraft_name(self, country: int, parent_base_id: int, flight: Flight):
+    def next_aircraft_name(self, country: Country, parent_base_id: int, flight: Flight):
         self.number += 1
-        name_str = "{} {}".format(flight.package.target.name, flight.flight_type)
+        try:
+            if flight.custom_name:
+                name_str = flight.custom_name
+            else:
+                name_str = "{} {}".format(
+                    flight.package.target.name, flight.flight_type)
+        except AttributeError:  # Here to maintain save compatibility with 2.3
+            name_str = "{} {}".format(
+                flight.package.target.name, flight.flight_type)
         return "{}|{}|{}|{}|{}|".format(name_str, country.id, self.number, parent_base_id, db.unit_type_name(flight.unit_type))
 
-    def next_unit_name(self, country, parent_base_id, unit_type):
+    def next_unit_name(self, country: Country, parent_base_id: int, unit_type: UnitType):
         self.number += 1
         return "unit|{}|{}|{}|{}|".format(country.id, self.number, parent_base_id, db.unit_type_name(unit_type))
 
-    def next_infantry_name(self, country, parent_base_id, unit_type):
+    def next_infantry_name(self, country: Country, parent_base_id: int, unit_type: UnitType):
         self.infantry_number += 1
         return "infantry|{}|{}|{}|{}|".format(country.id, self.infantry_number, parent_base_id, db.unit_type_name(unit_type))
 
     def next_basedefense_name(self):
         return "basedefense_aa|0|0|"
 
-    def next_awacs_name(self, country):
+    def next_awacs_name(self, country: Country):
         self.number += 1
         return "awacs|{}|{}|0|".format(country.id, self.number)
 
-    def next_tanker_name(self, country, unit_type):
+    def next_tanker_name(self, country: Country, unit_type: UnitType):
         self.number += 1
         return "tanker|{}|{}|0|{}".format(country.id, self.number, db.unit_type_name(unit_type))
 
-    def next_carrier_name(self, country):
+    def next_carrier_name(self, country: Country):
         self.number += 1
         return "carrier|{}|{}|0|".format(country.id, self.number)
 
@@ -90,6 +104,3 @@ class NameGenerator:
 
 
 namegen = NameGenerator()
-
-
-