diff --git a/lua/ge/extensions/career/vehicleRetrieval.lua b/lua/ge/extensions/career/vehicleRetrieval.lua index 35fde5e..6514d3b 100644 --- a/lua/ge/extensions/career/vehicleRetrieval.lua +++ b/lua/ge/extensions/career/vehicleRetrieval.lua @@ -28,17 +28,15 @@ local function spawnVehicle(inventoryId, callback) end end -local function Retrieve() - local fav_veh_id = career_modules_inventory.getFavoriteVehicle() - +local function Retrieve(inventoryId) extensions.core_jobsystem.create( function(job) - spawnVehicle(fav_veh_id, function() - local veh = be:getObjectByID(career_modules_inventory.getVehicleIdFromInventoryId(fav_veh_id)) + spawnVehicle(inventoryId, function() + local veh = be:getObjectByID(career_modules_inventory.getVehicleIdFromInventoryId(inventoryId)) local location = { pos = veh:getPosition(), rot = quat(0, 0, 1, 0) * quat(veh:getRefNodeRotation()) } local garage = career_modules_inventory.getClosestGarage(location.pos) job.sleep(1) - career_vehicleSaveSystem.LoadVehicle(fav_veh_id) + career_vehicleSaveSystem.LoadVehicle(inventoryId) freeroam_facilities.teleportToGarage(garage.id, veh, false) end) end @@ -47,12 +45,15 @@ 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 } + if menuData.tutorialPartShoppingActive or menuData.tutorialTuningActive then computerFunctionData.disabled = true computerFunctionData.reason = career_modules_computer.reasons.tutorialActive