Got something working now

Moose/Client.lua

@@ -12,7 +12,7 @@ Include.File( "Message" )
 
 --- The CLIENT class
 -- @type CLIENT
--- @extends Base#BASE
+-- @extends Unit#UNIT
 CLIENT = {
 	ONBOARDSIDE = {
 		NONE = 0,
@@ -48,7 +48,7 @@ CLIENT = {
 --	Mission:AddClient( CLIENT:New( 'RU MI-8MTV2*HOT-Deploy Troops 2' ):Transport() )
 --	Mission:AddClient( CLIENT:New( 'RU MI-8MTV2*RAMP-Deploy Troops 4' ):Transport() )
 function CLIENT:New( ClientName, ClientBriefing )
-	local self = BASE:Inherit( self, BASE:New() )
+	local self = BASE:Inherit( self, UNIT:New( Unit.getByName( ClientName ) ) )
 	self:F( ClientName, ClientBriefing )
 
   self.ClientName = ClientName

Moose/MissileTrainer.lua

@@ -37,14 +37,34 @@ function MISSILETRAINER:New( Distance )
 	
 	for ClientID, Client in pairs( self.DBClients ) do
      Client:Message( "Welcome to the Missile Trainer", 10, "ID", "TEST" )
+     
      Client.MainMenu = MENU_CLIENT:New( Client, "Missile Trainer", nil )
+     
      Client.MenuMessages = MENU_CLIENT:New( Client, "Messages", Client.MainMenu )
      Client.MenuOn = MENU_CLIENT_COMMAND:New( Client, "Messages On", Client.MenuMessages, self._MenuMessages, { MenuSelf = self, MessagesOnOff = true } )
      Client.MenuOff = MENU_CLIENT_COMMAND:New( Client, "Messages Off", Client.MenuMessages, self._MenuMessages, { MenuSelf = self, MessagesOnOff = false } )
-     Client.MenuToAll = MENU_CLIENT_COMMAND:New( Client, "To All", Client.MenuMessages, self._MenuMessages, { MenuSelf = self, MessagesToAll = true } )
-     Client.MenuToTarget = MENU_CLIENT_COMMAND:New( Client, "To Target", Client.MenuMessages, self._MenuMessages, { MenuSelf = self, MessagesToAll = false } )
-     Client.MenuTrackOn = MENU_CLIENT_COMMAND:New( Client, "Tracking On", Client.MenuMessages, self._MenuMessages, { MenuSelf = self, MessagesTrack = true } )
-     Client.MenuTrackOff = MENU_CLIENT_COMMAND:New( Client, "Tracking Off", Client.MenuMessages, self._MenuMessages, { MenuSelf = self, MessagesTrack = false } )
+     
+     Client.MenuTracking = MENU_CLIENT:New( Client, "Tracking", Client.MainMenu )
+     Client.MenuTrackingToAll = MENU_CLIENT_COMMAND:New( Client, "To All", Client.MenuTracking, self._MenuMessages, { MenuSelf = self, TrackingToAll = true } )
+     Client.MenuTrackingToTarget = MENU_CLIENT_COMMAND:New( Client, "To Target", Client.MenuTracking, self._MenuMessages, { MenuSelf = self, TrackingToAll = false } )
+     Client.MenuTrackOn = MENU_CLIENT_COMMAND:New( Client, "Tracking On", Client.MenuTracking, self._MenuMessages, { MenuSelf = self, Tracking = true } )
+     Client.MenuTrackOff = MENU_CLIENT_COMMAND:New( Client, "Tracking Off", Client.MenuTracking, self._MenuMessages, { MenuSelf = self, Tracking = false } )
+     
+     Client.MenuAlerts = MENU_CLIENT:New( Client, "Alerts", Client.MainMenu )
+     Client.MenuAlertsToAll = MENU_CLIENT_COMMAND:New( Client, "To All", Client.MenuAlerts, self._MenuMessages, { MenuSelf = self, AlertsToAll = true } )
+     Client.MenuAlertsToTarget = MENU_CLIENT_COMMAND:New( Client, "To Target", Client.MenuAlerts, self._MenuMessages, { MenuSelf = self, AlertsToAll = false } )
+     Client.MenuHitsOn = MENU_CLIENT_COMMAND:New( Client, "Hits On", Client.MenuAlerts, self._MenuMessages, { MenuSelf = self, AlertsHits = true } )
+     Client.MenuHitsOff = MENU_CLIENT_COMMAND:New( Client, "Hits Off", Client.MenuAlerts, self._MenuMessages, { MenuSelf = self, AlertsHits = false } )
+     Client.MenuLaunchesOn = MENU_CLIENT_COMMAND:New( Client, "Launches On", Client.MenuAlerts, self._MenuMessages, { MenuSelf = self, AlertsLaunches = true } )
+     Client.MenuLaunchesOff = MENU_CLIENT_COMMAND:New( Client, "Launches Off", Client.MenuAlerts, self._MenuMessages, { MenuSelf = self, AlertsLaunches = false } )
+     
+     Client.MenuDetails = MENU_CLIENT:New( Client, "Details", Client.MainMenu )
+     Client.MenuDetailsDistanceOn = MENU_CLIENT_COMMAND:New( Client, "Range On", Client.MenuDetails, self._MenuMessages, { MenuSelf = self, DetailsRange = true } )
+     Client.MenuDetailsDistanceOff = MENU_CLIENT_COMMAND:New( Client, "Range Off", Client.MenuDetails, self._MenuMessages, { MenuSelf = self, DetailsRange = false } )
+     Client.MenuDetailsBearingOn = MENU_CLIENT_COMMAND:New( Client, "Bearing On", Client.MenuDetails, self._MenuMessages, { MenuSelf = self, DetailsBearing = true } )
+     Client.MenuDetailsBearingOff = MENU_CLIENT_COMMAND:New( Client, "Bearing Off", Client.MenuDetails, self._MenuMessages, { MenuSelf = self, DetailsBearing = false } )
+     
+     
 	end
 --	self.DB:ForEachClient( 
 --	 --- @param Client#CLIENT Client
@@ -54,9 +74,21 @@ function MISSILETRAINER:New( Distance )
 --	)
 	
 	self.MessagesOnOff = true
-  self.MessagesToAll = false
-  self.MessagesTrack = true
-	
+
+  self.TrackingToAll = false
+  self.Tracking = true
+
+  self.AlertsToAll = true
+  self.AlertsHits = true
+  self.AlertsLaunches = true
+
+  self.DetailsRange = true
+  self.DetailsBearing = true
+  
+  self.TrackingMissiles = {}
+  
+	self.TrackingScheduler = SCHEDULER:New( self, self._TrackMissiles, {}, 0.5, 0.05, 0 )
+	  
 	return self
 end
 
@@ -68,18 +100,39 @@ function MISSILETRAINER:_MenuMessages( MenuParameters )
     self.MessagesOnOff = MenuParameters.MessagesOnOff
   end
   
-  if MenuParameters.MessagesToAll then
-    self.MessagesToAll = MenuParameters.MessagesToAll
+  if MenuParameters.TrackingToAll then
+    self.TrackingToAll = MenuParameters.TrackingToAll
   end
   
-  if MenuParameters.MessagesTrack then
-    self.MessagesTrack = MenuParameters.MessagesTrack
+  if MenuParameters.Tracking then
+    self.Tracking = MenuParameters.Tracking
+  end
+
+  if MenuParameters.AlertsToAll then
+    self.AlertsToAll = MenuParameters.AlertsToAll
+  end
+
+  if MenuParameters.AlertsHits then
+    self.AlertsHits = MenuParameters.AlertsHits
+  end
+  
+  if MenuParameters.AlertsLaunches then
+    self.AlertsLaunches = MenuParameters.AlertsLaunches
+  end
+  
+  if MenuParameters.DetailsRange then
+    self.DetailsRange = MenuParameters.DetailsRange
+  end
+  
+  if MenuParameters.DetailsBearing then
+    self.DetailsBearing = MenuParameters.DetailsBearing
   end
   
 end
 
 --- Detects if an SA site was shot with an anti radiation missile. In this case, take evasive actions based on the skill level set within the ME.
--- @see MISSILETRAINER
+-- @param #MISSILETRAINER self
+-- @param Event#EVENTDATA Event
 function MISSILETRAINER:_EventShot( Event )
 	self:F( { Event } )
 
@@ -96,68 +149,177 @@ function MISSILETRAINER:_EventShot( Event )
 	local TrainerTargetDCSGroupName = TrainerTargetDCSGroup:getName()
 	local TrainerTargetSkill =  _DATABASE.Templates.Units[TrainerTargetDCSUnitName].Template.skill
 
-	self:T( TrainerTargetSkill )
 	
 	local Client = self.DBClients[TrainerTargetDCSUnitName]
 	if Client then
+
 	  local TrainerSourceUnit = UNIT:New(TrainerSourceDCSUnit)
     local TrainerTargetUnit = UNIT:New(TrainerTargetDCSUnit)
-	  self.Schedulers[#self.Schedulers+1] = SCHEDULER:New( self, self._FollowMissile, { TrainerSourceUnit, TrainerWeapon, TrainerTargetUnit, Client }, 0.5, 0.05, 0 )  
+
+    if self.MessagesOnOff and self.AlertsLaunches then
+  
+      local Message = MESSAGE:New( 
+        string.format( "%s launched a %s", 
+          TrainerSourceUnit:GetTypeName(), 
+          TrainerWeaponName 
+        ) .. self:AddRange( Client, TrainerWeapon ) .. self:AddBearing( Client, TrainerWeapon ),"Launch", 5, "ID" )  
+  
+      if self.AlertsToAll then
+        Message:ToAll()
+      else
+        Message:ToClient( Client )
+      end
+    end
+    
+    local ClientID = Client:GetID()
+    self:T( ClientID )
+    if not self.TrackingMissiles[ClientID] then
+      self.TrackingMissiles[ClientID] = {}
+    end
+    self.TrackingMissiles[ClientID].Client = Client
+    if not self.TrackingMissiles[ClientID].MissileData then
+      self.TrackingMissiles[ClientID].MissileData = {}
+    end
+    local MissileData = {}
+    MissileData.TrainerSourceUnit = TrainerSourceUnit
+    MissileData.TrainerWeapon = TrainerWeapon
+    MissileData.TrainerTargetUnit = TrainerTargetUnit
+    table.insert( self.TrackingMissiles[ClientID].MissileData, MissileData )
+    --self:T( self.TrackingMissiles )
 	end
 end
 
+function MISSILETRAINER:AddRange( Client, TrainerWeapon )
+
+  local RangeText = ""
+  
+  if self.DetailsRange then
+
+    local PositionMissile = TrainerWeapon:getPoint()
+    local PositionTarget = Client:GetPositionVec3()
+    
+    local Range = ( ( PositionMissile.x - PositionTarget.x )^2 +
+      ( PositionMissile.y - PositionTarget.y )^2 +
+      ( PositionMissile.z - PositionTarget.z )^2
+      ) ^ 0.5
+
+    RangeText = string.format( ", at %4.2fkm", Range )
+  end
+  
+  return RangeText
+end
+
+function MISSILETRAINER:AddBearing( Client, TrainerWeapon )
+
+  local BearingText = ""
+  
+  if self.DetailsBearing then
+
+    local PositionMissile = TrainerWeapon:getPoint()
+    local PositionTarget = Client:GetPositionVec3()
+    
+    self:T( { PositionTarget, PositionMissile })
+    
+    local DirectionVector = { x = PositionMissile.x - PositionTarget.x, y = PositionMissile.y - PositionTarget.y, z = PositionMissile.z - PositionTarget.z }
+    local DirectionRadians = math.atan2( DirectionVector.z, DirectionVector.x )
+    --DirectionRadians = DirectionRadians + routines.getNorthCorrection( PositionTarget )
+    if DirectionRadians < 0 then
+      DirectionRadians = DirectionRadians + 2 * math.pi
+    end
+    local DirectionDegrees = DirectionRadians * 180 / math.pi
+    
+    BearingText = string.format( ", %d degrees", DirectionDegrees )
+  end
+  
+  return BearingText
+end
+
+
 ---
 -- @param #MISSILETRAINER self
 -- @param Unit#UNIT TrainerSourceDCSUnit
 -- @param DCSWeapon#Weapon TrainerWeapon
 -- @param Unit#UNIT TrainerTargetDCSUnit
 -- @param Client#CLIENT Client
-function MISSILETRAINER:_FollowMissile( TrainerSourceUnit, TrainerWeapon, TrainerTargetUnit, Client )
-  self:F( { TrainerSourceUnit, TrainerWeapon, TrainerTargetUnit, Client } )
-  
-  local PositionMissile = TrainerWeapon:getPoint()
-  local PositionTarget = TrainerTargetUnit:GetPositionVec3()
-  
-  local Distance = ( ( PositionMissile.x - PositionTarget.x )^2 +
-    ( PositionMissile.y - PositionTarget.y )^2 +
-    ( PositionMissile.z - PositionTarget.z )^2
-    ) ^ 0.5
+function MISSILETRAINER:_TrackMissiles()
+  self:F2()
 
   
-  if self.MessagesOnOff and self.MessagesTrack and self.MessageLastTime + 2 <= timer.getTime() then
-    self:T( Distance )
+  local ShowMessages = false
+  if self.MessagesOnOff and self.MessageLastTime + 3 <= timer.getTime() then
     self.MessageLastTime = timer.getTime()
-    local Message = MESSAGE:New( 
-        string.format( "%s launched by %s: %4.2f km", 
-          TrainerWeapon:getTypeName(), 
-          TrainerSourceUnit:GetName(), 
-          Distance 
-        ),"Tracking", 2, "ID" )  
-    
-    if self.MessagesToAll then
-      Message:ToAll()
-    else
-      Message:ToClient( Client )
-    end
+    ShowMessages = true
   end
   
-  if Distance <= self.Distance then
-    TrainerWeapon:destroy()
-    if self.MessagesOnOff then
-      self:T( "Destroyed" )
-      local Message = MESSAGE:New( 
-          string.format( "%s launched by %s destroyed", 
-            TrainerWeapon:getTypeName(), 
-            TrainerSourceUnit:GetName(), 
-            Distance 
-          ),"Tracking", 2, "ID" )  
-      if self.MessagesToAll then
-        Message:ToAll()
-      else
-        Message:ToClient( Client )
+  for ClientDataID, ClientData in pairs( self.TrackingMissiles ) do
+
+    local Client = ClientData.Client
+    self:T2( { Client:GetName() } )
+    
+  
+    ClientData.MessageToAll = "Missiles to Other Players:\n"
+    ClientData.MessageToClient = "Missiles to You:\n"
+    
+    for TrackingDataID, TrackingData in pairs( self.TrackingMissiles ) do
+      
+      self:T( #TrackingData.MissileData )
+      
+      for MissileDataID, MissileData in pairs( TrackingData.MissileData ) do
+        self:T( MissileDataID )
+      
+        local TrainerSourceUnit = MissileData.TrainerSourceUnit
+        local TrainerWeapon = MissileData.TrainerWeapon
+        local TrainerTargetUnit = MissileData.TrainerTargetUnit
+        
+        local PositionMissile = TrainerWeapon:getPosition().p
+        local PositionTarget = Client:GetPositionVec3()
+        
+        local Distance = ( ( PositionMissile.x - PositionTarget.x )^2 +
+          ( PositionMissile.y - PositionTarget.y )^2 +
+          ( PositionMissile.z - PositionTarget.z )^2
+          ) ^ 0.5
+                    
+        if Distance <= self.Distance then
+          -- Hit alert
+          TrainerWeapon:destroy()
+          if self.MessagesOnOff and self.AlertsHits then
+      
+            self:T( "Destroyed" )
+      
+            local Message = MESSAGE:New( 
+                string.format( "%s launched by %s destroyed", 
+                  TrainerWeapon:getTypeName(), 
+                  TrainerSourceUnit:GetTypeName()
+                ),"Tracking", 2, "ID" )  
+      
+            if self.AlertsToAll then
+              Message:ToAll()
+            else
+              Message:ToClient( Client )
+            end
+            
+            MissileData = nil
+            table.remove( TrackingData.MissileData, MissileDataID )
+          end
+        else
+          local TrackingTo = string.format( "  -> %s launched by %s", 
+              TrainerWeapon:getTypeName(), 
+              TrainerSourceUnit:GetName()
+            ) 
+        
+          if ClientDataID == TrackingDataID then
+            ClientData.MessageToClient = ClientData.MessageToClient .. TrackingTo .. self:AddRange( ClientData.Client, TrainerWeapon ) .. self:AddBearing( ClientData.Client, TrainerWeapon ) .. "\n"
+          else
+            ClientData.MessageToAll = ClientData.MessageToAll .. TrackingTo .. self:AddRange( TrackingData.Client, TrainerWeapon ) .. self:AddBearing( TrackingData.Client, TrainerWeapon ) .. "\n"
+          end
+        end
       end
     end
-    return false
+
+    if self.MessagesOnOff and self.Tracking and ShowMessages then
+      local Message = MESSAGE:New( ClientData.MessageToClient .. ClientData.MessageToAll, "Tracking", 1, "ID" ):ToClient( Client )  
+    end
+
   end
 
   return true