beamng/career_retrievedamaged
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Only Restore Damaged When Vehicle Value is Reduced

Browse Source
This commit is contained in:
snoutie 2025-03-06 19:14:55 +01:00
parent 5929cdff5f
commit 17d90c2699
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lua/ge/extensions/career/vehicleRetrieval.lua
View File

@ -16,7 +16,7 @@
local M = {} 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_permissions", 'career_modules_valueCalculator' }
local career_modules_inventory_removeVehicleObject local career_modules_inventory_removeVehicleObject
local vehicleObjectsToRemove = {} local vehicleObjectsToRemove = {}
@ -34,6 +34,10 @@ local function Retrieve(inventoryId)
if not career_vehicleSaveSystem.SaveVehicle(inventoryId) then if not career_vehicleSaveSystem.SaveVehicle(inventoryId) then
career_vehicleSaveSystem.QueuedVehicleSaved(inventoryId) career_vehicleSaveSystem.QueuedVehicleSaved(inventoryId)
end end
local vehicleValue = career_modules_valueCalculator.getInventoryVehicleValue(inventoryId, true)
local currentVehicleValue = career_modules_valueCalculator.getInventoryVehicleValue(inventoryId)
career_vehicleSaveSystem.CheckSavedAsync(function() career_vehicleSaveSystem.CheckSavedAsync(function()
extensions.core_jobsystem.create( extensions.core_jobsystem.create(
function(job) function(job)
@ -42,7 +46,11 @@ local function Retrieve(inventoryId)
local location = { pos = veh:getPosition(), rot = quat(0, 0, 1, 0) * quat(veh:getRefNodeRotation()) } local location = { pos = veh:getPosition(), rot = quat(0, 0, 1, 0) * quat(veh:getRefNodeRotation()) }
local garage = career_modules_inventory.getClosestGarage(location.pos) local garage = career_modules_inventory.getClosestGarage(location.pos)
job.sleep(1) job.sleep(1)
career_vehicleSaveSystem.LoadVehicle(inventoryId) 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) freeroam_facilities.teleportToGarage(garage.id, veh, false)
end) end)
end end

5
lua/ge/extensions/career/vehicleSaveSystem.lua
View File

@ -15,7 +15,7 @@
local M = {} local M = {}
M.dependencies = { 'career_career', 'career_saveSystem', 'career_modules_inventory', 'career_modules_insurance' } M.dependencies = { 'career_career', 'career_saveSystem', 'career_modules_inventory' }
local extensionName = "career_vehicleSaveSystem" local extensionName = "career_vehicleSaveSystem"
local vehicleSaves_temp = "/temp/career/vehicle_saves" local vehicleSaves_temp = "/temp/career/vehicle_saves"
@ -116,9 +116,6 @@ local function SaveVehicle(inventoryId)
end end
local function LoadVehicle(inventoryId) local function LoadVehicle(inventoryId)
if not career_modules_insurance.inventoryVehNeedsRepair(inventoryId) then
return
end
local saveFile = GetVehicleSaveFile(vehicleSaves_temp, inventoryId) local saveFile = GetVehicleSaveFile(vehicleSaves_temp, inventoryId)
local vehicleId = career_modules_inventory.getVehicleIdFromInventoryId(inventoryId) local vehicleId = career_modules_inventory.getVehicleIdFromInventoryId(inventoryId)