diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua index c77c174c2..ae3763298 100644 --- a/Moose Development/Moose/Core/Point.lua +++ b/Moose Development/Moose/Core/Point.lua @@ -1957,9 +1957,18 @@ do -- COORDINATE --- Smokes the point in a color. -- @param #COORDINATE self -- @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 } ) - 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 --- Smoke the COORDINATE Green. diff --git a/Moose Development/Moose/Functional/Autolase.lua b/Moose Development/Moose/Functional/Autolase.lua index 612162389..423fc55fe 100644 --- a/Moose Development/Moose/Functional/Autolase.lua +++ b/Moose Development/Moose/Functional/Autolase.lua @@ -118,7 +118,7 @@ AUTOLASE = { --- AUTOLASE class version. -- @field #string version -AUTOLASE.version = "0.1.25" +AUTOLASE.version = "0.1.26" ------------------------------------------------------------------- -- Begin Functional.Autolase.lua @@ -757,9 +757,11 @@ function AUTOLASE:ShowStatus(Group,Unit) end local code = self:GetLaserCode(unit:GetName()) report:Add(string.format("Recce %s has code %d",name,code)) + report:Add("---------------") end end report:Add(string.format("Lasing min threat level %d",self.minthreatlevel)) + report:Add("---------------") local lines = 0 for _ind,_entry in pairs(self.CurrentLasing) do local entry = _entry -- #AUTOLASE.LaserSpot @@ -779,7 +781,7 @@ function AUTOLASE:ShowStatus(Group,Unit) if playername then local settings = _DATABASE:GetPlayerSettings(playername) if settings then - self:I("Get Settings ok!") + self:T("Get Settings ok!") if settings:IsA2G_MGRS() then locationstring = entry.coordinate:ToStringMGRS(settings) elseif settings:IsA2G_LL_DMS() then @@ -789,12 +791,14 @@ function AUTOLASE:ShowStatus(Group,Unit) end end end - local text = string.format("%s lasing %s code %d\nat %s",reccename,typename,code,locationstring) + local text = string.format("+ %s lasing %s code %d\nat %s",reccename,typename,code,locationstring) report:Add(text) + report:Add("---------------") lines = lines + 1 end if lines == 0 then report:Add("No targets!") + report:Add("---------------") end local reporttime = self.reporttimelong if lines == 0 then reporttime = self.reporttimeshort end diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 9bac1a3c2..9b6c0ead1 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -1351,7 +1351,7 @@ CTLD.UnitTypeCapabilities = { --- CTLD class version. -- @field #string version -CTLD.version="1.1.20" +CTLD.version="1.1.21" --- Instantiate a new CTLD. -- @param #CTLD self @@ -3514,7 +3514,7 @@ function CTLD:_UnloadTroops(Group, Unit) if IsHerc then offset = self.TroopUnloadDistGroundHerc or 25 end if IsHook then offset = self.TroopUnloadDistGroundHook or 15 - if self.TroopUnloadDistHoverHook then + if hoverunload and self.TroopUnloadDistHoverHook then offset = self.TroopUnloadDistHoverHook or 5 end end