HomeWildfire Games
Diffusion 0 A.D. Public Repository rP22775

Carthaginian mercenaries duplication removal.
rP22775
Actions

Description

Carthaginian mercenaries duplication removal.

Remove duplicated actors from carthaginian civ folder due to redundance of having twice the same infantry in two folders.

carthaginians/infantry_slinger_e.xml > iberians/infantry_slinger_e.xml

carthaginians/infantry_swordsman_e.xml > gauls/infantry_swordsman_e.xml

Also include a fix for an unsync frame of the idle_ready_shieldsmall.dae animation.

Details

Committed
AlexandermbAug 24 2019, 8:54 PM
Parents
rP22774: Add syntagma formation variant for every civ pikeman infantry.
Branches
Unknown
Tags
Unknown
Build Status
Buildable 9061
Build 14848: Post-Commit BuildJenkins

Event Timeline

Alexandermb committed rP22775: Carthaginian mercenaries duplication removal..Aug 24 2019, 8:54 PM
Nescio added a subscriber: Nescio.Aug 24 2019, 8:57 PM
Nescio added inline comments.
/ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/infantry_swordsman_a.xml
9

Shouldn't that be a gladius? Samnites are Italic, not Greek.

Harbormaster completed building B9061: rP22775: Carthaginian mercenaries duplication removal..Aug 24 2019, 8:58 PM
Freagarach added a subscriber: Freagarach.Aug 24 2019, 8:59 PM

ERROR: CCacheLoader failed to find archived or source file for: "art/actors/units/carthaginians/infantry_swordsman_2_b.xml"
ERROR: CObjectManager::FindObjectBase(): Cannot find object 'units/carthaginians/infantry_swordsman_2_b.xml'

Alexandermb added a comment.Aug 24 2019, 9:18 PM
In rP22775#36795, @Freagarach wrote:

ERROR: CCacheLoader failed to find archived or source file for: "art/actors/units/carthaginians/infantry_swordsman_2_b.xml"
ERROR: CObjectManager::FindObjectBase(): Cannot find object 'units/carthaginians/infantry_swordsman_2_b.xml'

Coulnd't find any template calling that actor wich one calls that?

@Nescio Thanks! will change the xiphos to gladius properly.

Freagarach added a comment.Aug 24 2019, 9:21 PM
In rP22775#36796, @Alexandermb wrote:
In rP22775#36795, @Freagarach wrote:

ERROR: CCacheLoader failed to find archived or source file for: "art/actors/units/carthaginians/infantry_swordsman_2_b.xml"
ERROR: CObjectManager::FindObjectBase(): Cannot find object 'units/carthaginians/infantry_swordsman_2_b.xml'

Coulnd't find any template calling that actor wich one calls that?

Could be samnite_swordsman? Because I get the error when loading the units_demo map just after the samnite_swordsman.

Nescio added a comment.Aug 24 2019, 9:22 PM

Did a grep in the simulation folder, found templates/units/samnite_swordsman.xml

Alexandermb added a comment.Aug 24 2019, 9:28 PM
In rP22775#36798, @Nescio wrote:

Did a grep in the simulation folder, found templates/units/samnite_swordsman.xml

Could be samnite_swordsman? Because I get the error when loading the units_demo map just after the samnite_swordsman.

Thank you ver much both, gonna fix the template properly.

Alexandermb mentioned this in rP22776: Replace samnite_swordsman.xml actor properly following rP22775.Aug 24 2019, 9:30 PM
Freagarach added a comment.Aug 24 2019, 9:32 PM
In rP22775#36799, @Alexandermb wrote:

Thank you ver much both, gonna fix the template properly.

You thanks for the great art!

Changes (16)

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
art/
actors/
units/
carthaginians/
animation/
biped/
infantry/
spearman/
simulation/
templates/
units/

rP22775

View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shieldsmall.dae

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_a.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_e.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_a.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_e.xml

Loading...
Wildfire Games ยท Phabricator