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

Merge branch 'dev' into pr/204

Browse Source
This commit is contained in:
Raffson
2024-07-28 15:57:38 +02:00
parent 8dcf25d9ee e0d4a031bb
commit 65e529aa55
100 changed files with 1342 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qt_ui/main.py
View File

@@ -335,6 +335,9 @@ def create_game(
f104_starfighter=False,
f105_thunderchief=False,
hercules=False,
oh_6=False,
oh_6_vietnamassetpack=False,
uh_60l=False,
jas39_gripen=False,
sk60_saab105=False,
su15_flagon=False,

6
qt_ui/widgets/combos/QSquadronLiverySelector.py
View File

@@ -33,6 +33,12 @@ class SquadronLiverySelector(QComboBox):
for x in faction.liveries_overrides.get(self.aircraft_type, [])
if x in [y.id.lower() for y in liveries]
]
if selected_livery is None and squadron.livery_set:
self.addItem("Using livery-set from squadron's yaml", userData=None)
self.setEnabled(False)
return
if selected_livery is None and squadron.aircraft.default_livery:
selected_livery = squadron.aircraft.default_livery
if len(overrides) > 0:
self.addItem("Use livery overrides", userData=None)
for livery in sorted(liveries):

16
qt_ui/windows/mission/QAutoCreateDialog.py
View File

@@ -130,6 +130,20 @@ class QAutoCreateDialog(QDialog):
self.sead_sweep_type,
)
hbox = QHBoxLayout()
self.armed_recon = self._create_checkbox("Armed Recon")
self.armed_recon_count = _spinbox_template()
hbox.addWidget(self.armed_recon)
hbox.addWidget(self.armed_recon_count)
self.armed_recon_type = self._create_type_selector(FlightType.ARMED_RECON)
hbox.addWidget(self.armed_recon_type)
self.layout.addLayout(hbox)
self.checkboxes[self.armed_recon] = (
FlightType.ARMED_RECON,
self.armed_recon_count,
self.armed_recon_type,
)
hbox = QHBoxLayout()
self.refueling = self._create_checkbox("Refueling")
self.refueling_count = _spinbox_template()
@@ -161,6 +175,8 @@ class QAutoCreateDialog(QDialog):
FlightType.ANTISHIP,
FlightType.BAI,
FlightType.CAS,
FlightType.ARMED_RECON,
FlightType.AIR_ASSAULT,
}
for mt in self.package.target.mission_types(self.is_ownfor):
if mt in primary_tasks:

2
qt_ui/windows/newgame/QNewGameWizard.py
View File

@@ -107,6 +107,8 @@ class NewGameWizard(QtWidgets.QWizard):
f106_deltadart=self.field("f106_deltadart"),
hercules=self.field("hercules"),
irondome=self.field("irondome"),
oh_6=self.field("oh_6"),
oh_6_vietnamassetpack=self.field("oh_6_vietnamassetpack"),
uh_60l=self.field("uh_60l"),
jas39_gripen=self.field("jas39_gripen"),
super_etendard=self.field("super_etendard"),

6
qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
View File

@@ -98,6 +98,10 @@ class GeneratorOptions(QtWidgets.QWizardPage):
self.registerField("ea6b_prowler", self.ea6b_prowler)
self.hercules = QtWidgets.QCheckBox()
self.registerField("hercules", self.hercules)
self.oh_6 = QtWidgets.QCheckBox()
self.registerField("oh_6", self.oh_6)
self.oh_6_vietnamassetpack = QtWidgets.QCheckBox()
self.registerField("oh_6_vietnamassetpack", self.oh_6_vietnamassetpack)
self.uh_60l = QtWidgets.QCheckBox()
self.registerField("uh_60l", self.uh_60l)
self.f4bc_phantom = QtWidgets.QCheckBox()
@@ -196,6 +200,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
("Su-57 Felon (build-04)", self.su57_felon),
("Super Étendard (v2.5.5)", self.super_etendard),
("Swedish Military Assets pack (1.10)", self.swedishmilitaryassetspack),
("OH-6 Cayuse (v1.2)", self.oh_6),
("OH-6 Vietnam Asset Pack (v1.0)", self.oh_6_vietnamassetpack),
("UH-60L Black Hawk (v1.3.1)", self.uh_60l),
]