Refactored Persistance managed by SpawnManager for groups, and added … (#53)

* Refactored Persistance managed by SpawnManager for groups, and added Persistence for buildables
* get last file based on the iteration number
* Working persistence of everything as a MVP version

classes/capClasses/CapAirbase.lua

@@ -32,8 +32,9 @@ end
 ---@param stageConfig table
 ---@param runwayBombingTracker RunwayBombingTracker
 ---@param detectionManager DetectionManager
+---@param spawnManager SpawnManager
 ---@return CapBase
-function CapBase.new(airbaseName, database, logger, capConfig, stageConfig, runwayBombingTracker, detectionManager)
+function CapBase.new(airbaseName, database, logger, capConfig, stageConfig, runwayBombingTracker, detectionManager, spawnManager)
     CapBase.__index = CapBase
     local self = setmetatable({}, { __index = CapBase }) --[[@as CapBase]]
 
@@ -53,7 +54,7 @@ function CapBase.new(airbaseName, database, logger, capConfig, stageConfig, runw
     local baseData = database:getAirbaseDataForZone(airbaseName)
     if baseData and baseData.CapGroups then
         for key, name in pairs(baseData.CapGroups) do
-            local capGroup = Spearhead.classes.capClasses.airGroups.CapGroup.New(name, capConfig, logger)
+            local capGroup = Spearhead.classes.capClasses.airGroups.CapGroup.New(name, capConfig, logger, spawnManager)
             if capGroup then
                 self.capGroupsByName[name] = capGroup
             end
@@ -62,7 +63,7 @@ function CapBase.new(airbaseName, database, logger, capConfig, stageConfig, runw
 
     if baseData and baseData.SweepGroups then
         for key, name in pairs(baseData.SweepGroups) do
-            local sweepGroup = Spearhead.classes.capClasses.airGroups.SweepGroup.New(name, capConfig, logger)
+            local sweepGroup = Spearhead.classes.capClasses.airGroups.SweepGroup.New(name, capConfig, logger, spawnManager)
             if sweepGroup then
                 self.sweepGroupsByName[name] = sweepGroup
             end
@@ -71,7 +72,7 @@ function CapBase.new(airbaseName, database, logger, capConfig, stageConfig, runw
 
     if baseData and baseData.InterceptGroups then
         for key, name in pairs(baseData.InterceptGroups) do
-            local interceptGroup = Spearhead.classes.capClasses.airGroups.InterceptGroup.New(name, capConfig, logger, detectionManager)
+            local interceptGroup = Spearhead.classes.capClasses.airGroups.InterceptGroup.New(name, capConfig, logger, detectionManager, spawnManager)
             if interceptGroup then
                 self.interceptGroupsByName[name] = interceptGroup
             end

classes/capClasses/GlobalCapManager.lua

@@ -13,7 +13,8 @@ do
     ---@param stageConfig StageConfig
     ---@param detectionManager DetectionManager
     ---@param logLevel LogLevel
-    function GlobalCapManager.start(database, capConfig, detectionManager, stageConfig, logLevel)
+    ---@param spawnManager SpawnManager
+    function GlobalCapManager.start(database, capConfig, detectionManager, stageConfig, logLevel, spawnManager)
         if initiated == true then return end
 
         local logger = Spearhead.LoggerTemplate.new("AirbaseManager", logLevel)
@@ -32,7 +33,9 @@ do
                     for _, airbaseName in pairs(airbaseNames) do
                         if airbaseName then
                             local airbaseSpecificLogger = Spearhead.LoggerTemplate.new("CAP_" .. airbaseName, logLevel)
-                            local airbase = Spearhead.classes.capClasses.CapAirbase.new(airbaseName, database, airbaseSpecificLogger, capConfig, stageConfig, runwayBombingTracker, detectionManager)
+                            
+                            local airbase = Spearhead.classes.capClasses.CapAirbase.new(airbaseName, database, airbaseSpecificLogger, capConfig, stageConfig, runwayBombingTracker, detectionManager, spawnManager)
+                            
                             if airbase then
                                 table.insert(airbasesPerStage[stageName], airbase)
                                 allAirbasesByName[airbaseName] = airbase

classes/capClasses/airGroups/AirGroup.lua

@@ -6,6 +6,7 @@
 ---@field protected _isSpawned boolean
 ---@field protected _config CapConfig
 ---@field protected _checkLivenessNumber number
+---@field protected _spawnManager SpawnManager
 local AirGroup = {}
 AirGroup.__index = AirGroup
 
@@ -13,13 +14,15 @@ AirGroup.__index = AirGroup
 ---@param groupName string
 ---@param groupType AirGroupType
 ---@param config CapConfig
-function AirGroup:New(groupName, groupType, config, logger)
+---@param spawnManager SpawnManager
+function AirGroup:New(groupName, groupType, config, logger, spawnManager)
     self._groupName = groupName
     self._groupType = groupType
     self._isSpawned = false
     self._state = "UnSpawned" -- Default state
     self._config = config
     self._logger = logger
+    self._spawnManager = spawnManager
 
     local group = Group.getByName(self._groupName)
     if group then
@@ -31,7 +34,8 @@ function AirGroup:New(groupName, groupType, config, logger)
             Spearhead.Events.addOnUnitLostEventListener(unit:getName(), self)
             Spearhead.Events.addOnUnitLandEventListener(unit:getName(), self)
         end
-        Spearhead.DcsUtil.DestroyGroup(self._groupName)
+
+        spawnManager:DestroyGroup(groupName)
     end
 end
 
@@ -135,13 +139,19 @@ function AirGroup:SpawnInternal(force, withoutLoadout)
 
     if self._isSpawned and force ~= true then return end
 
-    local group, isStatic = Spearhead.DcsUtil.SpawnGroupTemplate(self._groupName, nil, nil, true, nil, withoutLoadout)
+    ---@type SpawnOverrides
+    local overrides = {
+        emptyLoadouts = withoutLoadout,
+        uncontrolled = true
+    }
+
+    local group, isStatic = self._spawnManager:SpawnGroup(self._groupName, overrides, false)
     if isStatic == true then
         --- If For Some reaons someone tries to schedule static units as CAP classes
         self._state = "UnSpawned"
         return
     end
-
+    group = group --[[@as Group]]
     if group then
         self._group = group
         self._isSpawned = true

classes/capClasses/airGroups/CapGroup.lua

@@ -10,12 +10,13 @@ CapGroup.__index = CapGroup
 ---@param groupName string
 ---@param config CapConfig
 ---@param logger Logger
+---@param spawnManager SpawnManager
 ---@return CapGroup
-function CapGroup.New(groupName, config, logger)
+function CapGroup.New(groupName, config, logger, spawnManager)
 
     setmetatable(CapGroup, Spearhead.classes.capClasses.airGroups.AirGroup)
     local self = setmetatable({}, CapGroup) --[[@as CapGroup]]
-    Spearhead.classes.capClasses.airGroups.AirGroup.New(self, groupName, "CAP", config, logger)
+    Spearhead.classes.capClasses.airGroups.AirGroup.New(self, groupName, "CAP", config, logger, spawnManager)
 
     self._targetZoneIdPerStage = {}
 

classes/capClasses/airGroups/InterceptGroup.lua

@@ -18,12 +18,13 @@ InterceptGroup.__index = InterceptGroup
 ---@param config CapConfig
 ---@param logger Logger
 ---@param detectionManager DetectionManager
+---@param spawnManager SpawnManager
 ---@return InterceptGroup?
-function InterceptGroup.New(groupName, config, logger, detectionManager)
+function InterceptGroup.New(groupName, config, logger, detectionManager, spawnManager)
 
     setmetatable(InterceptGroup, Spearhead.classes.capClasses.airGroups.AirGroup)
     local self = setmetatable({}, InterceptGroup)
-    Spearhead.classes.capClasses.airGroups.AirGroup.New(self, groupName, "INTERCEPT", config, logger)
+    Spearhead.classes.capClasses.airGroups.AirGroup.New(self, groupName, "INTERCEPT", config, logger, spawnManager)
 
     local group = Group.getByName(groupName)
     if not group then

classes/capClasses/airGroups/SweepGroup.lua

@@ -8,11 +8,12 @@ SweepGroup.__index = SweepGroup
 ---@param groupName string
 ---@param config CapConfig
 ---@param logger Logger
+---@param spawnManager SpawnManager
 ---@return SweepGroup
-function SweepGroup.New(groupName, config, logger)
+function SweepGroup.New(groupName, config, logger, spawnManager)
     setmetatable(SweepGroup, Spearhead.classes.capClasses.airGroups.AirGroup)
     local self = setmetatable({}, SweepGroup) --[[@as SweepGroup]]
-    Spearhead.classes.capClasses.airGroups.AirGroup.New(self, groupName, "SWEEP", config, logger)
+    Spearhead.classes.capClasses.airGroups.AirGroup.New(self, groupName, "SWEEP", config, logger, spawnManager)
 
     self._targetZoneIdPerStage = {}
     self:InitWithName(groupName)