Author: zookeeper
Date: Sun Sep 12 20:17:33 2010
New Revision: 46413

URL: http://svn.gna.org/viewcvs/wesnoth?rev=46413&view=rev
Log:
Fixed some bugs in the sea serpent spawning code and made each one hiss/roar a 
message when appearing.

Modified:
    trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg

Modified: 
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg?rev=46413&r1=46412&r2=46413&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg 
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg Sun 
Sep 12 20:17:33 2010
@@ -222,12 +222,12 @@
 
         [if]
             [variable]
-                name=side_$side_number|_serpent_triggered
+                name=side_$unit.side|_serpent_triggered
                 boolean_not_equals=yes
             [/variable]
 
             [then]
-                {VARIABLE side_$side_number|_serpent_triggered yes}
+                {VARIABLE side_$unit.side|_serpent_triggered yes}
 
                 [switch]
                     variable=unit.side
@@ -236,18 +236,21 @@
                         value=2
 
                         {VARIABLE serpent_name _"Chompey the Serpent"}
+                        {VARIABLE serpent_msg _"Graarrrrrr!"}
                     [/case]
 
                     [case]
                         value=3
 
                         {VARIABLE serpent_name _"Scaly the Serpent"}
+                        {VARIABLE serpent_msg _"Roarrrrrr!"}
                     [/case]
 
                     [case]
                         value=4
 
                         {VARIABLE serpent_name _"Toothey the Serpent"}
+                        {VARIABLE serpent_msg _"Hissssss!"}
                     [/case]
                 [/switch]
 
@@ -284,26 +287,42 @@
                         variable=possible_serpent_locs
                     [/store_locations]
 
-                    {VARIABLE_OP serpent_loc_i rand 
"$|($|possible_serpent_locs.length - 1)"}
-
-                    [scroll_to]
-                        
x,y=$|possible_serpent_locs[$|serpent_loc_i].x,$|possible_serpent_locs[$|serpent_loc_i].y
-                    [/scroll_to]
-
-                    {NAMED_LOYAL_UNIT $unit.side (Sea Serpent) 
$|possible_serpent_locs[$|serpent_loc_i].x 
$|possible_serpent_locs[$|serpent_loc_i].y () $serpent_name}
-                    [+unit]
-                        animate=yes
-                    [/unit]
-
-                    [message]
-                        side=1
-                        message= _ "Look out, a serpent has emerged from the 
deep."
-                    [/message]
-
-                    {CLEAR_VARIABLE possible_serpent_locs,serpent_loc_i}
+                    [if]
+                        [variable]
+                            name=possible_serpent_locs.length
+                            greater_than=1
+                        [/variable]
+
+                        [then]
+                            {VARIABLE_OP serpent_loc_i rand 
"$|($|possible_serpent_locs.length - 1)"}
+
+                            [scroll_to]
+                                
x,y=$|possible_serpent_locs[$|serpent_loc_i].x,$|possible_serpent_locs[$|serpent_loc_i].y
+                            [/scroll_to]
+
+                            {NAMED_LOYAL_UNIT $unit.side (Sea Serpent) 
$|possible_serpent_locs[$|serpent_loc_i].x 
$|possible_serpent_locs[$|serpent_loc_i].y () $serpent_name}
+                            [+unit]
+                                animate=yes
+                            [/unit]
+
+                            [message]
+                                
x,y=$|possible_serpent_locs[$|serpent_loc_i].x,$|possible_serpent_locs[$|serpent_loc_i].y
+                                message=$serpent_msg
+                            [/message]
+
+                            [message]
+                                side=1
+                                message= _ "Look out, a serpent has emerged 
from the deep."
+                            [/message]
+
+                            {CLEAR_VARIABLE serpent_loc_i}
+                        [/then]
+                    [/if]
+
+                    {CLEAR_VARIABLE possible_serpent_locs}
                 [/event]
 
-                {CLEAR_VARIABLE serpent_name}
+                {CLEAR_VARIABLE serpent_name,serpent_msg}
             [/then]
         [/if]
     [/event]


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

Reply via email to