From 8087c870272b5ea63b82264043fdd7dcd9fed29b Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 18 Jul 2024 14:34:33 +0200 Subject: [PATCH] Fixes --- Moose Development/Moose/Functional/Range.lua | 20 ++++++++++--------- .../Moose/Wrapper/Controllable.lua | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index eb3fc4f28..984dbed7e 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -1239,10 +1239,12 @@ function RANGE:SetSRS(PathToSRS, Port, Coalition, Frequency, Modulation, Volume, self.instructmsrs:SetLabel("RANGEI") self.instructmsrs:SetVolume(Volume or 1.0) self.instructsrsQ = MSRSQUEUE:New("INSTRUCT") - - if PathToGoogleKey then - self.controlmsrs:SetGoogle(PathToGoogleKey) - self.instructmsrs:SetGoogle(PathToGoogleKey) + + if PathToGoogleKey then + self.controlmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey) + self.controlmsrs:SetProvider(MSRS.Provider.GOOGLE) + self.instructmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey) + self.instructmsrs:SetProvider(MSRS.Provider.GOOGLE) end else @@ -2398,7 +2400,7 @@ function RANGE:onafterSave( From, Event, To ) end -- Path. - local path = lfs.writedir() .. [[Logs\]] + local path = self.targetpath or lfs.writedir() .. [[Logs\]] -- Set file name. local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename ) @@ -2463,7 +2465,7 @@ function RANGE:onafterLoad( From, Event, To ) end -- Path in DCS log file. - local path = lfs.writedir() .. [[Logs\]] + local path = self.targetpath or lfs.writedir() .. [[Logs\]] -- Set file name. local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename ) @@ -3854,13 +3856,13 @@ function RANGE:_TargetsheetOnOff( _unitname ) -- Inform player. if playerData and playerData.targeton == true then - text = string.format( "roger, your targetsheets are now SAVED." ) + text = string.format( "Roger, your targetsheets are now SAVED." ) else - text = string.format( "affirm, your targetsheets are NOT SAVED." ) + text = string.format( "Affirm, your targetsheets are NOT SAVED." ) end else - text = "negative, target sheet data recorder is broken on this range." + text = "Negative, target sheet data recorder is broken on this range." end -- Message to player. diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 77700891e..a891a7ca6 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -1012,7 +1012,7 @@ end -- TASKS FOR AIR CONTROLLABLES ---- (AIR) Attack a Controllable. +--- (AIR + GROUND) Attack a Controllable. -- @param #CONTROLLABLE self -- @param Wrapper.Group#GROUP AttackGroup The Group to be attacked. -- @param #number WeaponType (optional) Bitmask of weapon types those allowed to use. If parameter is not defined that means no limits on weapon usage. @@ -1060,7 +1060,7 @@ function CONTROLLABLE:TaskAttackGroup( AttackGroup, WeaponType, WeaponExpend, At return DCSTask end ---- (AIR) Attack the Unit. +--- (AIR + GROUND) Attack the Unit. -- @param #CONTROLLABLE self -- @param Wrapper.Unit#UNIT AttackUnit The UNIT to be attacked -- @param #boolean GroupAttack (Optional) If true, all units in the group will attack the Unit when found. Default false.