Diffusion 0 A.D. Public Repository rP24977

Let entities garrison using cmpGarrisonable.
rP24977
Actions

Tags

None

Subscribers

Description

Let entities garrison using cmpGarrisonable.

Followup to r24957 / rP24957.
Moves the logic for garrisoning from cmpGarrisonHolder to the entity that is being garrisoned.
Also fixes https://wildfiregames.com/forum/topic/36863-teleportation-feature-in-a24/?do=findComment&comment=418441 while at it (setting garrisoned before transferring orders on transform).

Differential revision: D3280
Refs: #5906
Comments by: @Stan, @wraitii

Details

Committed

Mar 2 2021, 4:06 PM

Differential Revision

D3280: Let entities garrison using cmpGarrisonable.

Parents

rP24976: Fix MSVC unknown pragma warning

Branches

Unknown

Tags

Unknown

Build Status

Buildable 15927
Build 35362: Post-Commit Build	Jenkins
Build 35361: Post-Commit Build (macOS)	Jenkins

Event Timeline

Freagarach committed rP24977: Let entities garrison using cmpGarrisonable..Mar 2 2021, 4:06 PM

Freagarach added an edge: D3280: Let entities garrison using cmpGarrisonable..

Freagarach added subscribers: Stan, wraitii.

Harbormaster completed building B15927: rP24977: Let entities garrison using cmpGarrisonable..Mar 2 2021, 4:32 PM

Freagarach mentioned this in rP25019: Ungarrison entities using cmpGarrisonable..Mar 6 2021, 7:08 AM

Freagarach mentioned this in D3643: Fix AutoGarrison order found by PetraAI..Mar 6 2021, 11:05 AM

Freagarach mentioned this in rP25025: Fix AutoGarrison UnitAI order..Mar 7 2021, 7:54 AM

Changes (9)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

maps/

scripts/

TriggerHelper.js

simulation/

components/

GarrisonHolder.js

Garrisonable.js

TurretHolder.js

tests/

test_GarrisonHolder.js

test_Garrisonable.js

test_Garrisoning.js

helpers/

rP24977

ps/trunk/binaries/data/mods/public/maps/scripts/TriggerHelper.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/GarrisonHolder.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/Garrisonable.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/TurretHolder.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/tests/test_GarrisonHolder.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Garrisonable.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Garrisoning.js

Loading...

ps/trunk/binaries/data/mods/public/simulation/helpers/Transform.js

Loading...