mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
ATIS - addede rainy presets 1-3
CTLD - avoid "preloading" when pilot leaves/crashes and rejoins CSAR - added option for autosmokedistance
This commit is contained in:
parent
4ba52212a9
commit
48aa841add
@ -1617,6 +1617,30 @@ function ATIS:onafterBroadcast(From, Event, To)
|
|||||||
-- Scattered 4
|
-- Scattered 4
|
||||||
clouddens=4
|
clouddens=4
|
||||||
elseif cloudspreset:find("RainyPreset") then
|
elseif cloudspreset:find("RainyPreset") then
|
||||||
|
-- Overcast + Rain
|
||||||
|
clouddens=9
|
||||||
|
if temperature>5 then
|
||||||
|
precepitation=1 -- rain
|
||||||
|
else
|
||||||
|
precepitation=3 -- snow
|
||||||
|
end
|
||||||
|
elseif cloudspreset:find("RainyPreset1") then
|
||||||
|
-- Overcast + Rain
|
||||||
|
clouddens=9
|
||||||
|
if temperature>5 then
|
||||||
|
precepitation=1 -- rain
|
||||||
|
else
|
||||||
|
precepitation=3 -- snow
|
||||||
|
end
|
||||||
|
elseif cloudspreset:find("RainyPreset2") then
|
||||||
|
-- Overcast + Rain
|
||||||
|
clouddens=9
|
||||||
|
if temperature>5 then
|
||||||
|
precepitation=1 -- rain
|
||||||
|
else
|
||||||
|
precepitation=3 -- snow
|
||||||
|
end
|
||||||
|
elseif cloudspreset:find("RainyPreset3") then
|
||||||
-- Overcast + Rain
|
-- Overcast + Rain
|
||||||
clouddens=9
|
clouddens=9
|
||||||
if temperature>5 then
|
if temperature>5 then
|
||||||
|
|||||||
@ -70,6 +70,7 @@
|
|||||||
-- self.allowDownedPilotCAcontrol = false -- Set to false if you don\'t want to allow control by Combined Arms.
|
-- self.allowDownedPilotCAcontrol = false -- Set to false if you don\'t want to allow control by Combined Arms.
|
||||||
-- self.allowFARPRescue = true -- allows pilots to be rescued by landing at a FARP or Airbase. Else MASH only!
|
-- self.allowFARPRescue = true -- allows pilots to be rescued by landing at a FARP or Airbase. Else MASH only!
|
||||||
-- self.autosmoke = false -- automatically smoke a downed pilot\'s location when a heli is near.
|
-- self.autosmoke = false -- automatically smoke a downed pilot\'s location when a heli is near.
|
||||||
|
-- self.autosmokedistance = 1000 -- distance for autosmoke
|
||||||
-- self.coordtype = 1 -- Use Lat/Long DDM (0), Lat/Long DMS (1), MGRS (2), Bullseye imperial (3) or Bullseye metric (4) for coordinates.
|
-- self.coordtype = 1 -- Use Lat/Long DDM (0), Lat/Long DMS (1), MGRS (2), Bullseye imperial (3) or Bullseye metric (4) for coordinates.
|
||||||
-- self.csarOncrash = false -- (WIP) If set to true, will generate a downed pilot when a plane crashes as well.
|
-- self.csarOncrash = false -- (WIP) If set to true, will generate a downed pilot when a plane crashes as well.
|
||||||
-- self.enableForAI = false -- set to false to disable AI pilots from being rescued.
|
-- self.enableForAI = false -- set to false to disable AI pilots from being rescued.
|
||||||
@ -240,7 +241,7 @@ CSAR.AircraftType["Mi-24V"] = 8
|
|||||||
|
|
||||||
--- CSAR class version.
|
--- CSAR class version.
|
||||||
-- @field #string version
|
-- @field #string version
|
||||||
CSAR.version="0.1.6r2"
|
CSAR.version="0.1.7r2"
|
||||||
|
|
||||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
-- ToDo list
|
-- ToDo list
|
||||||
@ -356,6 +357,7 @@ function CSAR:New(Coalition, Template, Alias)
|
|||||||
self.mashprefix = {"MASH"} -- prefixes used to find MASHes
|
self.mashprefix = {"MASH"} -- prefixes used to find MASHes
|
||||||
self.mash = SET_GROUP:New():FilterCoalitions(self.coalition):FilterPrefixes(self.mashprefix):FilterOnce() -- currently only GROUP objects, maybe support STATICs also?
|
self.mash = SET_GROUP:New():FilterCoalitions(self.coalition):FilterPrefixes(self.mashprefix):FilterOnce() -- currently only GROUP objects, maybe support STATICs also?
|
||||||
self.autosmoke = false -- automatically smoke location when heli is near
|
self.autosmoke = false -- automatically smoke location when heli is near
|
||||||
|
self.autosmokedistance = 1000 -- distance for autosmoke
|
||||||
-- added 0.1.4
|
-- added 0.1.4
|
||||||
self.limitmaxdownedpilots = true
|
self.limitmaxdownedpilots = true
|
||||||
self.maxdownedpilots = 25
|
self.maxdownedpilots = 25
|
||||||
@ -987,7 +989,7 @@ function CSAR:_CheckWoundedGroupStatus(heliname,woundedgroupname)
|
|||||||
_downedpilot.timestamp = timer.getAbsTime()
|
_downedpilot.timestamp = timer.getAbsTime()
|
||||||
self:__Approach(-5,heliname,woundedgroupname)
|
self:__Approach(-5,heliname,woundedgroupname)
|
||||||
end
|
end
|
||||||
else
|
elseif _distance >= 3000 and _distance < 5000 then
|
||||||
self.heliVisibleMessage[_lookupKeyHeli] = nil
|
self.heliVisibleMessage[_lookupKeyHeli] = nil
|
||||||
--reschedule as units aren\'t dead yet , schedule for a bit slower though as we\'re far away
|
--reschedule as units aren\'t dead yet , schedule for a bit slower though as we\'re far away
|
||||||
_downedpilot.timestamp = timer.getAbsTime()
|
_downedpilot.timestamp = timer.getAbsTime()
|
||||||
@ -1103,7 +1105,7 @@ function CSAR:_CheckCloseWoundedGroup(_distance, _heliUnit, _heliName, _woundedG
|
|||||||
|
|
||||||
local _reset = true
|
local _reset = true
|
||||||
|
|
||||||
if (self.autosmoke == true) and (_distance < 500) then
|
if (self.autosmoke == true) and (_distance < self.autosmokedistance) then
|
||||||
self:_PopSmokeForGroup(_woundedGroupName, _woundedLeader)
|
self:_PopSmokeForGroup(_woundedGroupName, _woundedLeader)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user