Update package.yml Workflow for Recursive Packaging

.gitea/workflows/package.yml

@@ -0,0 +1,20 @@
+name: Package BeamNG.drive mod
+run-name: Package ${{ github.event.repository.name }}.zip for release
+
+on: 
+  push:
+    tags:
+      - '*'
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Compress to zip
+        run: zip -r ${{ github.event.repository.name }}.zip *
+      - name: Release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          files: ${{ github.event.repository.name }}.zip

lua/ge/extensions/career/vehicleRetrieval.lua

@@ -19,6 +19,7 @@ M.dependencies = { 'career_modules_inventory', 'freeroam_facilities', "career_ve
     "career_modules_permissions", 'career_modules_valueCalculator' }
 
 local career_modules_inventory_removeVehicleObject
+local career_modules_inventory_openMenu
 local vehicleObjectsToRemove = {}
 
 local function spawnVehicle(inventoryId, callback)
@@ -56,9 +57,16 @@ local function onComputerAddFunctions(menuData, computerFunctions)
     if menuData.computerFacility.functions["vehicleInventory"] then
         local favouriteVehicleId = career_modules_inventory.getFavoriteVehicle()
 
+        local vehicleValue = career_modules_valueCalculator.getInventoryVehicleValue(favouriteVehicleId, true)
+        local currentVehicleValue = career_modules_valueCalculator.getInventoryVehicleValue(favouriteVehicleId)
+        local function_label = "Retrieve Favourite Vehicle"
+        if currentVehicleValue < vehicleValue then
+            function_label = function_label .. " (Damaged)"
+        end
+
         local computerFunctionData = {
             id = "retrieve_damaged",
-            label = "Retrieve Favourite Damaged",
+            label = function_label,
             callback = function() Retrieve(favouriteVehicleId) end,
             order = 1
         }
@@ -80,17 +88,34 @@ local function onComputerAddFunctions(menuData, computerFunctions)
 end
 
 local function RemoveVehicleObject(inventoryId)
-    table.insert(vehicleObjectsToRemove, inventoryId)
-    career_vehicleSaveSystem.EnqueueVehicleToSave(inventoryId)
-    career_vehicleSaveSystem.SaveVehicle(inventoryId)
-    career_vehicleSaveSystem.CheckSavedAsync(function()
-        career_modules_inventory_removeVehicleObject(inventoryId)
-    end)
+    if career_modules_inventory.getVehicleIdFromInventoryId(inventoryId) then
+        table.insert(vehicleObjectsToRemove, inventoryId)
+        career_vehicleSaveSystem.EnqueueVehicleToSave(inventoryId)
+        career_vehicleSaveSystem.SaveVehicle(inventoryId)
+        career_vehicleSaveSystem.CheckSavedAsync(function()
+            career_modules_inventory_removeVehicleObject(inventoryId)
+        end)
+    end
+end
+
+local function OpenMenu(_chooseButtonsData, header, _buttonsActive)
+    if _chooseButtonsData then
+        for _, buttonData in ipairs(_chooseButtonsData) do
+            if buttonData.buttonText == "Retrieve" then
+                buttonData.buttonText     = "Retrieve"
+                buttonData.callback       = function(inventoryId) Retrieve(inventoryId) end
+                buttonData.repairRequired = false
+            end
+        end
+    end
+    career_modules_inventory_openMenu(_chooseButtonsData, header, _buttonsActive)
 end
 
 local function onCareerActive()
     career_modules_inventory_removeVehicleObject = career_modules_inventory.removeVehicleObject
     career_modules_inventory.removeVehicleObject = RemoveVehicleObject
+    career_modules_inventory_openMenu = career_modules_inventory.openMenu
+    career_modules_inventory.openMenu = OpenMenu
 end
 
 M.onComputerAddFunctions = onComputerAddFunctions

scripts/retrievedamagedcareer/modScript.lua

@@ -19,6 +19,7 @@ M.dependencies = { 'career_career' }
 
 extensions.load("career_vehicleSaveSystem")
 extensions.load("career_vehicleRetrieval")
+extensions.load("career_modules_inventory")
 
 M.onInit = function()
     setExtensionUnloadMode(M, "manual")