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

This was SVN commit r6085.

Browse Source
This commit is contained in:
ROBOT 2008-06-21 09:48:47 +00:00
parent 0b824b64e8
commit 1e538aafc1
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
View File

@ -26,29 +26,7 @@
</Traits>
<Actions>
<<<<<<< .mine
=======
<Attack>
<Melee>
<Hack>15.0</Hack>
<Pierce>6.0</Pierce>
<Crush>0.2</Crush>
</Melee>
<Charge>
<Hack>30.0</Hack>
<Pierce>12.0</Pierce>
<Crush>0.5</Crush>
</Charge>
</Attack>
<Move>
<Speed>7.0</Speed>
<Run>
<Speed>15.0</Speed>
</Run>
</Move>
>>>>>>> .r6082
</Actions>
<Actor>units/hellenes/infantry_spearman_b.xml</Actor>