From b1ecdc727c98ca17f758a7d0d58b1df91a291a32 Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Sat, 7 Apr 2018 19:00:18 +0200 Subject: [PATCH] Faster menu and fix for Disembark loaded engineers in other helicopter. --- Moose Development/Moose/Cargo/Cargo.lua | 8 ++++++++ Moose Development/Moose/Tasking/Task_CARGO.lua | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Cargo/Cargo.lua b/Moose Development/Moose/Cargo/Cargo.lua index eb44217a3..cacd5fa64 100644 --- a/Moose Development/Moose/Cargo/Cargo.lua +++ b/Moose Development/Moose/Cargo/Cargo.lua @@ -384,6 +384,14 @@ do -- CARGO return self:Is( "Loaded" ) end + --- Check if cargo is loaded. + -- @param #CARGO self + -- @param Wrapper.Unit#UNIT Carrier + -- @return #boolean true if loaded + function CARGO:IsLoadedInCarrier( Carrier ) + return self.CargoCarrier and self.CargoCarrier:GetName() == Carrier:GetName() + end + --- Check if cargo is unloaded. -- @param #CARGO self -- @return #boolean true if unloaded diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua index 101399783..933413ebc 100644 --- a/Moose Development/Moose/Tasking/Task_CARGO.lua +++ b/Moose Development/Moose/Tasking/Task_CARGO.lua @@ -306,7 +306,7 @@ do -- TASK_CARGO end - if Cargo:IsLoaded() then + if Cargo:IsLoaded() == true and Cargo:IsLoadedInCarrier( TaskUnit ) == true then if not TaskUnit:InAir() then if Cargo:CanUnboard() == true then MENU_GROUP_COMMAND:New( TaskUnit:GetGroup(), "Unboard cargo " .. Cargo.Name, TaskUnit.Menu, self.MenuUnboardCargo, self, Cargo ):SetTime(MenuTime) @@ -333,7 +333,7 @@ do -- TASK_CARGO TaskUnit.Menu:Remove( MenuTime ) - self:__SelectAction( -5 ) + self:__SelectAction( -1 ) end