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 develop

Browse Source
This commit is contained in:
Applevangelist
2024-01-07 18:08:34 +01:00
parent 20f881f0a9 e26647c2ca
commit 57919704be
4 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Ops/Awacs.lua
View File

@@ -3526,7 +3526,7 @@ function AWACS:_Showtask(Group)
local targetstatus = currenttask.Target:GetState()
local ToDo = currenttask.ToDo
local description = currenttask.ScreenText
local descTTS = currenttask.ScreenText
local descTTS = currenttask.ScreenText
local callsign = Callsign
if self.debug then
@@ -3547,7 +3547,7 @@ function AWACS:_Showtask(Group)
local alti = currenttask.Cluster.altitude or currenttask.Contact.altitude or currenttask.Contact.group:GetAltitude()
local direction, direcTTS = self:_ToStringBRA(pposition,targetpos,alti)
description = description .. "\nBRA "..direction
descTTS = descTTS ..";BRA "..direcTTS
descTTS = descTTS ..";BRA "..direcTTS
end
elseif currenttask.ToDo == AWACS.TaskDescription.ANCHOR or currenttask.ToDo == AWACS.TaskDescription.REANCHOR then
local targetpos = currenttask.Target:GetCoordinate()

10
Moose Development/Moose/Ops/OpsTransport.lua
View File

@@ -605,6 +605,16 @@ function OPSTRANSPORT:AddCargoGroups(GroupSet, TransportZoneCombo, DisembarkActi
self:AddCargoGroups(group, TransportZoneCombo, DisembarkActivation)
end
-- Use FSM function to keep the SET up-to-date. Note that it overwrites the user FMS function, which cannot be used any more now.
local groupset=GroupSet --Core.Set#SET_OPSGROUP
function groupset.OnAfterAdded(groupset, From, Event, To, ObjectName, Object)
self:T(self.lid..string.format("Adding Cargo Group %s", tostring(ObjectName)))
self:AddCargoGroups(Object, TransportZoneCombo, DisembarkActivation, DisembarkZone, DisembarkCarriers)
end
end
-- Debug info.