diff --git a/README.md b/README.md index 00e4c513..fe05aca9 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # FS22_AutoDrive FS22 version of the AutoDrive mod -### Latest Release: 2.0.0.6 +### Latest Release: 2.0.0.7 ![GitHub all releases](https://img.shields.io/github/downloads/Stephan-S/FS22_AutoDrive/total?label=Downloads&style=plastic) [Latest Release](https://github.com/Stephan-S/FS22_AutoDrive/releases/latest) -Direct Download: https://github.com/Stephan-S/FS22_AutoDrive/releases/download/2.0.0.6/FS22_AutoDrive.zip +Direct Download: https://github.com/Stephan-S/FS22_AutoDrive/releases/download/2.0.0.7/FS22_AutoDrive.zip ## Discord Server: For help & support, feel free to join us on Discord: diff --git a/modDesc.xml b/modDesc.xml index f6c2aa4c..227400b3 100644 --- a/modDesc.xml +++ b/modDesc.xml @@ -32,7 +32,7 @@ Différents modes d'utilisation ont été ajoutés depuis les premières version - 2.0.0.6 + 2.0.0.7 icon.dds diff --git a/scripts/AutoDrive.lua b/scripts/AutoDrive.lua index 2496da3d..b8c93c2f 100644 --- a/scripts/AutoDrive.lua +++ b/scripts/AutoDrive.lua @@ -1,5 +1,5 @@ AutoDrive = {} -AutoDrive.version = "2.0.0.6" +AutoDrive.version = "2.0.0.7" AutoDrive.directory = g_currentModDirectory diff --git a/scripts/Manager/UserDataManager.lua b/scripts/Manager/UserDataManager.lua index 108c3bd0..d7f1cebb 100644 --- a/scripts/Manager/UserDataManager.lua +++ b/scripts/Manager/UserDataManager.lua @@ -93,17 +93,16 @@ function ADUserDataManager:saveToXml() if g_currentMission.userManager.getUserByConnection then local user = g_currentMission.userManager:getUserByConnection(connection) if user == nil then - -- no client, create a single player user + -- no client, create a single player user ID local uniqueId = ADUserDataManager.SinglePlayer - if self.users[uniqueId] == nil then - -- single player user data not loaded before, so use the current data - self.users[uniqueId] = {} - self.users[uniqueId].hudX = AutoDrive.HudX or 0.5 - self.users[uniqueId].hudY = AutoDrive.HudY or 0.5 - self.users[uniqueId].settings = {} - for _, sn in pairs(self.userSettingNames) do - self.users[uniqueId].settings[sn] = AutoDrive.getSettingState(sn) - end + + -- single player, so use the current data + self.users[uniqueId] = {} + self.users[uniqueId].hudX = AutoDrive.HudX or 0.5 + self.users[uniqueId].hudY = AutoDrive.HudY or 0.5 + self.users[uniqueId].settings = {} + for _, sn in pairs(self.userSettingNames) do + self.users[uniqueId].settings[sn] = AutoDrive.getSettingState(sn) end end end diff --git a/scripts/Utils/CollisionDetectionUtils.lua b/scripts/Utils/CollisionDetectionUtils.lua index b7dc1555..7b2b31e1 100644 --- a/scripts/Utils/CollisionDetectionUtils.lua +++ b/scripts/Utils/CollisionDetectionUtils.lua @@ -16,7 +16,10 @@ function AutoDrive.checkForVehiclesInBox(boundingBox, excludedVehicles) end end end - + if otherVehicle.spec_conveyorBelt and otherVehicle.spec_motorized and otherVehicle.getIsMotorStarted and otherVehicle:getIsMotorStarted() then + -- ignore operating conveyor belts + isExcluded = true + end if (not isExcluded) and otherVehicle ~= nil and otherVehicle.components ~= nil and otherVehicle.size.width ~= nil and otherVehicle.size.length ~= nil and otherVehicle.rootNode ~= nil then local x, _, z = getWorldTranslation(otherVehicle.components[1].node) local distance = MathUtil.vector2Length(boundingBox[1].x - x, boundingBox[1].z - z)