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/Eastern_Invasion Approac...


From: Joseph Simmons
Subject: [Wesnoth-cvs-commits] wesnoth/data/scenarios/Eastern_Invasion Approac...
Date: Sun, 20 Mar 2005 13:40:49 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Joseph Simmons <address@hidden> 05/03/20 18:40:49

Modified files:
        data/scenarios/Eastern_Invasion: Approaching_Weldyn.cfg 
                                         Captured.cfg Crossing.cfg 
                                         Elven_Alliance.cfg 
                                         Escape_Tunnel.cfg 
                                         Evacuation.cfg Lake_Vrug.cfg 
                                         Mal-Ravanals_Capital.cfg 
                                         Northern_Outpost.cfg 
                                         Ogre_Training.cfg Reject.cfg 
                                         The_Duel.cfg The_Outpost.cfg 
                                         Tribal_Warfare.cfg 
                                         Two_Paths.cfg 
                                         Undead_Border_Patrol.cfg 
                                         Undead_Crossing.cfg 
                                         Unexpected_Appearance.cfg 
                                         Weldyn_Attack.cfg 

Log message:
        Conversion to new [objectives] tag, plus very minor string changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg:1.12 
wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg:1.13
--- wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg:1.12 Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg      Sun Mar 
20 18:40:48 2005
@@ -15,15 +15,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden Gweddry to Weldyn
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec
-#Death of Konrad II"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -115,7 +106,33 @@
                [/ai]
        [/side]
 
-
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Get Gweddry to Weldyn"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Konrad II"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+               
        [event]
        name=start
                [recall]
Index: wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.33 
wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.34
--- wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.33   Mon Feb 21 
08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg        Sun Mar 20 
18:40:49 2005
@@ -12,14 +12,6 @@
 
 music="wesnoth-5.ogg"
 
-objectives= _ "
-Victory:
address@hidden from the Orcish Prisons
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
 victory_when_enemies_defeated=no
@@ -285,7 +277,30 @@
        ######################
        #/lots of definitions#
        ######################
-       
+
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Escape from the Orcish Prisons"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
        ########################################
        #starting units (like guards and doors)#
        ########################################
Index: wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg:1.14 
wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg:1.15
--- wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg:1.14   Mon Feb 21 
08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg        Sun Mar 20 
18:40:49 2005
@@ -15,14 +15,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden Gweddry and Owaec across the river
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -84,6 +76,29 @@
        [/side]
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Get Gweddry and Owaec across the river"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+       [event]
        name=start
                [recall]
                description=Dacyn
Index: wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg:1.12 
wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg:1.13
--- wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg:1.12     Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg  Sun Mar 20 
18:40:49 2005
@@ -15,14 +15,6 @@
 
        music="elfland.ogg"
 
-       objectives= _ "
-Victory:
address@hidden enemy leader
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Volas"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
 {deaths2.cfg}
@@ -73,6 +65,31 @@
        {GOLD 100 150 200}
        [/side]
 
+
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat enemy leader"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Volas"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+
        [event]
        name=start
                #hide Gruga-Har until he arrives
Index: wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg:1.26 
wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg:1.27
--- wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg:1.26      Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg   Sun Mar 20 
18:40:49 2005
@@ -11,14 +11,6 @@
 
        music="underground.ogg"
 
-       objectives= _ "
-Victory:
address@hidden the end of the tunnel
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Turns run out"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -88,6 +80,25 @@
                [/ai]
        [/side]
 
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Reach the end of the tunnel"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
        #beginning talking
        [event]
        name=start
Index: wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.27 
wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.28
--- wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.27 Mon Feb 28 
23:56:56 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg      Sun Mar 20 
18:40:49 2005
@@ -15,15 +15,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden everyone possible across the river
address@hidden the bridge (everyone left on the wrong side of the river will 
die, including everyone left on your recall list)
-Defeat:
-#Death of Gweddry or leaving him on the river's north side
-#Death of Dacyn or leaving him on the river's north side
-#Death of Owaec or leaving him on the river's north side"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -100,6 +91,41 @@
        [/event]
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Get everyone possible across the river"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Destroy the bridge (everyone left on 
the north side of the river will die, including those left on your recall list)"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Get Gweddry to Weldyn"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Leaving any of the three heroes on the 
north side of the river"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+       [event]
        name=start
                #create a mage with a special description
                [unit]
Index: wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg:1.17 
wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg:1.18
--- wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg:1.17  Mon Feb 21 
08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg       Sun Mar 20 
18:40:49 2005
@@ -17,14 +17,6 @@
 
        music=wesnoth-3.ogg
 
-       objectives= _ "
-Victory:
address@hidden the end of the path
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -79,6 +71,30 @@
                grouping=no
                [/ai]
        [/side]
+       
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Move Gweddry to the end of the path"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
 
        [event]
        name=start
Index: wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg:1.14 
wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg:1.15
--- wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg:1.14       
Mon Feb 21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg    Sun Mar 
20 18:40:49 2005
@@ -18,13 +18,6 @@
 
        music="wesnoth-4.ogg"
 
-       objectives= _ "
-Victory:
address@hidden from the Capital by killing one of the two necromancers
-Defeat:
-#Death of Gweddry
-#Death of Dacyn"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -102,17 +95,30 @@
                [/ai]
        [/side]
 
-
-       #prestart
        [event]
        name=prestart
-               [recall]
-               description=Dacyn
-               [/recall]
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Escape from the capital by killing one 
of the two necromancers"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+               [/objectives]
        [/event]
 
        [event]
        name=start
+               [recall]
+               description=Dacyn
+               [/recall]
                [message]
                description=Gweddry
                message= _ "We have come all the way to Mal-Ravanal's Capital!"
Index: wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.30 
wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.31
--- wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.30   Sun Mar 
20 09:36:16 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg        Sun Mar 
20 18:40:49 2005
@@ -17,15 +17,6 @@
 
        music="wesnoth-3.ogg"
 
-       objectives= _ "
-Victory:
address@hidden the outlaw leader in the villages and kill him
address@hidden the undead leader
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -101,6 +92,29 @@
 #enddef
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Find the outlaw leader in the villages 
and kill him"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Defeat the undead leader"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+       [event]
        name=start
                [set_variable]
                name=trapdiff
Index: wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg:1.13 
wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg:1.14
--- wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg:1.13      Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg   Sun Mar 20 
18:40:49 2005
@@ -18,14 +18,6 @@
        music="wesnoth-4.ogg"
        victory_when_enemies_defeated=no
 
-       objectives= _ "
-Victory:
address@hidden at least two ogres on the grass until your troops catch up with 
you
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -44,6 +36,13 @@
        canrecruit=0
        controller=human
        [/side]
+       
+       [side]
+       type=Young Ogre
+       side=2
+       canrecruit=0
+       controller=ai
+       [/side]
 
 #define OGRE
 [unit]
@@ -53,13 +52,33 @@
 y=10
 [/unit]
 #enddef
-       
-       [side]
-       type=Young Ogre
-       side=2
-       canrecruit=0
-       controller=ai
-       [/side]
+
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Survive until end of turns"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "To add ogres to your army, keep two on 
the grass until end of turns"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
 
        [event]
        name=start
Index: wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg:1.12 
wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg:1.13
--- wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg:1.12     Sat Mar 12 
18:54:51 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg  Sun Mar 20 18:40:49 2005
@@ -15,16 +15,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden Mal-Ravanal
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec
-#Letting any enemy unit onto your keep"
-
-
        [story]
                [part]
                        
background=campaigns/Eastern_Invasion/maps/eastern_invasion.png
@@ -117,6 +107,33 @@
        [/side]
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat Mal-Ravanal"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Letting any enemy unit on to your keep"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+       [event]
        name=start
                [recall]
                description=Dacyn
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg:1.14 
wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg:1.15
--- wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg:1.14   Mon Feb 21 
08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg        Sun Mar 20 
18:40:49 2005
@@ -15,12 +15,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden Mal-Ravanal
-Defeat:
-#Death of Gweddry"
-
        [story]
                [part]
                        
background=campaigns/Eastern_Invasion/maps/eastern_invasion.png
@@ -76,6 +70,22 @@
 
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat Mal-Ravanal"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+
+       [event]
        name=start
                [message]
                description=Undead Announcer
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.16 
wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.17
--- wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.16        Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg     Sun Mar 20 
18:40:49 2005
@@ -18,12 +18,6 @@
 
        music=wesnoth-2.ogg
 
-       objectives= _ "
-Victory:
address@hidden until you receive further instructions from Dacyn.
-Defeat:
-#Death of Gweddry"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -113,6 +107,22 @@
        {STARTING_VILLAGES 3 5}
        {STARTING_VILLAGES 4 8}
        
+
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Resist until you get further 
instructions from Dacyn"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
        #start event
        [event]
        name=start
Index: wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg:1.18 
wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg:1.19
--- wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg:1.18     Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg  Sun Mar 20 
18:40:49 2005
@@ -75,7 +75,30 @@
                grouping=defensive
                [/ai]
        [/side]
-       
+
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat all enemy leaders"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
        [event]
        name=start
                [recall]
@@ -138,15 +161,6 @@
                [/message]
        [/event]
 
-
-       objectives= _ "
-Victory:
address@hidden all enemy leaders
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        [event]
        name=die
                [filter]
Index: wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg:1.19 
wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg:1.20
--- wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg:1.19  Mon Feb 21 
08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg       Sun Mar 20 
18:40:49 2005
@@ -14,15 +14,6 @@
        
        {TURNS 14 12 10}
 
-       objectives= _ "
-Victory:
address@hidden either of the enemy leaders
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec
-#Turns run out"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -76,6 +67,29 @@
 
        [event]
        name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat either enemy leader"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+       
+       [event]
+       name=start
                [recall]
                description=Dacyn
                [/recall]
@@ -87,10 +101,6 @@
                x=33
                y=19
                [/unit]
-       [/event]
-
-       [event]
-       name=start
                [message]
                description=Gweddry
                message= _ "Look! The road splits here. Which way shall we go?"
Index: wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg:1.11 
wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg:1.12
--- wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg:1.11       
Mon Feb 21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg    Sun Mar 
20 18:40:49 2005
@@ -14,14 +14,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden either the necromancer or the lich
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Turns run out"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -73,6 +65,25 @@
        [/side]
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat either enemy leader"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+       [event]
        name=start
                [recall]
                description=Dacyn
Index: wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg:1.14 
wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg:1.15
--- wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg:1.14    Mon Feb 
21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Undead_Crossing.cfg Sun Mar 20 
18:40:49 2005
@@ -15,14 +15,6 @@
 
        music="wesnoth-2.ogg"
 
-       objectives= _ "
-Victory:
address@hidden the enemy Lich
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -57,6 +49,29 @@
        [/side]
 
        [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat enemy leader"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
+       [event]
        name=start
                [recall]
                description=Dacyn
Index: wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg:1.13 
wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg:1.14
--- wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg:1.13      
Mon Feb 21 08:08:24 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg   Sun Mar 
20 18:40:49 2005
@@ -14,13 +14,6 @@
 
        turns=18
 
-       objectives= _ "
-Victory:
address@hidden one of the necromancers
-Defeat:
-#Death of Gweddry
-#Turns run out"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -90,18 +83,34 @@
 
        [event]
        name=prestart
-               [recall]
-               description=Dacyn
-               [/recall]
                [terrain]
                x=21
                y=12
                letter=g
                [/terrain]
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Defeat either enemy necromancer"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+               [/objectives]
        [/event]
 
+
        [event]
        name=start
+               [recall]
+               description=Dacyn
+               [/recall]
                [message]
                description=Gweddry
                id=msg_cmpgn_ei_03_01
Index: wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:1.29 
wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:1.30
--- wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:1.29      Sat Mar 
12 18:54:51 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg   Sun Mar 20 
18:40:49 2005
@@ -29,15 +29,6 @@
 
        music=frantic.ogg
 
-       objectives= _ "
-Victory:
address@hidden the night
-Defeat:
-#Death of Gweddry
-#Death of Dacyn
-#Death of Owaec
-#Death of Konrad"
-
        {scenarios/Eastern_Invasion/deaths.cfg}
 
        [story]
@@ -166,6 +157,33 @@
        {STARTING_VILLAGES 3 5}
        {STARTING_VILLAGES 4 5}
 
+       [event]
+       name=prestart
+               [objectives]
+               side=1
+                       [objective]
+                       description= _ "Survive until end of turns"
+                       condition=win
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Gweddry"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Dacyn"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Owaec"
+                       condition=lose
+                       [/objective]
+                       [objective]
+                       description= _ "Death of Konrad II"
+                       condition=lose
+                       [/objective]
+               [/objectives]
+       [/event]
+
        #start event
        [event]
        name=start
@@ -177,7 +195,7 @@
                [/recall]
                [unit]
                description=Konrad
-               user_description= _ "Konrad"
+               user_description= _ "Konrad II"
                type=Lord
                side=1
                x=21




reply via email to

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