Remove flight-size-specific formations.

No reason to do this, and it's making the task rework annoying.
This commit is contained in:
Dan Albert 2023-08-17 20:17:36 -07:00
parent 5f3e342a0e
commit eebb172333
2 changed files with 3 additions and 12 deletions

View File

@ -26,10 +26,7 @@ class JoinPointBuilder(PydcsWaypointBuilder):
], ],
) )
if self.flight.count < 4:
waypoint.tasks.append(OptFormation.line_abreast_open()) waypoint.tasks.append(OptFormation.line_abreast_open())
else:
waypoint.tasks.append(OptFormation.spread_four_open())
elif self.flight.flight_type == FlightType.SEAD_ESCORT: elif self.flight.flight_type == FlightType.SEAD_ESCORT:
self.configure_escort_tasks( self.configure_escort_tasks(
@ -40,10 +37,7 @@ class JoinPointBuilder(PydcsWaypointBuilder):
ecm_option = OptECMUsing(value=OptECMUsing.Values.UseIfDetectedLockByRadar) ecm_option = OptECMUsing(value=OptECMUsing.Values.UseIfDetectedLockByRadar)
waypoint.tasks.append(ecm_option) waypoint.tasks.append(ecm_option)
if self.flight.count < 4:
waypoint.tasks.append(OptFormation.line_abreast_open()) waypoint.tasks.append(OptFormation.line_abreast_open())
else:
waypoint.tasks.append(OptFormation.spread_four_open())
elif not self.flight.flight_type.is_air_to_air: 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. # Capture any non A/A type to avoid issues with SPJs that use the primary radar such as the F/A-18C.

View File

@ -28,7 +28,4 @@ class SweepIngressBuilder(PydcsWaypointBuilder):
) )
) )
if self.flight.count < 4:
waypoint.tasks.append(OptFormation.line_abreast_open()) waypoint.tasks.append(OptFormation.line_abreast_open())
else:
waypoint.tasks.append(OptFormation.spread_four_open())