weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

xx

Browse Source
This commit is contained in:
Applevangelist 2024-12-27 12:24:02 +01:00
parent 9bf2a013d5
commit ecdca9919e
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Moose Development/Moose/Core/Point.lua
View File

@ -1957,9 +1957,18 @@ do -- COORDINATE
--- Smokes the point in a color. --- Smokes the point in a color.
-- @param #COORDINATE self -- @param #COORDINATE self
-- @param Utilities.Utils#SMOKECOLOR SmokeColor -- @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 } ) 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 end
--- Smoke the COORDINATE Green. --- Smoke the COORDINATE Green.

10
Moose Development/Moose/Functional/Autolase.lua
View File

@ -118,7 +118,7 @@ AUTOLASE = {
--- AUTOLASE class version. --- AUTOLASE class version.
-- @field #string version -- @field #string version
AUTOLASE.version = "0.1.25" AUTOLASE.version = "0.1.26"
------------------------------------------------------------------- -------------------------------------------------------------------
-- Begin Functional.Autolase.lua -- Begin Functional.Autolase.lua
@ -757,9 +757,11 @@ function AUTOLASE:ShowStatus(Group,Unit)
end end
local code = self:GetLaserCode(unit:GetName()) local code = self:GetLaserCode(unit:GetName())
report:Add(string.format("Recce %s has code %d",name,code)) report:Add(string.format("Recce %s has code %d",name,code))
report:Add("---------------")
end end
end end
report:Add(string.format("Lasing min threat level %d",self.minthreatlevel)) report:Add(string.format("Lasing min threat level %d",self.minthreatlevel))
report:Add("---------------")
local lines = 0 local lines = 0
for _ind,_entry in pairs(self.CurrentLasing) do for _ind,_entry in pairs(self.CurrentLasing) do
local entry = _entry -- #AUTOLASE.LaserSpot local entry = _entry -- #AUTOLASE.LaserSpot
@ -779,7 +781,7 @@ function AUTOLASE:ShowStatus(Group,Unit)
if playername then if playername then
local settings = _DATABASE:GetPlayerSettings(playername) local settings = _DATABASE:GetPlayerSettings(playername)
if settings then if settings then
self:I("Get Settings ok!") self:T("Get Settings ok!")
if settings:IsA2G_MGRS() then if settings:IsA2G_MGRS() then
locationstring = entry.coordinate:ToStringMGRS(settings) locationstring = entry.coordinate:ToStringMGRS(settings)
elseif settings:IsA2G_LL_DMS() then elseif settings:IsA2G_LL_DMS() then
@ -789,12 +791,14 @@ function AUTOLASE:ShowStatus(Group,Unit)
end end
end 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(text)
report:Add("---------------")
lines = lines + 1 lines = lines + 1
end end
if lines == 0 then if lines == 0 then
report:Add("No targets!") report:Add("No targets!")
report:Add("---------------")
end end
local reporttime = self.reporttimelong local reporttime = self.reporttimelong
if lines == 0 then reporttime = self.reporttimeshort end if lines == 0 then reporttime = self.reporttimeshort end

4
Moose Development/Moose/Ops/CTLD.lua
View File

@ -1351,7 +1351,7 @@ CTLD.UnitTypeCapabilities = {
--- CTLD class version. --- CTLD class version.
-- @field #string version -- @field #string version
CTLD.version="1.1.20" CTLD.version="1.1.21"
--- Instantiate a new CTLD. --- Instantiate a new CTLD.
-- @param #CTLD self -- @param #CTLD self
@ -3514,7 +3514,7 @@ function CTLD:_UnloadTroops(Group, Unit)
if IsHerc then offset = self.TroopUnloadDistGroundHerc or 25 end if IsHerc then offset = self.TroopUnloadDistGroundHerc or 25 end
if IsHook then if IsHook then
offset = self.TroopUnloadDistGroundHook or 15 offset = self.TroopUnloadDistGroundHook or 15
if self.TroopUnloadDistHoverHook then if hoverunload and self.TroopUnloadDistHoverHook then
offset = self.TroopUnloadDistHoverHook or 5 offset = self.TroopUnloadDistHoverHook or 5
end end
end end