From a76ea8f393431ba61e592713849f8bddf7657b5d Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 26 Sep 2018 21:40:18 +0200 Subject: [PATCH] Stuff --- Moose Development/Moose/AI/AI_Cargo.lua | 2 +- Moose Development/Moose/Cargo/Cargo.lua | 1 + Moose Development/Moose/Cargo/CargoUnit.lua | 2 ++ Moose Development/Moose/Functional/Warehouse.lua | 2 +- 4 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 6251f4e38..b22006944 100644 --- a/Moose Development/Moose/AI/AI_Cargo.lua +++ b/Moose Development/Moose/AI/AI_Cargo.lua @@ -261,7 +261,7 @@ function AI_CARGO:onbeforeLoad( Carrier, From, Event, To, PickupZone ) if Carrier_Weight[CarrierUnit] > CargoWeight then --and CargoBayFreeVolume > CargoVolume then Carrier:RouteStop() --Cargo:Ungroup() - Cargo:__Board( -LoadDelay, CarrierUnit, 25 ) + Cargo:__Board( -LoadDelay, CarrierUnit, 25) LoadDelay = LoadDelay + Cargo:GetCount() * LoadInterval self:__Board( LoadDelay, Cargo, CarrierUnit, PickupZone ) diff --git a/Moose Development/Moose/Cargo/Cargo.lua b/Moose Development/Moose/Cargo/Cargo.lua index 27a40b200..d1a602aed 100644 --- a/Moose Development/Moose/Cargo/Cargo.lua +++ b/Moose Development/Moose/Cargo/Cargo.lua @@ -472,6 +472,7 @@ do -- CARGO self.LoadRadius = LoadRadius or 500 self.NearRadius = NearRadius or 25 + env.info("FF nearradius = ".. self.NearRadius) self:SetDeployed( false ) diff --git a/Moose Development/Moose/Cargo/CargoUnit.lua b/Moose Development/Moose/Cargo/CargoUnit.lua index 474d3f90d..26b1a3b4d 100644 --- a/Moose Development/Moose/Cargo/CargoUnit.lua +++ b/Moose Development/Moose/Cargo/CargoUnit.lua @@ -226,6 +226,8 @@ do -- CARGO_UNIT -- @param #string Event -- @param #string From -- @param #string To + -- @param Wrapper.Group#GROUP CargoCarrier + -- @param #number NearRadius function CARGO_UNIT:onafterBoard( From, Event, To, CargoCarrier, NearRadius, ... ) self:F( { From, Event, To, CargoCarrier, NearRadius } ) diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index f7d7a4242..a7c15e897 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -3350,7 +3350,7 @@ function WAREHOUSE:onafterRequest(From, Event, To, Request) local CargoGroups --Core.Set#SET_CARGO -- Board radius, i.e. when the cargo will begin to board the carrier - local _boardradius=5000 + local _boardradius=500 if Request.transporttype==WAREHOUSE.TransportType.AIRPLANE then _boardradius=5000