Author: esr
Date: Mon Apr 6 02:10:20 2009
New Revision: 34575
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34575&view=rev
Log:
Fix continuity issues created by Chantal becoming personally important
to Delfador - happens in Delfador's Memoirs, affects Heir top the Throne.
This patch bumps Chantal from Druid to Shyde, and makes her death in HttT a
loss condition - though one that is highly unlikely to trigger given the
usual flow of battle in the scenario and the hitpoints she has as an L3.
This patch also adds dialog to both Elves Beseiged and Siege of Elensefar
that improves contnuity with LoW, with DM, and internally in HttT itself.
Finally, Chantal's name becomes a global spelling exception.
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg
trunk/data/core/units.cfg
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg?rev=34575&r1=34574&r2=34575&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
Mon Apr 6 02:10:20 2009
@@ -26,6 +26,10 @@
[/objective]
[objective]
description= _ "Death of Delfador"
+ condition=lose
+ [/objective]
+ [objective]
+ description= _ "Death of Chantal"
condition=lose
[/objective]
[objective]
@@ -213,7 +217,7 @@
[/side]
[side]
- type=Elvish Druid
+ type=Elvish Shyde
id=Chantal
name= _ "Chantal"
side=6
@@ -292,7 +296,7 @@
[/message]
[message]
speaker=Delfador
- message= _ "And so it has begun!"
+ message= _ "Do not spend your life here, Chantal. Someone must
warn the Northern Elves that the war we so long feared has begun."
[/message]
{HIGHLIGHT_IMAGE 1 1 scenery/signpost.png ()}
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg?rev=34575&r1=34574&r2=34575&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
Mon Apr 6 02:10:20 2009
@@ -558,7 +558,11 @@
[message]
speaker=Delfador
- message= _ "I have been meeting with the Great Elven Council. This
is Kalenz, a lord of the Northern Elves who came to the Council to offer us the
support of the Northern Elves."
+ message= _ "I have been meeting with the Ka'lian, the Great
Council of the Elves. This is Kalenz, a great lord of the Northern Elves who
came to the Council to offer us the support of the his people."
+ # See Legend of Wesmere; Kalenz is the former High Lord of
+ # the elves. At this time in 517 YW, he is probably a leader or
+ # legate of the elves of the Forest of Lintanir. None of
+ # this backstory existed when HttT was first written.
[/message]
[message]
@@ -573,7 +577,7 @@
[message]
speaker=Delfador
- message= _ "The Council has met and decided: we must capture the
Scepter of Fire."
+ message= _ "The Ka'lian has met and decided: we must capture the
Scepter of Fire."
[/message]
[message]
@@ -619,6 +623,11 @@
[message]
speaker=Delfador
message= _ "Yes, Konrad. I believe you will be king one day. Now
let us make haste!"
+ [/message]
+
+ [message]
+ speaker=Delfador
+ message= _ "We cannot go to Wesmere, for Asheviere's orcs have the
approaches ringed about with steel; Kalenz and I barely escaped, and Chantal
cannot get out. Until we are stronger, we must go where the orcs are not."
[/message]
[endlevel]
Modified: trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg?rev=34575&r1=34574&r2=34575&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg (original)
+++ trunk/data/campaigns/Heir_To_The_Throne/utils/deaths.cfg Mon Apr 6
02:10:20 2009
@@ -58,6 +58,20 @@
[event]
name=die
[filter]
+ id=Chantal
+ [/filter]
+ [message]
+ speaker=Delfador
+ message= _ "No! Chantal...! This will breaks our alliance with the
elves!"
+ [/message]
+ [endlevel]
+ result=defeat
+ [/endlevel]
+[/event]
+
+[event]
+ name=die
+ [filter]
id=Warven
[/filter]
[message]
Modified: trunk/data/core/units.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units.cfg?rev=34575&r1=34574&r2=34575&view=diff
==============================================================================
--- trunk/data/core/units.cfg (original)
+++ trunk/data/core/units.cfg Mon Apr 6 02:10:20 2009
@@ -154,7 +154,7 @@
# wmllint: general spellings Annuvin Delwyn Dallben Westin Blackwater
Aldril
# wmllint: general spellings Illuven Longlier Northlands Southlands
# wmllint: general spellings Haldric Garard Glyn Konrad Li'sar Delfador
- # wmllint: general spellings Eldred Asheviere Crelanu Tallin
+ # wmllint: general spellings Chantal Eldred Asheviere Crelanu Tallin
[race]
id=human
male_name= _ "race^Human"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
