Skip to content

Commit f4bc5f9

Browse files
authored
Release 1.1.1.0
FIX collision handling caused unloader to stop-and-go behind chopper FIX multiple trailer unload harvester TWEAK improved liquid overload: - only start loading in silo-trigger-range and if trigger is found TWEAK harvester - unloader - co-operation: - increased reverse distance for unloader - CP harvester should wait some seconds while unloader is driving reverse TWEAK rework park destination: - MP synchronized - on dedi server trailers, attachments, etc. can now also be assigned parking spaces - all destinations handled now internally in vehicles.xml in tag AutoDriveVehicleData parkDestination, AD will update automatical TWEAK debug road network: - performance optimisation, especial when deactivating route network debug - changed: known markers for open / dead route ends now named with "1..." - new: route network with connections AD might not use due to issues named "2...", i.e. reverse section (light blue) within one-way direction (green) TWEAK reset AD modes if started should fix/avoid unusual behaviour(s) TWEAK: CP interface for co-operation with newer CP versions ADDED: combine open pipe when precall-level is reached ADDED experimental features: - blue Line Route Finder: default OFF, enable if AD could not find a route via multiple passes dark blue connections, feedback if issues occure - detect Gras Field: default ON, harvester will detect gras field and assign the correct side to unloader
2 parents b348211 + 3393b76 commit f4bc5f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2052
-588
lines changed

FS19_AutoDrive/gui/userSettingsPage.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@
9797
<GuiElement type="bitmap" profile="multiTextOptionSettingsBg" />
9898
<GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" />
9999
</GuiElement>
100+
<!-- <GuiElement type="multiTextOption" profile="multiTextOptionSettings" onCreate="onCreateAutoDriveSetting" onClick="onOptionChange" name="combineCPADHudMouse" toolTipElementId="ingameMenuHelpBoxText"> -->
101+
<!-- <GuiElement type="button" profile="multiTextOptionSettingsLeft" /> -->
102+
<!-- <GuiElement type="button" profile="multiTextOptionSettingsRight" /> -->
103+
<!-- <GuiElement type="text" profile="multiTextOptionSettingsText" /> -->
104+
<!-- <GuiElement type="text" profile="multiTextOptionSettingsTitle" position="27px 6px" /> -->
105+
<!-- <GuiElement type="bitmap" profile="multiTextOptionSettingsBg" /> -->
106+
<!-- <GuiElement type="bitmap" profile="baseReference" screenAlign="topLeft" position="5px 4px" size="17px 17px" /> -->
107+
<!-- </GuiElement> -->
100108
</GuiElement>
101109
</GuiElement>
102110

@@ -105,4 +113,4 @@
105113
<GuiElement type="text" profile="ingameMenuHelpRowText" id="ingameMenuHelpBoxText" onTextChanged="onIngameMenuHelpTextChanged" />
106114
</GuiElement>
107115
</GuiElement>
108-
</GUI>
116+
</GUI>

FS19_AutoDrive/modDesc.xml

Lines changed: 97 additions & 147 deletions
Large diffs are not rendered by default.

FS19_AutoDrive/register.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ source(Utils.getFilename("scripts/Settings.lua", g_currentModDirectory))
1717
source(Utils.getFilename("scripts/Gui.lua", g_currentModDirectory))
1818
source(Utils.getFilename("scripts/Hud.lua", g_currentModDirectory))
1919
source(Utils.getFilename("scripts/DijkstraLive.lua", g_currentModDirectory))
20+
source(Utils.getFilename("scripts/DijkstraLiveBlue.lua", g_currentModDirectory))
2021
source(Utils.getFilename("scripts/ExternalInterface.lua", g_currentModDirectory))
2122
source(Utils.getFilename("scripts/PathCalculation.lua", g_currentModDirectory))
23+
source(Utils.getFilename("scripts/TelemetryExport.lua", g_currentModDirectory))
2224

2325
source(Utils.getFilename("scripts/Hud/GenericHudElement.lua", g_currentModDirectory))
2426
source(Utils.getFilename("scripts/Hud/HudButton.lua", g_currentModDirectory))

FS19_AutoDrive/scripts/AutoDrive.lua

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AutoDrive = {}
2-
AutoDrive.version = "1.1.0.8"
2+
AutoDrive.version = "1.1.1.0"
33

44
AutoDrive.directory = g_currentModDirectory
55

@@ -9,7 +9,10 @@ g_autoDriveDebugUIFilename = AutoDrive.directory .. "textures/gui_debug_Icons.dd
99
AutoDrive.experimentalFeatures = {}
1010
AutoDrive.experimentalFeatures.redLinePosition = false
1111
AutoDrive.experimentalFeatures.dynamicChaseDistance = false
12+
AutoDrive.experimentalFeatures.telemetryOutput = false
1213
AutoDrive.experimentalFeatures.enableRoutesManagerOnDediServer = false
14+
AutoDrive.experimentalFeatures.blueLineRouteFinder = false
15+
AutoDrive.experimentalFeatures.detectGrasField = true
1316

1417
AutoDrive.smootherDriving = true
1518
AutoDrive.developmentControls = false
@@ -92,6 +95,7 @@ AutoDrive.actions = {
9295
{"AD_continue", false, 3},
9396
{"ADParkVehicle", false, 0},
9497
{"AD_devAction", false, 0}
98+
-- {"COURSEPLAY_MOUSEACTION_SECONDARY", true, 1}
9599
}
96100

97101
function AutoDrive:onAllModsLoaded()
@@ -151,6 +155,7 @@ g_logManager:info("[AD] Start register later loaded mods end")
151155
FSBaseMission.saveSavegame = Utils.appendedFunction(FSBaseMission.saveSavegame, AutoDrive.saveSavegame)
152156

153157
LoadTrigger.onActivateObject = Utils.overwrittenFunction(LoadTrigger.onActivateObject, AutoDrive.onActivateObject)
158+
AIDriveStrategyCombine.getDriveData = Utils.overwrittenFunction(AIDriveStrategyCombine.getDriveData, AutoDrive.getDriveData)
154159
LoadTrigger.getIsActivatable = Utils.overwrittenFunction(LoadTrigger.getIsActivatable, AutoDrive.getIsActivatable)
155160
LoadTrigger.onFillTypeSelection = Utils.overwrittenFunction(LoadTrigger.onFillTypeSelection, AutoDrive.onFillTypeSelection)
156161

@@ -177,6 +182,8 @@ g_logManager:info("[AD] Start register later loaded mods end")
177182
ADScheduler:load()
178183
ADInputManager:load()
179184
ADMultipleTargetsManager:load()
185+
186+
AutoDrive.initTelemetry()
180187
end
181188

182189
function AutoDrive:init()
@@ -218,14 +225,15 @@ end
218225

219226
function AutoDrive:deleteMap()
220227
-- this function is called even befor the game is compeltely started in case you insert a wrong password for mp game, so we need to check that "mapHotspotsBuffer" and "unRegisterDestinationListener" are not nil
221-
if g_dedicatedServerInfo == nil and AutoDrive.mapHotspotsBuffer ~= nil then
228+
if AutoDrive.mapHotspotsBuffer ~= nil then
222229
-- Removing and deleting all map hotspots
223230
for _, mh in pairs(AutoDrive.mapHotspotsBuffer) do
224231
g_currentMission:removeMapHotspot(mh)
225232
mh:delete()
226233
end
227234
end
228235
AutoDrive.mapHotspotsBuffer = {}
236+
AutoDrive.mapHotspotsBuffer = nil
229237

230238
if (AutoDrive.unRegisterDestinationListener ~= nil) then
231239
AutoDrive:unRegisterDestinationListener(AutoDrive)
@@ -279,6 +287,9 @@ function AutoDrive:update(dt)
279287
if AutoDrive.isFirstRun == nil then
280288
AutoDrive.isFirstRun = false
281289
self:init()
290+
if AutoDrive.devAutoDriveInit ~= nil then
291+
AutoDrive.devAutoDriveInit()
292+
end
282293
end
283294

284295
if AutoDrive.getDebugChannelIsSet(AutoDrive.DC_NETWORKINFO) then
@@ -304,6 +315,8 @@ function AutoDrive:update(dt)
304315
ADMessagesManager:update(dt)
305316
ADTriggerManager:update(dt)
306317
ADRoutesManager:update(dt)
318+
319+
AutoDrive.handleTelemetry(dt)
307320
end
308321

309322
function AutoDrive:draw()

FS19_AutoDrive/scripts/DijkstraLive.lua

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,14 @@ return values:
308308
3. table with waypoints from start_id to target_id including start_id and target_id
309309
]]
310310
function AutoDrive:dijkstraLiveShortestPath(start_id, target_id)
311+
312+
if AutoDrive.experimentalFeatures.blueLineRouteFinder == true then
313+
return AutoDrive:dijkstraLiveBlueShortestPath(start_id, target_id)
314+
end
315+
311316
if ADGraphManager:hasChanges() then
312-
AutoDrive.checkWaypointsLinkedtothemselve(true) -- find WP linked to themselve, with parameter true issues will be fixed
313-
AutoDrive.checkWaypointsMultipleSameOut(true) -- find WP with multiple same out ID, with parameter true issues will be fixed
317+
AutoDrive.checkWaypointsLinkedtothemselve(true) -- find WP linked to themselve, with parameter true issues will be fixed
318+
AutoDrive.checkWaypointsMultipleSameOut(true) -- find WP with multiple same out ID, with parameter true issues will be fixed
314319
ADGraphManager:resetChanges()
315320
end
316321

0 commit comments

Comments
 (0)