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

NR: use death macros in remaining scenarios, instead of including the herodeaths file

Browse source
This commit is contained in:
Charles Dang 2015-04-08 15:02:09 +11:00
parent a1355fe159
commit edd9f7f3d4
8 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
View file

@ -784,5 +784,11 @@
[/endlevel]
[/event]
# Load standard death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_TALLIN}
{HERODEATH_CAMERIN}
{HERODEATH_KRASH}
{HERODEATH_ELENIA}
{HERODEATH_THERA_AND_MORVIN_NO_DIALOG}
{HERODEATH_STALRAG}
{HERODEATH_LICH_BROTHERS}
[/scenario]

5
data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg
View file

@ -369,9 +369,6 @@
[/endlevel]
[/event]
# Set a symbol that will correctly set the brothers and Stalrag death events for this and future scenarios
#define ALLIED_LICH
#enddef
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_EVERYONE}
[/scenario]

2
data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
View file

@ -395,5 +395,5 @@
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_EVERYONE}
[/scenario]

2
data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
View file

@ -1180,5 +1180,5 @@
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_EVERYONE}
[/scenario]

2
data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg
View file

@ -488,5 +488,5 @@
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_EVERYONE}
[/scenario]

2
data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
View file

@ -539,5 +539,5 @@
{MODIFY_UNIT id=Eryssa side 1}
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_EVERYONE}
[/scenario]

2
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file

@ -966,5 +966,5 @@
[/message]
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
{HERODEATH_EVERYONE}
[/scenario]

12
data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
View file

@ -877,6 +877,18 @@
[/event]
#enddef
# Macro shortcut whith everyone's death macros
#define HERODEATH_EVERYONE
{HERODEATH_TALLIN}
{HERODEATH_CAMERIN}
{HERODEATH_KRASH}
{HERODEATH_ELENIA}
{HERODEATH_THERA_AND_MORVIN_NO_DIALOG}
{HERODEATH_STALRAG}
{HERODEATH_LICH_BROTHERS}
{HERODEATH_ERYSSA}
#enddef
# This death event makes sure there is allways a supporter around
#define SUPPORTER_DEATH_HANDLER
[event]