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

THoT: instead of including full herodeath file, only include relevant macros per-scenario

Browse source 
This fixes invalid [event] WML at toplevel and useless events from scenarios that don't even
have certain units
This commit is contained in:
Charles Dang 2015-01-20 07:31:01 +11:00
parent 0087870887
commit 2cdc992081
12 changed files with 87 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
View file

@ -162,4 +162,6 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
[/scenario]

5
data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
View file

@ -140,8 +140,6 @@
[/part]
[/story]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
[event]
name="prestart"
@ -278,4 +276,7 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
[/scenario]

5
data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
View file

@ -68,8 +68,6 @@
#endif
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
[story]
[part]
background=maps/wesnoth.png
@ -165,4 +163,7 @@
message=_"Then it will be of the Alliance’s making, right enough, like this road that leads to it. It won’t do to have wild trolls squatting on it. Axes up!"
[/message]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
[/scenario]

5
data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
View file

@ -144,8 +144,6 @@
[/ai]
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
[side]
# The bandit indigenes
side=5
@ -411,4 +409,7 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
View file

@ -59,8 +59,6 @@
[/ai]
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
[side]
# The wild things
side=3
@ -367,4 +365,8 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
View file

@ -74,8 +74,6 @@
[/ai]
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
[event]
name="prestart"
@ -264,4 +262,8 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
View file

@ -64,8 +64,6 @@
user_team_name=_"Alliance"
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
[event]
name="prestart"
@ -358,4 +356,8 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
View file

@ -36,8 +36,6 @@
{FLAG_VARIANT knalgan}
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
# This tells the elves not to venture onto the plains
#define AVOID_LEAVING_FOREST
[avoid]
@ -377,4 +375,8 @@
[/else]
[/if]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
View file

@ -196,8 +196,6 @@
{FLAG_VARIANT6 ragged}
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
{SET_RIGHTEOUS_FLAME_EVENT}
[event]
@ -344,4 +342,8 @@
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
View file

@ -76,8 +76,6 @@
{FLAG_VARIANT knalgan}
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
{SET_RIGHTEOUS_FLAME_EVENT}
[event]
@ -352,4 +350,8 @@
result=defeat
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
View file

@ -185,8 +185,6 @@
{FLAG_VARIANT knalgan}
[/side]
{campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
#define MASKED_GUARD SIDE X Y
[unit]
type=Dwarvish Masked Steelclad
@ -1257,6 +1255,10 @@
result=defeat
[/endlevel]
[/event]
{HERODEATH_AIGLONDUR}
{HERODEATH_ANGARTHING}
{HERODEATH_RATHELN}
[/scenario]
#undef MASKED_GUARD

84
data/campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg
View file

@ -1,39 +1,51 @@
#textdomain wesnoth-thot
[event]
name=last breath
[filter]
id="Aiglondur"
[/filter]
[message]
speaker=Aiglondur
message= _ "I fall!"
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
[event]
name=die
[filter]
id="Angarthing"
[/filter]
[message]
speaker=Aiglondur
message= _ "Oh no! Without a loremaster we cannot complete our mission!"
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
#define HERODEATH_AIGLONDUR
[event]
name=last breath
[filter]
id="Aiglondur"
[/filter]
[event]
name=last breath
[filter]
id="Ratheln"
[/filter]
[message]
speaker=Ratheln
message= _ "Aaarrgh! My students... What will become of them?"
[/message]
[/event]
[message]
speaker=Aiglondur
message= _ "I fall!"
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
#enddef
#define HERODEATH_ANGARTHING
[event]
name=die
[filter]
id="Angarthing"
[/filter]
[message]
speaker=Aiglondur
message= _ "Oh no! Without a loremaster we cannot complete our mission!"
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
#enddef
#define HERODEATH_RATHELN
[event]
name=last breath
[filter]
id="Ratheln"
[/filter]
[message]
speaker=Ratheln
message= _ "Aaarrgh! My students... What will become of them?"
[/message]
[/event]
#enddef