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

# Updated test actor and script for prop switch testing

Browse Source 
This was SVN commit r3714.
This commit is contained in:
Wijitmaker 2006-04-01 23:49:59 +00:00
parent d17c57657f
commit 31dd421c15
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
View File

@ -68,9 +68,9 @@
</group>
<group>
<variant name="Chop">
<variant name="gather_wood">
<animations>
<animation file="biped/chop.psa" name="Chop" speed="150"/>
<animation file="biped/chop.psa" name="gather_wood" speed="150"/>
</animations>
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="r_hand"/>
@ -79,9 +79,9 @@
</group>
<group>
<variant name="Hoe">
<variant name="gather_grain">
<animations>
<animation file="biped/hoe.psa" name="Hoe" speed="150"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
</animations>
<props>
<prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
@ -90,9 +90,9 @@
</group>
<group>
<variant name="Forage">
<variant name="gather_fruit">
<animations>
<animation file="biped/forage.psa" name="Forage" speed="5"/>
<animation file="biped/forage.psa" name="gather_fruit" speed="5"/>
</animations>
<props>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
@ -101,9 +101,9 @@
</group>
<group>
<variant name="Mine">
<variant name="gather_stone">
<animations>
<animation file="biped/mine.psa" name="Mine" speed="150"/>
<animation file="biped/mine.psa" name="gather_stone" speed="150"/>
</animations>
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="r_hand"/>

11
binaries/data/mods/official/entities/template_entity_script.js
View File

@ -665,7 +665,16 @@ function entityEventGeneric( evt )
case ACTION_ATTACK:
this.performAttack( evt ); break;
case ACTION_GATHER:
this.performGather( evt ); break;
if ( !this.actions.gather )
evt.preventDefault();
evt.notifyType = NOTIFY_GATHER;
// Change our gather animation based on the type of target
var a = this.actions.gather;
this.setActionParams( ACTION_GATHER, 0.0, a.range, a.speed,
"gather_" + evt.target.traits.supply.subtype );
break;
case ACTION_HEAL:
this.performHeal( evt ); break;
case ACTION_ATTACK_RANGED: