From 59f98a4c16d2d0d8771b9537e8e1a92db22ffe1c Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 5 Oct 2024 23:04:06 +0200 Subject: [PATCH] Make combat landing configurable --- changelog.md | 1 + game/missiongenerator/aircraft/waypoints/landingzone.py | 3 ++- game/settings/settings.py | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index fec0835a..a7486741 100644 --- a/changelog.md +++ b/changelog.md @@ -30,6 +30,7 @@ * **[Doctrine]** Ability to customize the startup time allocated to the player * **[Mission Generation]** Ability to choose whether player flights can spawn on the sixpack or not * **[Options]** New options in Mission Generator section: Limit AI radio callouts & Suppress AI radio callouts. +* **[Options]** New option to use the combat landing flag in the landing waypoint task for helicopters. ## Fixes * **[UI/UX]** A-10A flights can be edited again diff --git a/game/missiongenerator/aircraft/waypoints/landingzone.py b/game/missiongenerator/aircraft/waypoints/landingzone.py index 894477ae..b17494b5 100644 --- a/game/missiongenerator/aircraft/waypoints/landingzone.py +++ b/game/missiongenerator/aircraft/waypoints/landingzone.py @@ -12,7 +12,8 @@ class LandingZoneBuilder(PydcsWaypointBuilder): # directly at the static ammo depot and exploding landing_point = waypoint.position.random_point_within(30, 20) # Use Land Task with 30s duration for helos - waypoint.add_task(Land(landing_point, duration=30)) + combat_land = self.flight.coalition.game.settings.use_ai_combat_landing + waypoint.add_task(Land(landing_point, duration=30, combat_landing=combat_land)) if waypoint.name == "DROPOFFZONE": script = RunScript( f'trigger.action.setUserFlag("split-{id(self.package)}", true)' diff --git a/game/settings/settings.py b/game/settings/settings.py index aeaf9287..8a3afbd5 100644 --- a/game/settings/settings.py +++ b/game/settings/settings.py @@ -824,6 +824,13 @@ class Settings: default=False, detail="Keeps the AI silent at all times for flights with human pilots. (except for AWACS flights)", ) + use_ai_combat_landing: bool = boolean_option( + "Use AI combat landing waypoint task", + page=MISSION_GENERATOR_PAGE, + section=GAMEPLAY_SECTION, + default=False, + detail="Turns the combat landing flag on in the landing waypoint task.", + ) # Mission specific desired_player_mission_duration: timedelta = minutes_option( "Desired mission duration",