Warehouse v0.2.7

Moose Development/Moose/AI/AI_Cargo_APC.lua

@@ -804,6 +804,7 @@ end
 -- @param #AI_CARGO_APC self
 function AI_CARGO_APC._BackHome(APC, self)
   --Trigger BackHome event.
+  env.info(string.format("FF APC %s is back home task function!",APC:GetName()))
   APC:SmokeGreen()
   self:__BackHome(1)
 end
@@ -815,5 +816,6 @@ end
 -- @param Event
 -- @param To
 function AI_CARGO_APC:onafterBackHome( APC, From, Event, To )
+  env.info(string.format("FF APC %s is back home event!",APC:GetName()))
   APC:SmokeRed()
 end

Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua

@@ -402,7 +402,12 @@ function AI_CARGO_DISPATCHER:onafterMonitor()
 
       function AI_Cargo.OnAfterUnloaded( AI_Cargo, Carrier, From, Event, To, Cargo )
         self:Unloaded( Carrier, Cargo )
-      end      
+      end
+      
+      -- FF added back home event.
+      function AI_Cargo.OnAfterBackHome( AI_Cargo, Carrier, From, Event, To)
+        self:BackHome( Carrier )
+      end
     end
 
     -- The Pickup sequence ...

Moose Development/Moose/AI/AI_Cargo_Helicopter.lua

@@ -241,8 +241,11 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
       end
     end
     
-    if self.RouteDeploy == true then
-      if Helicopter:GetHeight( true ) <= 5 and Helicopter:GetVelocityKMH() < 10 then
+    if self.RouteDeploy == true then      
+      local height=Helicopter:GetHeight( true )
+      local velocity=Helicopter:GetVelocityKMH()
+      env.info(string.format("FF helo in air %s, height = %d m, velocity = %d km/h", tostring(Helicopter:InAir()), height, velocity))
+      if  height <= 10 and  velocity < 10 then
         self:Unload( true )
         self.RouteDeploy = false
         self.Transporting = false
@@ -823,15 +826,21 @@ function AI_CARGO_HELICOPTER:onafterHome( Helicopter, From, Event, To, Coordinat
     --- Now we're going to do something special, we're going to call a function from a waypoint action at the AIControllable...
     Helicopter:WayPointInitialize( Route )
   
-    local Tasks = {}
-        
+    local Tasks = {}        
     Tasks[#Tasks+1] = Helicopter:TaskLandAtVec2( CoordinateTo:GetVec2() )
-    Tasks[#Tasks+1] = Helicopter:TaskFunction("AI_CARGO_HELICOPTER._BackHome", self)
-    
     Route[#Route].task = Helicopter:TaskCombo( Tasks )
-
-    Route[#Route+1] = WaypointTo
     
+    -- FF
+    --[[
+    local Tasks2 = {}        
+    Tasks2[#Tasks2+1] = Helicopter:TaskFunction("AI_CARGO_HELICOPTER._BackHome", self)
+    
+    Route[#Route+1] = WaypointTo
+    Route[#Route].task = Helicopter:TaskCombo( Tasks2 )
+    -- FF
+    ]]
+    
+    Route[#Route+1] = WaypointTo
 
     -- Now route the helicopter
     Helicopter:Route( Route, 0 )