FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Intercept ready

Browse Source
This commit is contained in:
FlightControl_Master
2017-07-31 17:04:20 +02:00
parent 27b18780f8
commit 411636a7f4
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Moose Development/Moose/Functional/Detection.lua
View File

@@ -1148,6 +1148,22 @@ do -- DETECTION_BASE
return DetectedItem.FriendliesNearBy return DetectedItem.FriendliesNearBy
end end
--- Returns if there are friendlies nearby the intercept ...
-- @param #DETECTION_BASE self
-- @return #boolean trhe if there are friendlies near the intercept.
function DETECTION_BASE:IsFriendliesNearIntercept( DetectedItem )
return DetectedItem.FriendliesNearIntercept ~= nil or false
end
--- Returns friendly units nearby the intercept point ...
-- @param #DETECTION_BASE self
-- @return #map<#string,Wrapper.Unit#UNIT> The map of Friendly UNITs.
function DETECTION_BASE:GetFriendliesNearIntercept( DetectedItem )
return DetectedItem.FriendliesNearIntercept
end
--- Returns the distance used to identify friendlies near the deteted item ... --- Returns the distance used to identify friendlies near the deteted item ...
-- @param #DETECTION_BASE self -- @param #DETECTION_BASE self
-- @return #number The distance. -- @return #number The distance.
@@ -1222,8 +1238,10 @@ do -- DETECTION_BASE
DetectedItem.FriendliesNearBy = DetectedItem.FriendliesNearBy or {} DetectedItem.FriendliesNearBy = DetectedItem.FriendliesNearBy or {}
local FriendlyUnit = UNIT:Find( FoundDCSUnit ) local FriendlyUnit = UNIT:Find( FoundDCSUnit )
local FriendlyUnitName = FriendlyUnit:GetName() local FriendlyUnitName = FriendlyUnit:GetName()
DetectedItem.FriendliesNearBy[FriendlyUnitName] = FriendlyUnit DetectedItem.FriendliesNearBy[FriendlyUnitName] = FriendlyUnit
local Distance = InterceptCoord:Get2DDistance( FriendlyUnit:GetCoordinate() )
local Distance = DetectedUnitCoord:Get2DDistance( FriendlyUnit:GetCoordinate() )
DetectedItem.FriendliesDistance = DetectedItem.FriendliesDistance or {} DetectedItem.FriendliesDistance = DetectedItem.FriendliesDistance or {}
DetectedItem.FriendliesDistance[Distance] = FriendlyUnit DetectedItem.FriendliesDistance[Distance] = FriendlyUnit
return true return true
@@ -1253,8 +1271,9 @@ do -- DETECTION_BASE
DetectedItem.FriendliesNearBy = DetectedItem.FriendliesNearBy or {} DetectedItem.FriendliesNearBy = DetectedItem.FriendliesNearBy or {}
DetectedItem.FriendliesNearBy[PlayerUnitName] = PlayerUnit DetectedItem.FriendliesNearBy[PlayerUnitName] = PlayerUnit
--local CenterCoord = DetectedUnit:GetCoordinate() local CenterCoord = DetectedUnit:GetCoordinate()
local Distance = InterceptCoord:Get2DDistance( PlayerUnit:GetCoordinate() )
local Distance = CenterCoord:Get2DDistance( PlayerUnit:GetCoordinate() )
DetectedItem.FriendliesDistance = DetectedItem.FriendliesDistance or {} DetectedItem.FriendliesDistance = DetectedItem.FriendliesDistance or {}
DetectedItem.FriendliesDistance[Distance] = PlayerUnit DetectedItem.FriendliesDistance[Distance] = PlayerUnit
end end
@@ -2315,15 +2334,19 @@ do -- DETECTION_AREAS
if self.Intercept then if self.Intercept then
local DetectedSet = DetectedItem.Set local DetectedSet = DetectedItem.Set
local DetectedUnit = DetectedSet:GetFirst() -- Wrapper.Unit#UNIT local DetectedUnit = DetectedSet:GetFirst() -- Wrapper.Unit#UNIT
local UnitSpeed = DetectedUnit:GetVelocityMPS() if DetectedUnit then
local UnitHeading = DetectedUnit:GetHeading() local UnitSpeed = DetectedUnit:GetVelocityMPS()
local UnitCoord = DetectedUnit:GetCoordinate() local UnitHeading = DetectedUnit:GetHeading()
local UnitCoord = DetectedUnit:GetCoordinate()
local TranslateDistance = UnitSpeed * self.InterceptDelay
local TranslateDistance = UnitSpeed * self.InterceptDelay
local InterceptCoord = UnitCoord:Translate( TranslateDistance, UnitHeading )
local InterceptCoord = UnitCoord:Translate( TranslateDistance, UnitHeading )
DetectedItem.InterceptCoord = InterceptCoord
DetectedItem.InterceptCoord = InterceptCoord
else
DetectedItem.InterceptCoord = nil
end
else else
DetectedItem.InterceptCoord = nil DetectedItem.InterceptCoord = nil
end end