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

Merge pull request #3966 from nemaara/NR

Browse source 
NR: require Eryssa to survive if she joins the player
This commit is contained in:
nemaara 2019-03-04 11:21:45 -05:00 • committed by GitHub
commit 1d5668ffaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.md
View file

@ -119,6 +119,8 @@
* S2: Modified Dacyn's dialogue upon undead arrival
* S7a: Require Dacyn to cross the river
* Northern Rebirth:
* Eryssa now must survive if she joins the player
* S8: add text and updated objectives when rescuing Eryssa
* S12a: Update objectives to make it clear that gold is not received if Sisal dies
* The Rise of Wesnoth:
* Fixed various typos

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

@ -321,6 +321,9 @@
[note]
description= _ "Even if your rescue fails, you will still advance to the next scenario"
[/note]
[note]
description= _ "You will win this scenario immediately upon moving onto the hex containing the Princess’s cage"
[/note]
[/objectives]
[/event]
@ -385,15 +388,20 @@
{IS_LOYAL}
[/unit]
[message]
race=orc
message= _ "The intruders are breaking in! Get to the walls and defend the fortress! And where did that Elvish Princess go?"
[/message]
[message]
speaker=Eryssa
message= _ "I am free! Thank you, my saviors. Who has come to rescue me from vile captivity?"
message= _ "(<i>hushed</i>) Thank you, my saviors. Who has come to rescue me from vile captivity?"
[/message]
[message]
speaker=Tallin
# wmllint: local spelling outta
message= _ "Later, princess, first let’s get outta — uh, let us take our leave of this place as swiftly as may be!"
message= _ "(<i>whispering</i>) Later, princess, first let’s get outta — uh, let us take our leave of this place as swiftly as may be!"
[/message]
[message]

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

@ -412,6 +412,15 @@
description= _ "Death of Ro’Sothian"
condition=lose
[/objective]
[objective]
description= _ "Death of Eryssa"
condition=lose
[show_if]
[have_unit]
id=Eryssa
[/have_unit]
[/show_if]
[/objective]
{TURNS_RUN_OUT}

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

@ -430,6 +430,15 @@
description= _ "Death of Ro’Sothian"
condition=lose
[/objective]
[objective]
description= _ "Death of Eryssa"
condition=lose
[show_if]
[have_unit]
id=Eryssa
[/have_unit]
[/show_if]
[/objective]
[objective]
description= _ "Turns run out"
condition=lose

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

@ -474,6 +474,15 @@
description= _ "Death of Ro’Sothian"
condition=lose
[/objective]
[objective]
description= _ "Death of Eryssa"
condition=lose
[show_if]
[have_unit]
id=Eryssa
[/have_unit]
[/show_if]
[/objective]
{TURNS_RUN_OUT}

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

@ -478,6 +478,15 @@
description= _ "Death of Ro’Sothian"
condition=lose
[/objective]
[objective]
description= _ "Death of Eryssa"
condition=lose
[show_if]
[have_unit]
id=Eryssa
[/have_unit]
[/show_if]
[/objective]
{TURNS_RUN_OUT}

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

@ -953,6 +953,15 @@
description= _ "Death of Hamel"
condition=lose
[/objective]
[objective]
description= _ "Death of Eryssa"
condition=lose
[show_if]
[have_unit]
id=Eryssa
[/have_unit]
[/show_if]
[/objective]
{IS_LAST_SCENARIO}
[/objectives]

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

@ -826,19 +826,17 @@
speaker=Elenia
message= _ "Eryssa, no! Please don’t die!"
[/message]
[message]
speaker=Tallin
message= _ "I am sorry, Elenia, we tried our best. (<i>Sigh</i>) I will never forget you, Eryssa."
[/message]
[/then]
[else]
[message]
speaker=Tallin
message= _ "You wretches are going to pay for this! FORWARD, MEN!"
[/message]
[/else]
[/if]
[message]
speaker=Tallin
message= _ "How could this happen? We can’t possibly go on without her..."
[/message]
[endlevel]
result=defeat
[/endlevel]
[/event]
#enddef