Merge pull request #3 from FlightControl-Master/develop

Develop

Moose Development/Moose/Functional/Sead.lua

@@ -245,28 +245,12 @@ function SEAD:OnEventShot( EventData )
 					ctrl = _targetMimcont
 					}
 
-					local delay1 = math.random(self.TargetSkill[_targetskill].DelayOff[1], self.TargetSkill[_targetskill].DelayOff[2])
-
-					if SuppressedGroups1[id.groupName] == nil then
-
-						SuppressedGroups1[id.groupName] = {
-							SuppressionEndTime1 = timer.getTime() + delay1,
-							SuppressionEndN1 = SuppressionEndCounter1	--Store instance of SuppressionEnd() scheduled function
-						}
-
-						Controller.setOption(_targetMimcont, AI.Option.Ground.id.ALARM_STATE,AI.Option.Ground.val.ALARM_STATE.GREEN)
-						timer.scheduleFunction(SuppressionEnd1, id, SuppressedGroups1[id.groupName].SuppressionEndTime1)	--Schedule the SuppressionEnd() function
-						--trigger.action.outText( string.format("Radar Off " ..string.format(delay1)), 20)
-					end
-
-					local SuppressedGroups = {}
-
-					local function SuppressionEnd(id)
+					local function SuppressionEnd(id) --switch group back on
 					 local range = self.EngagementRange -- Feature Request #1355
-					  --env.info(string.format("*** SEAD - Engagement Range is %d", range))
+					  self:T(string.format("*** SEAD - Engagement Range is %d", range))
 						id.ctrl:setOption(AI.Option.Ground.id.ALARM_STATE,AI.Option.Ground.val.ALARM_STATE.RED)
 						id.ctrl:setOption(AI.Option.Ground.id.AC_ENGAGEMENT_RANGE_RESTRICTION,range) --Feature Request #1355
-						SuppressedGroups[id.groupName] = nil
+						self.SuppressedGroups[id.groupName] = nil  --delete group id from table when done
 					end
 					-- randomize switch-on time
 					local delay = math.random(self.TargetSkill[_targetskill].DelayOn[1], self.TargetSkill[_targetskill].DelayOn[2])

Moose Development/Moose/Ops/Intelligence.lua

@@ -1,8 +1,11 @@
 --- **Ops** - Office of Military Intelligence.
 --
--- **Main Features:**
+-- ## Main Features:
 --
---    * Stuff
+--    * Detect and track contacts consistently
+--    * Detect and track clusters of contacts consistently
+--    * Use FSM events to link functionality into your scripts
+--    * Easy setup  
 --
 -- ===
 --
@@ -42,7 +45,40 @@
 --
 -- # The INTEL Concept
 -- 
+--  * Lightweight replacement for @{Functional.Detection#DETECTION}
+--  * Detect and track contacts consistently
+--  * Detect and track clusters of contacts consistently
+--  * Once detected and still alive, planes will be tracked 10 minutes, helicopters 20 minutes, ships and trains 1 hour, ground units 2 hours
+--  * Use FSM events to link functionality into your scripts
 -- 
+-- # Basic Usage 
+--
+--  ## set up a detection SET_GROUP  
+--  
+--  `Red_DetectionSetGroup = SET_GROUP:New()`  
+--  `Red_DetectionSetGroup:FilterPrefixes( { "Red EWR" } )`  
+--  `Red_DetectionSetGroup:FilterOnce()`  
+--  
+--  ## New Intel type detection for the red side, logname "KGB"    
+--  
+--  `RedIntel = INTEL:New(Red_DetectionSetGroup,"red","KGB")`  
+--  `RedIntel:SetClusterAnalysis(true,true)`  
+--  `RedIntel:SetVerbosity(2)`  
+--  `RedIntel:Start()`  
+--  
+--  ## Hook into new contacts found  
+--  
+--  `function RedIntel:OnAfterNewContact(From, Event, To, Contact)`  
+--        `local text = string.format("NEW contact %s detected by %s", Contact.groupname, Contact.recce or "unknown")`  
+--        `local m = MESSAGE:New(text,15,"KGB"):ToAll()`  
+-- `end`  
+-- 
+--  ## And/or new clusters found  
+--  
+-- `function RedIntel:OnAfterNewCluster(From, Event, To, Contact, Cluster)`  
+--        `local text = string.format("NEW cluster %d size %d with contact %s", Cluster.index, Cluster.size, Contact.groupname)`  
+--        `local m = MESSAGE:New(text,15,"KGB"):ToAll()`  
+-- `end`   
 -- 
 -- @field #INTEL
 INTEL = {
@@ -57,7 +93,7 @@ INTEL = {
   ContactsUnknown =    {},
   Clusters        =    {},
   clustercounter  =     1,
-  clusterradius   =   15,
+  clusterradius   =   10,
 }
 
 --- Detected item info.
@@ -314,7 +350,7 @@ function INTEL:RemoveRejectZone(RejectZone)
   return self
 end
 
---- Set forget contacts time interval. 
+--- Set forget contacts time interval. For unknown contacts only.
 -- Previously known contacts that are not detected any more, are "lost" after this time.
 -- This avoids fast oscillations between a contact being detected and undetected.
 -- @param #INTEL self
@@ -429,7 +465,7 @@ end
 -- @param #number radius The radius of the clusters
 -- @return #INTEL self
 function INTEL:SetClusterRadius(radius)
-  local radius = radius or 15
+  local radius = radius or 10
   self.clusterradius = radius
   return self
 end
@@ -1046,7 +1082,7 @@ function INTEL:CalcClusterThreatlevelSum(cluster)
     threatlevel=threatlevel+contact.threatlevel
     
   end
-
+  cluster.threatlevelSum = threatlevel  
   return threatlevel
 end
 
@@ -1058,7 +1094,7 @@ function INTEL:CalcClusterThreatlevelAverage(cluster)
 
   local threatlevel=self:CalcClusterThreatlevelSum(cluster)  
   threatlevel=threatlevel/cluster.size
-  
+  cluster.threatlevelAve = threatlevel 
   return threatlevel
 end
 
@@ -1078,7 +1114,7 @@ function INTEL:CalcClusterThreatlevelMax(cluster)
     end
     
   end
-
+  cluster.threatlevelMax = threatlevel 
   return threatlevel
 end
 
@@ -1119,7 +1155,7 @@ function INTEL:IsContactConnectedToCluster(contact, cluster)
       --local dist=Contact.position:Get2DDistance(contact.position)
       local dist=Contact.position:DistanceFromPointVec2(contact.position)
       
-      local radius = self.clusterradius or 15
+      local radius = self.clusterradius or 10
       if dist<radius*1000 then
         return true
       end

Moose Development/Moose/Wrapper/Controllable.lua

@@ -3687,3 +3687,57 @@ function CONTROLLABLE:OptionAAAttackRange(range)
   end
   return nil
 end
+
+--- Defines the range at which a GROUND unit/group is allowed to use its weapons automatically.
+-- @param #CONTROLLABLE self
+-- @param #number EngageRange Engage range limit in percent (a number between 0 and 100). Default 100.
+-- @return #CONTROLLABLE self
+function CONTROLLABLE:OptionEngageRange(EngageRange)
+  self:F2( { self.ControllableName } ) 
+  -- Set default if not specified.
+  EngageRange=EngageRange or 100
+  if EngageRange < 0  or EngageRange > 100 then
+    EngageRange = 100
+  end
+  local DCSControllable = self:GetDCSObject()
+  if DCSControllable then
+    local Controller = self:_GetController()
+    if Controller then 
+     if self:IsGround() then
+        self:SetOption(AI.Option.Ground.id.AC_ENGAGEMENT_RANGE_RESTRICTION, EngageRange)     
+     end
+    end
+   return self
+  end
+  return nil
+end
+
+--- (GROUND) Relocate controllable to a random point within a given radius; use e.g.for evasive actions; Note that not all ground controllables can actually drive, also the alarm state of the controllable might stop it from moving.
+-- @param #CONTROLLABLE self
+-- @param  #number speed Speed of the controllable, default 20
+-- @param  #number radius Radius of the relocation zone, default 500
+-- @param  #boolean onroad If true, route on road (less problems with AI way finding), default true
+-- @param  #boolean shortcut If true and onroad is set, take a shorter route - if available - off road, default false
+function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortcut)
+  self:F2( { self.ControllableName } ) 
+
+    local _coord = self:GetCoordinate() 
+    local _radius = radius or 500
+    local _speed = speed or 20
+    local _tocoord = _coord:GetRandomCoordinateInRadius(_radius,100)
+    local _onroad = onroad or true
+    local _grptsk = {}
+    local _candoroad = false
+    local _shortcut = shortcut or false
+    
+    -- create a DCS Task an push it on the group
+    -- TaskGroundOnRoad(ToCoordinate,Speed,OffRoadFormation,Shortcut,FromCoordinate,WaypointFunction,WaypointFunctionArguments)
+    if onroad then
+      _grptsk, _candoroad = self:TaskGroundOnRoad(_tocoord,_speed,"Off Road",_shortcut)
+      self:Route(_grptsk,5)
+    else
+      self:TaskRouteToVec2(_tocoord:GetVec2(),_speed,"Off Road")
+    end
+
+  return self    
+end