From 52e473204d85b55c14b68e64db1d04cee0e35a74 Mon Sep 17 00:00:00 2001 From: Sven Van de Velde Date: Fri, 12 Aug 2016 08:01:00 +0200 Subject: [PATCH] Static moose.lua --- .../Moose Mission Update/l10n/DEFAULT/Moose.lua | 10 +--------- Moose Mission Setup/Moose.lua | 6 +----- 2 files changed, 2 insertions(+), 14 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 1cc562db9..285a01d19 100644 --- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua +++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua @@ -1,9 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -<<<<<<< HEAD -env.info( 'Moose Generation Timestamp: 20160811_0937' ) -======= -env.info( 'Moose Generation Timestamp: 20160810_0820' ) ->>>>>>> refs/remotes/origin/master +env.info( 'Moose Generation Timestamp: 20160812_0800' ) local base = _G Include = {} @@ -21948,11 +21944,7 @@ function SPAWN:_RandomizeRoute( SpawnIndex ) SpawnTemplate.route.points[t].y = SpawnTemplate.route.points[t].y + math.random( self.SpawnRandomizeRouteRadius * -1, self.SpawnRandomizeRouteRadius ) -- Manage randomization of altitude for airborne units ... -<<<<<<< HEAD if SpawnTemplate.CategoryID == Group.Category.AIRPLANE or SpawnTemplate.CategoryID == Group.Category.HELICOPTER then -======= - if SpawnTemplate.SpawnCategoryID == Group.Category.AIRPLANE or SpawnTemplate.SpawnCategoryID == Group.Category.HELICOPTER then ->>>>>>> refs/remotes/origin/master if SpawnTemplate.route.points[t].alt and self.SpawnRandomizeRouteHeight then SpawnTemplate.route.points[t].alt = SpawnTemplate.route.points[t].alt + math.random( 1, self.SpawnRandomizeRouteHeight ) end diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 99882d4a9..285a01d19 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,9 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -<<<<<<< HEAD -env.info( 'Moose Generation Timestamp: 20160811_0937' ) -======= -env.info( 'Moose Generation Timestamp: 20160810_0820' ) ->>>>>>> refs/remotes/origin/master +env.info( 'Moose Generation Timestamp: 20160812_0800' ) local base = _G Include = {}