From eebb1723335cc7353da60bbc4cf819b32f6437d0 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 17 Aug 2023 20:17:36 -0700 Subject: [PATCH] Remove flight-size-specific formations. No reason to do this, and it's making the task rework annoying. --- game/missiongenerator/aircraft/waypoints/joinpoint.py | 10 ++-------- .../aircraft/waypoints/sweepingress.py | 5 +---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/game/missiongenerator/aircraft/waypoints/joinpoint.py b/game/missiongenerator/aircraft/waypoints/joinpoint.py index 59fe56ab..5cbd9d9f 100644 --- a/game/missiongenerator/aircraft/waypoints/joinpoint.py +++ b/game/missiongenerator/aircraft/waypoints/joinpoint.py @@ -26,10 +26,7 @@ class JoinPointBuilder(PydcsWaypointBuilder): ], ) - if self.flight.count < 4: - waypoint.tasks.append(OptFormation.line_abreast_open()) - else: - waypoint.tasks.append(OptFormation.spread_four_open()) + waypoint.tasks.append(OptFormation.line_abreast_open()) elif self.flight.flight_type == FlightType.SEAD_ESCORT: self.configure_escort_tasks( @@ -40,10 +37,7 @@ class JoinPointBuilder(PydcsWaypointBuilder): ecm_option = OptECMUsing(value=OptECMUsing.Values.UseIfDetectedLockByRadar) waypoint.tasks.append(ecm_option) - if self.flight.count < 4: - waypoint.tasks.append(OptFormation.line_abreast_open()) - else: - waypoint.tasks.append(OptFormation.spread_four_open()) + waypoint.tasks.append(OptFormation.line_abreast_open()) elif not self.flight.flight_type.is_air_to_air: # Capture any non A/A type to avoid issues with SPJs that use the primary radar such as the F/A-18C. diff --git a/game/missiongenerator/aircraft/waypoints/sweepingress.py b/game/missiongenerator/aircraft/waypoints/sweepingress.py index c4e78909..7f3e9851 100644 --- a/game/missiongenerator/aircraft/waypoints/sweepingress.py +++ b/game/missiongenerator/aircraft/waypoints/sweepingress.py @@ -28,7 +28,4 @@ class SweepIngressBuilder(PydcsWaypointBuilder): ) ) - if self.flight.count < 4: - waypoint.tasks.append(OptFormation.line_abreast_open()) - else: - waypoint.tasks.append(OptFormation.spread_four_open()) + waypoint.tasks.append(OptFormation.line_abreast_open())