weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update OpsGroup.lua

Browse Source 
- Fixed waypoint alt for missions
This commit is contained in:
Frank 2021-11-07 21:39:38 +01:00
parent 2ea951db61
commit 6cd00c60a7
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4596,17 +4596,19 @@ function OPSGROUP:RouteToMission(mission, delay)
end end
end end
-- Formation.
local formation=nil
if self.isArmygroup and mission.optionFormation then
formation=mission.optionFormation
end
-- UID of this waypoint. -- UID of this waypoint.
local uid=self:GetWaypointCurrent().uid local uid=self:GetWaypointCurrent().uid
-- Add waypoint. -- Add waypoint.
local waypoint=self:AddWaypoint(waypointcoord, SpeedToMission, uid, formation, false) ; waypoint.missionUID=mission.auftragsnummer local waypoint=nil --#OPSGROUP.Waypoint
if self:IsFlightgroup() then
waypoint=FLIGHTGROUP.AddWaypoint(self, waypointcoord, SpeedToMission, uid, UTILS.MetersToFeet(mission.missionAltitude or self.altitudeCruise), false)
elseif self:IsArmygroup() then
waypoint=ARMYGROUP.AddWaypoint(self, waypointcoord, SpeedToMission, uid, mission.optionFormation, false)
elseif self:IsNavygroup() then
waypoint=NAVYGROUP.AddWaypoint(self, waypointcoord, SpeedToMission, uid, mission.missionAltitude or self.altitudeCruise, false)
end
waypoint.missionUID=mission.auftragsnummer
-- Add waypoint task. UpdateRoute is called inside. -- Add waypoint task. UpdateRoute is called inside.
local waypointtask=self:AddTaskWaypoint(mission.DCStask, waypoint, mission.name, mission.prio, mission.duration) local waypointtask=self:AddTaskWaypoint(mission.DCStask, waypoint, mission.name, mission.prio, mission.duration)
@ -4619,11 +4621,20 @@ function OPSGROUP:RouteToMission(mission, delay)
mission:SetGroupWaypointIndex(self, waypoint.uid) mission:SetGroupWaypointIndex(self, waypoint.uid)
-- Add egress waypoint. -- Add egress waypoint.
local egress=mission:GetMissionEgressCoord() local egresscoord=mission:GetMissionEgressCoord()
if egress then if egresscoord then
--egress:MarkToAll(string.format("Egress Mission %s alt=%d m", mission:GetName(), waypointcoord.y)) --egresscoord:MarkToAll(string.format("Egress Mission %s alt=%d m", mission:GetName(), waypointcoord.y))
local waypointEgress=self:AddWaypoint(egress, SpeedToMission, waypoint.uid, formation, false) ; waypointEgress.missionUID=mission.auftragsnummer -- Add waypoint.
mission:SetGroupEgressWaypointUID(self, waypointEgress.uid) local waypoint=nil --#OPSGROUP.Waypoint
if self:IsFlightgroup() then
waypoint=FLIGHTGROUP.AddWaypoint(self, egresscoord, SpeedToMission, uid, UTILS.MetersToFeet(mission.missionAltitude or self.altitudeCruise), false)
elseif self:IsArmygroup() then
waypoint=ARMYGROUP.AddWaypoint(self, egresscoord, SpeedToMission, uid, mission.optionFormation, false)
elseif self:IsNavygroup() then
waypoint=NAVYGROUP.AddWaypoint(self, egresscoord, SpeedToMission, uid, mission.missionAltitude or self.altitudeCruise, false)
end
waypoint.missionUID=mission.auftragsnummer
mission:SetGroupEgressWaypointUID(self, waypoint.uid)
end end
--- ---