weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs with mixed parking

Browse Source
This commit is contained in:
Eclipse/Druss99 2025-10-12 12:23:55 -04:00 committed by Raffson
parent 98c71c255b
commit 96f940bc59
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -25,6 +25,7 @@
* **[Flight Plans]** Fixed a bug where SEAD flights would fire one ARM and RTB * **[Flight Plans]** Fixed a bug where SEAD flights would fire one ARM and RTB
* **[Plugins]** EW Script - Fix radar detection routine. * **[Plugins]** EW Script - Fix radar detection routine.
* **[Campaign]** Fixed a bug where sinking a destroyer in a carrier group would cause squadrons to be removed from the carrier * **[Campaign]** Fixed a bug where sinking a destroyer in a carrier group would cause squadrons to be removed from the carrier
* **[Engine]** Fixed a bug with transfers to Helipads
# Retribution v1.4.1 (hotfix) # Retribution v1.4.1 (hotfix)

6
qt_ui/windows/SquadronDialog.py
View File

@ -190,12 +190,12 @@ class SquadronDestinationComboBox(QComboBox):
or cp.coalition.game.settings.ground_start_ai_planes or cp.coalition.game.settings.ground_start_ai_planes
) )
if free_helicopter_slots > 0 and (is_heli or is_vtol): if free_helicopter_slots > 0 and is_heli:
free_helicopter_slots = -1 free_helicopter_slots -= 1
elif free_ground_spawns > 0 and ( elif free_ground_spawns > 0 and (
is_heli or is_vtol or count_ground_spawns is_heli or is_vtol or count_ground_spawns
): ):
free_ground_spawns = -1 free_ground_spawns -= 1
else: else:
slot = ap.free_parking_slot(s.aircraft.dcs_unit_type) slot = ap.free_parking_slot(s.aircraft.dcs_unit_type)
if slot: if slot:

22
qt_ui/windows/basemenu/QBaseMenu2.py
View File

@ -303,9 +303,8 @@ class QBaseMenu2(QDialog):
fixed_wing=False, fixed_wing_stol=False, rotary_wing=True fixed_wing=False, fixed_wing_stol=False, rotary_wing=True
) )
fixed_wing_parking = self.cp.total_aircraft_parking(parking_type_fixed_wing)
ground_spawn_parking = self.cp.total_aircraft_parking(parking_type_stol) ground_spawn_parking = self.cp.total_aircraft_parking(parking_type_stol)
rotary_wing_parking = self.cp.total_aircraft_parking(parking_type_rotary_wing) helipads = self.cp.total_aircraft_parking(parking_type_rotary_wing)
ground_unit_limit = self.cp.frontline_unit_count_limit ground_unit_limit = self.cp.frontline_unit_count_limit
deployable_unit_info = "" deployable_unit_info = ""
@ -319,14 +318,27 @@ class QBaseMenu2(QDialog):
deployable_unit_info = ( deployable_unit_info = (
f" (Up to {ground_unit_limit} deployable, {unit_overage} reserve)" f" (Up to {ground_unit_limit} deployable, {unit_overage} reserve)"
) )
fixed_wing_airfield_parking = [
slot
for slot in self.cp.parking_slots
if slot.airplanes and not slot.helicopter
]
rotary_wing_airfield_parking = [
slot
for slot in self.cp.parking_slots
if slot.helicopter and not slot.airplanes
]
mixed_parking = [
slot for slot in self.cp.parking_slots if slot.helicopter and slot.airplanes
]
self.intel_summary.setText( self.intel_summary.setText(
"\n".join( "\n".join(
[ [
f"{aircraft}/{parking} aircraft", f"{aircraft}/{parking} aircraft",
f"{fixed_wing_parking} fixed wing parking", f"{len(fixed_wing_airfield_parking)} fixed-wing only parking",
f"{len(rotary_wing_airfield_parking) + helipads} rotary-wing only parking",
f"{len(mixed_parking)} mixed parking",
f"{ground_spawn_parking} ground spawns", f"{ground_spawn_parking} ground spawns",
f"{rotary_wing_parking} rotary wing parking",
f"{self.cp.base.total_armor} ground units" + deployable_unit_info, f"{self.cp.base.total_armor} ground units" + deployable_unit_info,
f"{allocated.total_transferring} more ground units en route, {allocated.total_ordered} ordered", f"{allocated.total_transferring} more ground units en route, {allocated.total_ordered} ordered",
str(self.cp.runway_status), str(self.cp.runway_status),