From ddfc22bb5007a59d865f8808bc242965814c958f Mon Sep 17 00:00:00 2001 From: FlightControl Date: Mon, 8 Apr 2019 06:41:22 +0200 Subject: [PATCH] wip --- Moose Development/Moose/AI/AI_Escort.lua | 32 ++++++++---------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/Moose Development/Moose/AI/AI_Escort.lua b/Moose Development/Moose/AI/AI_Escort.lua index 9f4f813aa..713129c0d 100644 --- a/Moose Development/Moose/AI/AI_Escort.lua +++ b/Moose Development/Moose/AI/AI_Escort.lua @@ -300,8 +300,14 @@ function AI_ESCORT:Menus() -- self:MenuScanForTargets( 100, 60 ) self:MenuJoinUp() - self:MenuFormationTrail( 0, 0, 50 ) - self:MenuFormationStack( 0, 0, 100, 150 ) + self:MenuFormationTrail( 0, 50, 100 ) + self:MenuFormationStack( 0, 0, 100, 100 ) + self:MenuFormationLeftLine( 0, 0, 100, 100 ) + self:MenuFormationRightLine( 0, 0, 100, 100 ) + self:MenuFormationLeftWing( 0, 50, 0, 100, 100 ) + self:MenuFormationRightWing( 0, 50, 0, 100, 100 ) + self:MenuFormationCenterWing( 50, 50, 0, 50, 100, 100 ) + self:MenuFormationBox( 50, 100, 0, 50, 50, 100, 10 ) self:MenuHoldAtEscortPosition( 1000, 500 ) self:MenuHoldAtLeaderPosition( 1000, 500 ) @@ -333,12 +339,12 @@ function AI_ESCORT:MenuFormation( Formation, ... ) function ( self, Formation, ... ) self.EscortGroupSet:ForEachGroupAlive( --- @param Core.Group#GROUP EscortGroup - function( EscortGroup ) + function( EscortGroup, self, Formation, ... ) if EscortGroup:IsAir() then self:E({Formation=Formation}) - self["Formation"..Formation]( arg ) + self["Formation"..Formation]( self, ... ) end - end + end, self, Formation, ... ) end, self, Formation, ... ) @@ -426,22 +432,6 @@ function AI_ESCORT:MenuFormationStack( XStart, XSpace, YStart, YSpace ) end ---- Defines a menu slot to let the escort to join in a leFt wing formation. --- This menu will appear under **Formation**. --- @param #AI_ESCORT self --- @param #number XStart The start position on the X-axis in meters for the first group. --- @param #nubmer YStart The start position on the Y-axis in meters for the first group. --- @param #nubmer ZStart The start position on the Z-axis in meters for the first group. --- @param #number ZSpace The space between groups on the Z-axis in meters for each sequent group. --- @return #AI_ESCORT -function AI_ESCORT:MenuFormationLeftWing( XStart, YStart, ZStart, ZSpace ) - - self:MenuFormation( "LeftWing", XStart, YStart, ZStart, ZSpace ) - - return self -end - - --- Defines a menu slot to let the escort to join in a leFt wing formation. -- This menu will appear under **Formation**. -- @param #AI_ESCORT self