diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index 21af22579..f2f4b6613 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -1962,7 +1962,7 @@ function RANGE:OnEventShot( EventData ) local _results = self.bombPlayerResults[_playername] local result = {} -- #RANGE.BombResult - result.dataType = "Bomb Result" + result.command=SOCKET.DataType.BOMBRESULT result.name = _closetTarget.name or "unknown" result.distance = _distance result.radial = _closeCoord:HeadingTo( impactcoord ) @@ -3112,7 +3112,7 @@ function RANGE:_CheckInZone( _unitName ) -- Strafe result. local result = {} -- #RANGE.StrafeResult - result.dataType="Strafe Result" + result.command=SOCKET.DataType.STRAFERESULT result.player=_playername result.name=_result.zone.name or "unknown" result.time = timer.getAbsTime() diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 5f4356823..72f811f49 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -17946,12 +17946,12 @@ function AIRBOSS:onafterLSOGrade(From, Event, To, playerData, grade) local ts=playerData.trapsheet[i] --#AIRBOSS.GrooveData table.insert(trapsheet.X, UTILS.Round(ts.X, 1)) table.insert(trapsheet.Z, UTILS.Round(ts.Z, 1)) - table.insert(trapsheet.AoA, UTILS.Round(ts.AoA), 2) - table.insert(trapsheet.Alt, UTILS.Round(ts.Alt), 1) + table.insert(trapsheet.AoA, UTILS.Round(ts.AoA, 2)) + table.insert(trapsheet.Alt, UTILS.Round(ts.Alt, 1)) end local result={} - result.dataType="Trap Sheet" + result.command=SOCKET.DataType.LSOGRADE result.name=playerData.name result.trapsheet=trapsheet result.airframe=grade.airframe diff --git a/Moose Development/Moose/Utilities/Socket.lua b/Moose Development/Moose/Utilities/Socket.lua index fc3eba8a1..52910365c 100644 --- a/Moose Development/Moose/Utilities/Socket.lua +++ b/Moose Development/Moose/Utilities/Socket.lua @@ -23,7 +23,7 @@ -- @field #table json JSON. -- @extends Core.Fsm#FSM ---- **It is far more important to be able to hit the target than it is to haggle over who makes a weapon or who pulls a trigger** -- Dwight D Eisenhower +--- **At times I feel like a socket that remembers its tooth.** -- Saul Bellow -- -- === -- @@ -41,18 +41,16 @@ SOCKET = { lid = nil, } ---- Data type. +--- Data type. This is the keyword the socket listener uses. -- @field #string TEXT Plain text. --- @field #string BOMB Range bombing. --- @field #string STRAFE Range strafeing result. +-- @field #string BOMBRESULT Range bombing. +-- @field #string STRAFERESULT Range strafeing result. -- @field #string LSOGRADE Airboss LSO grade. --- @field #string TRAPSHEET Airboss trap sheet. SOCKET.DataType={ - TEXT="Text", - RANGEBOMB="Bomb Result", - RANGESTRAFE="Strafe Run", - LSOGRADE="LSO Grade", - TRAPSHEET="Trapsheet", + TEXT="moose_text", + BOMBRESULT="moose_bomb_result", + STRAFERESULT="moose_strafe_result", + LSOGRADE="moose_lso_grade", } @@ -141,7 +139,7 @@ function SOCKET:SendText(Text) local message={} - message.dataType = "Text Message" + message.command = SOCKET.DataType.TEXT message.text = Text self:SendTable(message)