diff --git a/changelog.md b/changelog.md index 50f0f743..ad44b641 100644 --- a/changelog.md +++ b/changelog.md @@ -7,7 +7,7 @@ Saves from 6.x are not compatible with 7.0. * **[Engine]** Support for DCS 2.8.4.39731. * **[Engine]** Saved games are now a zip file of save assets for easier bug reporting. The new extension is .liberation.zip. Drag and drop that file into bug reports. * **[Campaign]** Added options to limit squadron sizes and to begin all squadrons at maximum strength. Maximum squadron size is defined during air wing configuration with default values provided by the campaign. -* **[Campaign AI]** Added an option to instruct the campaign AI to prefer fulfilling missions with squadrons which have a matching primary task. Previously distance from target held a stronger influence than task preference. Primary tasks for squadrons are set by campaign designers but are user-configurable. +* **[Campaign AI]** The campaign AI now prefers fulfilling missions with squadrons which have a matching primary task. Previously distance from target held a stronger influence than task preference. Primary tasks for squadrons are set by campaign designers but are user-configurable. * **[Flight Planning]** Package TOT and composition can be modified after advancing time in Liberation. * **[Mission Generation]** Units on the front line are now hidden on MFDs. * **[Mission Generation]** Preset radio channels will now be configured for both A-10C modules. diff --git a/game/settings/settings.py b/game/settings/settings.py index aa6510be..70f0e102 100644 --- a/game/settings/settings.py +++ b/game/settings/settings.py @@ -195,18 +195,6 @@ class Settings: "future release." ), ) - prefer_squadrons_with_matching_primary_task: bool = boolean_option( - "Prefer squadrons with matching primary task when planning missions", - page=CAMPAIGN_MANAGEMENT_PAGE, - section=GENERAL_SECTION, - default=False, - detail=( - "If checked, squadrons with a primary task matching the mission will be " - "preferred even if there is a closer squadron capable of the mission as a" - "secondary task. Expect longer flights, but squadrons will be more often " - "assigned to their primary task." - ), - ) # Pilots and Squadrons ai_pilot_levelling: bool = boolean_option( "Allow AI pilot leveling", diff --git a/game/squadrons/airwing.py b/game/squadrons/airwing.py index b5975f11..b903bfe6 100644 --- a/game/squadrons/airwing.py +++ b/game/squadrons/airwing.py @@ -68,17 +68,15 @@ class AirWing: ) ) - if self.settings.prefer_squadrons_with_matching_primary_task: - return sorted( - ordered, - key=lambda s: ( - # This looks like the opposite of what we want because False sorts - # before True. - s.primary_task != task, - s.location.distance_to(location), - ), - ) - return ordered + return sorted( + ordered, + key=lambda s: ( + # This looks like the opposite of what we want because False sorts + # before True. + s.primary_task != task, + s.location.distance_to(location), + ), + ) def best_squadron_for( self, location: MissionTarget, task: FlightType, size: int, this_turn: bool