Depends on (#30)

* Added mission dependencies within a stage
2025-05-10 01:22:55 +02:00
parent 880816193d
commit c7c532a08a
9 changed files with 169 additions and 40 deletions
@@ -110,9 +110,12 @@ function StageBase:CleanRedUnits()
        value:SpawnCorpsesOnly()
    end

-    for _, unitName in pairs(self._cleanup_units) do
-        Spearhead.DcsUtil.DestroyUnit(unitName)
-        Spearhead.DcsUtil.CleanCorpse(unitName)
+    for unitName, shouldClean in pairs(self._cleanup_units) do
+        if shouldClean == true then
+            Spearhead.DcsUtil.DestroyUnit(unitName)
+            Spearhead.DcsUtil.CleanCorpse(unitName)
+        end
+        
    end

 end
@@ -6,6 +6,7 @@

 --- @class StageData
 --- @field missionsByCode table<string, Mission>
+--- @field missionsByName table<string, Mission>
 --- @field missions Array<ZoneMission>
 --- @field sams Array<ZoneMission>
 --- @field blueSams Array<BlueSam>
@@ -88,6 +89,7 @@ function Stage:superNew(database, stageConfig, logger, initData, missionPriority
        miscGroups = {},
        maxMissions = stageConfig.maxMissionsPerStage,
        farps = {},
+        missionsByName = {},
    }
    self._activeStage = -99
    self._preActivated = false
@@ -130,9 +132,17 @@ function Stage:superNew(database, stageConfig, logger, initData, missionPriority
        local missionZones = database:getMissionsForStage(self.zoneName)
        self._logger:debug("Found " .. Spearhead.Util.tableLength(missionZones) .. " mission zones for stage: " .. self.zoneName)
        for _, missionZone in pairs(missionZones) do
-            local mission = Spearhead.classes.stageClasses.missions.ZoneMission.new(missionZone, self._missionPriority, database, logger)
+            
+            local mission = Spearhead.classes.stageClasses.missions.ZoneMission.new(missionZone, self._missionPriority, database, logger, self)
            if mission then
                self._db.missionsByCode[mission.code] = mission
+
+                if mission.name and self._db.missionsByName[mission.name] == nil then
+                    self._db.missionsByName[mission.name] = mission
+                else
+                    Spearhead.AddMissionEditorWarning("DUPLICATE MISSION NAME ALERT: " .. mission.name .. " in zone: " .. self.zoneName)
+                end
+
                if mission.missionType == "SAM" then
                    table.insert(self._db.sams, mission)
                else
@@ -146,7 +156,7 @@ function Stage:superNew(database, stageConfig, logger, initData, missionPriority
        ---@type table<string, Array<Mission>>
        local randomMissionByName = {}
        for _, missionZoneName in pairs(randomMissionNames) do
-            local mission = Spearhead.classes.stageClasses.missions.ZoneMission.new(missionZoneName, self._missionPriority, database, logger)
+            local mission = Spearhead.classes.stageClasses.missions.ZoneMission.new(missionZoneName, self._missionPriority, database, logger, self)
            if mission then
                if randomMissionByName[mission.name] == nil then
                    randomMissionByName[mission.name] = {}
@@ -164,6 +174,13 @@ function Stage:superNew(database, stageConfig, logger, initData, missionPriority
                    Spearhead.classes.persistence.Persistence.RegisterPickedRandomMission(mission.name, mission.zoneName)

                    self._db.missionsByCode[mission.code] = mission
+
+                    if mission.name and self._db.missionsByName[mission.name] == nil then
+                        self._db.missionsByName[mission.name] = mission
+                    else
+                        Spearhead.AddMissionEditorWarning("DUPLICATE MISSION NAME ALERT: " .. mission.name .. " in zone: " .. self.zoneName)
+                    end
+
                    if mission.missionType == "SAM" then
                        table.insert(self._db.sams, mission)
                    else
@@ -222,7 +239,7 @@ function Stage:IsComplete()

    for i, mission in pairs(self._db.sams) do
        local state = mission:getState()
-        if state == "ACTIVE" or state == "NEW" then
+        if state == "ACTIVE" or state == "NEW" or state =="WAITING" then
            return false
        end
    end
@@ -293,6 +310,16 @@ function Stage:CheckAndUpdateSelf()
    end
 end

+---@param missionName string
+---@return boolean
+function Stage:IsMissionComplete(missionName)
+
+    local mission = self._db.missionsByName[missionName]
+    if not mission then return true end
+
+    return mission:getState() == "COMPLETED"
+end
+
 ---private use only
 function Stage:NotifyComplete()

@@ -4,6 +4,8 @@
 ---@class ZoneMission : Mission, OnUnitLostListener
 ---@field private _state MissionState
 ---@field private _missionGroups MissionGroups
+---@field private _dependencies table<string, boolean>
+---@field private _parentStage Stage
 local ZoneMission = {}

 --- @class MissionGroups
@@ -58,8 +60,9 @@ MINIMAL_UNITS_ALIVE_RATIO = 0.21
 ---@param priority MissionPriority
 ---@param database Database
 ---@param logger Logger
+---@param parentStage Stage
 ---@return ZoneMission?
-function ZoneMission.new(zoneName, priority, database, logger)
+function ZoneMission.new(zoneName, priority, database, logger, parentStage)
    local Mission = Spearhead.classes.stageClasses.missions.baseMissions.Mission
    ZoneMission.__index = ZoneMission
    setmetatable(ZoneMission, Mission)
@@ -80,6 +83,8 @@ function ZoneMission.new(zoneName, priority, database, logger)
        return nil
    end

+    --- parent new done
+
    if self.missionType == "SAM" then
        self.missionTypeDisplay = "DEAD"
    end
@@ -92,6 +97,15 @@ function ZoneMission.new(zoneName, priority, database, logger)
        groupNamesPerunit = {}
    }

+    self._parentStage = parentStage
+    self._dependencies = {}
+
+    local dependencies = database:getMissionDependencies(zoneName)
+    for _, dependency in pairs(dependencies) do
+        self._dependencies[dependency] = false
+    end
+
+
    local SpearheadGroup = Spearhead.classes.stageClasses.Groups.SpearheadGroup
    local groupNames = database:getGroupsForMissionZone(zoneName)
    for _, groupName in pairs(groupNames) do
@@ -131,6 +145,48 @@ function ZoneMission.new(zoneName, priority, database, logger)
    return self
 end

+---@private
+function ZoneMission:StartCheckingDependencies()
+
+
+    self._state = "WAITING"
+
+    ---comment
+    ---@param mission ZoneMission
+    ---@param time any
+    ---@return unknown
+    local function CheckDependencies(mission, time)
+        
+        if mission:AllDependenciesMet() == true then
+            mission:SpawnActive()
+            return nil
+        end
+
+        return time + 15
+    end
+
+    timer.scheduleFunction(CheckDependencies, self, timer.getTime() + 15)
+end
+
+---@return boolean
+function ZoneMission:AllDependenciesMet()
+    local allDependenciesMet = true
+    for missionName, value in pairs(self._dependencies) do
+        if self._parentStage:IsMissionComplete(missionName) == false then
+            allDependenciesMet = false
+            self._dependencies[missionName] = false
+        else
+            self._dependencies[missionName] = true
+        end
+    end
+
+    if allDependenciesMet == true then
+        self._logger:info("All dependencies met for " .. self.name)
+    end
+
+    return allDependenciesMet
+end
+
 ---@internal
 ---@param checkHealth boolean
 ---@param messageIfDone boolean
@@ -229,7 +285,6 @@ function ZoneMission:UpdateState(checkHealth, messageIfDone)
            self._state = "COMPLETED"
        end
    end
-
 end

 function ZoneMission:SpawnPersistedState()
@@ -242,7 +297,6 @@ end
 function ZoneMission:SpawnInactive()
    self._logger:info("PreActivating " .. self.name)

-    self._state = "ACTIVE"
    for _, group in pairs(self._missionGroups.groups) do
        group:Spawn()
    end
@@ -250,6 +304,12 @@ end

 function ZoneMission:SpawnActive()

+    if self:AllDependenciesMet() == false then
+        self:SpawnInactive()
+        self:StartCheckingDependencies()
+        return
+    end
+
    self._logger:info("Activating " .. self.name)

    if self._state == "COMPLETED" or self._state == "ACTIVE" then
@@ -270,6 +330,7 @@ end

 ---@private
 function ZoneMission:StartCheckingContinuous()
+
    ---comment
    ---@param mission Mission
    ---@param time any
@@ -278,6 +339,7 @@ function ZoneMission:StartCheckingContinuous()
        mission:UpdateState(true, true)

        if mission:getState() == "COMPLETED" then
+            mission:NotifyMissionComplete()
            return nil
        end
        return time + 30
@@ -153,6 +153,7 @@ do --aliases

    --- @alias MissionState
    --- | "NEW"
+    --- | "WAITING"
    --- | "ACTIVE"
    --- | "COMPLETED"