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:
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user