[Wesnoth-cvs-commits] wesnoth/data/scenarios/tutorial Traits_and_Spec...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  05/03/21 22:50:18

Modified files:
        data/scenarios/tutorial: Traits_and_Specialties.cfg 

Log message:
        Heh, now fix the bug I added :)

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

Patches:
Index: wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg
diff -u wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg:1.11 
wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg:1.12
--- wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg:1.11     Mon Mar 
21 22:29:21 2005
+++ wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg  Mon Mar 21 
22:50:18 2005
@@ -1,4 +1,5 @@
 {./utils.cfg}
+
 [tutorial]
 name= _ "Traits and Specialties"
 id=tutorial-2
@@ -6,12 +7,14 @@
 turns=24
 music=wesnoth-4.ogg
 experience_modifier=50
+
        {DAWN}
        {MORNING}
        {AFTERNOON}
        {DUSK}
        {FIRST_WATCH}
        {SECOND_WATCH}
+
        [side]
        type=Lord
        description=Konrad
@@ -19,7 +22,9 @@
        recruit=Elvish Archer,Elvish Fighter,Elvish Shaman,Elvish Scout
        controller=human
        [/side]
+
        {STARTING_VILLAGES 1 6}
+
        [side]
        type=Elder Mage
        description=Delfador
@@ -31,7 +36,9 @@
                passive_leader=yes
                [/ai]
        [/side]
+
        {STARTING_VILLAGES 2 6}
+
        [event]
        name=start
                [message]
@@ -42,12 +49,14 @@
                description=Delfador
                message= _ "You can win most scenarios simply by defeating all 
enemy leaders. Win this scenario by defeating me. Your fighter from the 
previous scenario can help you in this battle. To recall him, right-click on a 
castle tile, select Recall, select your fighter, then select 'OK'. You should 
also recruit Elvish Fighters and Elvish Archers."
                [/message]
+
                #this assumes that they only have 1 Elvish Fighter
                #it should be changed
                [role]
                type=Elvish Fighter
                role=recalled
                [/role]
+
                [objectives]
                summary= _ "Skills covered:
 Recalling
@@ -72,6 +81,7 @@
                        [/objective]
                [/objectives]
        [/event]
+
        [event]
        #even though this says 'recruit' it applies to recall also
        name=recruit
@@ -90,6 +100,7 @@
                                {RECALL_QUESTIONS}
                {QUESTION_OPTIONS_END}
        [/event]
+
        [event]
        name=turn 2
                [message]
@@ -245,17 +256,6 @@
                [filter]
                description=Delfador
                [/filter]
-               [message]
-               description=Delfador
-               message= _ "Congratulations! You have defeated me, and 
completed the second and final training scenario. Next, you may want to begin a 
campaign, or play multiplayer."
-               [/message]
-               {QUESTION_OPTIONS_START (_"Hooray!")}
-#define WESNOTH_QUESTIONS
-               {QUESTION_OPTION (_"How do I play a campaign?") (_"To begin a 
campaign, run Wesnoth, select 'Campaign', select which campaign to play, then 
select Easy, Normal, or Hard. Heir to the Throne is the suggested for newcomers 
to Wesnoth.")}
-               {QUESTION_OPTION (_"How do I play multiplayer?") (_"To play 
Wesnoth against other people, select 'Multiplayer'. Then select 'Join Official 
Server'. This will connect you to the official Wesnoth server, where you can 
join a game by selecting it, then selecting 'Join Game'.")}
-#enddef
-               {WESNOTH_QUESTIONS}
-               {QUESTION_OPTIONS_END}
 
                [message]
                description=Delfador
@@ -287,4 +287,19 @@
                [/endlevel]
        [/event]
 
+       [event]
+       name=victory
+               [message]
+               description=Delfador
+               message= _ "Next, you may want to begin a campaign, or play 
multiplayer."
+               [/message]
+               {QUESTION_OPTIONS_START (_"Hooray!")}
+#define WESNOTH_QUESTIONS
+               {QUESTION_OPTION (_"How do I play a campaign?") (_"To begin a 
campaign, run Wesnoth, select 'Campaign', select which campaign to play, then 
select Easy, Normal, or Hard. Heir to the Throne is the suggested for newcomers 
to Wesnoth.")}
+               {QUESTION_OPTION (_"How do I play multiplayer?") (_"To play 
Wesnoth against other people, select 'Multiplayer'. Then select 'Join Official 
Server'. This will connect you to the official Wesnoth server, where you can 
join a game by selecting it, then selecting 'Join Game'.")}
+#enddef
+               {WESNOTH_QUESTIONS}
+               {QUESTION_OPTIONS_END}
+       [/event]
+
 [/tutorial]