Merged 13327 13313 into trunk

This commit is contained in:
Isaac Clerencia Perez 2006-08-31 11:44:40 +00:00
parent ce0f8cff0e
commit 59dd15484c
2 changed files with 9 additions and 160 deletions

View file

@ -776,191 +776,40 @@ y=13,12
[/move_unit_fake]
[delay]
time=300
time=200
[/delay]
# depending on what kind of unit Kaleh is, change animation images
[set_variable]
name=temp
value=$stored_unit.type
[/set_variable]
[if]
[or]
[variable]
name=temp
equals="Kaleh Marshal"
[/variable]
[/or]
[or]
[variable]
name=temp
equals="Desert Marshal"
[/variable]
[/or]
[then]
{PUT_IMG newelves/desert-elvish-marshal.png 10 12}
{PUT_IMG newelves/kaleh-defend.png 10 12}
[redraw]
[/redraw]
[delay]
time=300
time=200
[/delay]
[removeitem]
x,y=10,12
[/removeitem]
{PUT_IMG newelves/desert-elvish-marshal-attack.png 10 12}
[/then]
[/if]
[if]
[or]
[variable]
name=temp
equals="Kaleh Champion"
[/variable]
[/or]
[or]
[variable]
name=temp
equals="Desert Champion"
[/variable]
[/or]
[then]
{PUT_IMG newelves/desert-elvish-champion.png 10 12}
{PUT_IMG newelves/kaleh-leading.png 10 12}
[redraw]
[/redraw]
[delay]
time=300
time=200
[/delay]
[removeitem]
x,y=10,12
[/removeitem]
{PUT_IMG newelves/desert-elvish-champion-attack.png 10 12}
[/then]
[/if]
[if]
[or]
[variable]
name=temp
equals="Kaleh Captain"
[/variable]
[/or]
[or]
[variable]
name=temp
equals="Desert Captain"
[/variable]
[/or]
[then]
{PUT_IMG newelves/desert-elvish-captain.png 10 12}
{PUT_IMG newelves/kaleh-melee-1.png 10 12}
[redraw]
[/redraw]
[delay]
time=300
[/delay]
[removeitem]
x,y=10,12
[/removeitem]
{PUT_IMG newelves/desert-elvish-captain-attack.png 10 12}
[/then]
[/if]
[if]
[or]
[variable]
name=temp
equals="Kaleh Hero"
[/variable]
[/or]
[or]
[variable]
name=temp
equals="Desert Hero"
[/variable]
[/or]
[then]
{PUT_IMG newelves/desert-elvish-hero.png 10 12}
[redraw]
[/redraw]
[delay]
time=300
[/delay]
[removeitem]
x,y=10,12
[/removeitem]
{PUT_IMG newelves/desert-elvish-hero-attack.png 10 12}
[/then]
[/if]
[if]
[or]
[variable]
name=temp
equals="Kaleh Fighter"
[/variable]
[/or]
[or]
[variable]
name=temp
equals="Desert Fighter"
[/variable]
[/or]
[then]
{PUT_IMG newelves/desert-elvish-fighter.png 10 12}
[redraw]
[/redraw]
[delay]
time=300
[/delay]
[removeitem]
x,y=10,12
[/removeitem]
{PUT_IMG newelves/desert-elvish-fighter-attack.png 10 12}
[/then]
[/if]
{CLEAR_VARIABLE stored_unit}
[redraw]

View file

@ -580,7 +580,7 @@
{TERRAIN_ADJACENT -140 mHhfF? N grassland}
{TERRAIN_ADJACENT_CUSTOM -150 mb& HSJpkscZ\|/wY mountains transition2}
{TERRAIN_ADJACENT_CUSTOM -151 mb& !mbXhCKNnoQrW mountains transition2}
{TERRAIN_ADJACENT_CUSTOM -151 mb& !mbXhCKNnoQW mountains transition2}
{TERRAIN_ADJACENT -160 M !MX desert-mountains}
{TERRAIN_ADJACENT -170 HA kscZ\|/wY snow-hills-to-water}