weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-24 03:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename AUFTRAG.transportCategories/etc to carrierCategories/etc

Browse Source
This commit is contained in:
ttrebuchon
2023-06-17 17:07:56 -04:00
parent e284773492
commit 2a11c4c98a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/Auftrag.lua
+3 -3
View File
@@ -3136,9 +3136,9 @@ function AUFTRAG:SetRequiredCarriers(NcarriersMin, NcarriersMax, Categories, Att
self.NcarriersMax=self.NcarriersMin self.NcarriersMax=self.NcarriersMin
end end
self.transportCategories = UTILS.EnsureTable(Categories, true) self.carrierCategories = UTILS.EnsureTable(Categories, true)
self.transportAttributes = UTILS.EnsureTable(Attributes, true) self.carrierAttributes = UTILS.EnsureTable(Attributes, true)
self.transportProperties = UTILS.EnsureTable(Properties, true) self.carrierProperties = UTILS.EnsureTable(Properties, true)
return self return self
end end
Moose Development/Moose/Ops/Commander.lua
+2 -2
View File
@@ -1508,7 +1508,7 @@ function COMMANDER:CheckMissionQueue()
local Transport=nil local Transport=nil
local Legions=mission.transportLegions or self.legions local Legions=mission.transportLegions or self.legions
TransportAvail, Transport=LEGION.AssignAssetsForTransport(self, Legions, assets, mission.NcarriersMin, mission.NcarriersMax, mission.transportDeployZone, mission.transportDisembarkZone, mission.transportCategories, mission.transportAttributes, mission.transportProperties) TransportAvail, Transport=LEGION.AssignAssetsForTransport(self, Legions, assets, mission.NcarriersMin, mission.NcarriersMax, mission.transportDeployZone, mission.transportDisembarkZone, mission.carrierCategories, mission.carrierAttributes, mission.carrierProperties)
-- Add opstransport to mission. -- Add opstransport to mission.
if TransportAvail and Transport then if TransportAvail and Transport then
@@ -1702,7 +1702,7 @@ function COMMANDER:RecruitAssetsForMission(Mission)
local cohort=_cohort --Ops.Cohort#COHORT local cohort=_cohort --Ops.Cohort#COHORT
-- Check if cohort can perform transport to target. -- Check if cohort can perform transport to target.
local can=LEGION._CohortCan(cohort, AUFTRAG.Type.OPSTRANSPORT, Mission.transportCategories, Mission.transportAttributes, Mission.transportProperties, nil, TargetVec2) local can=LEGION._CohortCan(cohort, AUFTRAG.Type.OPSTRANSPORT, Mission.carrierCategories, Mission.carrierAttributes, Mission.carrierProperties, nil, TargetVec2)
-- MaxWeight of cargo assets is limited by the largets available cargo bay. We don't want to select, e.g., tanks that cannot be transported by APCs or helos. -- MaxWeight of cargo assets is limited by the largets available cargo bay. We don't want to select, e.g., tanks that cannot be transported by APCs or helos.
if can and (MaxWeight==nil or cohort.cargobayLimit>MaxWeight) then if can and (MaxWeight==nil or cohort.cargobayLimit>MaxWeight) then
Moose Development/Moose/Ops/Legion.lua
+2 -2
View File
@@ -714,7 +714,7 @@ function LEGION:CheckMissionQueue()
local Legions=mission.transportLegions or {self} local Legions=mission.transportLegions or {self}
-- Assign carrier assets for transport. -- Assign carrier assets for transport.
TransportAvail, Transport=self:AssignAssetsForTransport(Legions, assets, mission.NcarriersMin, mission.NcarriersMax, mission.transportDeployZone, mission.transportDisembarkZone, mission.transportCategories, mission.transportAttributes, mission.transportProperties) TransportAvail, Transport=self:AssignAssetsForTransport(Legions, assets, mission.NcarriersMin, mission.NcarriersMax, mission.transportDeployZone, mission.transportDisembarkZone, mission.carrierCategories, mission.carrierAttributes, mission.carrierProperties)
end end
-- Add opstransport to mission. -- Add opstransport to mission.
@@ -2252,7 +2252,7 @@ function LEGION:RecruitAssetsForMission(Mission)
local cohort=_cohort --Ops.Cohort#COHORT local cohort=_cohort --Ops.Cohort#COHORT
-- Check if cohort can perform transport to target. -- Check if cohort can perform transport to target.
local can=LEGION._CohortCan(cohort, AUFTRAG.Type.OPSTRANSPORT, Mission.transportCategories, Mission.transportAttributes, Mission.transportProperties, nil, TargetVec2) local can=LEGION._CohortCan(cohort, AUFTRAG.Type.OPSTRANSPORT, Mission.carrierCategories, Mission.carrierAttributes, Mission.carrierProperties, nil, TargetVec2)
-- MaxWeight of cargo assets is limited by the largets available cargo bay. We don't want to select, e.g., tanks that cannot be transported by APCs or helos. -- MaxWeight of cargo assets is limited by the largets available cargo bay. We don't want to select, e.g., tanks that cannot be transported by APCs or helos.
if can and (MaxWeight==nil or cohort.cargobayLimit>MaxWeight) then if can and (MaxWeight==nil or cohort.cargobayLimit>MaxWeight) then