[Wesnoth-cvs-commits] wesnoth/data/scenarios/Eastern_Invasion Norther...

[Joseph Simmons]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Joseph Simmons <address@hidden> 05/05/01 13:06:26

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

Log message:
        Fixed bug #12922 in EI; i.e. make scenario Northern Outpost work 
correctly

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

Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.33 
wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.34
--- wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.33   Sat Apr 
23 15:04:15 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg        Sun May 
 1 13:06:26 2005
@@ -218,6 +218,45 @@
                                speaker=unit
                                message= _ "They're here!"
                                [/message]
+                               #decides if the badguy leader appears
+                               #badguy leader has less chance of appearing 
early on. (as in 0% chance for first 5 villages. :P)
+                               {RANDOM 4..10}
+                               [if]
+                                       [or]
+                                               [variable]
+                                               name=random
+                                               greater_than_equal_to=$trapdiff
+                                               [/variable]
+                                       [/or]
+                                       [or]
+                                               [variable]
+                                               name=shodranoshown
+                                               equals=yes
+                                               [/variable]
+                                       [/or]   
+                                       [else]
+                                               [unit]
+                                               type=Assassin
+                                               side=4
+                                               x=$x1
+                                               y=$y1
+                                               description=Shodrano
+                                               user_description= _ "Shodrano"
+                                               [/unit]
+                                               [set_variable]
+                                               name=shodranoshown
+                                               value=yes
+                                               [/set_variable]
+                                               [message]
+                                               description=Shodrano
+                                               message= _ "So, you have found 
my hiding place. Very well, I guess I will have to kill you!"
+                                               [/message]
+                                               [message]
+                                               description=Owaec
+                                               message= _ "That's the bandit 
leader! Kill him, and we will have fulfilled our duty!"
+                                               [/message]
+                                       [/else]
+                               [/if]
                        [/then]
                        [else]
                                [message]
@@ -230,46 +269,6 @@
                name=trapdiff
                add=1
                [/set_variable]
-               
-               #decides if the badguy leader appears
-               #badguy leader has less chance of appearing early on. (as in 0% 
chance for first 5 villages. :P)
-               {RANDOM 4..10}
-               [if]
-                       [or]
-                               [variable]
-                               name=random
-                               greater_than_equal_to=$trapdiff
-                               [/variable]
-                       [/or]
-                       [or]
-                               [variable]
-                               name=shodranoshown
-                               equals=yes
-                               [/variable]
-                       [/or]   
-                       [else]
-                               [unit]
-                               type=Assassin
-                               side=4
-                               x=$x1
-                               y=$y1
-                               description=Shodrano
-                               user_description= _ "Shodrano"
-                               [/unit]
-                               [set_variable]
-                               name=shodranoshown
-                               value=yes
-                               [/set_variable]
-                               [message]
-                               description=Shodrano
-                               message= _ "So, you have found my hiding place. 
Very well, I guess I will have to kill you!"
-                               [/message]
-                               [message]
-                               description=Owaec
-                               message= _ "That's the bandit leader! Kill him, 
and we will have fulfilled our duty!"
-                               [/message]
-                       [/else]
-               [/if]
        [/event]
 
        [event]
@@ -283,7 +282,7 @@
                [/message]
                [if]
                        [have_unit]
-                       name=Lanar-Skal
+                       description=Lanar-Skal
                        [/have_unit]
                        [then]
                                [message]