diff --git a/changelog.md b/changelog.md index 4b7f955d56b..feca3154c42 100644 --- a/changelog.md +++ b/changelog.md @@ -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 diff --git a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg index 9d863f10f6a..cf20b07ff09 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/08a_Elvish_Princess.cfg @@ -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= _ "(hushed) 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= _ "(whispering) Later, princess, first let’s get outta — uh, let us take our leave of this place as swiftly as may be!" [/message] [message] diff --git a/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg b/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg index fc9307c3202..1c71c9aae7d 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg @@ -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} diff --git a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg index 8a38580ebb6..ff3e8e305c9 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg @@ -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 diff --git a/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg b/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg index 1d77ad0ce11..c8e30c764dd 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/11a_The_Eastern_Flank.cfg @@ -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} diff --git a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg index 7e755d1feaf..c879114fcb4 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg @@ -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} diff --git a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg index b5afc9faff4..57014f43dae 100644 --- a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg +++ b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg @@ -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] diff --git a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg index 4e2f7475f0b..bf27682d077 100644 --- a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg +++ b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg @@ -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. (Sigh) 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