From a075e62badbc925dca48b0db6ac7a138091dc4ab Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Tue, 15 Dec 2020 22:27:19 -0800
Subject: [PATCH] Fix easy going CAPs.

Fixes https://github.com/Khopa/dcs_liberation/issues/592

(cherry picked from commit 1ebe367e07898bd09833672fe45c12a6dcbae00a)
---
 changelog.md    |  6 ++++++
 gen/aircraft.py | 24 +++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/changelog.md b/changelog.md
index 0eb51ba0..b8fd03c3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+# 2.3.1
+
+## Fixes:
+
+* **[AI]** CAP flights will engage enemies again.
+
 # 2.3.0
 
 # Features/Improvements
diff --git a/gen/aircraft.py b/gen/aircraft.py
index 6b24f90b..e51b0f2e 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -1756,15 +1756,11 @@ class RaceTrackBuilder(PydcsWaypointBuilder):
                 f"{flight_plan_type} does not define a patrol.")
             return waypoint
 
-        racetrack = ControlledTask(OrbitAction(
-            altitude=waypoint.alt,
-            pattern=OrbitAction.OrbitPattern.RaceTrack
-        ))
-        self.set_waypoint_tot(
-            waypoint, self.flight.flight_plan.patrol_start_time)
-        racetrack.stop_after_time(
-            int(self.flight.flight_plan.patrol_end_time.total_seconds()))
-        waypoint.add_task(racetrack)
+        # NB: It's important that the engage task comes before the orbit task.
+        # Though they're on the same waypoint, if the orbit task comes first it
+        # is their first priority and they will not engage any targets because
+        # they're fully focused on orbiting. If the STE task is first, they will
+        # engage targets if available and orbit if they find nothing to shoot.
 
         # TODO: Move the properties of this task into the flight plan?
         # CAP is the only current user of this so it's not a big deal, but might
@@ -1775,6 +1771,16 @@ class RaceTrackBuilder(PydcsWaypointBuilder):
             waypoint.tasks.append(EngageTargets(max_distance=nm_to_meter(50),
                                                 targets=[Targets.All.Air]))
 
+        racetrack = ControlledTask(OrbitAction(
+            altitude=waypoint.alt,
+            pattern=OrbitAction.OrbitPattern.RaceTrack
+        ))
+        self.set_waypoint_tot(
+            waypoint, self.flight.flight_plan.patrol_start_time)
+        racetrack.stop_after_time(
+            int(self.flight.flight_plan.patrol_end_time.total_seconds()))
+        waypoint.add_task(racetrack)
+
         return waypoint