From 6378cbc0eedf4a1d13a08a9e46ddb4b297412265 Mon Sep 17 00:00:00 2001
From: Wingthor <developer@wingthor.net>
Date: Tue, 23 May 2017 01:24:39 +0200
Subject: [PATCH] Changed the structure

Change the structure, took away the nil value error when calling the
setter. How ever color is not set proper, or turns out false
---
 .../Moose/Tasking/Task_CARGO.lua              | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua
index 5851cb145..1dd9fa924 100644
--- a/Moose Development/Moose/Tasking/Task_CARGO.lua	
+++ b/Moose Development/Moose/Tasking/Task_CARGO.lua	
@@ -174,6 +174,7 @@ do -- TASK_CARGO
   
     self.SetCargo = SetCargo
     self.TaskType = TaskType
+    self.SmokeColor = SMOKECOLOR.Red
     
     self.DeployZones = {} -- setmetatable( {}, { __mode = "v" } ) -- weak table on value
 
@@ -327,25 +328,7 @@ do -- TASK_CARGO
       self:__RouteToDeploy( 1.0, DeployZone )
     end
     
-    --- ¤TASK_CARGO
-    --@return SmokeColor
-    function TASK_CARGO:GetSmokeColor ()
-      return self.SmokeColor
-    end
     
-    ---#TASK_CARGO
-    --@param Color Might be Blue, Red or Green
-    function TASK_CARGO:SetSmokeColor(SmokeColor)
-       -- Makes sure Coloe is set
-       if SmokeColor == nil then
-       self:F2(SmokeColor)
-          self.SmokeColor = SMOKECOLOR.Red -- Make sure a default color is exist
-       elseif type(SmokeColor) == "number" then
-        if SmokeColor > 0 and SmokeColor <=5 then -- Make sure number is within ragne, assuming first enum is one
-          self.SmokeColor = SMOKECOLOR.SmokeColor
-        end
-       end
-    end
     
     ---
     --#TASK_CAROG_TRANSPORT self
@@ -381,12 +364,16 @@ do -- TASK_CARGO
       if self.Cargo:IsAlive() then
         if TaskUnit:IsAir() then
           local ColorToUse = TASK_CARGO:GetSmokeColor()
-          if ColorToUse == "Green" then
+          if ColorToUse == SMOKECOLOR.Green then
             self.Cargo.CargoObject:GetUnit(1):SmokeGreen()
-          elseif ColorToUse == "Blue" then
+          elseif ColorToUse == SMOKECOLOR.Blue then
             self.Cargo.CargoObject:GetUnit(1):SmokeBlue()
+          elseif ColorToUse == SMOKECOLOR.Orange then
+            self.Cargo.CargoObject:GetUnit(1):SmokeOrange()
+          elseif ColorToUse == SMOKECOLOR.White then
+            self.Cargo.CargoObject:GetUnit(1):SmokeWhite()
           else
-             self.Cargo.CargoObject:GetUnit(1):SmokeRed()
+            self.Cargo.CargoObject:GetUnit(1):SmokeRed()
           end
           self:__Land( -0.1, "Pickup" )
         else
@@ -637,6 +624,26 @@ do -- TASK_CARGO
  
   end
   
+   --- 
+    -- #TASK_CARGO
+    --@return SmokeColor
+    function TASK_CARGO:GetSmokeColor()
+      return self.SmokeColor
+    end
+
+    --@param Color Might be SMOKECOLOR.Blue, SMOKECOLOR.Red SMOKECOLOR.Orange, SMOKECOLOR.White or SMOKECOLOR.Green
+    function TASK_CARGO:SetSmokeColor(SmokeColor)
+       -- Makes sure Coloe is set
+       if SmokeColor == nil then
+          self.SmokeColor = SMOKECOLOR.Red -- Make sure a default color is exist
+       elseif type(SmokeColor) == "number" then
+       self:F2(SmokeColor)
+        if SmokeColor > 0 and SmokeColor <=5 then -- Make sure number is within ragne, assuming first enum is one
+          self.SmokeColor = SMOKECOLOR.SmokeColor
+        end
+       end
+    end
+  
   --- @param #TASK_CARGO self
   function TASK_CARGO:GetPlannedMenuText()
     return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"