feat: stenplukning efter jordbehandling (1.62.207)
This commit is contained in:
@@ -9,7 +9,7 @@ ADCpBridge = {}
|
||||
-- (Courseplays combine-unloader-tjek siger nej uden traktor — in-game 4/10: ingen tømmevogn i puljen)
|
||||
ADCpBridge.SPECS = {"spec_mower", "spec_tedder", "spec_windrower", "spec_forageWagon", "spec_combine", "spec_baler",
|
||||
"spec_sowingMachine", "spec_cultivator", "spec_plow", "spec_roller", "spec_weeder", "spec_mulcher",
|
||||
"spec_trailer", "spec_dischargeable"}
|
||||
"spec_trailer", "spec_dischargeable", "spec_stonePicker"}
|
||||
|
||||
-- Sprøjtens/sprederens fyld -> rolle (tom sprøjte har ingen rolle; den kan ikke sendes ud).
|
||||
ADCpBridge.SPRAY_ROLES = {
|
||||
|
||||
@@ -16,6 +16,7 @@ ADFieldFleet.ROLE_SPECS = {
|
||||
{role = "seeder", spec = "spec_sowingMachine"},
|
||||
{role = "roller", spec = "spec_roller"},
|
||||
{role = "weeder", spec = "spec_weeder"},
|
||||
{role = "stonePicker", spec = "spec_stonePicker"},
|
||||
{role = "sprayRole"},
|
||||
{role = "mulcher", spec = "spec_mulcher"},
|
||||
-- plov før kultivator: FS25-plove har også spec_cultivator (in-game 28/9: POV 5 XL blev "kultivator")
|
||||
|
||||
@@ -52,7 +52,7 @@ ADFieldJobs.PREPARED_DONE_RATIO = 0.95
|
||||
ADFieldJobs.POST_MOW_STAGES = {tedding = true, raking = true, collecting = true}
|
||||
|
||||
ADFieldJobs.PREP_STAGES = {strawCollecting = true, baling = true, baleCollecting = true, mulching = true, liming = true,
|
||||
plowing = true, cultivating = true, sowing = true, rolling = true}
|
||||
plowing = true, cultivating = true, stonePicking = true, sowing = true, rolling = true}
|
||||
|
||||
-- ---- ren beslutning ----
|
||||
|
||||
@@ -671,6 +671,10 @@ local function stepField(adEnv, info, env)
|
||||
end
|
||||
local nextField = ADFieldModel.advance(field, info.needs)
|
||||
ADFieldJobs.setField(nextField)
|
||||
if nextField.stage == "stonePicking" and ADFields.stoneHistogram ~= nil then
|
||||
local okStone, histogram = pcall(ADFields.stoneHistogram, info.field)
|
||||
ADFieldJobs.log(info.id, "sten på marken (værdi:pixels): %s", okStone and tostring(histogram) or ("fejl: " .. tostring(histogram)))
|
||||
end
|
||||
ADFieldJobs.waitingSince[info.id] = nil
|
||||
ADFieldJobs.forgetFinished(info.id)
|
||||
ADFieldWork.windDownHelpers(adEnv, info.id, field.stage)
|
||||
|
||||
@@ -29,6 +29,7 @@ ADFieldModel.ROLES = {
|
||||
harvesting = "harvester", mulching = "mulcher", liming = "limer", plowing = "plow",
|
||||
cultivating = "cultivator", sowing = "seeder", rolling = "roller", weeding = "weeder",
|
||||
fertilizing = "fertilizer", strawCollecting = "collector", baling = "baler", baleCollecting = "baleCollector",
|
||||
stonePicking = "stonePicker",
|
||||
}
|
||||
ADFieldModel.HELPERS = {harvesting = "unloader"}
|
||||
ADFieldModel.CARE_STAGES = {fertilizing = true, weeding = true, careLiming = true}
|
||||
@@ -111,6 +112,10 @@ function ADFieldModel.prepStages(plan, needs)
|
||||
elseif soil == "cultivate" or soil == "auto" then
|
||||
table.insert(stages, "cultivating")
|
||||
end
|
||||
-- jordbehandlingen vender sten op: stenplukning før såning, når kortet har sten (brugerønske 10/10)
|
||||
if needs.stones and (stages[#stages] == "plowing" or stages[#stages] == "cultivating") then
|
||||
table.insert(stages, "stonePicking")
|
||||
end
|
||||
if plan.sow then
|
||||
table.insert(stages, "sowing")
|
||||
if plan.roll then table.insert(stages, "rolling") end
|
||||
@@ -315,7 +320,7 @@ function ADFieldModel.advance(field, needs)
|
||||
local stages = ADFieldModel.workStages(field.plan, field.kind, needs)
|
||||
copy.stage = "done"
|
||||
local passed = false
|
||||
local order = {"mowing", "tedding", "raking", "collecting", "harvesting", "strawCollecting", "baling", "baleCollecting", "mulching", "liming", "plowing", "cultivating", "sowing", "rolling"}
|
||||
local order = {"mowing", "tedding", "raking", "collecting", "harvesting", "strawCollecting", "baling", "baleCollecting", "mulching", "liming", "plowing", "cultivating", "stonePicking", "sowing", "rolling"}
|
||||
local rank = {}
|
||||
for index, stage in ipairs(order) do rank[stage] = index end
|
||||
for _, stage in ipairs(stages) do
|
||||
|
||||
@@ -114,6 +114,7 @@ function ADFields.soilNeeds(levels, settings)
|
||||
return {
|
||||
lime = settings.limeRequired and levels.lime ~= nil and levels.lime < 1 or false,
|
||||
plow = settings.plowingRequired and levels.plowLevel ~= nil and levels.plowLevel < 1 or false,
|
||||
stones = settings.stones == true,
|
||||
}
|
||||
end
|
||||
|
||||
@@ -180,6 +181,33 @@ local function readWeed(x, z)
|
||||
return value
|
||||
end
|
||||
|
||||
function ADFields.mapHasStones()
|
||||
local system = g_currentMission ~= nil and g_currentMission.stoneSystem or nil
|
||||
if system == nil or system.getMapHasStones == nil then return false end
|
||||
local ok, has = pcall(system.getMapHasStones, system)
|
||||
return ok and has == true
|
||||
end
|
||||
|
||||
-- Diagnose til kalibrering (in-game): pixels pr. stenværdi på hele marken, fx "0:1200 1:40 2:0 3:8800 (min 1, max 3)".
|
||||
-- Spillets dokumentation siger ikke, hvilke værdier der er "sten der ligger" og "samlet op" (StonePickMission tæller
|
||||
-- NOTEQUAL max blandt > 0). Indtil det er målt, køres stenplukning altid efter jordbehandlingen.
|
||||
function ADFields.stoneHistogram(field)
|
||||
local system = g_currentMission ~= nil and g_currentMission.stoneSystem or nil
|
||||
if system == nil or field == nil or field.getDensityMapPolygon == nil then return nil end
|
||||
local mapId, firstChannel, numChannels = system:getDensityMapData()
|
||||
local minValue, maxValue = system:getMinMaxValues()
|
||||
local parts = {}
|
||||
for value = 0, maxValue do
|
||||
local modifier = DensityMapModifier.new(mapId, firstChannel, numChannels, g_terrainNode or g_currentMission.terrainRootNode)
|
||||
local filter = DensityMapFilter.new(modifier)
|
||||
filter:setValueCompareParams(DensityValueCompareType.EQUAL, value)
|
||||
field:getDensityMapPolygon():applyToModifier(modifier)
|
||||
local _, area = modifier:executeGet(filter)
|
||||
table.insert(parts, string.format("%d:%d", value, math.floor(area or 0)))
|
||||
end
|
||||
return string.format("%s (min %s, max %s)", table.concat(parts, " "), tostring(minValue), tostring(maxValue))
|
||||
end
|
||||
|
||||
local function missionSettings()
|
||||
local info = g_currentMission ~= nil and g_currentMission.missionInfo or {}
|
||||
local function flag(value) return value == nil or value == true end
|
||||
@@ -187,6 +215,8 @@ local function missionSettings()
|
||||
limeRequired = flag(info.limeRequired),
|
||||
plowingRequired = flag(info.plowingRequiredEnabled),
|
||||
weedsEnabled = flag(info.weedsEnabled),
|
||||
-- sten: kortet skal have sten, og de skal være slået til i savegamet
|
||||
stones = ADFields.mapHasStones() and flag(info.stonesEnabled),
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ end
|
||||
-- ballesamlere skal køre til et lager og kræver vejnettet; mejetærskere bruger deres eget flueben (som før).
|
||||
ADManualTransport.PLAYER_ROLES = {
|
||||
mower = true, tedder = true, rake = true, mulcher = true, limer = true, plow = true, cultivator = true,
|
||||
seeder = true, roller = true, weeder = true, fertilizer = true, baler = true,
|
||||
seeder = true, roller = true, weeder = true, fertilizer = true, baler = true, stonePicker = true,
|
||||
}
|
||||
|
||||
-- s = {role, hasPark, nearNetwork, helper}
|
||||
@@ -71,7 +71,7 @@ end
|
||||
local STAGE_VERBS = {
|
||||
mowing = "slås", tedding = "vendes", raking = "rives", mulching = "mulches", liming = "kalkes", careLiming = "kalkes",
|
||||
plowing = "pløjes", cultivating = "kultiveres", sowing = "sås", rolling = "tromles", weeding = "renses for ukrudt",
|
||||
fertilizing = "gødes", baling = "presses",
|
||||
fertilizing = "gødes", baling = "presses", stonePicking = "renses for sten",
|
||||
}
|
||||
|
||||
function ADManualTransport.stageVerb(stage)
|
||||
|
||||
@@ -14,6 +14,7 @@ SmartPickupFrame.ROLE_KEYS = {
|
||||
cultivator = "spu_field_role_cultivator", seeder = "spu_field_role_seeder", roller = "spu_field_role_roller",
|
||||
weeder = "spu_field_role_weeder", fertilizer = "spu_field_role_fertilizer",
|
||||
baler = "spu_field_role_baler", baleCollector = "spu_field_role_baleCollector",
|
||||
stonePicker = "spu_field_role_stonePicker",
|
||||
}
|
||||
|
||||
-- ---- tekster ----
|
||||
|
||||
@@ -189,6 +189,7 @@
|
||||
<text name="spu_field_rig_seeds" text="frø ok"/>
|
||||
<text name="spu_field_rigs" text="Maskiner pr. trin (Courseplay multi-tool)"/>
|
||||
<text name="spu_field_role_cultivator" text="kultivator"/>
|
||||
<text name="spu_field_role_stonePicker" text="stenplukker"/>
|
||||
<text name="spu_field_role_fertilizer" text="gødskning"/>
|
||||
<text name="spu_field_role_harvester" text="høster"/>
|
||||
<text name="spu_field_role_limer" text="kalkspreder"/>
|
||||
@@ -214,6 +215,7 @@
|
||||
<text name="spu_field_sowSame" text="Samme som høstet"/>
|
||||
<text name="spu_field_stage_careLiming" text="Kalkes"/>
|
||||
<text name="spu_field_stage_cultivating" text="Kultiveres"/>
|
||||
<text name="spu_field_stage_stonePicking" text="Renses for sten"/>
|
||||
<text name="spu_field_stage_fertilizing" text="Gødes"/>
|
||||
<text name="spu_field_stage_harvesting" text="Høstes"/>
|
||||
<text name="spu_field_stage_liming" text="Kalkes"/>
|
||||
|
||||
@@ -189,6 +189,7 @@
|
||||
<text name="spu_field_rig_seeds" text="seeds ok"/>
|
||||
<text name="spu_field_rigs" text="Machines per step (Courseplay multi-tool)"/>
|
||||
<text name="spu_field_role_cultivator" text="cultivator"/>
|
||||
<text name="spu_field_role_stonePicker" text="stone picker"/>
|
||||
<text name="spu_field_role_fertilizer" text="fertilizing"/>
|
||||
<text name="spu_field_role_harvester" text="harvester"/>
|
||||
<text name="spu_field_role_limer" text="lime spreader"/>
|
||||
@@ -214,6 +215,7 @@
|
||||
<text name="spu_field_sowSame" text="Same as harvested"/>
|
||||
<text name="spu_field_stage_careLiming" text="Liming"/>
|
||||
<text name="spu_field_stage_cultivating" text="Cultivating"/>
|
||||
<text name="spu_field_stage_stonePicking" text="Stone picking"/>
|
||||
<text name="spu_field_stage_fertilizing" text="Fertilizing"/>
|
||||
<text name="spu_field_stage_harvesting" text="Harvesting"/>
|
||||
<text name="spu_field_stage_liming" text="Liming"/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<modDesc descVersion="107">
|
||||
<author>masterdraco</author>
|
||||
<version>1.62.206.0</version>
|
||||
<version>1.62.207.0</version>
|
||||
<title>
|
||||
<en>AD Smart Pickup</en>
|
||||
</title>
|
||||
|
||||
Reference in New Issue
Block a user