fix(gui): markflåden er tydeligt fælles for alle marker og viser 'fast på F…' / 'i gang på F…'; 50,0 m markeres ikke som over 50 m; rollen hedder gødskning (v1.30.1.0)
This commit is contained in:
@@ -352,10 +352,17 @@ function SmartPickupFrame:rigDetails(rig)
|
||||
elseif rig.role == "weeder" then
|
||||
table.insert(parts, i18n:getText(rig.mechanical and "spu_field_rig_mechanical" or "spu_field_rig_herbicide"))
|
||||
end
|
||||
if (rig.width or 0) > ADFieldModel.CP_MAX_WIDTH then table.insert(parts, i18n:getText("spu_field_tooWideShort")) end
|
||||
-- samme grænse som udsendelsen (50,0 m med afrunding er ikke "over 50 m")
|
||||
if (rig.width or 0) > ADFieldModel.CP_MAX_WIDTH + ADFieldModel.WIDTH_TOLERANCE then table.insert(parts, i18n:getText("spu_field_tooWideShort")) end
|
||||
if (rig.width or 0) < ADFieldModel.MIN_WORK_WIDTH and not ADFieldModel.NO_WIDTH_ROLES[rig.role] then table.insert(parts, i18n:getText("spu_field_widthUnknownShort")) end
|
||||
-- fast på en mark (valgt under markens "Faste maskiner") og hvor den arbejder nu
|
||||
for fieldId, field in pairs(ADFieldJobs.state.fields) do
|
||||
for _, id in ipairs(field.plan ~= nil and field.plan.rigIds or {}) do
|
||||
if id == rig.id then table.insert(parts, string.format(i18n:getText("spu_field_dedicatedElsewhere"), tostring(fieldId))) end
|
||||
end
|
||||
end
|
||||
local assignment = ADFieldJobs.state.assignments[rig.id]
|
||||
if assignment ~= nil then table.insert(parts, string.format("F%d", assignment.fieldId)) end
|
||||
if assignment ~= nil then table.insert(parts, string.format(i18n:getText("spu_field_rig_working"), tostring(assignment.fieldId))) end
|
||||
return #parts > 0 and (" — " .. table.concat(parts, " — ")) or ""
|
||||
end
|
||||
|
||||
|
||||
@@ -87,7 +87,8 @@
|
||||
<text name="spu_field_noStore" text="ingen silo tager markens vare"/>
|
||||
<text name="spu_field_storeAuto" text="intet valgt: nærmeste silo med plads bruges"/>
|
||||
<text name="spu_field_fieldSiloNotEmptied" text="! Marksilo %s tømmes ikke hjem — lav et Ud fra bygning-flow"/>
|
||||
<text name="spu_field_section_fleet" text="— Markflåde (flueben = må sendes ud) —"/>
|
||||
<text name="spu_field_section_fleet" text="— Markflåde, fælles for ALLE marker (flueben = må sendes ud; faste maskiner vælges ved marken) —"/>
|
||||
<text name="spu_field_rig_working" text="i gang på F%s"/>
|
||||
<text name="spu_field_tooWideShort" text="!! over 50 m"/>
|
||||
<text name="spu_field_widthUnknownShort" text="!! bredde ukendt — sæt i Courseplay"/>
|
||||
<text name="spu_field_noRigs" text="ingen køretøjer med slåmaskine, vender, river eller læssevogn"/>
|
||||
@@ -123,7 +124,7 @@
|
||||
<text name="spu_field_rig_seeds" text="frø ok"/>
|
||||
<text name="spu_field_rigs" text="Maskiner pr. trin (Courseplay multi-tool)"/>
|
||||
<text name="spu_field_role_cultivator" text="kultivator"/>
|
||||
<text name="spu_field_role_fertilizer" text="gødningsspreder"/>
|
||||
<text name="spu_field_role_fertilizer" text="gødskning"/>
|
||||
<text name="spu_field_role_harvester" text="høster"/>
|
||||
<text name="spu_field_role_limer" text="kalkspreder"/>
|
||||
<text name="spu_field_role_mulcher" text="stubhakker"/>
|
||||
|
||||
@@ -87,7 +87,8 @@
|
||||
<text name="spu_field_noStore" text="no silo takes this field's goods"/>
|
||||
<text name="spu_field_storeAuto" text="none chosen: nearest silo with room is used"/>
|
||||
<text name="spu_field_fieldSiloNotEmptied" text="! Field silo %s is not emptied home — create an Out of building flow"/>
|
||||
<text name="spu_field_section_fleet" text="— Field fleet (ticked = may be sent out) —"/>
|
||||
<text name="spu_field_section_fleet" text="— Field fleet, shared by ALL fields (ticked = may be sent out; dedicated machines are set per field) —"/>
|
||||
<text name="spu_field_rig_working" text="working on F%s"/>
|
||||
<text name="spu_field_tooWideShort" text="!! over 50 m"/>
|
||||
<text name="spu_field_widthUnknownShort" text="!! width unknown — set in Courseplay"/>
|
||||
<text name="spu_field_noRigs" text="no vehicles with mower, tedder, rake or loading wagon"/>
|
||||
@@ -123,7 +124,7 @@
|
||||
<text name="spu_field_rig_seeds" text="seeds ok"/>
|
||||
<text name="spu_field_rigs" text="Machines per step (Courseplay multi-tool)"/>
|
||||
<text name="spu_field_role_cultivator" text="cultivator"/>
|
||||
<text name="spu_field_role_fertilizer" text="fertilizer spreader"/>
|
||||
<text name="spu_field_role_fertilizer" text="fertilizing"/>
|
||||
<text name="spu_field_role_harvester" text="harvester"/>
|
||||
<text name="spu_field_role_limer" text="lime spreader"/>
|
||||
<text name="spu_field_role_mulcher" text="mulcher"/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.30.0.0</version>
|
||||
<version>1.30.1.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user