feat: foderprioritering — trug som én trang, spillets fodervægt (TMR 1,0 > hø/ensilage 0,8 > græs 0,4) afgør rækkefølgen i truget; fanen viser samme rangering (v1.10.3.0)

2026-09-23 01:49:19 +02:00
parent 231d6a41d6
commit 69a98984bb
6 changed files with 108 additions and 7 deletions
@@ -731,6 +731,42 @@ UnloadTask.update(ts, 16)
 check("W12 omdirigeret trods isActiveAtTrigger", ts.destinationID, 40)
 check("W12 AD's aflæsning stoppet før kørsel", stopped, true)

+-- E5: fodertrug = én trang; inden for truget vælges efter spillets fodervægt (TMR 1,0 > hø 0,8 > græs 0,4);
+-- et tommere halmlager vinder over truget
+buildCowWorld()
+addMarker(23, "Høsilo", "Lader", 700, 0); table.insert(stations, makeStation(123, 700, 15, {[HAY] = 80000}, false, {[HAY] = 80000}))
+addMarker(24, "Græssilo", "Lader", 800, 0); table.insert(stations, makeStation(124, 800, 15, {[GRASS] = 80000}, false, {[GRASS] = 80000}))
+local e5Food = {[TMR] = 0, [HAY] = 0, [GRASS] = 0}
+local e5Straw = {level = 20000}
+local e5Barn = {
+    getName = function() return "Prioritets-stald" end,
+    spec_husbandryFood = {fillLevels = e5Food, capacity = 30000, animalTypeIndex = 7},
+    spec_husbandryStraw = {},
+    getHusbandryIsFillTypeSupported = function(_, fillType) return fillType == STRAW end,
+    getHusbandryFillLevel = function(_, fillType) if fillType == STRAW then return e5Straw.level end return 0 end,
+    getHusbandryCapacity = function(_, fillType) if fillType == STRAW then return 100000 end return 0 end,
+}
+g_currentMission.animalFoodSystem = {
+    getAnimalFood = function(_, animalTypeIndex) if animalTypeIndex == 7 then return {groups = {
+        {fillTypes = {TMR}, productionWeight = 1.0}, {fillTypes = {HAY}, productionWeight = 0.8}, {fillTypes = {GRASS}, productionWeight = 0.4}}} end end,
+    getMixturesByAnimalTypeIndex = function() return {} end,
+}
+unloadStations[1].targetStorages = nil
+unloadStations[1].owningPlaceable = e5Barn
+local e5Driver = makeSupplyDriver(markerByIndex(21), markerByIndex(30), {TMR, HAY, GRASS, STRAW})
+e5Driver.carriable = {TMR, HAY, GRASS, STRAW}
+e5Driver.trailers = {level = 0, capacity = 8000}
+-- trug tomt (100 % trang) vs. halm 80 % tomt -> truget først, og TMR før hø/græs
+check("E5 tomt trug: TMR først", manager:getNextPickup(e5Driver, false), 20)
+-- ingen TMR-kilde -> hø (0,8) før græs (0,4)
+stations[1].getFillLevel = function() return 0 end
+stations[1].owningPlaceable = nil
+check("E5 uden TMR-kilde: hø før græs", manager:getNextPickup(e5Driver, false), 23)
+-- trug 70 % fuldt (30 % trang) vs. halm 80 % tomt -> halm
+e5Food[HAY] = 21000
+check("E5 halmlager tommere end truget -> halm", manager:getNextPickup(e5Driver, false), 21)
+g_currentMission.animalFoodSystem = nil
+
 -- ==== I: run-integration — ingredienser fra run i stedet for multi-valg; Wait-pulje pr. run ====
 -- I1: traktor i et run med ÉN valgt vare i AD får alligevel behovsstyring (run'ets liste)
 local runDriver = buildCowWorld()