From 55c5a236169df7506597ada3ad5476ce551c65cd Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 27 Dec 2024 12:25:00 +0100 Subject: [PATCH 1/2] #CTLD Bugfix in selecting correct helo distance when hover/ground for the Chinook --- Moose Development/Moose/Ops/CTLD.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 9916afaa49f8ea46c0f5d5c7424e417c4c5c0c7f Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 27 Dec 2024 12:25:25 +0100 Subject: [PATCH 2/2] #COORDINATE Adding names to smoke to be able to switch them off earlier --- Moose Development/Moose/Core/Point.lua | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua index b70d39e3c..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. @@ -2410,7 +2419,7 @@ do -- COORDINATE for i,coord in ipairs(Coordinates) do vecs[i+1]=coord:GetVec3() end - + if #vecs<3 then self:E("ERROR: A free form polygon needs at least three points!") elseif #vecs==3 then @@ -3313,16 +3322,16 @@ do -- COORDINATE -- @param #COORDINATE self -- @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 Tasking.Task#TASK Task The task for which coordinates need to be calculated. -- @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() } ) local Settings = Settings or ( Controllable and _DATABASE:GetPlayerSettings( Controllable:GetPlayerName() ) ) or _SETTINGS local ModeA2A = nil - + + --[[ if Task then if Task:IsInstanceOf( TASK_A2A ) then ModeA2A = true @@ -3339,7 +3348,7 @@ do -- COORDINATE end end end - + --]] if ModeA2A == nil then local IsAir = Controllable and ( Controllable:IsAirPlane() or Controllable:IsHelicopter() ) or false