FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move transport categories/etc to SetRequiredCarriers, to allow for specifying them without always needing to specify zones

Browse Source
This commit is contained in:
ttrebuchon
2023-06-17 17:06:16 -04:00
parent b3d46618c2
commit e284773492
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Moose Development/Moose/Ops/Auftrag.lua
View File

@@ -3068,12 +3068,9 @@ function AUFTRAG:SetRequiredTransport(DeployZone, NcarriersMin, NcarriersMax, Di
-- OPS transport from pickup to deploy zone. -- OPS transport from pickup to deploy zone.
self.transportDeployZone=DeployZone self.transportDeployZone=DeployZone
self.transportDisembarkZone=DisembarkZone self.transportDisembarkZone=DisembarkZone
self.transportCategories = UTILS.EnsureTable(Categories, true)
self.transportAttributes = UTILS.EnsureTable(Attributes, true)
self.transportProperties = UTILS.EnsureTable(Properties, true)
-- Set required carriers. -- Set required carriers.
self:SetRequiredCarriers(NcarriersMin, NcarriersMax) self:SetRequiredCarriers(NcarriersMin, NcarriersMax, Categories, Attributes, Properties)
return self return self
end end
@@ -3124,8 +3121,11 @@ end
-- @param #AUFTRAG self -- @param #AUFTRAG self
-- @param #number NcarriersMin Number of carriers *at least* required. Default 1. -- @param #number NcarriersMin Number of carriers *at least* required. Default 1.
-- @param #number NcarriersMax Number of carriers *at most* used for transportation. Default is same as `NcarriersMin`. -- @param #number NcarriersMax Number of carriers *at most* used for transportation. Default is same as `NcarriersMin`.
-- @param #table Categories Group categories.
-- @param #table Attributes Generalizes group attributes.
-- @param #table Properties DCS attributes.
-- @return #AUFTRAG self -- @return #AUFTRAG self
function AUFTRAG:SetRequiredCarriers(NcarriersMin, NcarriersMax) function AUFTRAG:SetRequiredCarriers(NcarriersMin, NcarriersMax, Categories, Attributes, Properties)
self.NcarriersMin=NcarriersMin or 1 self.NcarriersMin=NcarriersMin or 1
@@ -3136,6 +3136,10 @@ function AUFTRAG:SetRequiredCarriers(NcarriersMin, NcarriersMax)
self.NcarriersMax=self.NcarriersMin self.NcarriersMax=self.NcarriersMin
end end
self.transportCategories = UTILS.EnsureTable(Categories, true)
self.transportAttributes = UTILS.EnsureTable(Attributes, true)
self.transportProperties = UTILS.EnsureTable(Properties, true)
return self return self
end end