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

Fixed the detection of invisible units.

Browse Source
This commit is contained in:
FlightControl_Master 2018-03-20 15:52:06 +01:00
parent e01a4fa18c
commit 5188c40701
1 changed files with 128 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,6 @@
--- **Functional** -- DETECTION_ classes model the detection of enemy units by FACs or RECCEs and group them according various methods. --- **Functional** -- Models the detection of enemy units by FACs or RECCEs and group them according various methods.
--
-- ===
-- --
-- ![Banner Image](..\Presentations\DETECTION\Dia1.JPG) -- ![Banner Image](..\Presentations\DETECTION\Dia1.JPG)
-- --
@ -11,19 +13,11 @@
-- --
-- === -- ===
-- --
-- # Demo Missions -- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/DET%20-%20Detection)
--
-- ### [DETECTION Demo Missions and Source Code](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master-release/DET%20-%20Detection)
--
-- ### [DETECTION Demo Missions, only for Beta Testers](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/DET%20-%20Detection)
--
-- ### [ALL Demo Missions pack of the Latest Release](https://github.com/FlightControl-Master/MOOSE_MISSIONS/releases)
-- --
-- === -- ===
-- --
-- # YouTube Channel -- ### [YouTube Playlist](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl3Cf5jpI6BS0sBOVWK__tji)
--
-- ### [DETECTION YouTube Channel](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl3Cf5jpI6BS0sBOVWK__tji)
-- --
-- === -- ===
-- --
@ -582,6 +576,9 @@ do -- DETECTION_BASE
self:T2( { TargetIsDetected = TargetIsDetected, TargetIsVisible = TargetIsVisible, TargetLastTime = TargetLastTime, TargetKnowType = TargetKnowType, TargetKnowDistance = TargetKnowDistance, TargetLastPos = TargetLastPos, TargetLastVelocity = TargetLastVelocity } ) self:T2( { TargetIsDetected = TargetIsDetected, TargetIsVisible = TargetIsVisible, TargetLastTime = TargetLastTime, TargetKnowType = TargetKnowType, TargetKnowDistance = TargetKnowDistance, TargetLastPos = TargetLastPos, TargetLastVelocity = TargetLastVelocity } )
-- Only process if the target is visible. Detection also returns invisible units.
if Detection.visible == true then
local DetectionAccepted = true local DetectionAccepted = true
local DetectedObjectName = DetectedObject:getName() local DetectedObjectName = DetectedObject:getName()
@ -605,13 +602,13 @@ do -- DETECTION_BASE
DetectionAccepted = self._.FilterCategories[DetectedUnitCategory] ~= nil and DetectionAccepted or false DetectionAccepted = self._.FilterCategories[DetectedUnitCategory] ~= nil and DetectionAccepted or false
-- if Distance > 15000 then -- if Distance > 15000 then
-- if DetectedUnitCategory == Unit.Category.GROUND_UNIT or DetectedUnitCategory == Unit.Category.SHIP then -- if DetectedUnitCategory == Unit.Category.GROUND_UNIT or DetectedUnitCategory == Unit.Category.SHIP then
-- if DetectedObject:hasSensors( Unit.SensorType.RADAR, Unit.RadarType.AS ) == false then -- if DetectedObject:hasSensors( Unit.SensorType.RADAR, Unit.RadarType.AS ) == false then
-- DetectionAccepted = false -- DetectionAccepted = false
-- end -- end
-- end -- end
-- end -- end
if self.AcceptRange and Distance * 1000 > self.AcceptRange then if self.AcceptRange and Distance * 1000 > self.AcceptRange then
DetectionAccepted = false DetectionAccepted = false
@ -717,6 +714,7 @@ do -- DETECTION_BASE
end end
end end
end end
end
self:T2( self.DetectedObjects ) self:T2( self.DetectedObjects )
end end