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

Updates

Browse Source
This commit is contained in:
FlightControl_Master
2017-09-13 07:07:07 +02:00
parent 5d62125245
commit adb4befcdf
5 changed files with 169 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Moose Development/Moose/Tasking/Task.lua
View File

@@ -867,13 +867,46 @@ function TASK:MenuMarkToGroup( TaskGroup )
self:E( "Mark Task menu selected")
self:UpdateTaskInfo()
local Report = REPORT:New():SetIndent( 0 )
-- List the name of the Task.
local Name = self:GetName()
Report:Add( Name .. ": " .. self:GetTaskBriefing() )
for TaskInfoID, TaskInfo in pairs( self.TaskInfo, function( t, a, b ) return t[a].TaskInfoOrder < t[b].TaskInfoOrder end ) do
local TaskInfoIDText = "" --string.format( "%s: ", TaskInfoID )
if type( TaskInfo.TaskInfoText ) == "string" then
Report:Add( TaskInfoIDText .. TaskInfo.TaskInfoText )
elseif type(TaskInfo) == "table" then
if TaskInfoID == "Coordinates" then
local ToCoordinate = TaskInfo.TaskInfoText -- Core.Point#COORDINATE
Report:Add( TaskInfoIDText .. ToCoordinate:ToString() )
else
end
end
end
self:E("ok5")
local Coordinate = self:GetInfo( "Coordinates" ) -- Core.Point#COORDINATE
local Briefing = self:GetTaskBriefing()
self:F( { Briefing = Briefing, Coordinate = Coordinate } )
local Velocity = self.TargetSetUnit:GetVelocity()
local Heading = self.TargetSetUnit:GetHeading()
Coordinate:MarkToGroup( Briefing, TaskGroup )
Coordinate:SetHeading( Heading )
Coordinate:SetVelocity( Velocity )
Report:Add( "Targets are" .. Coordinate:GetMovingText() .. "." )
local MarkText = Report:Text( ", " )
self:F( { Coordinate = Coordinate, MarkText = MarkText } )
Coordinate:MarkToGroup( MarkText, TaskGroup )
--Coordinate:MarkToAll( Briefing )
end

54
Moose Development/Moose/Tasking/Task_A2G.lua
View File

@@ -323,16 +323,9 @@ do -- TASK_A2G_SEAD
Mission:AddTask( self )
self:UpdateTaskInfo()
local ThreatLevel, ThreatText = TargetSetUnit:CalculateThreatLevelA2G()
local TargetUnit = TargetSetUnit:GetFirst()
local TargetCoord = TargetUnit:GetCoordinate() -- Core.Point#COORDINATE
self:SetBriefing(
TaskBriefing or
"Execute a Suppression of Enemy Air Defenses. " ..
ThreatText .. " targets to be expected. Target is" .. TargetCoord:GetMovingText() .. "."
"Execute a Suppression of Enemy Air Defenses."
)
return self
@@ -344,7 +337,13 @@ do -- TASK_A2G_SEAD
local TargetCoordinate = self.Detection and self.Detection:GetDetectedItemCoordinate( self.DetectedItemIndex ) or self.TargetSetUnit:GetFirst():GetCoordinate()
self:SetInfo( "Coordinates", TargetCoordinate, 0 )
self:SetInfo( "Threat", "[" .. string.rep( "■", self.Detection and self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex ) or self.TargetSetUnit:CalculateThreatLevelA2G() ) .. "]", 11 )
local ThreatLevel, ThreatText
if self.Detection then
ThreatLevel, ThreatText = self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex )
else
ThreatLevel, ThreatText = self.TargetSetUnit:CalculateThreatLevelA2G()
end
self:SetInfo( "Threat", ThreatText .. " [" .. string.rep( "■", ThreatLevel ) .. "]", 11 )
if self.Detection then
local DetectedItemsCount = self.TargetSetUnit:Count()
@@ -471,16 +470,9 @@ do -- TASK_A2G_BAI
Mission:AddTask( self )
self:UpdateTaskInfo()
local ThreatLevel, ThreatText = TargetSetUnit:CalculateThreatLevelA2G()
local TargetUnit = TargetSetUnit:GetFirst()
local TargetCoord = TargetUnit:GetCoordinate() -- Core.Point#COORDINATE
self:SetBriefing(
TaskBriefing or
"Execute a Battlefield Air Interdiction of a group of enemy targets. " ..
ThreatText .. " targets to be expected. Target is" .. TargetCoord:GetMovingText() .. "."
"Execute a Battlefield Air Interdiction of a group of enemy targets."
)
return self
@@ -493,7 +485,13 @@ do -- TASK_A2G_BAI
local TargetCoordinate = self.Detection and self.Detection:GetDetectedItemCoordinate( self.DetectedItemIndex ) or self.TargetSetUnit:GetFirst():GetCoordinate()
self:SetInfo( "Coordinates", TargetCoordinate, 0 )
self:SetInfo( "Threat", "[" .. string.rep( "■", self.Detection and self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex ) or self.TargetSetUnit:CalculateThreatLevelA2G() ) .. "]", 11 )
local ThreatLevel, ThreatText
if self.Detection then
ThreatLevel, ThreatText = self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex )
else
ThreatLevel, ThreatText = self.TargetSetUnit:CalculateThreatLevelA2G()
end
self:SetInfo( "Threat", ThreatText .. " [" .. string.rep( "■", ThreatLevel ) .. "]", 11 )
if self.Detection then
local DetectedItemsCount = self.TargetSetUnit:Count()
@@ -620,18 +618,10 @@ do -- TASK_A2G_CAS
Mission:AddTask( self )
self:UpdateTaskInfo()
local ThreatLevel, ThreatText = TargetSetUnit:CalculateThreatLevelA2G()
local TargetUnit = TargetSetUnit:GetFirst()
local TargetCoord = TargetUnit:GetCoordinate() -- Core.Point#COORDINATE
self:SetBriefing(
TaskBriefing or
"Execute a Close Air Support for a group of enemy targets. " ..
"Beware of friendlies at the vicinity! " ..
ThreatText .. " targets to be expected. Target is" .. TargetCoord:GetMovingText() .. "."
"Beware of friendlies at the vicinity! "
)
@@ -643,9 +633,13 @@ do -- TASK_A2G_CAS
local TargetCoordinate = self.Detection and self.Detection:GetDetectedItemCoordinate( self.DetectedItemIndex ) or self.TargetSetUnit:GetFirst():GetCoordinate()
self:SetInfo( "Coordinates", TargetCoordinate, 0 )
local ThreatLevel = self.Detection and self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex ) or self.TargetSetUnit:CalculateThreatLevelA2G()
self:SetInfo( "Threat", "[" .. string.rep( "■", ThreatLevel ) .. "]", 11 )
local ThreatLevel, ThreatText
if self.Detection then
ThreatLevel, ThreatText = self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex )
else
ThreatLevel, ThreatText = self.TargetSetUnit:CalculateThreatLevelA2G()
end
self:SetInfo( "Threat", ThreatText .. " [" .. string.rep( "■", ThreatLevel ) .. "]", 11 )
if self.Detection then
local DetectedItemsCount = self.TargetSetUnit:Count()