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 2025-07-18 09:24:58 +02:00
commit 00de8d911c
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4801,6 +4801,8 @@ end
-- @return #boolean If `true`, all groups are done with the mission. -- @return #boolean If `true`, all groups are done with the mission.
function AUFTRAG:CheckGroupsDone() function AUFTRAG:CheckGroupsDone()
local fsmState = self:GetState()
-- Check status of all OPS groups. -- Check status of all OPS groups.
for groupname,data in pairs(self.groupdata) do for groupname,data in pairs(self.groupdata) do
local groupdata=data --#AUFTRAG.GroupData local groupdata=data --#AUFTRAG.GroupData
@ -4859,12 +4861,12 @@ function AUFTRAG:CheckGroupsDone()
return true return true
end end
if (self:IsStarted() or self:IsExecuting()) and self:CountOpsGroups()>0 then if (self:IsStarted() or self:IsExecuting()) and (fsmState == AUFTRAG.Status.STARTED or fsmState == AUFTRAG.Status.EXECUTING) and self:CountOpsGroups()>0 then
self:T(self.lid..string.format("CheckGroupsDone: Mission is STARTED state %s [FSM=%s] and count of alive OPSGROUP > zero. Mission NOT DONE!", self.status, self:GetState())) self:T(self.lid..string.format("CheckGroupsDone: Mission is STARTED state %s [FSM=%s] and count of alive OPSGROUP > zero. Mission NOT DONE!", self.status, self:GetState()))
return false return false
end end
return false return true
end end
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

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

@ -1671,7 +1671,10 @@ function COMMANDER:_GetCohorts(Legions, Cohorts, Operation)
local legion=_legion --Ops.Legion#LEGION local legion=_legion --Ops.Legion#LEGION
-- Check that runway is operational. -- Check that runway is operational.
local Runway=legion:IsAirwing() and legion:IsRunwayOperational() or true local Runway=true
if legion:IsAirwing() then
Runway=legion:IsRunwayOperational() and legion.airbase and legion.airbase:GetCoalition() == legion:GetCoalition()
end
-- Legion has to be running. -- Legion has to be running.
if legion:IsRunning() and Runway then if legion:IsRunning() and Runway then
@ -1704,7 +1707,10 @@ function COMMANDER:_GetCohorts(Legions, Cohorts, Operation)
local legion=_legion --Ops.Legion#LEGION local legion=_legion --Ops.Legion#LEGION
-- Check that runway is operational. -- Check that runway is operational.
local Runway=legion:IsAirwing() and legion:IsRunwayOperational() or true local Runway=true
if legion:IsAirwing() then
Runway=legion:IsRunwayOperational() and legion.airbase and legion.airbase:GetCoalition() == legion:GetCoalition()
end
-- Legion has to be running. -- Legion has to be running.
if legion:IsRunning() and Runway then if legion:IsRunning() and Runway then

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

@ -2514,7 +2514,10 @@ function LEGION._GetCohorts(Legions, Cohorts, Operation, OpsQueue)
local legion=_legion --Ops.Legion#LEGION local legion=_legion --Ops.Legion#LEGION
-- Check that runway is operational. -- Check that runway is operational.
local Runway=legion:IsAirwing() and legion:IsRunwayOperational() or true local Runway=true
if legion:IsAirwing() then
Runway=legion:IsRunwayOperational() and legion.airbase and legion.airbase:GetCoalition() == legion:GetCoalition()
end
-- Legion has to be running. -- Legion has to be running.
if legion:IsRunning() and Runway then if legion:IsRunning() and Runway then

1
Moose Development/Moose/Wrapper/Group.lua
View File

@ -230,6 +230,7 @@ GROUP.Attribute = {
GROUND_EWR="Ground_EWR", GROUND_EWR="Ground_EWR",
GROUND_AAA="Ground_AAA", GROUND_AAA="Ground_AAA",
GROUND_SAM="Ground_SAM", GROUND_SAM="Ground_SAM",
GROUND_SHORAD="Ground_SHORAD",
GROUND_OTHER="Ground_OtherGround", GROUND_OTHER="Ground_OtherGround",
NAVAL_AIRCRAFTCARRIER="Naval_AircraftCarrier", NAVAL_AIRCRAFTCARRIER="Naval_AircraftCarrier",
NAVAL_WARSHIP="Naval_WarShip", NAVAL_WARSHIP="Naval_WarShip",