Diffusion 0 A.D. Public Repository rP20631

Update all female_citizen actors so that idle animations properly show carried…
AuditedrP20631
Actions

Tags

None

Subscribers

Description

Update all female_citizen actors so that idle animations properly show carried resources.

By refactoring unitAI slightly, we can easily improve our support for running/walking/idle animations.
Other gatherer entities (and other entities with custom walking animations for certain variants) will need to be updated individually at a later point to support this feature.

Reviewed By: bb, fatherbushido (a while ago)

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

Details

Auditors

Committed

Dec 10 2017, 11:06 AM

Reviewer

Differential Revision

D311: D13 prerequisite 2: Use variants better in UnitAI and change the actor files slightly in consequence

Parents

rP20630: Optimise HierarchicalPathfinder::Update by speeding up the chunk dirtiness…

Branches

Unknown

Tags

Unknown

Build Status

Buildable 4063
Build 7130: Post-Commit Build	Jenkins

Event Timeline

wraitii committed rP20631: Update all female_citizen actors so that idle animations properly show carried….Dec 10 2017, 11:06 AM

wraitii mentioned this in rP20632: Fix rP20631, where I missed adding a new file and accidentally invalidated….Dec 10 2017, 12:16 PM

Broken:

ERROR: Could not open path biped/female_base_walk.xml 
ERROR: CCacheLoader failed to find archived or source file for: "art/variants/biped/female_base_walk.xml"

Also cleopatra seems to be broken

This commit now has outstanding concerns.Dec 10 2017, 12:38 PM

Addressed in rP20632

This commit now requires verification by auditors.Dec 10 2017, 12:39 PM

Imarok accepted this commit.Dec 10 2017, 12:52 PM

All concerns with this commit have now been addressed.Dec 10 2017, 12:52 PM

Harbormaster completed building B4063: rP20631: Update all female_citizen actors so that idle animations properly show carried….Dec 10 2017, 2:41 PM

Still broken:

(man fighting with a pile of wood, noticed by cc)

(cav attacking with a block of meat

Another thing, but not sure if that is a bug: When a unit (woman/man) is ordered to attack-walk their load disappears.

This commit now has outstanding concerns.Dec 11 2017, 12:55 PM

Itms mentioned this in D1140: Adds a skip for invalid files in the validator.Dec 12 2017, 8:41 PM

wraitii mentioned this in D1239: Clean up UnitAI setting animation variants.Jan 21 2018, 5:14 PM

temple mentioned this in rP21219: Add running animations for carrying units so that they do not glide..Feb 16 2018, 1:05 AM

In rP20631#25916, @Imarok wrote:

Still broken:
(man fighting with a pile of wood, noticed by cc)
(cav attacking with a block of meat

Should be fixed with rP21337 and rP21335.

Another thing, but not sure if that is a bug: When a unit (woman/man) is ordered to attack-walk their load disappears.

That's the expected behavior.

temple mentioned this in D1307: Remove SetDefaultAnimationVariant from leave.Feb 23 2018, 11:29 PM

Looks good.

All concerns with this commit have now been addressed.Feb 24 2018, 12:15 AM

temple mentioned this in D1337: Formation animation refactor.Feb 25 2018, 11:41 PM

wraitii mentioned this in rP22442: Formation animation refactor - use animation variants instead of special move….Jul 8 2019, 8:24 PM

Silier mentioned this in rP23205: Remove forgot return from refactoring in rP20631.Dec 4 2019, 7:42 PM

Changes (32)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

art/

actors/

units/

athenians/

female_citizen.xml

carthaginians/

female_citizen.xml

celts/

female_citizen.xml

global/

ninja_female.xml

hellenes/

female_citizen.xml

female_gorgo.xml

iberians/

female_citizen.xml

macedonians/

female_citizen.xml

mauryans/

female_citizen.xml

persians/

female_citizen.xml

ptolemies/

female_citizen.xml

hero_cleopatra.xml

romans/

female_citizen.xml

seleucids/

female_citizen.xml

spartans/

female_citizen.xml

female_gorgo.xml

variants/

biped/

carry_metal.xml

carry_stone.xml

female_carry_food.xml

female_carry_food_idle.xml

female_carry_meat.xml

female_carry_meat_idle.xml

female_carry_metal.xml

female_carry_metal_idle.xml

female_carry_stone.xml

female_carry_stone_idle.xml

female_carry_wood.xml

female_carry_wood_idle.xml

simulation/

components/

rP20631

ps/trunk/binaries/data/mods/public/art/actors/units/athenians/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/global/ninja_female.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/hellenes/female_gorgo.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/macedonians/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/mauryans/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/ptolemies/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/ptolemies/hero_cleopatra.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/romans/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/seleucids/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/spartans/female_citizen.xml

Loading...

ps/trunk/binaries/data/mods/public/art/actors/units/spartans/female_gorgo.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/carry_food.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/carry_meat.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/carry_metal.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/carry_stone.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/carry_wood.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_food.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_food_idle.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_meat.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_meat_idle.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_metal.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_metal_idle.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_stone.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_stone_idle.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_wood.xml

Loading...

ps/trunk/binaries/data/mods/public/art/variants/biped/female_carry_wood_idle.xml

Loading...

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

Loading...