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

Fixes

Browse Source
This commit is contained in:
FlightControl 2019-03-21 05:49:48 +01:00
parent e996a30333
commit ca65154ecd
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Moose Development/Moose/Core/Zone.lua
View File

@ -710,7 +710,10 @@ function ZONE_RADIUS:GetScannedSetUnit()
if self.ScanData then
for ObjectID, UnitObject in pairs( self.ScanData.Units ) do
SetUnit:AddUnit( UNIT:FindByName(UnitObject:getName() ) )
local UnitObject = UnitObject -- DCS#Unit
if UnitObject:isExist() then
SetUnit:AddUnit( UNIT:FindByName( UnitObject:getName() ) )
end
end
end

16
Moose Development/Moose/Tasking/Task_Capture_Zone.lua
View File

@ -211,7 +211,7 @@ do -- TASK_CAPTURE_ZONE
"Capture Zone " .. self.TaskZoneName
)
self:UpdateTaskInfo()
self:UpdateTaskInfo( true )
return self
end
@ -219,18 +219,18 @@ do -- TASK_CAPTURE_ZONE
--- Instantiates a new TASK_CAPTURE_ZONE.
-- @param #TASK_CAPTURE_ZONE self
function TASK_CAPTURE_ZONE:UpdateTaskInfo( DetectedItem )
function TASK_CAPTURE_ZONE:UpdateTaskInfo( Persist )
self:F({"Update"})
Persist = Persist or false
local ZoneCoordinate = self.ZoneGoal:GetZone():GetCoordinate()
self.TaskInfo:AddTaskName( 0, "MSOD" )
self.TaskInfo:AddCoordinate( ZoneCoordinate, 1, "SOD" )
self.TaskInfo:AddText( "Zone Name", self.ZoneGoal:GetZoneName(), 10, "MOD" )
self.TaskInfo:AddText( "Zone Coalition", self.ZoneGoal:GetCoalitionName(), 11, "MOD" )
self.TaskInfo:AddTaskName( 0, "MSOD", Persist )
self.TaskInfo:AddCoordinate( ZoneCoordinate, 1, "SOD", Persist )
self.TaskInfo:AddText( "Zone Name", self.ZoneGoal:GetZoneName(), 10, "MOD", Persist )
self.TaskInfo:AddText( "Zone Coalition", self.ZoneGoal:GetCoalitionName(), 11, "MOD", Persist )
local SetUnit = self.ZoneGoal.Zone:GetScannedSetUnit()
local ThreatLevel, ThreatText = SetUnit:CalculateThreatLevelA2G()
self.TaskInfo:AddThreat( ThreatText, ThreatLevel, 20, "MOD" )
self.TaskInfo:AddThreat( ThreatText, ThreatLevel, 20, "MSOD", Persist )
end