weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added A space to test syncing

Browse Source
This commit is contained in:
Wingthor 2017-05-25 10:02:53 +02:00
parent 6378cbc0ee
commit 3c71af48ee
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Moose Development/Moose/Tasking/Task_CARGO.lua
View File

@ -355,6 +355,7 @@ do -- TASK_CARGO
end end
--- ---
-- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
@ -624,18 +625,13 @@ do -- TASK_CARGO
end 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 ---@param Color Might be SMOKECOLOR.Blue, SMOKECOLOR.Red SMOKECOLOR.Orange, SMOKECOLOR.White or SMOKECOLOR.Green
function TASK_CARGO:SetSmokeColor(SmokeColor) function TASK_CARGO:SetSmokeColor(SmokeColor)
-- Makes sure Coloe is set -- Makes sure Coloe is set
if SmokeColor == nil then if SmokeColor == nil then
self.SmokeColor = SMOKECOLOR.Red -- Make sure a default color is exist self.SmokeColor = SMOKECOLOR.Red -- Make sure a default color is exist
elseif type(SmokeColor) == "number" then elseif type(SmokeColor) == "number" then
self:F2(SmokeColor) self:F2(SmokeColor)
if SmokeColor > 0 and SmokeColor <=5 then -- Make sure number is within ragne, assuming first enum is one if SmokeColor > 0 and SmokeColor <=5 then -- Make sure number is within ragne, assuming first enum is one
@ -644,6 +640,11 @@ do -- TASK_CARGO
end end
end end
--@return SmokeColor
function TASK_CARGO:GetSmokeColor()
return self.SmokeColor
end
--- @param #TASK_CARGO self --- @param #TASK_CARGO self
function TASK_CARGO:GetPlannedMenuText() function TASK_CARGO:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )" return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"