Merge branch 'FF/Ops' into FF/OpsDev

Moose Development/Moose/Core/Base.lua

@@ -34,6 +34,7 @@ local _TraceClassMethod = {}
 
 local _ClassID = 0
 
+---
 -- @type BASE
 -- @field ClassName The name of the class.
 -- @field ClassID The ID number of the class.

Moose Development/Moose/Core/Database.lua

@@ -31,7 +31,7 @@
 -- @module Core.Database
 -- @image Core_Database.JPG
 
-
+---
 -- @type DATABASE
 -- @field #string ClassName Name of the class.
 -- @field #table Templates Templates: Units, Groups, Statics, ClientsByName, ClientsByID.

Moose Development/Moose/Core/Set.lua

@@ -860,8 +860,10 @@ do -- SET_BASE
     self:F3( Object )
     local outcome = false
     local name = Object:GetName()
+    --self:I("SET_BASE: Objectname = "..name)
     self:ForEach(
       function(object)
+        --self:I("SET_BASE: In set objectname = "..object:GetName())
         if object:GetName() == name then
           outcome = true
         end
@@ -4330,7 +4332,6 @@ do -- SET_CLIENT
   function SET_CLIENT:FilterStart()
 
     if _DATABASE then
-      self:_FilterStart()
       self:HandleEvent( EVENTS.Birth, self._EventOnBirth )
       self:HandleEvent( EVENTS.Dead, self._EventOnDeadOrCrash )
       self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash )
@@ -4339,6 +4340,7 @@ do -- SET_CLIENT
         local timing = self.ZoneTimerInterval or 30
         self.ZoneTimer:Start(timing,timing)
       end
+      self:_FilterStart()
     end
 
     return self
@@ -4574,9 +4576,9 @@ do -- SET_CLIENT
     if self.Filter.Callsigns then
       local MClientCallsigns = false
       local callsign = MClient:GetCallsign()
-			--self:T(callsign)
+      --self:I(callsign)
       for _,_Callsign in pairs(self.Filter.Callsigns) do
-				if callsign and string.find(callsign,_Callsign) then
+        if callsign and string.find(callsign,_Callsign,1,true) then
           MClientCallsigns = true
         end
       end

Moose Development/Moose/Core/Spawn.lua

@@ -286,6 +286,7 @@ SPAWN.Takeoff = {
   Cold = 4,
 }
 
+---
 -- @type SPAWN.SpawnZoneTable
 -- @list <Core.Zone#ZONE_BASE> SpawnZone
 

Moose Development/Moose/Functional/Escort.lua

@@ -108,7 +108,7 @@
 -- @image Escorting.JPG
 
 
-
+---
 -- @type ESCORT
 -- @extends Core.Base#BASE
 -- @field Wrapper.Client#CLIENT EscortClient

Moose Development/Moose/Functional/MissileTrainer.lua

@@ -67,7 +67,7 @@
 -- @module Functional.MissileTrainer
 -- @image Missile_Trainer.JPG
 
-
+---
 -- @type MISSILETRAINER
 -- @field Core.Set#SET_CLIENT DBClients
 -- @extends Core.Base#BASE

Moose Development/Moose/Functional/Movement.lua

@@ -10,6 +10,7 @@
 -- @module Functional.Movement
 -- @image MOOSE.JPG
 
+---
 -- @type MOVEMENT
 -- @extends Core.Base#BASE
 

Moose Development/Moose/Ops/PlayerTask.lua

@@ -98,7 +98,7 @@ PLAYERTASK = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASK.version="0.1.19"
+PLAYERTASK.version="0.1.20"
 
 --- Generic task condition.
 -- @type PLAYERTASK.Condition
@@ -2195,7 +2195,8 @@ function PLAYERTASKCONTROLLER:_EventHandler(EventData)
     end
   elseif EventData.id == EVENTS.PlayerEnterAircraft and EventData.IniCoalition == self.Coalition then
     if EventData.IniPlayerName and EventData.IniGroup then
-      if self.IsClientSet and self.ClientSet:IsNotInSet(CLIENT:FindByName(EventData.IniUnitName)) then
+      --if self.IsClientSet and self.ClientSet:IsNotInSet(CLIENT:FindByName(EventData.IniUnitName)) then
+      if self.IsClientSet and (not self.ClientSet:IsIncludeObject(CLIENT:FindByName(EventData.IniUnitName))) then
         self:T(self.lid.."Client not in SET: "..EventData.IniPlayerName)
         return self
       end
@@ -4064,6 +4065,7 @@ function PLAYERTASKCONTROLLER:onafterStart(From, Event, To)
   self:HandleEvent(EVENTS.Crash, self._EventHandler)
   self:HandleEvent(EVENTS.PilotDead, self._EventHandler)
   self:HandleEvent(EVENTS.PlayerEnterAircraft, self._EventHandler)
+  self:SetEventPriority(5)          
   return self
 end
 

Moose Development/Moose/Utilities/Enums.lua

@@ -26,6 +26,10 @@
 -- @field #ENUMS
 ENUMS = {}
 
+--- Suppress the error box
+env.setErrorMessageBoxEnabled( false )
+
+
 --- Rules of Engagement.
 -- @type ENUMS.ROE
 -- @field #number WeaponFree [AIR] AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target.

Moose Development/Moose/Utilities/Utils.lua

@@ -12,7 +12,7 @@
 -- @module Utilities.Utils
 -- @image MOOSE.JPG
 
-
+---
 -- @type SMOKECOLOR
 -- @field Green
 -- @field Red
@@ -22,6 +22,7 @@
 
 SMOKECOLOR = trigger.smokeColor -- #SMOKECOLOR
 
+---
 -- @type FLARECOLOR
 -- @field Green
 -- @field Red

Moose Development/Moose/Wrapper/Controllable.lua

@@ -1790,24 +1790,8 @@ end
 -- @return DCS#Task The DCS task structure.
 function CONTROLLABLE:EnRouteTaskEngageGroup( AttackGroup, Priority, WeaponType, WeaponExpend, AttackQty, Direction, Altitude, AttackQtyLimit )
 
-  --  EngageControllable  = {
-  --   id = 'EngageControllable ',
-  --   params = {
-  --     groupId = Group.ID,
-  --     weaponType = number,
-  --     expend = enum AI.Task.WeaponExpend,
-  --     attackQty = number,
-  --     directionEnabled = boolean,
-  --     direction = Azimuth,
-  --     altitudeEnabled = boolean,
-  --     altitude = Distance,
-  --     attackQtyLimit = boolean,
-  --     priority = number,
-  --   }
-  -- }
-
   local DCSTask = {
-    id = 'EngageControllable',
+    id = 'EngageGroup',
     params = {
       groupId          = AttackGroup:GetID(),
       weaponType       = WeaponType,
@@ -1923,7 +1907,7 @@ end
 function CONTROLLABLE:EnRouteTaskFAC_EngageGroup( AttackGroup, Priority, WeaponType, Designation, Datalink, Frequency, Modulation, CallsignID, CallsignNumber )
 
   local DCSTask = {
-    id = 'FAC_EngageControllable',
+    id = 'FAC_EngageGroup',
     params = {
       groupId     = AttackGroup:GetID(),
       weaponType  = WeaponType or "Auto",