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

Fixed Celt slinger sound effects.

Browse Source 
Tweaked cav spear tooltip.

This was SVN commit r11314.
This commit is contained in:
Michael D. Hafer 2012-03-11 04:39:53 +00:00
parent 8e94dea94d
commit 0741d0ccd6
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binaries/data/mods/public/art/actors/units/celts/infantry_slinger_a.xml
View File

@ -15,14 +15,14 @@
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
<animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ruins" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation event="0.43" file="infantry/general/mine.psa" load="" name="gather_rock" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="200"/>
<animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
@ -34,8 +34,8 @@
<props>
<prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
<prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
<prop actor="props/units/shields/celt_buckler_a.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
<prop actor="props/units/shields/celt_buckler_a.xml" attachpoint="shield"/>
</props>
</variant>
</group>
@ -130,7 +130,7 @@
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="gather_ruins">
<variant name="gather_ruins">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>

18
binaries/data/mods/public/art/actors/units/celts/infantry_slinger_b.xml
View File

@ -15,14 +15,14 @@
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
<animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ruins" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="200"/>
<animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
@ -33,8 +33,8 @@
<mesh>skeletal/m_pants.dae</mesh>
<props>
<prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
<prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
<prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
</props>
<texture>skeletal/celt_ijv_b_01.dds</texture>
</variant>
@ -42,7 +42,7 @@
<group>
<variant frequency="100" name="Idle"/>
<variant name="Melee">
<props>
<props>
<prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
</props>
@ -91,7 +91,7 @@
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="gather_ruins">
<variant name="gather_ruins">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>

20
binaries/data/mods/public/art/actors/units/celts/infantry_slinger_e.xml
View File

@ -15,14 +15,14 @@
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
<animation file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ruins" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="200"/>
<animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
@ -34,9 +34,9 @@
<props>
<prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
<prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
<prop actor="props/units/shields/celt_buckler_c.xml" attachpoint="shield"/>
<prop attachpoint=""/>
<prop actor="props/units/weapons/slingrock.xml" attachpoint="projectile"/>
<prop actor="props/units/shields/celt_buckler_c.xml" attachpoint="shield"/>
<prop attachpoint=""/>
</props>
</variant>
</group>
@ -60,7 +60,7 @@
<variant frequency="20" name="Trousers-3">
<mesh>skeletal/m_pants.dae</mesh>
<texture>skeletal/kart_isw_a_05.dds</texture>
</variant>
</variant>
</group>
<group>
<variant frequency="100" name="Idle">
@ -118,7 +118,7 @@
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="gather_ruins">
<variant name="gather_ruins">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>

2
binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
View File

@ -40,6 +40,6 @@
<Classes datatype="tokens">Spear</Classes>
<GenericName>Cavalry Spearman</GenericName>
<History>This was the weapon of choice from horseback. This was the unit that would eventually evolve to the medieval knight (after heavy influence by the Sarmartians and their lances). Infantry were an easy kill; just ride them down and skewer them with your stick and its point on the end. As with all cavalry - it was only the rich and the nobles who were able to fight from horseback due to the cost of owning such a beast.</History>
<Tooltip>Counters Swordsmen and Skirmishers. Countered by Spearmen.</Tooltip>
<Tooltip>Counters Swordsmen and Skirmishers. Countered by Spearmen and Archers.</Tooltip>
</Identity>
</Entity>