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.

qt_ui/widgets/combos/QAircraftTypeSelector.py

@@ -5,12 +5,13 @@ from PySide2.QtWidgets import QComboBox
 
 from dcs.unittype import FlyingType
 
+from game import Game, db
 
 class QAircraftTypeSelector(QComboBox):
     """Combo box for selecting among the given aircraft types."""
 
-    def __init__(self, aircraft_types: Iterable[Type[FlyingType]]) -> None:
+    def __init__(self, aircraft_types: Iterable[Type[FlyingType]], country: str) -> None:
         super().__init__()
         for aircraft in aircraft_types:
-            self.addItem(f"{aircraft.id}", userData=aircraft)
+            self.addItem(f"{db.unit_pretty_name(country, aircraft)}", userData=aircraft)
         self.model().sort(0)

qt_ui/windows/QDebriefingWindow.py

@@ -52,7 +52,7 @@ class QDebriefingWindow(QDialog):
         for unit_type, count in player_air_losses.items():
             try:
                 lostUnitsLayout.addWidget(
-                    QLabel(db.unit_type_name(unit_type)), row, 0)
+                    QLabel(db.unit_pretty_name(self.debriefing.player_country, unit_type)), row, 0)
                 lostUnitsLayout.addWidget(QLabel(str(count)), row, 1)
                 row += 1
             except AttributeError:
@@ -94,7 +94,7 @@ class QDebriefingWindow(QDialog):
         for unit_type, count in enemy_air_losses.items():
             try:
                 enemylostUnitsLayout.addWidget(
-                    QLabel(db.unit_type_name(unit_type)), row, 0)
+                    QLabel(db.unit_pretty_name(self.debriefing.enemy_country, unit_type)), row, 0)
                 enemylostUnitsLayout.addWidget(QLabel(str(count)), row, 1)
                 row += 1
             except AttributeError:

qt_ui/windows/basemenu/QRecruitBehaviour.py

@@ -58,7 +58,7 @@ class QRecruitBehaviour:
         existing_units = self.cp.base.total_units_of_type(unit_type)
         scheduled_units = self.pending_deliveries.units.get(unit_type, 0)
 
-        unitName = QLabel("<b>" + db.unit_type_name_2(unit_type) + "</b>")
+        unitName = QLabel("<b>" + db.unit_pretty_name(self.game_model.game.player_country, unit_type) + "</b>")
         unitName.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding))
 
         existing_units = QLabel(str(existing_units))

qt_ui/windows/basemenu/intel/QIntelInfo.py

@@ -46,7 +46,7 @@ class QIntelInfo(QFrame):
                     existing_units = self.cp.base.total_units_of_type(unit_type)
                     if existing_units == 0:
                         continue
-                    groupLayout.addWidget(QLabel("<b>" + db.unit_type_name(unit_type) + "</b>"), row, 0)
+                    groupLayout.addWidget(QLabel("<b>" + db.unit_pretty_name(self.game.enemy_country, unit_type) + "</b>"), row, 0)
                     groupLayout.addWidget(QLabel(str(existing_units)), row, 1)
                     row += 1
 

qt_ui/windows/intel.py

@@ -14,7 +14,7 @@ from PySide2.QtWidgets import (
     QWidget,
 )
 
-from game.game import Game
+from game.game import Game, db
 from qt_ui.uiconstants import ICONS
 from qt_ui.windows.finances.QFinancesMenu import FinancesLayout
 
@@ -81,7 +81,7 @@ class AircraftIntelLayout(IntelTableLayout):
             for airframe, count in base.aircraft.items():
                 if not count:
                     continue
-                self.add_row(airframe.id, count)
+                self.add_row(db.unit_pretty_name(game.enemy_country, airframe), count)
 
         self.add_spacer()
         self.add_row("<b>Total</b>", total)

qt_ui/windows/mission/flight/QFlightCreator.py

@@ -34,6 +34,7 @@ class QFlightCreator(QDialog):
         self.game = game
         self.package = package
         self.custom_name_text = None
+        self.country = self.game.player_country
 
         self.setWindowTitle("Create flight")
         self.setWindowIcon(EVENT_ICONS["strike"])
@@ -47,7 +48,7 @@ class QFlightCreator(QDialog):
         layout.addLayout(QLabeledWidget("Task:", self.task_selector))
 
         self.aircraft_selector = QAircraftTypeSelector(
-            self.game.aircraft_inventory.available_types_for_player
+            self.game.aircraft_inventory.available_types_for_player, self.game.player_country
         )
         self.aircraft_selector.setCurrentIndex(0)
         self.aircraft_selector.currentIndexChanged.connect(
@@ -154,7 +155,7 @@ class QFlightCreator(QDialog):
             start_type = "Cold"
         else:
             start_type = "Warm"
-        flight = Flight(self.package, aircraft, size, task, start_type, origin,
+        flight = Flight(self.package, self.country, aircraft, size, task, start_type, origin,
                         arrival, divert, custom_name=self.custom_name_text)
         flight.client_count = self.client_slots_spinner.value()