diff --git a/changelog.md b/changelog.md index 259e401d..41b45c9a 100644 --- a/changelog.md +++ b/changelog.md @@ -37,6 +37,7 @@ * **[UI]** Display TOT for all waypoints in the flight plan * **[UI]** Edit basic datalink properties for applicable aircraft * **[Mission Generation]** Automatic datalink network setup for applicable aircraft (_should_ in theory avoid the need to re-save the mission) +* **[Options]** New option to force-enable deck-crew for super-carriers on dedicated server. ## Fixes * **[UI/UX]** A-10A flights can be edited again diff --git a/game/missiongenerator/forcedoptionsgenerator.py b/game/missiongenerator/forcedoptionsgenerator.py index 017331db..6ccfea11 100644 --- a/game/missiongenerator/forcedoptionsgenerator.py +++ b/game/missiongenerator/forcedoptionsgenerator.py @@ -53,6 +53,10 @@ class ForcedOptionsGenerator: self.game.settings.battle_damage_assessment ) + def _set_supercarrier_deck_crew(self) -> None: + value = self.game.settings.supercarrier_deck_crew + self.mission.forced_options.supercarrier_deck_crew = value + def generate(self) -> None: self._set_options_view() self._set_external_views() @@ -60,3 +64,4 @@ class ForcedOptionsGenerator: self._set_labels() self._set_unrestricted_satnav() self._set_battle_damage_assessment() + self._set_supercarrier_deck_crew() diff --git a/game/settings/settings.py b/game/settings/settings.py index e5813523..76d0588d 100644 --- a/game/settings/settings.py +++ b/game/settings/settings.py @@ -738,6 +738,12 @@ class Settings: GAMEPLAY_SECTION, default=False, ) + supercarrier_deck_crew: bool = boolean_option( + "Use supercarrier deck-crew", + MISSION_GENERATOR_PAGE, + GAMEPLAY_SECTION, + default=True, + ) generate_marks: bool = boolean_option( "Put objective markers on the map", MISSION_GENERATOR_PAGE, diff --git a/requirements.txt b/requirements.txt index 1ce9154f..c13a0771 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,7 +33,7 @@ pluggy==1.5.0 pre-commit==3.7.1 pydantic==2.7.4 pydantic-settings==2.3.3 -pydcs @ git+https://github.com/dcs-retribution/pydcs@4b63a60f410b5542c9654ebe4d74cfcb17e06eff +pydcs @ git+https://github.com/dcs-retribution/pydcs@1eb583d4616a434d21e8cde73ef4247a0ec19a74 pyinstaller==5.13.2 pyinstaller-hooks-contrib==2024.0 pyparsing==3.1.2 diff --git a/resources/default_options.lua b/resources/default_options.lua index 100e5524..b90d140f 100644 --- a/resources/default_options.lua +++ b/resources/default_options.lua @@ -49,7 +49,7 @@ options = ["easyCommunication"] = true, ["labels"] = true, }, -- end of ["difficulty"] - ["VR"] = + ["VR"] = { ["use_mouse"] = true, ["hand_controllers"] = true, @@ -60,7 +60,7 @@ options = ["box_mouse_cursor"] = false, ["pixel_density"] = 1, }, -- end of ["VR"] - ["graphics"] = + ["graphics"] = { ["rainDroplets"] = 1, ["preloadRadius"] = 100000, @@ -100,8 +100,18 @@ options = ["clutterMaxDistance"] = 750, ["civTraffic"] = "", }, -- end of ["graphics"] - ["plugins"] = + ["plugins"] = { + ["Supercarrier"] = + { + ["deck_crew"] = true, + ["enable_FLOLS_overlay"] = true, + ["messages_enabled"] = true, + ["helpers_enabled"] = true, + ["Use_native_ATC_text"] = false, + ["velocity_limit_enabled"] = true, + ["simplified_taxi"] = true, + }, -- end of ["Supercarrier"] ["Su-25T"] = { ["CPLocalList"] = "default",