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

Avoid crash for custom/empty flight plans.

Browse Source 
Fixes https://github.com/Khopa/dcs_liberation/issues/210
This commit is contained in:
Dan Albert 2020-10-17 14:10:36 -07:00
parent 002f55dc04
commit cace523aa8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gen/flights/flightplan.py
View File

@ -103,8 +103,8 @@ class FlightPlanBuilder:
logging.error( logging.error(
"Troop transport flight plan generation not implemented" "Troop transport flight plan generation not implemented"
) )
except InvalidObjectiveLocation as ex: except InvalidObjectiveLocation:
logging.error(f"Could not create flight plan: {ex}") logging.exception(f"Could not create flight plan")
def regenerate_package_waypoints(self) -> None: def regenerate_package_waypoints(self) -> None:
ingress_point = self._ingress_point() ingress_point = self._ingress_point()

13
gen/flights/traveltime.py
View File

@ -42,8 +42,17 @@ class GroundSpeed:
for flight in package.flights: for flight in package.flights:
waypoint = flight.waypoint_with_type(IP_TYPES) waypoint = flight.waypoint_with_type(IP_TYPES)
if waypoint is None: if waypoint is None:
logging.error(f"Could not find ingress point for {flight}") logging.error(f"Could not find ingress point for {flight}.")
continue if flight.points:
logging.warning(
"Using first waypoint for mission altitude.")
waypoint = flight.points[0]
else:
logging.warning(
"Flight has no waypoints. Assuming mission altitude "
"of 25000 feet.")
waypoint = FlightWaypoint(FlightWaypointType.NAV, 0, 0,
25000)
speeds.add(GroundSpeed.for_flight(flight, waypoint.alt)) speeds.add(GroundSpeed.for_flight(flight, waypoint.alt))
return min(speeds) return min(speeds)