Spearhead/spearhead
3
0
Fork 0
Code Issues 20 Pull Requests 1 Actions Packages Releases 2 Wiki Activity

updated airbase

Browse Source
This commit is contained in:
dutchie031
2024-10-12 15:14:50 +02:00
parent 8cff8e095e
commit f576b45706
10 changed files with 328 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_miz/SPEARHEADDEV.miz
BIN
View File
Binary file not shown.
classes/capClasses/CapGroup.lua
+2
View File
@@ -116,6 +116,8 @@ function CapGroup:new(groupName, airbaseId, logger, database, capConfig)
local RESPAWN_AFTER_TOUCHDOWN_SECONDS = 180
Spearhead.DcsUtil.DestroyGroup(groupName)
-- initials
o.groupName = groupName
o.airbaseId = airbaseId
classes/configuration/CapConfig.lua
+1
View File
@@ -53,4 +53,5 @@ function CapConfig:new()
end
if not Spearhead.internal then Spearhead.internal = {} end
if not Spearhead.internal.configuration then Spearhead.internal.configuration = {} end
Spearhead.internal.configuration.CapConfig = CapConfig;
classes/configuration/StageConfig.lua
+2 -1
View File
@@ -20,11 +20,12 @@ function StageConfig:new()
o.isAutoStages = function(self) return autoStages end
local maxMissionsPerStage = SpearheadConfig.StageConfig.maxMissionStage
o.getMaxMissionPerStage = function(self) return maxMissionsPerStage end
o.getMaxMissionsPerStage = function(self) return maxMissionsPerStage end
o.logLevel = Spearhead.LoggerTemplate.LogLevelOptions.INFO
return o;
end
if not Spearhead.internal then Spearhead.internal = {} end
if not Spearhead.internal.configuration then Spearhead.internal.configuration = {} end
Spearhead.internal.configuration.StageConfig = StageConfig;
classes/spearhead_base.lua
+154 -857
View File
File diff suppressed because it is too large Load Diff
classes/spearhead_db.lua
+47 -22
View File
@@ -2,13 +2,13 @@
local SpearheadDB = {}
do -- DB
local singleton = nil
---comment
---@param Logger table
---@return table
function SpearheadDB:new(Logger)
function SpearheadDB:new(Logger, debug)
if not debug then debug = false end
if singleton ~= nil then
Logger:info("Returning an already initiated instance of SpearheadDB")
return singleton
@@ -34,8 +34,7 @@ do -- DB
o.tables.stage_numberPerzone = {}
do -- INIT ZONE TABLES
if env.mission.triggers and env.mission.triggers.zones then
for zone_ind, zone_data in pairs(env.mission.triggers.zones) do
for zone_ind, zone_data in pairs(Spearhead.DcsUtil.__trigger_zones) do
local zone_name = zone_data.name
local split_string = Spearhead.Util.split_string(zone_name, "_")
table.insert(o.tables.all_zones, zone_name)
@@ -73,7 +72,6 @@ do -- DB
end
end
end
end
Logger:debug("initiated zone tables, continuing with descriptions")
o.tables.descriptions = {}
@@ -82,7 +80,8 @@ do -- DB
for i, layer in pairs(env.mission.drawings.layers) do
if string.lower(layer.name) == "author" then
for key, layer_object in pairs(layer.objects) do
local inZone = Spearhead.DcsUtil.isPositionInZones(layer_object.mapX, layer_object.mapY, o.tables.mission_zones)
local inZone = Spearhead.DcsUtil.isPositionInZones(layer_object.mapX, layer_object.mapY,
o.tables.mission_zones)
if Spearhead.Util.tableLength(inZone) >= 1 then
local name = inZone[1]
if name ~= nil then
@@ -90,7 +89,8 @@ do -- DB
end
end
local inZone = Spearhead.DcsUtil.isPositionInZones(layer_object.mapX, layer_object.mapY, o.tables.random_mission_zones)
local inZone = Spearhead.DcsUtil.isPositionInZones(layer_object.mapX, layer_object.mapY,
o.tables.random_mission_zones)
if Spearhead.Util.tableLength(inZone) >= 1 then
local name = inZone[1]
if name ~= nil then
@@ -202,7 +202,6 @@ do -- DB
local found = findFirst(farpZoneName)
if found then
if o.tables.farpZonesPerStage[found] == nil then
o.tables.farpZonesPerStage[found] = {}
end
@@ -248,10 +247,10 @@ do -- DB
for _, airbase in pairs(airbases) do
local baseId = airbase:getID()
local point = airbase:getPoint()
local zone = Spearhead.DcsUtil.getAirbaseZoneById(baseId) or
{ x = point.x, z = point.z, radius = 4000 }
o.tables.capGroupsOnAirbase[baseId] = {}
local groups = Spearhead.DcsUtil.areGroupsInCustomZone(all_groups,
{ x = point.x, z = point.z, radius = 2048 })
local groups = Spearhead.DcsUtil.areGroupsInCustomZone(all_groups, zone)
for _, groupName in pairs(groups) do
is_group_taken[groupName] = true
table.insert(o.tables.capGroupsOnAirbase[baseId], groupName)
@@ -310,13 +309,37 @@ do -- DB
for _, airbase in pairs(airbases) do
local baseId = tostring(airbase:getID())
local point = airbase:getPoint()
local airbaseZone = Spearhead.DcsUtil.getAirbaseZoneById(baseId) or
{ x = point.x, z = point.z, radius = 4000 }
if isAirbaseInZone[tostring(baseId) or "something"] == true and airbaseZone and airbase:getDesc().category == Airbase.Category.AIRDROME then
if debug then
if airbaseZone.zone_type == Spearhead.DcsUtil.ZoneType.Polygon then
local functionString = "trigger.action.markupToAll(7, -1, " .. baseId + 300 .. ","
for _, vecpoint in pairs(airbaseZone.verts) do
functionString = functionString .. " { x=" .. vecpoint.x .. ", y=0,z=" .. vecpoint.z ..
"},"
end
functionString = functionString .. "{0,1,0,1}, {0,1,0,1}, 1)"
env.info(functionString)
local f, err = loadstring(functionString)
if f then
f()
else
env.info(err)
end
else
trigger.action.circleToAll(-1, baseId, { x = point.x, y = 0, z = point.z }, 2048,
{ 1, 0, 0, 1 }, { 1, 0, 0, 0 }, 1, true)
end
end
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 = 2048 })
local groups = Spearhead.DcsUtil.areGroupsInCustomZone(all_groups, airbaseZone)
for _, groupName in pairs(groups) do
if Spearhead.DcsUtil.IsGroupStatic(groupName) == true then
local object = StaticObject.getByName(groupName)
if object then
@@ -406,7 +429,8 @@ do -- DB
local zone = Spearhead.DcsUtil.getZoneByName(cap_route_zone)
if zone then
if zone.zone_type == Spearhead.DcsUtil.ZoneType.Cilinder then
table.insert(o.tables.capRoutesPerStageNumber[number].routes, { point1 = { x = zone.x , z = zone.z }, point2 = nil } )
table.insert(o.tables.capRoutesPerStageNumber[number].routes,
{ point1 = { x = zone.x, z = zone.z }, point2 = nil })
else
local function getDist(a, b)
return math.sqrt((b.x - a.x) ^ 2 + (b.z - a.z) ^ 2)
@@ -418,7 +442,6 @@ do -- DB
for i = 1, 3 do
for ii = i + 1, 4 do
local a = zone.verts[i]
local b = zone.verts[ii]
local dist = getDist(a, b)
@@ -475,14 +498,16 @@ do -- DB
local aY = pC.z + vY / magV * radius;
return { x = aX, z = aY }
end
local stageZoneName = Spearhead.Util.randomFromList(self.tables.stage_zonesByNumer[stageNumber]) or "none"
local stageZoneName = Spearhead.Util.randomFromList(self.tables.stage_zonesByNumer[stageNumber]) or
"none"
local stagezone = Spearhead.DcsUtil.getZoneByName(stageZoneName)
if stagezone then
local base = Spearhead.DcsUtil.getAirbaseById(baseId)
if base then
local closest = nil
if stagezone.zone_type == Spearhead.DcsUtil.ZoneType.Cilinder then
closest = GetClosestPointOnCircle({x = stagezone.x, z = stagezone.z}, stagezone.radius, base:getPoint())
closest = GetClosestPointOnCircle({ x = stagezone.x, z = stagezone.z }, stagezone.radius,
base:getPoint())
else
local function getDist(a, b)
return math.sqrt((b.x - a.x) ^ 2 + (b.z - a.z) ^ 2)
@@ -506,7 +531,6 @@ do -- DB
end
end
end
end
---comment
---@param self table
@@ -610,16 +634,17 @@ do -- DB
for _, missionZone in pairs(o.tables.mission_zones) do
if o.tables.descriptions[missionZone] == nil then
Spearhead.AddMissionEditorWarning("Mission with zonename: " .. missionZone .. " does not have a briefing")
Spearhead.AddMissionEditorWarning("Mission with zonename: " ..
missionZone .. " does not have a briefing")
end
end
for _, randomMission in pairs(o.tables.random_mission_zones) do
if o.tables.descriptions[randomMission] == nil then
Spearhead.AddMissionEditorWarning("Mission with zonename: " .. randomMission .. " does not have a briefing")
Spearhead.AddMissionEditorWarning("Mission with zonename: " ..
randomMission .. " does not have a briefing")
end
end
end
singleton = o
return o
classes/stageClasses/GlobalStageManager.lua
+1 -1
View File
@@ -9,7 +9,7 @@ GlobalStageManager.start = function (database, stageConfig)
for _, stageName in pairs(database:getStagezoneNames()) do
local logger = Spearhead.LoggerTemplate:new(stageName, stageConfig.logLevel)
local stage = Spearhead.internal.Stage:new(stageName, database, logger)
local stage = Spearhead.internal.Stage:new(stageName, database, logger, stageConfig)
StagesByName[stageName] = stage
classes/stageClasses/Mission.lua
+1
View File
@@ -353,6 +353,7 @@ do -- INIT Mission Class
end
end
end
Spearhead.DcsUtil.DestroyGroup(group_name)
end
if Spearhead.Util.tableLength(self.targetAliveStates) > 0 then
classes/stageClasses/Stage.lua
+9 -2
View File
@@ -94,14 +94,21 @@ do --init STAGE DIRECTOR
for _, groupName in pairs(database:getRedGroupsAtAirbase(airbaseId)) do
table.insert(o.db.redAirbasegroups, groupName)
Spearhead.DcsUtil.DestroyGroup(groupName)
end
for _, groupName in pairs(database:getBlueGroupsAtAirbase(airbaseId)) do
table.insert(o.db.blueAirbasegroups, groupName)
Spearhead.DcsUtil.DestroyGroup(groupName)
end
end
end
local miscGroups = database:getMiscGroupsAtStage(o.zoneName)
for _, groupName in pairs(miscGroups) do
Spearhead.DcsUtil.DestroyGroup(groupName)
end
local farps = database:getFarpZonesInStage(o.zoneName)
if farps ~= nil and type(farps) == "table" then o.db.farps = farps end
end
@@ -178,7 +185,7 @@ do --init STAGE DIRECTOR
trigger.action.circleToAll(-1, self.stageDrawingId, {x = zone.x, y = 0 , z = zone.z}, zone.radius, {0,0,0,0}, {0,0,0,0},4, true)
else
--trigger.action.circleToAll(-1, self.stageDrawingId, {x = zone.x, y = 0 , z = zone.z}, zone.radius, { 1, 0,0, 1 }, {1,0,0,1},4, true)
trigger.action.quadToAll( -1, self.stageDrawingId, zone.verts[2], zone.verts[1], zone.verts[4], zone.verts[3], {0,0,0,0}, {0,0,0,0}, 4, true)
trigger.action.quadToAll( -1, self.stageDrawingId, zone.verts[1], zone.verts[2], zone.verts[3], zone.verts[4], {0,0,0,0}, {0,0,0,0}, 4, true)
end
trigger.action.setMarkupColorFill(self.stageDrawingId, fillColor)
@@ -222,7 +229,7 @@ do --init STAGE DIRECTOR
end
end
local max = self.stageConfig:getMaxMissionPerStage() or 10
local max = self.stageConfig:getMaxMissionsPerStage() or 10
local availableMissionsCount = Spearhead.Util.tableLength(availableMissions)
if activeCount < max and availableMissionsCount > 0 then
main.lua
+31 -1
View File
@@ -1,6 +1,14 @@
--Single player purpose
local debug = false
local id = net.get_my_player_id()
if id == 0 then
debug = true
end
local dbLogger = Spearhead.LoggerTemplate:new("database", Spearhead.LoggerTemplate.LogLevelOptions.INFO)
local databaseManager = Spearhead.DB:new(dbLogger)
local databaseManager = Spearhead.DB:new(dbLogger, debug)
local capConfig = Spearhead.internal.configuration.CapConfig:new();
local stageConfig = Spearhead.internal.configuration.StageConfig:new();
@@ -21,3 +29,25 @@ Spearhead.LoadingDone()
-- Get-ChildItem . -Include *.lua -Recurse | foreach {""+(Get-Content $_).Count + " => " + $_.name }; && GCI . -Include *.lua* -Recurse | foreach{(GC $_).Count} | measure-object -sum | % Sum
-- find . -name '*.lua' | xargs wc -l
--- ==================== DEBUG ORDER OR ZONE VEC ===========================
-- local zone = Spearhead.DcsUtil.getZoneByName("MISSIONSTAGE_99")
-- local count = Spearhead.Util.tableLength(zone.verts)
-- for i = 1, count - 1 do
-- local a = zone.verts[i]
-- local b = zone.verts[i+1]
-- local color = {0,0,0,1}
-- color[i] = 1
-- trigger.action.textToAll(-1, 46+i , { x= a.x, y = 0, z = a.z } , color, {0,0,0}, 24 , true , "" .. i )
-- trigger.action.lineToAll(-1 , 56+i , { x= a.x, y = 0, z = a.z } , { x = b.x, y = 0, z = b.z } , color , 1, true)
-- end