From efd2f7938e6ff41d1ddeca3571059a6a26200313 Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Fri, 15 Sep 2017 10:39:50 +0200 Subject: [PATCH 1/3] Optimized code for SpawnAtAirbase --- Moose Development/Moose/Functional/Spawn.lua | 83 ++++++++++++-------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/Moose Development/Moose/Functional/Spawn.lua b/Moose Development/Moose/Functional/Spawn.lua index e34a384b4..9f5a87b1f 100644 --- a/Moose Development/Moose/Functional/Spawn.lua +++ b/Moose Development/Moose/Functional/Spawn.lua @@ -1008,55 +1008,74 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude ) -- R2.2 self:T( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } ) + local SpawnPoint = SpawnTemplate.route.points[1] + + -- These are only for ships. + SpawnPoint.linkUnit = nil + SpawnPoint.helipadId = nil + SpawnPoint.airdromeId = nil + + local AirbaseID = SpawnAirbase:GetID() + local AirbaseCategory = SpawnAirbase:GetDesc().category + self:F( { AirbaseCategory = AirbaseCategory } ) + + if AirbaseCategory == Airbase.Category.SHIP then + SpawnPoint.linkUnit = AirbaseID + SpawnPoint.helipadId = AirbaseID + elseif AirbaseCategory == Airbase.Category.HELIPAD then + SpawnPoint.linkUnit = AirbaseID + SpawnPoint.helipadId = AirbaseID + elseif AirbaseCategory == Airbase.Category.AIRDROME then + SpawnPoint.airdromeId = AirbaseID + end + + SpawnPoint.alt = 0 + + SpawnPoint.type = GROUPTEMPLATE.Takeoff[Takeoff][1] -- type + SpawnPoint.action = GROUPTEMPLATE.Takeoff[Takeoff][2] -- action + + -- Translate the position of the Group Template to the Vec3. for UnitID = 1, #SpawnTemplate.units do self:T( 'Before Translation SpawnTemplate.units['..UnitID..'].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units['..UnitID..'].y = ' .. SpawnTemplate.units[UnitID].y ) + + -- These cause a lot of confusion. local UnitTemplate = SpawnTemplate.units[UnitID] + + UnitTemplate.parking = nil + UnitTemplate.parking_id = nil + UnitTemplate.alt = 0 + local SX = UnitTemplate.x local SY = UnitTemplate.y - local BX = SpawnTemplate.route.points[1].x - local BY = SpawnTemplate.route.points[1].y + local BX = SpawnPoint.x + local BY = SpawnPoint.y local TX = PointVec3.x + ( SX - BX ) local TY = PointVec3.z + ( SY - BY ) - SpawnTemplate.units[UnitID].x = TX - SpawnTemplate.units[UnitID].y = TY + + UnitTemplate.x = TX + UnitTemplate.y = TY + if Takeoff == GROUP.Takeoff.Air then - SpawnTemplate.units[UnitID].alt = PointVec3.y + ( TakeoffAltitude or 200 ) - else - SpawnTemplate.units[UnitID].alt = PointVec3.y + 10 + UnitTemplate.alt = PointVec3.y + ( TakeoffAltitude or 200 ) + --else + -- UnitTemplate.alt = PointVec3.y + 10 end - SpawnTemplate.units[UnitID].parking = nil - SpawnTemplate.units[UnitID].parking_id = nil - self:T( 'After Translation SpawnTemplate.units['..UnitID..'].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units['..UnitID..'].y = ' .. SpawnTemplate.units[UnitID].y ) + self:T( 'After Translation SpawnTemplate.units['..UnitID..'].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units['..UnitID..'].y = ' .. UnitTemplate.y ) end - SpawnTemplate.route.points[1].x = PointVec3.x - SpawnTemplate.route.points[1].y = PointVec3.z + SpawnPoint.x = PointVec3.x + SpawnPoint.y = PointVec3.z + if Takeoff == GROUP.Takeoff.Air then - SpawnTemplate.route.points[1].alt = PointVec3.y + ( TakeoffAltitude or 200 ) - else - SpawnTemplate.route.points[1].alt = PointVec3.y + 10 - SpawnTemplate.route.points[1].airdromeId = SpawnAirbase:GetID() + SpawnPoint.alt = PointVec3.y + ( TakeoffAltitude or 200 ) + --else + -- SpawnPoint.alt = PointVec3.y + 10 end - SpawnTemplate.route.points[1].type = GROUPTEMPLATE.Takeoff[Takeoff][1] -- type - SpawnTemplate.route.points[1].action = GROUPTEMPLATE.Takeoff[Takeoff][2] -- action - + SpawnTemplate.x = PointVec3.x SpawnTemplate.y = PointVec3.z - -- test if the airbase is a ship - - self:F( { AirbaseDesc = SpawnAirbase:GetDesc() } ) - if SpawnAirbase:GetDesc().category == Airbase.Category.SHIP then - SpawnTemplate.route.points[1].linkUnit = SpawnAirbase:GetID() - SpawnTemplate.route.points[1].helipadId = SpawnAirbase:GetID() - SpawnTemplate.route.points[1].alt = 0 - SpawnTemplate.units[1].alt = 0 - SpawnTemplate.route.points[1].airdromeId = nil - self:F( { linkUnit = SpawnTemplate.route.points[1].linkUnit, helipadId = SpawnTemplate.route.points[1].helipadId } ) - end - - return self:SpawnWithIndex( self.SpawnIndex ) end end From 6a725475c9bc933e86b82cab2bcb79a1cba421d2 Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Fri, 15 Sep 2017 10:54:09 +0200 Subject: [PATCH 2/3] Documentation --- Moose Development/Moose/Functional/Spawn.lua | 36 ++++++++- docs/Documentation/AI_Patrol.html | 3 + docs/Documentation/Designate.html | 2 +- docs/Documentation/Detection.html | 3 +- docs/Documentation/Fsm.html | 3 +- docs/Documentation/Movement.html | 4 + docs/Documentation/Settings.html | 2 +- docs/Documentation/Spawn.html | 85 +++++++++++--------- docs/Documentation/SpawnStatic.html | 1 - docs/Documentation/Task_Cargo.html | 3 +- 10 files changed, 96 insertions(+), 46 deletions(-) diff --git a/Moose Development/Moose/Functional/Spawn.lua b/Moose Development/Moose/Functional/Spawn.lua index 9f5a87b1f..dfa15037d 100644 --- a/Moose Development/Moose/Functional/Spawn.lua +++ b/Moose Development/Moose/Functional/Spawn.lua @@ -200,6 +200,7 @@ -- * @{#SPAWN.SpawnFromStatic}(): Spawn a new group from a structure, taking the position of a @{Static}. -- * @{#SPAWN.SpawnFromUnit}(): Spawn a new group taking the position of a @{Unit}. -- * @{#SPAWN.SpawnInZone}(): Spawn a new group in a @{Zone}. +-- * @{#SPAWN.SpawnAtAirbase}(): Spawn a new group at an @{Airbase}, which can be an airdrome, ship or helipad. -- -- Note that @{#SPAWN.Spawn} and @{#SPAWN.ReSpawn} return a @{GROUP#GROUP.New} object, that contains a reference to the DCSGroup object. -- You can use the @{GROUP} object to do further actions with the DCSGroup. @@ -982,16 +983,49 @@ function SPAWN:OnSpawnGroup( SpawnCallBackFunction, ... ) return self end ---- Will spawn a group at an airbase. +--- Will spawn a group at an @{Airbase}. -- This method is mostly advisable to be used if you want to simulate spawning units at an airbase. -- Note that each point in the route assigned to the spawning group is reset to the point of the spawn. -- You can use the returned group to further define the route to be followed. +-- +-- The @{Airbase#AIRBASE} object must refer to a valid airbase known in the sim. +-- You can use the following enumerations to search for the pre-defined airbases on the current known maps of DCS: +-- +-- * @{Airbase#AIRBASE.Caucasus}: The airbases on the Caucasus map. +-- * @{Airbase#AIRBASE.Nevada}: The airbases on the Nevada (NTTR) map. +-- * @{Airbase#AIRBASE.Normandy}: The airbases on the Normandy map. +-- +-- Use the method @{Airbase#AIRBASE.FindByName}() to retrieve the airbase object. +-- The known AIRBASE objects are automatically imported at mission start by MOOSE. +-- Therefore, there isn't any New() constructor defined for AIRBASE objects. +-- +-- Ships and Farps are added within the mission, and are therefore not known. +-- For these AIRBASE objects, there isn't an @{Airbase#AIRBASE} enumeration defined. +-- You need to provide the **exact name** of the airbase as the parameter to the @{Airbase#AIRBASE.FindByName}() method! +-- -- @param #SPAWN self -- @param Wrapper.Airbase#AIRBASE SpawnAirbase The @{Airbase} where to spawn the group. -- @param #SPAWN.Takeoff Takeoff (optional) The location and takeoff method. Default is Hot. -- @param #number TakeoffAltitude (optional) The altitude above the ground. -- @return Wrapper.Group#GROUP that was spawned. -- @return #nil Nothing was spawned. +-- @usage +-- Spawn_Plane = SPAWN:New( "Plane" ) +-- Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Cold ) +-- Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Hot ) +-- Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Runway ) +-- +-- Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( "Carrier" ), SPAWN.Takeoff.Cold ) +-- +-- Spawn_Heli = SPAWN:New( "Heli") +-- +-- Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Cold" ), SPAWN.Takeoff.Cold ) +-- Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Hot" ), SPAWN.Takeoff.Hot ) +-- Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Runway" ), SPAWN.Takeoff.Runway ) +-- Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Air" ), SPAWN.Takeoff.Air ) +-- +-- Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "Carrier" ), SPAWN.Takeoff.Cold ) +-- function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude ) -- R2.2 self:E( { self.SpawnTemplatePrefix, SpawnAirbase, Takeoff, TakeoffAltitude } ) diff --git a/docs/Documentation/AI_Patrol.html b/docs/Documentation/AI_Patrol.html index 5e8474fed..5b64ef359 100644 --- a/docs/Documentation/AI_Patrol.html +++ b/docs/Documentation/AI_Patrol.html @@ -927,6 +927,9 @@ Use the method AIPATROLZONE.M + +

This table contains the targets detected during patrol.

+
diff --git a/docs/Documentation/Designate.html b/docs/Documentation/Designate.html index e613b9310..ff349e1b5 100644 --- a/docs/Documentation/Designate.html +++ b/docs/Documentation/Designate.html @@ -1097,7 +1097,7 @@ function below will use the range 1-7 just in case

- + #number DESIGNATE.LaseDuration diff --git a/docs/Documentation/Detection.html b/docs/Documentation/Detection.html index e05e22c9f..db832f4d5 100644 --- a/docs/Documentation/Detection.html +++ b/docs/Documentation/Detection.html @@ -2460,6 +2460,7 @@ The index of the DetectedItem.

+ #number DETECTION_BASE.DetectedItemCount @@ -4051,7 +4052,7 @@ Return false to cancel Transition.

- + #number DETECTION_BASE.RefreshTimeInterval diff --git a/docs/Documentation/Fsm.html b/docs/Documentation/Fsm.html index b58946d17..dc67c7520 100644 --- a/docs/Documentation/Fsm.html +++ b/docs/Documentation/Fsm.html @@ -1599,7 +1599,7 @@ A string defining the start state.

- #string + FSM._StartState @@ -1898,6 +1898,7 @@ A string defining the start state.

+ FSM.current diff --git a/docs/Documentation/Movement.html b/docs/Documentation/Movement.html index dfb86750e..3123488df 100644 --- a/docs/Documentation/Movement.html +++ b/docs/Documentation/Movement.html @@ -228,6 +228,7 @@ on defined intervals (currently every minute).

+ #number MOVEMENT.AliveUnits @@ -236,6 +237,9 @@ on defined intervals (currently every minute).

+ +

Contains the counter how many units are currently alive

+
diff --git a/docs/Documentation/Settings.html b/docs/Documentation/Settings.html index 0ff600a3c..274a10019 100644 --- a/docs/Documentation/Settings.html +++ b/docs/Documentation/Settings.html @@ -1241,7 +1241,7 @@ true if metric.

- + #boolean SETTINGS.Metric diff --git a/docs/Documentation/Spawn.html b/docs/Documentation/Spawn.html index e842b54c0..2a77723ca 100644 --- a/docs/Documentation/Spawn.html +++ b/docs/Documentation/Spawn.html @@ -424,9 +424,9 @@ and any spaces before and after the resulting name are removed.

- SPAWN:SpawnAtAirbase(Airbase, Takeoff, TakeoffAltitude) + SPAWN:SpawnAtAirbase(SpawnAirbase, Takeoff, TakeoffAltitude) -

Will spawn a group at an airbase.

+

Will spawn a group at an Airbase.

@@ -829,16 +829,6 @@ and any spaces before and after the resulting name are removed.

SPAWN.uncontrolled - - - - -

Type SPAWN.Takeoff

- - - -
SPAWN.Takeoff.type -
@@ -1034,6 +1024,7 @@ So in principle, the group list will contain all parameters and configurations a
  • SPAWN.SpawnFromStatic(): Spawn a new group from a structure, taking the position of a Static.
  • SPAWN.SpawnFromUnit(): Spawn a new group taking the position of a Unit.
  • SPAWN.SpawnInZone(): Spawn a new group in a Zone.
    • +
  • SPAWN.SpawnAtAirbase(): Spawn a new group at an Airbase, which can be an airdrome, ship or helipad.

    • Note that SPAWN.Spawn and SPAWN.ReSpawn return a GROUP#GROUP.New object, that contains a reference to the DCSGroup object. @@ -2201,9 +2192,6 @@ The group that was spawned. You can use this group for further actions.

    - -

    Don't repeat the group from Take-Off till Landing and back Take-Off by ReSpawning.

    -
    @@ -2273,23 +2261,41 @@ The group that was spawned. You can use this group for further actions.

    -SPAWN:SpawnAtAirbase(Airbase, Takeoff, TakeoffAltitude) +SPAWN:SpawnAtAirbase(SpawnAirbase, Takeoff, TakeoffAltitude)
    -

    Will spawn a group at an airbase.

    +

    Will spawn a group at an Airbase.

    This method is mostly advisable to be used if you want to simulate spawning units at an airbase. Note that each point in the route assigned to the spawning group is reset to the point of the spawn. You can use the returned group to further define the route to be followed.

    +

    The Airbase#AIRBASE object must refer to a valid airbase known in the sim. +You can use the following enumerations to search for the pre-defined airbases on the current known maps of DCS:

    + + + +

    Use the method Airbase#AIRBASE.FindByName() to retrieve the airbase object. +The known AIRBASE objects are automatically imported at mission start by MOOSE. +Therefore, there isn't any New() constructor defined for AIRBASE objects.

    + +

    Ships and Farps are added within the mission, and are therefore not known. +For these AIRBASE objects, there isn't an Airbase#AIRBASE enumeration defined. +You need to provide the exact name of the airbase as the parameter to the Airbase#AIRBASE.FindByName() method!

    + +

    Parameters

    • -

      Wrapper.Airbase#AIRBASE Airbase : +

      Wrapper.Airbase#AIRBASE SpawnAirbase : The Airbase where to spawn the group.

      • @@ -2321,6 +2327,24 @@ Nothing was spawned.

      +

      Usage:

      + 
        Spawn_Plane = SPAWN:New( "Plane" )
+  Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Cold )
+  Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Hot )
+  Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( AIRBASE.Caucasus.Krymsk ), SPAWN.Takeoff.Runway )
+  
+  Spawn_Plane:SpawnAtAirbase( AIRBASE:FindByName( "Carrier" ), SPAWN.Takeoff.Cold )
+  
+  Spawn_Heli = SPAWN:New( "Heli")
+  
+  Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Cold" ), SPAWN.Takeoff.Cold )
+  Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Hot" ), SPAWN.Takeoff.Hot )
+  Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Runway" ), SPAWN.Takeoff.Runway )
+  Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "FARP Air" ), SPAWN.Takeoff.Air )
+  
+  Spawn_Heli:SpawnAtAirbase( AIRBASE:FindByName( "Carrier" ), SPAWN.Takeoff.Cold )
+
      +
    @@ -2756,9 +2780,6 @@ when nothing was spawned.

    - -

    By default, no InitLimit

    -
    @@ -2794,7 +2815,7 @@ when nothing was spawned.

    - #number + SPAWN.SpawnMaxGroups @@ -2811,7 +2832,7 @@ when nothing was spawned.

    - #number + SPAWN.SpawnMaxUnitsAlive @@ -3139,7 +3160,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 )
    - #boolean + SPAWN.SpawnUnControlled @@ -3163,7 +3184,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 ) -

    Flag that indicates if all the Groups of the SpawnGroup need to be visible when Spawned.

    +

    When the first Spawn executes, all the Groups need to be made visible before start.

    @@ -3766,20 +3787,6 @@ True = Continue Scheduler

    Enumerator for spawns at airbases

    -

    Field(s)

    -
    -
    - - -SPAWN.Takeoff.type - -
    -
    - - - -
    -
    diff --git a/docs/Documentation/SpawnStatic.html b/docs/Documentation/SpawnStatic.html index 251693d35..487563b09 100644 --- a/docs/Documentation/SpawnStatic.html +++ b/docs/Documentation/SpawnStatic.html @@ -437,7 +437,6 @@ ptional) The name of the new static.

    - #number SPAWNSTATIC.SpawnIndex diff --git a/docs/Documentation/Task_Cargo.html b/docs/Documentation/Task_Cargo.html index d83d8b1f6..2f9cb7b3a 100644 --- a/docs/Documentation/Task_Cargo.html +++ b/docs/Documentation/Task_Cargo.html @@ -567,6 +567,7 @@ based on the tasking capabilities defined in Task#TA
    + FSM_PROCESS.DeployZone @@ -631,7 +632,7 @@ based on the tasking capabilities defined in Task#TA
    - + #number TASK_CARGO.CargoLimit From bae6219b7afb0e73edd1d06da1ae641b190fddeb Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Fri, 15 Sep 2017 13:42:08 +0200 Subject: [PATCH 3/3] Fix crash with markings * Fixed a crash with markings * Optimized the detailed report of a task --- Moose Development/Moose/Core/Point.lua | 3 +- Moose Development/Moose/Tasking/Task.lua | 39 +++++++++++++++--------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua index 014422de0..4589d98b6 100644 --- a/Moose Development/Moose/Core/Point.lua +++ b/Moose Development/Moose/Core/Point.lua @@ -338,7 +338,7 @@ do -- COORDINATE -- @return #string function COORDINATE:GetMovingText( Settings ) - return self:GetVelocityText( Settings ) .. self:GetHeadingText( Settings ) + return self:GetVelocityText( Settings ) .. ", " .. self:GetHeadingText( Settings ) end @@ -350,6 +350,7 @@ do -- COORDINATE return { x = TargetCoordinate.x - self.x, y = TargetCoordinate.y - self.y, z = TargetCoordinate.z - self.z } end + --- Get a correction in radians of the real magnetic north of the COORDINATE. -- @param #COORDINATE self -- @return #number CorrectionRadians The correction in radians. diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index 03e7107f5..4d6108705 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -879,19 +879,20 @@ function TASK:MenuMarkToGroup( TaskGroup ) local TaskInfoIDText = "" --string.format( "%s: ", TaskInfoID ) if type( TaskInfo.TaskInfoText ) == "string" then - Report:Add( TaskInfoIDText .. TaskInfo.TaskInfoText ) - elseif type(TaskInfo) == "table" then + if TaskInfoID == "Targets" then + else + Report:Add( TaskInfoIDText .. TaskInfo.TaskInfoText ) + end + elseif type( TaskInfo ) == "table" then if TaskInfoID == "Coordinates" then - local ToCoordinate = TaskInfo.TaskInfoText -- Core.Point#COORDINATE - Report:Add( TaskInfoIDText .. ToCoordinate:ToString() ) + --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 Velocity = self.TargetSetUnit:GetVelocity() @@ -1564,6 +1565,8 @@ function TASK:ReportDetails( ReportGroup ) -- Determine the status of the Task. local Status = "<" .. self:GetState() .. ">" + Report:Add( "Task: " .. Name .. " - " .. Status .. " - Detailed Report" ) + -- Loop each Unit active in the Task, and find Player Names. local PlayerNames = self:GetPlayerNames() @@ -1572,10 +1575,11 @@ function TASK:ReportDetails( ReportGroup ) PlayerReport:Add( "Group " .. PlayerGroup:GetCallsign() .. ": " .. PlayerName ) end local Players = PlayerReport:Text() - - Report:Add( "Task: " .. Name .. " - " .. Status .. " - Detailed Report" ) - Report:Add( " - Players:" ) - Report:AddIndent( Players ) + + if Players ~= "" then + Report:Add( " - Players assigned:" ) + Report:AddIndent( Players ) + end for TaskInfoID, TaskInfo in pairs( self.TaskInfo, function( t, a, b ) return t[a].TaskInfoOrder < t[b].TaskInfoOrder end ) do @@ -1585,17 +1589,24 @@ function TASK:ReportDetails( ReportGroup ) Report:Add( TaskInfoIDText .. TaskInfo.TaskInfoText ) elseif type(TaskInfo) == "table" then if TaskInfoID == "Coordinates" then - local FromCoordinate = ReportGroup:GetUnit(1):GetCoordinate() local ToCoordinate = TaskInfo.TaskInfoText -- Core.Point#COORDINATE - Report:Add( TaskInfoIDText ) - Report:AddIndent( ToCoordinate:ToStringBRA( FromCoordinate ) .. ", " .. TaskInfo.TaskInfoText:ToStringAspect( FromCoordinate ) ) - Report:AddIndent( ToCoordinate:ToStringBULLS( ReportGroup:GetCoalition() ) ) + Report:Add( TaskInfoIDText .. ToCoordinate:ToString() ) else end end end + + local Coordinate = self:GetInfo( "Coordinates" ) -- Core.Point#COORDINATE + local Velocity = self.TargetSetUnit:GetVelocity() + local Heading = self.TargetSetUnit:GetHeading() + + Coordinate:SetHeading( Heading ) + Coordinate:SetVelocity( Velocity ) + + Report:Add( "Targets are" .. Coordinate:GetMovingText() .. "." ) + return Report:Text() end