diff --git a/FS25_ADSmartPickup/adBuildings.lua b/FS25_ADSmartPickup/adBuildings.lua index 43d4540..161fc2f 100644 --- a/FS25_ADSmartPickup/adBuildings.lua +++ b/FS25_ADSmartPickup/adBuildings.lua @@ -68,17 +68,16 @@ end -- Trigger-noder pr. bygning: læsse (loadTriggers.triggerNode, pallespawner, objektlager) og -- aflæsning (unloadTriggers exactFillRootNode/triggerNode/aiNode). --- loadGroups: én gruppe noder pr. læssestation (mælketank, gyllebeholder ...), så hver station får sin +-- loadGroups: én gruppe noder pr. læssepunkt (mælketank, gyllebeholder ...), så hvert punkt får sin -- egen markør; pallespawner/objektlager er en gruppe for sig. local function collectNodes(placeable, loadStations, unloadStations) local loadGroups, unloadNodes = {}, {} + -- én gruppe pr. LÆSSEPUNKT: en stald har ofte én station med både mælke- og gyllepunkt for _, station in pairs(loadStations) do if station.owningPlaceable == placeable then - local nodes = {} for _, trigger in pairs(station.loadTriggers or {}) do - if trigger.triggerNode ~= nil then table.insert(nodes, trigger.triggerNode) end + if trigger.triggerNode ~= nil then table.insert(loadGroups, {trigger.triggerNode}) end end - if #nodes > 0 then table.insert(loadGroups, nodes) end end end for _, station in pairs(unloadStations) do diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index d1d7ac2..ddddcfd 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.13.1.0 + 1.13.2.0 <en>AD Smart Pickup</en> diff --git a/tests/test_adBuildings.lua b/tests/test_adBuildings.lua index 75fa9bb..a0a41c8 100644 --- a/tests/test_adBuildings.lua +++ b/tests/test_adBuildings.lua @@ -45,10 +45,10 @@ end -- verden: kostald med mælketank (load) og foder (unload), sukkerfabrik (unload + pallespawner), to siloer i række, objektlager, salgssted local barn = placeable("barn1", "Kostald 1", 0, 0, {getHusbandryFillLevel = function() return 0 end}) -local milkStation = {owningPlaceable = barn, loadTriggers = {{triggerNode = {x = 20, z = 0}}}} -local slurryStation = {owningPlaceable = barn, loadTriggers = {{triggerNode = {x = 0, z = 30}}}} +-- som FS25_LargerAnimalBarns' cowBarnBig: ÉN læssestation med TO læssepunkter (gylle + mælk) +local milkStation = {owningPlaceable = barn, loadTriggers = {{triggerNode = {x = 20, z = 0}}, {triggerNode = {x = 0, z = 30}}}} local barnUnload = {owningPlaceable = barn, unloadTriggers = {{exactFillRootNode = {x = -20, z = 0}}}} -table.insert(loadStations, milkStation); table.insert(loadStations, slurryStation); table.insert(unloadStations, barnUnload) +table.insert(loadStations, milkStation); table.insert(unloadStations, barnUnload) local mill = placeable("mill", "Sukkerfabrik", 500, 0, {spec_productionPoint = {productionPoint = {productions = {}, storage = {}, palletSpawner = {spawnPlaces = {{startNode = {x = 520, z = 0}}}}, unloadingStation = nil}}}) local millUnload = {owningPlaceable = mill, unloadTriggers = {{exactFillRootNode = {x = 480, z = 0}}}, isa = function() return true end, isSellingPoint = true} table.insert(unloadStations, millUnload)