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

Track life of Nym and Zhul by existence, not separate variables

Browse source
This commit is contained in:
Alarantalara 2013-11-14 22:42:25 -05:00
parent 6b8fc0b3af
commit e9dafa52e1
3 changed files with 33 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
View file

@ -241,8 +241,6 @@
{VARIABLE in_final_fight true}
{VARIABLE allies_killed 0}
{VARIABLE nym_dead false}
{VARIABLE zhul_dead false}
{VARIABLE ally_died_in_final_fight no}
{VARIABLE number_minions_to_spawn 0}

73
data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
View file

@ -38,13 +38,6 @@
[event]
name=prestart
# recall Nym
# wmllint: recognize Nym
[unit]
{NYM}
placement=recall
[/unit]
# capture all villages for side 1
[capture_village]
x=0-50
@ -103,10 +96,11 @@
[then]
[if]
[variable]
name=nym_dead
numerical_equals=1
[/variable]
[have_unit]
id=Nym
search_recall_list=yes
count=0
[/have_unit]
[then]
[message]
@ -121,10 +115,11 @@
[/if]
[if]
[variable]
name=zhul_dead
numerical_equals=1
[/variable]
[have_unit]
id=Zhul
search_recall_list=yes
count=0
[/have_unit]
[then]
[message]
@ -211,10 +206,11 @@
[/if]
[if]
[variable]
name=nym_dead
numerical_equals=1
[/variable]
[have_unit]
id=Nym
search_recall_list=yes
count=0
[/have_unit]
[then]
[message]
@ -226,10 +222,11 @@
[/if]
[if]
[variable]
name=zhul_dead
numerical_equals=1
[/variable]
[have_unit]
id=Zhul
search_recall_list=yes
count=0
[/have_unit]
[then]
[message]
@ -282,10 +279,10 @@
# if nym doesn't die
[if]
[variable]
name=nym_dead
numerical_equals=0
[/variable]
[have_unit]
id=Nym
search_recall_list=yes
[/have_unit]
[then]
[message]
@ -298,10 +295,10 @@
# if zhul doesn't die
[if]
[variable]
name=zhul_dead
numerical_equals=0
[/variable]
[have_unit]
id=Zhul
search_recall_list=yes
[/have_unit]
[then]
[message]
@ -416,15 +413,11 @@
# if both Nym and Zhul survived, then play special bonus conclusion
[if]
[variable]
name=nym_dead
numerical_equals=0
[/variable]
[variable]
name=zhul_dead
numerical_equals=0
[/variable]
[have_unit]
id=Nym,Zhul
search_recall_list=yes
count=2
[/have_unit]
[then]
[store_unit]

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

@ -50,7 +50,6 @@
equals=true
[/variable]
[then]
{VARIABLE nym_dead true}
{VARIABLE_OP allies_killed add 1}
[/then]
[else]
@ -78,7 +77,6 @@
equals=true
[/variable]
[then]
{VARIABLE zhul_dead true}
{VARIABLE_OP allies_killed add 1}
[/then]
[else]