weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix default faction selection when changing campaigns.

Browse Source 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1491.
This commit is contained in:
zhexu14 2023-07-23 05:35:44 +10:00 committed by GitHub
parent 48fff39409
commit 6475c6d1ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -18,6 +18,7 @@ Saves from 8.x are not compatible with 9.0.0.
* **[Data]** Allow CH-47D, CH-53E and UH-60A to operate from carriers and LHAs. * **[Data]** Allow CH-47D, CH-53E and UH-60A to operate from carriers and LHAs.
* **[Mission Generation]** Restored previous AI behavior for anti-ship missions. A DCS update caused only a single aircraft in a flight to attack. The full flight will now attack like they used to. * **[Mission Generation]** Restored previous AI behavior for anti-ship missions. A DCS update caused only a single aircraft in a flight to attack. The full flight will now attack like they used to.
* **[Mission Generation]** Fix generation of OCA Runway missions to allow LGBs to be used. * **[Mission Generation]** Fix generation of OCA Runway missions to allow LGBs to be used.
* **[New Game Wizard]** Factions are reset to default after clicking "Back" to Theater Configuration screen.
* **[Plugins]** Fixed Lua errors in Skynet plugin that would occur whenever one coalition had no IADS nodes. * **[Plugins]** Fixed Lua errors in Skynet plugin that would occur whenever one coalition had no IADS nodes.
* **[UI]** Fixed deleting waypoints in custom flight plans deleting the wrong waypoint. * **[UI]** Fixed deleting waypoints in custom flight plans deleting the wrong waypoint.
* **[UI]** Fixed flight properties UI to support F-15E S4+ laser codes. * **[UI]** Fixed flight properties UI to support F-15E S4+ laser codes.

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

@ -361,6 +361,10 @@ class FactionSelection(QtWidgets.QWizardPage):
self.updateUnitRecap() self.updateUnitRecap()
def cleanupPage(self):
"""When clicking Back button, reset factions to campaign defaults"""
self.setDefaultFactions(self.field("selectedCampaign"))
def updateUnitRecap(self): def updateUnitRecap(self):
red_faction = self.factions.get_by_name(self.redFactionSelect.currentText()) red_faction = self.factions.get_by_name(self.redFactionSelect.currentText())
blue_faction = self.factions.get_by_name(self.blueFactionSelect.currentText()) blue_faction = self.factions.get_by_name(self.blueFactionSelect.currentText())
@ -557,6 +561,11 @@ class TheaterConfiguration(QtWidgets.QWizardPage):
layout.addWidget(timeGroup, 3, 1, 3, 1) layout.addWidget(timeGroup, 3, 1, 3, 1)
self.setLayout(layout) self.setLayout(layout)
def initializePage(self):
"""Ensure that selectCampaign field is set after user clicks Back to previous page and Next back onto this page"""
campaign = self.campaignList.selected_campaign
self.setField("selectedCampaign", campaign)
class BudgetInputs(QtWidgets.QGridLayout): class BudgetInputs(QtWidgets.QGridLayout):
def __init__(self, label: str, value: int) -> None: def __init__(self, label: str, value: int) -> None: