From b8d44643c1e2b87f0af3cf29fb4178973d63d5da Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:49:00 +0100 Subject: [PATCH 1/2] Update Detection.lua (#2063) (#2064) # RadarBlur - make burn-through limit configureable --- Moose Development/Moose/Functional/Detection.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index 1acd82ad2..a71e194ed 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -721,7 +721,7 @@ do -- DETECTION_BASE end end - -- Calculate radar blue probability + -- Calculate radar blur probability if self.RadarBlur then MESSAGE:New("Radar Blur",10):ToLogIf(self.debug):ToAllIf(self.verbose) @@ -729,9 +729,9 @@ do -- DETECTION_BASE local thresheight = self.RadarBlurThresHeight or 90 -- 10% chance to find a low flying group local thresblur = self.RadarBlurThresBlur or 85 -- 25% chance to escape the radar overall local dist = math.floor(Distance) - if dist <= 20 then - thresheight = (((dist*dist)/400)*thresheight) - thresblur = (((dist*dist)/400)*thresblur) + if dist <= self.RadarBlurClosing then + thresheight = (((dist*dist)/self.RadarBlurClosingSquare)*thresheight) + thresblur = (((dist*dist)/self.RadarBlurClosingSquare)*thresblur) end local fheight = math.floor(math.random(1,10000)/100) local fblur = math.floor(math.random(1,10000)/100) @@ -1051,12 +1051,15 @@ do -- DETECTION_BASE -- @param #number minheight Minimum flight height to be detected, in meters AGL (above ground) -- @param #number thresheight Threshold to escape the radar if flying below minheight, defaults to 90 (90% escape chance) -- @param #number thresblur Threshold to be detected by the radar overall, defaults to 85 (85% chance to be found) + -- @param #number closing Closing-in in km - the limit of km from which on it becomes increasingly difficult to escape radar detection if flying towards the radar position. Should be about 1/3 of the radar detection radius in kilometers, defaults to 20. -- @return #DETECTION_BASE self - function DETECTION_BASE:SetRadarBlur(minheight,thresheight,thresblur) + function DETECTION_BASE:SetRadarBlur(minheight,thresheight,thresblur,closing) self.RadarBlur = true self.RadarBlurMinHeight = minheight or 250 -- meters self.RadarBlurThresHeight = thresheight or 90 -- 10% chance to find a low flying group self.RadarBlurThresBlur = thresblur or 85 -- 25% chance to escape the radar overall + self.RadarBlurClosing = closing or 20 -- 20km + self.RadarBlurClosingSquare = self.RadarBlurClosing * self.RadarBlurClosing return self end From cd4fb0c6c5723deceba69dfb26826508bfca35de Mon Sep 17 00:00:00 2001 From: ttrebuchon Date: Mon, 11 Dec 2023 05:50:09 -0500 Subject: [PATCH 2/2] Add missing files to Moose.files: (#2062) Utilities/Socket.lua Core/Astar.lua Core/MarkerOps_Base.lua Functional/ZoneGoalCargo.lua Ops/OpsZone.lua Ops/ArmyGroup.lua Ops/OpsTransport.lua Ops/Target.lua --- Moose Setup/Moose.files | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Moose Setup/Moose.files b/Moose Setup/Moose.files index eb513c320..90a6e761d 100644 --- a/Moose Setup/Moose.files +++ b/Moose Setup/Moose.files @@ -5,6 +5,7 @@ Utilities/Profiler.lua Utilities/Templates.lua Utilities/STTS.lua Utilities/FiFo.lua +Utilities/Socket.lua Core/Base.lua Core/Beacon.lua @@ -32,6 +33,8 @@ Core/TextAndSound.lua Core/Condition.lua Core/Pathline.lua Core/ClientMenu.lua +Core/Astar.lua +Core/MarkerOps_Base.lua Wrapper/Object.lua Wrapper/Identifiable.lua @@ -79,6 +82,7 @@ Functional/Shorad.lua Functional/Autolase.lua Functional/AICSAR.lua Functional/AmmoTruck.lua +Functional/ZoneGoalCargo.lua Ops/Airboss.lua Ops/RecoveryTanker.lua @@ -107,6 +111,10 @@ Ops/FlightControl.lua Ops/PlayerTask.lua Ops/PlayerRecce.lua Ops/EasyGCICAP.lua +Ops/OpsZone.lua +Ops/ArmyGroup.lua +Ops/OpsTransport.lua +Ops/Target.lua AI/AI_Balancer.lua AI/AI_Air.lua