mail[Wesnoth-commits] r33752 - in /trunk/data/campaigns/Northern_Rebirth: scenarios/01_Breaking_the_Chains.cfg utils/utils.cfg


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

Header


Content

Posted by lari . nieminen on March 17, 2009 - 16:12:
Author: zookeeper
Date: Tue Mar 17 16:12:00 2009
New Revision: 33752

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33752&view=rev
Log:
Hopefully fixed the rest of the silly supporter mess.

Modified:
    trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
    trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg

Modified: 
trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg?rev=33752&r1=33751&r2=33752&view=diff
==============================================================================
--- 
trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg 
(original)
+++ 
trunk/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg 
Tue Mar 17 16:12:00 2009
@@ -188,9 +188,8 @@
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
             [/modifications]
-            {MAKE_SUPPORTER}
+            role=Supporter
         [/unit]
-        {MAKE_SUPPORTER}
         [message]
             speaker=Tallin
             message= _ "The orcs have gotten careless - look how easily I 
stole these weapons and this bright gold from them. Now they're killing each 
other. This might be the only chance we got to get rid of this scum once and 
for all. Let's give it to 'em!"

Modified: trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg?rev=33752&r1=33751&r2=33752&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/utils/utils.cfg Tue Mar 17 16:12:00 
2009
@@ -1,41 +1,33 @@
 #textdomain wesnoth-nr
 
-#define MAKE_SUPPORTER
-    # Tag a unit as preferred for the Supporter role
-    [variables]
+#define RECALL_SUPPORTER
+    # Recall a walk-on to say lines. Prefer whoever was tagged with
+    # role=Supporter previously; if that unit is dead, pick anyone from side 
1.
+    [recall]
         role=Supporter
-    [/variables]
-#enddef
+    [/recall]
 
-#define RECALL_SUPPORTER
-    # Recall a walk-on to say lines.  Prefer whoever was tagged with the 
-    # variable role=Supporter previously; if that unit is dead, pick
-    # anyone from side 1.
-    [role]
-        [filter_wml]
-            [variables]
-                role=Supporter
-            [/variables]
-        [/filter_wml]
-        role=Supporter
-    [/role]
     [if]
         [not]
             [have_unit]
                 role=Supporter
             [/have_unit]
         [/not]
-        [role]
-            side=1
-            [not]
-                id=Tallin
-            [/not]
-            role=Supporter
-        [/role]
+
+        [then]
+            [role]
+                side=1
+                [not]
+                    id=Tallin
+                [/not]
+                role=Supporter
+            [/role]
+
+            [recall]
+                role=Supporter
+            [/recall]
+        [/then]
     [/if]
-    [recall]
-        role=Supporter
-    [/recall]
 #enddef
 
 ## These macros support a fourth difficulty level, NIGHTMARE.




Related Messages


Powered by MHonArc, Updated Tue Mar 17 17:00:34 2009