mail[Wesnoth-commits] r20567 - in /trunk/data: core/macros/ multiplayer/scenarios/


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

Header


Content

Posted by Soliton on September 18, 2007 - 21:57:
Author: soliton
Date: Tue Sep 18 21:57:05 2007
New Revision: 20567

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20567&view=rev
Log:
don't use random traits in the team survival and wesbowl

Modified:
    trunk/data/core/macros/utils.cfg
    trunk/data/multiplayer/scenarios/2p_Wesbowl.cfg
    trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg
    trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg
    trunk/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg

Modified: trunk/data/core/macros/utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/utils.cfg?rev=20567&r1=20566&r2=20567&view=diff
==============================================================================
--- trunk/data/core/macros/utils.cfg (original)
+++ trunk/data/core/macros/utils.cfg Tue Sep 18 21:57:05 2007
@@ -173,6 +173,22 @@
         y={Y}
         generate_description=yes
         random_traits=yes
+        upkeep=full
+    [/unit]
+#enddef
+
+#define MP_GENERIC_UNIT SIDE TYPE X Y
+    # Creates a generic unit of TYPE belonging to SIDE at X,Y, which has a
+    # random name no traits.
+    # This can be removed and GENERIC_UNIT be used instead once random traits
+    # work in multiplayer.
+    [unit]
+        side={SIDE}
+        type={TYPE}
+        x={X}
+        y={Y}
+        generate_description=yes
+        random_traits=no
         upkeep=full
     [/unit]
 #enddef

Modified: trunk/data/multiplayer/scenarios/2p_Wesbowl.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/2p_Wesbowl.cfg?rev=20567&r1=20566&r2=20567&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/2p_Wesbowl.cfg (original)
+++ trunk/data/multiplayer/scenarios/2p_Wesbowl.cfg Tue Sep 18 21:57:05 2007
@@ -37,6 +37,7 @@
         facing={FACING}
         x={X}
         y={Y}
+        random_traits=no
     [/unit]
 #enddef
 

Modified: trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg?rev=20567&r1=20566&r2=20567&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg (original)
+++ trunk/data/multiplayer/scenarios/4p_The_Wilderlands.cfg Tue Sep 18 
21:57:05 2007
@@ -6,7 +6,7 @@
         side=5
         x={X}
         y={Y}
-       random_traits=no
+        random_traits=no
     [/unit]
 #enddef
 
@@ -17,7 +17,7 @@
         x={X}
         y={Y}
         variation={VARIATION}
-       random_traits=no
+        #random_traits=no
     [/unit]
 #enddef
 

Modified: trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg?rev=20567&r1=20566&r2=20567&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg (original)
+++ trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg Tue Sep 18 21:57:05 
2007
@@ -200,48 +200,48 @@
 #enddef
 
 #define TS_SPAWN1 UNIT
-    {IF_ALIVE 2 ({CREATE_UNIT 1 ({UNIT}) 12 10 () ()})}
-    {IF_ALIVE 3 ({CREATE_UNIT 1 ({UNIT}) 29 7 () ()})}
-    {IF_ALIVE 4 ({CREATE_UNIT 1 ({UNIT}) 41 18 () ()})}
-    {IF_ALIVE 5 ({CREATE_UNIT 1 ({UNIT}) 36 32 () ()})}
-    {IF_ALIVE 6 ({CREATE_UNIT 1 ({UNIT}) 19 36 () ()})}
-    {IF_ALIVE 7 ({CREATE_UNIT 1 ({UNIT}) 7 25 () ()})}
+    {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({UNIT}) 12 10})}
+    {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({UNIT}) 29 7})}
+    {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({UNIT}) 41 18})}
+    {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({UNIT}) 36 32})}
+    {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({UNIT}) 19 36})}
+    {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({UNIT}) 7 25})}
 #enddef
 
 #define TS_SPAWN2 UNIT
-    {IF_ALIVE 2 ({CREATE_UNIT 1 ({UNIT}) 19 7 () ()})}
-    {IF_ALIVE 3 ({CREATE_UNIT 1 ({UNIT}) 36 10 () ()})}
-    {IF_ALIVE 4 ({CREATE_UNIT 1 ({UNIT}) 41 25 () ()})}
-    {IF_ALIVE 5 ({CREATE_UNIT 1 ({UNIT}) 29 36 () ()})}
-    {IF_ALIVE 6 ({CREATE_UNIT 1 ({UNIT}) 12 32 () ()})}
-    {IF_ALIVE 7 ({CREATE_UNIT 1 ({UNIT}) 7 18 () ()})}
+    {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({UNIT}) 19 7})}
+    {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({UNIT}) 36 10})}
+    {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({UNIT}) 41 25})}
+    {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({UNIT}) 29 36})}
+    {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({UNIT}) 12 32})}
+    {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({UNIT}) 7 18})}
 #enddef
 
 #define TS_SWAMP_SPAWN UNIT
-    {IF_ALIVE 2 ({CREATE_UNIT 1 ({UNIT}) 15 6 () ()})}
-    {IF_ALIVE 3 ({CREATE_UNIT 1 ({UNIT}) 35 7 () ()})}
-    {IF_ALIVE 4 ({CREATE_UNIT 1 ({UNIT}) 44 22 () ()})}
-    {IF_ALIVE 5 ({CREATE_UNIT 1 ({UNIT}) 33 37 () ()})}
-    {IF_ALIVE 6 ({CREATE_UNIT 1 ({UNIT}) 13 36 () ()})}
-    {IF_ALIVE 7 ({CREATE_UNIT 1 ({UNIT}) 4 20 () ()})}
+    {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({UNIT}) 15 6})}
+    {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({UNIT}) 35 7})}
+    {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({UNIT}) 44 22})}
+    {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({UNIT}) 33 37})}
+    {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({UNIT}) 13 36})}
+    {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({UNIT}) 4 20})}
 #enddef
 
 #define TS_LAKE_SPAWN UNIT
-    {IF_ALIVE 2 ({CREATE_UNIT 1 ({UNIT}) 17 10 () ()})}
-    {IF_ALIVE 3 ({CREATE_UNIT 1 ({UNIT}) 32 10 () ()})}
-    {IF_ALIVE 4 ({CREATE_UNIT 1 ({UNIT}) 39 22 () ()})}
-    {IF_ALIVE 5 ({CREATE_UNIT 1 ({UNIT}) 31 33 () ()})}
-    {IF_ALIVE 6 ({CREATE_UNIT 1 ({UNIT}) 16 32 () ()})}
-    {IF_ALIVE 7 ({CREATE_UNIT 1 ({UNIT}) 9 21 () ()})}
+    {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({UNIT}) 17 10})}
+    {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({UNIT}) 32 10})}
+    {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({UNIT}) 39 22})}
+    {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({UNIT}) 31 33})}
+    {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({UNIT}) 16 32})}
+    {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({UNIT}) 9 21})}
 #enddef
 
 #define TS_HOME_SPAWN UNIT
-    {IF_ALIVE 2 ({CREATE_UNIT 1 ({UNIT}) 18 12 () ()})}
-    {IF_ALIVE 3 ({CREATE_UNIT 1 ({UNIT}) 30 12 () ()})}
-    {IF_ALIVE 4 ({CREATE_UNIT 1 ({UNIT}) 36 21 () ()})}
-    {IF_ALIVE 5 ({CREATE_UNIT 1 ({UNIT}) 30 30 () ()})}
-    {IF_ALIVE 6 ({CREATE_UNIT 1 ({UNIT}) 18 13 () ()})}
-    {IF_ALIVE 7 ({CREATE_UNIT 1 ({UNIT}) 12 21 () ()})}
+    {IF_ALIVE 2 ({MP_GENERIC_UNIT 1 ({UNIT}) 18 12})}
+    {IF_ALIVE 3 ({MP_GENERIC_UNIT 1 ({UNIT}) 30 12})}
+    {IF_ALIVE 4 ({MP_GENERIC_UNIT 1 ({UNIT}) 36 21})}
+    {IF_ALIVE 5 ({MP_GENERIC_UNIT 1 ({UNIT}) 30 30})}
+    {IF_ALIVE 6 ({MP_GENERIC_UNIT 1 ({UNIT}) 18 13})}
+    {IF_ALIVE 7 ({MP_GENERIC_UNIT 1 ({UNIT}) 12 21})}
 #enddef
 
 #define TS_SPAWNS

Modified: trunk/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg?rev=20567&r1=20566&r2=20567&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg (original)
+++ trunk/data/multiplayer/scenarios/Wesbench_Shroud_Walk.cfg Tue Sep 18 
21:57:05 2007
@@ -134,6 +134,7 @@
         type=Elvish Archer
         side=1
         x,y={POS}
+        random_traits=no
     [/unit]
 #enddef
 
@@ -142,6 +143,7 @@
         type=Elvish Archer
         side=2
         x,y={POS}
+        random_traits=no
     [/unit]
 #enddef
 




Related Messages


Powered by MHonArc, Updated Tue Sep 18 22:20:42 2007