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

TSG, Choice in the Fog: if the player is allied with the Elves,

Browse source 
...both Urza Afalas and Mal M'Brin must be defeated to win. Second
part of the fix for bug #19758
This commit is contained in:
Elvish_Hunter 2012-06-12 09:19:02 +00:00
parent ee8b41ae04
commit a46252cbdb
3 changed files with 87 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -57,7 +57,9 @@ Version 1.11.0-svn:
* Fixed bug #19743: in Mages and Drakes, Perrin has two different messages about
apprentices, depending on the difficult level
* The South Guard:
* Fixed bug #19758: Urza Afalas' sighted event is fired also when the Lich is seen
* Fixed bug #19758: Urza Afalas' sighted event is fired also when the Lich is seen,
and if the player allies with the Elves, then both Urza Afalas and Mal M'Brin must
be defeated
* Tutorial:
* Applied patch #3203: Allow to end the scenario via the right-click menu.
* Fixed bug #19316: Narrator messages are now translated.

129
data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
View file

@ -769,10 +769,22 @@
[/endlevel]
[/then]
[else]
[message]
speaker=Urza Afalas
message= _ "Fools! That lich will be the death of us all! You have sealed our doom!"
[/message]
[if]
[have_unit]
id="Mal M'Brin"
[/have_unit]
[then]
[message]
speaker=Urza Afalas
message= _ "Fools! That lich will be the death of us all! You have sealed our doom!"
[/message]
[/then]
[else]
[fire_event]
name=bandits_and_lich_defeated
[/fire_event]
[/else]
[/if]
[/else]
[/if]
[/event]
@ -869,51 +881,72 @@
[/endlevel]
[/then]
[else]
[message]
speaker=Sir Gerrick
message= _ "We have beaten them both, criminals and undead!"
[/message]
[message]
speaker=Deoran
image=portraits/deoran-glad.png
message= _ "We should make haste to return to Wesnoth before the harvest. Fall arrived some time ago."
[/message]
[message]
speaker=Ethiliel
message= _ "Do not be so hasty; great mages are no mere tricksters to be easily defeated. I fear that there are tunnels and catacombs buried beneath his fortress and that we have merely defeated a specter. If we wish to cleanse the land of his evil, we must enter the darkness and root him out from within."
[/message]
[message]
speaker=Ethiliel
message= _ "There are strong magical wards placed here that would prevent you from entering, but I am capable of opening them to let us all pass."
[/message]
[message]
speaker=Deoran
image=portraits/deoran-sad.png
message= _ "My men are not dwarves! How are we to fight in catacombs and tunnels?"
[/message]
[message]
speaker=Sir Gerrick
message= _ "Someone must take news back to Wesnoth of this new evil that lurks near our borders. Who knows how many more of these undead are hiding in the forest?"
[/message]
[message]
speaker=Deoran
message= _ "Go, Sir Gerrick, and take with you an escort of elves, if Ethiliel will permit it."
[/message]
[message]
speaker=Ethiliel
message= _ "Indeed I will. My kinsfolk will protect you and your message!"
[/message]
[message]
speaker=Sir Gerrick
message= _ "Fare well, Deoran! I will be there to greet you when you return to Kerlath Province."
[/message]
[endlevel]
result=victory
next_scenario=06a_Tidings_Good_and_Ill
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[if]
[have_unit]
id=Urza Afalas
[/have_unit]
[then]
[message]
speaker=Sir Gerrick
message= _ "Now, on with those bandits!"
[/message]
[/then]
[else]
[fire_event]
name=bandits_and_lich_defeated
[/fire_event]
[/else]
[/if]
[/else]
[/if]
[/event]
[event]
name=bandits_and_lich_defeated
[message]
speaker=Sir Gerrick
message= _ "We have beaten them both, criminals and undead!"
[/message]
[message]
speaker=Deoran
image=portraits/deoran-glad.png
message= _ "We should make haste to return to Wesnoth before the harvest. Fall arrived some time ago."
[/message]
[message]
speaker=Ethiliel
message= _ "Do not be so hasty; great mages are no mere tricksters to be easily defeated. I fear that there are tunnels and catacombs buried beneath his fortress and that we have merely defeated a specter. If we wish to cleanse the land of his evil, we must enter the darkness and root him out from within."
[/message]
[message]
speaker=Ethiliel
message= _ "There are strong magical wards placed here that would prevent you from entering, but I am capable of opening them to let us all pass."
[/message]
[message]
speaker=Deoran
image=portraits/deoran-sad.png
message= _ "My men are not dwarves! How are we to fight in catacombs and tunnels?"
[/message]
[message]
speaker=Sir Gerrick
message= _ "Someone must take news back to Wesnoth of this new evil that lurks near our borders. Who knows how many more of these undead are hiding in the forest?"
[/message]
[message]
speaker=Deoran
message= _ "Go, Sir Gerrick, and take with you an escort of elves, if Ethiliel will permit it."
[/message]
[message]
speaker=Ethiliel
message= _ "Indeed I will. My kinsfolk will protect you and your message!"
[/message]
[message]
speaker=Sir Gerrick
message= _ "Fare well, Deoran! I will be there to greet you when you return to Kerlath Province."
[/message]
[endlevel]
result=victory
next_scenario=06a_Tidings_Good_and_Ill
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
[/scenario]

4
players_changelog
View file

@ -37,7 +37,9 @@ Version 1.11.0-svn:
* Silent Forest: the messages that appear upon killing the first Elf can be
translated differently depending on the Elf's gender
* The South Guard:
* Fixed bug #19758: Urza Afalas' sighted event is fired also when the Lich is seen
* Fixed bug #19758: Urza Afalas' sighted event is fired also when the Lich is seen,
and if the player allies with the Elves, then both Urza Afalas and Mal M'Brin must
be defeated
* Tutorial:
* Applied patch #3203: Allow to end the scenario via the right-click menu.
* Fixed bug #19316: Narrator messages are now translated.