diff --git a/Moose Development/Moose/DCS.lua b/Moose Development/Moose/DCS.lua index 8cbe4354d..b791abd27 100644 --- a/Moose Development/Moose/DCS.lua +++ b/Moose Development/Moose/DCS.lua @@ -1374,7 +1374,9 @@ do -- AI --- @type AI.Option.Ground -- @field #AI.Option.Ground.id id -- @field #AI.Option.Ground.val val - + -- @field #AI.Option.Ground.mid mid + -- @field #AI.Option.Ground.mval mval + -- --- @type AI.Option.Naval -- @field #AI.Option.Naval.id id -- @field #AI.Option.Naval.val val @@ -1397,6 +1399,11 @@ do -- AI -- @field PROHIBIT_AG -- @field MISSILE_ATTACK -- @field PROHIBIT_WP_PASS_REPORT + -- @field OPTION_RADIO_USAGE_CONTACT + -- @field OPTION_RADIO_USAGE_ENGAGE + -- @field OPTION_RADIO_USAGE_KILL + -- @field JETT_TANKS_IF_EMPTY + -- @field FORCED_ATTACK --- @type AI.Option.Air.id.FORMATION -- @field LINE_ABREAST @@ -1466,19 +1473,35 @@ do -- AI --- @type AI.Option.Ground.id -- @field NO_OPTION -- @field ROE @{#AI.Option.Ground.val.ROE} + -- @field FORMATION -- @field DISPERSE_ON_ATTACK true or false -- @field ALARM_STATE @{#AI.Option.Ground.val.ALARM_STATE} -- @field ENGAGE_AIR_WEAPONS + -- @field AC_ENGAGEMENT_RANGE_RESTRICTION + + --- @type AI.Option.Ground.mid -- Moose added + -- @field RESTRICT_AAA_MIN 27 + -- @field RESTRICT_AAA_MAX 29 + -- @field RESTRICT_TARGETS @{#AI.Option.Ground.mval.ENGAGE_TARGETS} 28 --- @type AI.Option.Ground.val -- @field #AI.Option.Ground.val.ROE ROE -- @field #AI.Option.Ground.val.ALARM_STATE ALARM_STATE + -- @field #AI.Option.Ground.val.ENGAGE_TARGETS RESTRICT_TARGETS --- @type AI.Option.Ground.val.ROE -- @field OPEN_FIRE -- @field RETURN_FIRE -- @field WEAPON_HOLD + --- @type AI.Option.Ground.mval -- Moose added + -- @field #AI.Option.Ground.mval.ENGAGE_TARGETS ENGAGE_TARGETS + + --- @type AI.Option.Ground.mval.ENGAGE_TARGETS -- Moose added + -- @field ANY_TARGET -- 0 + -- @field AIR_UNITS_ONLY -- 1 + -- @field GROUND_UNITS_ONLY -- 2 + --- @type AI.Option.Ground.val.ALARM_STATE -- @field AUTO -- @field GREEN diff --git a/Moose Development/Moose/Functional/Range.lua b/Moose Development/Moose/Functional/Range.lua index e97f15874..1999747a2 100644 --- a/Moose Development/Moose/Functional/Range.lua +++ b/Moose Development/Moose/Functional/Range.lua @@ -2381,7 +2381,7 @@ function RANGE:_DisplayMyStrafePitResults( _unitName ) -- Sort results table wrt number of hits. local _sort = function( a, b ) - return a.hits > b.hits + return a.roundsHit > b.roundsHit end table.sort( _results, _sort ) @@ -2398,7 +2398,7 @@ function RANGE:_DisplayMyStrafePitResults( _unitName ) -- Best result. if _bestMsg == "" then - _bestMsg = string.format( "Hits %d - %s - %s", _result.hits, _result.zone.name, _result.text ) + _bestMsg = string.format( "Hits %d - %s - %s", result.roundsHit, result.name, result.roundsQuality) end -- 10 runs @@ -2443,15 +2443,15 @@ function RANGE:_DisplayStrafePitResults( _unitName ) -- Get the best result of the player. local _best = nil for _, _result in pairs( _results ) do - if _best == nil or _result.hits > _best.hits then + if _best == nil or _result.roundsHit > _best.roundsHit then _best = _result end end -- Add best result to table. if _best ~= nil then - local text = string.format( "%s: Hits %i - %s - %s", _playerName, _best.hits, _best.zone.name, _best.text ) - table.insert( _playerResults, { msg = text, hits = _best.hits } ) + local text = string.format( "%s: Hits %i - %s - %s", _playerName, _best.roundsHit, _best.name, _best.roundsQuality ) + table.insert( _playerResults, { msg = text, hits = _best.roundsHit } ) end end @@ -3507,7 +3507,7 @@ function RANGE:_SmokeBombImpactOnOff( unitname ) self.PlayerSettings[playername].smokebombimpact = false text = string.format( "%s, %s, smoking impact points of bombs is now OFF.", self.rangename, playername ) else - self.PlayerSettigs[playername].smokebombimpact = true + self.PlayerSettings[playername].smokebombimpact = true text = string.format( "%s, %s, smoking impact points of bombs is now ON.", self.rangename, playername ) end self:_DisplayMessageToGroup( unit, text, 5, false, true ) @@ -3528,7 +3528,7 @@ function RANGE:_SmokeBombDelayOnOff( unitname ) self.PlayerSettings[playername].delaysmoke = false text = string.format( "%s, %s, delayed smoke of bombs is now OFF.", self.rangename, playername ) else - self.PlayerSettigs[playername].delaysmoke = true + self.PlayerSettings[playername].delaysmoke = true text = string.format( "%s, %s, delayed smoke of bombs is now ON.", self.rangename, playername ) end self:_DisplayMessageToGroup( unit, text, 5, false, true )