weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling for cargo drop waypoints.

Browse Source
This commit is contained in:
Dan Albert 2022-11-01 15:01:30 -07:00 committed by RndName
parent 8b384f184c
commit 251d329a71
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
game/ato/flightplans/waypointbuilder.py
View File

@ -572,8 +572,11 @@ class WaypointBuilder:
control_point: Drop-off location. control_point: Drop-off location.
is_helo: Differentiate behaviour between plane and helo is_helo: Differentiate behaviour between plane and helo
""" """
control_point = drop_off if isinstance(drop_off, ControlPoint) else None
if is_helo: if is_helo:
if isinstance(drop_off, ControlPoint):
raise ValueError(
"Helicopter airlift drop-off targets should not be control points"
)
return FlightWaypoint( return FlightWaypoint(
"DROPOFF", "DROPOFF",
FlightWaypointType.DROPOFF_ZONE, FlightWaypointType.DROPOFF_ZONE,
@ -582,7 +585,12 @@ class WaypointBuilder:
"RADIO", "RADIO",
description=f"Drop off cargo at {drop_off.name}", description=f"Drop off cargo at {drop_off.name}",
pretty_name="Drop-off zone", pretty_name="Drop-off zone",
control_point=control_point, )
if not isinstance(drop_off, ControlPoint):
raise ValueError(
f"Plane airlift drop-off targets must be control points, but was given "
f"{drop_off.__class__.__name__}"
) )
return FlightWaypoint( return FlightWaypoint(
"DROPOFF", "DROPOFF",
@ -592,7 +600,7 @@ class WaypointBuilder:
"RADIO", "RADIO",
description=f"Drop off cargo at {drop_off.name}", description=f"Drop off cargo at {drop_off.name}",
pretty_name="Cargo drop-off", pretty_name="Cargo drop-off",
control_point=control_point, control_point=drop_off,
) )
@staticmethod @staticmethod