From 84ddb3e380fff7658ebbb313d5fdc80205180f2e Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Thu, 5 Oct 2017 19:08:33 +0200 Subject: [PATCH] Progress --- Moose Development/Moose/Core/Point.lua | 4 +++- Moose Development/Moose/Tasking/TaskZoneCapture.lua | 2 +- Moose Mission Setup/Moose.lua | 2 +- Moose Mission Setup/Moose_.lua | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua index eabb09c87..db575a2ab 100644 --- a/Moose Development/Moose/Core/Point.lua +++ b/Moose Development/Moose/Core/Point.lua @@ -1081,7 +1081,7 @@ do -- COORDINATE local Settings = Settings or ( Controllable and _DATABASE:GetPlayerSettings( Controllable:GetPlayerName() ) ) or _SETTINGS - local ModeA2A = true + local ModeA2A = false if Task then if Task:IsInstanceOf( TASK_A2A ) then @@ -1092,6 +1092,8 @@ do -- COORDINATE else if Task:IsInstanceOf( TASK_CARGO ) then ModeA2A = false + else + ModeA2A = false end end end diff --git a/Moose Development/Moose/Tasking/TaskZoneCapture.lua b/Moose Development/Moose/Tasking/TaskZoneCapture.lua index accb1eaa9..b23f35988 100644 --- a/Moose Development/Moose/Tasking/TaskZoneCapture.lua +++ b/Moose Development/Moose/Tasking/TaskZoneCapture.lua @@ -176,7 +176,7 @@ do -- TASK_ZONE_GOAL if TaskInfoID == "Coordinate" then local FromCoordinate = ReportGroup:GetUnit(1):GetCoordinate() local ToCoordinate = TaskInfo.TaskInfoText -- Core.Point#COORDINATE - return string.format( " - %s: %s", TaskInfoID, ToCoordinate:ToString( ReportGroup:GetUnit(1), nil, self ) ) + return string.format( " - %s: %s", TaskInfoID, ToCoordinate:ToString( ReportGroup:GetUnit( 1 ), nil, self ) ) else end end diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index e390e9e67..a8d2fafcf 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20171005_1714' ) +env.info( 'Moose Generation Timestamp: 20171005_1908' ) local base = _G diff --git a/Moose Mission Setup/Moose_.lua b/Moose Mission Setup/Moose_.lua index 497702a58..5ffa8d3e9 100644 --- a/Moose Mission Setup/Moose_.lua +++ b/Moose Mission Setup/Moose_.lua @@ -1,5 +1,5 @@ env.info('*** MOOSE DYNAMIC INCLUDE START *** ') -env.info('Moose Generation Timestamp: 20171005_1714') +env.info('Moose Generation Timestamp: 20171005_1908') local base=_G __Moose={} __Moose.Include=function(IncludeFile)