fix(bomuld): ballemål skal have ballestation til varen — ikke siloer (v1.62.268)
This commit is contained in:
@@ -459,12 +459,13 @@ end
|
||||
|
||||
-- Salgssted for høst uden lager: alle salgsmarkører (som udkørselsflowene: ikke spærrede, ikke P/Connect/Wait) hvis
|
||||
-- station tager varen; højeste pris med vej fra marken og tilbage. -> AD-markør, pris pr. liter | nil
|
||||
function ADFieldWork.findSaleMarker(adEnv, vehicle, fillType, fieldMarkerId)
|
||||
-- stationOk(station) (valgfri): ekstra krav til stationen (baller: ballestation, ADFieldWork.stationTakesBales)
|
||||
function ADFieldWork.findSaleMarker(adEnv, vehicle, fillType, fieldMarkerId, stationOk)
|
||||
if fillType == nil or ADSources == nil or ADSources.getSellMarkers == nil or ADPrices == nil then return nil end
|
||||
local farmId = vehicle:getOwnerFarmId()
|
||||
local quotes = {}
|
||||
for _, entry in ipairs(ADSources.getSellMarkers(adEnv, farmId) or {}) do
|
||||
if ADSources.stationAccepts(entry.station, fillType) then
|
||||
if ADSources.stationAccepts(entry.station, fillType) and (stationOk == nil or stationOk(entry.station)) then
|
||||
local quote = ADPrices.getQuote(entry.station, fillType)
|
||||
if quote ~= nil and quote.price > 0 then
|
||||
table.insert(quotes, {price = quote.price, wayPointId = entry.marker.id, name = entry.marker.name, routed = false})
|
||||
@@ -1594,25 +1595,60 @@ end
|
||||
-- fuld fabrik — review 16/10)
|
||||
ADFieldWork.BALE_MIN_FREE_L = 20000
|
||||
|
||||
-- Tager stationen baller af varen? Spillets egen regel (UnloadingStation: "does not have a BaleUnloadTrigger"): en
|
||||
-- BaleUnloadTrigger for varen, eller en almindelig UnloadTrigger uden exactFillRootNode. In-game 16/10: bomulds-
|
||||
-- modulerne blev sendt til TMR Silo Farma (silo der tager COTTON løst, men ingen ballestation).
|
||||
function ADFieldWork.stationTakesBales(station, fillType)
|
||||
if station == nil or fillType == nil then return false end
|
||||
for _, trigger in pairs(station.unloadTriggers or {}) do
|
||||
if trigger.fillTypes ~= nil and trigger.fillTypes[fillType] ~= nil then
|
||||
local class = ClassUtil ~= nil and ClassUtil.getClassObjectByObject(trigger) or nil
|
||||
if BaleUnloadTrigger ~= nil and class == BaleUnloadTrigger then return true end
|
||||
if UnloadTrigger ~= nil and class == UnloadTrigger and trigger.exactFillRootNode == nil then return true end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
-- Som ADLoadSwap.findDumpMarker (silo eller egen fabrik der bruger varen), men kun stationer med ballestation til
|
||||
-- varen: stationer uden springes over, og der søges igen (højst MAX_BALE_TRIES gange).
|
||||
ADFieldWork.MAX_BALE_TRIES = 20
|
||||
function ADFieldWork.findBaleDumpMarker(adEnv, vehicle, fillType, rest, homeMarkerId, isReachable, farmId)
|
||||
local excluded = {}
|
||||
for _ = 1, ADFieldWork.MAX_BALE_TRIES do
|
||||
local marker = ADLoadSwap.findDumpMarker(adEnv, vehicle, fillType, rest, homeMarkerId, isReachable, excluded, nil, true)
|
||||
if marker == nil then return nil end
|
||||
-- samme gård som findDumpMarker selv slår op med (review: getUnloadStationAtWayPointId caches pr. gård)
|
||||
local station = ADSmartPickup.getUnloadStationAtWayPointId(adEnv, marker.id, ADSmartPickup.getFarmId(vehicle))
|
||||
if station == nil then return nil end
|
||||
if ADFieldWork.stationTakesBales(station, fillType) then return marker end
|
||||
-- findDumpMarker udelukker på owningPlaceable; uden en kan stationen ikke springes over
|
||||
if station.owningPlaceable == nil then return nil end
|
||||
excluded[station.owningPlaceable] = true
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
-- Mål for ballesamlerens læs -> {wayPointId, name} | nil. Halm: balle-/palleskur (som før). Bomuldsmoduler
|
||||
-- (brugerønske 16/10): egen fabrik der bruger dem (spinderiet), ellers skur, ellers salgssted der køber dem.
|
||||
function ADFieldWork.chooseBaleStore(adEnv, field, info, vehicle, fillType, isReachable, farmId)
|
||||
if not ADFieldModel.isBaleHarvest(field.lastFruit) then
|
||||
return ADSources.findPalletStore(adEnv, vehicle, fillType, nil, isReachable, farmId)
|
||||
end
|
||||
local okFactory, factory = pcall(ADLoadSwap.findDumpMarker, adEnv, vehicle, fillType, ADFieldWork.BALE_MIN_FREE_L,
|
||||
info.markerId, isReachable, nil, nil, true)
|
||||
local takesBales = function(station) return ADFieldWork.stationTakesBales(station, fillType) end
|
||||
local okFactory, factory = pcall(ADFieldWork.findBaleDumpMarker, adEnv, vehicle, fillType, ADFieldWork.BALE_MIN_FREE_L,
|
||||
info.markerId, isReachable, farmId)
|
||||
if not okFactory then log(field.id, "ballemål: fabriksopslag fejlede: %s", tostring(factory)) end
|
||||
if okFactory and factory ~= nil then return {wayPointId = factory.id, name = factory.name} end
|
||||
local shed = ADSources.findPalletStore(adEnv, vehicle, fillType, nil, isReachable, farmId)
|
||||
if shed ~= nil then return shed end
|
||||
-- en fabrik der bruger varen, men er fuld lige nu: vent, sælg ikke (som chooseStore, review 16/10)
|
||||
local okAny, anyFactory = pcall(ADLoadSwap.findDumpMarker, adEnv, vehicle, fillType, 0, info.markerId, isReachable, nil, nil, true)
|
||||
local okAny, anyFactory = pcall(ADFieldWork.findBaleDumpMarker, adEnv, vehicle, fillType, 0, info.markerId, isReachable, farmId)
|
||||
if okAny and anyFactory ~= nil then
|
||||
log(field.id, "ballemål: %s har ikke plads lige nu — modulerne venter", tostring(anyFactory.name))
|
||||
return nil
|
||||
end
|
||||
local okSale, sale = pcall(ADFieldWork.findSaleMarker, adEnv, vehicle, fillType, info.markerId)
|
||||
local okSale, sale = pcall(ADFieldWork.findSaleMarker, adEnv, vehicle, fillType, info.markerId, takesBales)
|
||||
if not okSale then log(field.id, "ballemål: salgsopslag fejlede: %s", tostring(sale)) end
|
||||
if okSale and sale ~= nil then return {wayPointId = sale.id, name = sale.name} end
|
||||
return nil
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.267.0</version>
|
||||
<version>1.62.268.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user