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

Allow in-line definitions of campaign factions.

Browse Source 
A lot of campaigns want to define custom factions. This allows them to
do so without us having to fill the built-in factions list with a bunch
of campaign-specific factions. It also makes custom campaigns more
portable as they don't need to also distribute the custom faction files.
This commit is contained in:
Dan Albert
2023-04-17 23:27:59 -07:00
parent dca256364a
commit 1ac36d03da
11 changed files with 288 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,9 +83,11 @@ class NewGameWizard(QtWidgets.QWizard):
def __init__(self, parent=None):
super(NewGameWizard, self).__init__(parent)
factions = Factions.load()
self.campaigns = list(sorted(Campaign.load_each(), key=lambda x: x.name))
self.faction_selection_page = FactionSelection()
self.faction_selection_page = FactionSelection(factions)
self.addPage(IntroPage())
self.theater_page = TheaterConfiguration(
self.campaigns, self.faction_selection_page
@@ -222,10 +224,10 @@ class IntroPage(QtWidgets.QWizardPage):
class FactionSelection(QtWidgets.QWizardPage):
def __init__(self, parent=None):
super(FactionSelection, self).__init__(parent)
def __init__(self, factions: Factions, parent=None) -> None:
super().__init__(parent)
self.factions = Factions.load()
self.factions = factions
self.setTitle("Faction selection")
self.setSubTitle(
@@ -308,15 +310,15 @@ class FactionSelection(QtWidgets.QWizardPage):
self.blueFactionSelect.clear()
self.redFactionSelect.clear()
for f in self.factions.iter_faction_names():
self.blueFactionSelect.addItem(f)
self.factions.reset_campaign_defined()
campaign.register_campaign_specific_factions(self.factions)
for i, r in enumerate(self.factions.iter_faction_names()):
self.redFactionSelect.addItem(r)
if r == campaign.recommended_enemy_faction:
self.redFactionSelect.setCurrentIndex(i)
if r == campaign.recommended_player_faction:
self.blueFactionSelect.setCurrentIndex(i)
for name in self.factions.iter_faction_names():
self.blueFactionSelect.addItem(name)
self.redFactionSelect.addItem(name)
self.blueFactionSelect.setCurrentText(campaign.recommended_player_faction.name)
self.redFactionSelect.setCurrentText(campaign.recommended_enemy_faction.name)
self.updateUnitRecap()