Add C-130 to the CAS capable list, clean up.

This commit is contained in:
Dan Albert 2021-04-23 21:21:05 -07:00
parent 20d8cc2b47
commit 5320d20f71
3 changed files with 5 additions and 16 deletions

View File

@ -157,6 +157,7 @@ CAS_CAPABLE = [
A_10C_2, A_10C_2,
B_1B, B_1B,
A_10C, A_10C,
Hercules,
F_14B, F_14B,
F_14A_135_GR, F_14A_135_GR,
Su_25TM, Su_25TM,

View File

@ -49,10 +49,7 @@ class QAircraftTypeSelector(QComboBox):
FlightType.BAI, FlightType.BAI,
FlightType.OCA_AIRCRAFT, FlightType.OCA_AIRCRAFT,
]: ]:
if ( if aircraft in gen.flights.ai_flight_planner_db.CAS_CAPABLE:
aircraft in gen.flights.ai_flight_planner_db.CAS_CAPABLE
or aircraft in gen.flights.ai_flight_planner_db.TRANSPORT_CAPABLE
):
self.addItem( self.addItem(
f"{db.unit_get_expanded_info(self.country, aircraft, 'name')}", f"{db.unit_get_expanded_info(self.country, aircraft, 'name')}",
userData=aircraft, userData=aircraft,
@ -70,10 +67,7 @@ class QAircraftTypeSelector(QComboBox):
userData=aircraft, userData=aircraft,
) )
elif mission_type in [FlightType.STRIKE]: elif mission_type in [FlightType.STRIKE]:
if ( if aircraft in gen.flights.ai_flight_planner_db.STRIKE_CAPABLE:
aircraft in gen.flights.ai_flight_planner_db.STRIKE_CAPABLE
or aircraft in gen.flights.ai_flight_planner_db.TRANSPORT_CAPABLE
):
self.addItem( self.addItem(
f"{db.unit_get_expanded_info(self.country, aircraft, 'name')}", f"{db.unit_get_expanded_info(self.country, aircraft, 'name')}",
userData=aircraft, userData=aircraft,

View File

@ -128,10 +128,7 @@ class QUnitInfoWindow(QDialog):
aircraft_tasks aircraft_tasks
+ f"{FlightType.BARCAP}, {FlightType.ESCORT}, {FlightType.INTERCEPTION}, {FlightType.SWEEP}, {FlightType.TARCAP}, " + f"{FlightType.BARCAP}, {FlightType.ESCORT}, {FlightType.INTERCEPTION}, {FlightType.SWEEP}, {FlightType.TARCAP}, "
) )
if ( if self.unit_type in gen.flights.ai_flight_planner_db.CAS_CAPABLE:
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 = (
aircraft_tasks aircraft_tasks
+ f"{FlightType.CAS}, {FlightType.BAI}, {FlightType.OCA_AIRCRAFT}, " + f"{FlightType.CAS}, {FlightType.BAI}, {FlightType.OCA_AIRCRAFT}, "
@ -144,9 +141,6 @@ class QUnitInfoWindow(QDialog):
aircraft_tasks = aircraft_tasks + f"{FlightType.ANTISHIP}, " aircraft_tasks = aircraft_tasks + f"{FlightType.ANTISHIP}, "
if self.unit_type in gen.flights.ai_flight_planner_db.RUNWAY_ATTACK_CAPABLE: if self.unit_type in gen.flights.ai_flight_planner_db.RUNWAY_ATTACK_CAPABLE:
aircraft_tasks = aircraft_tasks + f"{FlightType.OCA_RUNWAY}, " aircraft_tasks = aircraft_tasks + f"{FlightType.OCA_RUNWAY}, "
if ( if self.unit_type in gen.flights.ai_flight_planner_db.STRIKE_CAPABLE:
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}, " aircraft_tasks = aircraft_tasks + f"{FlightType.STRIKE}, "
return aircraft_tasks[:-2] return aircraft_tasks[:-2]