More work on the unit info screen.

qt_ui/main.py

@@ -75,6 +75,7 @@ def run_ui(game: Optional[Game] = None) -> None:
     uiconstants.load_aircraft_icons()
     uiconstants.load_vehicle_icons()
     uiconstants.load_aircraft_banners()
+    uiconstants.load_vehicle_banners()
 
     # Replace DCS Mission scripting file to allow DCS Liberation to work
     try:

qt_ui/uiconstants.py

@@ -74,6 +74,7 @@ CP_SIZE = 12
 
 AIRCRAFT_BANNERS: Dict[str, QPixmap] = {}
 AIRCRAFT_ICONS: Dict[str, QPixmap] = {}
+VEHICLE_BANNERS: Dict[str, QPixmap] = {}
 VEHICLES_ICONS: Dict[str, QPixmap] = {}
 ICONS: Dict[str, QPixmap] = {}
 
@@ -181,11 +182,16 @@ def load_aircraft_icons():
 
 
 def load_vehicle_icons():
-    for vehicle in os.listdir("./resources/ui/units/vehicles/"):
+    for vehicle in os.listdir("./resources/ui/units/vehicles/icons/"):
         if vehicle.endswith(".jpg"):
-            VEHICLES_ICONS[vehicle[:-7]] = QPixmap(os.path.join("./resources/ui/units/vehicles/", vehicle))
+            VEHICLES_ICONS[vehicle[:-7]] = QPixmap(os.path.join("./resources/ui/units/vehicles/icons/", vehicle))
 
 def load_aircraft_banners():
     for aircraft in os.listdir("./resources/ui/units/aircrafts/banners/"):
         if aircraft.endswith(".jpg"):
-            AIRCRAFT_BANNERS[aircraft[:-7]] = QPixmap(os.path.join("./resources/ui/units/aircrafts/banners/", aircraft))
+            AIRCRAFT_BANNERS[aircraft[:-7]] = QPixmap(os.path.join("./resources/ui/units/aircrafts/banners/", aircraft))
+
+def load_vehicle_banners():
+    for aircraft in os.listdir("./resources/ui/units/vehicles/banners/"):
+        if aircraft.endswith(".jpg"):
+            VEHICLE_BANNERS[aircraft[:-7]] = QPixmap(os.path.join("./resources/ui/units/vehicles/banners/", aircraft))

qt_ui/windows/QUnitInfoWindow.py

@@ -16,12 +16,16 @@ from PySide2.QtWidgets import (
     QFrame,
 )
 from jinja2 import Environment, FileSystemLoader, select_autoescape
-from dcs.unittype import UnitType
-from qt_ui.uiconstants import AIRCRAFT_BANNERS
+from dcs.unittype import UnitType, FlyingType, VehicleType
+import dcs
+from qt_ui.uiconstants import AIRCRAFT_BANNERS, VEHICLE_BANNERS
 
 from game.game import Game
 from game import db
 
+import gen.flights.ai_flight_planner_db
+from gen.flights.flight import FlightType
+
 
 class QUnitInfoWindow(QDialog):
 
@@ -43,7 +47,10 @@ class QUnitInfoWindow(QDialog):
 
         header = QLabel(self)
         header.setGeometry(0, 0, 720, 360)
-        pixmap = AIRCRAFT_BANNERS.get(self.unit_type.id)
+        if dcs.planes.plane_map.get(self.unit_type.id) is not None or dcs.helicopters.helicopter_map.get(self.unit_type.id) is not None:
+            pixmap = AIRCRAFT_BANNERS.get(self.unit_type.id)
+        elif dcs.vehicles.vehicle_map.get(self.unit_type.id) is not None:
+            pixmap = VEHICLE_BANNERS.get(self.unit_type.id)
         if pixmap is None:
             pixmap = AIRCRAFT_BANNERS.get("Missing")
         header.setPixmap(pixmap.scaled(header.width(), header.height()))
@@ -51,8 +58,10 @@ class QUnitInfoWindow(QDialog):
 
         self.gridLayout = QGridLayout()
         
+        # Build the topmost details grid.
         self.details_grid = QFrame()
         self.details_grid_layout = QGridLayout()
+        self.details_grid_layout.setMargin(0)
 
         self.name_box = QLabel(f"<b>Name:</b> {db.unit_get_expanded_info(self.game.player_country, self.unit_type, 'manufacturer')} {db.unit_get_expanded_info(self.game.player_country, self.unit_type, 'name')}")
         self.name_box.setProperty("style", "info-element")
@@ -73,12 +82,37 @@ class QUnitInfoWindow(QDialog):
 
         self.details_grid.setLayout(self.details_grid_layout)
 
+        self.gridLayout.addWidget(self.details_grid, 1, 0)
+        
+        # If it's an aircraft, include the task list.
+        if dcs.planes.plane_map.get(self.unit_type.id) is not None or dcs.helicopters.helicopter_map.get(self.unit_type.id) is not None:
+            self.tasks_box = QLabel(f"<b>In-Game Tasks:</b> {self.generateAircraftTasks()}")
+            self.tasks_box.setProperty("style", "info-element")
+            self.gridLayout.addWidget(self.tasks_box, 2, 0)
+
+        # Finally, add the description box.
         self.details_text = QTextBrowser()
         self.details_text.setProperty("style", "info-desc")
         self.details_text.setText(db.unit_get_expanded_info(self.game.player_country, self.unit_type, "text"))
-
-        self.gridLayout.addWidget(self.details_grid, 1, 0)
-        self.gridLayout.addWidget(self.details_text, 2, 0)
+        self.gridLayout.addWidget(self.details_text, 3, 0)
 
         self.layout.addLayout(self.gridLayout, 1, 0)
-        self.setLayout(self.layout)
+        self.setLayout(self.layout)
+
+    def generateAircraftTasks(self) -> str:
+        aircraft_tasks = ""
+        if self.unit_type in gen.flights.ai_flight_planner_db.CAP_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.BARCAP}, {FlightType.ESCORT}, {FlightType.INTERCEPTION}, {FlightType.SWEEP}, {FlightType.TARCAP}, "
+        if self.unit_type in gen.flights.ai_flight_planner_db.CAS_CAPABLE or self.unit_type in gen.flights.ai_flight_planner_db.TRANSPORT_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.CAS}, {FlightType.BAI}, {FlightType.OCA_AIRCRAFT}, "
+        if self.unit_type in gen.flights.ai_flight_planner_db.SEAD_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.SEAD}, "
+        if self.unit_type in gen.flights.ai_flight_planner_db.DEAD_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.DEAD}, "
+        if self.unit_type in gen.flights.ai_flight_planner_db.ANTISHIP_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.ANTISHIP}, "
+        if self.unit_type in gen.flights.ai_flight_planner_db.RUNWAY_ATTACK_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.OCA_RUNWAY}, "
+        if self.unit_type in gen.flights.ai_flight_planner_db.STRIKE_CAPABLE or self.unit_type in gen.flights.ai_flight_planner_db.TRANSPORT_CAPABLE:
+            aircraft_tasks = aircraft_tasks + f"{FlightType.STRIKE}, "
+        return aircraft_tasks[:-2]

qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py

@@ -44,7 +44,7 @@ class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour):
         for task_type in units.keys():
             units_column = list(set(units[task_type]))
             if len(units_column) == 0: continue
-            units_column.sort(key=lambda x: db.PRICES[x])
+            units_column.sort(key=lambda u: db.unit_get_expanded_info(self.game_model.game.player_country, u, 'name'))
             for unit_type in units_column:
                 row = self.add_purchase_row(unit_type, task_box_layout, row)
             stretch = QVBoxLayout()