diff --git a/game/factions/france_modded.py b/game/factions/france_modded.py
index b5496915..c6b902d1 100644
--- a/game/factions/france_modded.py
+++ b/game/factions/france_modded.py
@@ -74,8 +74,6 @@ France_2005_Modded = {
"ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
], "requirements": {
"frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974",
- "DCS MOD RAFALES 2.5.5 BETA (Cuesta brothers)": "https://www.digitalcombatsimulator.com/fr/files/3307478/",
- "MIRAGE F1 and F1CT for 2.5.5 by Eric and Patrick": "https://www.digitalcombatsimulator.com/fr/files/3305837/",
- "MOD EUROCOPTER EC665 TIGER by the Cuesta Brothers": "https://www.digitalcombatsimulator.com/en/files/3310596/"
+ "RAFALE 2.5.5": "https://www.digitalcombatsimulator.com/fr/files/3307478/",
}
}
\ No newline at end of file
diff --git a/qt_ui/windows/QNewGameWizard.py b/qt_ui/windows/QNewGameWizard.py
index cecd0ea4..89a263e9 100644
--- a/qt_ui/windows/QNewGameWizard.py
+++ b/qt_ui/windows/QNewGameWizard.py
@@ -147,32 +147,53 @@ class FactionSelection(QtWidgets.QWizardPage):
blues = [c for c in db.FACTIONS if db.FACTIONS[c]["side"] == "blue"]
reds = [c for c in db.FACTIONS if db.FACTIONS[c]["side"] == "red"]
- # Create form
- blueFaction = QtWidgets.QLabel("Blue Faction :")
+
+ # Factions selection
+ self.factionsGroup = QtWidgets.QGroupBox("Factions")
+ self.factionsGroupLayout = QtWidgets.QGridLayout()
+
+ blueFaction = QtWidgets.QLabel("Blue Faction :")
self.blueFactionSelect = QtWidgets.QComboBox()
for f in blues:
self.blueFactionSelect.addItem(f)
blueFaction.setBuddy(self.blueFactionSelect)
- redFaction = QtWidgets.QLabel("Red Faction :")
+ redFaction = QtWidgets.QLabel("Red Faction :")
self.redFactionSelect = QtWidgets.QComboBox()
for r in reds:
self.redFactionSelect.addItem(r)
redFaction.setBuddy(self.redFactionSelect)
+ self.blueSideRecap = QtWidgets.QLabel("")
+ self.blueSideRecap.setFont(CONST.FONT_PRIMARY_I)
+ self.blueSideRecap.setWordWrap(True)
+
+ self.blueGroup = QtWidgets.QGroupBox("Redfor")
+ self.redSideRecap = QtWidgets.QLabel("")
+ self.redSideRecap.setFont(CONST.FONT_PRIMARY_I)
+ self.redSideRecap.setWordWrap(True)
+
+ self.factionsGroupLayout.addWidget(blueFaction, 0, 0)
+ self.factionsGroupLayout.addWidget(self.blueFactionSelect, 0, 1)
+ self.factionsGroupLayout.addWidget(self.blueSideRecap, 1, 0, 1, 2)
+ self.factionsGroupLayout.addWidget(redFaction, 2, 0)
+ self.factionsGroupLayout.addWidget(self.redFactionSelect, 2, 1)
+ self.factionsGroupLayout.addWidget(self.redSideRecap, 3, 0, 1, 2)
+ self.factionsGroup.setLayout(self.factionsGroupLayout)
+
+ # Create required mod layout
+ self.requiredModsGroup = QtWidgets.QGroupBox("Required Mods")
+ self.requiredModsGroupLayout = QtWidgets.QHBoxLayout()
+ self.requiredMods = QtWidgets.QLabel("
")
+ self.requiredModsGroupLayout.addWidget(self.requiredMods)
+ self.requiredModsGroup.setLayout(self.requiredModsGroupLayout)
+
+ # Player faction selection
sideGroup = QtWidgets.QGroupBox("Player Side")
blueforRadioButton = QtWidgets.QRadioButton("BLUEFOR")
redforRadioButton = QtWidgets.QRadioButton("REDFOR")
blueforRadioButton.setChecked(True)
- # Unit Preview
- self.blueSideRecap = QtWidgets.QLabel("")
- self.blueSideRecap.setFont(CONST.FONT_PRIMARY_I)
- self.blueSideRecap.setWordWrap(True)
- self.redSideRecap = QtWidgets.QLabel("")
- self.redSideRecap.setFont(CONST.FONT_PRIMARY_I)
- self.redSideRecap.setWordWrap(True)
-
# Link form fields
self.registerField('blueFaction', self.blueFactionSelect)
self.registerField('redFaction', self.redFactionSelect)
@@ -185,14 +206,10 @@ class FactionSelection(QtWidgets.QWizardPage):
sideGroupLayout.addWidget(redforRadioButton)
sideGroup.setLayout(sideGroupLayout)
- layout = QtWidgets.QGridLayout()
- layout.addWidget(blueFaction, 0, 0)
- layout.addWidget(self.blueFactionSelect, 0, 1)
- layout.addWidget(self.blueSideRecap, 1, 0, 1, 2)
- layout.addWidget(redFaction, 2, 0)
- layout.addWidget(self.redFactionSelect, 2, 1)
- layout.addWidget(self.redSideRecap, 3, 0, 1, 2)
- layout.addWidget(sideGroup, 4, 0, 1, 2)
+ layout = QtWidgets.QVBoxLayout()
+ layout.addWidget(self.factionsGroup)
+ layout.addWidget(self.requiredModsGroup)
+ layout.addWidget(sideGroup)
self.setLayout(layout)
self.updateUnitRecap()
@@ -200,8 +217,14 @@ class FactionSelection(QtWidgets.QWizardPage):
self.redFactionSelect.activated.connect(self.updateUnitRecap)
def updateUnitRecap(self):
- red_units = db.FACTIONS[self.redFactionSelect.currentText()]["units"]
- blue_units = db.FACTIONS[self.blueFactionSelect.currentText()]["units"]
+
+ self.requiredMods.setText("")
+
+ red_faction = db.FACTIONS[self.redFactionSelect.currentText()]
+ blue_faction = db.FACTIONS[self.blueFactionSelect.currentText()]
+
+ red_units = red_faction["units"]
+ blue_units = blue_faction["units"]
blue_txt = ""
for u in blue_units:
@@ -217,6 +240,26 @@ class FactionSelection(QtWidgets.QWizardPage):
red_txt = red_txt + "\n"
self.redSideRecap.setText(red_txt)
+ has_mod = False
+ if "requirements" in red_faction.keys():
+ has_mod = True
+ for mod in red_faction["requirements"].keys():
+ self.requiredMods.setText(self.requiredMods.text() + "\n- " + mod + ": " + red_faction["requirements"][mod] + "
")
+
+ if "requirements" in blue_faction.keys():
+ has_mod = True
+ for mod in blue_faction["requirements"].keys():
+ if not "requirements" in red_faction.keys() or mod not in red_faction["requirements"].keys():
+ self.requiredMods.setText(self.requiredMods.text() + "\n- " + mod + ": " + blue_faction["requirements"][mod] + "
")
+
+ if has_mod:
+ self.requiredMods.setText(self.requiredMods.text() + "
\n\n")
+ else:
+ self.requiredMods.setText(self.requiredMods.text() + "None\n")
+
+
+
+
class TheaterConfiguration(QtWidgets.QWizardPage):
def __init__(self, parent=None):