From dbb710a980db56bfa5efb98e71d82f57ab2d3659 Mon Sep 17 00:00:00 2001 From: kalbuth Date: Tue, 14 Mar 2017 15:03:12 +0100 Subject: [PATCH 1/2] TaskRouteToZone formation fix setting initial point of TaskRouteToZone mission waypoints to have expected Formation set up. --- Moose Development/Moose/Wrapper/Controllable.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 88d8b8e62..dd8fabff0 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -1620,7 +1620,7 @@ function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation ) PointFrom.x = ControllablePoint.x PointFrom.y = ControllablePoint.y PointFrom.type = "Turning Point" - PointFrom.action = "Cone" + PointFrom.action = Formation or "Cone" PointFrom.speed = 20 / 1.6 From d7f75eaab6bace913683d61ee47a368ad2be08c9 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Tue, 14 Mar 2017 15:30:37 +0100 Subject: [PATCH 2/2] Generate moose.lua --- .../Moose Mission Update/l10n/DEFAULT/Moose.lua | 4 ++-- Moose Mission Setup/Moose.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua index 2917fc379..dcae46fdf 100644 --- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua +++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170314_0908' ) +env.info( 'Moose Generation Timestamp: 20170314_1530' ) local base = _G Include = {} @@ -15069,7 +15069,7 @@ function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation ) PointFrom.x = ControllablePoint.x PointFrom.y = ControllablePoint.y PointFrom.type = "Turning Point" - PointFrom.action = "Cone" + PointFrom.action = Formation or "Cone" PointFrom.speed = 20 / 1.6 diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 2917fc379..dcae46fdf 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170314_0908' ) +env.info( 'Moose Generation Timestamp: 20170314_1530' ) local base = _G Include = {} @@ -15069,7 +15069,7 @@ function CONTROLLABLE:TaskRouteToZone( Zone, Randomize, Speed, Formation ) PointFrom.x = ControllablePoint.x PointFrom.y = ControllablePoint.y PointFrom.type = "Turning Point" - PointFrom.action = "Cone" + PointFrom.action = Formation or "Cone" PointFrom.speed = 20 / 1.6