fix(markarbejde): afgrøde og vækststadie fra field.fieldState (spillets marktilstand); getFieldDataAtWorldPosition's 2. værdi er jord-bits, ikke vækst — F108 majs = bar jord; høstet mark vises som 'stub (afgrøde)' (v1.28.7.0)

tests/test_adFieldView.lua

@@ -38,5 +38,12 @@ local parts = V.soilParts({lime = 0.2, fert = 1, fertMax = 2, weed = 3, needs =
 check("V5 dele", table.concat(parts, ","), "lime,plow,fert,weed")
 check("V5 intet", #V.soilParts({lime = 2, fert = 2, fertMax = 2, weed = 0, needs = {}}), 0)
 
+-- cropText: høstet = stub (afgrøde), bar = bar jord, ellers afgrøden
+local texts = {spu_field_stubble = "stub (%s)", spu_field_bare = "bar jord"}
+local function T(key) return texts[key] end
+check("FVcrop stub", ADFieldView.cropText({kind = "bare", stubbleOf = "Hvede", cropTitle = "Hvede"}, T), "stub (Hvede)")
+check("FVcrop bar", ADFieldView.cropText({kind = "bare"}, T), "bar jord")
+check("FVcrop afgrøde", ADFieldView.cropText({kind = "harvest", cropTitle = "Majs"}, T), "Majs")
+
 print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL"))
 os.exit(failures == 0 and 0 or 1)

tests/test_adFieldsPolygon.lua

@@ -15,7 +15,7 @@ local MAIZE = 10
 function getWorldTranslation() return 0, 0, 0 end
 function getTerrainHeightAtWorldPos() return 0 end
 -- markskiltet står i marken, men ved en stribe uden afgrøde (x > 1400)
-local function cropAt(x) return x <= 1400 and MAIZE or nil end
+function cropAt(x) return x <= 1400 and MAIZE or nil end
 FSDensityMapUtil = {
     getFieldDataAtWorldPosition = function() return 1, 2 end,
     getFruitTypeIndexAtWorldPos = function(x, z) return cropAt(x) end,
@@ -56,5 +56,31 @@ check("PG3 majsen findes trods skiltet på bar stribe", info and info.fruitName,
 check("PG4 ikke bar mark", info and info.kind, "harvest")
 check("PG5 markør ved kanten findes (afstand til omridset)", info and info.markerId, 900)
 check("PG6 afstand = til kanten", info and info.markerDistance, 5)
+
+-- PG7-9: field.fieldState er spillets sandhed (fields.xml: MAIZE growthState 2); jord-bits fra
+-- getFieldDataAtWorldPosition (2. værdi) er IKKE vækststadie. Høstet mark (cutState) = bar, vist som stub.
+
+field.fieldState = {fruitTypeIndex = MAIZE, growthState = 2}
+FSDensityMapUtil.getFieldDataAtWorldPosition = function() return true, 0 end   -- jord-bits 0 lignede "ingen vækst"
+local function rescan()
+    ADFields.cache, ADFields.listCache, ADFields.activeScan, ADFields.lastScanStart = {}, nil, nil, nil
+    for _ = 1, 2000 do
+        if ADFields.getInfo(108) ~= nil then break end
+        ADFields.scanStep(adEnv, 1, now)
+        now = now + 16
+    end
+    return ADFields.getInfo(108)
+end
+info = rescan()
+check("PG7 majs i vækst (fieldState), ikke bar", info and info.kind, "harvest")
+check("PG7 fase vokser", info and info.phase, "growing")
+field.fieldState = {fruitTypeIndex = MAIZE, growthState = 9}
+info = rescan()
+check("PG8 høstet (cutState) = bar", info and info.kind, "bare")
+check("PG8 stub af majs", info and info.stubbleOf, "Majs")
+field.fieldState = {fruitTypeIndex = 0, growthState = 0}
+cropAt = function() return nil end
+info = rescan()
+check("PG9 ingen afgrøde = bar uden stub", info and info.kind .. "/" .. tostring(info.stubbleOf), "bare/nil")
 print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL"))
 os.exit(failures == 0 and 0 or 1)

tests/test_adFieldsScan.lua

@@ -17,7 +17,7 @@ function getWorldTranslation(node) local p = nodes[node]; return p[1], 0, p[2] e
 function getTerrainHeightAtWorldPos() return 0 end
 local calls = 0
 FSDensityMapUtil = {
-    getFieldDataAtWorldPosition = function() calls = calls + 1; return 1, 6 end,  -- på mark, vækststadie 6
+    getFieldDataAtWorldPosition = function() calls = calls + 1; return true, 170 end,  -- på mark (2. værdi = jord-bits, IKKE vækst)
     getFruitTypeIndexAtWorldPos = function() calls = calls + 1; return WHEAT end,
     getFruitArea = function(_, _, _, _, _, _, _, any) calls = calls + 1; return 0, any and 10 or 10 end,
 }
@@ -30,7 +30,9 @@ g_fruitTypeManager = {
 }
 g_fillTypeManager = {getConverterDataByName = function() return {} end, getFillTypeNameByIndex = function() return "X" end}
 g_farmlandManager = {getFarmlandOwner = function() return 1 end}
-local field = {getId = function() return 7 end, farmland = {id = 70}, polygonPoints = {101, 102, 103, 104}, posX = 50, posZ = 50}
+-- spillets egen marktilstand (field.fieldState, som fields.xml): afgrøde + vækststadie
+local field = {getId = function() return 7 end, farmland = {id = 70}, polygonPoints = {101, 102, 103, 104}, posX = 50, posZ = 50,
+    fieldState = {fruitTypeIndex = WHEAT, growthState = 6}}
 g_fieldManager = {getFields = function() return {field} end}
 g_currentMission = {terrainRootNode = 1, missionInfo = {}, fieldGroundSystem = {
     getDensityMapData = function() return 1, 0, 2 end, getMaxValue = function() return 2 end}}