Merge branch 'dev' of https://github.com/drexyl/dcs-retribution into dev
@@ -863,6 +863,7 @@ class Faction:
|
|||||||
self.air_defense_units,
|
self.air_defense_units,
|
||||||
self.artillery_units,
|
self.artillery_units,
|
||||||
self.logistics_units,
|
self.logistics_units,
|
||||||
|
self.missiles,
|
||||||
]:
|
]:
|
||||||
for i in list(sequence):
|
for i in list(sequence):
|
||||||
if i.dcs_unit_type.id == name:
|
if i.dcs_unit_type.id == name:
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ class MissionGenerator:
|
|||||||
|
|
||||||
namegen.reset_numbers()
|
namegen.reset_numbers()
|
||||||
self.generate_warehouses()
|
self.generate_warehouses()
|
||||||
|
output.parent.mkdir(parents=True, exist_ok=True)
|
||||||
self.mission.save(output)
|
self.mission.save(output)
|
||||||
|
|
||||||
return self.unit_map
|
return self.unit_map
|
||||||
|
|||||||
@@ -1259,6 +1259,7 @@ class Airfield(ControlPoint, CTLD):
|
|||||||
if self.is_friendly(for_player):
|
if self.is_friendly(for_player):
|
||||||
yield from [
|
yield from [
|
||||||
FlightType.AEWC,
|
FlightType.AEWC,
|
||||||
|
FlightType.ESCORT,
|
||||||
# TODO: FlightType.INTERCEPTION
|
# TODO: FlightType.INTERCEPTION
|
||||||
# TODO: FlightType.LOGISTICS
|
# TODO: FlightType.LOGISTICS
|
||||||
]
|
]
|
||||||
@@ -1372,6 +1373,7 @@ class NavalControlPoint(
|
|||||||
FlightType.AEWC,
|
FlightType.AEWC,
|
||||||
FlightType.RECOVERY,
|
FlightType.RECOVERY,
|
||||||
FlightType.REFUELING,
|
FlightType.REFUELING,
|
||||||
|
FlightType.ESCORT,
|
||||||
# TODO: FlightType.INTERCEPTION
|
# TODO: FlightType.INTERCEPTION
|
||||||
# TODO: Buddy tanking for the A-4?
|
# TODO: Buddy tanking for the A-4?
|
||||||
# TODO: Rescue chopper?
|
# TODO: Rescue chopper?
|
||||||
@@ -1655,8 +1657,11 @@ class Fob(ControlPoint, RadioFrequencyContainer, CTLD):
|
|||||||
if self.total_aircraft_parking(ParkingType(True, True, True)):
|
if self.total_aircraft_parking(ParkingType(True, True, True)):
|
||||||
yield FlightType.OCA_AIRCRAFT
|
yield FlightType.OCA_AIRCRAFT
|
||||||
else:
|
else:
|
||||||
yield FlightType.AEWC
|
yield from [
|
||||||
|
FlightType.AEWC,
|
||||||
|
FlightType.ESCORT,
|
||||||
|
FlightType.REFUELING,
|
||||||
|
]
|
||||||
yield from super().mission_types(for_player)
|
yield from super().mission_types(for_player)
|
||||||
|
|
||||||
def total_aircraft_parking(self, parking_type: ParkingType) -> int:
|
def total_aircraft_parking(self, parking_type: ParkingType) -> int:
|
||||||
|
|||||||
@@ -222,14 +222,6 @@ def load_aircraft_icons():
|
|||||||
AIRCRAFT_ICONS["F-5E-3_FC"] = AIRCRAFT_ICONS["F-5E-3"]
|
AIRCRAFT_ICONS["F-5E-3_FC"] = AIRCRAFT_ICONS["F-5E-3"]
|
||||||
AIRCRAFT_ICONS["F-86F_FC"] = AIRCRAFT_ICONS["F-86F Sabre"]
|
AIRCRAFT_ICONS["F-86F_FC"] = AIRCRAFT_ICONS["F-86F Sabre"]
|
||||||
AIRCRAFT_ICONS["MiG-15bis_FC"] = AIRCRAFT_ICONS["MiG-15bis"]
|
AIRCRAFT_ICONS["MiG-15bis_FC"] = AIRCRAFT_ICONS["MiG-15bis"]
|
||||||
AIRCRAFT_ICONS["CH_Ka52"] = AIRCRAFT_ICONS["CH_K"]
|
|
||||||
AIRCRAFT_ICONS["CH_Ka52K"] = AIRCRAFT_ICONS["CH_Ka"]
|
|
||||||
AIRCRAFT_ICONS["CH_Mi28N"] = AIRCRAFT_ICONS["CH_Mi"]
|
|
||||||
AIRCRAFT_ICONS["CH_Tu-95MSM"] = AIRCRAFT_ICONS["CH_Tu-95"]
|
|
||||||
AIRCRAFT_ICONS["CH_Tu-160M2"] = AIRCRAFT_ICONS["CH_Tu-16"]
|
|
||||||
AIRCRAFT_ICONS["B-21"] = AIRCRAFT_ICONS["B"]
|
|
||||||
AIRCRAFT_ICONS["CH_JAS39C"] = AIRCRAFT_ICONS["CH_JAS"]
|
|
||||||
AIRCRAFT_ICONS["HKP15B"] = AIRCRAFT_ICONS["HKP"]
|
|
||||||
|
|
||||||
|
|
||||||
def load_vehicle_icons():
|
def load_vehicle_icons():
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 908 B |
|
Before Width: | Height: | Size: 892 B After Width: | Height: | Size: 892 B |
|
Before Width: | Height: | Size: 920 B After Width: | Height: | Size: 920 B |
|
Before Width: | Height: | Size: 941 B After Width: | Height: | Size: 941 B |
|
Before Width: | Height: | Size: 809 B After Width: | Height: | Size: 809 B |
|
Before Width: | Height: | Size: 848 B After Width: | Height: | Size: 848 B |
|
Before Width: | Height: | Size: 847 B After Width: | Height: | Size: 847 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |