wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth A_Be...


From: James Spencer
Subject: [Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Rise_of_Wesnoth A_Be...
Date: Sun, 09 Jan 2005 17:23:55 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  05/01/09 21:35:47

Modified files:
        data/scenarios/The_Rise_of_Wesnoth: A_Beach.cfg 
                                            A_Final_Spring.cfg 
                                            A_Harrowing_Escape.cfg 
                                            A_New_Land.cfg 
                                            A_Spy_in_the_Woods.cfg 
                                            A_Summer_of_Storms.cfg 
                                            Clearwater_Port.cfg 
                                            Cursed_Isle.cfg 
                                            Elf_Lords.cfg Epilogue.cfg 
                                            Fallen_Lich_Point.cfg 
                                            Peoples_in_Decline.cfg 
                                            Return_of_the_Fleet.cfg 
                                            Return_to_Oldwood.cfg 
                                            Rise_of_Wesnoth.cfg 
                                            Rough_Landing.cfg Sewer.cfg 
                                            Southbay_in_Winter.cfg 
                                            Temple_of_the_Deep.cfg 
                                            The_Dragon.cfg The_Fall.cfg 
                                            The_Midlands.cfg 
                                            The_Oldwood.cfg The_Plan.cfg 
                                            The_River_Road.cfg 
                                            The_Vanguard.cfg 
                                            Troll_Hole.cfg 
                                            trow-deaths.cfg 
                                            trow-intro.cfg 
                                            trow-macros.cfg 
                                            trow-nlmsg.cfg 
                                            trow-nohome.cfg 
                                            trow-noisle.cfg 

Log message:
        Remove id= from [message]s in TRoW, fix all sorts of crimes against 
<TAB>

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.17 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.18
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg:1.17 Thu Nov 25 
05:10:21 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg      Sun Jan  9 
21:35:46 2005
@@ -118,56 +118,50 @@
                [recall]
                        description=Minister Edmond
                [/recall]
-               
+
        [/event]
-       
+
        [event]
                name=start
                [message]
-                       id=msgT16c_1
                        speaker=narrator
                        message= _ "After a long trek Prince Haldric and his 
companions find themselves on a sunny beach. While normally this would be a 
pleasant occurrence, they soon find the Saurians hard at work."
                [/message]
-               
+
                [message]
-                       id=msgT16c_2
                        speaker=Ssirk
                        message= _ "Monsters! We're being invaded by monsters."
                [/message]
-               
+
                [message]
-                       id=msgT16c_3
                        speaker=Tirasch
                        message= _ "We must hold the beach until we can call 
our Naga friends."
                [/message]
-               
+
                [message]
-                       id=msgT16c_4
                        speaker=Prince Haldric
                        message= _ "Us monsters? Hmph. . . prepare to meet our 
blades."
                [/message]
-               
+
                [message]
-                       id=msgT16c_5
                        speaker=Lady Jessica
                        message= _ "(Sigh) I bet he doesn't even see the irony 
in that."
                [/message]
        [/event]
-       
+
        [event]
                name=time over
                [message]
-                       id=msgT16c_6
                        description=Lady Jessica
                        message= _ "We were too slow. . . Every Naga in the Sea 
will be upon us!"
                [/message]
        [/event]
-       
+
 #define MUDMANIA X Y
                [filter]
                        type=Giant Mudcrawler
                [/filter]
-               
+
                [unit]
                        description=A Blob
                        type=Mudcrawler
@@ -175,7 +169,7 @@
                        x={X}
                        y={Y}
                [/unit]
-               
+
                [unit]
                        description=A Blob
                        type=Mudcrawler
@@ -188,7 +182,7 @@
        [event]
                name=die
                first_time_only=no
-               
+
                {MUDMANIA $x1 $y1}
        [/event]
 
@@ -198,12 +192,11 @@
                        type=Giant Mudcrawler
                [/filter]
                [message]
-                       id=msgT16c_7
                        speaker=Prince Haldric
                        message= _ "Ick! When you kill them they divide."
                [/message]      
        [/event]
-       
+
        [event]
                name=die
                [filter]
@@ -214,7 +207,7 @@
                        amount=170
                [/gold]
        [/event]
-       
+
        [event]
                name=die
                [filter]
@@ -225,7 +218,7 @@
                        amount=170
                [/gold]
        [/event]
-       
+
        [event]
                name=die
                [filter]
@@ -236,7 +229,7 @@
 
        [event]
                name=moveto
-               
+
                [filter]
                        side=1
                        x=1-11
@@ -252,7 +245,6 @@
                {UNIT (Sea Hag) (Riaa) 2 6 15}
 
                [message]
-                       id=msgT16c_8
                        speaker=Riaa
                        message= _ "We must protect the Saurians we need the 
metal!"
                [/message]
@@ -276,7 +268,6 @@
        [event]
                name=victory
                [message]
-                       id=msgT16c_9
                        description=Prince Haldric
                        message= _ "We've cleared the beach. Let's return to 
the elves."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.28 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.29
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg:1.28  Wed Dec 
22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg       Sun Jan 
 9 21:35:46 2005
@@ -260,12 +260,10 @@
        [event]
                name=start
                [message]
-                       id=msgT11_1
                        speaker=narrator
                        message= _ "Several months pass. Jessica has translated 
Lich-Lord Caror's Book. Prince Haldric is busy trying to understand the secrets 
of the Ruby of Fire."
                [/message]
                [message]
-                       id=msgT11_2
                        description=Prince Haldric
                        message= _ "I think I've figured something out. Look."
                [/message]
@@ -275,39 +273,32 @@
                        y=27,26,26,26,26,25,25,25
                [/move_unit_fake]
                [message]
-                       id=msgT11_3
                        description=Prince Haldric
                        message= _ "Ouch! Hot, hot, hot! Gee, somebody should 
really attach this thing to a sceptre or something! I think I'll save it for 
closer ranged combat for now."
                [/message]
                [message]
-                       id=msgT11_4
                        description=Lady Jessica
                        message= _ "Watch it! Well, at least you're improving."
                [/message]
                [message]
-                       id=msgT11_5
                        description=Burin the Lost
                        message= _ "Humph. Fool of a boy's just gonna burn us 
all up. Humans, always playing at being Wizards."
                [/message]
                [message]
-                       id=msgT11_6
                        description=Southbay Guard
                        message= _ "Orcs Sighted! They've seized the frontier! 
To arms! To arms!"
                [/message]
                [message]
-                       id=msgT11_7
                        description=Sir Ladoc
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "For the glory of Southbay!"
                [/message]
                [message]
-                       id=msgT11_8
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Prince Haldric, I'll concentrate on holding 
Southbay. You must defeat the Orcs. The ships aren't ready yet. We must defeat 
this army of Orcs to buy us more time. Try not to kill us all with that ruby!"
                [/message]
                [message]
-                       id=msgT11_9
                        description=Prince Haldric
                        message= _ "Very well. I'll do my best."
                [/message]
@@ -324,46 +315,38 @@
                {HERO (Merman Warrior) (Lord Typhon) 1 4 19}
 
                [message]
-                       id=msgT11_10
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "I come seeking the Crown Prince!"
                [/message]
                [message]
-                       id=msgT11_11
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Who is this fish man?"
                [/message]
                [message]
-                       id=msgT11_12
                        description=Lady Jessica
                        message= _ "He's a big part of the reason your son made 
it to the lands of the East. Lord Typhon provided us with pearls and an escort 
for our voyages, in exchange for steel trident points and fishhooks. It's 
difficult to be a blacksmith when you live underwater."
                [/message]
                [message]
-                       id=msgT11_13
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Indeed it is. But where is the Prince?"
                [/message]
                [message]
-                       id=msgT11_14
                        description=Lady Jessica
                        message= _ "The Crown Prince is dead. But we have need 
of your services again- -"
                [/message]
                [message]
-                       id=msgT11_15
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Under the same terms?"
                [/message]
                [message]
-                       id=msgT11_16
                        description=Lady Jessica
                        message= _ "Agreed."
                [/message]
                [message]
-                       id=msgT11_17
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Good. We need the steel for our own war in 
the deep. I formally place the might of the Merfolk at your disposal!"
@@ -377,7 +360,6 @@
        [event]
        name=turn 30
                [message]
-                       id=msgT11_18
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Make haste. We must secure the frontier or 
it's all over!"
@@ -407,12 +389,10 @@
                {UNIT (Ancient Lich) (Lich-Lord Jevyan) 5 42 24}
 
                [message]
-                       id=msgT11_19
                        description=Lich-Lord Jevyan
                        message= _ "King Addroran your day is done. Prepare to 
be ground to dust. If you're lucky I may raise you from death for my own 
amusement. Oh, and what's this? I sense, I sense the Ruby of Fire."
                [/message]
                [message]
-                       id=msgT11_20
                        description=Lady Jessica
                        message= _ "You monster! You've betrayed our people- - 
to ally youself with these Orcs?!"
                [/message]
@@ -420,23 +400,19 @@
                {UNIT (Death Knight) (Fool Prince) 5 43 24}
 
                [message]
-                       id=msgT11_21
                        description=Lich-Lord Jevyan
                        message= _ "Fool girl! My ambition extends in to 
infinity. I will survive. That is more than can be said for you. King Addroran, 
meet your son, you'll be joining him soon enough."
                [/message]
                [message]
-                       id=msgT11_22
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "NO!"
                [/message]
                [message]
-                       id=msgT11_23
                        description=Fool Prince
                        message= _ "Fath-er! Join. . . us. . ."
                [/message]
                [message]
-                       id=msgT11_24
                        description=Lady Jessica
                        message= _ "His older brother was more attractive. . ."
                [/message]
@@ -478,7 +454,6 @@
        [event]
                name=time over
                [message]
-                       id=msgT11_25
                        description=Lady Jessica
                        message= _ "Their reserves are arriving and we haven't 
secured the frontier! We're dead!"
                [/message]
@@ -496,7 +471,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_26
                        speaker=narrator
                        message= _ "Southbay"
                [/message]
@@ -516,7 +490,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_27
                        speaker=narrator
                        message= _ "To Clearwater Port"
                [/message]
@@ -536,7 +509,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_28
                        speaker=narrator
                        message= _ "To the Midlands & Oldwood"
                [/message]
@@ -556,7 +528,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_29
                        speaker=narrator
                        message= _ "To the Northrun"
                [/message]
@@ -576,7 +547,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_30
                        speaker=narrator
                        message= _ "To the Midlands"
                [/message]
@@ -596,7 +566,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_31
                        speaker=narrator
                        message= _ "New Southbay"
                [/message]
@@ -616,7 +585,6 @@
                [/redraw]
 
                [message]
-                       id=msgT11_32
                        speaker=narrator
                        message= _ "They sealed it, there is no escape for you!"
                [/message]
@@ -630,13 +598,11 @@
                description=King Addroran IX
                [/filter]
                [message]
-                       id=msg_Addroran_die
                        speaker=unit
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "I am finished."
                [/message]
                [message]
-                       id=msgT11_33
                        description=Prince Haldric
                        message= _ "We needed him to hold Southbay. We're done 
for!"
                [/message]
@@ -649,38 +615,31 @@
        [event]
                name=victory
                [message]
-                       id=msgT11_34
                        description=Prince Haldric
                        message= _ "We've defeated the Orcs. Let's rig the 
Ships and get out of here."
                [/message]
                [message]
-                       id=msgT11_35
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "My sons- - As we agreed. I will hold 
Southbay until my last breath."
                [/message]
                [message]
-                       id=msgT11_36
                        description=Lady Jessica
                        message= _ "With the help of the Merfolk, and my 
knowledge of an island that will make a good re-provisioning point, we should 
be able to embark for the great lands that are to the East."
                [/message]
                [message]
-                       id=msgT11_37
                        description=Lady Jessica
                        message= _ "What I don't like is the fact that 
Lich-Lord Jevyan, whom our capital is named after, betrayed my people. To make 
matters worse he knows that you have that ruby."
                [/message]
                [message]
-                       id=msgT11_38
                        description=Prince Haldric
                        message= _ "There's not much we can do about that now. 
I dub this fine ship the Eldaric, in honour of my father. About that island. . 
."
                [/message]
                [message]
-                       id=msgT11_39
                        description=Burin the Lost
                        message= _ "Great, more boats, and now an Ocean!"
                [/message]
                [message]
-                       id=msgT11_40
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "After you make it to this new land, send 
some of the ships back, for there may still be survivors in Southbay."
@@ -694,7 +653,6 @@
                [/filter]
 
                [message]
-                       id=msgT11_41
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "My Son!"
@@ -709,7 +667,6 @@
                [/filter]
 
                [message]
-                       id=msgT11_42
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "For the glory of Southbay!"
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.19 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.20
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg:1.19      
Wed Dec 22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg   Sun Jan 
 9 21:35:46 2005
@@ -123,25 +123,21 @@
        [event]
                name=start
                [message]
-                       id=msgT2_1
                        description=Prince Haldric
                        message= _ "Argh, the Orcish vanguard must have flanked 
us even further to the East! They're already holding the mouth of the pass. We 
have to get out of the mountain pass before winter comes or we're all dead 
meat!"
                [/message]
 
                [message]
-                       id=msgT2_2
                        description=Prince Haldric
                        message= _ "Father, I wish you were here. . ."
                [/message]
 
                [message]
-                       id=msgT2_3
                        description=Lady Outlaw
                        message= _ "I'd drop the sentiment, and pick up your 
sword. There's plenty of fighting ahead of us!"
                [/message]
 
                [message]
-                       id=msgT2_4
                        description=Tan-Schmog
                        message= _ "You won't get much further boy. Grrrr!"
                [/message]
@@ -156,7 +152,6 @@
                [/filter]
 
                [message]
-                       id=msgT2_5
                        speaker=unit
                        message= _ "Who goes there?"
                [/message]
@@ -164,43 +159,36 @@
                {HERO (Dwarvish Steelclad) (Burin the Lost) 1 8 5}
 
                [message]
-                       id=msgT2_6
                        speaker=Burin the Lost
                        message= _ "Burin, Burin the Lost. Who be yee?"
                [/message]
 
                [message]
-                       id=msgT2_7
                        description=Prince Haldric
                        message= _ "I'm Prince Haldric, we have little time to 
talk. We must make haste through the pass. . . What are you?"
                [/message]
 
                [message]
-                       id=msgT2_8
                        speaker=Burin the Lost
                        message= _ "I'm a Dwarf! Damn fool of a boy! I got lost 
while exploring deep underground, almost a century ago. I've never found my way 
home. But it seems nice enough here."
                [/message]
 
                [message]
-                       id=msgT2_9
                        description=Prince Haldric
                        message= _ "Nice? The Orcs have come and we must flee!"
                [/message]
 
                [message]
-                       id=msgT2_10
                        speaker=Burin the Lost
                        message= _ "Orcs! It's been a long time since I felt 
the satisfying crunch of one of those under my Axe. Time for a fight!"
                [/message]
 
                [message]
-                       id=msgT2_11
                        description=Prince Haldric
                        message= _ "You've fought Orcs before?"
                [/message]
 
                [message]
-                       id=msgT2_12
                        speaker=Burin the Lost
                        message= _ "Fool Boy! Where did you grow up? Enough of 
this, let's go get some Orcs!"
                [/message]
@@ -210,7 +198,6 @@
        [event]
                name=time over
                [message]
-                       id=msgT2_13
                        description=Prince Haldric
                        message= _ "We're trapped in the pass! I can see their 
re-enforcements! All is lost! Is that. . . Is that snow. . . We're so dead!"
                [/message]
@@ -228,7 +215,6 @@
                [/redraw]
 
                [message]
-                       id=msgT2_14
                        speaker=narrator
                        message= _ "SE - The River Road. SW - The Midlands."
                [/message]
@@ -248,7 +234,6 @@
                [/redraw]
 
                [message]
-                       id=msgT2_15
                        speaker=narrator
                        message= _ "GO HOME! AIN'T NUTTIN TO SEE HEER!"
                [/message]
@@ -258,22 +243,18 @@
 
 #define ESCAPE_VICTORY
                [message]
-                       id=msgT2_15a
                        description=Prince Haldric
                        message= _ "Now, should I go South-East on the River 
Road, or South-West through the midlands? The River Road crosses the Swamp of 
Esten, so I doubt that even Orcs would go there. The Midlands were nice, but 
who knows what's going on there now."
                        
                        [option]
-                               id=river_road
                                message= _ "I think I'll take the River Road. . 
."
                                [command]
                                        [message]
-                                               id=msgT2_16a
                                                description=Lady Outlaw
                                                message= _ "Good. The Midlands 
are probably an Orc infested ruin by now."
                                        [/message]
                
                                        [message]
-                                               id=msgT2_16b
                                                speaker=Burin the Lost
                                                message= _ "SWAMP! I'm under 5 
feet tall, and I don't float! Argh, have it your way."
                                        [/message]
@@ -285,17 +266,14 @@
                                [/command]
                        [/option]
                        [option]
-                               id=midlands
                                message= _ "We'll go through the Midlands. . ."
                                [command]
                                        [message]
-                                               id=msgT2_16c
                                                description=Lady Outlaw
                                                message= _ "I suspect that the 
Midlands might be in ruins by now."
                                        [/message]
                
                                        [message]
-                                               id=msgT2_16d
                                                speaker=Burin the Lost
                                                message= _ "It's better than 
the swamp, I'm under 5 feet tall, and I don't float! Besides, I'd rather enjoy 
meeting more orcs."
                                        [/message]
@@ -354,17 +332,14 @@
 
 #endif
                                [message]
-                                       id=msgT2_17
                                        speaker=Tan-NauVong
                                        message= _ "Come and get it!"
                                [/message]
                                [message]
-                                       id=msgT2_18
                                        speaker=Hashnak
                                        message= _ "Die human."
                                [/message]
                                [message]
-                                       id=msgT2_19
                                        speaker=Prince Haldric
                                        message= _ "Uh-oh!"
                                [/message]
@@ -417,17 +392,14 @@
                                {UNIT (Orcish Assassin) (Vigdish) 2 26 40}
 #endif
                                [message]
-                                       id=msgT2_20
                                        speaker=Tan-Schmog
                                        message= _ "I'll not go so easily!"
                                [/message]
                                [message]
-                                       id=msgT2_21
                                        speaker=Hashnak
                                        message= _ "Die human."
                                [/message]
                                [message]
-                                       id=msgT2_22
                                        speaker=Prince Haldric
                                        message= _ "Uh-oh!"
                                [/message]
@@ -438,12 +410,10 @@
        [event]
                name=victory
                [message]
-                       id=msgT2_23
                        speaker=Prince Haldric
                        message= _ "We've escaped the pass. Well, at least I 
know that the orcs can be beaten. Hmmm, I guess that this is the last I'll see 
of my home. . . and my Father. (Sigh)"
                [/message]
                [message]
-                       id=msgT2_24
                        speaker=Prince Haldric
                        message= _ "We should make our way to Southbay. It is 
the largest city on the Isle. We should be able to make a stand there. Failing 
that, there's always Clearwater Port."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.16 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.17
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg:1.16      Wed Dec 
22 02:26:54 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg   Sun Jan  9 
21:35:46 2005
@@ -101,42 +101,35 @@
                        y=39
                [/hide_unit]
        [/event]
-       
+
        [event]
                name=start
 
                [message]
-                       id=msgT14_1
                        speaker=narrator
                        message= _ "At last the distant shores of a great 
continent are spotted. The time for landfall has arrived."
                [/message]
                [message]
-                       id=msgT14_2
                        description=Glimir
                        message= _ "Go home you vile dwarves! By treaty you are 
pledged to only the hills and mountains to the North of the Great River. This 
is not your land."
                [/message]
                [message]
-                       id=msgT14_3
                        description=Dursil
                        message= _ "Our lands are become full, and our mines go 
to the bottom of the world. We have won our war against those things that live 
in the dark. By what right do you claim all of the forests of the world, and 
ALL of the land South of the Great River, and force us onto only the hills and 
mountans of the North? There are hills and mountains as good as any here in the 
South!"
                [/message]
                [message]
-                       id=msgT14_4
                        description=Glimir
                        message= _ "By the right of treaty, ancient but still 
true- "
                [/message]
                [message]
-                       id=msgT14_5
                        description=Dursil
                        message= _ "Hmph! You nany-pamby elves: 'We don't cut 
the trees we groom the forest.' Our axes can get the wood for a fifth of the 
cost! I can charge half of what your people do, and still be rich, and I'm not 
the first to have the thought!"
                [/message]
                [message]
-                       id=msgT14_6
                        description=Glimir
                        message= _ "Wait, I see a ship. Many ships. We're being 
invaded!"
                [/message]
                [message]
-                       id=msgT14_7
                        description=Dursil
                        message= _ "Umm, we're being invaded? Okay, we'll sort 
out our differences later. Let's get them first."
                [/message]
@@ -198,27 +191,22 @@
 #              [/teleport]
 
                [message]
-                       id=msgT14_8
                        description=Prince Haldric
                        message= _ "We come in Peace. May our peoples-"
                [/message]
                [message]
-                       id=msgT14_9
                        description=Dursil
                        message= _ "Get them!"
                [/message]
                [message]
-                       id=msgT14_10
                        description=Lady Jessica
                        message= _ "Gee, and you were practising that speech 
for days. I guess that's it for diplomacy then. Haldric, we should avoid 
calling upon too many units, and avoid fighting them. There has to be a 
peaceful resolution to this."
                [/message]
                [message]
-                       id=msgT14_11
                        description=Burin the Lost
                        message= _ "In the name of. . . This is the continent 
of my home. But I set out East. I must have travelled clear around the world."
                [/message]
                [message]
-                       id=msgT14_12
                        description=Burin the Lost
                        message= _ "My people are too far South. I don't know 
what's going on here. I'll stick with you until the end. You've been a good 
friend. Just no more sea voyages."
                [/message]
@@ -236,50 +224,41 @@
                {UNIT (Elvish Shyde) (Lord Dionli) 2 28 7}
 
                [message]
-                       id=msgT14_13
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "What? What's going on here? Dwarves? 
Humans? Ships? Glimir tell me."
                [/message]
                [message]
-                       id=msgT14_14
                        description=Glimir
                        message= _ "The stories are true. There must be dwarven 
colonists in the Brown Hills. We caught this band chopping wood near the bay. 
Then we saw lots of ships. Not like before, with that fellow from Southbay and 
his lone ship. It was always interesting when he stopped by."
                [/message]
                [message]
-                       id=msgT14_15
                        description=Glimir
                        message= _ "We thought we were being invaded. We, erm, 
put our differences aside with the dwarves, for the moment, and decided to deal 
with this first."
                [/message]
                [message]
-                       id=msgT14_16
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "These are disturbing trends. Human, it is 
by luck alone that I am here to spare you. For on this day the Council of Lords 
is meeting in a forest not far from here."
                [/message]
                [message]
-                       id=msgT14_17
                        description=Prince Haldric
                        message= _ "I am Prince Haldric. We come in Peace. May 
our peoples-"
                [/message]
                [message]
-                       id=msgT14_18
                        description=Lady Jessica
                        message= _ "Haldric."
                [/message]
                [message]
-                       id=msgT14_19
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "As for you dwarf, return to the Brown 
Hills. Then tell your people to prepare to return to the North."
                [/message]
                [message]
-                       id=msgT14_20
                        description=Dursil
                        message= _ "I'll return to the hills, but I can't 
promise that my people will go. Hmph!"
                [/message]
                [message]
-                       id=msgT14_21
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "Haldric is it? You are their leader? You 
and your advisers are to come with me. It will be safe for your passengers to 
disembark here."
@@ -304,14 +283,12 @@
                [/move_unit_fake]
 
                [message]
-                       id=msgT14_22
                        description=Lady Jessica
                        message= _ "(Whisper) Maybe it'd be best if you didn't 
mention our little friend following us. . ."
                [/message]
 
 #ifdef EASY
                [message]
-                       id=msgT14_23a
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "I must return to my people. You have kept 
your word, you may avail of my services in the future. The services of my 
people will remain at your disposal."
@@ -323,7 +300,6 @@
                [/disallow_recruit]
 
                [message]
-                       id=msgT14_23b
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "I must return to my people. My warriors 
that fought by your side wish to remain with you. You have kept your word, you 
may avail of my services in the future."
@@ -335,17 +311,14 @@
                [/kill]
 
                [message]
-                       id=msgT14_24
                        description=Prince Haldric
                        message= _ "May the currents carry you swiftly my 
friend. (Whisper) Jessica, send word that a third of the fleet is to return to 
the Green Isle, to look for more survivors. If they return tell them to keep 
returning until no more survivors are found."
                [/message]
                [message]
-                       id=msgT14_25
                        description=Prince Haldric
                        message= _ "(Still Whispering) Man the ships with 
skeleton crews, and give them the remaining supplies. Pass the word to Lord 
Typhon. Make sure than no more than a third of the fleet is sent. We can't 
provide the Orcs with a ready made fleet. Make haste, return before it is time 
to meet with these, what are they? Ahhh, Elves."
                [/message]
                [message]
-                       id=msgT14_26
                        description=Prince Haldric
                        message= _ "This is the second Eldaric I get to say 
goodbye to. At least this time it is easier than the first."
                [/message]
@@ -390,7 +363,6 @@
        [event]
        name=turn 3
                [message]
-                       id=msgT14_27
                        description=Lady Jessica
                        message= _ "I bet this wasn't the welcome you were 
expecting."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.18 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.19
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg:1.18      
Mon Nov 22 21:58:20 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg   Sun Jan 
 9 21:35:46 2005
@@ -84,56 +84,47 @@
                        time=1500
                [/delay]
                [message]
-                       id=msgT17_1
                        description=Lord Logalmier
                        image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                        message= _ "So a doom has followed them here from their 
old home. My Outriders have reported that Orcs have made landfall. Orcs here, 
for the first time in centuries."
                [/message]
                [message]
-                       id=msgT17_2
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "And he bears an artifact of some power. The 
Orcs would not be able to sense that. There is some greater power at work here."
                [/message]
                [message]
-                       id=msgT17_3
                        description=Lord Aryad
                        image="portraits/The_Rise_of_Wesnoth/aryad.png"
                        message= _ "We may have decided wrong. If the humans 
drive the Orcs off we should honour our pledge. If more trouble follows them 
here we should let them fight it out, then we should 'deal' with the survivors, 
and make compromise with the Dwarves."
                [/message]
                [message]
-                       id=msgT17_4
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "But we spoke a Pact with this Haldric and 
these men of the West North-"
                [/message]
                [message]
-                       id=msgT17_5
                        description=Lord Logalmier
                        image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                        message= _ "We are the people of the forest, you know 
that all words spoken to these un-people are of secondary importance to our own 
needs. As Lord Aryad said, 'If more trouble follows them here we should let 
them fight it out, then we should 'deal' with the survivors, and make 
compromise with the Dwarves.'"
                [/message]
                [message]
-                       id=msgT17_6
                        description=Lord El'Isomithir
                        image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                        message= _ "Agreed."
                [/message]
                [message]
-                       id=msgT17_7
                        description=Lord Dionli
                        image="portraits/The_Rise_of_Wesnoth/dionli.png"
                        message= _ "(Sigh) Agreed."
                [/message]
                [message]
-                       id=msgT17_8
                        description=Lord Logalmier
                        image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                        message= _ "Agreed."
                [/message]
 
                [message]
-                       id=msgT17_9
                        description=Jessica in Hiding
                        message= _ "(Whispering) Some friends. I must tell 
Haldric."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.14 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.15
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg:1.14      
Sun Nov  7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg   Sun Jan 
 9 21:35:46 2005
@@ -6,7 +6,6 @@
        turns=28
        {scenarios/The_Rise_of_Wesnoth/trow-intro.cfg}
 
-
        {DAWN}
        {MORNING}
        {AFTERNOON}
@@ -84,107 +83,89 @@
        [event]
        name=start
                [message]
-                       id=msgT0_1
                        speaker=narrator
                        message= _ "The trouble seems to have finally reached 
to the heart of the Isle, to the isolated lands of King Eldaric IV."
                [/message]
                [message]
-                       id=msgT0_2
                        description=King Eldaric IV
                        message= _ "It looks like an Wesfolk rabble have seized 
the Northern Keep! Prepare for battle Haldric!"
                [/message]
                [message]
-                       id=msgT0_3
                        description=Prince Haldric
                        message= _ "Father, I am of age, may I lead our forces 
in battle?"
                [/message]
                [message]
-                       id=msgT0_4
                        description=King Eldaric IV
                        message= _ "You're showing initiative son! I'm proud of 
you! You may lead our forces to battle, but I'll stay near to keep an eye on 
you."
                [/message]
                [message]
-                       id=msgT0_5
                        description=Prince Haldric
                        message= _ "Onward to victory!"
                [/message]
                [message]
-                       id=msgT0_6
                        description=Wesfolk Leader
                        message= _ "Look a little prince-ling, and his merry 
men! We'll teach you a lesson for what your kind did to us!"
                [/message]
        [/event]
-       
+
        [event]
        name=turn 5
                [message]
-                       id=msgT0_7
                        description=King Eldaric IV
                        message= _ "Don't forget about some of the more 
isolated the villages, we'll need the gold!"
                [/message]
        [/event]
-       
+
        [event]
        name=turn 20
                [message]
-                       id=msgT0_8
                        description=King Eldaric IV
                        message= _ "Make haste Son! We must win before the 
summer crop is in ruin."
                [/message]
        [/event]
-       
+
        [event]
-        name=die
+       name=die
                [filter]
                description=Wesfolk Leader
                [/filter]
                [message]
-                       id=msgT0_9
                        speaker=unit
                        message= _ "I evoke surrender! Don't kill me. . ."
                [/message]
                [message]
-                       id=msgT0_10
                        description=Prince Haldric
                        message= _ "Why have you come to trouble our lands?"
                [/message]
                [message]
-                       id=msgT0_11
                        speaker=unit
                        message= _ "Trouble your lands! Bah! Your fool Prince 
of Southbay has attacked our lands. The Lich-Lords had no choice. . . They 
opened a gate. . . and. . ."
                [/message]
                [message]
-                       id=msgT0_12
                        description=King Eldaric IV
                        message= _ "And what?"
                [/message]
                [message]
-                       id=msgT0_13
                        speaker=unit
                        message= _ "They pledged to visit all of the terrors of 
the hells upon this Isle. They built a great stone gate to the heart of the 
homeland of the Orcs in the distant West! Now even us Wesfolk must flee or be 
slaves."
                [/message]
                [message]
-                       id=msgT0_14
                        description=Prince Haldric
                        message= _ "Orcs are just creatures of tall tales!"
                [/message]
                [message]
-                       id=msgT0_15
                        speaker=unit
                        message= _ "You've been on this Isle too long. I assure 
you that orcs exist. By now there are probably a half dozen gates to the orcish 
homeland. There is no hope."
                [/message]
                [message]
-                       id=msgT0_16
                        description=King Eldaric IV
                        message= _ "We must prepare the defences! Haldric, stay 
at the keep, I must go and fortify our frontier."
                [/message]
                [message]
-                       id=msgT0_17
                        speaker=unit
                        message= _ "My forces are defeated, under your customs 
of surrender I will go now."
                [/message]
                [message]
-                       id=msgT0_18
                        description=King Eldaric IV
                        message= _ "You may go. See to it that you trouble us 
no more, for the custom states that you may evoke surrender but once. If we 
meet again, I won't be so merciful."
                [/message]
@@ -194,16 +175,14 @@
                        bonus=yes
                [/endlevel]
        [/event]
-       
+
        [event]
        name=time over
                [message]
-                       id=msgT0_19
                        description=King Eldaric IV
                        message= _ "We have run out of time. . . The crops 
shall spoil, we'll starve!"
                [/message]
        [/event]
-               
 
        [event]
        name=die
@@ -211,22 +190,20 @@
                description=Prince Haldric
                [/filter_second]
                [message]
-                       id=msgT0_20
                        speaker=second_unit
                        message= _ "Die Wesfolk Scum!"
                [/message]
        [/event]
-       
+
        [event]
        name=attack
                [filter]
                description=Prince Haldric
                [/filter]
                [message]
-                       id=msgT0_21
                        description=Prince Haldric
                        message= _ "Feel my wrath you fiend!"
                [/message]
        [/event]
-       
+
 [/scenario]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.30 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.31
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg:1.30 Wed Dec 
22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg      Sun Jan 
 9 21:35:46 2005
@@ -237,102 +237,86 @@
                {UNIT (Peasant) (Angry Farmer) 2 29 22}
        [/event]
 
-       
        [event]
        name=start
                [message]
-                       id=msgT7_1
                        speaker=narrator
                        message= _ "Our Prince has managed to make it to 
Clearwater Port, with the Orcs on his heels. While the Orcs haven't caught up 
with him yet, the winter snow has, and the Ships seem to be missing from the 
port."
                [/message]
-               
+
                [message]
-                       id=msgT7_2
                        speaker=Sir Ruddry
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Ha! Clearwater Port still stands!"
                [/message]
-               
+
                [message]
-                       id=msgT7_3
                        speaker=Prince Haldric
                        message= _ "Lieutenant, who is in command here? And 
where are the ships? We risk being trapped in this city for the winter if the 
port freezes over."
                [/message]
-               
+
                [message]
-                       id=msgT7_4
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "I am, my Lord, I command the local 
garrison. Our whole fishing fleet is evacuating people to Southbay as we speak. 
The ships should be back in a few days. Our forces engaged the Orcs as they 
exited the Swamp of Esten, we even pushed them back into the swamp!"
                [/message]
-               
+
                [message]
-                       id=msgT7_5
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Unfortunately, it was only a feint and orc 
reinforcements quickly overran our positions. We lost most of our forces, my 
lord, including the King of Clearwater, who was bravely leading the charge."
                [/message]
-               
+
                [message]
-                       id=msgT7_6
                        speaker=Prince Haldric
                        message= _ "That's horrible!"
                [/message]
-               
+
                [message]
-                       id=msgT7_7
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "The blood of many good soldiers stained the 
frozen field that day. And still they press on. The king left no heir, but the 
other nobles have fled to Southbay. We've been busy evacuating the rest of the 
populace. The army bought us enough time to evacuate almost all our people, and 
most of the winter stores. They've gone to Southbay, apparently the city is 
brimming with refugees from all over."
                [/message]
-               
+
                [message]
-                       id=msgT7_8
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "We're only holding the city until the last 
of the refugees are gone. You, my lord, are free to retreat to safety when the 
next ship comes. But, if I may be frank my lord, our defenses are stretched 
thin and we could use all the help we can get to hold our walls. Otherwise I 
fear that we will be overrun before the last of the people can be evacuated"
                [/message]
-               
+
                [message]
-                       id=msgT7_9
                        speaker=Prince Haldric
                        message= _ "Well, we are the last of the refugees from 
our lands, for the Orcs are right on our heels! We have Wesfolk with us, they 
have been of service, they are to be evacuated as well. We have traveled far 
and bear many wounded, but we will help you defend these walls as long as we 
can."
                [/message]
-               
+
                [message]
-                       id=msgT7_10
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "I thank you, my lord. But we are to bring 
these Wesfolk too? It would be...highly irregular. Are you sure, my lord?"
                [/message]
-               
+
                [message]
-                       id=msgT7_11
                        speaker=Prince Haldric
                        message= _ "Yes. Be sure that it is understood that 
these are our friends."
                [/message]
-               
+
                [message]
-                       id=msgT7_12
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Yes Sir!"
                [/message]
-               
+
                [message]
-                       id=msgT7_13
                        speaker=Lady Jessica
                        message= _ "Yes Sir, indeed! You need us to help hold 
out until the ships arrive."
                [/message]
-               
+
                [message]
-                       id=msgT7_14
                        speaker=Burin the Lost
                        message= _ "Ships! Nobody said anything about ships. 
Will this torture ever end! Ahhh, the Orcs will help take my mind off things."
                [/message]
 
                [message]
-                       id=msgT7_15
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "To your posts men! We should be able to 
evacuate everyone in three more boat loads. Until then, let us make those orcs 
pay dearly for every inch of our land. For our homes, for our people, for our 
fallen King!"
@@ -346,7 +330,6 @@
                description=Angry Farmer
                [/filter]
                [message]
-                       id=msgT7_16
                        speaker=Angry Farmer
                        message= _ "You killed my family! Die!"
                [/message]
@@ -358,7 +341,6 @@
                description=Lady Jessica
                [/filter]
                [message]
-                       id=msgT7_17
                        speaker=Lady Jessica
                        message= _ "'But they're Wesfolk.' Bah!"
                [/message]
@@ -367,7 +349,6 @@
        [event]
        name=turn 3
                [message]
-                       id=msgT7_18
                        description=Ut'Tan-Vrork
                        message= _ "Push 'em into the sea! They're in our 
winter homes! Oh, and Tan-Vragar, I hope they like your little surprise!"
                [/message]
@@ -405,7 +386,6 @@
                [/redraw]
 
                [message]
-                       id=msgT7_19
                        speaker=narrator
                        message= _ "On ode to ye, on 'yer way, I hope you have 
a brighter day!"
                [/message]
@@ -426,7 +406,6 @@
                [/redraw]
 
                [message]
-                       id=msgT7_20
                        speaker=narrator
                        message= _ "Deadman's Ford"
                [/message]
@@ -447,7 +426,6 @@
                [/redraw]
 
                [message]
-                       id=msgT7_21
                        speaker=narrator
                        message= _ "The River Road - To the Swamp of Esten."
                [/message]
@@ -468,7 +446,6 @@
                [/redraw]
 
                [message]
-                       id=msgT7_22
                        speaker=narrator
                        message= _ "Clearwater Port"
                [/message]
@@ -636,12 +613,11 @@
                        x=40,39,39,39,38,37,36,35,34,33,32,31,30,30,30
                        y=14,14,13,12,11,11,10,11,11,12,12,13,13,14,15
                [/move_unit_fake]
-               
+
                {PUT_IMG (pirate-galleon.png) 30 15}
                {PUT_IMG (items/gohere.png) 31 16}
-               
+
                [message]
-                       id=msgT7_23
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My lord, the first ship has arrived! Prince 
Haldric, if you and your men must leave for Southbay just go to the pier to 
board the ship."
@@ -651,7 +627,7 @@
                        value=1
                [/set_variable]
        [/event]
-       
+
        [event]
        name=turn 18
 #              {PUT_IMG (terrain/pier.png) 31 16}
@@ -661,7 +637,6 @@
                [/removeitem]
 
                [message]
-                       id=msgT7_24
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My lord, the first ship is departing. But 
the second ship should arrive shortly."
@@ -680,7 +655,7 @@
                [/move_unit_fake]
                {CLEAR_VARIABLE First_Ship}
        [/event]
-       
+
                #Second Ship
        [event]
        name=turn 20
@@ -689,12 +664,11 @@
                        x=40,39,39,39,38,37,36,35,34,33,32,31,31
                        y=14,14,13,12,11,11,10,11,11,12,12,13,14
                [/move_unit_fake]
-               
+
                {PUT_IMG (pirate-galleon.png) 31 14}
                {PUT_IMG (items/gohere.png) 32 14}
-               
+
                [message]
-                       id=msgT7_25
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My lord, the second ship has arrived! 
Prince Haldric, if you and your men want to leave for Southbay just go to the 
pier to board the ship."
@@ -704,7 +678,7 @@
                        value=1
                [/set_variable]
        [/event]
-       
+
        [event]
        name=turn 24
        
@@ -715,7 +689,6 @@
                [/removeitem]
 
                [message]
-                       id=msgT7_26
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My lord, the second ship is departing. But 
the last ship will be here before long. With your help we can hold on just a 
while longer"
@@ -726,7 +699,7 @@
                        x=31
                        y=14
                [/removeitem]
-               
+
                [move_unit_fake]
                        type=Transport Galleon
                        x=31,31,32,33,34,35,36,37,38,39,39,39,40
@@ -743,12 +716,11 @@
                        x=40,39,39,39,38,37,36,35,34,33,32,31,30,30,29,28
                        y=14,14,13,12,11,11,10,11,11,12,12,13,13,14,15,15
                [/move_unit_fake]
-               
+
                {PUT_IMG (pirate-galleon.png) 28 15}
                {PUT_IMG (items/gohere.png) 29 16}
-               
+
                [message]
-                       id=msgT7_27
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My lord, the last ship has arrived! Finally 
the last of our people can flee to safety. Prince Haldric, you and your men 
must go now! Go to the pier to board the ship for Southbay."
@@ -758,7 +730,7 @@
                        value=1
                [/set_variable]
        [/event]
-       
+
        [event]
        name=turn 30
        
@@ -769,7 +741,6 @@
                [/removeitem]
 
                [message]
-                       id=msgT7_28
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My lord, the last ship is departing. We're 
Trapped!"
@@ -827,7 +798,6 @@
                        [/then]
                        [else]
                                [message]
-                                       id=msgT7_29
                                        speaker=Lieutenant Aethyr
                                        
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                        message= _ "My lord, the ship isn't 
here yet. Come help us defend against the orcs"
@@ -842,7 +812,6 @@
 
                [else]
                        [message]
-                               id=msgT7_30
                                speaker=Lieutenant Aethyr
                                image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                message= _ "Shirk not your duty soldier. When 
the boat arrives, this is where Prince Haldric must go to lead you to the ship. 
Until then, help us defend against the orcs."
@@ -885,7 +854,6 @@
                        [/then]
                        [else]
                                [message]
-                                       id=msgT7_31
                                        speaker=Lieutenant Aethyr
                                        
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                        message= _ "My lord, the ship isn't 
here yet. Come help us defend against the orcs"
@@ -897,10 +865,9 @@
                        [/if]
                
                [/then]
-                                       
+
                [else]
                        [message]
-                               id=msgT7_32
                                speaker=narrator
                                message= _ "Shirk not your duty soldier. When 
the boat arrives, this is where Prince Haldric must go to lead you to the ship. 
Until then, help us defend against the orcs."
                        [/message]
@@ -926,7 +893,7 @@
                        x=29
                        y=16
                [/have_unit]
-                                       
+
                [then]
                        [if]
                                [variable]
@@ -942,7 +909,6 @@
                        [/then]
                        [else]
                                [message]
-                                       id=msgT7_33
                                        speaker=Lieutenant Aethyr
                                        
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                        message= _ "My lord, the ship isn't 
here yet. Come help us defend against the orcs"
@@ -957,7 +923,6 @@
 
                [else]
                        [message]
-                               id=msgT7_34
                                speaker=narrator
                                message= _ "Shirk not your duty soldier. When 
the boat arrives, this is where Prince Haldric must go to lead you to the ship. 
Until then, help us defend against the orcs."
                        [/message]
@@ -974,20 +939,18 @@
                [filter]
                        description=Lieutenant Aethyr
                [/filter]
-               
+
                [message]
-                       id=msgT7_35
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Let me have peace in Death! My love, I'll 
be there soo-"
                [/message]
-               
+
                [message]
-                       id=msgT7_36
                        speaker=Prince Haldric
                        message= _ "We needed him to get out of here. We're 
Trapped!"
                [/message]
-               
+
                [endlevel]
                        result=defeat
                        bonus=no
@@ -997,94 +960,81 @@
        [event]
                name=victory
                [message]
-                       id=msgT7_37
                        speaker=Prince Haldric
                        message= _ "We've escaped from the orcs before we were 
trapped by the ice! Now, on to Southbay."
                [/message]
-               
+
                [message]
-                       id=msgT7_38
                        speaker=Burin the Lost
                        message= _ "I know I mentioned I can't float."
                [/message]
-               
+
                [message]
-                       id=msgT7_39
                        speaker=Lady Jessica
                        message= _ "Might I suggest a bit of a detour?"
                [/message]
-               
+
                [message]
-                       id=msgT7_40
                        speaker=Prince Haldric
                        message= _ "Why?"
                [/message]
-               
+
                [message]
-                       id=msgT7_41
                        speaker=Lady Jessica
                        message= _ "You have the Ruby of Fire, but you have no 
idea what it does, correct? You know that Lich you have petrified just outside 
of Southbay-"
                [/message]
-               
+
                [message]
-                       id=msgT7_42
                        speaker=Prince Haldric
                        message= _ "Yeah, Lich Point! Where we first used our 
mages in battle, and turned the tide of war against your people."
                [/message]
-               
+
                [message]
-                       id=msgT7_43
                        speaker=Lady Jessica
                        message= _ "Erm, yeah. . . He was the arch rival of our 
dearly departed Lich-Lord Lenvan. He coveted the ruby, and was studying it. The 
only copy of his notes got petrified along with him."
                [/message]
-               
+
                [message]
-                       id=msgT7_44
                        speaker=Prince Haldric
                        message= _ "If we make landfall outside of Southbay, 
we'll be trapped. Of that I am sure!"
                [/message]
-               
+
                [message]
-                       id=msgT7_45
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My family was from Southbay, my father was 
a soldier there. The city's sewer entrance is near that fossil of a Lich."
                [/message]
-               
+
                [message]
-                       id=msgT7_46
                        speaker=Prince Haldric
                        message= _ "Wow, this is beginning to sound dangerously 
like a plan. Lieutenant Aethyr will you join us?"
                [/message]
-               
+
                [message]
-                       id=msgT7_47
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "No. These monsters killed my family. My 
wife, my daughters. There is nothing left for me. I'll stay, by the time the 
Orcs wrestle Clearwater Port away from me there'll be nothing but rubble left!"
                [/message]
-               
+
                [message]
-                       id=msgT7_48
                        speaker=Lieutenant Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "The peasant farmers seem to like you. Who 
knows, maybe they'll be of some help."
                [/message]
-               
+
                [message]
-                       id=msgT7_49
                        speaker=Prince Haldric
                        message= _ "Resources are scarce, we need all of the 
help we can get. Be brave and fight hard my friend!"
                [/message]
-               
+
                [allow_recruit]
                        type=Peasant
                [/allow_recruit]
-               
+
                {CLEAR_VARIABLE First_Ship}
                {CLEAR_VARIABLE Second_Ship}
                {CLEAR_VARIABLE Third_Ship}
-               
+
        [/event]
        
        [event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.18 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.19
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg:1.18     Fri Dec 
24 05:04:21 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg  Sun Jan  9 
21:35:46 2005
@@ -152,7 +152,6 @@
                        y={Y}
                [/filter]
                [message]
-                       id=msgT16d_1
                        speaker=unit
                        message= _ "She's. . . She's beautiful."
                [/message]
@@ -191,22 +190,18 @@
 #endif
 
                [message]
-                       id=msgT16d_2
                        speaker=Midnight Queen
                        message= _ "You will be made to serve. . . Come admire 
me. Feel my love."
                [/message]
                [message]
-                       id=msgT16d_3
                        speaker=Prince Haldric
                        message= _ "She is so. . ."
                [/message]
                [message]
-                       id=msgT16d_4
                        speaker=Lady Jessica
                        message= _ "Haldric think with your brain!"
                [/message]
                [message]
-                       id=msgT16d_5
                        speaker=Prince Haldric
                        message= _ "Get her before she can cause too much 
trouble!"
                [/message]
@@ -228,7 +223,6 @@
                        y={Y}
                [/filter]
                [message]
-                       id=msgT16d_6
                        speaker=unit
                        message= _ "The temple is quite empty."
                [/message]
@@ -328,31 +322,26 @@
        [event]
                name=start
                [message]
-                       id=msgT16d_7
                        speaker=narrator
                        message= _ "After a short trip by sea Haldric arrives 
on the Elves' cursed isle. A fog hangs in the air."
                [/message]
-               
+
                [message]
-                       id=msgT16d_8
                        description=Burin the Lost
                        message= _ "I said no more ships. Double crossing 
humans! Ahhh, I've been with you this far. Who'd of though, a nautical dwarf."
                [/message]
-               
+
                [message]
-                       id=msgT16d_9
                        description=Prince Haldric
                        message= _ "I suspect we'll be facing more undead. Be 
careful."
                [/message]
-               
+
                [message]
-                       id=msgT16d_10
                        description=Lady Jessica
                        message= _ "These will be the long dead. Not like the 
undead that my people used, and they are elf-dead. Be careful indeed."
                [/message]
-               
+
                [message]
-                       id=msgT16d_11
                        description=Minister Edmond
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "All Soldiers of Darkness will meet the same 
fate by my hand."
@@ -362,62 +351,57 @@
        [event]
                name=victory
                [message]
-                       id=msgT16d_12
                        description=Prince Haldric
                        message= _ "Those elves are finally at rest. I hope 
that the curses they laid upon us hold no weight."
                [/message]
-               
+
                [message]
-                       id=msgT16d_13
                        description=Lady Jessica
                        message= _ "Haldric, you're too paranoid."
                [/message]
-               
+
                {VARIABLE_OP num_done add 1}
-               
+
                [set_variable]
                        name=cursed_isle
                        value=1
                [/set_variable]
-               
+
                [set_variable]
                        name=last_done
                        value="Isle"
                [/set_variable]
-               
+
        [/event]
-       
+
        [event]
                name=die
                [filter]
                        description=Isorfilad
                [/filter]
                [message]
-                       id=msgT16d_14
                        description=Isorfilad
                        message= _ "I curse upon all of your kin that visit 
this isle."
                [/message]
        [/event]
-       
+
        [event]
                name=die
                [filter]
                        description=Tinoldor
                [/filter]
                [message]
-                       id=msgT16d_15
                        description=Tinoldor
                        message= _ "I wish a blight upon you and yours. May you 
never see peace."
                [/message]
        [/event]
-       
+
        [event]
                name=die
                [filter]
                        description=Midnight Queen
                [/filter]
                [message]
-                       id=msgT16d_16
                        description=Midnight Queen
                        message= _ "My soul will haunt this place until the end 
of time! A curse upon you!"
                [/message]
@@ -426,7 +410,6 @@
                        value=0
                [/set_variable]
                [message]
-                       id=msgT16d_17
                        description=Prince Haldric
                        message= _ "Without their Queen the undead are simply 
fading away!"
                [/message]
@@ -436,7 +419,7 @@
                        {CLEAR_VARIABLE queen_awake}
                [/endlevel]
        [/event]
-       
+
        [event]
        name=die
                [filter]
@@ -446,12 +429,11 @@
                        description=Minister Edmond
                [/filter_second]
                [message]
-                       id=msgT16d_18
                        speaker=second_unit
                        message= _ "Back, back to the grave with you!"
                [/message]
        [/event]
-       
+
        [event]
        name=enemies defeated
                [if]
@@ -461,7 +443,6 @@
                        [/variable]
                        [then]
                                [message]
-                                       id=msgT16d_19
                                        speaker=Lady Jessica
                                        message= _ "We still have to defeat 
that Vampire Queen!"
                                [/message]
@@ -476,11 +457,10 @@
                [/if]
                
        [/event]
-       
+
        [event]
                name=time over
                [message]
-                       id=msgT16d_20
                        description=Prince Haldric
                        message= _ "No! The ship that was supposed to pick us 
up sees that there's still fighting. It's not stopping. We're trapped."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.18 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.19
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg:1.18       Mon Nov 
22 21:58:20 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg    Sun Jan  9 
21:35:46 2005
@@ -50,53 +50,53 @@
                controller=human
                team_name=Haldric
        [/side]
-       
+
        [side]
                type=Elvish Shyde
                description=Lord Dionli
                side=2
                team_name=Elves
        [/side]
-       
+
        [side]
                type=Elvish Champion
                description=Lord Logalmier
                side=3
                team_name=Elves
        [/side]
-       
+
        [side]
                type=Elvish Sharpshooter
                description=Lord Aryad
                side=4
                team_name=Elves
        [/side]
-       
+
        [event]
        name=prestart
-       
+
                {PUT_IMG (items/pine2.png) 13 12}
 
                [recall]
                        description=Lady Jessica
                [/recall]
-               
+
                [recall]
                        description=Burin the Lost
                [/recall]
-               
+
                [recall]
                        description=Sir Ruddry
                [/recall]
-               
+
                [recall]
                        description=Sir Ladoc
                [/recall]
-               
+
                [recall]
                        description=Minister Edmond
                [/recall]
-               
+
                [teleport]
                        [filter]
                                description=Prince Haldric
@@ -104,7 +104,7 @@
                        x=13
                        y=21
                [/teleport]
-               
+
                [teleport]
                        [filter]
                                description=Lady Jessica
@@ -112,7 +112,7 @@
                        x=15
                        y=20
                [/teleport]
-               
+
                [teleport]
                        [filter]
                                description=Burin the Lost
@@ -120,7 +120,7 @@
                        x=11
                        y=21
                [/teleport]
-               
+
                [teleport]
                        [filter]
                                description=Sir Ruddry
@@ -128,7 +128,7 @@
                        x=12
                        y=21
                [/teleport]
-               
+
                [teleport]
                        [filter]
                                description=Sir Ladoc
@@ -136,7 +136,7 @@
                        x=12
                        y=21
                [/teleport]
-               
+
                [teleport]
                        [filter]
                                description=Minister Edmond
@@ -144,19 +144,17 @@
                        x=15
                        y=22
                [/teleport]
-               
+
                {UNIT (Elvish Marshal) (Lord El'Isomithir) 4 13 14}
-               
+
        [/event]
 
 #define DRAGON
                        [option]
-                               id=dragon_now
                                message= _ "I think I'll fight the Dragon!"
 
                                [command]
                                        [message]
-                                       id=msgT15_O1
                                        description=Prince Haldric
                                        message= _ "Lord Logalmier, I shall 
defeat your Dragon."
                                        [/message]
@@ -173,7 +171,6 @@
                                        [/then]
                                        [else]
                                                [message]
-                                                       id=msgT15_O1a
                                                        description=Lady Jessica
                                                        message= _ "Umm, you 
already beat the dragon Haldric."
                                                [/message]
@@ -185,12 +182,10 @@
 
 #define BEACH
                        [option]
-                               id=beach_now
                                message= _ "Let's get those Saurians and Nagas 
on that beach!"
 
                                [command]
                                        [message]
-                                       id=msgT15_O2
                                        description=Prince Haldric
                                        message= _ "Those cold blooded monsters 
will feel my wrath!"
                                        [/message]
@@ -207,7 +202,6 @@
                                        [/then]
                                        [else]
                                                [message]
-                                                       id=msgT15_O2a
                                                        description=Lady Jessica
                                                        message= _ "Umm, you 
already cleared the Beach."
                                                [/message]
@@ -216,15 +210,13 @@
                                [/command]
                        [/option]
 #enddef
-       
+
 #define HOLE
                        [option]
-                               id=hole_now
                                message= _ "Let's clear out that Troll Hole!"
 
                                [command]
                                        [message]
-                                       id=msgT15_O3
                                        description=Prince Haldric
                                        message= _ "So what exactly is a Troll?"
                                        [/message]
@@ -241,7 +233,6 @@
                                        [/then]
                                        [else]
                                                [message]
-                                                       id=msgT15_O3a
                                                        description=Lady Jessica
                                                        message= _ "Haldric, 
the Trolls, scales and fangs, you don't remember?"
                                                [/message]
@@ -253,12 +244,10 @@
 
 #define ISLE
                        [option]
-                               id=isle_now
                                message= _ "Let's put those Souls to rest on 
the Cursed Isle!"
 
                                [command]
                                        [message]
-                                       id=msgT15_O4
                                        description=Prince Haldric
                                        message= _ "Undead. Bah! We're pros at 
fighting them."
                                        [/message]
@@ -275,7 +264,6 @@
                                        [/then]
                                        [else]
                                                [message]
-                                                       id=msgT15_O4a
                                                        description=Lady Jessica
                                                        message= _ "How could 
you possibly forget that horror of an Island?"
                                                [/message]
@@ -287,7 +275,6 @@
 
 #define QUEST_CHOICES
                [message]
-                       id=msgT15_O4b
                        description=Prince Haldric
                        message= _ "In the name of Peace between our Peoples:"
                        {DRAGON}
@@ -305,14 +292,13 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_Q1
                                description=Lord Logalmier
                                
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                message= _ "I fear my kin are too easy on you. 
I decree that you should be made to fight the Dragon of the Green Swamp and its 
Saurian minions. If you can defeat him, you have truly earned you place in this 
land."
                        [/message]
                [/then]
        [/if]
-       
+
        [if]
                [variable]
                name=a_beach
@@ -320,14 +306,13 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_Q2
                                description=Lord Dionli
                                image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                message= _ "There are a group of Saurians, 
friends of the dragon I'm sure, who are trading metal with the Nagas of the 
sea. We should really put a stop to this. They are located on a beach near 
here."
                        [/message]
                [/then]
        [/if]
-       
+
        [if]
                [variable]
                name=troll_hole
@@ -335,14 +320,13 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_Q3
                                description=Lord Aryad
                                image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                message= _ "We are having a problem with a 
Troll Hole in the Brown Hills. While I find the though of those dwarves 
stumbling on the Trolls vaguely amusing, this should make an adequate quest for 
you."
                        [/message]
                [/then]
        [/if]
-       
+
        [if]
                [variable]
                name=cursed_isle
@@ -350,7 +334,6 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_Q4
                                description=Lord El'Isomithir
                                
image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                                message= _ "Long ago a clan of elves on an Isle 
fell under the sway of a dark curse. Their souls still haunt that place since 
no elf will go there. You should clear this isle, and put their souls to rest."
@@ -368,7 +351,6 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_G1
                                description=Lord Logalmier
                                
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                message= _ "Ahhh, you have defeated the dragon 
man of the West-North, you are truly impressive for a human."
@@ -382,7 +364,6 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_G2
                                description=Lord Aryad
                                image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                message= _ "So, you have defeated the Trolls. 
Welcome back Haldric."
@@ -396,7 +377,6 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_G3
                                description=Lord El'Isomithir
                                
image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                                message= _ "Finally the souls of our poor kin 
may rest. Thank you."
@@ -410,7 +390,6 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT15_G4
                                description=Lord Dionli
                                image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                message= _ "Our beaches are free again. I knew 
I could trust you Haldric."
@@ -422,142 +401,123 @@
        [event]
                name=start
                [message]
-                       id=msgT15_1
                        speaker=narrator
                        message= _ "Haldric and his companions find themselves 
before the Ka'lian, or the Council of Elven Lords."
                [/message]
-               
+
                [if]
                        [variable]
                        name=num_done
                        numerical_equals=0
                        [/variable]
-                       
+
                        [then]
                                [message]
-                                       id=msgT15_2
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "Dionli, why have you brough 
these humans before us?"
                                [/message]
                                [message]
-                                       id=msgT15_3
                                        description=Lord Dionli
                                        
image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                        message= _ "The are of the same people 
as the Prince of Southbay. They come as refugees. I can see a use for them."
                                [/message]
                                [message]
-                                       id=msgT15_4
                                        description=Lord Aryad
                                        
image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                        message= _ "What use would that be? 
What need could we have for the shortliveds here?"
                                [/message]
                                [message]
-                                       id=msgT15_5
                                        description=Lord Dionli
                                        
image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                        message= _ "The dwarves have come to 
the Brown Hills. While they live long, even they grow like weeds when in an 
empty field. There is trouble brewing."
                                [/message]
                                [message]
-                                       id=msgT15_6
                                        description=Lord Dionli
                                        
image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                        message= _ "It is better to be the 
greater of three than the lesser of two. The Prince of Southbay was good, he 
was a credit to his people, maybe these ones are made of the same stuff."
                                [/message]
                                [message]
-                                       id=msgT15_7
                                        description=Lord El'Isomithir
                                        
image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                                        message= _ "But why then do they come 
as refugees? Speak human."
                                [/message]
                                [message]
-                                       id=msgT15_8
                                        description=Prince Haldric
                                        message= _ "Our people come in peace. 
They was a war in our homeland. We are refugees. We come seeking a new home, 
since our island to the West and North is now forfit."
                                [/message]
                                [message]
-                                       id=msgT15_9
                                        description=Lord El'Isomithir
                                        
image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                                        message= _ "So you come to steal our 
land? We know your kind, humans of the West-North."
                                [/message]
                                [message]
-                                       id=msgT15_10
                                        description=Prince Haldric
                                        message= _ "We only wish to live in 
peace. The dwarves are peoples of mountain and hill, the elves are people of 
the forests, we only seek some of the space in between."
                                [/message]
                                [message]
-                                       id=msgT15_11
                                        description=Lord Dionli
                                        
image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                        message= _ "I suggest that we grant 
these humans the plains to the North and South of the great river."
                                [/message]
                                [message]
-                                       id=msgT15_12
                                        description=Lord Aryad
                                        
image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                        message= _ "They should be put to the 
test before such a grant is given."
                                [/message]
                                [message]
-                                       id=msgT15_13
                                        description=Lord El'Isomithir
                                        
image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                                        message= _ "A quest for each of us 
then?"
                                [/message]
                                [message]
-                                       id=msgT15_14
                                        description=Lord Dionli
                                        
image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                        message= _ "Agreed."
                                [/message]
                                [message]
-                                       id=msgT15_15
                                        description=Lord Aryad
                                        
image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                        message= _ "Agreed."
                                [/message]
                                [message]
-                                       id=msgT15_16
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "Agreed. (Sigh)"
                                [/message]
                                [message]
-                                       id=msgT15_17
                                        description=Prince Haldric
                                        message= _ "Umm, agreed."
                                [/message]
                                [message]
-                                       id=msgT15_18
                                        description=Lord Aryad
                                        
image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                        message= _ "Well then human. Each of us 
lords has a specific quest for you. If you complete them all you will be 
granted all of the plains in our domain and the hills south of the Great River, 
if not you will be forced to depart. So which quest do you wish to undertake 
first?"
                                [/message]
                                {QUESTS}
-                               
+
                                #will have to use a [do] here if the future 
choices. . .
                                {QUEST_CHOICES}
                        [/then]
                [/if]
-               
+
                [if]
                        [variable]
                        name=num_done
                        numerical_equals=1
                        [/variable]
-                       
+
                        [then]
                                {GREET}
-                               
+
                                [message]
-                                       id=msgT15_19
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "Very good, but this is just 
the start human. There is still much more for you to do."
                                [/message]
-                               
+
                                {QUESTS}
-                               
+
                                [while]
                                [variable]
                                        less_than=4
@@ -569,25 +529,24 @@
                                [/while]
                        [/then]
                [/if]
-               
+
                [if]
                        [variable]
                        name=num_done
                        numerical_equals=2
                        [/variable]
-                       
+
                        [then]
                                {GREET}
-                               
+
                                [message]
-                                       id=msgT15_20
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "You are victorious again. 
You may yet earn your place in this land."
                                [/message]
-                               
+
                                {QUESTS}
-                               
+
                                [while]
                                [variable]
                                        less_than=4
@@ -599,25 +558,24 @@
                                [/while]
                        [/then]
                [/if]
-               
+
                [if]
                        [variable]
                        name=num_done
                        numerical_equals=3
                        [/variable]
-                       
+
                        [then]
                                {GREET}
-                               
+
                                [message]
-                                       id=msgT15_21
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "Ahhh, my young Prince, 
you're not as soft as I thought."
                                [/message]
-                               
+
                                {QUESTS}
-                               
+
                                [while]
                                [variable]
                                        less_than=4
@@ -629,7 +587,7 @@
                                [/while]
                        [/then]
                [/if]
-               
+
                [if]
                        [variable]
                        name=num_done
@@ -637,96 +595,84 @@
                        [/variable]
                        [then]
                        {GREET}
-                       
+
                                [message]
-                                       id=msgT15_22
                                        description=Lord Dionli
                                        
image="portraits/The_Rise_of_Wesnoth/dionli.png"
                                        message= _ "You were successful Prince 
Haldric. I knew you could do it."
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_23
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "Man of the West-North you 
have earned your place on this great continent."
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_24
                                        description=Lord Aryad
                                        
image="portraits/The_Rise_of_Wesnoth/aryad.png"
                                        message= _ "As per our agreement, you 
and your people-"
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_25
                                        description=Lord El'Isomithir
                                        
image="portraits/The_Rise_of_Wesnoth/isomithir.png"
                                        message= _ "may stay."
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_26
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "We hereby grant you the 
plains to the North of the Great River, and the plains and hills to the South 
of the Great River. Be kind to the land. In a time of need we may call upon 
you, remember our generosity."
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_27
                                        description=Prince Haldric
                                        message= _ "Fair enough. I decree a 
'Pact of Mutual Aid' between our peoples. But, aren't you setting us in 
conflict with the Dwarves?"
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_28
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "No. The dwarves have 
returned to the North. But humans mine as well. No? They are your resources to 
guard now. In the future we would be willing to trade with you."
                                [/message]
-                               
+
                                [move_unit_fake]
                                        type=Lieutenant
                                        x=20,20,19
                                        y=25,24,24
                                [/move_unit_fake]
-                               
+
                                {HERO (Lieutenant) (Lt. Aethyr) 1 19 24}
-                               
+
                                [message]
-                                       id=msgT15_29
                                        description=Lord Logalmier
                                        
image="portraits/The_Rise_of_Wesnoth/logalmier.png"
                                        message= _ "Who is this?"
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_30
                                        description=Prince Haldric
                                        message= _ "It's Lieutenant Aethyr, of 
Clearwater Port. I was sure you perished in the fighting there?"
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_31
                                        description=Lt. Aethyr
                                        
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                        message= _ "No Sir. I was leading the 
final survivors of Clearwater Port, we were making our last stand at the 
lighthouse, then one of your ships came. One of my men conked me on the head, 
then I woke up at sea."
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_32
                                        description=Lt. Aethyr
                                        
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                        message= _ "I come bearing news. Some 
'old friends' have decided to make an appearance. You should go 'greet' them."
                                [/message]
-                               
+
                                [message]
-                                       id=msgT15_33
                                        description=Lady Jessica
                                        message= _ "(Whispering) I fear our 
friend has said too much. You go on ahead, I'll catch up with you."
                                [/message]
-                               
+
                                {CLEAR_VARIABLE num_done}
                                {CLEAR_VARIABLE a_beach}
                                {CLEAR_VARIABLE cursed_isle}
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.8 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.9
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg:1.8 Thu Nov 18 
00:46:07 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg     Sun Jan  9 
21:35:46 2005
@@ -142,17 +142,15 @@
                [/delay]
 
                [message]
-                       id=msgT22_1
                        description=Minister Edmond
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "May Lieutenant Aether have a peaceful 
journey into the next world, where he has been preceded by his wife and loving 
daughters. For his heroism in the face of adversity a place of glory is assured 
to him in the Halls of Light. . ."
                [/message]
                [message]
-                       id=msgT22_2
                        description=Prince Haldric
                        message= _ "Without the Lieutenant's noble sacrifice we 
would have never carried the day. We have won a great victory here today but 
much has been lost, many good people- My father- Eldaric, King Addroran. 
However, there is hope, and a new land spread before us!"
                [/message]
-               
+
                [if]
                        [have_unit]
                                [or]
@@ -170,79 +168,65 @@
                        [/have_unit]
                        [then]
                                [message]
-                                       id=msgT22_3
                                        description=Prince Haldric
                                        message= _ "But dark deeds have been 
done on all sides. There is now a secret that only Jessica and I share. I must 
have your word that what I say will never be uttered again."
                                [/message]
                                [message]
-                                       id=msgT22_4
                                        description=Burin the Lost
                                        message= _ "I have followed you this 
far, I will keep your secret. I pledge."
                                [/message]
                                [message]
-                                       id=msgT22_5
                                        description=Sir Ruddry
                                        
image="portraits/The_Rise_of_Wesnoth/knight.png"
                                        message= _ "Lord, I shall guard your 
secret until the time of my death."
                                [/message]
                                [message]
-                                       id=msgT22_6
                                        description=Sir Ladoc
                                        
image="portraits/The_Rise_of_Wesnoth/knight.png"
                                        message= _ "I will take it with me to 
my Grave."
                                [/message]
                                [message]
-                                       id=msgT22_7
                                        description=Minister Edmond
                                        
image="portraits/The_Rise_of_Wesnoth/edmond.png"
                                        message= _ "I agree, but misfortune may 
follow you depending on the nature of your misdeed."
                                [/message]
                                [message]
-                                       id=msgT22_8
                                        description=Prince Haldric
                                        message= _ "The Elves don't have the 
Ruby of Fire. We perpirated a ruse on the Orcs. If they return they will come 
looking for the Elves."
                                [/message]
                                [message]
-                                       id=msgT22_9
                                        description=Lady Jessica
                                        message= _ "To be fair to you Haldric, 
the Elves were reconsidering their Pact with us."
                                [/message]
                                [message]
-                                       id=msgT22_10
                                        description=Burin the Lost
                                        message= _ "Humph. I suspected as 
much-- from both the Elves and you. Humans and Elves always think they're so 
clever!"
                                [/message]
                                [message]
-                                       id=msgT22_11
                                        description=Minister Edmond
                                        
image="portraits/The_Rise_of_Wesnoth/edmond.png"
                                        message= _ "May the Lords of Light have 
Mercy on you. But, I am bound by my word."
                                [/message]
                        [/then]
                [/if]
-               
+
                [message]
-                       id=msgT22_12
                        description=Prince Haldric
                        message= _ "Jessica, you hid the Ruby away in that vile 
Troll Hole? Didn't you?"
                [/message]
                [message]
-                       id=msgT22_13
                        description=Lady Jessica
                        message= _ "What? Why would you doubt me?"
                [/message]
                [message]
-                       id=msgT22_14
                        description=Prince Haldric
                        message= _ "The Orcs that didn't escape in the ships 
have regrouped. They are preparing to march on the Elves. We should come to the 
aide of our new friends."
                [/message]
                [message]
-                       id=msgT22_15
                        description=Prince Haldric
                        message= _ "These Orcs are few, but the Elves aren't 
accustomed to war. Besides we will have to rely on Elven charity if we are to 
survive this first winter."
                [/message]
                [message]
-                       id=msgT22_16
                        description=Prince Haldric
                        message= _ "After that we should build towns in all of 
the regions that the Elves have given us. We should move our capital inland, 
away from the coast. I hope the children of the good people of the West North, 
of the Green Isle, find prosperity in this new land."
                [/message]
@@ -263,92 +247,75 @@
                        [/have_unit]
                        [then]
                                [message]
-                                       id=msgT22_17
                                        description=Prince Haldric
                                        message= _ "So what of the rest of you?"
                                [/message]
                                [message]
-                                       id=msgT22_18
                                        description=Burin the Lost
                                        message= _ "I shall go back to my 
people. It seems we have grown many and strong in the time I was gone. I will 
try to convince them of the wisdom of using the underways to settle new lands."
                                [/message]
                                [message]
-                                       id=msgT22_19
                                        description=Burin the Lost
                                        message= _ "I know the way to many 
places- I think. I want to find out if there are dwarves in other lands. It's a 
big world with lots of good mountains. Of that much I am sure."
                                [/message]
                                [message]
-                                       id=msgT22_20
                                        description=Minister Edmond
                                        
image="portraits/The_Rise_of_Wesnoth/edmond.png"
                                        message= _ "We have lost much in the 
last months, but we should not lose all of our knowledge. I will go forth 
amongst the people and spread wisdom, and see about establishing a new order of 
Mages in this new land."
                                [/message]
                                [message]
-                                       id=msgT22_21
                                        description=Sir Ruddry
                                        
image="portraits/The_Rise_of_Wesnoth/knight.png"
                                        message= _ "I am but a humble servant 
of the Crown. I will establish a new order of knights for a new land. For a new 
King, if you will allow me to serve under your banner."
                                [/message]
                                [message]
-                                       id=msgT22_22
                                        description=Sir Ladoc
                                        
image="portraits/The_Rise_of_Wesnoth/knight.png"
                                        message= _ "I am but a humble servant 
of the Crown. I will establish a new order of knights for a new land. For a new 
King, if you will allow me to serve under your banner."
                                [/message]
                                [message]
-                                       id=msgT22_23
                                        description=Prince Haldric
                                        message= _ "Excellent."
                                [/message]
                        [/then]
                [/if]
                [message]
-                       id=msgT22_24
                        description=Prince Haldric
                        message= _ "I suppose I am King Haldric now. Hmm. . . 
but what to call this new kingdom?"
                [/message]
                [message]
-                       id=msgT22_25
                        description=Lady Jessica
                        message= _ "May I make a suggestion?"
                [/message]
                [message]
-                       id=msgT22_26
                        description=Prince Haldric
                        message= _ "Sure."
                [/message]
                [message]
-                       id=msgT22_27
                        description=Lady Jessica
                        message= _ "The word Wesfolk is from your old tongue. 
It means 'People of the West'. The Elves call us the people of the West North. 
Under the same old tongue that would be 'Wes Noth'. So I suggest that the new 
kingdom be called 'Wesnoth', in honour of our old home."
                [/message]
                [message]
-                       id=msgT22_28
                        description=Prince Haldric
                        message= _ "Hmm- 'Wesnoth' I like it. Yes, 'Wesnoth' 
would be fine. So I am the first King of Wesnoth!"
                [/message]
                [message]
-                       id=msgT22_29
                        description=Lady Jessica
                        message= _ "So, what is to become of me?"
                [/message]
                [message]
-                       id=msgT22_30
                        description=Prince Haldric
                        message= _ "There are many Wesfolk amongst the remains 
of my people. We must stay  united under one banner. I will need you by my side 
if there is any hope of building a true 'Kingdom of Wesnoth'. Come, we have 
much work to do."
                [/message]
                [message]
-                       id=msgT22_31
                        description=Lady Jessica
                        message= _ "We!?"
                [/message]
                [message]
-                       id=msgT22_32
                        speaker=narrator
                        message= _ "In later ages the Bards would sing the 'The 
Breaking of the Pact', an epic tale of Haldric's betrayal of the Elves. They 
would whisper of the price he and his descendants would pay for that betrayal 
without knowing the whole truth."
                [/message]
                [message]
-                       id=msgT22_33
                        speaker=narrator
                        message= _ "But some of us have remembered the true 
story of our arrival on this great continent. The true story of the Rise of 
Wesnoth."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.22 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.23
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg:1.22       
Wed Dec 22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg    Sun Jan 
 9 21:35:46 2005
@@ -219,35 +219,32 @@
        [event]
        name=start
                [message]
-                       id=msgT8_1
                        speaker=Tan-Pulk
                        message= _ "Da big bosses said we'd be in da city by 
winter. Bosses wrong, stinky humans still there, and I'm a tinkin- -"
                [/message]
                [message]
-                       id=msgT8_2
                        speaker=Ut'Tan-Grilg
                        message= _ "Wait! I see a ship! Humans is coming! Smash 
'em good!"
                [/message]
-               
+
                [move_unit_fake]
                        type=Transport Galleon
                        x=35,34,33,33,34,34
                        y=30,29,29,28,27,26
                [/move_unit_fake]
-               
+
                {PUT_IMG (pirate-galleon.png) 34 26}
-               
+
                [unhide_unit]
                        x=33
                        y=24
                [/unhide_unit]
-               
+
                [message]
-                       id=msgT8_3
                        speaker=narrator
                        message= _ "Prince Haldric has arrived at Fallen Lich 
Point, to retrieve the Lich's Book, and flee into the Sewers of Southbay."
                [/message]
-               
+
                [recall]
                        description=Lady Jessica
                [/recall]
@@ -257,42 +254,36 @@
                [recall]
                        description=Sir Ruddry
                [/recall]
-               
+
                [recall]
                        description=Sir Ladoc
                [/recall]
-               
+
                [recall]
                        description=Minister Edmond
                [/recall]
-               
+
                [message]
-                       id=msgT8_4
                        description=Prince Haldric
                        message= _ "Okay. Let's unstone that Lich and get his 
book, then get into the sewers. Ummm, what language would that book be in?"
                [/message]
                [message]
-                       id=msgT8_5
                        description=Lady Jessica
                        message= _ "Some pep talk. The book will probably be in 
the Old Wesfolk tongue."
                [/message]
                [message]
-                       id=msgT8_6
                        description=Prince Haldric
                        message= _ "Ohhh."
                [/message]
                [message]
-                       id=msgT8_7
                        description=Lady Jessica
                        message= _ "Just get the book, I think I should be able 
to translate it."
                [/message]
                [message]
-                       id=msgT8_8
                        description=Prince Haldric
                        message= _ "Then into Southbay's sewer."
                [/message]
                [message]
-                       id=msgT8_9
                        description=Lady Jessica
                        message= _ "Right."
                [/message]
@@ -307,7 +298,6 @@
                        y=30
                [/filter]
                [message]
-                       id=msgT8_10
                        speaker=narrator
                        message= _ "INSCRIPTION: This monolith was erected by 
me, <CHIPPED AWAY>, first Mage of the good people of the Green Isle. By it's 
power the Lich is bound in stone. To end the spell a noble of the line of Kings 
should utter the following. . ."
                [/message]
@@ -330,14 +320,12 @@
 
                                [then]
                                        [message]
-                                       id=msgT8_10a
                                                description=Prince Haldric
                                                message= _ "Hmm... after some 
thought. . ."
                        
                                                [option]
-                                                       id=phrase_now
                                                        message= _ "I think 
I'll say that magic phrase."
-                                                       
+
                                                        [command]
                                                        [set_variable]
                                                                name=lich_free
@@ -346,22 +334,18 @@
                                                        [unstone]
                                                        [/unstone]
                                                        [message]
-                                                               id=msgT8_11a
                                                                
description=Prince Haldric
                                                                message= _ "The 
Lich is free! Let's bash him and grab that book. That sounds like a job for 
you, Lady Jessica!"
                                                        [/message]
                                                        [message]
-                                                               id=msgT8_11b
                                                                
description=Lady Jessica
                                                                message= _ 
"Hmph! You're just happy because that monolith proves your paternity!"
                                                        [/message]
                                                        [message]
-                                                               id=msgT8_11c
                                                                
description=Lich-Lord Caror
                                                                message= _ 
"Free, I'm free, and I feel the Ruby of Fire! It will be mine."
                                                        [/message]
                                                        [message]
-                                                               id=msgT8_11d
                                                                
description=Minister Edmond
                                                                
image="portraits/The_Rise_of_Wesnoth/edmond.png"
                                                                message= _ "No 
you won't you soldier of darkness!"
@@ -370,18 +354,15 @@
                                                [/option]
                                                
                                                [option]
-                                               id=phrase_later
                                                message= _ "I think I'll wait a 
while before uttering any magic phrases."
-                                               
+
                                                [command]
                                                        [message]
-                                                               id=msgT8_11e
                                                                
description=Prince Haldric
                                                                message= _ "We 
have more pressing matters to deal with before we free that Lich."
                                                        [/message]
-                                                       
+
                                                        [message]
-                                                               id=msgT8_11f
                                                                
description=Lady Jessica
                                                                message= _ 
"Afraid you'll find out you're not of the line of Kings?"
                                                        [/message]
@@ -389,10 +370,9 @@
                                                [/option]
                                        [/message]
                                [/then]
-                                       
+
                                [else]
                                        [message]
-                                               id=msgT8_12
                                                speaker=narrator
                                                message= _ "This sounds like a 
job for Prince Haldric, hopefully."
                                        [/message]
@@ -405,7 +385,6 @@
                
                [else]
                        [message]
-                               id=msgT8_13
                                speaker=narrator
                                message= _ "The Lich-Lord is already free."
                        [/message]
@@ -428,12 +407,10 @@
                [/redraw]
 
                [message]
-                       id=msgT8_14
                        speaker=narrator
                        message= _ "NW - Southbay."
                [/message]
                [message]
-                       id=msgT8_15
                        speaker=unit
                        message= _ "More Like NW - Every Orc on the Isle. Hmph!"
                [/message]
@@ -467,13 +444,11 @@
                                [/variable]
                                [then]
                                        [message]
-                                               id=msgT8_16
                                                description=Prince Haldric
                                                message= _ "We have the book, 
let's get out of here!"
                                        [/message]
 
                                        [message]
-                                               id=msgT8_17
                                                description=Lady Jessica
                                                message= _ "Sounds good to me."
                                        [/message]
@@ -504,7 +479,6 @@
                        
                                [else]
                                        [message]
-                                               id=msgT8_18
                                                description=Prince Haldric
                                                message= _ "I seem to be 
forgetting something. Ohhh, the book!"
                                        [/message]
@@ -514,7 +488,6 @@
                        
                        [else]
                                [message]
-                                       id=msgT8_19
                                        speaker=narrator
                                        message= _ "Prince Haldric must be the 
first into the sewers of Southbay."
                                [/message]
@@ -541,27 +514,22 @@
                {UNIT (Yeti) (Rarlg) 4 12 11}
 
                [message]
-                       id=msgT8_20
                        description=Rarlg
                        message= _ "Rarlg - argh, a raul-rarlg!"
                [/message]
                [message]
-                       id=msgT8_21
                        description=Prince Haldric
                        message= _ "Oh my!"
                [/message]
                [message]
-                       id=msgT8_22
                        description=Ut'Tan-Grilg
                        message= _ "Oh my!"
                [/message]
                [message]
-                       id=msgT8_23
                        description=Tan-Pulk
                        message= _ "Oh my!"
                [/message]
                [message]
-                       id=msgT8_24
                        description=Lady Jessica
                        message= _ "And he brought a friend."
                [/message]
@@ -580,13 +548,11 @@
                [/filter]
 
                [message]
-                       id=msgT8_25
                        description=Lich-Lord Caror
                        message= _ "So close. So close."
                [/message]
 
                [message]
-                       id=msgT8_26
                        speaker=second_unit
                        message= _ "I found the book in what was left of his 
robes! Let's get out of here!"
                [/message]
@@ -641,7 +607,6 @@
        [event]
                name=time over
                [message]
-                       id=msgT8_27
                        description=Prince Haldric
                        message= _ "I can hear their re-enforcements coming! 
We're trapped! All is lost!"
                [/message]
@@ -659,7 +624,6 @@
                [/redraw]
 
                [message]
-                       id=msgT8_28
                        speaker=narrator
                        message= _ "Sewer - Danger Keep Out!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.24 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.25
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg:1.24      
Wed Nov 24 00:23:39 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg   Sun Jan 
 9 21:35:46 2005
@@ -188,42 +188,35 @@
        [event]
                name=start
                [message]
-                       id=msgT12_1
                        speaker=narrator
                        message= _ "After some time at sea an island is 
spotted. The Eldaric docks at a crude port that appears to be deserted."
                [/message]
                [message]
-                       id=msgT12_2
                        description=Burin the Lost
                        message= _ "Land! Land! Bless the Lords of Light!"
                [/message]
                [message]
-                       id=msgT12_3
                        description=Lady Jessica
                        message= _ "This is the Elder Prince's island all 
right. We had a heck of a time pacifying the Drakes who live here. Oh my, it 
looks like they've rearmed!"
                [/message]
                [message]
-                       id=msgT12_5
                        description=Prince Haldric
                        message= _ "We come in peace. We only seek to 
re-provision our ships."
                [/message]
                [message]
-                       id=msgT12_6
                        description=Lady Jessica
                        message= _ "<Whispering> I don't think diplomacy is 
going to work."
                [/message]
                [message]
-                       id=msgT12_7
                        description=Gerrick
                        message= _ "Ssso humansss, you've come to trouble usss 
again. Prepare to die! For the glory of the Lords of Morogor!"
                [/message]
                [message]
-                       id=msgT12_8
                        description=Lady Jessica
                        message= _ "<Whispering> Do I need to say, 'I told you 
so'?"
                [/message]
        [/event]
-       
+
        [event]
                name=moveto
                [filter]
@@ -238,7 +231,6 @@
                {UNIT (Sea Serpent) (Bitey the Serpent) 4 $xx1 $yy1}
 
                [message]
-                       id=msgT12_9
                        speaker=unit
                        message= _ "Look out, a Serpent has emerged from the 
deep."
                [/message]
@@ -256,27 +248,22 @@
        [event]
                name=victory
                [message]
-                       id=msgT12_10
                        description=Prince Haldric
                        message= _ "Well, it looks like their warriors have 
given up the fight. We should be able to re-provision the ships now"
                [/message]
                [message]
-                       id=msgT12_11
                        description=Lady Jessica
                        message= _ "The nice thing is, they'll go back to 
guarding this island after we're gone for a while. It'll make a good way of 
preventing others from following us."
                [/message]
                [message]
-                       id=msgT12_12
                        description=Prince Haldric
                        message= _ "This island is slowly sinking. Hmm, I 
wonder what they'll do when it gets too small for them?"
                [/message]
                [message]
-                       id=msgT12_13
                        description=Lady Jessica
                        message= _ "Well, they seem rather intelligent. They're 
certainly belligerent and numerous. I'm sure they'll eventually evacuate. Just 
like us right now."
                [/message]
                [message]
-                       id=msgT12_14
                        description=Prince Haldric
                        message= _ "I don't find that thought very comforting."
                [/message]
@@ -289,7 +276,6 @@
                {UNIT (Blood Bat) (Familiar) 4 4 2}
 
                [message]
-                       id=msgT12_15
                        description=Familiar
                        image="portraits/The_Rise_of_Wesnoth/familiar.png"
                        message= _ "Neep! Neep!"
@@ -309,7 +295,6 @@
        [event]
                name=time over
                [message]
-                       id=msgT12_16
                        description=Lady Jessica
                        message= _ "The fleet is starving, we'll never pacify 
this Island before we all die!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.25 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg:1.25     
Wed Dec 22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg  Sun Jan 
 9 21:35:46 2005
@@ -198,50 +198,41 @@
        [event]
                name=start
                [message]
-                       id=msgT19_1
                        speaker=narrator
                        message= _ "Haldric reaches the site where the fleet is 
due to return. Several ships have already docked. The Orcs are on the frontier."
                [/message]
                [message]
-                       id=msgT19_2
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Sir, some ships have landed. . . They look 
like they've been damaged by the voyage. Hmm, it seems that most of the ships 
are staying at sea."
                [/message]
                [message]
-                       id=msgT19_3
                        description=Prince Haldric
                        message= _ "They've undoubtedly spotted the smoke from 
the Orcish fires. We have to defeat these monsters before everybody starves at 
sea, or before Jevyan launches an attack with his fleet."
                [/message]
                [message]
-                       id=msgT19_4
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Yes Sir! The rest of the refugees have fled 
South, to our initial landing site. If we fail here they'll get slaughtered."
                [/message]
                [message]
-                       id=msgT19_5
                        description=Burin the Lost
                        message= _ "Well, that settles it. Enough talking, time 
to fight!"
                [/message]
                [message]
-                       id=msgT19_6
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "For the glory of the men of The Green Isle!"
                [/message]
                [message]
-                       id=msgT19_7
                        description=Prince Haldric
                        message= _ "No, for the Glory of all of the people of 
the West North! Charge!"
                [/message]
                [message]
-                       id=msgT19_8
                        description=Tan-Rinak
                        message= _ "Bah! Human- we will stomp you under our 
heels!"
                [/message]
                [message]
-                       id=msgT19_8b
                        description=General Heravan
                        message= _ ". . .And raise your dead to serve forever!"
                [/message]
@@ -270,17 +261,14 @@
                {UNIT (Ancient Lich) (Lich-Lord Jevyan) 2 25 2}
 
                [message]
-                       id=msgT19_9
                        description=Lich-Lord Jevyan
                        message= _ "Give up boy! You can't defeat me- Hmm, 
what's this? You've learnt to conceal the power of the Ruby of Fire. It makes 
little difference, your undead corpse will lay it at my feet."
                [/message]
                [message]
-                       id=msgT19_10
                        description=Prince Haldric
                        message= _ "We'll see about that. The Fool Prince of 
Southbay was wrong to start this war, but you're the real monster! You 
sacrificed your own people to preserve your immortal un-life."
                [/message]
                [message]
-                       id=msgT19_11
                        description=Lich-Lord Jevyan
                        message= _ "Enough of this. A curse of darkness upon 
you young prince."
                [/message]
@@ -309,7 +297,6 @@
 #endif
 
                [message]
-                       id=msgT19_12
                        description=Familiar
                        image="portraits/The_Rise_of_Wesnoth/familiar.png"
                        message= _ "Neep! Neep!"
@@ -341,7 +328,6 @@
        [event]
                name=time over
                [message]
-                       id=msgT19_13
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "I see masts on the horizon. Jevyan's fleet 
is here! It's all over."
@@ -360,12 +346,10 @@
                [/redraw]
 
                [message]
-                       id=msgT19_14
                        speaker=narrator
                        message= _ "Please Diembark in an Orderly Fashion and 
Proceed South"
                [/message]
                [message]
-                       id=msgT19_15
                        speaker=unit
                        message= _ "Hmm, they left off the 'or the Orcs will 
eat you' part."
                [/message]
@@ -400,17 +384,14 @@
                {CLEAR_VARIABLE jessica_store}
                
                [message]
-                       id=msgT19_16
                        description=Lady Jessica
                        message= _ "I'm back, things went well! Haldric, I sure 
hope you know what you're doing."
                [/message]
                [message]
-                       id=msgT19_17
                        description=Prince Haldric
                        message= _ "Umm, we'll talk about it later. I'm just a 
little busy at the moment. I'm glad you made it back in one piece."
                [/message]
                [message]
-                       id=msgT19_18
                        description=Lady Jessica
                        message= _ "Yeah, it looks like you could use all of 
the help you can get."
                [/message]
@@ -419,27 +400,22 @@
 [event]
                name=victory
                [message]
-                       id=msgT19_19
                        description=Prince Haldric
                        message= _ "We've defeated Jevyan's forces. The ships 
must diembark their passengers quickly-"
                [/message]
                [message]
-                       id=msgT19_20
                        description=Lady Jessica
                        message= _ "Haldric, what's going on? What's the plan?"
                [/message]
                [message]
-                       id=msgT19_21
                        description=Prince Haldric
                        message= _ "Well, we're going to confront Jevyan and 
destroy him."
                [/message]
                [message]
-                       id=msgT19_22
                        description=Lady Jessica
                        message= _ "That will be easier said than done. Even if 
we defeat him, the other Lich-Lords will follow. It's because of that Ruby. If 
I were paranoid I'd say that our dear old 'tree-friend' might have known as 
much."
                [/message]
                [message]
-                       id=msgT19_23
                        description=Prince Haldric
                        message= _ "We should discuss this in private. Here, 
come with me."
                [/message]
@@ -464,12 +440,10 @@
                {UNIT (Cuttle Fish) (Cuttle Fish) 3 12 16}
 #endif
                [message]
-                       id=msgT19_24
                        description=Cuttle Fish
                        message= _ "Slurp, click, click, click!"
                [/message]
                [message]
-                       id=msgT19_25
                        description=Prince Haldric
                        message= _ "I don't know what that is, but it doesn't 
sound friendly."
                [/message]
@@ -496,7 +470,6 @@
                {UNIT (Saurian Skirmisher) (Anexir) 4 33 15}
 #endif
                [message]
-                       id=msgT19_26
                        description=Flixta
                        message= _ "You Again. You will sssuffer for your 
attack against my people! Shek'kahan, our Naga friendsss- You'll pay! We have 
new friends now."
                [/message]
@@ -523,7 +496,6 @@
                [/filter]
                
                [message]
-                       id=msgT19_27
                        speaker=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Oh, to join my family again! Do not mourn 
my passing."
@@ -546,7 +518,6 @@
 
                [message]
                        description=Tan-Halg
-                       id=msgT19_28
                        message= _ "My people are like a rock slide, you can 
run, but we will crush you- Ahhck!"
                [/message]
                
@@ -568,7 +539,6 @@
 
                [message]
                        description=Tan-Rinak
-                       id=msgT19_29
                        message= _ "I- I die?"
                [/message]
                
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.20 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.21
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:1.20       
Wed Nov 24 23:46:21 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg    Sun Jan 
 9 21:35:46 2005
@@ -107,34 +107,28 @@
        [event]
        name=start
                [message]
-                       id=msgT6_1
                        speaker=narrator
                        message= _ "Prince Haldric has emerged from the 
Lich-Lord's tomb, with the Ruby of Fire. The forest seems particularly bright 
this day, but there is a cold breeze. It is late into the fall, and the first 
snows should fall any day. Prince Haldric has returned to his forest keep, and 
is pondering what to do next. . ."
                [/message]
                [message]
-                       id=msgT6_2
                        description=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "So you have defeated the Lich and returned 
with his artifact. The ground feels happy beneath my toes."
                [/message]
                [message]
-                       id=msgT6_3
                        description=Prince Haldric
                        message= _ "Yes, it was a tough battle, but in the end 
we prevailed. Now, I'm having a problem. I'm at a loss when it comes to trying 
to figure out what I should do next."
                [/message]
                [message]
-                       id=msgT6_4
                        description=Prince Haldric
                        message= _ "I have this artifact, but I have no idea 
what it does. To make matters worse I have no idea what's going on outside this 
forest. The number of refugees is growing daily. We need to get to Southbay, 
but I dare not lead us onto the plains or it could be a mass slaughter."
                [/message]
                [message]
-                       id=msgT6_5
                        description=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "My eyes do not extend beyond the forest. 
You have been a tree-friend, I wish there was more I could do to help you."
                [/message]
                [message]
-                       id=msgT6_6
                        description=Prince Haldric
                        message= _ "We can't all stay here for the winter or 
we'll all starve, or freeze. Your hospitality has barely been enough as it is. 
Wait a second, I see somebody!"
                [/message]
@@ -160,42 +154,34 @@
                        [/variable]
                        [then]
                                [message]
-                                       id=msgT6_7
                                        description=Lady Outlaw
                                        message= _ "You thought that I ran 
away, didn't you?"
                                [/message]
                                [message]
-                                       id=msgT6_8
                                        description=Prince Haldric
                                        message= _ "The thought had crossed my 
mind."
                                [/message]
                                [message]
-                                       id=msgT6_9
                                        description=Lady Outlaw
                                        message= _ "Well, I come bearing news 
of the road to Southbay!"
                                [/message]
                                [message]
-                                       id=msgT6_10
                                        description=Prince Haldric
                                        message= _ "Really!"
                                [/message]
                                [message]
-                                       id=msgT6_11
                                        description=Lady Outlaw
                                        message= _ "The news is not good. The 
main host of Orcs is between the forest and Southbay, we clearly can't go that 
way. However, the road to Clearwater Port is free of Orcs. Apparently they're 
bogged down in the swamp of Esten."
                                [/message]
                                [message]
-                                       id=msgT6_12
                                        description=Prince Haldric
                                        message= _ "Well, I certainly don't 
mind the thought of the Orcs floundering around that infernal swamp. But, one 
question remains."
                                [/message]
                                [message]
-                                       id=msgT6_13
                                        description=Lady Outlaw
                                        message= _ "What?"
                                [/message]
                                [message]
-                                       id=msgT6_14
                                        description=Prince Haldric
                                        message= _ "Can I trust you, and your 
information? I don't even know your name."
                                [/message]
@@ -203,62 +189,50 @@
                        [/then]
                        [else]
                                [message]
-                                       id=msgT6_15
                                        description=Prince Haldric
                                        message= _ "You again!"
                                [/message]
                                [message]
-                                       id=msgT6_16
                                        description=Lady Outlaw
                                        message= _ "I come bearing news of the 
road to Southbay!"
                                [/message]
                                [message]
-                                       id=msgT6_17
                                        description=Prince Haldric
                                        message= _ "Humph! Your words mean very 
little to me."
                                [/message]
                                [message]
-                                       id=msgT6_18
                                        description=Lady Outlaw
                                        message= _ "It is important, and not 
good. The main host of Orcs is between the forest and Southbay, you clearly 
can't go that way. However, the road to Clearwater Port is free of Orcs. 
Apparently they're bogged down in the swamp of Esten."
                                [/message]
                                [message]
-                                       id=msgT6_19
                                        description=Lady Outlaw
                                        message= _ "I propose we join forces, 
and make a brake for Clearwater Port."
                                [/message]
                                [message]
-                                       id=msgT6_20
                                        description=Prince Haldric
                                        message= _ "Well, I certainly don't 
mind the thought of the Orcs floundering around that infernal swamp. But, some 
questions remain."
                                [/message]
                                [message]
-                                       id=msgT6_21
                                        description=Prince Haldric
                                        message= _ "Lady, why would you let 
those undead monsters lead your people?"
                                [/message]
                                [message]
-                                       id=msgT6_22
                                        description=Lady Outlaw
                                        message= _ "Haldric, we are an ancient 
people who lived in a land filled with all manner of man and beast. We needed 
vision that extended beyond the meagre span of human years. The art of 
Necromancy allowed our best and brightest to live forever, and our worst got to 
serve as mindless slaves."
                                [/message]
                                [message]
-                                       id=msgT6_23
                                        description=Lady Outlaw
                                        message= _ "Other than losing our war 
back West, then our refugee war to your people, and this Orc thing, it wasn't 
such a bad deal."
                                [/message]
                                [message]
-                                       id=msgT6_24
                                        description=Prince Haldric
                                        message= _ "Uh-huh.  Have you 
considered that the unholy act of turning your best and brightest into undead 
is what causes them to fall into darkness?"
                                [/message]
                                [message]
-                                       id=msgT6_26
                                        description=Lady Outlaw
                                        message= _ "We should save this 
pointless debate for later. Anything else?"
                                [/message]
                                [message]
-                                       id=msgT6_27
                                        description=Prince Haldric
                                        message= _ "Why should I trust you, and 
your information? I don't even know your name, and you have this nasty habit of 
always turning up!"
                                [/message]
@@ -284,7 +258,6 @@
                        [/else]
                [/if]
                [message]
-                       id=msgT6_28
                        description=Lady Outlaw
                        message= _ "Bah, have it your way!"
                [/message]
@@ -308,33 +281,27 @@
                [/delay]
                        
                [message]
-                       id=msgT6_30
                        description=Lady Jessica
                        message= _ "I am the Lady Jessica, a Noble, a Princess 
of the Wesfolk! Betrayed by the Lich-Lords' dark pact with the Orcs. In no 
small part because 'your' fool Prince of Southbay convinced them that their 
immortal un-lives were over!"
                [/message]
                [message]
-                       id=msgT6_31
                        description=Lady Jessica
                        message= _ "And now, I'm just as much as a refugee as 
you. Frankly, I don't know if the Lich-Lords are working with the Orcs, or not. 
The Orcs might have gotten rid of the Lich-Lords, or they might not have, but I 
do know that the Orcs weren't going to tolerate living humans outside of the 
slave mines, or stew pot!"
                [/message]
                [message]
-                       id=msgT6_32
                        description=Lady Jessica
                        message= _ "Young Prince, it is time to go! We must 
flee before the winter snow!"
                [/message]
                [message]
-                       id=msgT6_33
                        description=Prince Haldric
                        message= _ "Fair enough, we will head for Clearwater 
Port. Thank You Elilmaldur-Rithrandil, I will remember your hospitality!"
                [/message]
                [message]
-                       id=msgT6_34
                        description=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "Always happy to help a tree-friend. May the 
Powers of Light guide you on your way!"
                [/message]
                [message]
-                       id=msgT6_35
                        description=Burin the Lost
                        message= _ "Finally, we're getting out of this forest!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.16 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.17
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg:1.16 Sat Dec 
 4 05:48:32 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg      Sun Jan 
 9 21:35:46 2005
@@ -281,122 +281,99 @@
        [event]
                name=start
                [message]
-                       id=msgT21_1
                        speaker=narrator
                        message= _ "Haldric rapidly approaches the site where 
Lich-Lord Jevyan has made landfall. The final confrontation looms before him."
                [/message]
                [message]
-                       id=msgT21_2
                        description=Lich-Lord Jevyan
                        message= _ "You can not win. Give me the Ruby of Fire 
and I will go in peace."
                [/message]
                [message]
-                       id=msgT21_3
                        description=Prince Haldric
                        message= _ "This ends here Jevyan. Even if I believed 
your words I couldn't give you the Ruby of Fire."
                [/message]
                [message]
-                       id=msgT21_4
                        description=Lich-Lord Jevyan
                        message= _ "Bah! Even if you have learnt to conceal the 
power of the Ruby of Fire you will deliver it unto me in death!"
                [/message]
                [message]
-                       id=msgT21_5
                        description=Lady Jessica
                        message= _ "You're a fool Jevyan. How do you think we 
secured our place here? We had to give the Elves the Ruby of Fire. We just 
signed a treaty with the Elves ensuring our place here."
                [/message]
                [message]
-                       id=msgT21_6
                        description=Lich-Lord Jevyan
                        message= _ "No! I don't believe it. Only a fool would 
give away an artifact of such power."
                [/message]
                [message]
-                       id=msgT21_7
                        description=Prince Haldric
                        message= _ "A fool, or a desperate band of refugees!"
                [/message]
                [message]
-                       id=msgT21_8
                        description=Lich-Lord Jevyan
                        message= _ "No. It can't be!"
                [/message]
                [message]
-                       id=msgT21_9
                        description=Burin the Lost
                        message= _ "Fool human, you shouldn't give such toys to 
elves! Bah! It matters little to me. I'm no wizard. All I got is my axe. He, 
he. It's all I need- Prepare to die Orcish scum!"
                [/message]
                [message]
-                       id=msgT21_10
                        description=Minister Edmond
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "Ha. Let all of the footsoldiers of darkness 
be cast down!"
                [/message]
                [message]
-                       id=msgT21_11
                        description=Prince Haldric
                        message= _ "It matters little, because here you fall!"
                [/message]
                [message]
-                       id=msgT21_12
                        description=Sir Ruddry
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "For all of the good people of Clearwater 
Port!"
                [/message]
                [message]
-                       id=msgT21_13
                        description=Sir Ladoc
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "For the honour of SouthBay!"
                [/message]
                [message]
-                       id=msgT21_14
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "We don't need some magic trinket to beat 
you! Prepare to meet you fate you decrepit sack of bones! For the honour of all 
of the people of the of the West North!"
                [/message]
                [message]
-                       id=msgT21_15
                        description=Prince Haldric
                        message= _ "Charge!"
                [/message]
                [message]
-                       id=msgT21_16
                        description=Ut'Tan-Grorag
                        message= _ "I hate it when my prey gets chatty! Get 
them, it's a long boat ride back home!"
                [/message]
                [message]
-                       id=msgT21_17
                        description=Lich-Lord Jevyan
                        message= _ "We shall soon see if you have the Ruby of 
Fire!"
                [/message]
                [message]
-                       id=msgT21_18
                        description=Familiar
                        image="portraits/The_Rise_of_Wesnoth/familiar.png"
                        message= _ "Neep! Neep!"
                [/message]
                [message]
-                       id=msgT21_19
                        description=Prince Haldric
                        message= _ "<Whispering> Lieutenant, you remember the 
plan right?"
                [/message]
                [message]
-                       id=msgT21_20
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "<Whispering> Yes Sir. I am ready."
                [/message]
        [/event]
 
-       
-
        [event]
                name=die
                [filter]
                        side=1
                [/filter]
                [message]
-                       id=msgT21_21
                        speaker=Lady Jessica
                        message= _ "He's raising our dead! Be careful!"
                [/message]
@@ -405,7 +382,7 @@
        [event]
                name=die
                first_time_only=no
-               
+
                {RISE_UP_RISE_UP $x1 $y1}
        [/event]
 
@@ -415,42 +392,38 @@
                description=Lt. Aethyr
                [/filter]
                [message]
-                       id=msgT21_22
                        speaker=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Feel my wrath, Jevyan I'm coming for you! 
No piece of paper in my pocket is going to stop me from destroying you. For my 
family! For the people of Clearwater Port!"
                [/message]
                [message]
-                       id=msgT21_23
                        description=Lich-Lord Jevyan
                        message= _ "All life is finite, you will be made to 
serve along with the rest."
                [/message]
        [/event]
-       
+
        [event]
        name=attack
                [filter]
                description=Burin the Lost
                [/filter]
                [message]
-                       id=msgT21_24
                        speaker=Burin the Lost
                        message= _ "Come on, stay still, just for a second. . ."
                [/message]
        [/event]
-       
+
        [event]
        name=attack
                [filter]
                description=Lady Jessica
                [/filter]
                [message]
-                       id=msgT21_25
                        speaker=Lady Jessica
                        message= _ "For the Wesfolk!"
                [/message]
        [/event]
-       
+
        [event]
        name=attack
                [filter]
@@ -460,19 +433,17 @@
                description=Lt. Aethyr
                [/filter_second]
                [message]
-                       id=msgT21_26
                        speaker=Lady Jessica
                        message= _ "Be careful Lieutenant!"
                [/message]
        [/event]
-       
+
        [event]
        name=attack
                [filter]
                description=Familiar
                [/filter]
                [message]
-                       id=msgT21_27
                        speaker=Familiar
                        image="portraits/The_Rise_of_Wesnoth/familiar.png"
                        message= _ "Neep! Neep!"
@@ -525,27 +496,22 @@
 
                                [then]
                                        [message]
-                                               id=msgT21_28
                                                speaker=Tan-Vragish
                                                message= _ "The battle is going 
against us!"
                                        [/message]
                                        [message]
-                                               id=msgT21_29
                                                speaker=Ut'Tan-Grorag
                                                message= _ "Our forces are 
being routed! We should flee back to the Green Isle!"
                                        [/message]
                                        [message]
-                                               id=msgT21_30
                                                speaker=Tan-Erinak
                                                message= _ "It goes poorly for 
us!"
                                        [/message]
                                        [message]
-                                               id=msgT21_31
                                                speaker=Tan-Prodash
                                                message= _ "Defeated, by 
humans?"
                                        [/message]
                                        [message]
-                                               id=msgT21_32
                                                speaker=Lich-Lord Jevyan
                                                message= _ "Fight on you 
cowardly Orcish scum!"
                                        [/message]
@@ -553,7 +519,6 @@
 
                                [else]
                                        [message]
-                                               id=msgT21_33
                                                speaker=Tan-Vragish
                                                message= _ "Da old bag of bones 
has been crushed, and our cause is lost. We know da Elfses have da Fire Ruby. 
Retreat!"
                                        [/message]
@@ -561,7 +526,6 @@
                                                description=Tan-Vragish
                                        [/kill]
                                        [message]
-                                               id=msgT21_34
                                                speaker=Ut'Tan-Grorag
                                                message= _ "Da Elfses have the 
Fire Ruby, we must flee. To da Ships!"
                                        [/message]
@@ -569,7 +533,6 @@
                                                description=Ut'Tan-Grorag
                                        [/kill]
                                        [message]
-                                               id=msgT21_35
                                                speaker=Tan-Erinak
                                                message= _ "We have many 
kinsmen on the Green Isle- we will return for the Ruby of Fire!"
                                        [/message]
@@ -577,7 +540,6 @@
                                                description=Tan-Erinak
                                        [/kill]
                                        [message]
-                                               id=msgT21_36
                                                speaker=Tan-Prodash
                                                message= _ "We must get back to 
the Green Isle. The Elfses have the Ruby of Fire and our assult has been 
stopped."
                                        [/message]
@@ -600,12 +562,10 @@
                [/variable]
                [then]
                        [message]
-                               id=msgT21_37
                                description=Prince Haldric
                                message= _ "The plan revolved around some Orcs 
making it back to the Green Isle to tell their kin that the Elves have the Ruby 
of Fire. So we wouldn't have to bear the brunt of the next invasion."
                        [/message]
                        [message]
-                               id=msgT21_38
                                description=Prince Haldric
                                message= _ "What have we done?"
                        [/message]
@@ -681,14 +641,12 @@
                [/filter_second]
 
                [message]
-                       id=msgT21_39
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "My love, my family, I'll be there soo-"
                [/message]
 
                [message]
-                       id=msgT21_40
                        description=Prince Haldric
                        message= _ "Lieutenant Aethyr! No! Umm, he was kind of 
critical for convincing Jevyan that the Elves have the Ruby of Fire."
                [/message]
@@ -709,26 +667,22 @@
                [/filter_second]
 
                [message]
-                       id=msgT21_41
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Jevyan- I spit upon thee. Your end awaits. 
My love, my family, I'll be there soo-"
                [/message]
 
                [message]
-                       id=msgT21_42
                        description=Lich-Lord Jevyan
                        message= _ "Fool. You are no match for my power. What! 
What's this? A treaty. That's elf script."
                [/message]
 
                [message]
-                       id=msgT21_43
                        description=Lich-Lord Jevyan
                        message= _ "No. Why? You fools, you gave the Ruby of 
Fire to the Elves. But that won't save you from me. I will destroy you, then I 
will deal with the Elves."
                [/message]
 
                [message]
-                       id=msgT21_44
                        description=Prince Haldric
                        message= _ "We'll see about that. For the honour of 
Lieutenant Aethyr, forward!"
                [/message]
@@ -740,7 +694,6 @@
                        description=Lich-Lord Jevyan
                [/filter]
                [message]
-                       id=msgT21_45
                        description=Lich-Lord Jevyan
                        message= _ "I am fallen before my plans have reached 
fruition. A curse upon you Haldric, may you and your descendants know nothing 
but strife!"
                [/message]
@@ -752,7 +705,6 @@
                        [/have_unit]
                        [then]
                                [message]
-                                       id=msgT21_46
                                        description=Lt. Aethyr
                                        
image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                                        message= _ "You deny me my honourable 
death? Our foes are not yet convinced that the Elves have the Ruby."
@@ -770,7 +722,6 @@
                                        [/variable]
                                        [then]
                                                [message]
-                                                       id=msgT21_47
                                                        speaker=Tan-Vragish
                                                        message= _ "Da old bag 
of bones has been crushed, and our cause is lost. We know da Elfses have da 
Fire Ruby. Retreat!"
                                                [/message]
@@ -778,7 +729,6 @@
                                                        description=Tan-Vragish
                                                [/kill]
                                                [message]
-                                                       id=msgT21_48
                                                        speaker=Ut'Tan-Grorag
                                                        message= _ "Da old bag 
of bones has been crushed, and our cause is lost. We know da Elfses have da 
Fire Ruby. Retreat!"
                                                [/message]
@@ -786,7 +736,6 @@
                                                        
description=Ut'Tan-Grorag
                                                [/kill]
                                                [message]
-                                                       id=msgT21_49
                                                        speaker=Tan-Erinak
                                                        message= _ "Da old bag 
of bones has been crushed, and our cause is lost. We know da Elfses have da 
Fire Ruby. Retreat!"
                                                [/message]
@@ -794,7 +743,6 @@
                                                        description=Tan-Erinak
                                                [/kill]
                                                [message]
-                                                       id=msgT21_50
                                                        speaker=Tan-Prodash
                                                        message= _ "Da old bag 
of bones has been crushed, and our cause is lost. We know da Elfses have da 
Fire Ruby. Retreat!"
                                                [/message]
@@ -808,22 +756,18 @@
                                        [/then]
                                        [else]
                                                [message]
-                                                       id=msgT21_51
                                                        speaker=Tan-Vragish
                                                        message= _ "Da old bag 
'o bones is gone, but you haven't beat us yet!"
                                                [/message]
                                                [message]
-                                                       id=msgT21_52
                                                        speaker=Ut'Tan-Grorag
                                                        message= _ "We took yer 
home now we'll take yer lives!"
                                                [/message]
                                                [message]
-                                                       id=msgT21_53
                                                        speaker=Tan-Erinak
                                                        message= _ "The Elfses 
have da Fire Ruby, and you have nothing!"
                                                [/message]
                                                [message]
-                                                       id=msgT21_54
                                                        speaker=Tan-Prodash
                                                        message= _ "We will 
suck the marrow from your bones human!"
                                                [/message]
@@ -858,7 +802,6 @@
                [/unit]
 
                [message]
-                       id=msgT21_55
                        speaker=unit
                        message= _ "Ack. One of those monsters is destroying 
the bridge."
                [/message]
@@ -921,7 +864,6 @@
                [/unit]
 
                [message]
-                       id=msgT21_56
                        speaker=unit
                        message= _ "The bridge!"
                [/message]
@@ -984,7 +926,6 @@
                [/unit]
 
                [message]
-                       id=msgT21_57
                        speaker=unit
                        message= _ "Out advance is thwarted, that monster has 
destroyed the bridge!"
                [/message]
@@ -1038,7 +979,6 @@
                [/scroll_to_unit]
 
                [message]
-                       id=msgT21_58
                        speaker=Abraxas
                        message= _ "It's the Haldric! Jevyan you never said you 
came to destroy this monster. We will help you."
                [/message]
@@ -1067,7 +1007,6 @@
 #define DEEP_WALKERS
        {VARIABLE_OP yy1 random 25..40}
        [message]
-               id=msgT21_59
                description=Lich-Lord Jevyan
                message= _ "Come in from the deep my loyal soldiers!"
        [/message]
@@ -1096,7 +1035,6 @@
        {VARIABLE_OP yy1 random 24..45}
 
        [message]
-               id=msgT21_60
                description=Lich-Lord Jevyan
                message= _ "Rise, rise from the ground!"
        [/message]
@@ -1129,18 +1067,15 @@
                description=Familiar
                [/filter]
                [message]
-                       id=msgT21_61
                        speaker=Familiar
                        image="portraits/The_Rise_of_Wesnoth/familiar.png"
                        message= _ "Neep! SPLAT!"
                [/message]
                [message]
-                       id=msgT21_62
                        speaker=second_unit
                        message= _ "Ahh. . . That almost makes it all worth 
while!"
                [/message]
                [message]
-                       id=msgT21_63
                        speaker=Lich-Lord Jevyan
                        message= _ "You'll pay for that!"
                [/message]
@@ -1148,7 +1083,6 @@
                {DEEP_WALKERS}
                {FROM_THE_EARTH}
                [message]
-                       id=msgT21_64
                        speaker=Lich-Lord Jevyan
                        message= _ "Strike down these fools."
                [/message]
@@ -1220,12 +1154,10 @@
                        y=39,39,38,39,39,40,41,42,43,44,44,45,45
                [/move_unit_fake]
                [message]
-                       id=msgT21_65
                        description=Lady Jessica
                        message= _ "We did it! We won!"
                [/message]
                [message]
-                       id=msgT21_66
                        description=Prince Haldric
                        message= _ "Jevyan is destroyed, but at a terrible 
price. Let's put Lieutenant Aether to rest and discuss what is to come in the 
following days."
                [/message]
@@ -1234,7 +1166,6 @@
        [event]
        name=time over
                [message]
-                       id=msgT21_67
                        description=Prince Haldric
                        message= _ "Our strength is waining, and our foes grow 
stronger by the hour. The battle is lost!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.19 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.20
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg:1.19   Mon Nov 
22 21:58:20 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg        Sun Jan 
 9 21:35:47 2005
@@ -155,32 +155,27 @@
        [event]
                name=start
                [message]
-                       id=msgT13_1
                        speaker=narrator
                        message= _ "After a particularly bad series of storms 
the Eldaric has taken on water, and much of the fleet has been scattered. Lord 
Typhon suggests stopping at a group of small windswept islands to regroup."
                [/message]
-               
+
                [message]
-                       id=msgT13_2
                        description=Burin the Lost
                        message= _ "I don't think I can take much more of this. 
I'm feeling I'll!"
                [/message]
-               
+
                [message]
-                       id=msgT13_3
                        description=Lord Typhon
                        image="portraits/The_Rise_of_Wesnoth/typhon.png"
                        message= _ "Be careful, these islands aren't safe. 
We're in Naga territory. But this is the only place to stop with soft sand 
beaches to make landfall. . . The Nagas like to scavenge metal from ships that 
they capture here."
                [/message]
-               
+
                [message]
-                       id=msgT13_4
                        description=Xamalia
                        message= _ "Prey! Get them!"
                [/message]
-               
+
                [message]
-                       id=msgT13_5
                        description=Prince Haldric
                        message= _ "The fleet must regroup here. We have to 
defeat these monsters."
                [/message]
@@ -200,11 +195,10 @@
                {UNIT (Sea Serpent) (Chompey the Serpent) 2 $xx1 $yy1}
 
                [message]
-                       id=msgT13_6
                        speaker=unit
                        message= _ "Look out, a Serpent has emerged from the 
deep."
                [/message]
-               
+
                [scroll_to_unit]
                        description=Chompey the Serpent
                        x=$xx1
@@ -229,11 +223,10 @@
                {UNIT (Sea Serpent) (Scaly the Serpent) 2 $xx1 $yy1}
 
                [message]
-                       id=msgT13_7
                        speaker=unit
                        message= _ "Look out, a Serpent has emerged from the 
deep."
                [/message]
-               
+
                [scroll_to_unit]
                        description=Scaly the Serpent
                        x=$xx1
@@ -258,11 +251,10 @@
                {UNIT (Sea Serpent) (Toothey the Serpent) 2 $xx1 $yy1}
 
                [message]
-                       id=msgT13_8
                        speaker=unit
                        message= _ "Look out, a Serpent has emerged from the 
deep."
                [/message]
-               
+
                [scroll_to_unit]
                        description=Toothey the Serpent
                        x=$xx1
@@ -276,60 +268,54 @@
        [event]
                name=victory
                [message]
-                       id=msgT13_9
                        description=Prince Haldric
                        message= _ "We've defeated the Nagas. The fleet should 
be able to regroup here."
                [/message]
-               
+
                [message]
-                       id=msgT13_10
                        description=Lady Jessica
                        message= _ "The next time we see land, it should be the 
great continent to the East."
                [/message]
-               
+
                [message]
-                       id=msgT13_11
                        description=Prince Haldric
                        message= _ "I'll be glad when this voyage is over. 
We're almost there. Almost there."
                [/message]
-               
+
                [move_unit_fake]
                        type=Blood Bat
                        x=1,2,3
                        y=25,25,26
                [/move_unit_fake]
-               
+
                {UNIT (Blood Bat) (Familiar) 4 3 26}
-               
+
                [message]
-                       id=msgT13_12
                        description=Familiar
                        image="portraits/The_Rise_of_Wesnoth/familiar.png"
                        message= _ "Neep! Neep!"
                [/message]
-               
+
                [kill]
                        description=Familiar
                [/kill]
-               
+
                [move_unit_fake]
                        type=Blood Bat
                        x=3,3,2,1
                        y=26,27,27,28
                [/move_unit_fake]
-               
+
                [message]
-                       id=msgT13_13
                        description=Lady Jessica
                        message= _ "I think we're being followed. . ."
                [/message]
-               
+
        [/event]
        
        [event]
                name=time over
                [message]
-                       id=msgT13_14
                        description=Lady Jessica
                        message= _ "We were too slow. . . The fleet will be 
scattered to the four corners of the world!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.23 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg:1.23   Wed Dec 22 
00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg        Sun Jan  9 
21:35:47 2005
@@ -141,41 +141,30 @@
        [event]
        name=start
                [message]
-                       id=msgT9_1
                        speaker=narrator
                        message= _ "In the last leg of their journey to 
Southbay, Haldric and his companions find themselves in the Sewers of Southbay."
                [/message]
                [message]
-                       id=msgT9_2
                        speaker=Burin the Lost
                        message= _ "Only a human could take such a lovely cave 
and fill it with refuse. Humans. Hey, is that a pair of boots?"
                [/message]
                [message]
-                       id=msgT9_3
                        description=Prince Haldric
                        message= _ "We should be cautious down here. This isn't 
an old maid's drain pipe, this is the sewer of Southbay. It is said that the 
city diverted an underground river for its own use, and let their own effluent 
run down the old river bed."
                [/message]
-               
                [message]
-                       id=msgT9_4
                        description=Prince Haldric
                        message= _ "This is the far end of that river bed. 
Legend has it- -"
                [/message]
-
                [message]
-                       id=msgT9_5
                        description=Tinry the Red
                        message= _ "That a King banished a rouge faction of Red 
Mages down here after the Wesfolk war!"
                [/message]
-               
                [message]
-                       id=msgT9_6
                        description=Daellyn the Red
                        message= _ "Can you feel it brother? This one bears the 
Ruby of Fire. After all this time it has simply come to us!"
                [/message]
-               
                [message]
-                       id=msgT9_7
                        description=Tinry the Red
                        message= _ "We must have it. Get them!"
                [/message]
@@ -184,7 +173,6 @@
        [event]
        name=time over
                [message]
-                       id=msgT9_8
                        description=Prince Haldric
                        message= _ "Nooo! The wizards are flooding the sewer 
we're doomed!"
                [/message]
@@ -193,13 +181,11 @@
        [event]
        name=turn 3
                [message]
-                       id=msgT9_9
                        description=Lady Jessica
                        message= _ "Haldric, there's something that's filling 
me with a sense of foreboding. That Ruby, have you noticed that anything that 
happens to be strong in the ways of magic can sense it. Elilmaldur-Rithrandil, 
felt it, and so did Lich-Lord Caror, now these two."
                [/message]
 
                [message]
-                       id=msgT9_10
                        description=Prince Haldric
                        message= _ "We just got the Lich's book, and I can 
litererally feel the power of the Ruby, even with it in my pack. Let's figure 
out what it does, before we decide what to do with it."
                [/message]
@@ -218,10 +204,8 @@
                        [/variable]
                        
                        [then]
-                               
-               
+
                                [message]
-                                       id=msgT9_11
                                        speaker=second_unit
                                        message= _ "Hmmm. He seems to have had 
a map, and some gold!"
                                [/message]
@@ -243,7 +227,6 @@
                                [/set_variable]
 
                                [message]
-                                       id=msgT9_12
                                        description=Daellyn the Red
                                        message= _ "Brother!"
                                [/message]
@@ -271,7 +254,6 @@
                        
                        [then]
                                [message]
-                                       id=msgT9_13
                                        speaker=second_unit
                                        message= _ "Hmmm. He seems to have had 
a map."
                                [/message]
@@ -290,7 +272,6 @@
                                [/set_variable]
 
                                [message]
-                                       id=msgT9_14
                                        description=Tinry the Red
                                        message= _ "Brother!"
                                [/message]
@@ -313,7 +294,6 @@
                [/filter]
                
                [message]
-                       id=msgT9_15
                        speaker=unit
                        message= _ "Argh, the stream bed is blocked! Only a 
pint of goo is getting through. We'll have to go around."
                [/message]
@@ -331,7 +311,6 @@
                [/redraw]
 
                [message]
-                       id=msgT9_16
                        speaker=narrator
                        message= _ "To Southbay"
                [/message]
@@ -356,19 +335,19 @@
                        [/have_unit]
                        [then]
                                [if]
-               
+
                                        [variable]
                                                name=wiz_dead
                                                equals=yes
                                        [/variable]
-                                               
+
                                        [then]
                                                [endlevel]
                                                        bonus=yes
                                                        result=victory
                                                [/endlevel]
                                        [/then]
-                                       
+
                                        [else]
                                                [endlevel]
                                                        bonus=no
@@ -379,7 +358,6 @@
                        [/then]
                        [else]
                                [message]
-                                       id=msgT9_17
                                        speaker=narrator
                                        message= _ "It's not very Heroic if 
Prince Haldric isn't the one to lead his band from the Sewers of Southbay."
                                [/message]
@@ -397,13 +375,11 @@
                        y=9
                [/filter]
                [message]
-                       id=msgT9_18
                        speaker=narrator
                        message= _ "Danger Ahead!"
                [/message]
                
                [message]
-                       id=msgT9_19
                        speaker=unit
                        message= _ "Ahead, so far it's been danger everywhere."
                [/message]
@@ -411,15 +387,14 @@
                [allow_undo]
                [/allow_undo]
        [/event]
-       
+
        [event]
                name=victory
                [message]
-                       id=msgT9_20
                        speaker=Prince Haldric
                        message= _ "Finally on to Southbay!"
                [/message]
-               
+
                {CLEAR_VARIABLE wiz_dead}
                
        [/event]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.17 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.18
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg:1.17      
Fri Nov 19 01:18:53 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg   Sun Jan 
 9 21:35:47 2005
@@ -98,161 +98,132 @@
                name=start
 
                [message]
-                       id=msgT10_1
                        speaker=narrator
                        message= _ "Prince Haldric has emerged from the sewers 
of Southbay in the very heart of the city. After some commotion, he is given an 
audience with the King of Southbay."
                [/message]
                [message]
-                       id=msgT10_2
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "So Prince, you bring refugees, but do you 
bring swords as well?"
                [/message]
                [message]
-                       id=msgT10_3
                        description=Prince Haldric
                        message= _ "I bear both, and all are loyal to the King 
of Southbay!"
                [/message]
                [message]
-                       id=msgT10_4
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "I knew you as a boy, and your people have 
preceded you. Your father was an honourable man, and so are you. Aren't you the 
King now?"
                [/message]
                [message]
-                       id=msgT10_5
                        description=Prince Haldric
                        message= _ "A King with no land and no crown is no King 
my Lord."
                [/message]
                [message]
-                       id=msgT10_6
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Fair enough. These are dark days to live 
through my young Prince. You've done your father proud. Far better than my 
legacy, a dead adventurer and a missing fool! It is fitting that my line should 
end with my kingdom."
                [/message]
                [message]
-                       id=msgT10_7
                        description=Prince Haldric
                        message= _ "You should not say such things!"
                [/message]
                [message]
-                       id=msgT10_8
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Hmph! It matters little now. What's this? 
You bring a Wesfolk waif with you. Put her out with the others!"
                [/message]
                [message]
-                       id=msgT10_9
                        description=Lady Jessica
                        message= _ "You've put my people out in the snow! 
Prepare to meet your fate you- -"
                [/message]
                [message]
-                       id=msgT10_10
                        description=Prince Haldric
                        message= _ "She and her people have been of great 
service to me. Open the gates, let them in."
                [/message]
                [message]
-                       id=msgT10_11
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "What? On your word alone boy? And what of 
the other Wesfolk that have drifted to our gate?"
                [/message]
                [message]
-                       id=msgT10_12
                        description=Prince Haldric
                        message= _ "Let them all in! For the sake of humanity 
on this isle!"
                [/message]
                [message]
-                       id=msgT10_13
                        description=Lady Jessica
                        message= _ "And because I can sweeten the deal. I can 
save the lives of all of the people left on this isle. I will reveal all, if 
you swear on the soul of your eldest son that you will let all of the Wesfolk 
who may come into the city, and to allow them to participate in what must 
happen next."
                [/message]
                [message]
-                       id=msgT10_14
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Hmm. . . Very well. I so swear. Speak."
                [/message]
                [message]
-                       id=msgT10_15
                        description=Lady Jessica
                        message= _ "First, I CAN translate the book that will 
allow Haldric to use the Ruby of Fire. The artifact should help with what must 
come."
                [/message]
                [message]
-                       id=msgT10_16
                        description=Lady Jessica
                        message= _ "Second, I know the way to the mysterious 
lands of the East. Addroran, I was your son's navigator and companion. Believe 
me, you must go East."
                [/message]
                [message]
-                       id=msgT10_17
                        description=Prince Haldric
                        message= _ "Compan- - What?"
                [/message]
                [message]
-                       id=msgT10_18
                        description=Burin the Lost
                        message= _ "She's just full of surprises."
                [/message]
                [message]
-                       id=msgT10_19
                        description=Lady Jessica
                        message= _ "I was the navigator. Haldric, your people 
simply washed up here long ago. My people actually came here on purpose. You'd 
all still be herding sheep and living in grass huts if it wasn't for my people."
                [/message]
                [message]
-                       id=msgT10_20
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Some favour your people did for us. Why 
flee at all? And why East? We've already repelled an Orcish assult just before 
winter came. We should be working toward taking back the Isle."
                [/message]
                [message]
-                       id=msgT10_21
                        description=Lady Jessica
                        message= _ "This is no time for bravado. You must head 
East because my people came from the West, which is teeming with every form of 
man and monster imaginable. There is literally no room there. If you thought we 
were bad, you should see what else lives there. You'd be slaves, or you'd be 
dead."
                [/message]
                [message]
-                       id=msgT10_22
                        description=Lady Jessica
                        message= _ "Learn the lesson of my people. If we had 
fled here while even one of our great cities still stood we could have taken 
this Isle with ease. But we fought on until the bitter end. There can be no 
compromise with the Orcs, their numbers are limitless, and you have no way to 
stop more Orcs from coming."
                [/message]
                [message]
-                       id=msgT10_23
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "Hmm. There is wisdom in your words, and my 
end should be in this place. We can hold out for the rest of the winter here. 
When the Orcs last came it was fall and the harvest was in. We can hunt the 
great schools of fish that live under the ice. You might even be able to depart 
in well provisioned ships!"
                [/message]
                [message]
-                       id=msgT10_24
                        description=Lady Jessica
                        message= _ "Don't you intend to come with us?"
                [/message]
                [message]
-                       id=msgT10_25
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "No. Flee, and flee East. It is my duty to 
hold this city as long as I can. For the sake of all who can be evacuated. That 
means that it should fall on Haldric and you to lead the evacuation."
                [/message]
                [message]
-                       id=msgT10_26
                        description=Prince Haldric
                        message= _ "My King, there will be a new kingdom in the 
East, and the bulk of the fleet will bear the flag of Southbay. A new throne 
and new lands await you in the East."
                [/message]
                [message]
-                       id=msgT10_27
                        description=King Addroran IX
                        image="portraits/The_Rise_of_Wesnoth/addroran.png"
                        message= _ "My bloodline has ended with my sons, and I 
am old. Let the ships take the the women, children, and young men first. A new 
Kingdom must be born of vital blood. Us old men are still of some value. We 
will make the Orcs pay dearly when they come to take this place!"
                [/message]
                [message]
-                       id=msgT10_28
                        description=Prince Haldric
                        message= _ "Well, if there is no other way. May the 
bards forever sing of the valour of the Kings of Southbay! Jessica, about that 
book?"
                [/message]
                [message]
-                       id=msgT10_29
                        description=Lady Jessica
                        message= _ "I'll begin my translation. Oh, and you 
should seal up the sewer entrance."
                [/message]
-               
+
                [endlevel]
                        result=continue
                [/endlevel]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.25 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.26
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg:1.25      
Sat Dec  4 05:48:32 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg   Sun Jan 
 9 21:35:47 2005
@@ -139,24 +139,18 @@
        name=start
 
                [message]
-                       id=msgT5_1
                        speaker=narrator
                        message= _ "With a feeling of grim curiosity Prince 
Haldric and his company descend into catacombs below the temple, buried deep in 
the bedrock, in the very roots of the world itself. In the distance Haldric 
hears a booming voice."
                [/message]
                [message]
-                       id=msgT5_2
                        description=Lich-Lord Lenvan
                        message= _ "Free! I'm free at last! I knew those puny 
mages couldn't seal me in here forever! Rise my soldiers of Darkness, the world 
will be ours once more!"
                [/message]
-               
                [message]
-                       id=msgT5_3
                        description=Burin the Lost
                        message= _ "Back underground. . . This feels much 
better! As for the current residents, uggh!"
                [/message]
-
                [message]
-                       id=msgT5_4
                        description=Prince Haldric
                        message= _ "Let's put these monsters to their final 
rest."
                [/message]
@@ -168,7 +162,6 @@
                description=Lich-Lord Lenvan
                [/filter]
                [message]
-                       id=msgT5_5
                        speaker=unit
                        message= _ "I am fallen after all this time."
                [/message]
@@ -177,7 +170,6 @@
                        value=1
                [/set_variable]
                [message]
-                       id=msgT5_6
                        speaker=Prince Haldric
                        message= _ "The world won't miss him one bit."
                [/message]
@@ -193,12 +185,11 @@
                                [/endlevel]
                        [/then]
                [/if]
-        [/event]
+       [/event]
 
        [event]
        name=time over
                [message]
-                       id=msgT5_7
                        description=Prince Haldric
                        message= _ "What's that! No! The tree-folk are sealing 
us back in here. They must think that we've failed. We're trapped."
                [/message]
@@ -212,7 +203,6 @@
                        y=18
                [/filter]
                [message]
-                       id=msgT5_8
                        speaker=narrator
                        message= _ "INSCRIPTION: Embrace the Monolith to be 
Cured by the Powers of Light."
                [/message]
@@ -226,7 +216,6 @@
                        y=18
                [/filter]
                [message]
-                       id=msgT5_8
                        speaker=narrator
                        message= _ "INSCRIPTION: Embrace the Monolith to be 
Cured by the Powers of Light."
                [/message]
@@ -241,7 +230,6 @@
                        side=1 
                [/filter_second] 
                [message]
-                       id=msgT5_9
                        speaker=unit
                        message= _ "I don't like the look of that pool at all."
                [/message]
@@ -255,7 +243,6 @@
                        y=2,2
                [/filter]
                [message]
-                       id=msgT5_10
                        speaker=narrator
                        message= _ "It looks scary, but it's good for you."
                [/message]
@@ -276,7 +263,6 @@
                        [/variable]
                        [then]
                                [message]
-                                       id=msgT5_11
                                        speaker=narrator
                                        message= _ "You already have the Fire 
Ruby."
                                [/message]
@@ -288,7 +274,7 @@
                                                x=13
                                                y=2
                                        [/have_unit]
-                                       
+
                                        [then]
                                                [set_variable]
                                                        name=Have_Ruby
@@ -300,13 +286,11 @@
                                                [/sound]
 
                                                [message]
-                                                       id=msgT5_12
                                                        speaker=narrator
                                                        message= _ "As you open 
the chest you see it, the Ruby of Fire. It is the size of an apple, and burns 
with and internal fire, which is refracted through its faces. You can feel the 
power flowing from it. . ."
                                                [/message]
                
                                                [message]
-                                                       id=msgT5_13
                                                        speaker=Prince Haldric
                                                        message= _ "It's funny 
that the Lich-Lord didn't have this on his person. Since I don't actually know 
what this thing does, I'll just put it in the bottom of my pack for right now."
                                                [/message]
@@ -333,7 +317,6 @@
                                                [/sound]
 
                                                [message]
-                                                       id=msgT5_14
                                                        speaker=narrator
                                                        message= _ "Maybe you 
should move somebody else to the chest."
                                                [/message]
@@ -348,7 +331,6 @@
        [event]
                name=victory
                [message]
-                       id=msgT5_15
                        speaker=Prince Haldric
                        message= _ "I'm glad that's over! We have the Ruby of 
Fire, and that Lich-Lord is now a pile of dust, let's get out of these 
catacombs!"
                [/message]
@@ -359,7 +341,7 @@
        [event]
                name=die
                first_time_only=no
-               
+
                {RISE_UP_RISE_UP $x1 $y1}
        [/event]
 
@@ -369,7 +351,6 @@
                        side=1
                [/filter]
                [message]
-                       id=msgT5_16
                        speaker=Prince Haldric
                        message= _ "He's raising our dead!"
                [/message]      
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.18 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.19
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg:1.18      Thu Nov 
25 05:10:21 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg   Sun Jan  9 
21:35:47 2005
@@ -214,56 +214,50 @@
                        value=0
                [/set_variable]
        [/event]
-       
+
        [event]
                name=start
                [message]
-                       id=msgT16b_1
                        speaker=narrator
                        message= _ "After some days of travel Haldric finds 
himself confronted by a vast expanse of swamp. A small island with a mountain 
dominates the view. That can only be the home of the dragon."
                [/message]
-               
+
                [message]
-                       id=msgT16b_2
                        description=Burin the Lost
                        message= _ "Flies, fies, everywhere! Ahhhck!"
                [/message]
-               
+
                [message]
-                       id=msgT16b_3
                        description=Prince Haldric
                        message= _ "'Prince Haldric the Dragonbane' sounds 
rather nice."
                [/message]
-               
+
                [message]
-                       id=msgT16b_4
                        description=Lady Jessica
                        message= _ "We'll see. . ."
                [/message]
                
        [/event]
-       
+
        [event]
                name=victory
                [message]
-                       id=msgT16b_5
                        description=Prince Haldric
                        message= _ "I'm glad that's over. The elves certainly 
aren't taking it easy on us. It's a miracle any of us are alive at all."
                [/message]
-               
+
                [message]
-                       id=msgT16b_6
                        description=Lady Jessica
                        message= _ "I'm still not calling you 'the Dragonbane'."
                [/message]
-               
+
                {VARIABLE_OP num_done add 1}
-               
+
                [set_variable]
                        name=the_dragon
                        value=1
                [/set_variable]
-               
+
                [set_variable]
                        name=last_done
                        value="Dragon"
@@ -278,7 +272,7 @@
                [filter]
                        type=Giant Mudcrawler
                [/filter]
-               
+
                [unit]
                        description=A Blob
                        type=Mudcrawler
@@ -286,7 +280,7 @@
                        x={X}
                        y={Y}
                [/unit]
-               
+
                [unit]
                        description=A Blob
                        type=Mudcrawler
@@ -309,12 +303,11 @@
                        type=Giant Mudcrawler
                [/filter]
                [message]
-                       id=msgT16b_7
                        speaker=Prince Haldric
                        message= _ "Watch for the big Mudcrawlers they divide 
when you kill them."
                [/message]
        [/event]
-       
+
 #define GOLD_TO_BADDIES
                [gold]
                        side=2
@@ -342,7 +335,7 @@
                        x=12-26
                        y=24-30
                [/filter]
-               
+
                [if]
                        [variable]
                                name=dragon_awake
@@ -356,12 +349,10 @@
                                        value=1
                                [/set_variable]
                                [message]
-                                       id=msgT16b_8
                                        speaker=Shek'kahan
                                        message= _ "It is unwise to trifle with 
dragons boy!"
                                [/message]
                                [message]
-                                       id=msgT16b_9
                                        speaker=Prince Haldric
                                        message= _ "We shall see."
                                [/message]
@@ -369,7 +360,7 @@
                        [/then]
                [/if]
        [/event]
-       
+
        [event]
        name=turn 15
                [if]
@@ -385,12 +376,10 @@
                                        value=1
                                [/set_variable]
                                [message]
-                                       id=msgT16b_10
                                        speaker=Shek'kahan
                                        message= _ "Who dares disturb 
Shek'kahan the terrible?"
                                [/message]
                                [message]
-                                       id=msgT16b_11
                                        speaker=Prince Haldric
                                        message= _ "I do, you fiend!"
                                [/message]
@@ -398,7 +387,7 @@
                        [/then]
                [/if]
        [/event]
-       
+
        [event]
        name=moveto
                [filter]
@@ -406,15 +395,15 @@
                        x=20
                        y=27
                [/filter]
-               
+
                {LOOT 200 1}
-               
+
                [set_variable]
                        name=got_treasure
                        value=1
                [/set_variable]
        [/event]
-       
+
        [event]
        name=enemies defeated
                [if]
@@ -424,7 +413,6 @@
                        [/variable]
                        [then]
                                [message]
-                                       id=msgT16b_12
                                        speaker=Lady Jessica
                                        message= _ "We still have to slay the 
dragon!"
                                [/message]
@@ -437,7 +425,6 @@
                                [/variable]
                                [then]
                                        [message]
-                                               id=msgT16b_13
                                                speaker=Prince Haldric
                                                message= _ "The Dragon's Cave 
has yielded some treasure!"
                                        [/message]
@@ -462,7 +449,6 @@
                        description=Shek'kahan
                [/filter]
                [message]
-                       id=msgT16b_14
                        speaker=Shek'kahan
                        message= _ "No!"
                [/message]
@@ -477,12 +463,10 @@
                        [/variable]
                        [then]
                                [message]
-                               id=msgT16b_14a
                                description=Prince Haldric
                                message= _ "We've slain the Dragon: "
-                               
+
                                [option]
-                               id=run_now
                                message= _ "Let's get out of here!"
                                [command]
                                        [endlevel]
@@ -493,7 +477,6 @@
                                [/option]
 
                                [option]
-                               id=fight_now
                                message= _ "Let's finish off the rest of these 
monsters!"
                                [/option]
                                [/message]
@@ -506,14 +489,13 @@
                                [/variable]
                                [then]
                                        [message]
-                                               id=msgT16b_15
                                                speaker=Prince Haldric
                                                message= _ "The Dragon's Cave 
has yielded some treasure!"
                                        [/message]
                                        {LOOT 200 1}
                                [/then]
                                [/if]
-                               
+
                                [endlevel]
                                        result=victory
                                        bonus=yes
@@ -521,11 +503,10 @@
                        [/else]
                [/if]
        [/event]
-       
+
        [event]
                name=time over
                [message]
-                       id=msgT16b_16
                        description=Prince Haldric
                        message= _ "More Saurians are arriving. They've 
surrounded us! We're doomed."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.17 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.18
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg:1.17        Sun Nov 
 7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg     Sun Jan  9 
21:35:47 2005
@@ -153,69 +153,61 @@
 
        [event]
                name=start
-               
+
                [message]
-                       id=msgT1_1
                        speaker=narrator
                        message= _ "Summer passes into fall, and King Eldaric 
fortifies his frontiers. It is not long before the first orcish scouts are 
spotted. War has come to the valley."
                [/message]
-               
+
                [message]
-                       id=msgT1_2
                        description=King Eldaric IV
                        message= _ "Haldric, things have not gone well! The 
Orcs have arrived. We met them at the north keep but they were just too many. 
They have flanked us to the East in the mountains. I have my personal guards 
holding the pass to the North, but they won't be able to last long. . . We must 
evacuate our home."
                [/message]
-               
+
                [message]
-                       id=msgT1_3
                        description=Prince Haldric
                        message= _ "That's awful! And it only gets worse. That 
Wesfolk rabble has set up shop again in the South Pass. . ."
                [/message]
-               
+
                [message]
-                       id=msgT1_4
                        description=King Eldaric IV
                        message= _ "That's the only way out of the valley! This 
is a disaster! We must defeat that Wesfolk scum and flee to the South. Our home 
is lost. . . We must make haste."
                [/message]
-               
+
                [message]
-                       id=msgT1_5
                        description=Tan-Rarbag
                        message= _ "So HUMAN, care to make your final stand?"
                [/message]
-               
+
                [message]
-                       id=msgT1_6
                        description=Tan-Erang
                        message= _ "Die! Die! Die!"
                [/message]
-               
+
                [message]
-                       id=msgT1_7
                        description=Wesfolk Leader
                        message= _ "This is going to get ugly. . ."
                [/message]
        [/event]
-       
+
        [event]
                name=turn 14
                [message]
-                       id=msgT1_8
                        description=King Eldaric IV
                        message= _ "Hurry! Only death awaits in this valley!"
                [/message]
        [/event]
-       
+
        [event]
                name=die
                [filter]
                        description=Tan-Erang
                [/filter]
-               
+
                [filter_second]
                        side=1
                [/filter_second]
-               
+
                {LOOT 75 1}
        [/event]
 
@@ -224,92 +216,83 @@
                [filter]
                        description=Tan-Rarbag
                [/filter]
-               
+
                [filter_second]
                        side=1
                [/filter_second]
-               
+
                {LOOT 75 1}
        [/event]
-       
+
        [event]
                name=die
-               
+
                [filter]
                        description=Wesfolk Leader
                 [/filter]
-               
+
                [filter_second]
                        side=1
                [/filter_second]
                 
                [message]
-                       id=msgT1_9
-                       speaker=unit
-                       message= _ "Ummm, I evoke surrender. . ."
-                [/message]
-                
+                       speaker=unit
+                       message= _ "Ummm, I evoke surrender. . ."
+               [/message]
+
                [message]
-                       id=msgT1_10
-                       description=King Eldaric IV
-                       message= _ "Nay! Off with your hea- - -"
-                [/message]
-                
+                       description=King Eldaric IV
+                       message= _ "Nay! Off with your hea- - -"
+               [/message]
+
                [message]
-                       id=msgT1_11
                        speaker=unit
                        message= _ "But I can help! Really! You could use me 
and my men's skills on the long road ahead!"
-                [/message]
+               [/message]
                 
                [message]
-                       id=msgT1_12
-                       description=King Eldaric IV
-                       message= _ "Haldric, what say you on this matter?"
-                [/message]
-               
+                       description=King Eldaric IV
+                       message= _ "Haldric, what say you on this matter?"
+               [/message]
+
                [message]
-                       id=msgT1_12a
                        description=Prince Haldric
                        message= _ "Hmm... after some thought. . ."
-                       
+
                        [option]
-                               id=accept_wesfolk
                                message= _ "I think that your skills may be 
useful. You may join us."
                                [command]
-                                       
+
                                        [message]
-                                               id=msgT1_13a
                                                description=Wesfolk Leader
                                                message= _ "Let there be peace 
between us, our survival depends on it."
                                        [/message]
-                                       
+
                                        [allow_recruit]
                                        #Single line the list, check my bug
                                                type=Footpad
                                        [/allow_recruit]
-                                       
+
                                        [allow_recruit]
                                        #Single line the list, check my bug
                                                type=Poacher
                                        [/allow_recruit]
-                                       
+
                                        [allow_recruit]
                                        #Single line the list, check my bug
                                                type=Thief
                                        [/allow_recruit]
-                                       
+
                                        [allow_recruit]
                                        #Single line the list, check my bug
                                                type=Thug
                                        [/allow_recruit]
-                                       
+
                                        [message]
-                                               id=msgT1_13b
                                                description=Prince Haldric
                                                message= _ "So what shall I 
call you?"
                                        [/message]
                                        [message]
-                                               id=msgT1_13c
                                                description=Wesfolk Leader
                                                message= _ "The Lady Outlaw 
will do."
                                        [/message]
@@ -327,27 +310,23 @@
                                [/command]
                        [/option]
                        [option]
-                               id=reject_wesfolk
                                message= _ "Your word can't be trusted. Prepare 
to meet your Gods!"
                                [command]
                                        [message]
-                                               id=msgT1_13e
                                                description=Wesfolk Leader
                                                message= _ "Arrogant fools! 
(Reaches into pocket) POOF!"
                                        [/message]
-                                       
+
                                        [message]
-                                               id=msgT1_13f
                                                description=King Eldaric IV
                                                message= _ "Argh, she's gone. 
Next time, more sword, less chat."
                                        [/message]
-                                       
+
                                        [message]
-                                               id=msgT1_13g
                                                description=Prince Haldric
                                                message= _ "She's clever! Maybe 
I made the wrong choice. Well, at least she left some of her gold behind. . ."
                                        [/message]
-                                       
+
                                        [set_variable]
                                                name=have_lady
                                                value=0
@@ -367,58 +346,54 @@
                        [/option]
                [/message]
                [message]
-                       id=msgT1_14
-                       description=King Eldaric IV
-                       message= _ "Son, you must lead our people through the 
South Pass. I will remain behind to hold off these vile monsters for as long as 
I can."
-                [/message]
-               [message]
-                       id=msgT1_15
-                       description=Prince Haldric
-                       message= _ "But Father!"
-                [/message]
+                       description=King Eldaric IV
+                       message= _ "Son, you must lead our people through the 
South Pass. I will remain behind to hold off these vile monsters for as long as 
I can."
+               [/message]
+               [message]
+                       description=Prince Haldric
+                       message= _ "But Father!"
+               [/message]
                [message]
                        id=msgT1_16
-                       description=King Eldaric IV
-                       message= _ "It's the only way. Go now, and don't look 
back! Luck be with you!"
-                [/message]
-               
-                [endlevel]
-                       result=victory
-                       bonus=yes
-                [/endlevel]
-               
-        [/event]
-       
+                       description=King Eldaric IV
+                       message= _ "It's the only way. Go now, and don't look 
back! Luck be with you!"
+               [/message]
+
+               [endlevel]
+                       result=victory
+                       bonus=yes
+               [/endlevel]
+
+       [/event]
+
        [event]
-                       name=die
+               name=die
                [filter]
                        description=Wesfolk Leader
                [/filter]
-       
+
                [filter_second]
                        side=3, 4
                [/filter_second]
-               
+
                [message]
-                       id=msgT1_17
                        description=King Eldaric IV
                        message= _ "We're surrounded! The Orcs have taken the 
southern pass! All is lost!"
                [/message]
-               
+
                [endlevel]
-                       result=defeat
+                       result=defeat
                [/endlevel]
        [/event]
-       
+
        [event]
                name=time over
                [message]
-                       id=msgT1_18
                        description=King Eldaric IV
                        message= _ "We're surrounded! I can see their 
re-enforcements! All is lost!"
                [/message]
        [/event]
-       
+
        [event]
                name=moveto
                [filter]
@@ -427,22 +402,20 @@
                        y=13-15
                [/filter]
                [message]
-                       id=msgT1_19
                        description=Prince Haldric
                        message= _ "Our Home! Where shall we go!"
                [/message]
                [message]
-                       id=msgT1_20
                        description=King Eldaric IV
                        message= _ "There can be no looking back! We must go 
South."
                [/message]
        [/event]
-       
+
        [event]
                name=victory
                [kill]
                        description=King Eldaric IV
                [/kill]
        [/event]
-       
+
 [/scenario]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.22 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.23
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg:1.22    Wed Dec 
22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg Sun Jan  9 
21:35:47 2005
@@ -162,43 +162,36 @@
                name=start
 
                [message]
-                       id=msgT3b_1
                        speaker=narrator
                        message= _ "Prince Haldric leads his refugee band into 
the Midlands and smoke is in the air."
                [/message]
                
                [message]
-                       id=msgT3b_2
                        speaker=Prince Haldric
                        message= _ "It is as we suspected, the Orcs have sacked 
the Midlands. This is not a civilised way to fight a war! Look there, there are 
still Orcs about.. . To arms!"
                [/message]
                
                [message]
-                       id=msgT3b_3
                        speaker=Burin the Lost
                        message= _ "Alright! Charge!"
                [/message]
                
                [message]
-                       id=msgT3b_4
                        speaker=Lady Outlaw
                        message= _ "Feel my wrath you Orcish scum!"
                [/message]
                
                [message]
-                       id=msgT3b_5
                        speaker=Tan-Vrodis
                        message= _ "HUMANS. . . I see humans!"
                [/message]
                
                [message]
-                       id=msgT3b_6
                        speaker=Tan-Bok
                        message= _ "Ha, Hogar! You said we wouldn't see any 
action this far back from the front."
                [/message]
                
                [message]
-                       id=msgT3b_7
                        speaker=Tan-Hogar
                        message= _ "Shut yer mouth! Let's just get 'em."
                [/message]
@@ -217,7 +210,6 @@
                [/redraw]
 
                [message]
-                       id=msgT3b_8
                        speaker=narrator
                        message= _ "SE - The Oldwood. Enter at Your Own Risk!"
                [/message]
@@ -237,7 +229,6 @@
                [/redraw]
 
                [message]
-                       id=msgT3b_9
                        speaker=narrator
                        message= _ "SW - Southbay."
                [/message]
@@ -261,7 +252,6 @@
                {UNIT (Goblin Knight) (Grilg) 3 11 33}
                
                [message]
-                       id=msgT3b_10
                        description=Grilg
                        message= _ "What? More humans here? Get them!"
                [/message]
@@ -289,7 +279,6 @@
                {UNIT (Orcish Slayer) (Vrogar) 4 36 33}
                
                [message]
-                       id=msgT3b_11
                        description=Vrogar
                        message= _ "How'd they get behind us? I hate to miss 
such tasty meat."
                [/message]
@@ -313,7 +302,6 @@
 
                [message]
                        description=Tan-Hogar
-                       id=msgT3b_12
                        message= _ "Better him than me! Reserves!"
                [/message]
                
@@ -335,7 +323,6 @@
 
                [message]
                        description=Tan-Bok
-                       id=msgT3b_13
                        message= _ "Holgar was a fool! Reserves!"
                [/message]
                
@@ -352,64 +339,55 @@
                        x=40,39,38,37,36,35,34,33,32,31,30
                        y=15,16,16,16,16,16,15,15,14,14,14
                [/move_unit_fake]
-               
+
                {HERO (Knight) (Sir Ladoc) 1 30 14}
-               
+
                [message]
                        description=Sir Ladoc
-                       id=msgT3b_14
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Hold There! You can not pass. You've 
already stumbled on the Orcish rear guard. The main body of their forces is on 
the road to Southbay. It is an army of nightmarish size."
                [/message]
-               
+
                [message]
                        description=Prince Haldric
-                       id=msgT3b_15
                        message= _ "I'm Haldric, my father was King Eldaric IV 
in the lands North-West of here. Soldier, aren't you on the wrong side of the 
lines?"
                [/message]
-               
+
                [message]
                        description=Sir Ladoc
-                       id=msgT3b_16
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "They overran my post. I got hit on the head 
pretty good, when I came to the Orcish army had already passed my position."
                [/message]
-               
+
                [message]
                        description=Prince Haldric
-                       id=msgT3b_17
                        message= _ "Tell me, how fares Southbay?"
                [/message]
-               
+
                [message]
                        description=Sir Ladoc
-                       id=msgT3b_18
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Southbay won't fall without one hell of a 
fight, sir. They'll stand to the last! I only wish I was there!"
                [/message]
-               
+
                [message]
                        description=Sir Ladoc
-                       id=msgT3b_19
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Well, we can't go back, and the road ahead 
is blocked. . . I guess we'll have to risk it and go through the Oldwood 
forest, then make a break for Clearwater Port."
                [/message]
-               
+
                [message]
-                       id=msgT3b_20
                        speaker=Burin the Lost
                        message= _ "Oh great, now a forest. I should have 
stayed at home and took my chances with the Orcs!"
                [/message]
-               
+
                [message]
                        description=Sir Ladoc
-                       id=msgT3b_21
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Sir, if you don't mind, I'll go with you."
                [/message]
-               
+
                [message]
-                       id=msgT3b_22
                        speaker=Lady Outlaw
                        message= _ "On we go. . ."
                [/message]
@@ -418,7 +396,7 @@
                        value="Midlands"
                [/set_variable]
        [/event]
-       
+
        [event]
        name=time over
                [message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.27 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.28
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:1.27     Tue Nov 
30 03:13:19 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg  Sun Jan  9 
21:35:47 2005
@@ -203,55 +203,45 @@
        [event]
        name=start
                [message]
-                       id=msgT4_1
                        speaker=narrator
                        message= _ "Haldric's band finds itself at the heart of 
the Oldwood Forest. The road quickly narrows and becomes little more than a 
path. Branches reach high overhead, blocking almost all of the light. . . The 
ominous noises of the deep woods echo all around."
                [/message]
                [message]
-                       id=msgT4_2
                        description=Burin the Lost
                        message= _ "Will this evil forest ever end! There are 
mosquitoes as big as my fist in here, and these nasty old trees are giving me 
the creeps."
                [/message]
                [message]
-                       id=msgT4_3
                        description=Lady Outlaw
                        message= _ "This isn't so bad. Haldric's kind are such 
a suspicious lot when it comes to these sorts of things."
                [/message]
                [message]
-                       id=msgT4_4
                        description=Prince Haldric
                        message= _ "Quiet. Listen, I think I hear something."
                [/message]
                [message]
-                       id=msgT4_5
                        description=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "All I hear are more tree-foes!"
                [/message]
                [message]
-                       id=msgT4_6
                        description=Prince Haldric
                        message= _ "That tree, it speaks! No- No- We are 
tree-friends, really!"
                [/message]
                [message]
-                       id=msgT4_7
                        description=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "You kind has long come with your axes, some 
tree-friends you are. Still you must be less worse than these new monsters that 
have come to plague us. They cut the trees, and burn the trees for no reason at 
all!"
                [/message]
                [message]
-                       id=msgT4_8
                        description=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "You claim to be a tree-friend, so be a 
tree-friend now. For we are in dire need, or you may meet your fate with the 
rest of these monsters."
                [/message]
                [message]
-                       id=msgT4_9
                        description=Prince Haldric
                        message= _ "We will help. (Quietly) Be careful with the 
trees."
                [/message]
                [message]
-                       id=msgT4_10
                        description=Burin the Lost
                        message= _ "What! What are you looking at me for?"
                [/message]
@@ -265,7 +255,6 @@
                        y=22
                [/filter]
                [message]
-                       id=msgT4_11
                        speaker=unit
                        message= _ "The temple has already been looted, however 
the entrance to it's catacombs seem to be blocked by a wall of magical energy."
                [/message]
@@ -277,7 +266,6 @@
        [event]
        name=turn 4
                [message]
-                       id=msgT4_12
                        description=Tan-Rugar
                        message= _ "Stupid stinking trees, we'll show you!"
                [/message]
@@ -286,7 +274,6 @@
        [event]
        name=turn 6
                [message]
-                       id=msgT4_13
                        description=Tan-Gralg
                        message= _ "Chop 'em down. It's cool in these woods, I 
think we need a fire!"
                [/message]
@@ -298,12 +285,10 @@
                 description=Elilmaldur-Rithrandil
                 [/filter]
                [message]
-                       id=msgT4_14
                        description=Prince Haldric
                        message= _ "Without the help of these tree-folk we'll 
be trapped in these woods till we die! There will be nothing to hold the Orcs 
back!"
                [/message]
                [message]
-                       id=msgT4_15
                        speaker=Burin the Lost
                        message= _ "Stupid tree-folk."
                [/message]
@@ -316,68 +301,55 @@
        [event]
                name=victory
                [message]
-                       id=msgT4_16
                        speaker=Prince Haldric
                        message= _ "We've defeated the Orcs"
                [/message]
                [message]
-                       id=msgT4_17
                        speaker=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "On this day you have proved yourself to be 
a tree-friend. For so long your kind has only come with sharp blades to harm my 
kind. You come to build these buildings of stone. Our roots may be slow, but 
they are strong, we will eventually claim all of the stones back for the earth."
                [/message]
                [message]
-                       id=msgT4_18
                        speaker=Prince Haldric
                        message= _ "Well, I suspect you won't have to worry 
about my kind for much longer. The Orcs have come, and they are taking this 
Isle!"
                [/message]
                [message]
-                       id=msgT4_19
                        speaker=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "Hmmmm- my kind were here before your kind, 
and we will be here after the Orcs are gone as well. We were here before all 
others, and I suspect the we will be here in the end."
                [/message]
                [message]
-                       id=msgT4_20
                        speaker=Prince Haldric
                        message= _ "Can you help us fight the Orcs?"
                [/message]
                [message]
-                       id=msgT4_21
                        speaker=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "My kind are bound to the forest, we would 
be of little help to you beyond our borders. Maybe we could still be of some 
aide to you. In a war of your people some time ago one of your kings trapped an 
evil Lich in the catacombs of the temple at the heart of the wood. We were 
there, we were watching."
                [/message]
-               
                [message]
-                       id=msgT4_22
                        speaker=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "After we drove your kind off we figured out 
how to break the spell that holds the Evil in the catacombs, and keeps others 
from entering them."
                [/message]
                [message]
-                       id=msgT4_23
                        speaker=Prince Haldric
                        message= _ "This helps us how?"
                [/message]
                [message]
-                       id=msgT4_24
                        speaker=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "The Lich was carrying a powerful artifact. 
We know, we can feel it. This artifact may aid you in your quest."
                [/message]
                [message]
-                       id=msgT4_25
                        description=Lady Outlaw
                        message= _ "He must mean the Ruby of Fire. It was our 
most powerful artifact. We brought it with us from the East. We thought it was 
lost in the war with your people, when Lich-Lord Lenvan fell!"
                [/message]
                [message]
-                       id=msgT4_26
                        speaker=Prince Haldric
                        message= _ "At this point we need all of the help we 
can get!"
                [/message]
                [message]
-                       id=msgT4_27
                        speaker=Elilmaldur-Rithrandil
                        image="portraits/The_Rise_of_Wesnoth/rithrandil.png"
                        message= _ "Then I will open the catacombs for you. . ."
@@ -389,32 +361,26 @@
                        [/variable]
                        [then]
                                [message]
-                                       id=msgT4_28
                                        description=Lady Outlaw
                                        message= _ "Young Prince, while the 
Lich-lords have betrayed us by allying themselves with that Orcish scum, I 
can't bring myself to fight against one of the greatest leaders of my people."
                                [/message]
                                [message]
-                                       id=msgT4_29
                                        description=Prince Haldric
                                        message= _ "Lady, why would you let 
those monsters lead your people?"
                                [/message]
                                [message]
-                                       id=msgT4_30
                                        description=Lady Outlaw
                                        message= _ "Haldric, we are an ancient 
people who lived in a land filled with all manner of man and beast. We needed 
vision that extended beyond the meagre span of human years. The art of 
Necromancy allowed our best and brightest to live forever, and our worst got to 
serve as mindless slaves."
                                [/message]
                                [message]
-                                       id=msgT4_31
                                        description=Lady Outlaw
                                        message= _ "Other than losing our war 
back West, then our refugee war to your people, and this Orc thing, it wasn't 
such a bad deal. Lich-Lord Lenvan was one of our greatest leaders, he lead our 
escape in the West. Albeit, after being down in that hole for so long I don't 
imagine he's too happy."
                                [/message]
                                [message]
-                                       id=msgT4_32
                                        description=Prince Haldric
                                        message= _ "Uh-huh. Have you considered 
that the unholy act of turning your best and brightest into undead is what 
causes them to fall into darkness?"
                                [/message]
                                [message]
-                                       id=msgT4_33
                                        description=Lady Outlaw
                                        message= _ "We should save the debate 
for later. I can still be of use to you. I shall scout the road ahead. We need 
to know if we can make it to Southbay. I'll return in a few days."
                                [/message]
@@ -428,7 +394,6 @@
        [event]
        name=time over
                [message]
-                       id=msgT4_34
                        description=Prince Haldric
                        message= _ "We have run out of time. . . We'll be 
trapped in these woods until we die!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.7 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.8
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg:1.7 Sat Nov 13 
20:31:06 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg     Sun Jan  9 
21:35:47 2005
@@ -133,62 +133,50 @@
                [/delay]
 
                [message]
-                       id=msgT20_1
                        description=Lady Jessica
                        message= _ "So what is your plan?"
                [/message]
                [message]
-                       id=msgT20_2
                        description=Prince Haldric
                        message= _ "We're going to convince Jevyan that we gave 
the Elves the Ruby of Fire to secure our place in this new land. Then if the 
Orcs return, hopefully they'll go looking for our not so loyal Elven allies 
first."
                [/message]
                [message]
-                       id=msgT20_3
                        description=Lady Jessica
                        message= _ "Haldric, that's devious. I kind of like 
this plan. But you spoke a pact with the Elves, you'll be expected to come to 
their aid."
                [/message]
                [message]
-                       id=msgT20_4
                        description=Prince Haldric
                        message= _ "Yes, and we may come to their aid. We'll 
have to weigh our options when and if the time comes. If the Orcs return in 
great numbers the brunt of their assult must fall on somebody else. Who knows, 
maybe I won't even come to their aid at all-"
                [/message]
                [message]
-                       id=msgT20_5
                        description=Lady Jessica
                        message= _ "Many people will call you a coward. They 
will say that you turned your back on your pact with the Elves. It's not like 
you can tell people what I overheard."
                [/message]
                [message]
-                       id=msgT20_6
                        description=Prince Haldric
                        message= _ "Recent events have taught me one thing: 
that survival trumps honour. Besides, they won't be screaming at me- I'll be 
dead."
                [/message]
                [message]
-                       id=msgT20_7
                        description=Lady Jessica
                        message= _ "WHAT!"
                [/message]
                [message]
-                       id=msgT20_8
                        description=Prince Haldric
                        message= _ "I'll be dead. I mean we can't just say that 
we gave away the Ruby of Fire, or send Jevyan a letter. Well, we are going to 
say it- but that's not the point. Jessica, you're going to forge a very 
official looking treaty, in which we give the Elves the Ruby of Fire, in return 
for our place here."
                [/message]
                [message]
-                       id=msgT20_9
                        description=Prince Haldric
                        message= _ "I'm going to face Jevyan, and if rumours of 
his power are true he's going to pick that treaty off my mangled corpse. Then, 
you're going to destroy Jevyan after word of the treaty is spread to the Orcs, 
but before he has a chance to read my undead mind. . ."
                [/message]
                [message]
-                       id=msgT20_10
                        description=Lady Jessica
                        message= _ "Haldric! I won't do it. . . I won't help. 
What is it with your kind, always rushing to a fool's death. Who'll lead these 
people?"
                [/message]
                [message]
-                       id=msgT20_11
                        description=Prince Haldric
                        message= _ "You will. I wouldn't have made it this far 
without you. We really have to convince Jevyan-"
                [/message]
                [message]
-                       id=msgT20_12
                        description=Lady Jessica
                        message= _ "Haldric, this is ridiculous! I- -"
                [/message]
@@ -221,69 +209,57 @@
                [/unhide_unit]
 
                [message]
-                       id=msgT20_13
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "There is no way I'm letting you go through 
with this Sir! Over our dead bodies, right Jessica?"
                [/message]
                [message]
-                       id=msgT20_14
                        description=Lady Jessica
                        message= _ "Right!"
                [/message]
                [message]
-                       id=msgT20_15
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "I'll do it sir."
                [/message]
                [message]
-                       id=msgT20_16
                        description=Prince Haldric
                        message= _ "No. I can't ask you to do this."
                [/message]
                [message]
-                       id=msgT20_17
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "You've denied me my honourable death twice 
already. Once when you arrived at Clearwater Port, and once again when your 
ships rescued me. I'll not be denied in this a third time!"
                [/message]
                [message]
-                       id=msgT20_18
                        description=Prince Haldric
                        message= _ "No, this is my sacrifice to make!"
                [/message]
 
                [message]
-                       id=msgT20_19
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Sir, my family has been slaughtered, and my 
home lost. All I long for is to join them. Give me this honourable death. . . 
Please sir! I beg of you!"
                [/message]
                [message]
-                       id=msgT20_20
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "After this conflict is over I'll have to 
suffer through the long years alone, with no honourable way of joining them. I 
want to look that monster Jevyan in the eye before I go! I won't be denied!"
                [/message]
                [message]
-                       id=msgT20_21
                        description=Prince Haldric
                        message= _ "Very well, if you can't be deterred. 
Remember, you MUST be slain by the hand of Jevyan himself. We can't have an 
illiterate Orc or mindless Skeleton getting the treaty. We will honour your 
sacrifice."
                [/message]
                [message]
-                       id=msgT20_22
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Honour me by destroying Jevyan! Preferably 
before he can do unnatural things to me. I want to rest in the ground, not be 
some mindless undead slave for all eternity!"
                [/message]
                [message]
-                       id=msgT20_23
                        description=Prince Haldric
                        message= _ "We'll make sure. I promise."
                [/message]
                [message]
-                       id=msgT20_24
                        description=Lady Jessica
                        message= _ "We'll have to be careful to let one of the 
Orcish leaders escape back to the Green Isle with the knowledge that the Elves 
'have' the Ruby of Fire. Sheesh. . . What is your kind's infatuation with 
rushing to an 'honourable death'?"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.19 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.20
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg:1.19  Wed Dec 
22 00:38:50 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg       Sun Jan 
 9 21:35:47 2005
@@ -162,38 +162,32 @@
        [event]
                name=start
                [message]
-                       id=msgT3a_1
                        speaker=narrator
                        message= _ "With great trepidation Prince Haldric leads 
his refugee band into the Swamp of Esten. In the centre of that very swamp a 
shroud of fog descends over Young Prince Haldric."
                [/message]
-               
+
                [message]
-                       id=msgT3a_2
                        speaker=Prince Haldric
                        message= _ "I have a very bad feeling about this. This 
awful swamp and it's crazy cult. . . Before these troubles started we used to 
have to clear the swamp every spring and fall."
                [/message]
-               
+
                [message]
-                       id=msgT3a_3
                        speaker=Prince Haldric
                        message= _ "I suppose with the rampaging bands of 
murderous Orcs roaming about that hasn't been done in a while."
                [/message]
-               
+
                [message]
-                       id=msgT3a_4
                        speaker=Burin the Lost
                        image="portraits/The_Rise_of_Wesnoth/burin.png"
                        message= _ "I miss the Orcs. . . We go all this way, 
and (SNIFF) what a lovely smell we have discovered."
                [/message]
-               
+
                [message]
-                       id=msgT3a_5
                        speaker=Lady Outlaw
                        message= _ "This is too quiet. I don't like this one 
bit, not one bit at all."
                [/message]
-               
+
                [message]
-                       id=msgT3a_6
                        speaker=Prince Haldric
                        message= _ "Wait, I think I hear Something. . . To 
Arms!"
                [/message]
@@ -239,7 +233,6 @@
                        y={Y}
                [/filter]
                [message]
-                       id=msgT3a_7
                        speaker=Prince Haldric
                        message= _ "Careful, you don't know what's lurking in 
there!"
                [/message]
@@ -252,18 +245,15 @@
                        y={Y}
                [/unit]
                [message]
-                       id=msgT3a_8
                        description=Minister Edmond
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "Back you vile--- Oh, sorry I thought you 
were undead. When are those goofs in Clearwater Port Going to clear the swamp 
again?"
                [/message]
                [message]
-                       id=msgT3a_9
                        speaker=Prince Haldric
                        message= _ "Maybe they'll clear it SOME TIME AFTER THE 
APOCALYPSE is over!"
                [/message]
                [message]
-                       id=msgT3a_10
                        description=Minister Edmond
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "Oooh! I take it you wouldn't mind if I 
helped out?"
@@ -280,7 +270,6 @@
                        y={Y}
                [/filter]
                [message]
-                       id=msgT3a_11
                        speaker=unit
                        message= _ "Hey, there's somebody hidden in the temple. 
Ack! Hold there!"
                [/message]
@@ -330,7 +319,6 @@
        
        [command]
                [message]
-                       id=gold_temple
                        speaker=narrator
                        message= _ "You find treasure worth 50 pieces of gold 
in the temple"
                [/message]
@@ -397,7 +385,6 @@
                [/redraw]
 
                [message]
-                       id=msgT3a_12
                        speaker=narrator
                        message= _ "SW - The Oldwood Forest. Enter at Your Own 
Risk!"
                [/message]
@@ -411,7 +398,6 @@
                        description=Lollyra
                 [/filter]
                [message]
-                       id=msgT3a_13
                        speaker=Lollyra
                        message= _ "May I live forever in Undeath!"
                [/message]
@@ -423,7 +409,6 @@
                        description=Clurka
                 [/filter]
                [message]
-                       id=msgT3a_14
                        speaker=Clurka
                        message= _ "Ohhh! To be risen again!"
                [/message]
@@ -435,7 +420,6 @@
                        description=Cleon
                 [/filter]
                [message]
-                       id=msgT3a_15
                        speaker=Cleon
                        message= _ "A prayer for life immortal!"
                [/message]
@@ -443,75 +427,66 @@
        
        [event]
        name=victory
-               
+
                [move_unit_fake]
                        type=Knight
                        x=35,34,33,32,31,30
                        y=35,34,35,34,34,33
                [/move_unit_fake]
-               
+
                {HERO (Knight) (Sir Ruddry) 1 30 33}
-               
+
                [scroll_to_unit]
                        description=Sir Ruddry
                        side=1
                [/scroll_to_unit]
-               
+
                [message]
                        description=Sir Ruddry
-                       id=msgT3a_16
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "I don't know who you are, but you can't 
continue down this road! There is an army of those Orcs bigger than any army 
I've ever seen just down the road!"
                [/message]
-               
+
                [message]
                        description=Prince Haldric
-                       id=msgT3a_17
                        message= _ "I'm Haldric, my father was King Eldaric IV 
in the lands North-West of here. Soldier have you deserted your post?"
                [/message]
-               
+
                [message]
                        description=Sir Ruddry
-                       id=msgT3a_18
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "No Sir! I'm the sole survivor of the 
Clearwater Port expeditionary force. Trust me, you can't continue down this 
road sir. Especially with the refugees, you'll be slaughtered."
                [/message]
-               
+
                [message]
                        description=Prince Haldric
-                       id=msgT3a_19
                        message= _ "Tell me, does Clearwater Port still stand? 
Is the port free?"
                [/message]
-               
+
                [message]
                        description=Sir Ruddry
-                       id=msgT3a_20
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "As far as I know Sir. We have a large army, 
and they were pressing all able bodied men and boys into service when I left. 
That Orcish army is huge, but they haven't met the main body of our forces yet."
                [/message]
-               
+
                [message]
                        description=Prince Haldric
-                       id=msgT3a_21
                        message= _ "Well, we can't go back, and the road ahead 
is blocked. I guess we'll have to risk it and go through the Oldwood forest, 
then make a break for Clearwater Port or Southbay."
                [/message]
-               
+
                [message]
-                       id=msgT3a_22
                        speaker=Burin the Lost
                        image="portraits/The_Rise_of_Wesnoth/burin.png"
                        message= _ "Oh great, now a Forest. . . I should have 
stayed at home and took my chances with the Orcs!"
                [/message]
-               
+
                [message]
                        description=Sir Ruddry
-                       id=msgT3a_23
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Sir, if you don't mind, I'll go with you."
                [/message]
-               
+
                [message]
-                       id=msgT3a_24
                        speaker=Lady Outlaw
                        message= _ "On we go. . ."
                [/message]
@@ -526,7 +501,6 @@
        [event]
        name=time over
                [message]
-                       id=msg4_25
                        description=King Eldaric IV
                        message= _ "We have run out of time. . . We'll be 
trapped in this swamp when winter arrives!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.23 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.24
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg:1.23    Sat Dec 
 4 05:48:32 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg Sun Jan  9 
21:35:47 2005
@@ -198,69 +198,56 @@
        [event]
                name=start
                [message]
-                       id=msgT18_1
                        speaker=narrator
                        message= _ "Haldric and his companions race across the 
plains to confront the resurgent Orcish threat. On the eve of battle Lady 
Jessica catches up with Haldric on a fog covered plain."
                [/message]
                [message]
-                       id=msgT18_2
                        description=Lady Jessica
                        message= _ "Haldric, the Elves, we can't trust them!"
                [/message]
 
                [message]
-                       id=msgT18_3
                        description=Prince Haldric
                        message= _ "I could have told you that."
                [/message]
                [message]
-                       id=msgT18_4
                        description=Lady Jessica
                        message= _ "Haldric, it's bad. The Elves are having 
second thoughts. They think we might be more trouble than we're worth. We have 
to defeat these Orcs decisively."
                [/message]
                [message]
-                       id=msgT18_5
                        description=Prince Haldric
                        message= _ "Well, that sounds reasonable."
                [/message]
                [message]
-                       id=msgT18_6
                        description=Lady Jessica
                        message= _ "More Orcs will follow after these, that 
Ruby guarantees it. If more Orcs follow us here the Elves seem content to let 
us fight it out. Then they said they would 'deal with the survivors'."
                [/message]
                [message]
-                       id=msgT18_7
                        description=Lady Jessica
                        message= _ "Jevyan is here. . . His familiar, that bat. 
He won't let such a lucrative prize as the Ruby of Fire just slip away. 
Especially when he sees that he has the advantage."
                [/message]
                [message]
-                       id=msgT18_8
                        description=Prince Haldric
                        message= _ "I have a plan. Jessica, remember that Troll 
Hole? Here, take the Ruby of Fire, hide it in the hole."
                [/message]
                [message]
-                       id=msgT18_12
                        description=Lady Jessica
                        message= _ "Haldric! What! Why?"
                [/message]
                [message]
-                       id=msgT18_13
                        description=Prince Haldric
                        message= _ "Just do it."
                [/message]
                [message]
-                       id=msgT18_13b
                        description=Prince Haldric
                        message= _ "Lt. Aethyr, did these Orcs come on our 
ships, did they capture the fleet we sent out?"
                [/message]
                [message]
-                       id=msgT18_14
                        description=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "No Sir! They must have seized all of 
remaining boats on the Green Isle. Our fleet should be returning any day now."
                [/message]
                [message]
-                       id=msgT18_15
                        description=Prince Haldric
                        message= _ "We are a refugee people, we must push back 
their vanguard, and secure our beachhead. If they capture our ships all is 
lost. We will be crushed under a tide of Orcs."
                [/message]
@@ -274,7 +261,6 @@
                [/store_unit]
 
                [message]
-                       id=msgT18_16
                        speaker=narrator
                        message= _ "Lady Jessica soon departs. In the distance 
a voice booms:"
                [/message]
@@ -293,7 +279,6 @@
                [/recall]
 
                [message]
-                       id=msgT18_17
                        description=Tan-Gagar
                        message= _ "Drop the gold where it is! We've payed our 
friends enough. There are humans about, I can smell 'em!"
                [/message]
@@ -303,7 +288,6 @@
        [event]
        name=time over
                [message]
-                       id=msgT18_18
                        description=Prince Haldric
                        message= _ "We have run out of time. . . We'll never 
beat the Orcs to the beach"
                [/message]
@@ -322,7 +306,6 @@
                [/sound]
 
                [message]
-                       id=msgT18_19
                        speaker=unit
                        message= _ "I've found the Orcs' chest! It's filled 
with gold."
                [/message]
@@ -355,7 +338,6 @@
                {UNIT (Soul Shooter) (Rabbin) 2 1 28}
 
                [message]
-                       id=msgT18_20
                        description=Rabbin
                        message= _ "You will be felled by by hand you useless 
fleashbags!"
                [/message]
@@ -377,13 +359,11 @@
                {UNIT (Draug) (General Kafka) 3 35 19}
                
                [message]
-                       id=msgT18_22
                        description=General Kafka
                        message= _ "Never trust the living to do the job of the 
undead. Prepare to meet the inevitable!"
                [/message]
 
                [message]
-                       id=msgT18_23
                        description=Minister Edmond
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "The only job of the dead is to remain dead. 
Prepare to be reunited with the ground."
@@ -409,7 +389,6 @@
 
                [message]
                        description=Tan-Gagar
-                       id=msgT18_24
                        message= _ "We must block the human advance!"
                [/message]
                
@@ -431,7 +410,6 @@
 
                [message]
                        description=Tan-Erirt
-                       id=msgT18_25
                        message= _ "Reserves! We can't let them get to their 
landing site."
                [/message]
                
@@ -446,7 +424,6 @@
 
                [message]
                        description=Prince Haldric
-                       id=msgT18_26
                        message= _ "We've defeated their vanguard. We have to 
meet the fleet before Jevyan destroys them, and captures the ships. I hope 
Jessica makes it back soon."
                [/message]
 
@@ -461,7 +438,6 @@
                [/filter]
                
                [message]
-                       id=msgT18_27
                        speaker=Lt. Aethyr
                        image="portraits/The_Rise_of_Wesnoth/aethyr.png"
                        message= _ "Oh, to join my family again! Do not mourn 
my passing."
@@ -479,7 +455,6 @@
                [/filter]
                
                [message]
-                       id=msgT18_28
                        speaker=Burin the Lost
                        message= _ "Ahh, it's great to be home! I'm not much 
for the politics, but it's great to be home!"
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.15 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.16
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg:1.15      Sun Nov 
 7 04:44:58 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg   Sun Jan  9 
21:35:47 2005
@@ -255,31 +255,26 @@
        [event]
                name=start
                [message]
-                       id=msgT16a_1
                        speaker=narrator
                        message= _ "It isn't long before Haldric and his 
companions enter the Brown Hills. An elven guide leads them to a gaping cave 
mouth, and they descend into the darkness."
                [/message]
                
                [message]
-                       id=msgT16a_2
                        speaker=Prince Haldric
                        message= _ "So, does anybody know anything about 
trolls?"
                [/message]
                
                [message]
-                       id=msgT16a_3
                        speaker=Burin the Lost
                        message= _ "I indeed do. They are green, and mean, and 
will try to crush you like a bug. They heal very quickly."
                [/message]
                
                [message]
-                       id=msgT16a_4
                        speaker=Lady Jessica
                        message= _ "Hmm. . . Do we really need to know that 
much about the trolls? I think it's safe to say that the elves wouldn't have 
sent us down here if they were at all friendly."
                [/message]
                
                [message]
-                       id=msgT16a_5
                        speaker=Prince Haldric
                        message= _ "Fair Enough. Well, let's get them!"
                [/message]
@@ -288,7 +283,6 @@
        [event]
                name=time over
                [message]
-                       id=msgT16a_6
                        description=Prince Haldric
                        message= _ "We have failed. . . More of the Troll's kin 
are arriving through the entrance."
                [/message]
@@ -329,7 +323,6 @@
        [event]
                name=victory
                [message]
-                       id=msgT16a_7
                        description=Prince Haldric
                        message= _ "The trolls are beaten. No wonder why the 
elves are getting us to do their dirty linens."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg:1.7 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg:1.8
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg:1.7      Thu Nov 
18 00:46:07 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg  Sun Jan  9 
21:35:47 2005
@@ -4,7 +4,6 @@
                description=Prince Haldric
                [/filter]
                [message]
-                       id=msg_haldric_die
                        speaker=unit
                        message= _ "I can't be finished yet. . . I still have 
so much more to do."
                [/message]
@@ -19,7 +18,6 @@
                description=King Eldaric IV
                [/filter]
                [message]
-                       id=msg_eldaric_die
                        speaker=unit
                        message= _ "It is not yet my time! No!"
                [/message]
@@ -34,7 +32,6 @@
                description=Lady Jessica
                [/filter]
                [message]
-                       id=msg_jess_die
                        speaker=unit
                        message= _ "No! I'll not go so easil--"
                [/message]
@@ -49,7 +46,6 @@
                description=Lady Outlaw
                [/filter]
                [message]
-                       id=msg_lady_outlaw_die
                        speaker=unit
                        message= _ "Bah! I'm not dying today! (POOF! The Lady 
Outlaw vanishes in a puff of smoke)"
                [/message]
@@ -65,7 +61,6 @@
                        description=Burin the Lost
                [/filter]
                [message]
-                       id=msg_burin_die
                        speaker=unit
                        message= _ "Fool of a boy. I never should have followed 
him."
                [/message]
@@ -77,7 +72,6 @@
                description=Sir Ruddry
                [/filter]
                [message]
-                       id=msg_ruddry_die
                        speaker=unit
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "Hail the Kings, may their bloodlines 
continue beyond my time!"
@@ -90,7 +84,6 @@
                description=Sir Ladoc
                [/filter]
                [message]
-                       id=msg_ladoc_die
                        speaker=unit
                        image="portraits/The_Rise_of_Wesnoth/knight.png"
                        message= _ "For Land and Lord, I sacrifice all!"
@@ -103,7 +96,6 @@
                description=Minister Edmond
                [/filter]
                [message]
-                       id=msg_edmond_die
                        speaker=unit
                        image="portraits/The_Rise_of_Wesnoth/edmond.png"
                        message= _ "May the Lords of Light protect us all."
@@ -116,7 +108,6 @@
                description=Lord Typhon
                [/filter]
                [message]
-                       id=msg_typhon_die
                        description=Prince Haldric
                        message= _ "Without him the bottom's of our ships will 
be completely vulnerable. . ."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.9 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.10
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:1.9       Fri Nov 
19 01:32:35 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg   Sun Jan  9 
21:35:47 2005
@@ -1,12 +1,10 @@
 [story]
        [part]
        music=underground.ogg
-       id=trow_intro_1
        story= _ "In the days before Haldric the First saved our people, and 
founded the kingdom of Wesnoth, we came from an Isle far to the West. . ."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [/part]
        [part]
-       id=trow_intro_2
        story= _ "We were prosperous, and numerous. We lived in a rich land, 
with many Kings. Then THEY came, the Wesfolk. They were a wicked, brutal, and 
dirty lot. They were the vanquished from their homes in some war in a land even 
farther off into the West. The Wesfolk were not numerous, but they used dark 
magic, and legions of the walking dead. . ."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [image]
@@ -15,7 +13,6 @@
        [/image]
        [/part]
        [part]
-       id=trow_intro_3
        story= _ "After a time of great struggle a peace was reached. We came 
to dominate most of the Isle, with the Wesfolk pushed onto the most marginal of 
lands. In confronting their vile legions, we grew strong, indeed it was from 
this war we gleaned our first shards of knowledge about magic."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [image]
@@ -24,7 +21,6 @@
        [/image]
        [/part]
        [part]
-       id=trow_intro_4
        story= _ "Thus history continued apace for several centuries. You must 
recall that the route from the Western lands to our Isle was perilous at the 
best of times. So perilous that a stable trading relationship between the 
mainland and the Isle could never be maintained."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [image]
@@ -33,7 +29,6 @@
        [/image]
        [/part]
        [part]
-       id=trow_intro_5
        story= _ "Things only got worse when looking to the East. A strong, 
cold, ocean current swept down from the North in the Eastern ocean, pushing all 
ships horribly off course. Ships that travelled East, and returned, reported 
nothing but open ocean, and vile sea monsters. . ."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [image]
@@ -46,7 +41,6 @@
        [/image]
        [/part]
        [part]
-       id=trow_intro_6
        story= _ "Over time our skills as navigators grew. Then, one day, the 
Crown Prince of Southbay returned home from a long voyage with a fabulous tale. 
He said that there were lands to the East that could be reached by the strong 
of heart, and by aggressively sailing to the East and North, to compensate for 
Southern pull of the ocean."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [image]
@@ -55,22 +49,18 @@
        [/image]
        [/part]
        [part]
-       id=trow_intro_7
        story= _ "It wasn't long after he returned that the very Crown Prince 
who discovered the land to the East fell ill and died, under mysterious 
circumstances. His younger brother, and next in line for the throne, conspired 
to start a war of distraction with the poor Wesfolk kingdoms, and their 
Lich-Lords."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [/part]
        [part]
-       id=trow_intro_8
        story= _ "The new Crown Prince departed, with the largest army ever 
assembled on the Isle to make war with the Wesfolk. This where our story 
begins. . ."
        background=campaigns/Heir_To_The_Throne/story/story1.png
        [/part]
        [part]
-       id=trow_intro_9
        story= _ "With the plight of a different Prince on the same Isle. . ."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [/part]
        [part]
-       id=trow_intro_10
        story= _ "For this is the story of Haldric the First, and the Rise of 
Wesnoth. . ."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_great_continent.png
        [image]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.7 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.8
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg:1.7      Thu Nov 
11 19:04:56 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg  Sun Jan  9 
21:35:47 2005
@@ -19,7 +19,6 @@
        
        [command]
                [message]
-                       id=trow_macros_1
                        speaker=narrator
                        message= _ "You retrieve {AMOUNT} pieces of gold."
                [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg:1.4 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg:1.5
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg:1.4       Fri Oct 
29 21:46:12 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg   Sun Jan  9 
21:35:47 2005
@@ -7,12 +7,10 @@
                [/variable]
                [then]
                [message]
-                       id=msgTNL_1
                        description=Prince Haldric
                        message= _ "I still think I should be called 
'Dragonbane'."
                [/message]
                [message]
-                       id=msgTNL_2
                        description=Lady Jessica
                        message= _ "Not in my lifetime."
                [/message]
@@ -29,13 +27,11 @@
                [/variable]
                [then]
                [message]
-                       id=msgTNL_3
                        description=Lady Jessica
                        message= _ "It could be worse. We could be back in that 
Troll Hole!"
                [/message]
                
                [message]
-                       id=msgTNL_4
                        description=Burin the Lost
                        message= _ "Hey, disparage the Trolls, NOT the Holes!"
                [/message]
@@ -52,12 +48,10 @@
                [/variable]
                [then]
                [message]
-                       id=msgTNL_5
                        description=Prince Haldric
                        message= _ "Well, at least we don't have to contend 
with the undead. No offence Jessica."
                [/message]
                [message]
-                       id=msgTNL_6
                        description=Lady Jessica
                        message= _ "Don't worry about it."
                [/message]
@@ -74,7 +68,6 @@
                [/variable]
                [then]
                [message]
-                       id=msgTNL_7
                        description=Prince Haldric
                        message= _ "Too bad that this isn't going as well as 
the beach. . . I miss the beach."
                [/message]
@@ -91,12 +84,10 @@
                [/variable]
                [then]
                [message]
-                       id=msgTNL_8
                        description=Lady Jessica
                        message= _ "Haldric, just before we arrived here I got 
word that the your 'third of a fleet' has departed for our old home, the Green 
Isle."
                [/message]
                [message]
-                       id=msgTNL_9
                        description=Prince Haldric
                        message= _ "You were planning on sharing this with me 
when?"
                [/message]
@@ -113,12 +104,10 @@
                [/variable]
                [then]
                [message]
-                       id=msgTNL_9
                        description=Lady Jessica
                        message= _ "Haldric messengers just informed me that 
the fleet has returned from our old home. They came back with as nearly as 
large a fleet as we initially set out with, and Southbay still stands. This is 
excellent news. As per your orders a third of the fleet has headed back out."
                [/message]
                [message]
-                       id=msgTNL_10
                        description=Prince Haldric
                        message= _ "That is excellent news indeed. Our numbers 
have doubled. Now on to the business at hand."
                [/message]
@@ -136,12 +125,10 @@
 #              [/variable]
 #              [then]
 #              [message]
-#                      id=msgTNL_11
 #                      description=Lady Jessica
 #                      message= _ "Haldric, the fleet made it back again. A 
few more ships, #But they report that the whole of the coast was teeming with 
Orcs. All that was seen of #Southbay was a cloud of smoke."
 #              [/message]
 #              [message]
-#                      id=msgTNL_12
 #                      description=Prince Haldric
 #                      message= _ "A sad end to our home. We must save our 
mourning for later, #for battle awaits us now."
 #              [/message]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg:1.7 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg:1.8
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg:1.7      Fri Nov 
 5 23:18:22 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg  Sun Jan  9 
21:35:47 2005
@@ -1,19 +1,16 @@
 [story]
        [part]
        music=underground.ogg
-       id=nohome_1
        story= _ "So it came to pass that Price Haldric was forced from his 
home, never to return. With the help of his father's noble sacrifice he has 
escaped the Southern pass. Haldric has left the lands of his home, and before 
him stretches the vast expanse of the southern kingdoms of his people."
        background=campaigns/Heir_To_The_Throne/story/story6.png
        [/part]
        
        [part]
-       id=nohome_2
        story= _ "To the South-West lay the Midlands. These were prosperous 
kingdoms, nestled between hill and forest. They served as the breadbasket of a 
people, and as a valuable source of both lumber and gemstones. These Kingdoms 
fed the city of Southbay, the largest city on the Isle. Albeit, with this 
coming of the Orcs the midlands are probably a barren waste by now."
        background=campaigns/Heir_To_The_Throne/story/story6.png
        [/part]
        
        [part]
-       id=nohome_3
        story= _ "The river road follows to Isle's greatest river to the 
South-East. This road leads to the Isle's second largest city, Clearwater Port. 
It would likely have been the Isle's largest city save for the events of the 
Wesfolk War. The Lich-Lords befouled much of the land around the river during 
the course of a great battle. Now the swamp is home to an Wesfolk imitating 
cult."
        background=campaigns/Heir_To_The_Throne/story/story6.png
        [/part]
Index: wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg
diff -u wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg:1.6 
wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg:1.7
--- wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg:1.6      Fri Nov 
 5 23:18:22 2004
+++ wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg  Sun Jan  9 
21:35:47 2005
@@ -1,13 +1,11 @@
 [story]
        [part]
        music=underground.ogg
-       id=noisle_1
        story= _ "Several days later Prince Haldric departs in his ship the 
Eldaric, his home and Isle lost to him forever. In his heart he knows he will 
never see his secluded valley again. Before him lay a vast expanse of stormy 
seas, and the mysterious island that Lady Jessica has mentioned, and even more 
exotic lands even further to the East."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [/part]
 
        [part]
-       id=noisle_2
        story= _ "Apparently the island that King Haldric and his crew are 
approaching was at one time a volcano that is now slowly sinking into the sea. 
The elder Crown Prince of Southbay managed to establish a foothold on this 
Island, despite the belligerent nature of it's reptilian inhabitants. There 
must be little left of that foothold by now."
        background=campaigns/The_Rise_of_Wesnoth/maps/the_green_isle.png
        [/part]




reply via email to

[Prev in Thread] Current Thread [Next in Thread]