weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow the split point to differ from the join.

Browse Source 
This places the split point based on the best path from the IP to home,
rather than the best path from home to the target. The outcome is that
the planner might choose an alternate route out of a threatened area
based on the safest escape from the IP, which is where the aircraft
should be when it releases its weapons, rather than at the target.
That's of course not always perfect since the IP distance is not based
on the carried weapon, but it's a better choice when it matters more
(when carrying standoff weapons attacking a more dangerous target).
This commit is contained in:
Dan Albert 2021-07-13 19:59:22 -07:00
parent c1d3c93dbb
commit 415b8c6317
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gen/flights/flightplan.py
View File

@ -985,7 +985,9 @@ class FlightPlanBuilder:
self.package.waypoints = PackageWaypoints(
WaypointBuilder.perturb(join_point),
ingress_point,
WaypointBuilder.perturb(join_point),
WaypointBuilder.perturb(
self.preferred_split_point(ingress_point, join_point)
),
)
def retreat_point(self, origin: Point) -> Point:
@ -1003,17 +1005,29 @@ class FlightPlanBuilder:
split_point,
)
def preferred_join_points(self) -> Iterator[Point]:
path = self.coalition.nav_mesh.shortest_path(
self.package_airfield().position, self.package.target.position
)
# Use non-threatened points along the path to the target (excluding the target
# itself) as the join point. We may need to try more than one in the event that
# the close non-threatened points are closer than the ingress point itself.
for point in reversed(path[:-1]):
def safe_points_between(self, a: Point, b: Point) -> Iterator[Point]:
for point in self.coalition.nav_mesh.shortest_path(a, b)[1:]:
if not self.threat_zones.threatened(point):
yield point
def preferred_join_points(self) -> Iterator[Point]:
# Use non-threatened points along the path to the target as the join point. We
# may need to try more than one in the event that the close non-threatened
# points are closer than the ingress point itself.
return self.safe_points_between(
self.package.target.position, self.package_airfield().position
)
def preferred_split_point(self, ingress_point: Point, join_point: Point) -> Point:
# Use non-threatened points along the path to the target as the join point. We
# may need to try more than one in the event that the close non-threatened
# points are closer than the ingress point itself.
for point in self.safe_points_between(
ingress_point, self.package_airfield().position
):
return point
return join_point
def generate_strike(self, flight: Flight) -> StrikeFlightPlan:
"""Generates a strike flight plan.