feat: slagtesalg pr. stald fordelt over måneder + fast traktor; ingen global dyre-indstilling
This commit is contained in:
@@ -173,13 +173,33 @@ ADLivestock.ARRIVE_M = 30
|
||||
|
||||
-- Ren: hvor mange klare dyr skal med, og skal turen køre? ready = klare dyr i stalden, total = alle dyr, slots =
|
||||
-- vognens frie pladser. Kør, når et fuldt læs er klar, eller når alle stallens dyr er klare (sidste rest).
|
||||
function ADLivestock.tripSize(ready, total, slots)
|
||||
-- quotaLeft (nil = ingen månedskvote): højst så mange dyr endnu denne måned. Er kvoten det, der begrænser, køres
|
||||
-- resten af kvoten, selv om det ikke er et fuldt læs (ellers blev en kvote på 17 aldrig kørt med en vogn til 25).
|
||||
function ADLivestock.tripSize(ready, total, slots, quotaLeft)
|
||||
if (ready or 0) <= 0 or (slots or 0) <= 0 then return 0 end
|
||||
if quotaLeft ~= nil then
|
||||
if quotaLeft <= 0 then return 0 end
|
||||
if quotaLeft <= ready then return math.min(quotaLeft, slots) end
|
||||
end
|
||||
if ready >= slots then return slots end
|
||||
if ready >= (total or 0) then return ready end
|
||||
return 0
|
||||
end
|
||||
|
||||
-- Ren: månedskvote ved "fordel salg over måneder" (brugerønske 19/10: "en lille del hver måned ... indtægt hver
|
||||
-- måned"). total = dyr i stalden ved månedens start, months = 0 (fra) | antal måneder. -> antal | nil (ingen kvote)
|
||||
function ADLivestock.monthlyQuota(total, months)
|
||||
if (months or 0) <= 0 then return nil end
|
||||
if (total or 0) <= 0 then return 0 end
|
||||
return math.ceil(total / months)
|
||||
end
|
||||
|
||||
-- Ren: kvote-posten for stalden i denne måned (ny post ved månedsskifte). record = {key, quota, sold} | nil
|
||||
function ADLivestock.monthRecord(record, key, total, months)
|
||||
if record ~= nil and record.key == key and record.months == months then return record end
|
||||
return {key = key, months = months, quota = ADLivestock.monthlyQuota(total, months), sold = 0}
|
||||
end
|
||||
|
||||
-- Ren: bedste handler. dealers = {{id, price, distance}} -> den med højest pris (lige pris: nærmest)
|
||||
function ADLivestock.bestDealer(dealers)
|
||||
local best = nil
|
||||
@@ -205,6 +225,7 @@ if AnimalLoadingTrigger ~= nil and AnimalLoadingTrigger.new ~= nil and not ADLiv
|
||||
end
|
||||
|
||||
local jobs = {} -- trailer -> job
|
||||
ADLivestock.monthly = {} -- staldens id -> {key (år*100+periode), months, quota, sold}; gemmes i savegamet
|
||||
local busyVehicles = setmetatable({}, {__mode = "k"}) -- traktor/vogn -> job
|
||||
local checkTimer = 0
|
||||
ADLivestock.FAIL_COOLDOWN_MS = 15 * 60 * 1000 -- mislykket tur: samme stald/vogn prøves først igen efter så lang tid
|
||||
@@ -226,11 +247,38 @@ local function warnOnce(key, text)
|
||||
Logging.info(ADLivestock.LOG_PREFIX .. "%s", text)
|
||||
end
|
||||
|
||||
-- Optaget af en dyretur? (pulje, oprydning, spillerens maskine)
|
||||
function ADLivestock.isBusy(vehicle)
|
||||
-- Fast traktor pr. stald (brugerønske 19/10: "låse den traktor der står på 129 til det job"): staldens id -> køretøjs-id.
|
||||
-- En låst traktor bruges kun til staldens dyreture og er optaget for alt andet, mens salget er slået til.
|
||||
ADLivestock.locks = {}
|
||||
|
||||
function ADLivestock.setLock(barnId, vehicleId)
|
||||
ADLivestock.locks[barnId] = vehicleId
|
||||
end
|
||||
|
||||
function ADLivestock.getLock(barnId)
|
||||
return ADLivestock.locks[barnId]
|
||||
end
|
||||
|
||||
local function isLockedTractor(vehicle)
|
||||
local id = ADRunsController ~= nil and ADRunsController.getVehicleId(vehicle) or nil
|
||||
if id == nil then return false end
|
||||
for barnId, vehicleId in pairs(ADLivestock.locks) do
|
||||
if vehicleId == id and ADSettings ~= nil and ADSettings.getOwn("sellReadyAnimals", barnId) == 1 then return true end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
-- På dyretur lige nu (ikke bare låst)? Spillerens-maskine-reglen må køre en låst traktor hjem, når den ikke er på tur.
|
||||
function ADLivestock.isOnTrip(vehicle)
|
||||
return vehicle ~= nil and busyVehicles[vehicle] ~= nil
|
||||
end
|
||||
|
||||
-- Optaget af en dyretur eller låst til en stalds dyreture? (pulje, flows, oprydning, spillerens maskine)
|
||||
function ADLivestock.isBusy(vehicle)
|
||||
if vehicle == nil then return false end
|
||||
return busyVehicles[vehicle] ~= nil or isLockedTractor(vehicle)
|
||||
end
|
||||
|
||||
-- AD-markør ved en trigger: helst en med "animal"/"dyr" i navnet inden for MARKER_M, ellers nærmeste
|
||||
local function triggerMarker(adEnv, trigger)
|
||||
local x, z = nodePos(trigger ~= nil and trigger.triggerNode or nil)
|
||||
@@ -263,7 +311,7 @@ local function readyBarns(farmId)
|
||||
local animals = placeable.spec_husbandryAnimals
|
||||
local id = ADBuildings ~= nil and ADBuildings.getId(placeable) or nil
|
||||
if animals ~= nil and call(placeable, "getOwnerFarmId") == farmId and id ~= nil
|
||||
and ADSettings ~= nil and ADSettings.get("sellReadyAnimals", id) == 1 and animals.animalLoadingTrigger ~= nil then
|
||||
and ADSettings ~= nil and ADSettings.getOwn("sellReadyAnimals", id) == 1 and animals.animalLoadingTrigger ~= nil then
|
||||
local ready, total = 0, 0
|
||||
for _, cluster in ipairs(call(placeable, "getClusters") or {}) do
|
||||
local n = call(cluster, "getNumAnimals") or cluster.numAnimals or 0
|
||||
@@ -272,7 +320,7 @@ local function readyBarns(farmId)
|
||||
local age = call(cluster, "getAge") or 0
|
||||
if readyAge ~= nil and age >= readyAge then ready = ready + n end
|
||||
end
|
||||
if ready > 0 then table.insert(list, {placeable = placeable, ready = ready, total = total, typeIndex = animals.animalTypeIndex}) end
|
||||
if ready > 0 then table.insert(list, {placeable = placeable, id = id, ready = ready, total = total, typeIndex = animals.animalTypeIndex}) end
|
||||
end
|
||||
end
|
||||
return list
|
||||
@@ -317,6 +365,25 @@ local function freeTractor(adEnv, trailer)
|
||||
return ADPool.bestFit(candidates, {x = x, z = z, neededHp = okHp and neededHp or nil}, "unloader")
|
||||
end
|
||||
|
||||
-- Staldens låste traktor, hvis den er ledig lige nu (holder, ingen spiller, intet flow, ikke reserveret) -> {id, vehicle} | nil
|
||||
local function lockedTractor(adEnv, vehicleId)
|
||||
local vehicle = ADRunsController.findVehicleById(adEnv, vehicleId)
|
||||
if vehicle == nil or busyVehicles[vehicle] ~= nil or ADPool.isReserved(vehicleId) then return nil, vehicle end
|
||||
local module = vehicle.ad ~= nil and vehicle.ad.stateModule or nil
|
||||
if module ~= nil and module:isActive() then return nil, vehicle end
|
||||
if vehicle.getIsControlled ~= nil and vehicle:getIsControlled() then return nil, vehicle end
|
||||
if ADRunsController.getRunForVehicle(vehicle) ~= nil then return nil, vehicle end
|
||||
if ADPlayerClaim ~= nil and ADPlayerClaim.claims(vehicle) then return nil, vehicle end
|
||||
if ADHitch.isBusy ~= nil and ADHitch.isBusy(vehicle) then return nil, vehicle end
|
||||
-- samme optaget-regler som puljen (review: en markopgave/CP/marksilo-lån fra før låsen må ikke overtages)
|
||||
if ADFieldJobs ~= nil and ADFieldJobs.state ~= nil and (ADFieldJobs.state.assignments or {})[vehicleId] ~= nil then return nil, vehicle end
|
||||
if ADCpBridge ~= nil and ADCpBridge.isWorking ~= nil and ADCpBridge.isWorking(vehicle) then return nil, vehicle end
|
||||
if ADFieldSilos ~= nil and ADFieldSilos.isLoaned ~= nil and ADFieldSilos.isLoaned(vehicle) then return nil, vehicle end
|
||||
if ADPool.isReturning ~= nil and ADPool.isReturning(vehicle) then return nil, vehicle end
|
||||
if ADFlowWagons ~= nil and ADFlowWagons.isEmptying ~= nil and ADFlowWagons.isEmptying(vehicle) then return nil, vehicle end
|
||||
return {id = vehicleId, vehicle = vehicle}, vehicle
|
||||
end
|
||||
|
||||
-- Handlere der tager dyretypen, med AD-markør; pris pr. dyr for et eksempel-cluster
|
||||
local function dealersFor(adEnv, typeIndex, x, z)
|
||||
local list = {}
|
||||
@@ -398,6 +465,7 @@ end
|
||||
local function loadAnimals(job)
|
||||
local trailer, placeable = job.trailer, job.barn
|
||||
local free = freeSlots(trailer, job.typeIndex)
|
||||
if (job.size or 0) > 0 then free = math.min(free, job.size) end -- månedskvoten bestemmer turens størrelse
|
||||
local moved = 0
|
||||
local clusters = {}
|
||||
for _, cluster in ipairs(call(placeable, "getClusters") or {}) do table.insert(clusters, cluster) end
|
||||
@@ -422,6 +490,10 @@ local function loadAnimals(job)
|
||||
end
|
||||
local clusterSystem = call(placeable, "getClusterSystem")
|
||||
if clusterSystem ~= nil and clusterSystem.updateNow ~= nil then clusterSystem:updateNow() end
|
||||
local record = job.barnId ~= nil and ADLivestock.monthly[job.barnId] or nil
|
||||
-- altid i den aktuelle måneds post (review: en tur planlagt i én måned og læsset i den næste tæller i den næste)
|
||||
if record ~= nil then record.sold = record.sold + moved end
|
||||
job.loaded = true
|
||||
return moved
|
||||
end
|
||||
|
||||
@@ -451,7 +523,8 @@ end
|
||||
local function startJob(adEnv, farmId, barn, trailerInfo, tractor, dealer, size)
|
||||
local job = {farmId = farmId, barn = barn and barn.placeable or nil, barnName = barn and placeableName(barn.placeable) or nil,
|
||||
trailer = trailerInfo.vehicle, tractor = tractor.vehicle, dealer = dealer, size = size, phase = "fetch", since = now(),
|
||||
sellOnly = barn == nil, typeIndex = barn ~= nil and barn.typeIndex or nil}
|
||||
sellOnly = barn == nil, typeIndex = barn ~= nil and barn.typeIndex or nil, barnId = barn ~= nil and barn.id or nil,
|
||||
monthKey = barn ~= nil and barn.monthKey or nil}
|
||||
jobs[job.trailer] = job
|
||||
busyVehicles[job.tractor], busyVehicles[job.trailer] = job, job
|
||||
ADPool.reserve(job, {tractor.id, trailerInfo.id})
|
||||
@@ -545,6 +618,67 @@ local function stepJob(adEnv, job)
|
||||
end
|
||||
end
|
||||
|
||||
-- Spillets måned: år*100+periode (nil før miljøet findes)
|
||||
local function monthKey()
|
||||
local environment = g_currentMission ~= nil and g_currentMission.environment or nil
|
||||
if environment == nil or environment.currentPeriod == nil then return nil end
|
||||
return (environment.currentYear or 0) * 100 + environment.currentPeriod
|
||||
end
|
||||
|
||||
ADLivestock.FILE_NAME = "ADSmartPickup_livestock.xml"
|
||||
ADLivestock.ROOT = "ADSmartPickupLivestock"
|
||||
|
||||
-- Månedskvoterne gemmes, så en genindlæsning midt i måneden ikke giver en ny fuld kvote (kaldt fra ADRunsController.save)
|
||||
function ADLivestock.save()
|
||||
local path = ADUtil.savePath(ADLivestock.FILE_NAME)
|
||||
if path == nil or XMLFile == nil then return false end
|
||||
local xmlFile = XMLFile.create("ADSmartPickupLivestock", path, ADLivestock.ROOT)
|
||||
if xmlFile == nil then return false end
|
||||
local index = 0
|
||||
for id, record in pairs(ADLivestock.monthly) do
|
||||
local node = string.format("%s.month(%d)", ADLivestock.ROOT, index)
|
||||
xmlFile:setString(node .. "#building", id)
|
||||
xmlFile:setInt(node .. "#key", record.key)
|
||||
xmlFile:setInt(node .. "#months", record.months)
|
||||
xmlFile:setInt(node .. "#quota", record.quota or 0)
|
||||
xmlFile:setInt(node .. "#sold", record.sold)
|
||||
index = index + 1
|
||||
end
|
||||
index = 0
|
||||
for barnId, vehicleId in pairs(ADLivestock.locks) do
|
||||
local node = string.format("%s.lock(%d)", ADLivestock.ROOT, index)
|
||||
xmlFile:setString(node .. "#building", barnId)
|
||||
xmlFile:setString(node .. "#vehicle", vehicleId)
|
||||
index = index + 1
|
||||
end
|
||||
xmlFile:save()
|
||||
xmlFile:delete()
|
||||
return true
|
||||
end
|
||||
|
||||
function ADLivestock.load()
|
||||
ADLivestock.monthly = {}
|
||||
ADLivestock.locks = {}
|
||||
local path = ADUtil.savePath(ADLivestock.FILE_NAME)
|
||||
if path == nil or fileExists == nil or not fileExists(path) or XMLFile == nil then return false end
|
||||
local xmlFile = XMLFile.load("ADSmartPickupLivestock", path)
|
||||
if xmlFile == nil then return false end
|
||||
xmlFile:iterate(ADLivestock.ROOT .. ".month", function(_, node)
|
||||
local id = xmlFile:getString(node .. "#building")
|
||||
local key = xmlFile:getInt(node .. "#key")
|
||||
if id ~= nil and key ~= nil then
|
||||
ADLivestock.monthly[id] = {key = key, months = xmlFile:getInt(node .. "#months") or 0,
|
||||
quota = xmlFile:getInt(node .. "#quota") or 0, sold = xmlFile:getInt(node .. "#sold") or 0}
|
||||
end
|
||||
end)
|
||||
xmlFile:iterate(ADLivestock.ROOT .. ".lock", function(_, node)
|
||||
local id, vehicleId = xmlFile:getString(node .. "#building"), xmlFile:getString(node .. "#vehicle")
|
||||
if id ~= nil and vehicleId ~= nil and vehicleId ~= "" then ADLivestock.locks[id] = vehicleId end
|
||||
end)
|
||||
xmlFile:delete()
|
||||
return true
|
||||
end
|
||||
|
||||
local function planJobs(adEnv)
|
||||
local farmId = g_currentMission:getFarmId()
|
||||
-- vogne der allerede har dyr (afbrudt tur, genindlæsning): sælges først
|
||||
@@ -563,10 +697,20 @@ local function planJobs(adEnv)
|
||||
if tractor ~= nil then startJob(adEnv, farmId, nil, trailerInfo, tractor, dealer, 0) end
|
||||
end
|
||||
end
|
||||
local key = monthKey()
|
||||
for _, barn in ipairs(readyBarns(farmId)) do
|
||||
local planned = 0
|
||||
for _, job in pairs(jobs) do if job.barn == barn.placeable then planned = planned + (job.size or 0) end end
|
||||
-- kun ture der ikke har læsset endnu (læssede dyr er allerede ude af staldens tal)
|
||||
for _, job in pairs(jobs) do if job.barn == barn.placeable and not job.loaded then planned = planned + (job.size or 0) end end
|
||||
local ready = barn.ready - planned
|
||||
local months = ADSettings.getOwn("sellReadySpreadMonths", barn.id) or 0
|
||||
local quotaLeft = nil
|
||||
if key ~= nil and months > 0 then
|
||||
local record = ADLivestock.monthRecord(ADLivestock.monthly[barn.id], key, barn.total, months)
|
||||
ADLivestock.monthly[barn.id] = record
|
||||
quotaLeft = record.quota - record.sold - planned
|
||||
barn.monthKey = key
|
||||
end
|
||||
if ready > 0 and (failedUntil[barn.placeable] or 0) <= now() then
|
||||
local x, z = nodePos(barn.placeable.spec_husbandryAnimals.animalLoadingTrigger.triggerNode)
|
||||
local dealer = ADLivestock.bestDealer(dealersFor(adEnv, barn.typeIndex, x, z))
|
||||
@@ -577,15 +721,28 @@ local function planJobs(adEnv)
|
||||
if ready <= 0 then break end
|
||||
if trailerInfo.animals == 0 and (failedUntil[trailerInfo.vehicle] or 0) <= now() then
|
||||
local slots = freeSlots(trailerInfo.vehicle, barn.typeIndex)
|
||||
local size = ADLivestock.tripSize(ready, barn.total - planned, slots)
|
||||
local size = ADLivestock.tripSize(ready, barn.total - planned, slots, quotaLeft)
|
||||
if size > 0 then
|
||||
local tractor = freeTractor(adEnv, trailerInfo.vehicle)
|
||||
local lockId = ADLivestock.locks[barn.id]
|
||||
local tractor, lockedVehicle
|
||||
if lockId ~= nil then
|
||||
-- låst traktor: kun den (er den optaget, ventes til næste tjek)
|
||||
tractor, lockedVehicle = lockedTractor(adEnv, lockId)
|
||||
if tractor == nil then
|
||||
warnOnce("lockBusy:" .. tostring(barn.id), string.format("%s: venter på den faste traktor '%s'", placeableName(barn.placeable),
|
||||
lockedVehicle ~= nil and vname(lockedVehicle) or ("findes ikke: " .. tostring(lockId))))
|
||||
break
|
||||
end
|
||||
else
|
||||
tractor = freeTractor(adEnv, trailerInfo.vehicle)
|
||||
end
|
||||
if tractor == nil then
|
||||
warnOnce("noTractor:" .. tostring(barn.placeable), string.format("%s: slagteklare dyr, men ingen ledig traktor til kreaturvognen", placeableName(barn.placeable)))
|
||||
break
|
||||
end
|
||||
startJob(adEnv, farmId, barn, trailerInfo, tractor, dealer, size)
|
||||
ready = ready - size
|
||||
if quotaLeft ~= nil then quotaLeft = quotaLeft - size end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user