Skip to content

Manual Combine Unloader — Call Unloader button for player-driven combines #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antler22 wants to merge 16 commits into
base: main
Choose a base branch
from
+808 −68
Open

Manual Combine Unloader — Call Unloader button for player-driven combines #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e34aae2
Antler edit upload
antler22 Apr 21, 2026
43463d3
Remove US unit changes from feature branch (personal preference only)
antler22 Apr 25, 2026
8adf9e5
Address PR review: rename GrainCart->ManualUnloader, clean up PPC dif…
antler22 Apr 24, 2026
de4c4a6
Address pvaiko review round 2: revert unintended changes, simplify PP…
antler22 Apr 26, 2026
6cec16e
Address pvaiko review round 3: simplify proxy, revert unrelated files…
antler22 Apr 27, 2026
f149b30
Revert verbose debug messages to upstream wording for log consistency
antler22 Apr 30, 2026
7eea607
Apply pvaiko round-4 review items (1-9, 11, 12)
antler22 May 9, 2026
bea655f
Item 10: re-pathfind when combine relocates during DRIVING_TO_COMBINE
antler22 May 9, 2026
16694e3
Fix item 10: restrict combine-relocation re-path to manual combines only
antler22 May 10, 2026
83f20e8
Refactor: extract isManualCombine() helper and checkCombineRelocatedA…
antler22 May 10, 2026
883538b
Move off-track disable to proxy per pvaiko review; add getPPC() getter
antler22 May 27, 2026
2209802
Restore upstream configs (keep personal config local only)
antler22 May 27, 2026
d9f52ef
Restore upstream configs (keep personal settings local)
antler22 May 27, 2026
f58169e
Fix getCpDriveStrategy crash and suppress off-track shutdown for manu…
antler22 May 28, 2026
b885b53
Fix off-track shutdown: disable PPC check before ppc:update() runs
antler22 May 28, 2026
fbc6b62
Fix off-track cutout firing after unloader is released from manual co…
antler22 May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions modDesc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Changelog 8.1.0.3
<sourceFile filename="scripts/ai/InfoTextsManager.lua"/>
<sourceFile filename="scripts/ai/PurePursuitController.lua"/>
<sourceFile filename="scripts/ai/SelfUnloadHelper.lua"/>
<sourceFile filename="scripts/ai/CpManualCombineProxy.lua"/>
<sourceFile filename="scripts/ai/VehicleScanner.lua"/>
<sourceFile filename="scripts/ai/AIReverseDriver.lua"/>

Expand Down Expand Up @@ -346,6 +347,7 @@ Changelog 8.1.0.3
<sourceFile filename="scripts/events/CpJobStartAtLastWpSyncEvent.lua"/>
<sourceFile filename="scripts/events/CpJobSyncOnLeaveEvent.lua"/>
<sourceFile filename="scripts/events/DriveNowRequestEvent.lua"/>
<sourceFile filename="scripts/events/CpManualUnloaderEvent.lua"/>
<sourceFile filename="scripts/events/PlowCenterTurnEvent.lua"/>
<sourceFile filename="scripts/events/FieldPolygonChangedEvent.lua"/>

Expand Down Expand Up @@ -434,6 +436,10 @@ Changelog 8.1.0.3
<binding device="KB_MOUSE_DEFAULT" input="KEY_lalt KEY_g" />
</actionBinding>

<actionBinding action="CP_CALL_GRAIN_CART">
<binding device="KB_MOUSE_DEFAULT" input="KEY_lctrl KEY_u" />
</actionBinding>

<actionBinding action="CP_TOGGLE_MOUSE">
<binding device="KB_MOUSE_DEFAULT" input="MOUSE_BUTTON_RIGHT" />
</actionBinding>
Expand Down Expand Up @@ -463,6 +469,7 @@ Changelog 8.1.0.3
<action name="CP_OPEN_COURSEMANAGER"/>
<action name="CP_OPEN_INGAME_MENU"/>

<action name="CP_CALL_GRAIN_CART" />
<action name="CP_TOGGLE_MOUSE" />
</actions>
</modDesc>
3 changes: 2 additions & 1 deletion scripts/ai/CollisionAvoidanceController.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ end

function CollisionAvoidanceController:findPotentialCollisions()
for _, vehicle in pairs(g_currentMission.vehicleSystem.vehicles) do
if AIDriveStrategyCombineCourse.isActiveCpCombine(vehicle) then
if AIDriveStrategyCombineCourse.isActiveCpCombine(vehicle) and
not (vehicle.cpIsManualCombineCallingUnloader and vehicle:cpIsManualCombineCallingUnloader()) then
local d = calcDistanceFrom(self.vehicle.rootNode, vehicle.rootNode)
if d < self.range then
local myCourse = self.strategy:getCurrentCourse()
Expand Down
Loading