From 703dac8251b3087514d8c1eae9e2288a221e43bc Mon Sep 17 00:00:00 2001 From: FlightControl Date: Thu, 6 Sep 2018 20:31:33 +0200 Subject: [PATCH] Optimization solving the overloading problem with Loaded event for cargo deployment. --- Moose Development/Moose/AI/AI_Cargo.lua | 2 +- Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/AI/AI_Cargo.lua b/Moose Development/Moose/AI/AI_Cargo.lua index 8e145a8c4..885d717de 100644 --- a/Moose Development/Moose/AI/AI_Cargo.lua +++ b/Moose Development/Moose/AI/AI_Cargo.lua @@ -414,7 +414,7 @@ function AI_CARGO:onafterUnloaded( Carrier, From, Event, To, Cargo, CarrierUnit, end if AllUnloaded == true then - self:Deployed( DeployZone ) + self:__Deployed( 5, DeployZone ) end end diff --git a/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua b/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua index 58ed1ce92..eb448955f 100644 --- a/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua @@ -428,6 +428,8 @@ function AI_CARGO_DISPATCHER:New( SetCarrier, SetCargo ) self:AddTransition( "Monitoring", "Loaded", "Monitoring" ) self:AddTransition( "Monitoring", "PickedUp", "Monitoring" ) + self:AddTransition( "Monitoring", "Transport", "Monitoring" ) + self:AddTransition( "Monitoring", "Deploy", "Monitoring" ) self:AddTransition( "Monitoring", "Unload", "Monitoring" ) self:AddTransition( "Monitoring", "Unloading", "Monitoring" ) @@ -771,6 +773,7 @@ function AI_CARGO_DISPATCHER:onafterMonitor() function AI_Cargo.OnAfterPickedUp( AI_Cargo, CarrierGroup, From, Event, To, PickupZone ) self:PickedUp( CarrierGroup, PickupZone ) + self:Transport( CarrierGroup ) end @@ -1011,7 +1014,7 @@ end -- @param Wrapper.Group#GROUP Carrier -- @param Cargo.Cargo#CARGO Cargo -- @return #AI_CARGO_DISPATCHER -function AI_CARGO_DISPATCHER:OnAfterLoaded( From, Event, To, Carrier, Cargo ) +function AI_CARGO_DISPATCHER:onafterTransport( From, Event, To, Carrier, Cargo ) if self.DeployZoneSet then if self.AI_Cargo[Carrier]:IsTransporting() == true then