From 0f4b3e0d884c5d73ff61a0b72c9c1b8caf42e36e Mon Sep 17 00:00:00 2001 From: Mongrelf Date: Thu, 21 Dec 2017 14:18:33 -0700 Subject: [PATCH 1/3] AI_A2A_Dispatcher:CountCAPAirborne Added additional condition check for state = "Starting" --- Moose Development/Moose/AI/AI_A2A_Dispatcher.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index a99003115..5571ea4d9 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -2504,7 +2504,8 @@ do -- AI_A2A_DISPATCHER if AIGroup:IsAlive() then -- Check if the CAP is patrolling or engaging. If not, this is not a valid CAP, even if it is alive! -- The CAP could be damaged, lost control, or out of fuel! - if DefenderTask.Fsm:Is( "Patrolling" ) or DefenderTask.Fsm:Is( "Engaging" ) or DefenderTask.Fsm:Is( "Refuelling" )then + if DefenderTask.Fsm:Is( "Patrolling" ) or DefenderTask.Fsm:Is( "Engaging" ) or DefenderTask.Fsm:Is( "Refuelling" ) + or DefenderTask.Fsm:Is( "Starting" ) then CapCount = CapCount + 1 end end From 030bd92148043573a0965424064f95a011fb6280 Mon Sep 17 00:00:00 2001 From: Mongrelf Date: Thu, 21 Dec 2017 14:33:09 -0700 Subject: [PATCH 2/3] AcceptZones Change Added higher level variable to hold detection state across multiple AcceptZones. --- Moose Development/Moose/Functional/Detection.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index 2d19364f5..d696bf3d9 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -617,12 +617,16 @@ do -- DETECTION_BASE end if self.AcceptZones then + local AnyZoneDetection = false for AcceptZoneID, AcceptZone in pairs( self.AcceptZones ) do local AcceptZone = AcceptZone -- Core.Zone#ZONE_BASE - if AcceptZone:IsVec2InZone( DetectedObjectVec2 ) == false then - DetectionAccepted = false + if AcceptZone:IsVec2InZone( DetectedObjectVec2 ) then + AnyZoneDetection = true end end + if not AnyZoneDetection then + DetectionAccepted = false + end end if self.RejectZones then From 7b0c0a0c8b214619ce399ebac2b2139b59f83fda Mon Sep 17 00:00:00 2001 From: Mongrelf Date: Thu, 21 Dec 2017 15:34:02 -0700 Subject: [PATCH 3/3] Changing Condition Check Starting to Started Had Starting as the additional condition check but should be 'Started' --- Moose Development/Moose/AI/AI_A2A_Dispatcher.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index 5571ea4d9..076aa20a8 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -2505,7 +2505,7 @@ do -- AI_A2A_DISPATCHER -- Check if the CAP is patrolling or engaging. If not, this is not a valid CAP, even if it is alive! -- The CAP could be damaged, lost control, or out of fuel! if DefenderTask.Fsm:Is( "Patrolling" ) or DefenderTask.Fsm:Is( "Engaging" ) or DefenderTask.Fsm:Is( "Refuelling" ) - or DefenderTask.Fsm:Is( "Starting" ) then + or DefenderTask.Fsm:Is( "Started" ) then CapCount = CapCount + 1 end end