diff --git a/Moose Development/Moose/Functional/Mantis.lua b/Moose Development/Moose/Functional/Mantis.lua index dc706f543..10086cda1 100644 --- a/Moose Development/Moose/Functional/Mantis.lua +++ b/Moose Development/Moose/Functional/Mantis.lua @@ -1727,9 +1727,9 @@ do IntelOne.DetectAccousticUnitTypes = self.DetectAccousticCategories or {Unit.Category.HELICOPTER} --IntelOne:SetClusterAnalysis(true,true,true) if self.usecorridors == true then - IntelOne:SetCorrdidorZones(self.corridorzones) + IntelOne:SetCorridorZones(self.corridorzones) if self.corridorfloor or self.corridorceiling then - IntelOne:SetCooridorLimits(self.corridorfloor,self.corridorceiling) + IntelOne:SetCorridorLimits(self.corridorfloor,self.corridorceiling) end end IntelOne:Start() @@ -1740,9 +1740,9 @@ do IntelTwo.DetectAccousticUnitTypes = self.DetectAccousticCategories or {Unit.Category.HELICOPTER} --IntelTwo:SetClusterAnalysis(true,true,true) if self.usecorridors == true then - IntelTwo:SetCorrdidorZones(self.corridorzones) + IntelTwo:SetCorridorZones(self.corridorzones) if self.corridorfloor or self.corridorceiling then - IntelTwo:SetCooridorLimits(self.corridorfloor,self.corridorceiling) + IntelTwo:SetCorridorLimits(self.corridorfloor,self.corridorceiling) end end IntelTwo:Start() diff --git a/Moose Development/Moose/Ops/EasyA2G.lua b/Moose Development/Moose/Ops/EasyA2G.lua index 2cc1cc8c1..5a5f05823 100644 --- a/Moose Development/Moose/Ops/EasyA2G.lua +++ b/Moose Development/Moose/Ops/EasyA2G.lua @@ -239,7 +239,7 @@ EASYA2G = { ManagedEWR = {}, ManagedREC = {}, MaxAliveMissions = 8, - debug = true, + debug = false, engagerange = 50, repeatsonfailure = 3, GoZoneSet = nil, diff --git a/Moose Development/Moose/Ops/Intelligence.lua b/Moose Development/Moose/Ops/Intelligence.lua index ee07fba91..278793f07 100644 --- a/Moose Development/Moose/Ops/Intelligence.lua +++ b/Moose Development/Moose/Ops/Intelligence.lua @@ -986,14 +986,18 @@ function INTEL:UpdateIntel() -- Check if unit is in any of the corridor zones. if self.corridorzoneset:Count()>0 then + self:T("Corridorzone Check for unit "..unit:GetName()) local inzone = false for _,_zone in pairs(self.corridorzoneset.Set) do local zone=_zone --Core.Zone#ZONE 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"):ToAllIf(self.verbose>1):ToLogIf(self.verbose>1) if unit:IsAir() and (self.corridorfloor ~= nil or self.corridorceiling ~= nil) then local alt = unit:GetAltitude() 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 else inzone=true