diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 0d3ccb0fa..2e68f9be7 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -5073,7 +5073,7 @@ function AUFTRAG:CheckGroupsDone() -- Check status of all OPS groups. for groupname,data in pairs(self.groupdata) do local groupdata=data --#AUFTRAG.GroupData - if groupdata then + if groupdata and not groupdata.opsgroup:IsDestroyed() then if not (groupdata.status==AUFTRAG.GroupStatus.DONE or groupdata.status==AUFTRAG.GroupStatus.CANCELLED) then -- At least this group is not DONE or CANCELLED. self:T2(self.lid..string.format("CheckGroupsDone: OPSGROUP %s is not DONE or CANCELLED but in state %s. Mission NOT DONE!", groupdata.opsgroup.groupname, groupdata.status:upper())) @@ -6037,6 +6037,7 @@ function AUFTRAG:CountOpsGroups() local groupdata=_groupdata --#AUFTRAG.GroupData if groupdata and groupdata.opsgroup and groupdata.opsgroup:IsAlive() and not groupdata.opsgroup:IsDead() then N=N+1 + printf("FF Count Group N=%d %s", N, tostring(groupdata.opsgroup.groupname)) end end return N diff --git a/Moose Development/Moose/Ops/Commander.lua b/Moose Development/Moose/Ops/Commander.lua index 5c7468f77..1a636fe68 100644 --- a/Moose Development/Moose/Ops/Commander.lua +++ b/Moose Development/Moose/Ops/Commander.lua @@ -1882,6 +1882,8 @@ function COMMANDER:RecruitAssetsForMission(Mission) -- Recruite assets. local recruited, assets, legions=LEGION.RecruitCohortAssets(Cohorts, Mission.type, Mission.alert5MissionType, NreqMin, NreqMax, TargetVec2, Payloads, Mission.engageRange, Mission.refuelSystem, nil, nil, MaxWeight, nil, Mission.attributes, Mission.properties, {Mission.engageWeaponType}) + + self:T(self.lid..string.format("Recruited=%s Nassets=%d", tostring(recruited), #assets)) return recruited, assets, legions end