[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/01/03 00:01:30

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

Log message:
        Forgot an [or] tag when fixing previous bug... :)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg.diff?tr1=1.23&tr2=1.24&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.23 
wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.24
--- wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.23   Sun Dec 
26 20:10:13 2004
+++ wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg        Mon Jan 
 3 00:01:30 2005
@@ -107,35 +107,28 @@
                [/recall]
                [message]
                description=Owaec
-               id=msg_cmpgn_ei_06_01
                message= _ "Hail, Gweddry!"
                [/message]
                [message]
                description=Gweddry
-               id=msg_cmpgn_ei_06_02
                message= _ "Hello. We have been forced from our positions. Do 
you think you can help us regain our outpost?"
                [/message]
                [message]
                description=Owaec
-               id=msg_cmpgn_ei_06_03
                message= _ "I am not sure. There are bandits in this country, 
and I have been told that it is my duty to defeat them, and protect the local 
villages. Whenever I send out troops to defeat them, they end up being 
slaughtered before they get aid, and the bandits retreat into the villages. I 
cannot find a way to defeat them."
                [/message]
                [message]
                description=Dacyn
-               id=msg_cmpgn_ei_06_04
                message= _ "I think I may be able to help you. I am a mage; I 
believe I will be able to cast a spell that will reveal them if you enter the 
villages. However, I won't be able to help you in battle."
                [/message]
                [message]
                description=Gweddry
-               id=msg_cmpgn_ei_06_05
                message= _ "It is time to drive out some bandits. Dacyn, go 
cast your spell!"
                [/message]
                [message]
                description=Owaec
-               id=msg_cmpgn_ei_06_05
                message= _ "I believe there is a leader behind these outlaws; 
kill him, and we will have defeated these bandits."
                [/message]
-
                [message]
                description=Lanar-Skal
                message= _ "Go, go far from here! But me and my kind will chase 
you, and kill you!"
@@ -165,7 +158,15 @@
                        [then]
                                [set_variable]
                                name=numban
-                               random=0..6
+#ifdef EASY
+                               random=0..4
+#endif
+#ifdef NORMAL
+                               random=1..5
+#endif
+#ifdef HARD
+                               random=2..6
+#endif
                                [/set_variable]
                                [set_variable]
                                name=numban
@@ -207,13 +208,17 @@
                #badguy leader has less chance of appearing early on. (as in 0% 
chance for first 5 villages. :P)
                {RANDOM 4..10}
                [if]
-                       [variable]
-                       name=random
-                       greater_than_equal_to=$trapdiff
-                       [/variable]
-                       [have_unit]
-                       description=Shodrano
-                       [/have_unit]
+                       [or]
+                               [variable]
+                               name=random
+                               greater_than_equal_to=$trapdiff
+                               [/variable]
+                       [/or]
+                       [or]
+                               [have_unit]
+                               description=Shodrano
+                               [/have_unit]
+                       [/or]   
                        [else]
                                [unit]
                                type=Assassin