FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1956 from FlightControl-Master/FF/Ops

Browse Source 
AUFTRAG
This commit is contained in:
Frank 2023-06-11 22:52:28 +02:00 committed by GitHub
commit d31db1351a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Ops/Auftrag.lua
View File

@ -1444,7 +1444,7 @@ function AUFTRAG:NewCASENHANCED(CasZone, Altitude, Speed, RangeMax, NoEngageZone
mission.optionROE=ENUMS.ROE.OpenFire mission.optionROE=ENUMS.ROE.OpenFire
mission.optionROT=ENUMS.ROT.EvadeFire mission.optionROT=ENUMS.ROT.EvadeFire
mission.missionFraction=1.0 mission.missionFraction=0.5
mission.missionSpeed=Speed and UTILS.KnotsToKmph(Speed) or nil mission.missionSpeed=Speed and UTILS.KnotsToKmph(Speed) or nil
mission.missionAltitude=Altitude and UTILS.FeetToMeters(Altitude) or nil mission.missionAltitude=Altitude and UTILS.FeetToMeters(Altitude) or nil

5
Moose Development/Moose/Ops/OpsGroup.lua
View File

@ -5943,13 +5943,12 @@ function OPSGROUP:RouteToMission(mission, delay)
-- Random coordinate. -- Random coordinate.
waypointcoord=targetzone:GetRandomCoordinate(nil , nil, surfacetypes) waypointcoord=targetzone:GetRandomCoordinate(nil , nil, surfacetypes)
else else
--- ---
-- Default case -- Default case
--- ---
waypointcoord=mission:GetMissionWaypointCoord(self.group, randomradius, surfacetypes) waypointcoord=mission:GetMissionWaypointCoord(self.group, randomradius, surfacetypes)
end end
-- Add enroute tasks. -- Add enroute tasks.
@ -6039,7 +6038,7 @@ function OPSGROUP:RouteToMission(mission, delay)
local d=currentcoord:Get2DDistance(waypointcoord) local d=currentcoord:Get2DDistance(waypointcoord)
-- Debug info. -- Debug info.
self:T(self.lid..string.format("Distance to ingress waypoint=%.1f m", d)) self:T(self.lid..string.format("Distance to ingress waypoint=%.1f m", d))
-- Add mission execution (ingress) waypoint. -- Add mission execution (ingress) waypoint.
local waypoint=nil --#OPSGROUP.Waypoint local waypoint=nil --#OPSGROUP.Waypoint