diff --git a/FS25_ADSmartPickup/adHitch.lua b/FS25_ADSmartPickup/adHitch.lua index ae1dcaa..5cb91f6 100644 --- a/FS25_ADSmartPickup/adHitch.lua +++ b/FS25_ADSmartPickup/adHitch.lua @@ -68,6 +68,13 @@ function ADHitch.stepAction(name) return ADHitch.parseMarker(name) or "arrive" end +-- Connect-markøren virker begge veje: ankommer traktoren med et redskab bag sig, kobles det af igen — markøren +-- ligger under trækøjet, så vognen står da præcis på sin parkeringsplads. +function ADHitch.resolveAction(action, hasRearImplement) + if action == "attach" and hasRearImplement then return "detach" end + return action +end + -- pause efter et trin: ved almindelige markører undervejs holdes der, ikke efter sidste trin function ADHitch.waitAfter(action, index, count) if action == "arrive" and index < count then return ADHitch.ROUTE_WAIT_MS end @@ -181,6 +188,10 @@ local function attachedImplements(vehicle) return list end +local function hasRearImplement(vehicle) + return #ADHitch.rearImplements(attachedImplements(vehicle)) > 0 +end + -- Kobler redskaberne bag traktoren af. -> ok, navne eller årsag function ADHitch.tryDetach(vehicle) local rear = ADHitch.rearImplements(attachedImplements(vehicle)) @@ -229,7 +240,8 @@ function ADHitch.route(adEnv, vehicle, markerIds, onDone) return end local marker = adEnv.ADGraphManager:getMapMarkerByWayPointId(markerIds[index]) - local action = ADHitch.stepAction(marker ~= nil and marker.name or nil) + local action = ADHitch.resolveAction(ADHitch.stepAction(marker ~= nil and marker.name or nil), + hasRearImplement(vehicle)) start(adEnv, vehicle, markerIds[index], action, function(_, ok, detail) if not ok then Logging.warning(ADHitch.LOG_PREFIX .. "'%s' stopper turen ved trin %d", vehicleName(vehicle), index) @@ -268,7 +280,9 @@ local function watchManualTrips(adEnv) and module:getMode() == adEnv.AutoDrive.MODE_DRIVETO then local marker = module:getFirstMarker() local action = marker ~= nil and ADHitch.parseMarker(marker.name) or nil - if action ~= nil then jobs[vehicle] = ADHitch.newJob(marker.id, marker.name, action) end + if action ~= nil then + jobs[vehicle] = ADHitch.newJob(marker.id, marker.name, ADHitch.resolveAction(action, hasRearImplement(vehicle))) + end end end end @@ -337,7 +351,7 @@ function ADHitch:consoleDetach() return "spuDetach: intet koblet af (" .. tostring(detail) .. ")" end --- "spuTrip Connect Bredal > Start > Afkobl Bredal > Start": maskinen spilleren sidder i kører turen +-- "spuTrip Connect Bredal > Start > Connect Bredal > Start": maskinen spilleren sidder i kører turen -- (spilleren kan blive siddende; AD kører også med spilleren i førerhuset). function ADHitch:consoleTrip(...) local vehicle = currentVehicle() @@ -345,7 +359,7 @@ function ADHitch:consoleTrip(...) local adEnv = ADFieldSilos ~= nil and ADFieldSilos.adEnv or nil if adEnv == nil then return "spuTrip: AutoDrive er ikke klar endnu" end local names = ADHitch.parseTrip(...) - if #names == 0 then return "spuTrip: brug fx spuTrip Connect Bredal > Start > Afkobl Bredal > Start" end + if #names == 0 then return "spuTrip: brug fx spuTrip Connect Bredal > Start > Connect Bredal > Start" end local markers, ids = adEnv.ADGraphManager:getMapMarkers(), {} for _, name in ipairs(names) do local marker = ADHitch.findMarker(markers, name) @@ -358,6 +372,6 @@ end if addConsoleCommand ~= nil then addConsoleCommand("spuConnect", "Kobler nærmeste redskab på den maskine du sidder i", "consoleConnect", ADHitch) - addConsoleCommand("spuTrip", "Kør en tur: spuTrip Connect Bredal > Start > Afkobl Bredal > Start", "consoleTrip", ADHitch) + addConsoleCommand("spuTrip", "Kør en tur: spuTrip Connect Bredal > Start > Connect Bredal > Start", "consoleTrip", ADHitch) addConsoleCommand("spuDetach", "Kobler redskaberne bag den maskine du sidder i af", "consoleDetach", ADHitch) end diff --git a/FS25_ADSmartPickup/modDesc.xml b/FS25_ADSmartPickup/modDesc.xml index 250261e..92b87d8 100644 --- a/FS25_ADSmartPickup/modDesc.xml +++ b/FS25_ADSmartPickup/modDesc.xml @@ -1,7 +1,7 @@ masterdraco - 1.47.1.0 + 1.47.2.0 <en>AD Smart Pickup</en> diff --git a/tests/test_adHitch.lua b/tests/test_adHitch.lua index fada58b..c35e531 100644 --- a/tests/test_adHitch.lua +++ b/tests/test_adHitch.lua @@ -77,5 +77,10 @@ check("trin: ankom er færdig", arriveJob.state, "done") local markers = {{name = "Start", id = 1}, {name = "Connect Bredal", id = 9}} check("markør: navn uden hensyn til store/små", H.findMarker(markers, "connect bredal").id, 9) check("markør: ukendt", H.findMarker(markers, "Stald"), nil) +-- Connect-markøren virker begge veje: med redskab bag sig kobles det af (vognen står så på sin plads) +check("connect uden vogn: kobl på", H.resolveAction("attach", false), "attach") +check("connect med vogn: kobl af", H.resolveAction("attach", true), "detach") +check("afkobl forbliver afkobl", H.resolveAction("detach", false), "detach") +check("almindelig markør", H.resolveAction("arrive", true), "arrive") print(failures == 0 and "\nALLE TESTS OK" or ("\n" .. failures .. " FEJL")) os.exit(failures == 0 and 0 or 1)