mail[Wesnoth-commits] r20747 - in /trunk/data/campaigns/The_Rise_Of_Wesnoth: scenarios/07_Return_to_Oldwood.cfg utils/trow-deaths.cfg


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

Header


Content

Posted by mythological on September 27, 2007 - 14:28:
Author: mythological
Date: Thu Sep 27 14:27:48 2007
New Revision: 20747

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20747&view=rev
Log:
Changed the way lady outlaw is handled in TRoW's Return to Oldwood scenario. 
Fixing bug #10062

Modified:
    
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
    trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg?rev=20747&r1=20746&r2=20747&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg 
(original)
+++ 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg 
Thu Sep 27 14:27:48 2007
@@ -136,25 +136,69 @@
             description=Prince Haldric
             message= _ "We can't all stay here for the winter; we would 
starve, or freeze. Your hospitality, though generously meant, has barely 
sufficed. Hold - I see somebody!"
         [/message]
-        [move_unit_fake]
-            type=Outlaw
-            side=1
-            gender=female
-            x=8,8,8,8,8,7,7,6,6
-            y=30,29,28,27,26,26,25,24,23,22
-        [/move_unit_fake]
-
-        [unit]
-            type=Outlaw
-            gender=female
-            description=Lady Outlaw
-            user_description= _ "Lady Outlaw"
-            profile="portraits/lady_outlaw.png"
-            unrenamable=yes
-            side=1
-            x=6
-            y=22
-        [/unit]
+        [store_unit]
+            [filter]
+                description=Lady Outlaw
+            [/filter]
+            variable=lady_store
+            kill=yes
+        [/store_unit]
+        [if]
+            [variable]
+                name=lady_store.type
+                equals=Fugitive
+            [/variable]
+            [then]
+                [move_unit_fake]
+                    type=Fugitive
+                    side=1
+                    gender=female
+                    x=8,8,8,8,8,7,7,6,6
+                    y=30,29,28,27,26,26,25,24,23,22
+                [/move_unit_fake]
+            [/then]
+            [else]
+                 [move_unit_fake]
+                    type=Outlaw
+                    side=1
+                    gender=female
+                    x=8,8,8,8,8,7,7,6,6
+                    y=30,29,28,27,26,26,25,24,23,22
+                [/move_unit_fake]
+            [/else]
+        [/if]
+        
+        {VARIABLE lady_store.x 6}
+        {VARIABLE lady_store.y 22}
+
+        [unstore_unit]
+            variable=lady_store
+        [/unstore_unit]
+    [/event]
+
+    [event]
+        name=start
+        [if]
+            [have_unit]
+                side=1
+                description=Lady Outlaw
+            [/have_unit]
+            [then]
+            [/then]
+            [else]        
+                [unit]
+                    type=Outlaw
+                    gender=female
+                    description=Lady Outlaw
+                    user_description= _ "Lady Outlaw"
+                    profile="portraits/lady_outlaw.png"
+                    unrenamable=yes
+                    side=1
+                    x=6
+                    y=22
+                [/unit]
+            [/else]
+        [/if]
 
         [if]
             [variable]

Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg?rev=20747&r1=20746&r2=20747&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg (original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/utils/trow-deaths.cfg Thu Sep 27 
14:27:48 2007
@@ -54,6 +54,13 @@
         name=have_lady
         value=0
     [/set_variable]
+    [store_unit]
+        [filter]
+            description=Lady Outlaw
+        [/filter]
+        variable=lady_store
+        kill=yes
+    [/store_unit]
 [/event]
 
 [event]




Related Messages


Powered by MHonArc, Updated Thu Sep 27 15:01:05 2007