This was SVN commit r6085.
This commit is contained in:
parent
0b824b64e8
commit
1e538aafc1
@ -26,29 +26,7 @@
|
|||||||
</Traits>
|
</Traits>
|
||||||
|
|
||||||
<Actions>
|
<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>
|
</Actions>
|
||||||
|
|
||||||
<Actor>units/hellenes/infantry_spearman_b.xml</Actor>
|
<Actor>units/hellenes/infantry_spearman_b.xml</Actor>
|
||||||
|
Loading…
Reference in New Issue
Block a user