Fixing an incorrect merge I committed with 2007-09-09T17:08:21Z!mythological@mt.net.mk

This commit is contained in:
Dimitar Ilccov 2007-09-09 19:01:31 +00:00
parent dcb00f67e5
commit e66ad8bff1

View file

@ -147,42 +147,24 @@
range=melee
damage=13
number=2
[/attack]
{DEFENSE_ANIM "deoran/dismounted-commander-defend.png" "deoran/dismounted-commander.png" {SOUND_LIST:HUMAN_HIT} }
[attack_anim]
[attack_filter]
name=lance
[/attack_filter]
[frame]
begin=-200
end=-175
image=deoran/dismounted-commander.png
[/frame]
[frame]
begin=-175
end=-100
image=deoran/dismounted-commander-attack1.png
[/frame]
[if]
hits=no
[frame]
begin=-225
end=-200
image=deoran/horseman-commander.png
sound=horse-canter.wav
[/frame]
[animation]
[frame]
begin=-200
end=-175
image=deoran/dismounted-commander.png
[/frame]
[frame]
begin=-175
end=-100
image=deoran/horseman-commander-moving.png
image=deoran/dismounted-commander-attack1.png
[/frame]
[if]
hits=no
[frame]
begin=-100
end=100
image=deoran/horseman-commander-attack.png
sound={SOUND_LIST:MISS}
image=deoran/dismounted-commander-attack2.png
sound=spear-miss.ogg
[/frame]
[/if]
[else]
@ -190,19 +172,14 @@
[frame]
begin=-100
end=100
image=deoran/horseman-commander-attack.png
sound=spear.wav
image=deoran/dismounted-commander-attack2.png
sound=spear.ogg
[/frame]
[/else]
[frame]
begin=100
end=175
image=deoran/horseman-commander-moving.png
[/frame]
[frame]
begin=175
end=200
image=deoran/horseman-commander.png
image=deoran/dismounted-commander.png
[/frame]
[/animation]
[/attack]
@ -250,14 +227,10 @@
end=-175
image=deoran/dismounted-commander.png
[/frame]
[/if]
[else]
hits=yes
[frame]
begin=-100
end=100
image=deoran/dismounted-commander-attack2.png
sound=spear.ogg
begin=-175
end=-100
image=deoran/dismounted-commander-attack1.png
[/frame]
[if]
hits=no
@ -293,23 +266,22 @@
number=2
[animation]
[frame]
begin=-225
end=-200
image=deoran/horseman-commander.png
sound=horse-canter.wav
begin=-200
end=-175
image=deoran/dismounted-commander.png
[/frame]
[frame]
begin=-200
begin=-175
end=-100
image=deoran/horseman-commander-moving.png
image=deoran/dismounted-commander-attack1.png
[/frame]
[if]
hits=no
[frame]
begin=-100
end=100
image=deoran/horseman-commander-attack.png
sound={SOUND_LIST:MISS}
image=deoran/dismounted-commander-attack2.png
sound=spear-miss.ogg
[/frame]
[/if]
[else]
@ -317,19 +289,14 @@
[frame]
begin=-100
end=100
image=deoran/horseman-commander-attack.png
sound=spear.wav
image=deoran/dismounted-commander-attack2.png
sound=spear.ogg
[/frame]
[/else]
[frame]
begin=100
end=175
image=deoran/horseman-commander-moving.png
[/frame]
[frame]
begin=175
end=200
image=deoran/horseman-commander.png
image=deoran/dismounted-commander.png
[/frame]
[/animation]
[/attack]