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

Fix error while loading/setting campaign settings

Browse Source
This commit is contained in:
Raffson 2024-12-26 16:23:04 +01:00
parent d1b484f560
commit ffe0ede285
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qt_ui/windows/newgame/WizardPages/QNewGameSettings.py
View File

@ -34,16 +34,17 @@ class NewGameSettings(QtWidgets.QWizardPage):
@staticmethod @staticmethod
def _load_campaign_settings(campaign: Campaign, settings: Settings) -> None: def _load_campaign_settings(campaign: Campaign, settings: Settings) -> None:
campaign_settings = Settings.deserialize_state_dict(campaign.settings) campaign_settings = Settings.deserialize_state_dict(campaign.settings)
campaign_settings["plugins"] = { if campaign_settings.get("plugins", {}):
**settings.__dict__["plugins"], campaign_settings["plugins"] = {
**campaign_settings["plugins"], **settings.__dict__["plugins"],
} **campaign_settings["plugins"],
}
settings.__dict__.update(campaign_settings) settings.__dict__.update(campaign_settings)
def set_campaign_values(self, c: Campaign): def set_campaign_values(self, c: Campaign):
sw = self.settings_widget sw = self.settings_widget
sw.load_default_settings() sw.load_default_settings()
sw.settings.__dict__.update(Settings.deserialize_state_dict(c.settings)) self._load_campaign_settings(c, sw.settings)
sw.settings.player_income_multiplier = c.recommended_player_income_multiplier sw.settings.player_income_multiplier = c.recommended_player_income_multiplier
sw.settings.enemy_income_multiplier = c.recommended_enemy_income_multiplier sw.settings.enemy_income_multiplier = c.recommended_enemy_income_multiplier
sw.update_from_settings() sw.update_from_settings()