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/develop' into branch

Browse Source
This commit is contained in:
Applevangelist 2025-04-27 11:27:59 +02:00
commit 9721f743a0
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,7 +603,7 @@ RANGE.MenuF10Root = nil
--- Range script version. --- Range script version.
-- @field #string version -- @field #string version
RANGE.version = "2.8.0" RANGE.version = "2.8.1"
-- TODO list: -- TODO list:
-- TODO: Verbosity level for messages. -- TODO: Verbosity level for messages.
@ -2032,10 +2032,10 @@ function RANGE._OnImpact(weapon, self, playerData, attackHdg, attackAlt, attackV
-- Smoke impact point of bomb. -- Smoke impact point of bomb.
if playerData and playerData.smokebombimpact and insidezone then if playerData and playerData.smokebombimpact and insidezone then
if playerData and playerData.delaysmoke then if playerData.delaysmoke then
timer.scheduleFunction( self._DelayedSmoke, { coord = impactcoord, color = playerData.smokecolor }, timer.getTime() + self.TdelaySmoke ) impactcoord:Smoke(playerData.smokecolor, 30, self.TdelaySmoke)
else else
impactcoord:Smoke( playerData.smokecolor ) impactcoord:Smoke(playerData.smokecolor, 30)
end end
end end
@ -2640,13 +2640,6 @@ end
-- Display Messages -- Display Messages
----------------------------------------------------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Start smoking a coordinate with a delay.
-- @param #table _args Argements passed.
function RANGE._DelayedSmoke( _args )
_args.coord:Smoke(_args.color)
--trigger.action.smoke( _args.coord:GetVec3(), _args.color )
end
--- Display top 10 stafing results of a specific player. --- Display top 10 stafing results of a specific player.
-- @param #RANGE self -- @param #RANGE self
-- @param #string _unitName Name of the player unit. -- @param #string _unitName Name of the player unit.

2
Moose Development/Moose/Ops/FlightGroup.lua
View File

@ -259,7 +259,7 @@ function FLIGHTGROUP:New(group)
local self=BASE:Inherit(self, OPSGROUP:New(group)) -- #FLIGHTGROUP local self=BASE:Inherit(self, OPSGROUP:New(group)) -- #FLIGHTGROUP
-- Set some string id for output to DCS.log file. -- Set some string id for output to DCS.log file.
self.lid=string.format("FLIGHTGROUP %s | ", self.groupname) self.lid=string.format("FLIGHTGROUP %s | ", self.groupname or "N/A")
-- Defaults -- Defaults
self:SetDefaultROE() self:SetDefaultROE()