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

Remove checks for Garak being alive in possession event

Browse source 
If he were dead, the player would already be defeated
Also puts death of possessor before possessee as that makes more sense
in my mind
This commit is contained in:
Alarantalara 2013-11-09 22:47:39 -05:00
parent 6e64145779
commit 7945bed9d8
1 changed files with 96 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

238
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View file

@ -1011,36 +1011,30 @@
speaker=Ystara
message= _ "No! This contest is not over yet, Azkotep. I shall show you a taste of my true power."
[/message]
[if]
[have_unit]
id=Garak
[/have_unit]
[then]
[store_locations]
[filter]
id=Garak
[/filter]
variable=coords
[/store_locations]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[kill]
id=Ystara
animate=yes
fire_event=no
[/kill]
[store_locations]
[filter]
id=Garak
[/filter]
variable=coords
[/store_locations]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
{NAMED_NOTRAIT_UNIT 2 (Corrupted Elf) $coords.x $coords.y (Possessed Garak) ( _ "Possessed Garak")}
[fire_event]
name=garak_resists
@ -1083,30 +1077,23 @@
message= _ "In this I shall support you, the darkness will not lift until one of us is victorious."
[/message]
[if]
[have_unit]
id=Garak
[/have_unit]
[then]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[kill]
id=Azkotep
animate=yes
fire_event=no
[/kill]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[place_shroud]
side=1
x=1-60
@ -1177,30 +1164,24 @@
speaker=Azkotep
message= _ "In this I shall support you, the darkness shall not break until one of us is victorious."
[/message]
[if]
[have_unit]
id=Garak
[/have_unit]
[then]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[kill]
id=Ystara
animate=yes
fire_event=no
[/kill]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[redraw]
side=1
[/redraw]
@ -1270,31 +1251,25 @@
speaker=Ystara
message= _ "No! This contest is not over yet, Azkotep. I shall show you a taste of my true power."
[/message]
[if]
[have_unit]
[store_locations]
[filter]
id=Garak
[/have_unit]
[then]
[store_locations]
[filter]
id=Garak
[/filter]
variable=coords
[/store_locations]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[/filter]
variable=coords
[/store_locations]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
{NAMED_NOTRAIT_UNIT 2 (Corrupted Elf) $coords.x $coords.y (Possessed Garak) ( _ "Possessed Garak")}
[fire_event]
name=garak_resists
@ -1334,25 +1309,18 @@
[/variable]
[/or]
[then]
[if]
[have_unit]
[store_unit]
[filter]
id=Garak
[/have_unit]
[then]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[place_shroud]
side=1
x=1-60
@ -1427,30 +1395,23 @@
speaker=Azkotep
message= _ "No, I shall have my revenge. I shall show you that darkness is strongest just before dawn. Death and decay, grant me my vengeance!"
[/message]
[if]
[have_unit]
id=Garak
[/have_unit]
[then]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[kill]
id=Azkotep
animate=yes
fire_event=no
[/kill]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
{NAMED_NOTRAIT_UNIT 2 (Corrupted Elf) $coords.x $coords.y (Possessed Garak) ( _ "Possessed Garak")}
[fire_event]
name=garak_resists
@ -1490,25 +1451,18 @@
[/variable]
[/or]
[then]
[if]
[have_unit]
[store_unit]
[filter]
id=Garak
[/have_unit]
[then]
[store_unit]
[filter]
id=Garak
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[/then]
[/if]
[/filter]
variable=ElvishGarak
kill=no
[/store_unit]
[kill]
id=Garak
animate=yes
fire_event=no
[/kill]
[place_shroud]
side=1
x=1-60