Merge branch 'develop'

Fixing back to the inclusion of inactive units.
2025-08-15 10:47:21 +00:00 · 2018-10-21 13:18:29 +02:00 · 2018-10-21 13:12:20 +02:00 · 2018-10-20 04:31:59 +02:00 · 2018-10-20 04:26:45 +02:00 · 2018-10-19 17:01:11 +02:00
2 changed files with 2 additions and 2 deletions
--- a/Development/Moose/AI/AI_Cargo_Dispatcher.lua
+++ b/Development/Moose/AI/AI_Cargo_Dispatcher.lua
@@ -899,7 +899,7 @@ function AI_CARGO_DISPATCHER:onafterMonitor()
  
  for CarrierGroupName, Carrier in pairs( self.SetCarrier:GetSet() ) do
    local Carrier = Carrier -- Wrapper.Group#GROUP
-    if Carrier:IsAlive() == true then
+    if Carrier:IsAlive() ~= nil then
      local AI_Cargo = self.AI_Cargo[Carrier]
      if not AI_Cargo then
      
--- a/Development/Moose/Wrapper/Controllable.lua
+++ b/Development/Moose/Wrapper/Controllable.lua
@@ -2136,7 +2136,7 @@ do -- Route methods
    local canroad=false
                
    -- Check if a valid path on road could be found.
-    if PathOnRoad then
+    if PathOnRoad and LengthDirect > 2000 then -- if the length of the movement is less than 1 km, drive directly.
      -- Check whether the road is very long compared to direct path.
      if LongRoad and Shortcut then
Author	SHA1	Message	Date
FlightControl	3011b0ac8e	Merge branch 'develop'	2018-10-21 13:18:29 +02:00
FlightControl	e4334cccb3	Fixing back to the inclusion of inactive units.	2018-10-21 13:12:20 +02:00
FlightControl	fd30da2f95	Merge branch 'develop'	2018-10-20 04:31:59 +02:00
FlightControl	b378ad2885	Fixing path calculation. Direct route when the length between the two coordinates is less than 2 km.	2018-10-20 04:26:45 +02:00
FlightControl	9c45031a33	Merge branch 'develop'	2018-10-19 17:01:11 +02:00
FlightControl	e4606b4d05	Fixing path calculation. Direct route when the length between the two coordinates is less than 1 km.	2018-10-19 17:00:43 +02:00