diff --git a/changelog.md b/changelog.md index 514b6792..082c7b6f 100644 --- a/changelog.md +++ b/changelog.md @@ -19,7 +19,8 @@ BAI/ANTISHIP/DEAD/STRIKE/BARCAP/CAS/OCA/AIR-ASSAULT (main) missions * **[Performance]** Added performance option: Front-line troops prefer roads. * **[Data]** Added data to support C-47 Skytrain. * **[Data]** Added data to support KS-19 & SON-9, including support for "AAA Site" layout. -* * **[Campaign]** Add 3 new campaigns by Oscar Juliet from WRL +* **[Squadrons]** Squadron pilot limits enabled by default. +* **[Campaign]** Add 3 new campaigns by Oscar Juliet from WRL ## Fixes diff --git a/game/settings/settings.py b/game/settings/settings.py index e626e58f..04dca340 100644 --- a/game/settings/settings.py +++ b/game/settings/settings.py @@ -205,10 +205,10 @@ class Settings: ) #: Feature flag for squadron limits. enable_squadron_pilot_limits: bool = boolean_option( - "Enable per-squadron pilot limits (WIP)", + "Enable per-squadron pilot limits", CAMPAIGN_MANAGEMENT_PAGE, PILOTS_AND_SQUADRONS_SECTION, - default=False, + default=True, detail=( "If set, squadrons will be limited to a maximum number of pilots and dead " "pilots will replenish at a fixed rate, each defined with the settings" @@ -225,7 +225,7 @@ class Settings: CAMPAIGN_MANAGEMENT_PAGE, PILOTS_AND_SQUADRONS_SECTION, default=12, - min=12, + min=6, max=72, detail=( "Sets the maximum number of pilots a squadron may have active. "