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

SEAD working correctly + readjust test missions not to loose anything.

Browse Source
This commit is contained in:
FlightControl
2016-07-13 09:08:08 +02:00
parent ce19e3bc03
commit 86b283c7f0
35 changed files with 77 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Moose Development/Moose/Set.lua
View File

@@ -351,12 +351,16 @@ end
--- Copies the Filter criteria from a given Set (for rebuilding a new Set based on an existing Set).
-- @param #SET_BASE self
-- @param #SET_BASE OtherSet
-- @param #SET_BASE BaseSet
-- @return #SET_BASE
function SET_BASE:CopyFilter( OtherSet )
function SET_BASE:SetDatabase( BaseSet )
local OtherFilter = routines.utils.deepCopy( OtherSet.Filter )
-- Copy the filter criteria of the BaseSet
local OtherFilter = routines.utils.deepCopy( BaseSet.Filter )
self.Filter = OtherFilter
-- Now base the new Set on the BaseSet
self.Database = BaseSet:GetSet()
return self
end
@@ -630,7 +634,7 @@ function SET_BASE:Flush()
for ObjectName, Object in pairs( self.Set ) do
ObjectNames = ObjectNames .. ObjectName .. ", "
end
self:T( { "Objects in Set:", ObjectNames } )
self:E( { "Objects in Set:", ObjectNames } )
return ObjectNames
end
@@ -1455,7 +1459,9 @@ function SET_UNIT:IsIncludeObject( MUnit )
for RadarTypeID, RadarType in pairs( self.Filter.RadarTypes ) do
self:E( { "Radar:", RadarType } )
if MUnit:HasSensors( Unit.SensorType.RADAR, RadarType ) == true then
self:E( "RADAR Found" )
if MUnit:GetRadar() == true then -- This call is necessary to evaluate the SEAD capability.
self:E( "RADAR Found" )
end
MUnitRadar = true
end
end