Configure target points for F-15E S4+.

We don't need explicit configuration of initial points. The plane
automatically configures any steerpoint immediately before a target
point as an initial point.

Target offset points and aim points have not been implemented because I
can't find any information the describes their intent.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/3088.

changelog.md

@@ -213,6 +213,7 @@ BAI/ANTISHIP/DEAD/STRIKE/BARCAP/CAS/OCA/AIR-ASSAULT (main) missions
 * **[Flight Planning]** Improved IP selection for targets that are near the center of a threat zone.
 * **[Flight Planning]** Loadouts and aircraft properties can now be set per-flight member. Warning: AI flights should not use mixed loadouts.
 * **[Flight Planning]** Laser codes that are pre-assigned to weapons at mission start can now be chosen from a list in the loadout UI. This does not affect the aircraft's TGP, just the weapons. Currently only implemented for the F-15E S4+ and F-16C.
+* **[Mission Generation]** Configured target and initial points for F-15E S4+.
 * **[Modding]** Factions can now specify the ship type to be used for cargo shipping. The Handy Wind will be used by default, but WW2 factions can pick something more appropriate.
 * **[UI]** An error will be displayed when invalid fast-forward options are selected rather than beginning a never ending simulation.
 * **[UI]** Added cheats for instantly repairing and destroying runways.

game/dcs/aircrafttype.py

@@ -210,6 +210,8 @@ class AircraftType(UnitType[Type[FlyingType]]):
     task_priorities: dict[FlightType, int]
     laser_code_configs: list[LaserCodeConfig]
 
+    use_f15e_waypoint_names: bool
+
     _by_name: ClassVar[dict[str, AircraftType]] = {}
     _by_unit_type: ClassVar[dict[type[FlyingType], list[AircraftType]]] = defaultdict(
         list
@@ -516,6 +518,7 @@ class AircraftType(UnitType[Type[FlyingType]]):
                 laser_code_configs=[
                     LaserCodeConfig.from_yaml(d) for d in data.get("laser_codes", [])
                 ],
+                use_f15e_waypoint_names=data.get("use_f15e_waypoint_names", False),
             )
 
     @staticmethod

game/missiongenerator/aircraft/waypoints/pydcswaypointbuilder.py

@@ -38,11 +38,14 @@ class PydcsWaypointBuilder:
         self.elapsed_mission_time = elapsed_mission_time
         self.mission_data = mission_data
 
+    def dcs_name_for_waypoint(self) -> str:
+        return self.waypoint.name
+
     def build(self) -> MovingPoint:
         waypoint = self.group.add_waypoint(
             self.waypoint.position,
             self.waypoint.alt.meters,
-            name=self.waypoint.name,
+            name=self.dcs_name_for_waypoint(),
         )
 
         if self.waypoint.flyover:

game/missiongenerator/aircraft/waypoints/target.py

@@ -0,0 +1,14 @@
+from .pydcswaypointbuilder import PydcsWaypointBuilder
+
+
+class TargetBuilder(PydcsWaypointBuilder):
+    """Waypoint builder for target waypoint types.
+
+    This handles both precise target locations (TARGET_POINT) and target areas
+    (TARGET_GROUP_LOC).
+    """
+
+    def dcs_name_for_waypoint(self) -> str:
+        if self.flight.unit_type.use_f15e_waypoint_names:
+            return f"#T {self.waypoint.name}"
+        return super().dcs_name_for_waypoint()

game/missiongenerator/aircraft/waypoints/waypointgenerator.py

@@ -41,6 +41,7 @@ from .seadsweepingress import SeadSweepIngressBuilder
 from .splitpoint import SplitPointBuilder
 from .strikeingress import StrikeIngressBuilder
 from .sweepingress import SweepIngressBuilder
+from .target import TargetBuilder
 
 
 class WaypointGenerator:
@@ -121,6 +122,10 @@ class WaypointGenerator:
 
     def builder_for_waypoint(self, waypoint: FlightWaypoint) -> PydcsWaypointBuilder:
         builders = {
+            FlightWaypointType.CARGO_STOP: CargoStopBuilder,
+            FlightWaypointType.DROPOFF_ZONE: LandingZoneBuilder,
+            FlightWaypointType.INGRESS_AIR_ASSAULT: AirAssaultIngressBuilder,
+            FlightWaypointType.INGRESS_ANTI_SHIP: AntiShipIngressBuilder,
             FlightWaypointType.INGRESS_BAI: BaiIngressBuilder,
             FlightWaypointType.INGRESS_CAS: CasIngressBuilder,
             FlightWaypointType.INGRESS_DEAD: DeadIngressBuilder,
@@ -131,17 +136,15 @@ class WaypointGenerator:
             FlightWaypointType.INGRESS_STRIKE: StrikeIngressBuilder,
             FlightWaypointType.INGRESS_SWEEP: SweepIngressBuilder,
             FlightWaypointType.JOIN: JoinPointBuilder,
-            FlightWaypointType.SPLIT: SplitPointBuilder,
             FlightWaypointType.LANDING_POINT: LandingPointBuilder,
             FlightWaypointType.LOITER: HoldPointBuilder,
             FlightWaypointType.PATROL: RaceTrackEndBuilder,
             FlightWaypointType.PATROL_TRACK: RaceTrackBuilder,
             FlightWaypointType.PICKUP_ZONE: LandingZoneBuilder,
-            FlightWaypointType.DROPOFF_ZONE: LandingZoneBuilder,
             FlightWaypointType.REFUEL: RefuelPointBuilder,
-            FlightWaypointType.CARGO_STOP: CargoStopBuilder,
+            FlightWaypointType.SPLIT: SplitPointBuilder,
-            FlightWaypointType.INGRESS_AIR_ASSAULT: AirAssaultIngressBuilder,
+            FlightWaypointType.TARGET_GROUP_LOC: TargetBuilder,
-            FlightWaypointType.INGRESS_ANTI_SHIP: AntiShipIngressBuilder,
+            FlightWaypointType.TARGET_POINT: TargetBuilder,
         }
         builder = builders.get(waypoint.waypoint_type, DefaultWaypointBuilder)
         return builder(

resources/units/aircraft/F-15ESE.yaml

@@ -9,6 +9,7 @@ origin: USA
 price: 24
 role: Multirole Strike Fighter
 max_range: 300
+use_f15e_waypoint_names: true
 variants:
   F-15E Strike Eagle (Suite 4+): {}
   F-15I Ra'am: {}