[Wesnoth-cvs-commits] wesnoth/data/scenarios/The_Dark_Hordes Confront...

[Susanna Björverud]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Susanna Björverud <address@hidden>      05/03/20 15:50:38

Modified files:
        data/scenarios/The_Dark_Hordes: Confrontation.cfg 

Log message:
        Made Confrontation (TDH) use the new [objectives] tag for the 
mid-scenario
        objectives change, and cleaned out obsolete message id:s

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.11 
wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.12
--- wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.11       Sun Mar 
20 12:03:03 2005
+++ wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg    Sun Mar 20 
15:50:37 2005
@@ -88,32 +88,26 @@
        [event]
        name=start
                [message]
-               id=undconfront_1
                speaker=narrator
                message= _ "With the finding of Crelanu's ancient tome, fresh 
strength had flowed to Gwiti's army, and they had made good time. However, 
Gwiti's march was halted by Leonard as he reentered Wesnothian territory. The 
general of several outlying areas, his troops were many but untrained."
                [/message]
                [message]
-               id=undconfront_2
                description=Gwiti Ha'atel
                message= _ "I see that your puny kingdom marshals its troops at 
last."
                [/message]
                [message]
-               id=undconfront_3
                description=Leonard
                message= _ "So you are the one responsible for our defeat at 
the Stone of Erzen. Die!"
                [/message]
                [message]
-               id=undconfront_4
                description=Gwiti Ha'atel
                message= _ "Somehow, I have the feeling it is you who will do 
the dying today. I wonder why?"
                [/message] 
                [message]
-               id=undconfront_5
                speaker=narrator
                message= _ "In truth, Leonard's army was unprepared and 
under-equipped, and he had neglected to send word. Luckily, behind him came one 
whose name was a bane to the undead: Lord Aretu. Gwiti knew that even if he 
defeated Leonard, his best hope was now to flee into the mountains."
                [/message] 
                [message]
-               id=undconfront_7
                description=Leonard
                message= _ "I shall slay you myself!"
                [/message] 
@@ -126,7 +120,6 @@
                description=Gwiti Ha'atel
                [/filter]
                [message]
-               id=undconfront_8
                speaker=unit
                message= _ "So this is death... the cold, black void"
                [/message]
@@ -141,7 +134,6 @@
                description=Leonard
                [/filter]
                [message]
-               id=undconfront_10
                speaker=unit
                message= _ "No! This cannot be true! My king, I have failed..."
                [/message]
@@ -154,21 +146,31 @@
                canrecruit=1
                [/unit]
                [message]
-               id=undconfront_19
                description=Lord Aretu
                message= _ "Leonard is dead? Oh, what a sad day. Come, men, let 
us destroy those undead!"
                [/message] 
                [message] 
-               id=undconfront_20
                description=Gwiti Ha'atel
                message= _ "Only one way lies open now. I must flee where his 
horses cannot go: the sharp peaks and bottomless caves."
                [/message] 
-               [message] 
-               id=undconfront_21
-               speaker=narrator
-               message= _ "NEW OBJECTIVE
address@hidden Gwiti to the end of the mountain pass"
-               [/message]
+
+               [objectives]
+               side=1
+               summary= _"After the death of Leonard, Gwiti must now achieve a 
new objective"
+                       [objective]
+                       condition=win
+                       description=_ "Move Gwiti to the end of the mountain 
pass"
+                       [/objective]
+                       [objective]
+                       condition=lose
+                       description=_ "Death of Gwiti Ha'atel"
+                       [/objective]
+                       [objective]
+                       condition=lose
+                       description=_ "Turns run out"
+                       [/objective]
+               [/objectives]
+
        [/event]
 
 
@@ -182,7 +184,6 @@
                side=1
                [/filter]
                [message] 
-               id=undconfront_11
                description=Lord Aretu
                message= _ "Return to your master, dark fiend!"
                [/message]
@@ -214,14 +215,12 @@
        [/have_unit]
        [then]
                [message]
-               id=undconfront_failed_pass
                speaker=Leonard
                message= _ "Haha, it was a mistake of you to flee there! The 
pass is blocked, and my troops will slay you now!"
                [/message]
        [/then]
        [else]
                [message] 
-               id=undconfront_13
                speaker=unit
                message= _ "Phew... Surely the puny humans will be too tired to 
follow me now!"
                [/message] 
@@ -234,27 +233,22 @@
                side=1
                [/unit]
                [message] 
-               id=undconfront_14
                description=Tanar
                message= _ "Oh, no, escaping dwarves only to be caught by 
undead."
                [/message]
                [message] 
-               id=undconfront_15
                speaker=unit
                message= _ "Who are you? If you are a foe of the Dwarves, I 
might consider you an ally."
                [/message]
                [message] 
-               id=undconfront_16
                description=Tanar
                message= _ "I am Tanar, lord of an orcish clan that dwelt here! 
My people were driven out by the dwarves. All families count several dead. 
Please, let us march with you, for only a chance to strike back at the evil 
Dwarves!"
                [/message] 
                [message] 
-               id=undconfront_17
                speaker=unit
                message= _ "Gladly. I do get so lonely talking to myself, and 
none of my minions are worth talking to."
                [/message]
                [message] 
-               id=undconfront_18
                description=Tanar
                message= _ "Thank you, my new Lord! Never had I thought I would 
see the day when my people were glad to march alongside skeletons and ghosts."
                [/message]