Fix Saving for Multiple Spawned Vehicles

lua/ge/extensions/career/vehicleRetrieval.lua

@@ -15,7 +15,8 @@
 
 local M = {}
 
-M.dependencies = { 'career_modules_inventory', 'freeroam_facilities', "career_vehicleSaveSystem" }
+M.dependencies = { 'career_modules_inventory', 'freeroam_facilities', "career_vehicleSaveSystem",
+    "career_modules_permissions", 'career_modules_valueCalculator' }
 
 local career_modules_inventory_removeVehicleObject
 local vehicleObjectsToRemove = {}
@@ -28,31 +29,54 @@ local function spawnVehicle(inventoryId, callback)
     end
 end
 
-local function Retrieve()
+local function Retrieve(inventoryId)
-    local fav_veh_id = career_modules_inventory.getFavoriteVehicle()
+    career_vehicleSaveSystem.EnqueueVehicleToSave(inventoryId)
+    if not career_vehicleSaveSystem.SaveVehicle(inventoryId) then
+        career_vehicleSaveSystem.DequeueVehicleToSave(inventoryId)
+    end
 
-    extensions.core_jobsystem.create(
+    local vehicleValue = career_modules_valueCalculator.getInventoryVehicleValue(inventoryId, true)
-        function(job)
+    local currentVehicleValue = career_modules_valueCalculator.getInventoryVehicleValue(inventoryId)
-            spawnVehicle(fav_veh_id, function()
+
-                local veh = be:getObjectByID(career_modules_inventory.getVehicleIdFromInventoryId(fav_veh_id))
+    career_vehicleSaveSystem.CheckSavedAsync(function()
-                local location = { pos = veh:getPosition(), rot = quat(0, 0, 1, 0) * quat(veh:getRefNodeRotation()) }
+        extensions.core_jobsystem.create(
-                local garage = career_modules_inventory.getClosestGarage(location.pos)
+            function(job)
-                job.sleep(1)
+                spawnVehicle(inventoryId, function()
-                career_vehicleSaveSystem.LoadVehicle(fav_veh_id)
+                    local veh = be:getObjectByID(career_modules_inventory.getVehicleIdFromInventoryId(inventoryId))
-                freeroam_facilities.teleportToGarage(garage.id, veh, false)
+                    local location = { pos = veh:getPosition(), rot = quat(0, 0, 1, 0) * quat(veh:getRefNodeRotation()) }
-            end)
+                    local garage = career_modules_inventory.getClosestGarage(location.pos)
-        end
+                    job.sleep(1)
-    )
+                    if currentVehicleValue < vehicleValue then
+                        career_vehicleSaveSystem.LoadVehicle(inventoryId)
+                    else
+                        log('I', 'retrieval', 'retrieving vehicle ' .. inventoryId .. " in an undamaged state")
+                    end
+                    freeroam_facilities.teleportToGarage(garage.id, veh, false)
+                end)
+            end
+        )
+    end)
 end
 
 local function onComputerAddFunctions(menuData, computerFunctions)
     if menuData.computerFacility.functions["vehicleInventory"] then
+        local favouriteVehicleId = career_modules_inventory.getFavoriteVehicle()
+
         local computerFunctionData = {
             id = "retrieve_damaged",
             label = "Retrieve Favourite Damaged",
-            callback = Retrieve,
+            callback = function() Retrieve(favouriteVehicleId) end,
             order = 1
         }
+
+        local repairPermission = career_modules_permissions.getStatusForTag("vehicleRepair",
+            { inventoryId = favouriteVehicleId })
+
+        if not repairPermission["allow"] then
+            computerFunctionData.disabled = true
+            computerFunctionData.reason = { type = "text", label = "Vehicle is being repaired." }
+        end
+
         if menuData.tutorialPartShoppingActive or menuData.tutorialTuningActive then
             computerFunctionData.disabled = true
             computerFunctionData.reason = career_modules_computer.reasons.tutorialActive
@@ -63,7 +87,7 @@ end
 
 local function RemoveVehicleObject(inventoryId)
     table.insert(vehicleObjectsToRemove, inventoryId)
-    career_vehicleSaveSystem.QueueVehicleToSave(inventoryId)
+    career_vehicleSaveSystem.EnqueueVehicleToSave(inventoryId)
     career_vehicleSaveSystem.SaveVehicle(inventoryId)
     career_vehicleSaveSystem.CheckSavedAsync(function()
         career_modules_inventory_removeVehicleObject(inventoryId)

lua/ge/extensions/career/vehicleSaveSystem.lua

@@ -65,13 +65,14 @@ local function GetVehicleSaveFile(root, inventoryId)
     return path .. "/save.json"
 end
 
-local function QueueVehicleToSave(inventoryId)
+local function EnqueueVehicleToSave(inventoryId)
+    log("I", "saving", "enqueued vehicle " .. inventoryId)
     M.queuedVehicleSaves[inventoryId] = true
 end
 
-local function QueuedVehicleSaved(inventoryId)
+local function DequeueVehicleToSave(inventoryId)
-    log("I", "saving", "saved vehicle " .. inventoryId)
+    log("I", "saving", "dequeued vehicle " .. inventoryId)
-    table.remove(M.queuedVehicleSaves, inventoryId)
+    M.queuedVehicleSaves[inventoryId] = nil
 end
 
 local function VehiclesSaved()
@@ -108,9 +109,10 @@ local function SaveVehicle(inventoryId)
         local object = be:getObjectByID(vehicleId)
         object:queueLuaCommand("beamstate.save(\"" ..
             saveFile ..
-            "\"); obj:queueGameEngineLua('career_vehicleSaveSystem.QueuedVehicleSaved(\"" .. inventoryId .. "\")')")
+            "\"); obj:queueGameEngineLua('career_vehicleSaveSystem.DequeueVehicleToSave(" .. inventoryId .. ")');")
         return true
     else
+        log('I', 'saving', 'vehicle ' .. inventoryId .. " not spawned")
         return false
     end
 end
@@ -123,7 +125,9 @@ local function LoadVehicle(inventoryId)
         log("I", "loading", "loading vehicle from " .. saveFile)
         local object = be:getObjectByID(vehicleId)
         object:queueLuaCommand("beamstate.load(\"" ..
-            saveFile .. "\")")
+            saveFile .. "\");" ..
+            "for key, value in pairs(v.data.controller) do if value['fileName'] == 'advancedCouplerControl' then local c = controller.getController(value['name']) if c['reset'] then c['reset']() end end end"
+        )
     end
 end
 
@@ -135,12 +139,12 @@ local function onSaveCurrentSaveSlot(currentSavePath, oldSaveDate, vehiclesThumb
     local vehicles = career_modules_inventory.getVehicles()
 
     for id, _ in pairs(vehicles) do
-        QueueVehicleToSave(id)
+        EnqueueVehicleToSave(id)
     end
 
     for id, _ in pairs(M.queuedVehicleSaves) do
         if not SaveVehicle(id) then
-            QueuedVehicleSaved(id)
+            DequeueVehicleToSave(id)
         end
     end
     CheckSavedAsync(function()
@@ -166,8 +170,8 @@ M.LoadVehicle = LoadVehicle
 
 M.CheckSavedAsync = CheckSavedAsync
 
-M.QueueVehicleToSave = QueueVehicleToSave
+M.EnqueueVehicleToSave = EnqueueVehicleToSave
-M.QueuedVehicleSaved = QueuedVehicleSaved
+M.DequeueVehicleToSave = DequeueVehicleToSave
 
 M.onSaveCurrentSaveSlotAsyncStart = onSaveCurrentSaveSlotAsyncStart
 M.onSaveCurrentSaveSlot = onSaveCurrentSaveSlot