mirror of
https://github.com/dcs-retribution/dcs-retribution.git
synced 2025-11-10 15:41:24 +00:00
Fix NGW bug wrt missing plugin-options in campaign settings
This commit is contained in:
parent
ea09b6be32
commit
db3670b759
@ -23,7 +23,7 @@ class NewGameSettings(QtWidgets.QWizardPage):
|
||||
settings = Settings()
|
||||
self.settings_widget = QSettingsWidget(settings)
|
||||
self.settings_widget.load_default_settings()
|
||||
settings.__dict__.update(Settings.deserialize_state_dict(campaign.settings))
|
||||
self._load_campaign_settings(campaign, settings)
|
||||
settings.player_income_multiplier = (
|
||||
campaign.recommended_player_income_multiplier
|
||||
)
|
||||
@ -31,6 +31,14 @@ class NewGameSettings(QtWidgets.QWizardPage):
|
||||
self.settings_widget.update_from_settings()
|
||||
self.setLayout(self.settings_widget.layout)
|
||||
|
||||
@staticmethod
|
||||
def _load_campaign_settings(campaign, settings):
|
||||
campaign_settings = Settings.deserialize_state_dict(campaign.settings)
|
||||
campaign_settings["plugins"] = {
|
||||
**settings.__dict__["plugins"], **campaign_settings["plugins"]
|
||||
}
|
||||
settings.__dict__.update(campaign_settings)
|
||||
|
||||
def set_campaign_values(self, c: Campaign):
|
||||
sw = self.settings_widget
|
||||
sw.load_default_settings()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user