diff --git a/changelog.md b/changelog.md index 9a48c7d7..55ca2695 100644 --- a/changelog.md +++ b/changelog.md @@ -6,7 +6,7 @@ Saves from 2.5 are not compatible with 3.0. * **[Campaign]** Ground units can now be transferred by road, airlift, and cargo ship. See https://github.com/Khopa/dcs_liberation/wiki/Unit-Transfers for more information. * **[Campaign]** Ground units can no longer be sold. To move units to a new location, transfer them. -* **[Campaign]** Ground units must now be recruited at a base with a factory and transferred to their destination. When buying units in the UI, the purchase will automatically be fulfilled at the closest factory and a transfer will be created on the next turn. This feature is off by default. +* **[Campaign]** Ground units must now be recruited at a base with a factory and transferred to their destination. When buying units in the UI, the purchase will automatically be fulfilled at the closest factory, and a transfer will be created on the next turn. * **[UI]** Campaigns generated for an older or newer version of the game will now be marked as incompatible. They can still be played, but bugs may be present. * **[Modding]** Campaigns now choose locations for factories to spawn. diff --git a/game/settings.py b/game/settings.py index cbc6108c..d6338610 100644 --- a/game/settings.py +++ b/game/settings.py @@ -33,9 +33,10 @@ class Settings: disable_legacy_aewc: bool = False generate_dark_kneeboard: bool = False - #: Feature flag for new ground unit behavior. Old campaigns are sufficiently broken - #: that we need to implement this conditionally for the time being. - enable_new_ground_unit_recruitment: bool = False + #: Feature flag for new ground unit behavior. Old campaigns are will not work with + #: this so the old behavior remains an option until it breaks, at which point we'll + #: remove it. + enable_new_ground_unit_recruitment: bool = True # Performance oriented perf_red_alert_state: bool = True diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 9377afb6..8f4bb54d 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -536,6 +536,7 @@ class DifficultyAndAutomationOptions(QtWidgets.QWizardPage): new_ground_unit_recruitment_label.setOpenExternalLinks(True) flags_layout.addWidget(new_ground_unit_recruitment_label, 0, 0) new_ground_unit_recruitment = QtWidgets.QCheckBox() + new_ground_unit_recruitment.setChecked(True) self.registerField("new_ground_unit_recruitment", new_ground_unit_recruitment) flags_layout.addWidget(new_ground_unit_recruitment, 0, 1, Qt.AlignRight) diff --git a/qt_ui/windows/settings/QSettingsWindow.py b/qt_ui/windows/settings/QSettingsWindow.py index d328b74c..af3f7e8e 100644 --- a/qt_ui/windows/settings/QSettingsWindow.py +++ b/qt_ui/windows/settings/QSettingsWindow.py @@ -83,7 +83,7 @@ NEW_GROUND_UNIT_RECRUITMENT_TOOLTIP = ( "travel to the front line." ) NEW_GROUND_UNIT_RECRUITMENT_BEHAVIOR_LABEL = ( - "Enable new ground unit recruitment behavior (WIP)
" + "Enable new ground unit recruitment behavior
" '' 'More information.' )