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

Attempt to fix the count problem

Browse Source
This commit is contained in:
FlightControl 2017-05-04 06:33:40 +02:00
parent c7d6027734
commit a06c6176a2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ do -- DETECTION_BASE
-- local SetGroup = SET_GROUP:New():FilterPrefixes( "FAC" ):FilterStart() -- Build a SetGroup of Forward Air Controllers. -- local SetGroup = SET_GROUP:New():FilterPrefixes( "FAC" ):FilterStart() -- Build a SetGroup of Forward Air Controllers.
-- --
-- -- Build a detect object. -- -- Build a detect object.
-- local Detection = DETECTION_BASE:New( SetGroup ) -- local Detection = DETECTION_UNITS:New( SetGroup )
-- --
-- -- This will accept detected units if the range is below 5000 meters. -- -- This will accept detected units if the range is below 5000 meters.
-- Detection:SetAcceptRange( 5000 ) -- Detection:SetAcceptRange( 5000 )
@ -211,7 +211,7 @@ do -- DETECTION_BASE
-- local ZoneAccept2 = ZONE:New( "AcceptZone2" ) -- local ZoneAccept2 = ZONE:New( "AcceptZone2" )
-- --
-- -- Build a detect object. -- -- Build a detect object.
-- local Detection = DETECTION_BASE:New( SetGroup ) -- local Detection = DETECTION_UNITS:New( SetGroup )
-- --
-- -- This will accept detected units by Detection when the unit is within ZoneAccept1 OR ZoneAccept2. -- -- This will accept detected units by Detection when the unit is within ZoneAccept1 OR ZoneAccept2.
-- Detection:SetAcceptZones( { ZoneAccept1, ZoneAccept2 } ) -- Detection:SetAcceptZones( { ZoneAccept1, ZoneAccept2 } )
@ -232,7 +232,7 @@ do -- DETECTION_BASE
-- local ZoneReject2 = ZONE:New( "RejectZone2" ) -- local ZoneReject2 = ZONE:New( "RejectZone2" )
-- --
-- -- Build a detect object. -- -- Build a detect object.
-- local Detection = DETECTION_BASE:New( SetGroup ) -- local Detection = DETECTION_UNITS:New( SetGroup )
-- --
-- -- This will reject detected units by Detection when the unit is within ZoneReject1 OR ZoneReject2. -- -- This will reject detected units by Detection when the unit is within ZoneReject1 OR ZoneReject2.
-- Detection:SetRejectZones( { ZoneReject1, ZoneReject2 } ) -- Detection:SetRejectZones( { ZoneReject1, ZoneReject2 } )
@ -728,7 +728,7 @@ do -- DETECTION_BASE
local DetectedSet = DetectedItem.Set local DetectedSet = DetectedItem.Set
if DetectedSet:Count() == 0 then if DetectedSet:Count() == 0 then
self.DetectedItems[DetectedItemID] = nil self:RemoveDetectedItem(DetectedItemID)
end end
end end
@ -1221,9 +1221,11 @@ do -- DETECTION_BASE
-- @param #number DetectedItemIndex The index or position in the DetectedItems list where the item needs to be removed. -- @param #number DetectedItemIndex The index or position in the DetectedItems list where the item needs to be removed.
function DETECTION_BASE:RemoveDetectedItem( DetectedItemIndex ) function DETECTION_BASE:RemoveDetectedItem( DetectedItemIndex )
if self.DetectedItems[DetectedItemIndex] then
self.DetectedItemCount = self.DetectedItemCount - 1 self.DetectedItemCount = self.DetectedItemCount - 1
self.DetectedItems[DetectedItemIndex] = nil self.DetectedItems[DetectedItemIndex] = nil
end end
end
--- Get the detected @{Set#SET_BASE}s. --- Get the detected @{Set#SET_BASE}s.
@ -1236,7 +1238,7 @@ do -- DETECTION_BASE
--- Get the amount of SETs with detected objects. --- Get the amount of SETs with detected objects.
-- @param #DETECTION_BASE self -- @param #DETECTION_BASE self
-- @return #number Count -- @return #number The amount of detected items. Note that the amount of detected items can differ with the reality, because detections are not real-time but doen in intervals!
function DETECTION_BASE:GetDetectedItemsCount() function DETECTION_BASE:GetDetectedItemsCount()
local DetectedCount = self.DetectedItemCount local DetectedCount = self.DetectedItemCount

1
Moose Development/Moose/Tasking/Mission.lua
View File

@ -295,6 +295,7 @@ function MISSION:AbortUnit( PlayerUnit )
local PlayerUnitRemoved = false local PlayerUnitRemoved = false
for TaskID, Task in pairs( self:GetTasks() ) do for TaskID, Task in pairs( self:GetTasks() ) do
local Task = Task -- Tasking.Task#TASK
if Task:AbortUnit( PlayerUnit ) then if Task:AbortUnit( PlayerUnit ) then
PlayerUnitRemoved = true PlayerUnitRemoved = true
end end