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 Capture...


From: Joseph Simmons
Subject: [Wesnoth-cvs-commits] wesnoth/data/scenarios/Eastern_Invasion Capture...
Date: Sat, 07 May 2005 12:22:13 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Joseph Simmons <address@hidden> 05/05/07 16:22:12

Modified files:
        data/scenarios/Eastern_Invasion: Captured.cfg 

Log message:
        Fixed many bugs in captured, and used nested [event] tags. it makes 
more much less hacky WML than setting variables does.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.35 
wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.36
--- wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg:1.35   Sun Mar 27 
23:06:16 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg        Sat May  7 
16:22:12 2005
@@ -526,12 +526,10 @@
                #a prisoner says something
                        [message]
                        speaker=narrator
-                       id=msg_cmpgn_ei_14_25
                        message= _ "The guards are distracted! Now is the time 
to escape!"
                        [/message]
                        [message]
                        description=Gweddry
-                       id=msg_cmpgn_ei_14_26
                        message= _ "Huh? Who's there, who said that?"
                        [/message]
                [/event]
@@ -555,12 +553,10 @@
                {TRUEUNSTORE 4-6 16-18 O}
                [message]
                description=Gweddry
-               id=msg_cmpgn_ei_14_11
                message= _ "So you are in this cell! Come on, we have to 
escape!"
                [/message]
                [message]
                description=Owaec
-               id=msg_cmpgn_ei_14_12
                message= _ "Very well. I think the rest of the cells are 
further down this path."
                [/message]
        [/event]
@@ -571,7 +567,6 @@
                {TRUEUNSTORE 6-8 12-14 R2}
                [message]
                description=Gweddry
-               id=msg_cmpgn_ei_14_13
                message= _ "So, they have captured some of our best fighters as 
well as me, Dacyn and Owaec. $R2.user_description, follow me! We must get out 
of this dungeon."
                [/message]
        [/event]
@@ -605,11 +600,76 @@
                [item]
                image=items/castle-ruins.png
                x,y=4,5
-               [/item]         
-               [set_variable]
-               name=D_created
-               value=yes
-               [/set_variable]
+               [/item]
+               ##########################
+               #the key in all its glory#
+               ##########################
+               #getting into the chamber
+               [event]
+               name=moveto
+                       [filter]
+                       x=4,3
+                       y=5,6
+                       side=1
+                       [/filter]
+                       [message]
+                       speaker=unit
+                       message= _ "Here is the thin spot in the wall. Well, 
actually, no- it's not a thin spot at all! It's really a door!"
+                       [/message]
+                       [terrain]
+                       x,y=3,5
+                       letter=r
+                       [/terrain]
+                       [removeitem]
+                       x,y=4,5
+                       [/removeitem]
+                       {GUARD 3 3 (Troll Warrior)}
+                       [message]
+                       description=Owaec
+                       message= _ "Huh! A guard. Once we kill him, we should 
be able to get out of these cells..."
+                       [/message]
+                       #barrel
+                       {ITM_BARREL 3 2}
+               [/event]
+               #the key itself
+               [event]
+               name=moveto
+                       [filter]
+                       x,y=3,2
+                       side=1
+                       [/filter]
+                       [message]
+                       speaker=unit
+                       id=msg_cmpgn_ei_14_21
+                       message= _ "I have found the key! Let's get out of 
here!"
+                       [/message]
+                       [set_variable]
+                       name=key
+                       value=yes
+                       [/set_variable]
+                       #opening the door with the key
+                       [event]
+                       name=moveto
+                               [filter]
+                               x=10
+                               y=22
+                               side=1
+                               [/filter]
+                               [message]
+                               description=Gweddry
+                               message= _ "This is the right key! come on, 
let's open the door, quick!"
+                               [/message]
+                               [terrain]
+                               x=10
+                               y=21
+                               letter=u
+                               [/terrain]
+                               [set_variable]
+                               name=key
+                               value=no
+                               [/set_variable]
+                       [/event]
+               [/event]
        [/event]
 
        ###########
@@ -643,109 +703,9 @@
                [/terrain]
        [/event]
 
-       ##########################
-       #the key in all its glory#
-       ##########################
-       #getting into the chamber
-       [event]
-       name=moveto
-       first_time_only=no
-               [filter]
-               x=4,3
-               y=5,6
-               description=Gweddry
-               [/filter]
-               [if]
-                       [variable]
-                       name=D_created
-                       equals=yes
-                       [/variable]
-                       [then]
-                               [message]
-                               description=Gweddry
-                               id=msg_cmpgn_ei_14_19
-                               message= _ "Here is the thin spot in the wall. 
Well, actually, no- it's not a thin spot at all! It's really a door!"
-                               [/message]
-                               [terrain]
-                               x,y=3,5
-                               letter=r
-                               [/terrain]
-                               [removeitem]
-                               x,y=4,5
-                               [/removeitem]
-                               {GUARD 3 3 (Troll Warrior)}
-                               [message]
-                               description=Owaec
-                               id=msg_cmpgn_ei_14_20
-                               message= _ "Huh! A guard. Once we kill him, we 
should be able to get out of these cells..."
-                               [/message]
-                               #barrel
-                               {ITM_BARREL 3 2}
-                               [clear_variable]
-                               name=D_created
-                               [/clear_variable]
-                       [/then]
-                       [else]
-                               [allow_undo]
-                               [/allow_undo]
-                       [/else]
-               [/if]
-       [/event]
 
-       #the key itself
-       [event]
-       name=moveto
-               [filter]
-               x,y=3,2
-               side=1
-               [/filter]
-               [message]
-               speaker=unit
-               id=msg_cmpgn_ei_14_21
-               message= _ "I have found the key! Let's get out of here!"
-               [/message]
-               [set_variable]
-               name=key
-               value=yes
-               [/set_variable]
-       [/event]
 
        #opening the door
-       [event]
-       name=moveto
-       first_time_only=no
-               [filter]
-               x=10
-               y=22
-               side=1
-               [/filter]
-               [if]
-                       [variable]
-                       name=key
-                       equals=yes
-                       [/variable]
-                       [then]
-                               [message]
-                               description=Gweddry
-                               id=msg_cmpgn_ei_14_22
-                               message= _ "This is the right key! come on, 
let's open the door, quick!"
-                               [/message]
-                               [terrain]
-                               x=10
-                               y=21
-                               letter=u
-                               [/terrain]
-                               [set_variable]
-                               name=key
-                               value=no
-                               [/set_variable]
-                       [/then]
-                       [else]
-                               [allow_undo]
-                               [/allow_undo]
-                       [/else]
-               [/if]
-       [/event]
        
        
        ######################################
@@ -767,17 +727,14 @@
                {PRISON 32 19}
                [message]
                description=Valand
-               id=msg_cmpgn_ei_14_27
                message= _ "Help us! The guards are planning to execute us 
tomorrow!"
                [/message]
                [message]
                x,y=34,20
-               id=msg_cmpgn_ei_14_28
                message= _ "Hah! Tomorrow? You make a big mistake if you 
believe you will live that long."
                [/message]
                [message]
                x,y=30,20
-               id=msg_cmpgn_ei_14_29
                message= _ "Right, boss, especially since they're invading, and 
we need to kill them now before they escape!"
                [/message]
        [/event]
@@ -792,7 +749,6 @@
                [/filter]
                [message]
                speaker=unit
-               id=msg_cmpgn_ei_14_30
                message= _ "Argh! Oh well, at least my vast hordes will defeat 
you!"
                [/message]
                {GUARD 20 10 (Orcish Grunt)}




reply via email to

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