Giddy-Up - Mount & Animal Work Fixes

Giddy-Up - Mount & Animal Work Fixes

A compatibility and job-safety patch for Giddy-Up 2 - Continued and Animal Harvesting Spot (Continued).

Problem 1: stalled animal work

Animal Harvesting Spot coordinates two pawns: a handler starts a milking, shearing, training or slaughter job while the animal is sent to the assigned spot. If Giddy-Up mounts or reserves that animal during the rendezvous—or if a zone or pathing restriction prevents either participant from reaching the other—the handler can remain standing indefinitely with an animal-work activity shown in the UI. The job still exists, but the meeting required to continue it can no longer happen. In normal play this is easy to miss until the player notices that a handler has been idle for a long time.

Problem 2: unreachable auto-mount loop

Giddy-Up normally checks whether an animal is eligible to be mounted, but an eligible animal is not necessarily reachable by the selected rider. This can occur when:

• The rider or animal is restricted to a different allowed area.
• A door, temporary obstruction or other pathing rule separates them.
• A newly tamed mount still has auto-mount enabled while its intended rider cannot reach it.

The issue becomes visible when the pawn's next job is far enough away for Giddy-Up to consider transport. Large maps and long routes therefore make it easier to encounter, but no particular map-layout mod is required. In that state Giddy-Up can inject a Mount job, have it fail immediately, and inject it again during the same job search. The visible symptoms are pawns standing still after being undrafted, severe TPS loss and RimWorld reporting "started 10 jobs in one tick".

What this patch changes

• A rider must be able to reserve and reach an auto-mount candidate before Giddy-Up can select it.
• The final Mount job repeats that validation before reserving the animal.
• A failed mount attempt receives a short retry cooldown, preventing rapid reinjection while still allowing a later retry if the route becomes available.
• Mounted or mount-pending animals are excluded from spot-based animal work.
• Before spot work begins, the handler must be able to reach the animal and the animal must be able to reach the assigned harvesting spot.
• An existing rendezvous that stops making progress is safely cancelled so both pawns can select another job and retry later.

The brief delay after an unreachable mount attempt is intentional. The pawn then continues with its normal available work instead of entering a job loop.

Scope and compatibility

• RimWorld 1.6
• Tested with Giddy-Up 2 - Continued 2.2.5.
• Requires Harmony, Giddy-Up 2 - Continued and Animal Harvesting Spot (Continued).
• Load after both gameplay mods. RimWorld should arrange this automatically.
• Uses RimWorld's standard reserve and reachability APIs and has no hard dependency on any map-layout or zoning mod.
• The watchdog only observes the rendezvous phase. It does not time out active milking, shearing, training or slaughter work.
• Contains no persistent save data and should be safe to add or remove.

Credits

Compatibility patch created by YVY with ChatGPT. All credit for the original functionality belongs to the authors and maintainers of Giddy-Up 2 - Continued and Animal Harvesting Spot (Continued).