weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

First version of fix.

Browse Source 
I need to make a second internal index in Detection to sort out the alternative groupings per unit name or type name.
This commit is contained in:
FlightControl_Master 2018-03-16 06:40:50 +01:00
parent e57d05fc91
commit 533689826e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1534,6 +1534,7 @@ do -- DETECTION_BASE
-- @return #DETECTION_BASE.DetectedItem -- @return #DETECTION_BASE.DetectedItem
function DETECTION_BASE:GetDetectedItem( Index ) function DETECTION_BASE:GetDetectedItem( Index )
self:F( { DetectedItems = self.DetectedItems } )
local DetectedItem = self.DetectedItems[Index] local DetectedItem = self.DetectedItems[Index]
if DetectedItem then if DetectedItem then
return DetectedItem return DetectedItem
@ -1700,6 +1701,7 @@ do -- DETECTION_BASE
local DetectedItem = self:GetDetectedItem( Index ) local DetectedItem = self:GetDetectedItem( Index )
if DetectedItem then if DetectedItem then
self:F( { ThreatLevel = DetectedItem.ThreatLevel, ThreatText = DetectedItem.ThreatText } )
return DetectedItem.ThreatLevel or 0, DetectedItem.ThreatText or "" return DetectedItem.ThreatLevel or 0, DetectedItem.ThreatText or ""
end end
@ -1931,7 +1933,7 @@ do -- DETECTION_UNITS
local DetectedItem = self:GetDetectedItem( DetectedUnitName ) local DetectedItem = self:GetDetectedItem( DetectedUnitName )
if not DetectedItem then if not DetectedItem then
self:T( "Added new DetectedItem" ) self:T( "Added new DetectedItem" )
DetectedItem = self:AddDetectedItem( "UNIT", DetectedUnitName ) DetectedItem = self:AddDetectedItem( "UNIT" )
DetectedItem.TypeName = DetectedUnit:GetTypeName() DetectedItem.TypeName = DetectedUnit:GetTypeName()
DetectedItem.Name = DetectedObject.Name DetectedItem.Name = DetectedObject.Name
DetectedItem.IsVisible = DetectedObject.IsVisible DetectedItem.IsVisible = DetectedObject.IsVisible
@ -1960,6 +1962,7 @@ do -- DETECTION_UNITS
self:SetDetectedItemCoordinate( DetectedItem, DetectedFirstUnitCoord, DetectedFirstUnit ) self:SetDetectedItemCoordinate( DetectedItem, DetectedFirstUnitCoord, DetectedFirstUnit )
self:ReportFriendliesNearBy( { DetectedItem = DetectedItem, ReportSetGroup = self.DetectionSetGroup } ) -- Fill the Friendlies table self:ReportFriendliesNearBy( { DetectedItem = DetectedItem, ReportSetGroup = self.DetectionSetGroup } ) -- Fill the Friendlies table
self:SetDetectedItemThreatLevel( DetectedItem )
self:NearestRecce( DetectedItem ) self:NearestRecce( DetectedItem )
end end
@ -2194,7 +2197,7 @@ do -- DETECTION_TYPES
local DetectedTypeName = DetectedUnit:GetTypeName() local DetectedTypeName = DetectedUnit:GetTypeName()
local DetectedItem = self:GetDetectedItem( DetectedTypeName ) local DetectedItem = self:GetDetectedItem( DetectedTypeName )
if not DetectedItem then if not DetectedItem then
DetectedItem = self:AddDetectedItem( "TYPE", DetectedTypeName ) DetectedItem = self:AddDetectedItem( "TYPE" )
DetectedItem.TypeName = DetectedUnit:GetTypeName() DetectedItem.TypeName = DetectedUnit:GetTypeName()
end end
@ -2218,6 +2221,7 @@ do -- DETECTION_TYPES
self:SetDetectedItemCoordinate( DetectedItem, DetectedUnitCoord, DetectedFirstUnit ) self:SetDetectedItemCoordinate( DetectedItem, DetectedUnitCoord, DetectedFirstUnit )
self:ReportFriendliesNearBy( { DetectedItem = DetectedItem, ReportSetGroup = self.DetectionSetGroup } ) -- Fill the Friendlies table self:ReportFriendliesNearBy( { DetectedItem = DetectedItem, ReportSetGroup = self.DetectionSetGroup } ) -- Fill the Friendlies table
self:SetDetectedItemThreatLevel( DetectedItem )
self:NearestRecce( DetectedItem ) self:NearestRecce( DetectedItem )
end end