Enable garrisoning on gates / fix movement of units with visible garrison…
rP23731
Actions

Description

Enable garrisoning on gates / fix movement of units with visible garrison points (2nd commit)

This is the same commit as rP23710 / D1418, fixing noted issues.

This addresses two related issues:

Units visibly garrisoned on gates keep the gate open.
Units visibly garrisoned on entities keep their pathfinding blocker flags.

De-activate the obstruction of visibly-garrisoned entities, fixing the 2nd issue.
Keep a list of entities that cannot move and thus should not count towards gate-opening logic.

Packing logic is kept separate: it is more related to entities having 'alternate forms' with different capabilities than being currently incapable of moving.

Based on work by temple

Fixes #2679.
Fixes #5151.

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

Details

Committed

wraitii

Jun 2 2020, 1:40 PM

Differential Revision

D2775: [attempt 2] Enable garrisoning on gates / fix movement of units with visible garrison points

Parents

rP23730: Remove inaccurate howdah from the carthaginian champion elephant.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 11911
Build 22308: Trigger Windows Autobuild
Build 22307: Post-Commit Build	Jenkins
Build 22306: Post-Commit Build (macOS)	Jenkins

Event Timeline

wraitii committed rP23731: Enable garrisoning on gates / fix movement of units with visible garrison….Jun 2 2020, 1:40 PM

wraitii added an edge: D2775: [attempt 2] Enable garrisoning on gates / fix movement of units with visible garrison points.

Harbormaster completed building B11911: rP23731: Enable garrisoning on gates / fix movement of units with visible garrison….Jun 2 2020, 1:55 PM

Thanks. I rebuilt the game and tried it out in combination with D2760. Everything seems to work fine.
One minor thing is that locked gates still play an opening-and-closing animation when garrisoning or ungarrisoning units; I suppose that's an art problem?

In rP23731#42611, @Nescio wrote:

One minor thing is that locked gates still play an opening-and-closing animation when garrisoning or ungarrisoning units; I suppose that's an art problem?

hmm, that seems like it's trying to close again when already closed, which shouldn't happen. Perhaps it's an art issue as we end up resetting some animation timer. I'll check.

hmm, that seems like it's trying to close again when already closed, which shouldn't happen. Perhaps it's an art issue as we end up resetting some animation timer. I'll check.

I believe garrison holder is still setting garrisoned flag for variants and art replays animations on variant change if it has active animation.

In rP23731#42614, @Angen wrote:

I believe garrison holder is still setting garrisoned flag for variants and art replays animations on variant change if it has active animation.

Correct, thanks -> GarrisonHolder calls UpdateGarrisonFlag on PerformGarrison which sets the variant and the probably resets.
Not a bug in the diff then, still should probably be fixed.

Nescio mentioned this in D2760: [gameplay] add visible garrison points to gates.Jun 3 2020, 12:44 PM

Nescio mentioned this in D2769: [gameplay] add visible garrison points to wall towers.Jun 3 2020, 12:53 PM

Kinda hackish solution in D2969.

Freagarach added inline comments.Jan 7 2021, 3:54 PM