mail[Wesnoth-commits] r25073 - /trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by lari . nieminen on March 24, 2008 - 17:21:
Author: zookeeper
Date: Mon Mar 24 17:21:33 2008
New Revision: 25073

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25073&view=rev
Log:
Got rid of commas in variable names and prevented the guards from having 
identical id's.

Modified:
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=25073&r1=25072&r2=25073&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg 
Mon Mar 24 17:21:33 2008
@@ -106,7 +106,7 @@
     [/event]
 
     # Generate a random number of guards between 0 and 2 around X,Y
-#define RANDOM_GUARDS TYPE ID_STRING NAME_STRING SIDE X Y
+#define RANDOM_GUARDS TYPE NAME_STRING SIDE X Y
     {VARIABLE_OP number_of_guards random 0..2}
 
     {REPEAT $number_of_guards (
@@ -135,7 +135,6 @@
         [/move_unit_fake]
 
         [unit]
-            id={ID_STRING}
             name={NAME_STRING} # wmllint: ignore
             type={TYPE}
             side={SIDE}
@@ -168,11 +167,11 @@
             side=1
         [/filter]
 
-        {IF_VAR village_$x1,$y1|_cleared not_equals yes (
+        {IF_VAR village_$x1|_$y1|_cleared not_equals yes (
         [then]
-            {RANDOM_GUARDS (Goblin Spearman) Villager (_ "Villager") 2 $x1 
$y1}
-
-            {VARIABLE village_$x1,$y1|_cleared yes}
+            {RANDOM_GUARDS (Goblin Spearman) (_ "Villager") 2 $x1 $y1}
+
+            {VARIABLE village_$x1|_,$y1|_cleared yes}
         [/then]
 
         [else]
@@ -259,7 +258,7 @@
         [/store_villages]
 
         {FOREACH villages i}
-        {VARIABLE_OP village_var format 
"village_$villages[$i].x,$villages[$i].y|_cleared"}
+        {VARIABLE_OP village_var format 
"village_$villages[$i].x|_$villages[$i].y|_cleared"}
 
         {CLEAR_VARIABLE $village_var}
         {NEXT i}




Related Messages


Powered by MHonArc, Updated Mon Mar 24 18:41:53 2008