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 remote-tracking branch 'origin/develop' into branch

Browse Source
This commit is contained in:
Applevangelist 2025-06-15 15:43:48 +02:00
commit 2e31c62efb
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Moose Development/Moose/Ops/FlightGroup.lua
View File

@ -2002,6 +2002,9 @@ function FLIGHTGROUP:onafterElementAirborne(From, Event, To, Element)
-- Debug info. -- Debug info.
self:T2(self.lid..string.format("Element airborne %s", Element.name)) self:T2(self.lid..string.format("Element airborne %s", Element.name))
-- Set parking spot to free. Also for FC. This is usually done after taxiing but doing it here in case the group is teleported.
self:_SetElementParkingFree(Element)
-- Set element status. -- Set element status.
self:_UpdateStatus(Element, OPSGROUP.ElementStatus.AIRBORNE) self:_UpdateStatus(Element, OPSGROUP.ElementStatus.AIRBORNE)

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

@ -5589,10 +5589,13 @@ function OPSGROUP:onafterUnpauseMission(From, Event, To)
-- Debug info. -- Debug info.
self:T(self.lid..string.format("Unpausing mission %s [%s]", mission:GetName(), mission:GetType())) self:T(self.lid..string.format("Unpausing mission %s [%s]", mission:GetName(), mission:GetType()))
-- Set state of mission, e.g. for not teleporting again
mission.unpaused=true
-- Start mission. -- Start mission.
self:MissionStart(mission) self:MissionStart(mission)
-- Remove mission from -- Remove mission from pausedmissions queue
for i,mid in pairs(self.pausedmissions) do for i,mid in pairs(self.pausedmissions) do
--self:T(self.lid..string.format("Checking paused mission", mid)) --self:T(self.lid..string.format("Checking paused mission", mid))
if mid==mission.auftragsnummer then if mid==mission.auftragsnummer then
@ -6232,7 +6235,7 @@ function OPSGROUP:RouteToMission(mission, delay)
end end
-- Check if group is mobile. Note that some immobile units report a speed of 1 m/s = 3.6 km/h. -- Check if group is mobile. Note that some immobile units report a speed of 1 m/s = 3.6 km/h.
if self.speedMax<=3.6 or mission.teleport then if (self.speedMax<=3.6 or mission.teleport) and not mission.unpaused then
-- Teleport to waypoint coordinate. Mission will not be paused. -- Teleport to waypoint coordinate. Mission will not be paused.
self:Teleport(waypointcoord, nil, true) self:Teleport(waypointcoord, nil, true)