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

Split full-strength start from squadron aircraft limits

Browse Source
This commit is contained in:
Raffson 2023-06-03 16:04:16 +02:00
parent db7bcaa45c
commit 2ed85792b9
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/settings/settings.py
View File

@ -258,9 +258,7 @@ class Settings:
PILOTS_AND_SQUADRONS_SECTION, PILOTS_AND_SQUADRONS_SECTION,
default=False, default=False,
detail=( detail=(
"If set, squadrons will not be able to exceed a maximum number of aircraft " "If set, squadrons will not be able to buy more aircraft than the configured maximum."
"(configurable), and the campaign will begin with all squadrons at full strength "
"given enough room at the base."
), ),
) )

1
game/theater/start_generator.py
View File

@ -49,6 +49,7 @@ class GeneratorSettings:
no_player_navy: bool no_player_navy: bool
no_enemy_navy: bool no_enemy_navy: bool
tgo_config: TgoConfig tgo_config: TgoConfig
squadrons_start_full: bool
@dataclass @dataclass

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

@ -84,6 +84,7 @@ class NewGameWizard(QtWidgets.QWizard):
no_player_navy=self.field("no_player_navy"), no_player_navy=self.field("no_player_navy"),
no_enemy_navy=self.field("no_enemy_navy"), no_enemy_navy=self.field("no_enemy_navy"),
tgo_config=campaign.load_ground_forces_config(), tgo_config=campaign.load_ground_forces_config(),
squadrons_start_full=self.field("squadrons_start_full")
) )
mod_settings = ModSettings( mod_settings = ModSettings(
a4_skyhawk=self.field("a4_skyhawk"), a4_skyhawk=self.field("a4_skyhawk"),
@ -143,7 +144,7 @@ class NewGameWizard(QtWidgets.QWizard):
g.settings.set_plugin_option("herculescargo", True) g.settings.set_plugin_option("herculescargo", True)
self.generatedGame.begin_turn_0( self.generatedGame.begin_turn_0(
squadrons_start_full=settings.enable_squadron_aircraft_limits squadrons_start_full=generator_settings.squadrons_start_full
) )
super(NewGameWizard, self).accept() super(NewGameWizard, self).accept()

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

@ -54,6 +54,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
self.registerField("no_player_navy", self.no_player_navy) self.registerField("no_player_navy", self.no_player_navy)
self.no_enemy_navy = QtWidgets.QCheckBox() self.no_enemy_navy = QtWidgets.QCheckBox()
self.registerField("no_enemy_navy", self.no_enemy_navy) self.registerField("no_enemy_navy", self.no_enemy_navy)
self.squadrons_start_full = QtWidgets.QCheckBox()
self.registerField("squadrons_start_full", self.squadrons_start_full)
generatorLayout = QtWidgets.QGridLayout() generatorLayout = QtWidgets.QGridLayout()
generatorLayout.addWidget(QtWidgets.QLabel("No Aircraft Carriers"), 1, 0) generatorLayout.addWidget(QtWidgets.QLabel("No Aircraft Carriers"), 1, 0)
@ -65,13 +67,23 @@ class GeneratorOptions(QtWidgets.QWizardPage):
generatorLayout.addWidget(QtWidgets.QLabel("No Enemy Navy"), 4, 0) generatorLayout.addWidget(QtWidgets.QLabel("No Enemy Navy"), 4, 0)
generatorLayout.addWidget(self.no_enemy_navy, 4, 1) generatorLayout.addWidget(self.no_enemy_navy, 4, 1)
label = QtWidgets.QLabel("Squadrons start at full capacity")
label.setToolTip(
"Campaign will start with all squadrons at full strength "
"given enough room at the airfield in question.\n"
"Each squadron's capacity can be defined during Air Wing Configuration."
)
generatorLayout.addWidget(label, 5, 0)
generatorLayout.addWidget(self.squadrons_start_full, 5, 1)
generatorLayout.addWidget(QtWidgets.QWidget(), 6, 0)
self.player_budget = BudgetInputs("Player starting budget", DEFAULT_BUDGET) self.player_budget = BudgetInputs("Player starting budget", DEFAULT_BUDGET)
self.registerField("starting_money", self.player_budget.starting_money) self.registerField("starting_money", self.player_budget.starting_money)
generatorLayout.addLayout(self.player_budget, 5, 0) generatorLayout.addLayout(self.player_budget, 7, 0)
self.enemy_budget = BudgetInputs("Enemy starting budget", DEFAULT_BUDGET) self.enemy_budget = BudgetInputs("Enemy starting budget", DEFAULT_BUDGET)
self.registerField("enemy_starting_money", self.enemy_budget.starting_money) self.registerField("enemy_starting_money", self.enemy_budget.starting_money)
generatorLayout.addLayout(self.enemy_budget, 6, 0) generatorLayout.addLayout(self.enemy_budget, 8, 0)
generatorSettingsGroup.setLayout(generatorLayout) generatorSettingsGroup.setLayout(generatorLayout)
@ -195,6 +207,7 @@ class GeneratorOptions(QtWidgets.QWizardPage):
self.no_lha.setChecked(s.get("no_lha", False)) self.no_lha.setChecked(s.get("no_lha", False))
self.no_player_navy.setChecked(s.get("no_player_navy", False)) self.no_player_navy.setChecked(s.get("no_player_navy", False))
self.no_enemy_navy.setChecked(s.get("no_enemy_navy", False)) self.no_enemy_navy.setChecked(s.get("no_enemy_navy", False))
self.squadrons_start_full.setChecked(s.get("squadron_start_full", False))
self.a4_skyhawk.setChecked(s.get("a4_skyhawk", False)) self.a4_skyhawk.setChecked(s.get("a4_skyhawk", False))
self.a6a_intruder.setChecked(s.get("a6a_intruder", False)) self.a6a_intruder.setChecked(s.get("a6a_intruder", False))