FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Faster menu and fix for Disembark loaded engineers in other helicopter.

Browse Source
This commit is contained in:
FlightControl_Master 2018-04-07 19:00:18 +02:00
parent 7735120f25
commit b1ecdc727c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Moose Development/Moose/Cargo/Cargo.lua
View File

@ -384,6 +384,14 @@ do -- CARGO
return self:Is( "Loaded" ) return self:Is( "Loaded" )
end 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. --- Check if cargo is unloaded.
-- @param #CARGO self -- @param #CARGO self
-- @return #boolean true if unloaded -- @return #boolean true if unloaded

4
Moose Development/Moose/Tasking/Task_CARGO.lua
View File

@ -306,7 +306,7 @@ do -- TASK_CARGO
end end
if Cargo:IsLoaded() then if Cargo:IsLoaded() == true and Cargo:IsLoadedInCarrier( TaskUnit ) == true then
if not TaskUnit:InAir() then if not TaskUnit:InAir() then
if Cargo:CanUnboard() == true then if Cargo:CanUnboard() == true then
MENU_GROUP_COMMAND:New( TaskUnit:GetGroup(), "Unboard cargo " .. Cargo.Name, TaskUnit.Menu, self.MenuUnboardCargo, self, Cargo ):SetTime(MenuTime) 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 ) TaskUnit.Menu:Remove( MenuTime )
self:__SelectAction( -5 ) self:__SelectAction( -1 )
end end