mail[Wesnoth-commits] r20774 - /trunk/data/campaigns/The_South_Guard/scenarios/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 September 29, 2007 - 22:50:
Author: zookeeper
Date: Sat Sep 29 22:49:21 2007
New Revision: 20774

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20774&view=rev
Log:
Fix some things in Into the Depths.

Modified:
    trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg?rev=20774&r1=20773&r2=20774&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg 
Sat Sep 29 22:49:21 2007
@@ -39,6 +39,8 @@
         fog=yes
         shroud=yes
 
+        share_view=yes
+
         {GOLD 125 100 80}
         {INCOME 10 8 6}
     [/side]
@@ -135,8 +137,8 @@
     [side]
         side=4
         type=Troll Hero
-        description=Grée
-        user_description= _ "Grée"
+        description=Grek
+        user_description= _ "Grek"
 
         team_name=South_Guard
         controller=ai
@@ -178,6 +180,9 @@
         team_name=South_Guard
         controller=ai
         colour=purple
+
+        fog=yes
+        share_view=yes
 
         [ai]
             recruitment_pattern=fighter
@@ -398,6 +403,8 @@
             side=4
         [/filter]
 
+        [redraw][/redraw]
+
         [message]
             speaker=Grek
             message= _ "Ha! Humans and elves! What are you doing in our 
caves, and why shouldn't we grind your bones and gnaw on your flesh?"
@@ -428,6 +435,11 @@
 # the WML doesn't need to be duplicated by hand
 
 #define TROLL_HELP
+    [gold]
+        side=1
+        amount=-$troll_help_cost
+    [/gold]
+
     [remove_shroud]
         side=1
         x,y=1-38,1-35
@@ -484,8 +496,8 @@
 
     {HIGHLIGHT_IMAGE 17 24 items/bomb.png ()}
 
-    {VARIABLE bomb_placed true}
-    {VARIABLE troll_allies true}
+    {VARIABLE bomb_placed yes}
+    {VARIABLE troll_allies yes}
 #enddef
 
         [message]
@@ -543,49 +555,7 @@
                                 [/objective]
                             [/objectives]
 
-                            [event]
-                                name=moveto
-                                first_time_only=no
-
-                                [filter]
-                                    side=1
-                                    [filter_adjacent]
-                                        description=Grek
-                                    [/filter_adjacent]
-                                [/filter]
-
-                                [store_side]
-                                    side=1
-                                    variable=stored_side_1
-                                [/store_side]
-
-                                [message]
-                                    speaker=Grek
-                                    message= _ "Ha, you can afford troll 
help this time?"
-                                    [option]
-                                        [show_if]
-                                            [variable]
-                                                name=stored_side_1.gold
-                                                
greater_than_equal_to=$troll_help_cost
-                                            [/variable]
-                                        [/show_if]
-
-                                        message= _ "Here's $troll_help_cost 
for your help against the undead."
-
-                                        [command]
-                                            {TROLL_HELP}
-                                        [/command]
-                                    [/option]
-
-                                    [option]
-                                        message= _ "No, sorry."
-
-                                        [command]
-                                            [allow_undo][/allow_undo]
-                                        [/command]
-                                    [/option]
-                                [/message]
-                            [/event]
+                            {VARIABLE late_payment_for_troll_help yes}
                         [/else]
                     [/if]
                 [/command]
@@ -638,9 +608,73 @@
                             condition=lose
                         [/objective]
                     [/objectives]
+
+                    {VARIABLE late_payment_for_troll_help yes}
                 [/command]
             [/option]
         [/message]
+    [/event]
+
+    [event]
+        name=moveto
+        first_time_only=no
+
+        [filter]
+            side=1
+            [filter_adjacent]
+                description=Grek
+            [/filter_adjacent]
+        [/filter]
+
+        [if]
+            [variable]
+                name=late_payment_for_troll_help
+                equals=yes
+            [/variable]
+
+            [variable]
+                name=troll_allies
+                not_equals=yes
+            [/variable]
+
+            [then]
+                [store_side]
+                    side=1
+                    variable=stored_side_1
+                [/store_side]
+
+                [message]
+                    speaker=Grek
+                    message= _ "Ha, you can afford troll help this time?"
+                    [option]
+                        [show_if]
+                            [variable]
+                                name=stored_side_1.gold
+                                greater_than_equal_to=$troll_help_cost
+                            [/variable]
+                        [/show_if]
+
+                        message= _ "Here's $troll_help_cost for your help 
against the undead."
+
+                        [command]
+                            {TROLL_HELP}
+                        [/command]
+                    [/option]
+
+                    [option]
+                        message= _ "No, sorry."
+
+                        [command]
+                            [allow_undo][/allow_undo]
+                        [/command]
+                    [/option]
+                [/message]
+            [/then]
+
+            [else]
+                [allow_undo][/allow_undo]
+            [/else]
+        [/if]
     [/event]
 
     [event]
@@ -653,7 +687,7 @@
         [if]
             [variable]
                 name=bomb_placed
-                equals=true
+                equals=yes
             [/variable]
             [then]
                 [message]
@@ -706,6 +740,8 @@
             description="Mal M'Brin"
         [/filter]
 
+        [redraw][/redraw]
+
         [message]
             speaker="Ethiliel"
             message= _ "Mebrin! My teacher of old! Can that truly be you?"
@@ -746,23 +782,23 @@
             message= _ "Your servants! Your servants are abominations worse 
than any human. They stink of the grave. This cannot be the sage Mebrin that 
I knew and revered speaking. He would never have allied himself with the dead 
against the living!"
         [/message]
 
-       [message]
+        [message]
             speaker="Mal M'Brin"
             message= _ "I am called Mal M'Brin now, Ethiliel, best student 
of mine. It is time for a new lesson. I was such as you, full of doubt and 
weakness, but now I have passed over and become more than you know. There is 
infinity in death; I have touched the void at the heart of all things. You, 
too, can partake of its boundless power."
         [/message]
 
-       [message]
+        [message]
             speaker="Mal M'Brin"
             message= _ "Join me! Stand by my side! We shall rise and sweep 
the humans from the green world. Their corpses will serve us; their bones 
will dance for our pleasure."
         [/message]
 
-       [message]
+        [message]
             speaker="Ethiliel"
             message= _ "And when we were done, what would we have become? 
Unlife. Hungering shadows, devouring all we once cherished."
             image=portraits/ethiliel-mad.png
         [/message]
 
-       [message]
+        [message]
             speaker="Ethiliel"
             message= _ "No. It shall not be. The sage Mebrin is dead. It is 
time to put him to rest."
         [/message]
@@ -797,5 +833,6 @@
         {CLEAR_VARIABLE bomb_placed}
         {CLEAR_VARIABLE troll_allies}
         {CLEAR_VARIABLE stored_side_1}
+        {CLEAR_VARIABLE late_payment_for_troll_help}
     [/event]
 [/scenario]




Related Messages


Powered by MHonArc, Updated Sun Sep 30 00:41:01 2007