0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UtBS: fixed cloaked figure death bug in scenario 4 and 5

Browse source
This commit is contained in:
Asa Swain 2006-04-24 03:59:37 +00:00
parent a47843ee1b
commit 37a5e335aa
30 changed files with 534 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg
View file

@ -2266,33 +2266,15 @@ fire_event=no
[/if]
# for some reason right after the cloaked figure dies and
# Nym reappears, her death event is called, even though she
# a hero reappears, the hero's death event is called, even though it
# didn't die. This variable is used to make sure that if the
# death event is accidentally called, then it does nothing.
# (and doesn't end the scenario)
[set_variable]
name=temp
value=$unit_var.description
[/set_variable]
[if]
[variable]
name=temp
equals=Nym
[/variable]
[then]
[set_variable]
name=immortal_hero
value=1
[/set_variable]
[/then]
[/if]
{CLEAR_VARIABLE unit_var}
[/set_variable]
[/event]
@ -2311,8 +2293,12 @@ first_time_only=no
[/variable]
[then]
[set_variable]
name=immortal_hero
value=0
[/set_variable]
[/then]
[/if]

26
data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg
View file

@ -4387,33 +4387,15 @@ message= _ "Where did he go? How does he disappear like that? And what in Uria'
[/if]
# for some reason right after the cloaked figure dies and
# Nym reappears, her death event is called, even though she
# a hero reappears, the hero's death event is called, even though it
# didn't die. This variable is used to make sure that if the
# death event is accidentally called, then it does nothing.
# (and doesn't end the scenario)
[set_variable]
name=temp
value=$unit_var.description
[/set_variable]
[if]
[variable]
name=temp
equals=Nym
[/variable]
[then]
[set_variable]
name=immortal_hero
value=1
[/set_variable]
[/then]
[/if]
{CLEAR_VARIABLE unit_var}
[/set_variable]
[if]
[variable]
@ -4476,8 +4458,12 @@ first_time_only=no
[/variable]
[then]
[set_variable]
name=immortal_hero
value=0
[/set_variable]
[/then]
[/if]

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer.cfg
View file

@ -77,6 +77,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -229,6 +239,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer10.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer11.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer2.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer3.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer4.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer5.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer6.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer7.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer8.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Archer9.cfg
View file

@ -75,6 +75,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -239,6 +249,16 @@
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-archer+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

22
data/campaigns/Under_the_Burning_Suns/units/Desert_Avenger.cfg
View file

@ -89,10 +89,20 @@ Special Notes: While a unit with the same allegiance as the Desert Avenger distr
[/specials]
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-avenger-attack.png
image="newelves/desert-elvish-avenger-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
image="newelves/desert-elvish-avenger-attack.png"
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/animation]
@ -271,6 +281,16 @@ Special Notes: While a unit with the same allegiance as the desert avenger distr
[/specials]
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-avenger+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Captain.cfg
View file

@ -60,6 +60,16 @@ Special Notes: the leadership of a Captain enables friendly units next to it to
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-captain-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Champion.cfg
View file

@ -55,6 +55,16 @@
number=5
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-champion-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Fighter.cfg
View file

@ -54,6 +54,16 @@
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-fighter-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Hero.cfg
View file

@ -54,6 +54,16 @@
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-hero-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

17
data/campaigns/Under_the_Burning_Suns/units/Desert_Horseman.cfg
View file

@ -63,6 +63,7 @@ Special Notes: The skirmish ability allows the Desert Horseman to ignore enemy u
number=5
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-200
end=-100
@ -73,6 +74,22 @@ Special Notes: The skirmish ability allows the Desert Horseman to ignore enemy u
begin=-100
end=100
image=newelves/desert-elvish-horse-archer-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-200
end=-100
image=newelves/desert-elvish-horse-archer-moving.png
sound=horse-elf-canter.wav
[/frame]
[frame]
begin=-100
end=100
image=newelves/desert-elvish-horse-archer-attack.png
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/animation]
[/attack]

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Hunter.cfg
View file

@ -44,6 +44,16 @@
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-hunter-melee.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Marksman.cfg
View file

@ -55,6 +55,16 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-marksman-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -219,6 +229,16 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-marksman+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Marshal.cfg
View file

@ -61,6 +61,16 @@ Special Notes: the leadership of a Marshal enables friendly units next to it to
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-marshal-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

24
data/campaigns/Under_the_Burning_Suns/units/Desert_Outrider.cfg
View file

@ -58,12 +58,34 @@
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-200
end=-100
image=newelves/desert-elvish-outrider-moving.png
sound=horse-canter.wav
[/frame]
[frame]
begin=-100
end=100
image=newelves/desert-elvish-outrider-attack.png
image=image=newelves/desert-elvish-outrider-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-200
end=-100
image=newelves/desert-elvish-outrider-moving.png
sound=horse-canter.wav
[/frame]
[frame]
begin=-100
end=100
image=image=newelves/desert-elvish-outrider-attack.png
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/animation]
[/attack]
[attack]

15
data/campaigns/Under_the_Burning_Suns/units/Desert_Prowler.cfg
View file

@ -59,6 +59,21 @@ Special Notes: The skirmish ability allows the rogue to ignore enemy units' zone
number=4
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-350
end=-100
image=newelves/desert-elvish-prowler-melee1.png
[/frame]
[frame]
begin=-100
end=50
image=newelves/desert-elvish-prowler-melee2.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-350
end=-100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Ranger.cfg
View file

@ -90,6 +90,16 @@ Special Notes: While a unit with the same allegiance as the Desert Ranger distra
[/specials]
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-ranger-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -268,6 +278,16 @@ Special Notes: While a unit with the same allegiance as the Desert Ranger distra
[/specials]
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-ranger+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

17
data/campaigns/Under_the_Burning_Suns/units/Desert_Rider.cfg
View file

@ -57,6 +57,7 @@
number=3
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-200
end=-100
@ -67,6 +68,22 @@
begin=-100
end=100
image=newelves/desert-elvish-rider-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-200
end=-100
image=newelves/desert-elvish-rider-moving.png
sound=horse-canter.wav
[/frame]
[frame]
begin=-100
end=100
image=newelves/desert-elvish-rider-attack.png
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/animation]
[/attack]

17
data/campaigns/Under_the_Burning_Suns/units/Desert_Scout.cfg
View file

@ -56,6 +56,7 @@
number=3
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-200
end=-100
@ -66,6 +67,22 @@
begin=-100
end=100
image=newelves/desert-elvish-scout-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-200
end=-100
image=newelves/desert-elvish-scout-moving.png
sound=horse-canter.wav
[/frame]
[frame]
begin=-100
end=100
image=newelves/desert-elvish-scout-attack.png
sound={SOUND_LIST:SWORD_SWISH}
[/frame]
[/animation]
[/attack]

10
data/campaigns/Under_the_Burning_Suns/units/Desert_Sentinel.cfg
View file

@ -48,6 +48,16 @@ The skirmish ability allows the rogue to ignore enemy units' zones of control an
damage=7
number=4
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-sentinel-melee.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

20
data/campaigns/Under_the_Burning_Suns/units/Desert_Sharpshooter.cfg
View file

@ -85,6 +85,16 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image=newelves/desert-elvish-sharpshooter-attack.png
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100
@ -275,6 +285,16 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
number=2
icon=attacks/sword-elven.png
[animation]
hits=no
[frame]
begin=-101
end=100
image="newelves/desert-elvish-sharpshooter+female-attack.png"
sound={SOUND_LIST:MISS}
[/frame]
[/animation]
[animation]
hits=yes
[frame]
begin=-101
end=100

77
data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg
View file

@ -68,24 +68,48 @@ name=die
# Zhul death
[event]
name=die
[filter]
description=Zhul
[/filter]
[if]
#if immortal_hero=1, then don't cause defeat, turn flag off
[variable]
name=immortal_hero
numerical_equals=1
[/variable]
[message]
speaker=unit
message= _ "Eloh protect us, I have fallen."
[/message]
[then]
[endlevel]
result=defeat
[/endlevel]
[set_variable]
name=immortal_hero
value=0
[/set_variable]
[/then]
[else]
[message]
speaker=unit
message= _ "Eloh protect us, I have fallen."
[/message]
[endlevel]
result=defeat
[/endlevel]
[/else]
[/if]
[/event]
# Garak death
[event]
name=die
[filter]
description=Garak
[/filter]
@ -104,18 +128,41 @@ name=die
# Elyssa death
[event]
name=die
[filter]
description=Elyssa
[/filter]
[if]
#if immortal_hero=1, then don't cause defeat, turn flag off
[variable]
name=immortal_hero
numerical_equals=1
[/variable]
[message]
speaker=unit
message= _ "This can't be the end, I have too much left to see."
[/message]
[then]
[message]
description=Kaleh
message= _ "How could we have let her die? I've never seen fire magic like that before. She will be sorely missed."
[/message]
[set_variable]
name=immortal_hero
value=0
[/set_variable]
[/then]
[else]
[message]
speaker=unit
message= _ "This can't be the end, I have too much left to see."
[/message]
[message]
description=Kaleh
message= _ "How could we have let her die? I've never seen fire magic like that before. She will be sorely missed."
[/message]
[/else]
[/if]
[/event]