#Changes from Develop

2025-10-29 16:58:06 +00:00 · 2022-09-10 11:49:40 +02:00
parent c58e91b956
commit 7c22e9fe69
48 changed files with 7792 additions and 3739 deletions
--- a/Development/Moose/Functional/Range.lua
+++ b/Development/Moose/Functional/Range.lua
@@ -429,6 +429,25 @@ RANGE.TargetType = {
 -- @field #string airframe Aircraft type of player.
 -- @field #number time Time via timer.getAbsTime() in seconds of impact.
 -- @field #string date OS date.
+-- @field #number attackHdg Attack heading in degrees.
+-- @field #number attackVel Attack velocity in knots.
+-- @field #number attackAlt Attack altitude in feet.
+-- @field #string clock Time of the run.
+-- @field #string rangename Name of the range.
+
+--- Strafe result.
+-- @type RANGE.StrafeResult
+-- @field #string player Player name.
+-- @field #string airframe Aircraft type of player.
+-- @field #number time Time via timer.getAbsTime() in seconds of impact.
+-- @field #string date OS date.
+-- @field #string name Name of the target pit.
+-- @field #number roundsFired Number of rounds fired.
+-- @field #number roundsHit Number of rounds that hit the target.
+-- @field #number strafeAccuracy Accuracy of the run in percent.
+-- @field #string clock Time of the run.
+-- @field #string rangename Name of the range.
+-- @field #boolean invalid Invalid pass.

 --- Strafe result.
 -- @type RANGE.StrafeResult
@@ -569,17 +588,16 @@ RANGE.version = "2.4.0"

 --- RANGE contructor. Creates a new RANGE object.
 -- @param #RANGE self
-- @param #string rangename Name of the range. Has to be unique. Will we used to create F10 menu items etc.
+-- @param #string RangeName Name of the range. Has to be unique. Will we used to create F10 menu items etc.
 -- @return #RANGE RANGE object.
-function RANGE:New( rangename )
-  BASE:F( { rangename = rangename } )
+function RANGE:New( RangeName )

  -- Inherit BASE.
  local self = BASE:Inherit( self, FSM:New() ) -- #RANGE

  -- Get range name.
  -- TODO: make sure that the range name is not given twice. This would lead to problems in the F10 radio menu.
-  self.rangename = rangename or "Practice Range"
+  self.rangename = RangeName or "Practice Range"

  -- Log id.
  self.id = string.format( "RANGE %s | ", self.rangename )
@@ -950,6 +968,19 @@ function RANGE:SetTargetSheet( path, prefix )
  return self
 end

+--- Set FunkMan socket. Bombing and strafing results will be send to your Discord bot.
+-- **Requires running FunkMan program**.
+-- @param #RANGE self
+-- @param #number Port Port. Default `10042`.
+-- @param #string Host Host. Default "127.0.0.1".
+-- @return #RANGE self
+function RANGE:SetFunkManOn(Port, Host)
+  
+  self.funkmanSocket=SOCKET:New(Port, Host)
+  
+  return self
+end
+
 --- Set messages to examiner. The examiner will receive messages from all clients.
 -- @param #RANGE self
 -- @param #string examinergroupname Name of the group of the examiner.
@@ -1728,7 +1759,6 @@ function RANGE:OnEventHit( EventData )
            self:_DisplayMessageToGroup( _unit, text )
            self:T2( self.id .. text )
            _currentTarget.pastfoulline = true
-            invalidStrafe = true -- Rangeboss Edit
          end
        end

@@ -1760,6 +1790,13 @@ function RANGE:OnEventHit( EventData )
  end
 end

+--- Range event handler for event shot (when a unit releases a rocket or bomb (but not a fast firing gun).
+-- @param #RANGE self
+-- @param #table weapon Weapon
+function RANGE:_TrackWeapon(weapon)
+
+end
+
 --- Range event handler for event shot (when a unit releases a rocket or bomb (but not a fast firing gun).
 -- @param #RANGE self
 -- @param Core.Event#EVENTDATA EventData
@@ -1806,6 +1843,11 @@ function RANGE:OnEventShot( EventData )

  -- Get player unit and name.
  local _unit, _playername = self:_GetPlayerUnitAndName( _unitName )
+  
+  -- Attack parameters.
+  local attackHdg=_unit:GetHeading()
+  local attackAlt=_unit:GetHeight()
+  local attackVel=_unit:GetVelocityKNOTS()

  -- Set this to larger value than the threshold.
  local dPR = self.BombtrackThreshold * 2
@@ -1848,7 +1890,6 @@ function RANGE:OnEventShot( EventData )

        -- Check again in ~0.005 seconds ==> 200 checks per second.
        return timer.getTime() + self.dtBombtrack
-
      else

        -----------------------------
@@ -1858,7 +1899,7 @@ function RANGE:OnEventShot( EventData )
        -- Get closet target to last position.
        local _closetTarget = nil -- #RANGE.BombTarget
        local _distance = nil
-        local _closeCoord = nil
+        local _closeCoord = nil   --Core.Point#COORDINATE
        local _hitquality = "POOR"

        -- Get callsign.
@@ -1886,6 +1927,7 @@ function RANGE:OnEventShot( EventData )

        -- Loop over defined bombing targets.
        for _, _bombtarget in pairs( self.bombingTargets ) do
+          local bombtarget=_bombtarget  --#RANGE.BombTarget

          -- Get target coordinate.
          local targetcoord = self:_GetBombTargetCoordinate( _bombtarget )
@@ -1898,15 +1940,15 @@ function RANGE:OnEventShot( EventData )
            -- Find closest target to last known position of the bomb.
            if _distance == nil or _temp < _distance then
              _distance = _temp
-              _closetTarget = _bombtarget
-              _closeCoord = targetcoord
+              _closetTarget = bombtarget
+              _closeCoord   = targetcoord
              if _distance <= 1.53 then -- Rangeboss Edit
                _hitquality = "SHACK" -- Rangeboss Edit
-              elseif _distance <= 0.5 * _bombtarget.goodhitrange then -- Rangeboss Edit
+              elseif _distance <= 0.5 * bombtarget.goodhitrange then -- Rangeboss Edit
                _hitquality = "EXCELLENT"
-              elseif _distance <= _bombtarget.goodhitrange then
+              elseif _distance <= bombtarget.goodhitrange then
                _hitquality = "GOOD"
-              elseif _distance <= 2 * _bombtarget.goodhitrange then
+              elseif _distance <= 2 * bombtarget.goodhitrange then
                _hitquality = "INEFFECTIVE"
              else
                _hitquality = "POOR"
@@ -1927,6 +1969,7 @@ function RANGE:OnEventShot( EventData )
          local _results = self.bombPlayerResults[_playername]

          local result = {} -- #RANGE.BombResult
+          result.command=SOCKET.DataType.BOMBRESULT
          result.name = _closetTarget.name or "unknown"
          result.distance = _distance
          result.radial = _closeCoord:HeadingTo( impactcoord )
@@ -1934,11 +1977,17 @@ function RANGE:OnEventShot( EventData )
          result.quality = _hitquality
          result.player = playerData.playername
          result.time = timer.getAbsTime()
+          result.clock = UTILS.SecondsToClock(result.time, true)
+          result.midate = UTILS.GetDCSMissionDate()
+          result.theatre = env.mission.theatre
          result.airframe = playerData.airframe
          result.roundsFired = 0 -- Rangeboss Edit
          result.roundsHit = 0 -- Rangeboss Edit
          result.roundsQuality = "N/A" -- Rangeboss Edit
          result.rangename = self.rangename
+          result.attackHdg = attackHdg
+          result.attackVel = attackVel
+          result.attackAlt = attackAlt

          -- Add to table.
          table.insert( _results, result )
@@ -2078,13 +2127,13 @@ function RANGE:onafterImpact( From, Event, To, result, player )
  -- Only display target name if there is more than one bomb target.
  local targetname = nil
  if #self.bombingTargets > 1 then
-    local targetname = result.name
+    targetname = result.name
  end

  -- Send message to player.
  local text = string.format( "%s, impact %03d° for %d ft", player.playername, result.radial, UTILS.MetersToFeet( result.distance ) )
  if targetname then
-    text = text .. string.format( " from bulls of target %s." )
+    text = text .. string.format( " from bulls of target %s.", targetname )
  else
    text = text .. "."
  end
@@ -2110,16 +2159,40 @@ function RANGE:onafterImpact( From, Event, To, result, player )
  end

  -- Unit.
-  local unit = UNIT:FindByName( player.unitname )
-
-  -- Send message.
-  self:_DisplayMessageToGroup( unit, text, nil, true )
-  self:T( self.id .. text )
+  if player.unitname then
+  
+    -- Get unit.
+    local unit = UNIT:FindByName( player.unitname )
+  
+    -- Send message.
+    self:_DisplayMessageToGroup( unit, text, nil, true )
+    self:T( self.id .. text )
+  end

  -- Save results.
  if self.autosave then
    self:Save()
  end
+  
+  -- Send result to FunkMan, which creates fancy MatLab figures and sends them to Discord via a bot.
+  if self.funkmanSocket then
+    self.funkmanSocket:SendTable(result)
+  end
+
+end
+
+--- Function called after strafing run.
+-- @param #RANGE self
+-- @param #string From From state.
+-- @param #string Event Event.
+-- @param #string To To state.
+-- @param #RANGE.PlayerData player Player data table.
+-- @param #RANGE.StrafeResult result Result of run.
+function RANGE:onafterStrafeResult( From, Event, To, player, result)
+
+  if self.funkmanSocket then
+    self.funkmanSocket:SendTable(result)
+  end

 end

@@ -2175,7 +2248,7 @@ function RANGE:onafterSave( From, Event, To )
      local target = result.name
      local radial = result.radial
      local quality = result.quality
-      local time = UTILS.SecondsToClock( result.time )
+      local time = UTILS.SecondsToClock(result.time, true)
      local airframe = result.airframe
      local date = "n/a"
      if os then
@@ -2353,7 +2426,8 @@ end
 --- Start smoking a coordinate with a delay.
 -- @param #table _args Argements passed.
 function RANGE._DelayedSmoke( _args )
-  trigger.action.smoke( _args.coord:GetVec3(), _args.color )
+  _args.coord:Smoke(_args.color)
+  --trigger.action.smoke( _args.coord:GetVec3(), _args.color )
 end

 --- Display top 10 stafing results of a specific player.
@@ -3045,9 +3119,13 @@ function RANGE:_CheckInZone( _unitName )
          
          -- Strafe result.
          local result = {} -- #RANGE.StrafeResult
+          result.command=SOCKET.DataType.STRAFERESULT
          result.player=_playername
          result.name=_result.zone.name or "unknown"
          result.time = timer.getAbsTime()
+          result.clock = UTILS.SecondsToClock(result.time)
+          result.midate = UTILS.GetDCSMissionDate()
+          result.theatre = env.mission.theatre
          result.roundsFired = shots
          result.roundsHit = _result.hits
          result.roundsQuality = resulttext
@@ -3473,6 +3551,7 @@ function RANGE:_DisplayMessageToGroup( _unit, _text, _time, _clear, display )

    -- Group ID.
    local _gid = _unit:GetGroup():GetID()
+    local _grp = _unit:GetGroup()

    -- Get playername and player settings
    local _, playername = self:_GetPlayerUnitAndName( _unit:GetName() )
@@ -3480,14 +3559,14 @@ function RANGE:_DisplayMessageToGroup( _unit, _text, _time, _clear, display )

    -- Send message to player if messages enabled and not only for the examiner.
    if _gid and (playermessage == true or display) and (not self.examinerexclusive) then
-      trigger.action.outTextForGroup( _gid, _text, _time, _clear )
+      local m = MESSAGE:New(_text,_time,nil,_clear):ToUnit(_unit)
    end

    -- Send message to examiner.
    if self.examinergroupname ~= nil then
-      local _examinerid = GROUP:FindByName( self.examinergroupname ):GetID()
+      local _examinerid = GROUP:FindByName( self.examinergroupname )
      if _examinerid then
-        trigger.action.outTextForGroup( _examinerid, _text, _time, _clear )
+        local m = MESSAGE:New(_text,_time,nil,_clear):ToGroup(_examinerid)
      end
    end
  end