fix: Måned-fanen viser 'ikke såtid nu' i stedet for ok (v1.62.113)

This commit is contained in:
2026-10-08 21:25:56 +02:00
parent 23a8d76342
commit 061dfcdebb
5 changed files with 10 additions and 6 deletions
+6 -5
View File
@@ -67,7 +67,7 @@ function ADMonthView.nextStage(field, info)
return nextField.stage
end
-- Vindue for en aktiv mark: "harvestCloses" | "lastSowMonth" | "ok".
-- Vindue for en aktiv mark: "harvestCloses" | "lastSowMonth" | "notSowTime" | "ok".
-- ctx = {period, plantableIn(name, period), withers(info, nextPeriod)}
function ADMonthView.window(field, info, ctx)
local stage = field.stage
@@ -76,9 +76,10 @@ function ADMonthView.window(field, info, ctx)
return "harvestCloses"
end
local sowsLater = field.plan ~= nil and field.plan.sow and ADMonthView.BEFORE_SOWING[stage]
if sowsLater and ADMonthView.sowWindow(ctx.plantableIn, ADFieldModel.sowFruit(field), ctx.period) == "closes" then
return "lastSowMonth"
end
local sow = sowsLater and ADMonthView.sowWindow(ctx.plantableIn, ADFieldModel.sowFruit(field), ctx.period) or nil
if sow == "closes" then return "lastSowMonth" end
-- på såtrinnet uden såtid nu: ikke "ok" (8/10: spilleren spurgte om hvede/græs kan sås næste måned)
if sow == "closed" and stage == "sowing" then return "notSowTime" end
return "ok"
end
@@ -117,7 +118,7 @@ function ADMonthView.build(infos, fieldsById, ctx)
if field.stage == "sowing" or (info.kind == "bare" and ADMonthView.BEFORE_SOWING[field.stage]) then
row.sowFruit = field.plan.sow and ADFieldModel.sowFruit(field) or nil
end
if row.window ~= "ok" then critical = critical + 1 end
if row.window == "harvestCloses" or row.window == "lastSowMonth" then critical = critical + 1 end
table.insert(rows, row)
elseif field ~= nil and info.kind == "bare" and (field.stage == "idle" or field.stage == "done") then
local target = field.plan.targetFruit
+1
View File
@@ -55,6 +55,7 @@
<text name="spu_month_col_progress" text="Færdig"/>
<text name="spu_month_col_next" text="Næste"/>
<text name="spu_month_col_window" text="Vindue"/>
<text name="spu_month_window_notSowTime" text="ikke såtid nu"/>
<text name="spu_month_window_ok" text="ok"/>
<text name="spu_month_window_harvestCloses" text="OBS: visner snart"/>
<text name="spu_month_window_lastSowMonth" text="OBS: sidste såmåned"/>
+1
View File
@@ -55,6 +55,7 @@
<text name="spu_month_col_progress" text="Done"/>
<text name="spu_month_col_next" text="Next"/>
<text name="spu_month_col_window" text="Window"/>
<text name="spu_month_window_notSowTime" text="not sowing time"/>
<text name="spu_month_window_ok" text="ok"/>
<text name="spu_month_window_harvestCloses" text="NOTE: withers soon"/>
<text name="spu_month_window_lastSowMonth" text="NOTE: last sow month"/>
+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.112.0</version>
<version>1.62.113.0</version>
<title>
<en>AD Smart Pickup</en>
</title>