feat: bygninger viser deres sted (nærmeste AD-markør) i Field Silos og Vis bygning; nye siloer hedder 'Silo ved <markør>' — 1.62.327
Brugerønske 17/10 18:07: 13 bygninger hed 'Silo N' (dieseltanke, mælketank, bins) uden sted. ADBuildings.nearestNamedMarker/placeSuffix/labelWithPlace/placeSuffixFor; build() sætter near pr. bygning; ADNaming silo-fallback 'Silo ved <markør>' før 'Silo N'. Eksisterende navne røres ikke. Manualer opdateret; tests NM1-5, LP1-7, naming.
This commit is contained in:
@@ -208,6 +208,46 @@ function ADBuildings.isCandidateMarker(marker)
|
||||
return not ADSupplyPlanner.isWaitMarker(marker) and not ADBuildings.isServiceMarker(marker.name)
|
||||
end
|
||||
|
||||
-- Stedet: nærmeste AD-markør (ikke P/Connect/Wait) inden for NEAR_MARKER_M af bygningen — så "Silo 7" kan kendes som
|
||||
-- "Silo 7 · Silo Complex" (brugerønske 17/10 18:07: "alle dem der bare hedder silo aner jeg ikke hvor de reelt står").
|
||||
-- markers = {{name, x, z}} (allerede filtreret) -> {name, distance} | nil
|
||||
ADBuildings.NEAR_MARKER_M = 80
|
||||
function ADBuildings.nearestNamedMarker(markers, x, z, maxDistance)
|
||||
if x == nil or z == nil then return nil end
|
||||
local best, bestDistance = nil, maxDistance or ADBuildings.NEAR_MARKER_M
|
||||
for _, marker in ipairs(markers or {}) do
|
||||
local distance = math.sqrt((marker.x - x) ^ 2 + (marker.z - z) ^ 2)
|
||||
if distance < bestDistance then best, bestDistance = marker.name, distance end
|
||||
end
|
||||
return best ~= nil and {name = best, distance = bestDistance} or nil
|
||||
end
|
||||
|
||||
-- Navn med sted til listerne: "Silo 7 · Silo Complex"; markørnavnet udelades, når det allerede står i navnet
|
||||
-- ("F36 marksilo" ved markøren "F36"), og helt når der ingen markør er nær.
|
||||
-- Sted-endelsen alene (" · Silo Complex" eller ""): markøren som helt ord i navnet tæller som "står allerede der"
|
||||
-- ("F36 marksilo" ved "F36"; men "F3" gemmer sig ikke i "F36").
|
||||
function ADBuildings.placeSuffix(building)
|
||||
local name = tostring(building ~= nil and building.name or "?")
|
||||
local near = building ~= nil and building.near or nil
|
||||
if near == nil or near.name == nil or near.name == "" then return "" end
|
||||
if string.find(" " .. string.lower(name) .. " ", " " .. string.lower(tostring(near.name)) .. " ", 1, true) then return "" end
|
||||
return " · " .. tostring(near.name)
|
||||
end
|
||||
|
||||
function ADBuildings.labelWithPlace(building)
|
||||
return tostring(building ~= nil and building.name or "?") .. ADBuildings.placeSuffix(building)
|
||||
end
|
||||
|
||||
-- Alle navngivne markører (uden P/Connect/Wait) med position -> {{name, x, z}}
|
||||
local function namedMarkers(adEnv)
|
||||
local list = {}
|
||||
for _, marker in pairs(adEnv.ADGraphManager:getMapMarkers()) do
|
||||
local wayPoint = ADBuildings.isCandidateMarker(marker) and adEnv.ADGraphManager:getWayPointById(marker.id) or nil
|
||||
if wayPoint ~= nil then table.insert(list, {name = tostring(marker.name), x = wayPoint.x, z = wayPoint.z}) end
|
||||
end
|
||||
return list
|
||||
end
|
||||
|
||||
-- Nærmeste ikke-Wait-markør til en af noderne, ≤ MAX_MARKER_DISTANCE.
|
||||
local function nearestMarker(adEnv, nodes)
|
||||
local best, bestDistance = nil, ADBuildings.MAX_MARKER_DISTANCE
|
||||
@@ -608,6 +648,8 @@ local function build(adEnv, farmId)
|
||||
-- naboens marker kan være nærmere dem (in-game 17/10 08:05: Hønsehus 2 tog 'Coop 1 Egg Pickup' 7 m fra sin
|
||||
-- palleplads, og Hønsehus 3 stod uden markør)
|
||||
local loadOwner, prepared = {}, {}
|
||||
local okNamed, named = pcall(namedMarkers, adEnv)
|
||||
if not okNamed then named = {} end
|
||||
for _, placeable in pairs(placeables) do
|
||||
if getKind(placeable) == "husbandry" and isOwnedBy(placeable, farmId) then
|
||||
local loadGroups, unloadNodes = collectNodes(placeable, loadStations, unloadStations)
|
||||
@@ -681,8 +723,10 @@ local function build(adEnv, farmId)
|
||||
-- silo der kun kan FYLDES (fx drive-on-bunker der fodrer en biogas-fermentor): aflæsning,
|
||||
-- ingen læssestation -> et forsyningsmål, aldrig en kilde
|
||||
local isFillOnlySilo = kind == "silo" and loadMarkers[1] == nil and #loadGroups == 0 and unloadMarker ~= nil
|
||||
local nearX, nearZ = getNodePosition(placeable.rootNode)
|
||||
table.insert(result, {
|
||||
id = id, name = getName(placeable, id), kind = kind, placeable = placeable,
|
||||
near = ADBuildings.nearestNamedMarker(named, nearX, nearZ), -- stedet (nærmeste AD-markør) til listerne
|
||||
loadMarker = loadMarkers[1],
|
||||
loadMarkers = loadMarkers,
|
||||
unloadMarker = unloadMarker,
|
||||
@@ -698,6 +742,15 @@ local function build(adEnv, farmId)
|
||||
return result
|
||||
end
|
||||
|
||||
-- Sted-endelsen for en bygning i den cachede liste (til "Vis bygning"-vælgeren): " · Silo Complex" eller ""
|
||||
function ADBuildings.placeSuffixFor(adEnv, farmId, placeable)
|
||||
local id = placeable ~= nil and ADBuildings.getId(placeable) or nil
|
||||
for _, building in ipairs(id ~= nil and ADBuildings.list(adEnv, farmId) or {}) do
|
||||
if building.id == id then return ADBuildings.placeSuffix(building) end
|
||||
end
|
||||
return ""
|
||||
end
|
||||
|
||||
function ADBuildings.invalidate()
|
||||
if ADCache ~= nil then ADCache.clear() end
|
||||
cache.list, cache.time = nil, -math.huge
|
||||
|
||||
@@ -147,7 +147,8 @@ function ADNames.autoName(adEnv, buildings)
|
||||
end
|
||||
end
|
||||
table.insert(inputs, {id = building.id, kind = building.kind, animal = building.kind == "husbandry" and animalTypeName(building.placeable) or nil,
|
||||
storeName = rawName(building.placeable), inFarmCluster = farm[building.id] == true, nearestField = nearest})
|
||||
storeName = rawName(building.placeable), inFarmCluster = farm[building.id] == true, nearestField = nearest,
|
||||
nearMarker = building.near ~= nil and building.near.name or nil})
|
||||
end
|
||||
end
|
||||
local added = ADNaming.assign(inputs, existing)
|
||||
|
||||
@@ -30,7 +30,7 @@ local function uniqueFixed(names, base)
|
||||
end
|
||||
|
||||
-- Navn for én bygning (nil = navngives ikke, fx salgssteder).
|
||||
-- b = {kind, animal, storeName, inFarmCluster, nearestField = {name, distance}}
|
||||
-- b = {kind, animal, storeName, inFarmCluster, nearestField = {name, distance}, nearMarker = navn}
|
||||
local function nameFor(b, names)
|
||||
if b.kind == "husbandry" then
|
||||
local prefix = ADNaming.ANIMAL_PREFIX[tostring(b.animal or ""):upper()] or "Stald"
|
||||
@@ -41,6 +41,9 @@ local function nameFor(b, names)
|
||||
if field ~= nil and field.name ~= nil and (field.distance or math.huge) <= ADNaming.FIELD_SILO_DISTANCE then
|
||||
return uniqueFixed(names, field.name .. " marksilo")
|
||||
end
|
||||
-- hverken gård eller mark: stedet (nærmeste AD-markør) frem for "Silo 13" (brugerønske 17/10: 13 siloer
|
||||
-- hed "Silo N", og ingen vidste hvor de stod)
|
||||
if b.nearMarker ~= nil and b.nearMarker ~= "" then return uniqueFixed(names, "Silo ved " .. tostring(b.nearMarker)) end
|
||||
return string.format("Silo %d", ADNaming.nextNumber(names, "Silo"))
|
||||
elseif b.kind == "objectStorage" then
|
||||
return string.format("Palleskur %d", ADNaming.nextNumber(names, "Palleskur"))
|
||||
|
||||
@@ -86,7 +86,7 @@ function SmartPickupFrame:fillFieldSiloRows(adEnv)
|
||||
local farmId = g_currentMission:getFarmId()
|
||||
for _, building in ipairs(ADBuildings.list(adEnv, farmId)) do
|
||||
if building.kind == "silo" then
|
||||
local option = self:addToggleRow("fsStore", tostring(building.name), onOff, ADFieldSiloConfig.hasStore(cfg, building.id))
|
||||
local option = self:addToggleRow("fsStore", ADBuildings.labelWithPlace(building), onOff, ADFieldSiloConfig.hasStore(cfg, building.id))
|
||||
self.rowData[option] = {kind = "fsStore", buildingId = building.id}
|
||||
end
|
||||
end
|
||||
|
||||
@@ -116,12 +116,19 @@ function SmartPickupFrame:statTotalCells(stats)
|
||||
end
|
||||
|
||||
-- Navne til vælgeren; ens navne (40 Farma-siloer) får løbenummer.
|
||||
function SmartPickupFrame:storageLabels(inventory)
|
||||
-- Vælgerens tekster: navn + sted ("Silo 7 · Silo Complex"); ens navne får #1/#2 (1.62.327: sted, så "Silo N" kan kendes)
|
||||
function SmartPickupFrame:storageLabels(inventory, adEnv)
|
||||
local counts, seen, labels = {}, {}, {}
|
||||
for _, entry in ipairs(inventory) do counts[entry.name] = (counts[entry.name] or 0) + 1 end
|
||||
local farmId = g_currentMission ~= nil and g_currentMission.getFarmId ~= nil and g_currentMission:getFarmId() or nil
|
||||
for index, entry in ipairs(inventory) do
|
||||
seen[entry.name] = (seen[entry.name] or 0) + 1
|
||||
labels[index] = counts[entry.name] > 1 and string.format("%s #%d", entry.name, seen[entry.name]) or entry.name
|
||||
local base = counts[entry.name] > 1 and string.format("%s #%d", entry.name, seen[entry.name]) or entry.name
|
||||
local okLabel, label = pcall(function()
|
||||
if adEnv == nil or ADBuildings == nil or ADBuildings.placeSuffixFor == nil then return base end
|
||||
return base .. ADBuildings.placeSuffixFor(adEnv, farmId, entry.placeable)
|
||||
end)
|
||||
labels[index] = okLabel and label or base
|
||||
end
|
||||
return labels
|
||||
end
|
||||
@@ -136,7 +143,7 @@ function SmartPickupFrame:fillStorageDetail(adEnv, inventory, fullInventory)
|
||||
self.storageIndex = math.max(1, math.min(self.storageIndexByTab[self.currentTab] or 1, #inventory))
|
||||
local row = self:addRow(self.productPrefab, {kind = "storageBuilding"})
|
||||
local option = row:getDescendantByName("option")
|
||||
option:setTexts(self:storageLabels(inventory))
|
||||
option:setTexts(self:storageLabels(inventory, adEnv))
|
||||
option:setState(self.storageIndex, false)
|
||||
row:getDescendantByName("title"):setText(self.i18n:getText("spu_storage_select"))
|
||||
local entry = inventory[self.storageIndex]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.326.0</version>
|
||||
<version>1.62.327.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user