fix: marker med afgrøde men uden markjord-lag kommer med (Flat Acres 4X F2) — 1.62.165

This commit is contained in:
2026-10-10 06:47:32 +02:00
parent 1daa3ec0b7
commit 9e2dd2c8dc
3 changed files with 23 additions and 8 deletions
+21 -7
View File
@@ -268,7 +268,10 @@ end
-- intet: resten af marken er stadig markjord. groundPoints = prøvepunkter hvor jorden selv er markjord: en
-- brakmark (FALLOW) har også groundType NONE i marktilstanden (Chipping Norton in-game 3/10), men markjord i
-- punkterne — viser mindst halvdelen markjord, er marken med.
function ADFields.isCultivable(state, onFieldPoints, groundPoints)
-- cropPoints: punkter uden markjord, men med en afgrøde (kort hvor afgrøden er sat uden markjord-lag — in-game 10/10
-- Flat Acres 4X: F2 med høstklar hvede, spillet melder "ingen markjord"). Afgrøden kan høstes, så marken er med.
function ADFields.isCultivable(state, onFieldPoints, groundPoints, cropPoints)
if (cropPoints or 0) > 0 then return true end
local points = onFieldPoints or 0
if points <= 0 then return false end
if state ~= nil and state.noFieldGround then
@@ -432,7 +435,17 @@ local function newScan(adEnv, entry)
for _, candidate in ipairs(candidates) do
push(scan, function()
local ok, onField = pcall(isOnField, candidate.x, candidate.z)
if ok and onField then table.insert(scan.points, candidate) end
if ok and onField then
table.insert(scan.points, candidate)
else
-- ingen markjord, men en afgrøde i punktet (kortet har sat afgrøden uden markjord-lag): tæller med
local okF, fruit = pcall(FSDensityMapUtil.getFruitTypeIndexAtWorldPos, candidate.x, candidate.z)
if okF and type(fruit) == "number" and fruit > 0 then
candidate.cropOnly = true
scan.cropPoints = (scan.cropPoints or 0) + 1
table.insert(scan.points, candidate)
end
end
end)
end
-- 3) afgrøde pr. punkt (efter alle kandidater)
@@ -456,8 +469,9 @@ function ADFields.scanPerFruit(scan)
-- (getFieldDataAtWorldPosition giver isOnField, densityBits, groundType — IKKE vækststadie)
local state = ADFields.readFieldState(info.field)
info.growthState = state ~= nil and state.growthState or nil
info.cultivable = ADFields.isCultivable(state, #scan.points)
if state ~= nil then
info.cultivable = ADFields.isCultivable(state, #scan.points, nil, scan.cropPoints)
-- spillets marktilstand siger "ingen markjord, ingen afgrøde", men punkterne har en: punkterne vinder
if state ~= nil and not (state.fruitIndex == nil and state.noFieldGround and (scan.cropPoints or 0) > 0) then
info.fruitIndex = state.fruitIndex
else
info.fruitIndex = winner(scan.fruitVotes)
@@ -575,13 +589,13 @@ local function finishScan(adEnv, scan)
info.shapeSig = ADFields.shapeSignature(info.verts)
if ADCourseCache ~= nil and ADCourseCache.checkField ~= nil then pcall(ADCourseCache.checkField, info.id, info.shapeSig) end
-- jorden i punkterne er nu læst: afgør "kan dyrkes" igen (brakmark vs. bygget over)
info.cultivable = ADFields.isCultivable(ADFields.readFieldState(info.field), #scan.points, scan.soil.prepared[2])
info.cultivable = ADFields.isCultivable(ADFields.readFieldState(info.field), #scan.points, scan.soil.prepared[2], scan.cropPoints)
ADFields.cache[info.id] = info
ADFields.listCache = nil
-- diagnose: første scanning af hver mark (og når den skifter til/fra "kan ikke dyrkes") i loggen
local state = ADFields.readFieldState(info.field)
local summary = string.format("F%s scannet: %d af %d punkter på mark (%d med markjord), polygon %d hjørner, marktilstand %s, afgrøde %s, med i listen %s",
tostring(info.id), #scan.points, scan.candidates or 0, scan.soil.prepared[2], #(info.verts or {}),
local summary = string.format("F%s scannet: %d af %d punkter på mark (%d med markjord, %d kun afgrøde), polygon %d hjørner, marktilstand %s, afgrøde %s, med i listen %s",
tostring(info.id), #scan.points, scan.candidates or 0, scan.soil.prepared[2], scan.cropPoints or 0, #(info.verts or {}),
state == nil and "ukendt" or (state.noFieldGround and "groundType NONE" or "markjord"),
tostring(info.fruitName or "-"), info.cultivable == false and "NEJ" or "ja")
ADFields.scanLog = ADFields.scanLog or {}
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<modDesc descVersion="107">
<author>masterdraco</author>
<version>1.62.164.0</version>
<version>1.62.165.0</version>
<title>
<en>AD Smart Pickup</en>
</title>