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

Fix ally death

Browse source 
Simplify filter
Fix bug in which if the ally dies in the rescue scenario, he is also
considered to have died in the epilogue changing the final dialog
Change to a last breath event since the unit speaks in it (but was
concealed by variable name from wmllint)
Removes variable ally_dead
This commit is contained in:
Alarantalara 2013-11-14 22:30:49 -05:00
parent 1a654391df
commit 6b8fc0b3af
2 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -314,10 +314,10 @@
# if ally doesn't die
[if]
[variable]
name=ally_dead
boolean_equals=no
[/variable]
[have_unit]
id=$ally_name
search_recall_list=yes
[/have_unit]
[then]
{MESSAGE_DEPEND_ON_ALLY
@ -354,10 +354,11 @@
# if ally died before the final battle
[if]
[variable]
name=ally_dead
boolean_equals=yes
[/variable]
[have_unit]
id=$ally_name
search_recall_list=yes
count=0
[/have_unit]
[variable]
name=ally_died_in_final_fight

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

@ -107,22 +107,10 @@
[/event]
[event]
name=die
name=last breath
[filter]
id=Grog
[or]
id=Nog
[/or]
[or]
id=Rogrimir
[/or]
[or]
id=Jarl
[/or]
id=Grog,Nog,Rogrimir,Jarl
[/filter]
[if]
@ -133,14 +121,14 @@
[then]
[message]
speaker=$ally_name
speaker=unit
message= _ "I go now to join my forefathers..."
[/message]
[/then]
[else]
[message]
speaker=$ally_name
speaker=unit
message= _ "No, $unit.name can’t die now!"
[/message]
[/else]
@ -181,8 +169,6 @@
[/if]
[/else]
[/if]
{VARIABLE ally_dead yes}
[/event]
[event]