From 25831db0571e07aefef31f30fed07b12f9bb0962 Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Mon, 2 Apr 2018 19:33:44 +0200 Subject: [PATCH] Progress -- Still need to fix an issue with some strang objects appearing and a crash. --- Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua index 3832d4a7a..5795b947b 100644 --- a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua @@ -253,7 +253,7 @@ do -- TASK_CARGO_DISPATCHER self.PilotSpawn:InitCoalition( EventData.IniUnit:GetCoalition() ) self.CSAR[#self.CSAR+1] = {} - self.CSAR[#self.CSAR].PilotUnit = self.PilotSpawn:SpawnFromPointVec2( PointVec2Spawn ) + self.CSAR[#self.CSAR].PilotGroup = self.PilotSpawn:SpawnFromPointVec2( PointVec2Spawn ) self.CSAR[#self.CSAR].Task = nil return self @@ -310,7 +310,7 @@ do -- TASK_CARGO_DISPATCHER -- @return #nil If there is no CSAR task required. function TASK_CARGO_DISPATCHER:EvaluateCSAR( CSARUnit ) - local CSARCargo = CARGO_UNIT:New( CSARUnit, "Pilot", CSARUnit:GetName(), 80, 1500, 10 ) + local CSARCargo = CARGO_GROUP:New( CSARUnit, "Pilot", CSARUnit:GetName(), 80, 1500, 10 ) local SetCargo = SET_CARGO:New() SetCargo:AddCargosByName( CSARUnit:GetName() ) @@ -361,7 +361,8 @@ do -- TASK_CARGO_DISPATCHER if CSARData.Task then else -- New CSAR Task - local SetCargo = self:EvaluateCSAR( CSARData.PilotUnit ) + self:F( { PilotGroup = CSARData.PilotGroup } ) + local SetCargo = self:EvaluateCSAR( CSARData.PilotGroup ) local CSARTask = TASK_CARGO_CSAR:New( Mission, self.SetGroup, string.format( "CSAR.%03d", CSARID ), SetCargo ) CSARTask:SetDeployZones( self.CSARDeployZones or {} ) Mission:AddTask( CSARTask )