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

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Applevangelist 2024-07-18 14:35:38 +02:00
commit f0e01845d3
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Moose Development/Moose/Functional/Range.lua
View File

@ -1239,10 +1239,12 @@ function RANGE:SetSRS(PathToSRS, Port, Coalition, Frequency, Modulation, Volume,
self.instructmsrs:SetLabel("RANGEI") self.instructmsrs:SetLabel("RANGEI")
self.instructmsrs:SetVolume(Volume or 1.0) self.instructmsrs:SetVolume(Volume or 1.0)
self.instructsrsQ = MSRSQUEUE:New("INSTRUCT") self.instructsrsQ = MSRSQUEUE:New("INSTRUCT")
if PathToGoogleKey then if PathToGoogleKey then
self.controlmsrs:SetGoogle(PathToGoogleKey) self.controlmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
self.instructmsrs:SetGoogle(PathToGoogleKey) self.controlmsrs:SetProvider(MSRS.Provider.GOOGLE)
self.instructmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
self.instructmsrs:SetProvider(MSRS.Provider.GOOGLE)
end end
else else
@ -2398,7 +2400,7 @@ function RANGE:onafterSave( From, Event, To )
end end
-- Path. -- Path.
local path = lfs.writedir() .. [[Logs\]] local path = self.targetpath or lfs.writedir() .. [[Logs\]]
-- Set file name. -- Set file name.
local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename ) local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename )
@ -2463,7 +2465,7 @@ function RANGE:onafterLoad( From, Event, To )
end end
-- Path in DCS log file. -- Path in DCS log file.
local path = lfs.writedir() .. [[Logs\]] local path = self.targetpath or lfs.writedir() .. [[Logs\]]
-- Set file name. -- Set file name.
local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename ) local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename )
@ -3854,13 +3856,13 @@ function RANGE:_TargetsheetOnOff( _unitname )
-- Inform player. -- Inform player.
if playerData and playerData.targeton == true then 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 else
text = string.format( "affirm, your targetsheets are NOT SAVED." ) text = string.format( "Affirm, your targetsheets are NOT SAVED." )
end end
else else
text = "negative, target sheet data recorder is broken on this range." text = "Negative, target sheet data recorder is broken on this range."
end end
-- Message to player. -- Message to player.

4
Moose Development/Moose/Wrapper/Controllable.lua
View File

@ -1012,7 +1012,7 @@ end
-- TASKS FOR AIR CONTROLLABLES -- TASKS FOR AIR CONTROLLABLES
--- (AIR) Attack a Controllable. --- (AIR + GROUND) Attack a Controllable.
-- @param #CONTROLLABLE self -- @param #CONTROLLABLE self
-- @param Wrapper.Group#GROUP AttackGroup The Group to be attacked. -- @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. -- @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 return DCSTask
end end
--- (AIR) Attack the Unit. --- (AIR + GROUND) Attack the Unit.
-- @param #CONTROLLABLE self -- @param #CONTROLLABLE self
-- @param Wrapper.Unit#UNIT AttackUnit The UNIT to be attacked -- @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. -- @param #boolean GroupAttack (Optional) If true, all units in the group will attack the Unit when found. Default false.