FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

#COORDINATE Adding names to smoke to be able to switch them off earlier

Browse Source
This commit is contained in:
Applevangelist 2024-12-27 12:25:25 +01:00
parent 55c5a23616
commit 9916afaa49
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Moose Development/Moose/Core/Point.lua
View File

@ -1957,9 +1957,18 @@ do -- COORDINATE
--- Smokes the point in a color. --- Smokes the point in a color.
-- @param #COORDINATE self -- @param #COORDINATE self
-- @param Utilities.Utils#SMOKECOLOR SmokeColor -- @param Utilities.Utils#SMOKECOLOR SmokeColor
function COORDINATE:Smoke( SmokeColor ) -- @param #string name (Optional) Name if you want to stop the smoke early (normal duration: 5mins)
function COORDINATE:Smoke( SmokeColor, name )
self:F2( { SmokeColor } ) self:F2( { SmokeColor } )
trigger.action.smoke( self:GetVec3(), SmokeColor ) self.firename = name or "Smoke-"..math.random(1,100000)
trigger.action.smoke( self:GetVec3(), SmokeColor, self.firename )
end
--- Stops smoking the point in a color.
-- @param #COORDINATE self
-- @param #string name (Optional) Name if you want to stop the smoke early (normal duration: 5mins)
function COORDINATE:StopSmoke( name )
self:StopBigSmokeAndFire( name )
end end
--- Smoke the COORDINATE Green. --- Smoke the COORDINATE Green.
@ -2410,7 +2419,7 @@ do -- COORDINATE
for i,coord in ipairs(Coordinates) do for i,coord in ipairs(Coordinates) do
vecs[i+1]=coord:GetVec3() vecs[i+1]=coord:GetVec3()
end end
if #vecs<3 then if #vecs<3 then
self:E("ERROR: A free form polygon needs at least three points!") self:E("ERROR: A free form polygon needs at least three points!")
elseif #vecs==3 then elseif #vecs==3 then
@ -3313,16 +3322,16 @@ do -- COORDINATE
-- @param #COORDINATE self -- @param #COORDINATE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable to retrieve the settings from, otherwise the default settings will be chosen. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable to retrieve the settings from, otherwise the default settings will be chosen.
-- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object. -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
-- @param Tasking.Task#TASK Task The task for which coordinates need to be calculated.
-- @return #string The coordinate Text in the configured coordinate system. -- @return #string The coordinate Text in the configured coordinate system.
function COORDINATE:ToString( Controllable, Settings, Task ) function COORDINATE:ToString( Controllable, Settings )
-- self:E( { Controllable = Controllable and Controllable:GetName() } ) -- self:E( { Controllable = Controllable and Controllable:GetName() } )
local Settings = Settings or ( Controllable and _DATABASE:GetPlayerSettings( Controllable:GetPlayerName() ) ) or _SETTINGS local Settings = Settings or ( Controllable and _DATABASE:GetPlayerSettings( Controllable:GetPlayerName() ) ) or _SETTINGS
local ModeA2A = nil local ModeA2A = nil
--[[
if Task then if Task then
if Task:IsInstanceOf( TASK_A2A ) then if Task:IsInstanceOf( TASK_A2A ) then
ModeA2A = true ModeA2A = true
@ -3339,7 +3348,7 @@ do -- COORDINATE
end end
end end
end end
--]]
if ModeA2A == nil then if ModeA2A == nil then
local IsAir = Controllable and ( Controllable:IsAirPlane() or Controllable:IsHelicopter() ) or false local IsAir = Controllable and ( Controllable:IsAirPlane() or Controllable:IsHelicopter() ) or false