From 2c61c695d5942e59623050e033818e624918ff13 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Mon, 9 May 2022 08:41:33 +0200
Subject: [PATCH] Update Chief.lua

- Added target in zone check to abort missions
---
 Moose Development/Moose/Ops/Chief.lua | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/Moose Development/Moose/Ops/Chief.lua b/Moose Development/Moose/Ops/Chief.lua
index bdbb9da57..ce5d5a65c 100644
--- a/Moose Development/Moose/Ops/Chief.lua	
+++ b/Moose Development/Moose/Ops/Chief.lua	
@@ -1510,6 +1510,8 @@ function CHIEF:onafterStatus(From, Event, To)
 
   end
   
+  
+  
   ---
   -- Defcon
   ---
@@ -1530,6 +1532,58 @@ function CHIEF:onafterStatus(From, Event, To)
   -- Check target queue and assign missions to new targets.
   self:CheckTargetQueue()
   
+  -- Loop over targets.
+  for _,_target in pairs(self.targetqueue) do
+    local target=_target --Ops.Target#TARGET
+    
+    if target and target:IsAlive() and target.mission and target.mission:IsNotOver() then
+    
+      local inborder=self:CheckTargetInZones(target, self.borderzoneset)
+      
+      local inyellow=self:CheckTargetInZones(target, self.yellowzoneset)
+      
+      local inattack=self:CheckTargetInZones(target, self.engagezoneset)
+      
+      if self.strategy==CHIEF.Strategy.PASSIVE then
+      
+        -- Passive: No targets are engaged at all.
+        self:T(self.lid..string.format("Cancelling mission for target %s as strategy is PASSIVE", target:GetName()))
+        target.mission:Cancel()
+        
+      elseif self.strategy==CHIEF.Strategy.DEFENSIVE then
+      
+        -- Defensive: Cancel if not in border.
+        if not inborder then
+          self:T(self.lid..string.format("Cancelling mission for target %s as strategy is DEFENSIVE and not inside border", target:GetName()))
+          target.mission:Cancel()
+        end
+      
+      elseif self.strategy==CHIEF.Strategy.OFFENSIVE then
+
+        -- Offensive: Cancel if not in border or conflict.
+        if not (inborder or inyellow) then
+          self:T(self.lid..string.format("Cancelling mission for target %s as strategy is OFFENSIVE and not inside border or conflict", target:GetName()))
+          target.mission:Cancel()
+        end
+      
+      elseif self.strategy==CHIEF.Strategy.AGGRESSIVE then
+
+        -- Aggessive: Cancel if not in border, conflict or attack.
+        if not (inborder or inyellow or inattack) then
+          self:T(self.lid..string.format("Cancelling mission for target %s as strategy is AGGRESSIVE and not inside border, conflict or attack", target:GetName()))
+          target.mission:Cancel()
+        end
+      
+      elseif self.strategy==CHIEF.Strategy.TOTALWAR then
+        
+        -- Total War: No missions are cancelled.
+        
+      end
+    
+    end
+    
+  end  
+  
   ---
   -- Check Strategic Zone Queue
   ---