weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-25 13:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
FlightControl_Master
2017-09-11 14:54:08 +02:00
parent bdfd03a0b8
commit 560f551ed7
7 changed files with 128 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Tasking/Task.lua
+3 -5
View File
@@ -870,13 +870,11 @@ function TASK:MenuMarkToGroup( TaskGroup )
local Coordinate = self:GetInfo( "Coordinates" ) -- Core.Point#COORDINATE
local Briefing = self:GetTaskBriefing()
local GroupID = TaskGroup:GetID()
local Vec3 = Coordinate:GetVec3()
self:F( { Coordinate = Vec3, Briefing = Briefing, GroupID = GroupID } )
self:F( { Briefing = Briefing, Coordinate = Coordinate } )
trigger.action.markToGroup( 1, Briefing, Vec3, GroupID )
--trigger.action.markToAll( 1, Briefing, Vec3 )
--Coordinate:MarkToGroup( Briefing, TaskGroup )
Coordinate:MarkToAll( Briefing )
end
--- Report the task status.
Moose Development/Moose/Tasking/Task_A2G.lua
+31 -12
View File
@@ -323,13 +323,18 @@ do -- TASK_A2G_SEAD
Mission:AddTask( self )
self:SetBriefing(
TaskBriefing or
"Execute a Suppression of Enemy Air Defenses.\n"
)
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() .. "."
)
return self
end
@@ -466,12 +471,17 @@ 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.\n"
"Execute a Battlefield Air Interdiction of a group of enemy targets. " ..
ThreatText .. " targets to be expected. Target is " .. TargetCoord:GetMovingText() .. "."
)
self:UpdateTaskInfo()
return self
end
@@ -610,13 +620,20 @@ 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.\n" ..
"Beware of friendlies at the vicinity!\n"
"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() .. "."
)
self:UpdateTaskInfo()
return self
end
@@ -626,7 +643,9 @@ do -- TASK_A2G_CAS
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 = self.Detection and self.Detection:GetDetectedItemThreatLevel( self.DetectedItemIndex ) or self.TargetSetUnit:CalculateThreatLevelA2G()
self:SetInfo( "Threat", "[" .. string.rep( "■", ThreatLevel ) .. "]", 11 )
if self.Detection then
local DetectedItemsCount = self.TargetSetUnit:Count()