upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[[NR polishing]]

Browse Source 
* Fixed some typos in Father Marcus' and Sister Theta's lines.

* Fixed a grammar inconsistency in Father Marcus' and Sister Theta's lines
  ("that hurt" instead of "that hurts").

* Optimized Father Marcus' and Sister Theta's impassable terrain filter
  for the code that decides where they should respawn.

* Added a variable clearing statement to Father Marcus' and Sister Theta's
  death events to prevent WML leaks in saved games.

* Gave Krash and Stalrag "last breath" events and moved part of their
  death event dialogue there.
This commit is contained in:
Ignacio R. Morelle 2008-09-02 22:18:39 +00:00
parent 7618bbad51
commit e8b411a0cf
1 changed files with 154 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

394
data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
View File

@ -1,7 +1,23 @@
#textdomain wesnoth-nr
## Common code for hero deaths.
# Krash death event
# Krash death events
[event]
name=last breath
[filter]
id=Krash
[/filter]
[message]
speaker=Krash
message= _ " *roars in pain*"
[/message]
[message]
speaker=Tallin
message= _ "Krash!"
[/message]
[/event]
[event]
name=die
[filter]
@ -12,14 +28,6 @@
play_once=yes
[/music]
[message]
speaker=Krash
message= _ " *roars in pain*"
[/message]
[message]
speaker=Tallin
message= _ "Krash!"
[/message]
[message]
speaker=Father Marcus
message= _ "It's no good, Tallin, he is gone."
@ -84,6 +92,18 @@
[/endlevel]
[/event]
[event]
name=last breath
[filter]
id=Stalrag
[/filter]
[message]
speaker=Stalrag
message= _ "Farewell, my friends. I now go to join my fallen brothers."
[/message]
[/event]
[event]
name=die
[filter]
@ -94,17 +114,22 @@
name=nr-sad.ogg
play_once=yes
[/music]
[message]
speaker=Stalrag
message= _ "Farewell, my friends. I now go to join my fallen brothers."
[/message]
[role]
type=Dwarvish Berserker,Dwarvish Ulfsurker
role=Shinsplitter
[/role]
[recall]
role=Shinsplitter
[/recall]
[if]
[not]
[have_unit]
role=Shinsplitter
[/have_unit]
[/not]
[then]
[recall]
role=Shinsplitter
[/recall]
[/then]
[/if]
[message]
role=Shinsplitter
message= _ "No, Stalrag! Without you what will become of the Shinsplitters?"
@ -193,14 +218,12 @@
[filter]
id=Sister Theta
[/filter]
{RANDOM 1,2,3,4,5,6,7}
{RANDOM 1..7}
[if]
[variable]
name=random
equals=1
[/variable]
[then]
[switch]
variable=random
[case]
value=1
[message]
speaker=Sister Theta
message= _ "Ahhhh! Save me, my husband!"
@ -209,14 +232,9 @@
speaker=Father Marcus
message= _ " *rolls eyes* Dramatic as always."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=2
[/variable]
[then]
[/case]
[case]
value=2
[message]
speaker=Sister Theta
message= _ "Ahhhhhhh!"
@ -225,14 +243,9 @@
speaker=Father Marcus
message= _ "You monsters think you are so tough don't you? Well check this out."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=3
[/variable]
[then]
[/case]
[case]
value=3
[message]
speaker=Sister Theta
message= _ "Ahhhhhhh!"
@ -241,14 +254,9 @@
speaker=Father Marcus
message= _ "You incompetent fools, you think you can kill us? Good luck!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=4
[/variable]
[then]
[/case]
[case]
value=4
[message]
speaker=Sister Theta
message= _ "Ack! Stupid slobbering beast!"
@ -257,14 +265,9 @@
speaker=Father Marcus
message= _ "Your efforts to destroy us are in vain, you foul creature."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=5
[/variable]
[then]
[/case]
[case]
value=5
[message]
speaker=Sister Theta
message= _ "Oh no, Marcus! We have failed in our mission to help Tallin!"
@ -273,14 +276,9 @@
speaker=Father Marcus
message= _ "Failed? Never! The word failure is not in our dictionary."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=6
[/variable]
[then]
[/case]
[case]
value=6
[message]
speaker=Sister Theta
message= _ "Alas! I am dying! Marcus darling, I wish you were beside me so that I may die in your arms! So that I may feel the kiss of your lips on mine one last time!"
@ -297,14 +295,8 @@
speaker=Father Marcus
message= _ "Oh right. I CALL UPON THE LORDS OF LIGHT TO GRANT YOU LIFE!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=7
[/variable]
[then]
[/case]
[else]
[message]
speaker=Sister Theta
message= _ "You cruel creature! How dare you use your brute strength against such a frail creature as me."
@ -313,8 +305,8 @@
speaker=Father Marcus
message= _ "Don't worry, Theta, you will have plenty of opportunities to set him straight."
[/message]
[/then]
[/if]
[/else]
[/switch]
{FLASH_WHITE ()}
# Find a respawn point, start within 1 hex of Father Marcus, increase range if nothing suitable
# Search around Tallin if Marcus is still jailed
@ -351,7 +343,7 @@
[/filter]
[/not]
[not]
terrain=Xu,Qxu,Ql,Qlf,Wo,Mm^Xm,Md^Xm,Xv
terrain=Wo,*^Xm,X*,Q*
[/not]
[/and]
[/store_locations]
@ -384,12 +376,10 @@
{CLEAR_VARIABLE respawn_point}
{CLEAR_VARIABLE type_check}
{CLEAR_VARIABLE current_radius}
[if]
[variable]
name=random
equals=1
[/variable]
[then]
[switch]
variable=random
[case]
value=1
[message]
speaker=Father Marcus
message= _ "Theta, when this is all over, you should paint your face and join a theater."
@ -406,14 +396,9 @@
speaker=Sister Theta
message= _ " *giggle* Who needs an excuse for overacting?"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=2
[/variable]
[then]
[/case]
[case]
value=2
[message]
speaker=Sister Theta
message= _ "Woha! That trick is a bit hard on the constitution."
@ -430,38 +415,23 @@
speaker=Father Marcus
message= _ "Thank the lords of light, not me!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=3
[/variable]
[then]
[/case]
[case]
value=3
[message]
speaker=Sister Theta
message= _ "Ouch! That hurt. Let's try not to do that again, OK?"
message= _ "Ouch! That hurts. Let's try not to do that again, OK?"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=4
[/variable]
[then]
[/case]
[case]
value=4
[message]
speaker=Sister Theta
message= _ "There we go, payback time!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=5
[/variable]
[then]
[/case]
[case]
value=5
[message]
speaker=Sister Theta
message= _ "There we go, let's give this one more shot!"
@ -470,14 +440,9 @@
speaker=Father Marcus
message= _ "Just try not to kill yourself again."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=6
[/variable]
[then]
[/case]
[case]
value=6
[message]
speaker=Father Marcus
message= _ "Theta, you should know by now that it is very unclerical to make such a spectacle of yourself."
@ -490,14 +455,8 @@
speaker=Father Marcus
message= _ " *rolls eyes* Women!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=7
[/variable]
[then]
[/case]
[else]
[message]
speaker=Sister Theta
message= _ "That's darned right!"
@ -510,8 +469,12 @@
speaker=Sister Theta
message= _ " *giggle* Sorry."
[/message]
[/then]
[/if]
[/else]
[/switch]
[clear_variable]
name=random
[/clear_variable]
[/event]
# Father Marcus - See above
@ -522,13 +485,11 @@
id=Father Marcus
[/filter]
{RANDOM 1,2,3,4,5,6,7}
[if]
[variable]
name=random
equals=1
[/variable]
[then]
{RANDOM 1..7}
[switch]
variable=random
[case]
value=1
[message]
speaker=Father Marcus
message= _ "Alas! So.... close."
@ -537,14 +498,9 @@
speaker=Sister Theta
message= _ "Hey, that's not right. The good guys aren't supposed to die. Oh well, I'll fix that."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=2
[/variable]
[then]
[/case]
[case]
value=2
[message]
speaker=Father Marcus
message= _ "Argh!"
@ -553,14 +509,9 @@
speaker=Sister Theta
message= _ "You incompetent fools, you think you can kill us? Good luck!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=3
[/variable]
[then]
[/case]
[case]
value=3
[message]
speaker=Father Marcus
message= _ "Argh!"
@ -569,14 +520,9 @@
speaker=Sister Theta
message= _ "Oh dear. Did you just go and get yourself killed again, Marcus? Well, I'll fix that."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=4
[/variable]
[then]
[/case]
[case]
value=4
[message]
speaker=Father Marcus
message= _ "The forces of good can never be defeated by the likes of you!"
@ -585,14 +531,9 @@
speaker=Sister Theta
message= _ "Yeah, try taking a bath and you MIGHT be able to kill him for good *wink wink*. But for the time being, abracadabra!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=5
[/variable]
[then]
[/case]
[case]
value=5
[message]
speaker=Father Marcus
message= _ "Argh!"
@ -601,30 +542,19 @@
speaker=Sister Theta
message= _ "Stupid troll, maybe next time you should try killing someone who can be killed."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=6
[/variable]
[then]
[/case]
[case]
value=6
[message]
speaker=Father Marcus
message= _ "Argh! I'll just come back and finish you in my next life."
[/message]
[message]
speaker=Sister Theta
message= _ "Which might be sooner then you think."
message= _ "Which might be sooner than you think."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=7
[/variable]
[then]
[/case]
[else]
[message]
speaker=Father Marcus
message= _ "Ack! I have been brained!"
@ -633,8 +563,9 @@
speaker=Sister Theta
message= _ "Eeeeww! Gross! Ahh never mind, I'll get you cleaned up good."
[/message]
[/then]
[/if]
[/else]
[/switch]
{VARIABLE current_radius 1}
[if]
[have_unit]
@ -661,13 +592,14 @@
[/filter]
radius=$current_radius
[/and]
# Exclude hexes with units on them and impassable terrain
[and]
[not]
[filter]
[/filter]
[/not]
[not]
terrain=Xu,Qxu,Ql,Qlf,Wo,Mm^Xm,Md^Xm,Xv
terrain=Wo,*^Xm,X*,Q*
[/not]
[/and]
[/store_locations]
@ -699,12 +631,11 @@
{CLEAR_VARIABLE type_check}
{CLEAR_VARIABLE respawn_point}
{CLEAR_VARIABLE current_radius}
[if]
[variable]
name=random
equals=1
[/variable]
[then]
[switch]
variable=random
[case]
value=1
[message]
speaker=Sister Theta
message= _ "There we go."
@ -713,26 +644,16 @@
speaker=Father Marcus
message= _ "Ahh yes, that's better."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=2
[/variable]
[then]
[/case]
[case]
value=2
[message]
speaker=Father Marcus
message= _ "Ouch! That hurt. Let's try not to do that again ok?"
message= _ "Ouch! That hurts. Let's try not to do that again, OK?"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=3
[/variable]
[then]
[/case]
[case]
value=3
[message]
speaker=Sister Theta
message= _ "Marcus! You bad boy, always getting into trouble."
@ -741,14 +662,9 @@
speaker=Father Marcus
message= _ "Sorry, won't do it again. Promise!"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=4
[/variable]
[then]
[/case]
[case]
value=4
[message]
speaker=Father Marcus
message= _ "I heard that, Theta."
@ -757,14 +673,13 @@
speaker=Sister Theta
message= _ "Hey, just trying to give him an incentive to drown himself."
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=6
[/variable]
[then]
[/case]
[case]
value=5
# no message for this case
[/case]
[case]
value=6
[message]
speaker=Sister Theta
message= _ "See?"
@ -773,14 +688,8 @@
speaker=Father Marcus
message= _ "Now where did he go!?"
[/message]
[/then]
[/if]
[if]
[variable]
name=random
equals=7
[/variable]
[then]
[/case]
[else]
[message]
speaker=Father Marcus
message= _ "Ahhh, Theta, you would make such a good housewife!"
@ -797,8 +706,12 @@
speaker=Sister Theta
message= _ " *giggle* Sorry!"
[/message]
[/then]
[/if]
[/else]
[/switch]
[clear_variable]
name=random
[/clear_variable]
[/event]
# Elenia death
[event]
@ -825,6 +738,7 @@
message= _ "Farewell Elenia. May you find peace in your final journey."
[/message]
[/event]
# Camerin death
[event]
name=die
@ -877,7 +791,7 @@
[store_unit]
[filter]
race=Human
race=human
alignment=lawful
[not]
id=Camerin