Merge branch 'develop' into FF/Ops

Moose Development/Moose/Ops/ATIS.lua

@@ -312,10 +312,16 @@
 --
 --     atis=ATIS:New("Batumi", 305, radio.modulation.AM)
 --     atis:SetSRS("D:\\DCS\\_SRS\\", "male", "en-US")
---     atis:Start()  
+--     atis:Start()
 --
 -- This uses a male voice with US accent. It requires SRS to be installed in the `D:\DCS\_SRS\` directory. Note that backslashes need to be escaped or simply use slashes (as in linux).
 -- 
+-- ### SRS can use multiple frequencies: 
+-- 
+--     atis=ATIS:New("Batumi", {305,103.85}, {radio.modulation.AM,radio.modulation.FM})
+--     atis:SetSRS("D:\\DCS\\_SRS\\", "male", "en-US")
+--     atis:Start()
+-- 
 -- ### SRS Localization
 -- 
 --  You can localize the SRS output, all you need is to provide a table of translations and set the `locale` of your instance. You need to provide the translations in your script **before you instantiate your ATIS**.
@@ -884,13 +890,14 @@ _ATIS = {}
 
 --- ATIS class version.
 -- @field #string version
-ATIS.version = "0.10.3"
+ATIS.version = "0.10.4"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- TODO: Correct fog for elevation.
+-- DONE: Option to add multiple frequencies for SRS
 -- DONE: Zulu time --> Zulu in output.
 -- DONE: Fix for AB not having a runway - Helopost like Naqoura
 -- DONE: Add new Normandy airfields.
@@ -899,7 +906,7 @@ ATIS.version = "0.10.3"
 -- DONE: Visibility reported twice over SRS
 -- DONE: Add text report for output.
 -- DONE: Add stop FMS functions.
--- NOGO: Use local time. Not realisitc!
+-- NOGO: Use local time. Not realistic!
 -- DONE: Dew point. Approx. done.
 -- DONE: Metric units.
 -- DONE: Set UTC correction.
@@ -915,8 +922,8 @@ ATIS.version = "0.10.3"
 --- Create a new ATIS class object for a specific airbase.
 -- @param #ATIS self
 -- @param #string AirbaseName Name of the airbase.
--- @param #number Frequency Radio frequency in MHz. Default 143.00 MHz.
--- @param #number Modulation Radio modulation: 0=AM, 1=FM. Default 0=AM. See `radio.modulation.AM` and `radio.modulation.FM` enumerators.
+-- @param #number Frequency Radio frequency in MHz. Default 143.00 MHz. When using **SRS** this can be passed as a table of multiple frequencies.
+-- @param #number Modulation Radio modulation: 0=AM, 1=FM. Default 0=AM. See `radio.modulation.AM` and `radio.modulation.FM` enumerators. When using **SRS** this can be passed as a table of multiple modulations.
 -- @return #ATIS self
 function ATIS:New(AirbaseName, Frequency, Modulation)
 
@@ -1594,8 +1601,16 @@ function ATIS:onafterStart( From, Event, To )
   end
 
   -- Info.
-  self:I( self.lid .. string.format( "Starting ATIS v%s for airbase %s on %.3f MHz Modulation=%d", ATIS.version, self.airbasename, self.frequency, self.modulation ) )
-
+  if type(self.frequency) == "table" then
+    local frequency = table.concat(self.frequency,"/")
+    local modulation = self.modulation
+    if type(self.modulation) == "table" then
+      modulation = table.concat(self.modulation,"/")
+    end
+    self:I( self.lid .. string.format( "Starting ATIS v%s for airbase %s on %s MHz Modulation=%s", ATIS.version, self.airbasename, frequency, modulation ) )
+  else
+    self:I( self.lid .. string.format( "Starting ATIS v%s for airbase %s on %.3f MHz Modulation=%d", ATIS.version, self.airbasename, self.frequency, self.modulation ) )
+  end
   -- Start radio queue.
   if not self.useSRS then
     self.radioqueue = RADIOQUEUE:New( self.frequency, self.modulation, string.format( "ATIS %s", self.airbasename ) )
@@ -1653,7 +1668,17 @@ function ATIS:onafterStatus( From, Event, To )
   end
 
   -- Info text.
-  local text = string.format( "State %s: Freq=%.3f MHz %s", fsmstate, self.frequency, UTILS.GetModulationName( self.modulation ) )
+  local text = ""
+  if type(self.frequency) == "table" then
+    local frequency = table.concat(self.frequency,"/")
+    local modulation = self.modulation
+    if type(self.modulation) == "table" then
+      modulation = table.concat(self.modulation,"/")
+    end
+    text = string.format( "State %s: Freq=%s MHz %s", fsmstate, frequency, modulation )
+  else
+    text = string.format( "State %s: Freq=%.3f MHz %s", fsmstate, self.frequency, UTILS.GetModulationName( self.modulation ) )
+  end
   if self.useSRS then
     text = text .. string.format( ", SRS path=%s (%s), gender=%s, culture=%s, voice=%s", tostring( self.msrs.path ), tostring( self.msrs.port ), tostring( self.msrs.gender ), tostring( self.msrs.culture ), tostring( self.msrs.voice ) )
   else
@@ -2919,8 +2944,17 @@ function ATIS:UpdateMarker( information, runact, wind, altimeter, temperature )
   if self.markerid then
     self.airbase:GetCoordinate():RemoveMark( self.markerid )
   end
-
-  local text = string.format( "ATIS on %.3f %s, %s:\n", self.frequency, UTILS.GetModulationName( self.modulation ), tostring( information ) )
+  local text = ""
+  if type(self.frequency) == "table" then
+    local frequency = table.concat(self.frequency,"/")
+    local modulation = self.modulation
+    if type(modulation) == "table" then
+      modulation = table.concat(self.modulation,"/")
+    end
+    text = string.format( "ATIS on %s %s, %s:\n", tostring(frequency), tostring(modulation), tostring( information ) )
+  else
+    text = string.format( "ATIS on %.3f %s, %s:\n", self.frequency, UTILS.GetModulationName( self.modulation ), tostring( information ) )
+  end
   text = text .. string.format( "%s\n", tostring( runact ) )
   text = text .. string.format( "%s\n", tostring( wind ) )
   text = text .. string.format( "%s\n", tostring( altimeter ) )

Moose Development/Moose/Ops/FlightControl.lua

@@ -2811,7 +2811,11 @@ function FLIGHTCONTROL:_PlayerInfoATIS(groupname)
     
     -- Radio message.
     self:TransmissionPilot(rtext, flight)
-    self:TransmissionTower(srstxt,flight,10)
+    if self.atis then
+      self:TransmissionTower(srstxt,flight,10)
+    else
+      self:TransmissionTower(text,flight,10)
+    end
     
   else
     self:E(self.lid..string.format("Cannot find flight group %s.", tostring(groupname)))

Moose Development/Moose/Ops/FlightGroup.lua

@@ -2863,8 +2863,11 @@ function FLIGHTGROUP:_CheckGroupDone(delay, waittime)
             end
 
           else
+            -- Check if not parking (could be on ALERT5 and just spawned (current mission=nil)
+            if not self:IsParking() then            
               self:T(self.lid..string.format("Passed Final WP but Tasks=%d or Missions=%d left in the queue. Wait!", nTasks, nMissions))
               self:__Wait(-1)
+            end
           end
         else
           self:T(self.lid..string.format("Passed Final WP but still have current Task (#%s) or Mission (#%s) left to do", tostring(self.taskcurrent), tostring(self.currentmission)))

Moose Development/Moose/Ops/OpsZone.lua

@@ -1483,11 +1483,11 @@ function OPSZONE:_GetZoneColor()
   local color={0,0,0}
   
   if self.ownerCurrent==coalition.side.NEUTRAL then
-    color={1, 1, 1}
+    color=self.ZoneOwnerNeutral or {1, 1, 1}
   elseif self.ownerCurrent==coalition.side.BLUE then
-    color={0, 0, 1}
+    color=self.ZoneOwnerBlue or {0, 0, 1}
   elseif self.ownerCurrent==coalition.side.RED then
-    color={1, 0, 0}
+    color=self.ZoneOwnerRed or {1, 0, 0}
   else
   
   end
@@ -1495,6 +1495,21 @@ function OPSZONE:_GetZoneColor()
   return color
 end
 
+--- Set custom RGB color of zone depending on current owner.
+-- @param #OPSZONE self
+-- @param #table Neutral Color is a table of RGB values 0..1 for Red, Green, and Blue respectively, e.g. {1,0,0} for red.
+-- @param #table Blue Color is a table of RGB values 0..1 for Red, Green, and Blue respectively, e.g. {0,1,0} for green.
+-- @param #table Red Color is a table of RGB values 0..1 for Red, Green, and Blue respectively, e.g. {0,0,1} for blue.
+-- @return  #OPSZONE self
+function OPSZONE:SetZoneColor(Neutral, Blue, Red)
+  
+  self.ZoneOwnerNeutral = Neutral  or {1, 1, 1}
+  self.ZoneOwnerBlue = Blue or {0, 0, 1}
+  self.ZoneOwnerRed = Red or {1, 0, 0}
+
+  return self
+end
+
 --- Update marker on the F10 map.
 -- @param #OPSZONE self
 function OPSZONE:_UpdateMarker()

Moose Development/Moose/Ops/PlayerRecce.lua

@@ -104,7 +104,7 @@ PLAYERRECCE = {
   ClassName          =   "PLAYERRECCE",
   verbose            =   true,
   lid                =   nil,
-  version            =   "0.0.21",
+  version            =   "0.0.22",
   ViewZone           =   {},
   ViewZoneVisual     =   {},
   ViewZoneLaser      =   {},
@@ -469,8 +469,10 @@ function PLAYERRECCE:_GetClockDirection(unit, target)
   local _playerPosition = unit:GetCoordinate() -- get position of helicopter
   local _targetpostions = target:GetCoordinate() -- get position of downed pilot
   local _heading = unit:GetHeading() -- heading
+  --self:I("Heading = ".._heading)
   local DirectionVec3 = _playerPosition:GetDirectionVec3( _targetpostions )
   local Angle = _playerPosition:GetAngleDegrees( DirectionVec3 )
+  --self:I("Angle = "..Angle)
   local clock = 12
   local hours = 0   
   if _heading and Angle then
@@ -478,10 +480,13 @@ function PLAYERRECCE:_GetClockDirection(unit, target)
     --if angle == 0 then angle = 360 end
     clock = _heading-Angle  
     hours = (clock/30)*-1
+    --self:I("hours = "..hours)
     clock = 12+hours
     clock = UTILS.Round(clock,0)
     if clock > 12 then clock = clock-12 end
-  end    
+    if clock == 0 then clock = 12 end
+  end
+  --self:I("Clock ="..clock)    
   return clock
 end
 
@@ -709,8 +714,8 @@ function PLAYERRECCE:_GetViewZone(unit, vheading, minview, maxview, angle, camon
       local heading2 = (vheading-90)%360
       self:T({heading1,heading2})
       local startpos = startp:Translate(minview,vheading)
-      local pos1 = startpos:Translate(10,heading1)
-      local pos2 = startpos:Translate(10,heading2)
+      local pos1 = startpos:Translate(12.5,heading1)
+      local pos2 = startpos:Translate(12.5,heading2)
       local pos3 = pos1:Translate(maxview,vheading)
       local pos4 = pos2:Translate(maxview,vheading)
       local array = {}
@@ -912,32 +917,41 @@ function PLAYERRECCE:_LaseTarget(client,targetset)
   else
     laser = self.LaserSpots[playername]
   end
+  -- old target
   if self.LaserTarget[playername] then
     -- still looking at target?
     local target=self.LaserTarget[playername] -- Ops.Target#TARGET
     local oldtarget = target:GetObject() --or laser.Target
-    --self:I("Targetstate: "..target:GetState())
-    --self:I("Laser State: "..tostring(laser:IsLasing()))
-    if not oldtarget or targetset:IsNotInSet(oldtarget) or target:IsDead() or target:IsDestroyed() then
+    self:T("Targetstate: "..target:GetState())
+    self:T("Laser State: "..tostring(laser:IsLasing()))
+    if (not oldtarget) or targetset:IsNotInSet(oldtarget) or target:IsDead() or target:IsDestroyed() then
       -- lost LOS or dead
       laser:LaseOff()
       if target:IsDead() or target:IsDestroyed() or target:GetLife() < 2 then
         self:__Shack(-1,client,oldtarget)
-        self.LaserTarget[playername] = nil
+        --self.LaserTarget[playername] = nil
       else
         self:__TargetLOSLost(-1,client,oldtarget)
-        self.LaserTarget[playername] = nil
+        --self.LaserTarget[playername] = nil
       end
-    end
-    if oldtarget and (not laser:IsLasing()) then
-      --self:I("Switching laser back on ..")
+      self.LaserTarget[playername] = nil
+      oldtarget = nil
+      self.LaserSpots[playername] = nil
+    elseif oldtarget and laser and (not laser:IsLasing()) then
+      --laser:LaseOff()
+      self:T("Switching laser back on ..")
       local lasercode = self.UnitLaserCodes[playername] or laser.LaserCode or 1688
       local lasingtime = self.lasingtime or 60
       --local targettype = target:GetTypeName()
       laser:LaseOn(oldtarget,lasercode,lasingtime)
       --self:__TargetLasing(-1,client,oldtarget,lasercode,lasingtime) 
+    else
+      -- we should not be here...
+      self:T("Target alive and laser is on!")
+      --self.LaserSpots[playername] = nil
     end
-  elseif not laser:IsLasing() and target then
+  -- new target
+  elseif (not laser:IsLasing()) and target then
     local relativecam = self.LaserRelativePos[client:GetTypeName()]
     laser:SetRelativeStartPosition(relativecam)
     local lasercode = self.UnitLaserCodes[playername] or laser.LaserCode or 1688
@@ -945,7 +959,7 @@ function PLAYERRECCE:_LaseTarget(client,targetset)
     --local targettype = target:GetTypeName()
     laser:LaseOn(target,lasercode,lasingtime) 
     self.LaserTarget[playername] = TARGET:New(target)
-    self.LaserTarget[playername].TStatus = 9
+    --self.LaserTarget[playername].TStatus = 9
     self:__TargetLasing(-1,client,target,lasercode,lasingtime)
   end
   return self
@@ -1027,6 +1041,13 @@ function PLAYERRECCE:_SwitchLasing(client,group,playername)
     MESSAGE:New("Lasing is now ON",10,self.Name or "FACA"):ToClient(client)
   else
     self.AutoLase[playername] = false
+    if self.LaserSpots[playername] then 
+      local laser = self.LaserSpots[playername] -- Core.Spot#SPOT
+      if laser:IsLasing() then
+        laser:LaseOff()
+      end
+      self.LaserSpots[playername] = nil
+    end
     MESSAGE:New("Lasing is now OFF",10,self.Name or "FACA"):ToClient(client)
   end
   if self.ClientMenus[playername] then
@@ -1681,7 +1702,7 @@ function PLAYERRECCE:onafterRecceOnStation(From, Event, To, Client, Playername)
   local text2tts = string.format("All stations, FACA %s on station at %s!",callsign, coordtext)
   text2tts = self:_GetTextForSpeech(text2tts)
   if self.debug then
-  self:I(text2.."\n"..text2tts)
+  self:T(text2.."\n"..text2tts)
   end
   if self.UseSRS then
     local grp = Client:GetGroup()
@@ -1720,7 +1741,7 @@ function PLAYERRECCE:onafterRecceOffStation(From, Event, To, Client, Playername)
   local texttts = string.format("All stations, FACA %s leaving station at %s, good bye!",callsign, coordtext)
   texttts = self:_GetTextForSpeech(texttts)
   if self.debug then
-    self:I(text.."\n"..texttts)
+    self:T(text.."\n"..texttts)
   end
   local text1 = "Going home!"
   if self.UseSRS then