diff --git a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua index 46ba6a7..a5f8828 100644 --- a/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua +++ b/FS25_ADSmartPickup/gui/SmartPickupFieldTab.lua @@ -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 diff --git a/FS25_ADSmartPickup/l10n/l10n_da.xml b/FS25_ADSmartPickup/l10n/l10n_da.xml index ebe82fc..a64c979 100644 --- a/FS25_ADSmartPickup/l10n/l10n_da.xml +++ b/FS25_ADSmartPickup/l10n/l10n_da.xml @@ -87,7 +87,8 @@ - + + @@ -123,7 +124,7 @@ - + diff --git a/FS25_ADSmartPickup/l10n/l10n_en.xml b/FS25_ADSmartPickup/l10n/l10n_en.xml index 2cbae9f..38fc1b5 100644 --- a/FS25_ADSmartPickup/l10n/l10n_en.xml +++ b/FS25_ADSmartPickup/l10n/l10n_en.xml @@ -87,7 +87,8 @@ - + + @@ -123,7 +124,7 @@ - + diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index a5e4d7b..bccc863 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.30.0.0 + 1.30.1.0 <en>AD Smart Pickup</en>