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

Fix custom waypoint addition/removal.

Browse Source 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2063.
This commit is contained in:
Benjamin Fischer
2022-03-18 08:06:41 +01:00
committed by GitHub
parent 01f872c960
commit be67d6dbc6
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py
View File

@@ -71,10 +71,11 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
pos = FrontLineConflictDescription.frontline_position(
front_line, self.game.theater
)[0]
wptname = f"Frontline {front_line.name} [CAS]"
wpt = FlightWaypoint(
FlightWaypointType.CUSTOM, pos, Distance.from_meters(800)
wptname, FlightWaypointType.CUSTOM, pos, Distance.from_meters(800)
)
wpt.name = f"Frontline {front_line.name} [CAS]"
wpt.alt_type = "RADIO"
wpt.pretty_name = wpt.name
wpt.description = "Frontline"
@@ -90,12 +91,12 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
ground_object, BuildingGroundObject
):
wpt = FlightWaypoint(
ground_object.waypoint_name,
FlightWaypointType.CUSTOM,
ground_object.position,
Distance.from_meters(0),
)
wpt.alt_type = "RADIO"
wpt.name = ground_object.waypoint_name
wpt.pretty_name = wpt.name
wpt.obj_name = ground_object.obj_name
wpt.targets.append(ground_object)
@@ -116,13 +117,7 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
):
for g in ground_object.groups:
for j, u in enumerate(g.units):
wpt = FlightWaypoint(
FlightWaypointType.CUSTOM,
u.position,
Distance.from_meters(0),
)
wpt.alt_type = "RADIO"
wpt.name = wpt.name = (
wptname = (
"["
+ str(ground_object.obj_name)
+ "] : "
@@ -130,7 +125,14 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
+ " #"
+ str(j)
)
wpt.pretty_name = wpt.name
wpt = FlightWaypoint(
wptname,
FlightWaypointType.CUSTOM,
u.position,
Distance.from_meters(0),
)
wpt.alt_type = "RADIO"
wpt.pretty_name = wptname
wpt.targets.append(u)
wpt.obj_name = ground_object.obj_name
wpt.waypoint_type = FlightWaypointType.CUSTOM
@@ -146,10 +148,12 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
self.include_friendly and cp.captured
):
wpt = FlightWaypoint(
FlightWaypointType.CUSTOM, cp.position, Distance.from_meters(0)
cp.name,
FlightWaypointType.CUSTOM,
cp.position,
Distance.from_meters(0),
)
wpt.alt_type = "RADIO"
wpt.name = cp.name
if cp.captured:
wpt.description = (
"Position of " + cp.name + " [Friendly Airbase]"