Author: zookeeper
Date: Sat Nov 22 19:22:33 2008
New Revision: 30964

URL: http://svn.gna.org/viewcvs/wesnoth?rev=30964&view=rev
Log:
Improved the dust devil cutscene somewhat, although the fake moving might be a 
little bit glitchy now.

Modified:
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg?rev=30964&r1=30963&r2=30964&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
 Sat Nov 22 19:22:33 2008
@@ -913,13 +913,7 @@
                     message=_"Hey! Look there, they dropped something... A 
stone bottle, sealed. I wonder what's inside..."
                 [/message]
 
-                [teleport]
-                    [filter]
-                        id=Nym
-                    [/filter]
-                    x=$x1
-                    y=$y1
-                [/teleport]
+                {MOVE_UNIT id=Nym $x1 $y1}
 
                 [message]
                     speaker=Zhul
@@ -955,44 +949,45 @@
                     message=_"It's a dust devil, but I have never seen one so 
small before."
                 [/message]
 
-                # this isn't working yet - but takes ages to filter
-                # so I'm commenting it out for 1.3.8
-                #[store_locations]
-                #  variable=move
-                #  x=$x1
-                #  y=$y1
-                #  radius=1
-                #  [filter_radius]
-                #    [not]
-                #      [filter]
-                #        side=1,2,3,4
-                #      [/filter]
-                #    [/not]
-                #  [/filter_radius]
-                #[/store_locations]
-
-                #{VARIABLE i 0}
-                #[while]
-                #  [variable]
-                #    name=i
-                #    less_than=4
-                #  [/variable]
-                #  [do]
-                #    {RANDOM 1..move.length}
-                #    {VARIABLE moves[$i].x $move[$random].x}
-                #    {VARIABLE moves[$i].y $move[$random].y}
-                #  [/do]
-                #[/while]
-                #{CLEAR_VARIABLE move}
-
-                #[move_unit_fake]
-                #    type=Dust Devil
-                #    side=1
-                #    
x=$moves[0].x,$x1,$moves[1].x,$x1,$moves[2].x,$x1,$moves[3].x,$x1
-                #    
y=$moves[0].y,$y1,$moves[1].y,$y1,$moves[2].y,$y1,$moves[3].y,$y1
-                #[/move_unit_fake]
-
-                #{CLEAR_VARIABLE moves}
+                [store_locations]
+                    [not]
+                        [filter]
+                        [/filter]
+                    [/not]
+
+                    [and]
+                        x,y=$x1,$y1
+                        radius=1
+                    [/and]
+
+                    variable=locs_around_nym
+                [/store_locations]
+
+                [store_unit]
+                    [filter]
+                        type=Dust Devil
+                    [/filter]
+
+                    kill=no
+                    variable=stored_dust_devil
+                [/store_unit]
+
+                {VARIABLE dust_devil_path.x $stored_dust_devil.x}
+                {VARIABLE dust_devil_path.y $stored_dust_devil.y}
+
+                {FOREACH locs_around_nym i}
+                    {VARIABLE dust_devil_path.x 
"$dust_devil_path.x|,$locs_around_nym[$i].x"}
+                    {VARIABLE dust_devil_path.y 
"$dust_devil_path.y|,$locs_around_nym[$i].y"}
+                {NEXT i}
+
+                [move_unit_fake]
+                    type=Dust Devil
+                    side=1
+                    x=$dust_devil_path.x|,$dust_devil_path.x
+                    y=$dust_devil_path.y|,$dust_devil_path.y
+                [/move_unit_fake]
+
+                {CLEAR_VARIABLE 
locs_around_nym,stored_dust_devil,dust_devil_path}
 
                 [message]
                     speaker=Kaleh


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to