mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-12 03:55:39 +00:00
This was SVN commit r6087.
This commit is contained in:
@@ -8,45 +8,11 @@
|
||||
<Icon_Cell>5</Icon_Cell>
|
||||
</Id>
|
||||
|
||||
<<<<<<< .mine
|
||||
=======
|
||||
<Armour>
|
||||
<Hack>8.0</Hack>
|
||||
<Pierce>5.0</Pierce>
|
||||
<Crush>13.0</Crush>
|
||||
</Armour>
|
||||
|
||||
<Health>
|
||||
<Max>120</Max>
|
||||
</Health>
|
||||
>>>>>>> .r6082
|
||||
|
||||
</Traits>
|
||||
|
||||
<Actions>
|
||||
<<<<<<< .mine
|
||||
|
||||
=======
|
||||
<Attack>
|
||||
<Melee>
|
||||
<Hack>16.0</Hack>
|
||||
<Pierce>8.0</Pierce>
|
||||
<Crush>1.0</Crush>
|
||||
</Melee>
|
||||
<Charge>
|
||||
<Hack>32.0</Hack>
|
||||
<Pierce>16.0</Pierce>
|
||||
<Crush>2.0</Crush>
|
||||
</Charge>
|
||||
</Attack>
|
||||
|
||||
<Move>
|
||||
<Speed>7.0</Speed>
|
||||
<Run>
|
||||
<Speed>14.0</Speed>
|
||||
</Run>
|
||||
</Move>
|
||||
>>>>>>> .r6082
|
||||
</Actions>
|
||||
|
||||
<Actor>units/hellenes/infantry_spearman_e.xml</Actor>
|
||||
|
||||
Reference in New Issue
Block a user