feat: stoppet gylle-flows samlede sæt (gyllevogn på) er også markflåde; oversigt viser 'Gøder — sættet er lånt til markerne' ved reserve-dvale — 1.62.316
This commit is contained in:
@@ -296,7 +296,9 @@ function ADFieldWork.getRigs(adEnv)
|
||||
local id = ADRunsController.getVehicleId(vehicle)
|
||||
-- traktorer i et almindeligt flow (æg, gylle, foder ...) hører til den drift og er ikke markflåde
|
||||
-- (et stoppet flows traktorer er ledige — maskinpulje/flow-vogne)
|
||||
if role ~= nil and id ~= nil and (ADPool ~= nil and ADPool.isFreeFromFlows(vehicle) or ADRunsController.getRunForVehicle(vehicle) == nil) then
|
||||
-- (et stoppet/sovende flows samlede sæt med gyllevogn/spreder er også markflåde: ADFlowWagons.isFieldRigTractor)
|
||||
if role ~= nil and id ~= nil and (ADPool ~= nil and ADPool.isFreeFromFlows(vehicle) or ADRunsController.getRunForVehicle(vehicle) == nil
|
||||
or (ADFlowWagons ~= nil and ADFlowWagons.isFieldRigTractor ~= nil and ADFlowWagons.isFieldRigTractor(vehicle))) then
|
||||
local x, z = vehiclePosition(vehicle)
|
||||
local rig = {
|
||||
id = id, vehicle = vehicle, role = role, label = ADRuns.vehicleLabel(vehicle),
|
||||
|
||||
@@ -270,6 +270,35 @@ function ADFlowWagons.tractorFree(s)
|
||||
return s.stopped == true and not s.carriesFlowWagon and not s.homeTrip
|
||||
end
|
||||
|
||||
-- Markflåden må bruge et flows samlede sæt, når flowet IKKE kører (stoppet eller sovende) og flowets vogn selv er
|
||||
-- arbejdsredskabet (gyllevogn/spreder: spec_sprayer) — ikke en lastvogn (29/9-reglen gælder stadig for lastvogne).
|
||||
-- s = {hasRun, running, carriesOwnWagon, wagonIsSprayer, homeTrip, fetchingWagon}
|
||||
-- (in-game 17/10 11:39: 'Slurry' var gemt som stoppet (ikke sovende) efter "Stop alle" -> sættene var ikke kandidater,
|
||||
-- og F67 fik MEGA'en)
|
||||
function ADFlowWagons.fieldRigLendable(s)
|
||||
if s == nil or not s.hasRun then return false end
|
||||
if s.running or s.fetchingWagon or s.homeTrip then return false end
|
||||
return s.carriesOwnWagon == true and s.wagonIsSprayer == true
|
||||
end
|
||||
|
||||
function ADFlowWagons.isFieldRigTractor(vehicle)
|
||||
local run = ADRunsController.getRunForVehicle(vehicle)
|
||||
if run == nil then return false end
|
||||
local tractorId = ADRunsController.getVehicleId(vehicle)
|
||||
local wagonId = (run.wagons or {})[tractorId]
|
||||
local carries, sprayer = false, false
|
||||
for _, implement in ipairs(ADHitch.rearImplementsOf(vehicle)) do
|
||||
if wagonId ~= nil and ADRunsController.getVehicleId(implement.object) == wagonId then
|
||||
carries = true
|
||||
sprayer = implement.object.spec_sprayer ~= nil
|
||||
end
|
||||
end
|
||||
return ADFlowWagons.fieldRigLendable({hasRun = true, running = run.stopped ~= true and run.sleeping ~= true,
|
||||
carriesOwnWagon = carries, wagonIsSprayer = sprayer,
|
||||
homeTrip = emptying[vehicle] ~= nil or homing[vehicle] ~= nil,
|
||||
fetchingWagon = fetching[vehicle] ~= nil or waiting[vehicle] ~= nil})
|
||||
end
|
||||
|
||||
function ADFlowWagons.isFreeTractor(vehicle)
|
||||
local run = ADRunsController.getRunForVehicle(vehicle)
|
||||
local carries = false
|
||||
|
||||
@@ -73,6 +73,13 @@ function SmartPickupFrame:flowCells(adEnv, run)
|
||||
local why = nil
|
||||
if ADFlowSleep ~= nil and ADFlowSleep.getSleepReason ~= nil then why = ADFlowSleep.getSleepReason(run.id) end
|
||||
status = i18n:getText("spu_flow_sleeping")
|
||||
-- gødningsreserven holder gyllesalget: sættet står til rådighed for markerne — det er ikke "søvn" for spilleren
|
||||
if type(why) == "string" and ADFlowSleep.heldForFields ~= nil and ADFlowSleep.heldForFields({why}) then
|
||||
status = i18n:getText("spu_flow_fertilizing")
|
||||
longStatus = string.format(i18n:getText("spu_flow_fertilizingWhy"), ADFlowSleep.shortReason(why))
|
||||
local name = (run.id == self.selectedRunId and "> " or "") .. ADFlowView.listName(run)
|
||||
return {name, products, from, to, string.format("%d/%d", row.running, row.total), status, longStatus}
|
||||
end
|
||||
if why == false then
|
||||
why = i18n:getText(run.kind == "outbound" and "spu_sleep_noTripOut" or "spu_sleep_noTripSupply")
|
||||
elseif why ~= nil then
|
||||
|
||||
@@ -373,6 +373,8 @@
|
||||
<text name="spu_flow_sleeping" text="Sover"/>
|
||||
<text name="spu_flow_sleepingWhy" text="Sover — %s" />
|
||||
<text name="spu_flow_sleepingLong" text="Sover — vågner når der er arbejde (traktor og vogn er ledige imens)"/>
|
||||
<text name="spu_flow_fertilizing" text="Gøder"/>
|
||||
<text name="spu_flow_fertilizingWhy" text="Gøder — sættet er lånt til markerne (%s)"/>
|
||||
<text name="spu_sleep_noTripOut" text="intet at køre ud med"/>
|
||||
<text name="spu_sleep_noTripSupply" text="intet at hente til målene"/>
|
||||
<text name="spu_flow_ruleSell" text="pris >= %d %%"/>
|
||||
|
||||
@@ -373,6 +373,8 @@
|
||||
<text name="spu_flow_sleeping" text="Sleeping"/>
|
||||
<text name="spu_flow_sleepingWhy" text="Sleeping — %s" />
|
||||
<text name="spu_flow_sleepingLong" text="Sleeping — wakes when there is work (tractor and wagon are free meanwhile)"/>
|
||||
<text name="spu_flow_fertilizing" text="Fertilizing"/>
|
||||
<text name="spu_flow_fertilizingWhy" text="Fertilizing — the set is lent to the fields (%s)"/>
|
||||
<text name="spu_sleep_noTripOut" text="nothing to take out"/>
|
||||
<text name="spu_sleep_noTripSupply" text="nothing to fetch for the targets"/>
|
||||
<text name="spu_flow_ruleSell" text="price >= %d %%"/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.315.0</version>
|
||||
<version>1.62.316.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user