merged main

classes/capClasses/CapAirbase.lua

@@ -56,6 +56,7 @@ function CapBase:new(airbaseId, database, logger, capConfig, stageConfig)
             capGroup:AddOnStateUpdatedListener(o)
         end
     end
+    logger:info("Airbase with Id '" .. airbaseId .. "' has a total of " .. Spearhead.Util.tableLength(o.groupsByName) .. "cap flights registered")
 
     o.SpawnIfApplicable = function(self)
         self.logger:debug("Check spawns for airbase " .. self.airbaseId )

classes/spearhead_db.lua

@@ -251,7 +251,7 @@ do -- DB
 
                     o.tables.capGroupsOnAirbase[baseId] = {}
                     local groups = Spearhead.DcsUtil.areGroupsInCustomZone(all_groups,
-                        { x = point.x, z = point.z, radius = 6600 })
+                        { x = point.x, z = point.z, radius = 2048 })
                     for _, groupName in pairs(groups) do
                         is_group_taken[groupName] = true
                         table.insert(o.tables.capGroupsOnAirbase[baseId], groupName)
@@ -314,7 +314,7 @@ do -- DB
                     if isAirbaseInZone[tostring(baseId) or "something" ] == true and airbase:getDesc().category == Airbase.Category.AIRDROME then
                         o.tables.redAirbaseGroupsPerAirbase[baseId] = {}
                         o.tables.blueAirbaseGroupsPerAirbase[baseId] = {}
-                        local groups = Spearhead.DcsUtil.areGroupsInCustomZone(all_groups, { x = point.x, z = point.z, radius = 6600 })
+                        local groups = Spearhead.DcsUtil.areGroupsInCustomZone(all_groups, { x = point.x, z = point.z, radius = 2048 })
                         for _, groupName in pairs(groups) do
 
                             if Spearhead.DcsUtil.IsGroupStatic(groupName) == true then

classes/stageClasses/Stage.lua

@@ -106,6 +106,25 @@ do --init STAGE DIRECTOR
             if farps ~= nil and type(farps) == "table" then o.db.farps = farps end
         end
 
+        o.StageCompleteListeners = {}
+        ---comment
+        ---@param self table
+        ---@param StageCompleteListener table a Object with tage
+        o.AddStageCompleteListener = function(self, StageCompleteListener)
+
+            if type(StageCompleteListener) ~= "table" then
+                return
+            end
+            table.insert(self.MissionCompleteListeners, StageCompleteListener)
+        end
+
+        local triggerStageCompleteListeners = function(self)
+            --[[
+                TODO: Trigger Stage complete
+            ]]
+        end
+
+
         o.IsComplete = function(self)
             for i, mission in pairs(self.db.missions) do
                 local state = mission:GetState()
@@ -190,7 +209,7 @@ do --init STAGE DIRECTOR
         end
 
         o.ActivateMissionsIfApplicable = function (self)
-            local activeCount = 0 
+            local activeCount = 0
 
             local availableMissions = {}
             for _, mission in pairs(self.db.missionsByCode) do
@@ -216,6 +235,7 @@ do --init STAGE DIRECTOR
                         if mission then
                             mission:Activate()
                             self:AddCommmandsForMissionToAllPlayers(mission)
+                            activeCount = activeCount + 1;
                         end
                         availableMissionsCount = availableMissionsCount - 1
                     end
@@ -283,25 +303,6 @@ do --init STAGE DIRECTOR
 
             timer.scheduleFunction(ActivateBlueAsync, self, timer.getTime() + 3)
 
-            -- for key, farp in pairs(self.db.farps) do
-            --     if farp.helipadnames then
-            --         for _, helipadName in pairs(farp.helipadnames) do
-            --             local helipad = Airbase.getByName(helipadName)
-            --             if helipad then
-            --                 logger:debug("Enabling: '" .. helipad:getName() .. "'")
-            --                 helipad:setCoalition(2)
-            --             else
-            --                 logger:warn(helipadName .. " not found when spawning farps")
-            --             end
-            --         end
-            --     end
-
-            --     if farp.group_names then
-            --         for _, groupName in pairs(farp.group_names) do
-            --             Spearhead.DcsUtil.SpawnGroupTemplate(groupName)
-            --         end
-            --     end
-            -- end
         end
 
         o.OnStatusRequestReceived = function(self, groupId)
@@ -427,7 +428,12 @@ do --init STAGE DIRECTOR
         
         o.OnMissionComplete = function(self, mission)
             timer.scheduleFunction(removeMissionCommandsDelayed, { self = self, mission = mission}, timer.getTime() + 20)
-            timer.scheduleFunction(activateMissionsIfApplicableAsync, self, timer.getTime() + 10)
+
+            if(self:IsComplete()) then
+                
+            else
+                timer.scheduleFunction(activateMissionsIfApplicableAsync, self, timer.getTime() + 10)
+            end
         end
 
         for _, mission in pairs(o.db.missionsByCode) do