Merge branch 'develop' into FF/Ops

Moose Development/Moose/Ops/Airboss.lua

@@ -10180,6 +10180,28 @@ function AIRBOSS:_GetSternCoord()
   return self.sterncoord
 end
 
+--- Get wire from draw argument.
+-- @param #AIRBOSS self
+-- @param Core.Point#COORDINATE Lcoord Landing position.
+-- @return #number Trapped wire (1-4) or 99 if no wire was trapped.
+function AIRBOSS:_GetWireFromDrawArg()
+
+  local wireArgs={}
+  wireArgs[1]=141
+  wireArgs[2]=142
+  wireArgs[3]=143
+  wireArgs[4]=144
+
+  for wire,drawArg in pairs(wireArgs) do
+    local value=self.carrier:GetDrawArgumentValue(drawArg)
+    if math.abs(value)>0.001 then
+      return wire
+    end
+  end
+
+  return 99
+end
+
 --- Get wire from landing position.
 -- @param #AIRBOSS self
 -- @param Core.Point#COORDINATE Lcoord Landing position.

Moose Development/Moose/Ops/PlayerTask.lua

@@ -96,7 +96,7 @@ PLAYERTASK = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASK.version="0.1.12"
+PLAYERTASK.version="0.1.14"
 
 --- Generic task condition.
 -- @type PLAYERTASK.Condition
@@ -3526,6 +3526,23 @@ function PLAYERTASKCONTROLLER:AddAgent(Recce)
   return self
 end
 
+--- [User] Add agent SET_GROUP to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+-- @param #PLAYERTASKCONTROLLER self
+-- @param Core.Set#SET_GROUP RecceSet SET_GROUP of agents.
+-- @return #PLAYERTASKCONTROLLER self
+function PLAYERTASKCONTROLLER:AddAgentSet(RecceSet)
+  self:T(self.lid.."AddAgentSet")
+  if self.Intel then
+    local Set = RecceSet:GetAliveSet()
+    for _,_Recce in pairs(Set) do
+      self.Intel:AddAgent(_Recce)
+    end
+  else
+    self:E(self.lid.."*****NO detection has been set up (yet)!")
+  end
+  return self
+end
+
 --- [User] Set up detection of STATIC objects. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
 -- @param #boolean OnOff Set to `true`for on and `false`for off.