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

This was SVN commit r6084.

Browse Source
This commit is contained in:
ROBOT 2008-06-21 09:46:27 +00:00
parent 81df44562f
commit 0b824b64e8
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,19 +16,20 @@
</Promotion>
<<<<<<< .mine
</Traits>
=======
<Armour>
<Hack>7.0</Hack>
<Pierce>5.0</Pierce>
<Crush>12.0</Crush>
</Armour>
<Health>
<Max>100</Max>
</Health>
</Traits>
>>>>>>> .r6082
<Actions>
<<<<<<< .mine
=======
<Attack>
<Melee>
<Hack>15.0</Hack>
@ -48,6 +49,7 @@
<Speed>14.0</Speed>
</Run>
</Move>
>>>>>>> .r6082
</Actions>
<Actor>units/hellenes/infantry_spearman_a.xml</Actor>

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

@ -15,30 +15,20 @@
</Id>
<Creation>
<Time>20</Time>
<Resource>
<Food>65</Food>
<Wood>2</Wood>
<Ore>1</Ore>
</Resource>
</Creation>
<Promotion>
<Entity>hele_infantry_spearman_a</Entity>
</Promotion>
<Armour>
<Hack>5.0</Hack>
<Pierce>4.5</Pierce>
<Crush>10.0</Crush>
</Armour>
</Traits>
<Actions>
<<<<<<< .mine
=======
<Attack>
<Melee>
<Hack>15.0</Hack>
@ -58,6 +48,7 @@
<Speed>15.0</Speed>
</Run>
</Move>
>>>>>>> .r6082
</Actions>
<Actor>units/hellenes/infantry_spearman_b.xml</Actor>

7
binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
View File

@ -8,6 +8,8 @@
<Icon_Cell>5</Icon_Cell>
</Id>
<<<<<<< .mine
=======
<Armour>
<Hack>8.0</Hack>
<Pierce>5.0</Pierce>
@ -17,10 +19,14 @@
<Health>
<Max>120</Max>
</Health>
>>>>>>> .r6082
</Traits>
<Actions>
<<<<<<< .mine
=======
<Attack>
<Melee>
<Hack>16.0</Hack>
@ -40,6 +46,7 @@
<Speed>14.0</Speed>
</Run>
</Move>
>>>>>>> .r6082
</Actions>
<Actor>units/hellenes/infantry_spearman_e.xml</Actor>