Diffusion 0 A.D. Public Repository rP23925

Improve ship pickup.
AuditedrP23925
Actions

Description

Improve ship pickup.

Improve unitAI: don't move if the requester can reach us and we are close enough. This avoids an issue where ships moved more than necessary when picking up many units.
Also improve requester UnitAI -> retry pickup if the target entity is Idle.
Improve unitMotion: periodically recompute paths in "known bad path" mode to adapt to moving targets.
Expose UnitMotion reachability to scripts and other code.

This adds a test map for some common and some tricky pickup cases, using triggers.

Based on a patch by: causative

Reviewed By: Freagarach

Fixes #3472

Differential Revision: https://code.wildfiregames.com/D665

Details

Auditors

Silier
bb

Committed

wraitii

Aug 3 2020, 2:02 PM

Reviewer

Freagarach

Differential Revision

D665: Make ship pickup nicer

Parents

rP23924: Do not let every entity with UnitAI listen to "OnGlobalConstructionFinished".

Branches

Unknown

Tags

Unknown

Build Status

Buildable 12716
Build 24688: Trigger Windows Autobuild
Build 24687: Post-Commit Build	Jenkins
Build 24686: Post-Commit Build (macOS)	Jenkins

Event Timeline

wraitii committed rP23925: Improve ship pickup..Aug 3 2020, 2:02 PM

wraitii added an edge: D665: Make ship pickup nicer.

Harbormaster completed building B12716: rP23925: Improve ship pickup..Aug 3 2020, 2:17 PM

For some reason formation movement is broken after this commit: formationmembers get stuck at obstruction when colliding with them on a path. Reproducible by ordering a (large enough) formation to walk to the other side of a tree (or any obstruction really).

This commit now has outstanding concerns.Sep 4 2020, 11:21 PM