mail[Wesnoth-commits] r25191 - in /branches/1.4/data/campaigns/The_South_Guard/scenarios: 06a_Tidings_Good_And_Ill.cfg 07a_Into_The_Depths.cfg


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

Header


Content

Posted by lari . nieminen on March 27, 2008 - 16:07:
Author: zookeeper
Date: Thu Mar 27 16:07:12 2008
New Revision: 25191

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25191&view=rev
Log:
Ported r24454 to 1.4.

Modified:
    
branches/1.4/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
    
branches/1.4/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg

Modified: 
branches/1.4/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg?rev=25191&r1=25190&r2=25191&view=diff
==============================================================================
--- 
branches/1.4/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
 (original)
+++ 
branches/1.4/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
 Thu Mar 27 16:07:12 2008
@@ -140,26 +140,11 @@
         [store_unit]
             [filter]
                 side=1
-
-                [not]
-                    description=Sir Gerrick
-                [/not]
-
-                [not]
-                    race=elf
-
-                    [not]
-                        description=Ethiliel
-                    [/not]
-
-                    [not]
-                        description=Elvish Bodyguard
-                    [/not]
-                [/not]
+                description=Elvish Bodyguard
             [/filter]
 
             kill=yes
-            variable=stored_Deoran_army
+            variable=stored_elvish_bodyguards
         [/store_unit]
 
         # Store Deoran's gold so it can be restored in Into the Depths and 
set
@@ -198,6 +183,7 @@
             side=1
             [modifications]
                 {TRAIT_LOYAL}
+                {TRAIT_DEXTROUS}
             [/modifications]
         [/unit]
     [/event]
@@ -504,11 +490,16 @@
                     variable=stored_Hylas
                 [/unstore_unit]
 
-                {FOREACH stored_Deoran_army i}
+                {FOREACH stored_elvish_bodyguards i}
                 [unstore_unit]
-                    variable=stored_Deoran_army[$i]
+                    variable=stored_elvish_bodyguards[$i]
                 [/unstore_unit]
                 {NEXT i}
+                
+                {CLEAR_VARIABLE stored_Deoran}
+                {CLEAR_VARIABLE stored_Ethiliel}
+                {CLEAR_VARIABLE stored_Hylas}
+                {CLEAR_VARIABLE stored_elvish_bodyguards}
 
                 [endlevel]
                     bonus=no

Modified: 
branches/1.4/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg?rev=25191&r1=25190&r2=25191&view=diff
==============================================================================
--- 
branches/1.4/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg 
(original)
+++ 
branches/1.4/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg 
Thu Mar 27 16:07:12 2008
@@ -214,9 +214,6 @@
         [/modify_side]
 
         {CLEAR_VARIABLE stored_Deoran_side}
-        {CLEAR_VARIABLE stored_Deoran_army}
-        {CLEAR_VARIABLE stored_Ethiliel}
-        {CLEAR_VARIABLE stored_Hylas}
 
         [unit]
             side=2




Related Messages


Powered by MHonArc, Updated Thu Mar 27 16:41:34 2008