diff --git a/FS25_ADSmartPickup/gui/SmartPickupFrame.lua b/FS25_ADSmartPickup/gui/SmartPickupFrame.lua index 6131b8e..30a0af5 100644 --- a/FS25_ADSmartPickup/gui/SmartPickupFrame.lua +++ b/FS25_ADSmartPickup/gui/SmartPickupFrame.lua @@ -15,6 +15,8 @@ SmartPickupFrame.TAB_NAMES = {"spu_tab_overview", "spu_tab_supply", "spu_tab_out -- Hver fane viser kun runs af sin egen slags; Oversigt og Lagre opretter forsynings-runs. SmartPickupFrame.TAB_KIND = {"supply", "supply", "outbound", "supply"} SmartPickupFrame.POLICIES = {"off", "store", "sell", "sellElseStore"} +-- Afvisningsgrunde der handler om VOGNEN (ikke run'ets opsætning): traktoren kan ikke vælges. +SmartPickupFrame.VEHICLE_BLOCKING_REASONS = {noTrailer = true, cannotCarry = true, needsAutoload = true} function SmartPickupFrame.new(i18n, getAdEnv) local self = SmartPickupFrame:superClass().new(nil, SmartPickupFrame._mt) @@ -457,6 +459,12 @@ function SmartPickupFrame:fillVehicleRows(adEnv, run) title:setText(string.format("%s — %s", ADRunsController.getVehicleLabel(adEnv, vehicle), string.format(self.i18n:getText("spu_inRun"), tostring(otherRun.name)))) else title:setText(self:describeVehicle(adEnv, run, vehicle, inRun[id])) + -- Vogn der ikke kan bære run'ets varer (ingen vogn / forkert vogn / paller uden UAL) kan ikke + -- vælges; er den allerede i run'et, kan den stadig fravælges. + if not inRun[id] and SmartPickupFrame.VEHICLE_BLOCKING_REASONS[ADRunsController.validateVehicle(adEnv, run, vehicle).reason] then + option:setDisabled(true) + self.rowData[option].locked = true + end end end end diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 253f835..2c354e8 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.12.3.0 + 1.12.4.0 <en>AD Smart Pickup</en>