weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-22 16:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

# Conflicts:

Browse Source 
#	Moose Development/Moose/Tasking/Task_CARGO.lua
This commit is contained in:
FlightControl_Master
2018-04-08 22:36:58 +02:00
parent 8b8fcaaacd
commit a95afe9956
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Tasking/Task_CARGO.lua
+2
View File
@@ -643,6 +643,8 @@ do -- TASK_CARGO
self:F( { Cargo = Cargo } ) self:F( { Cargo = Cargo } )
self:F( { Cargo = Cargo } )
local TaskUnitName = TaskUnit:GetName() local TaskUnitName = TaskUnit:GetName()
self:F( { TaskUnit = TaskUnitName, Task = Task and Task:GetClassNameAndID() } ) self:F( { TaskUnit = TaskUnitName, Task = Task and Task:GetClassNameAndID() } )
Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua
+15 -11
View File
@@ -429,17 +429,17 @@ do -- TASK_CARGO_DISPATCHER
--- Add a Transport task to transport cargo from fixed locations to a deployment zone. --- Add a Transport task to transport cargo from fixed locations to a deployment zone.
-- @param #TASK_CARGO_DISPATCHER self -- @param #TASK_CARGO_DISPATCHER self
-- @param #string TransportTaskName (optional) The name of the transport task. -- @param #string TaskName (optional) The name of the transport task.
-- @param Core.SetCargo#SET_CARGO SetCargo The SetCargo to be transported. -- @param Core.SetCargo#SET_CARGO SetCargo The SetCargo to be transported.
-- @param #string Briefing The briefing of the task transport to be shown to the player. -- @param #string Briefing The briefing of the task transport to be shown to the player.
-- @return #TASK_CARGO_DISPATCHER -- @return #TASK_CARGO_DISPATCHER
-- @usage -- @usage
-- --
-- -- Add a Transport task to transport cargo of different types to a Transport Deployment Zone. -- -- Add a Transport task to transport cargo of different types to a Transport Deployment Zone.
function TASK_CARGO_DISPATCHER:AddTransportTask( TransportTaskName, SetCargo, Briefing ) function TASK_CARGO_DISPATCHER:AddTransportTask( TaskName, SetCargo, Briefing )
self.TransportCount = self.TransportCount + 1 self.TransportCount = self.TransportCount + 1
local TaskName = string.format( ( TransportTaskName or "Transport" ) .. ".%03d", self.TransportCount ) local TaskName = string.format( ( TaskName or "Transport" ) .. ".%03d", self.TransportCount )
self.Transport[TaskName] = {} self.Transport[TaskName] = {}
self.Transport[TaskName].SetCargo = SetCargo self.Transport[TaskName].SetCargo = SetCargo
@@ -452,13 +452,15 @@ do -- TASK_CARGO_DISPATCHER
--- Define one deploy zone for the Transport tasks. --- Define one deploy zone for the Transport tasks.
-- @param #TASK_CARGO_DISPATCHER self -- @param #TASK_CARGO_DISPATCHER self
-- @param #string TransportTaskName (optional) The name of the Transport task. -- @param #string TaskName (optional) The name of the Transport task.
-- @param TransportDeployZone A Transport deploy zone. -- @param TransportDeployZone A Transport deploy zone.
-- @return #TASK_CARGO_DISPATCHER -- @return #TASK_CARGO_DISPATCHER
function TASK_CARGO_DISPATCHER:SetTransportDeployZone( TransportTaskName, TransportDeployZone ) function TASK_CARGO_DISPATCHER:SetTransportDeployZone( TaskName, TransportDeployZone )
if TransportTaskName then if self.Transport[TaskName] then
self.Transport[TransportTaskName].DeployZones = { TransportDeployZone } self.Transport[TaskName].DeployZones = { TransportDeployZone }
else
error( "TaskName does not exist" )
end end
return self return self
@@ -467,14 +469,16 @@ do -- TASK_CARGO_DISPATCHER
--- Define the deploy zones for the Transport tasks. --- Define the deploy zones for the Transport tasks.
-- @param #TASK_CARGO_DISPATCHER self -- @param #TASK_CARGO_DISPATCHER self
-- @param #string TransportTaskName (optional) The name of the Transport task. -- @param #string TaskName (optional) The name of the Transport task.
-- @param TransportDeployZones A list of the Transport deploy zones. -- @param TransportDeployZones A list of the Transport deploy zones.
-- @return #TASK_CARGO_DISPATCHER -- @return #TASK_CARGO_DISPATCHER
-- --
function TASK_CARGO_DISPATCHER:SetTransportDeployZones( TransportTaskName, TransportDeployZones ) function TASK_CARGO_DISPATCHER:SetTransportDeployZones( TaskName, TransportDeployZones )
if TransportTaskName then if self.Transport[TaskName] then
self.Transport[TransportTaskName].DeployZones = TransportDeployZones self.Transport[TaskName].DeployZones = TransportDeployZones
else
error( "TaskName does not exist" )
end end
return self return self