mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-18 21:25:58 +00:00
xx
This commit is contained in:
@@ -1727,9 +1727,9 @@ do
|
|||||||
IntelOne.DetectAccousticUnitTypes = self.DetectAccousticCategories or {Unit.Category.HELICOPTER}
|
IntelOne.DetectAccousticUnitTypes = self.DetectAccousticCategories or {Unit.Category.HELICOPTER}
|
||||||
--IntelOne:SetClusterAnalysis(true,true,true)
|
--IntelOne:SetClusterAnalysis(true,true,true)
|
||||||
if self.usecorridors == true then
|
if self.usecorridors == true then
|
||||||
IntelOne:SetCorrdidorZones(self.corridorzones)
|
IntelOne:SetCorridorZones(self.corridorzones)
|
||||||
if self.corridorfloor or self.corridorceiling then
|
if self.corridorfloor or self.corridorceiling then
|
||||||
IntelOne:SetCooridorLimits(self.corridorfloor,self.corridorceiling)
|
IntelOne:SetCorridorLimits(self.corridorfloor,self.corridorceiling)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
IntelOne:Start()
|
IntelOne:Start()
|
||||||
@@ -1740,9 +1740,9 @@ do
|
|||||||
IntelTwo.DetectAccousticUnitTypes = self.DetectAccousticCategories or {Unit.Category.HELICOPTER}
|
IntelTwo.DetectAccousticUnitTypes = self.DetectAccousticCategories or {Unit.Category.HELICOPTER}
|
||||||
--IntelTwo:SetClusterAnalysis(true,true,true)
|
--IntelTwo:SetClusterAnalysis(true,true,true)
|
||||||
if self.usecorridors == true then
|
if self.usecorridors == true then
|
||||||
IntelTwo:SetCorrdidorZones(self.corridorzones)
|
IntelTwo:SetCorridorZones(self.corridorzones)
|
||||||
if self.corridorfloor or self.corridorceiling then
|
if self.corridorfloor or self.corridorceiling then
|
||||||
IntelTwo:SetCooridorLimits(self.corridorfloor,self.corridorceiling)
|
IntelTwo:SetCorridorLimits(self.corridorfloor,self.corridorceiling)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
IntelTwo:Start()
|
IntelTwo:Start()
|
||||||
|
|||||||
@@ -239,7 +239,7 @@ EASYA2G = {
|
|||||||
ManagedEWR = {},
|
ManagedEWR = {},
|
||||||
ManagedREC = {},
|
ManagedREC = {},
|
||||||
MaxAliveMissions = 8,
|
MaxAliveMissions = 8,
|
||||||
debug = true,
|
debug = false,
|
||||||
engagerange = 50,
|
engagerange = 50,
|
||||||
repeatsonfailure = 3,
|
repeatsonfailure = 3,
|
||||||
GoZoneSet = nil,
|
GoZoneSet = nil,
|
||||||
|
|||||||
@@ -986,14 +986,18 @@ function INTEL:UpdateIntel()
|
|||||||
|
|
||||||
-- Check if unit is in any of the corridor zones.
|
-- Check if unit is in any of the corridor zones.
|
||||||
if self.corridorzoneset:Count()>0 then
|
if self.corridorzoneset:Count()>0 then
|
||||||
|
self:I("Corridorzone Check for unit "..unit:GetName())
|
||||||
local inzone = false
|
local inzone = false
|
||||||
for _,_zone in pairs(self.corridorzoneset.Set) do
|
for _,_zone in pairs(self.corridorzoneset.Set) do
|
||||||
local zone=_zone --Core.Zone#ZONE
|
local zone=_zone --Core.Zone#ZONE
|
||||||
if unit:IsInZone(zone) then
|
if unit:IsInZone(zone) then
|
||||||
|
local debugtext = "Corridorzone Check for unit "..unit:GetName().."\n"
|
||||||
|
debugtext = debugtext .. string.format("IsAir %s | Alt %dm | Floor %dm | Ceil %dm",tostring(unit:IsAir()),tonumber(unit:GetAltitude()),tonumber(self.corridorfloor),tonumber(self.corridorceiling))
|
||||||
|
MESSAGE:New(debugtext,15,"INTEL"):ToAll():ToLog()
|
||||||
if unit:IsAir() and (self.corridorfloor ~= nil or self.corridorceiling ~= nil) then
|
if unit:IsAir() and (self.corridorfloor ~= nil or self.corridorceiling ~= nil) then
|
||||||
local alt = unit:GetAltitude()
|
local alt = unit:GetAltitude()
|
||||||
if self.corridorfloor and alt > self.corridorfloor then inzone = true end
|
if self.corridorfloor and alt > self.corridorfloor then inzone = true end
|
||||||
if self.corridorceiling and alt < self.corridorceiling then inzone = true end
|
if self.corridorceiling and (inzone == true or self.corridorfloor == nil) and alt < self.corridorceiling then inzone = true else inzone = false end
|
||||||
if inzone == true then break end
|
if inzone == true then break end
|
||||||
else
|
else
|
||||||
inzone=true
|
inzone=true
|
||||||
|
|||||||
Reference in New Issue
Block a user