paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

This was SVN commit r6086.

Browse Source
This commit is contained in:
ROBOT 2008-06-21 09:49:41 +00:00
parent 1e538aafc1
commit 00ffc7a073
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
View File

@ -16,40 +16,12 @@
</Promotion>
<<<<<<< .mine
</Traits>
=======
<Armour>
<Hack>7.0</Hack>
<Pierce>5.0</Pierce>
<Crush>12.0</Crush>
</Armour>
>>>>>>> .r6082
<Actions>
<<<<<<< .mine
=======
<Attack>
<Melee>
<Hack>15.0</Hack>
<Pierce>7.0</Pierce>
<Crush>1.0</Crush>
</Melee>
<Charge>
<Hack>30.0</Hack>
<Pierce>14.0</Pierce>
<Crush>2.0</Crush>
</Charge>
</Attack>
<Move>
<Speed>6.75</Speed>
<Run>
<Speed>14.0</Speed>
</Run>
</Move>
>>>>>>> .r6082
</Actions>
<Actor>units/hellenes/infantry_spearman_a.xml</Actor>