mail[Wesnoth-commits] r20453 - /trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg


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

Header


Content

Posted by lari . nieminen on September 16, 2007 - 20:40:
Author: zookeeper
Date: Sun Sep 16 20:39:21 2007
New Revision: 20453

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20453&view=rev
Log:
Start working on the bandit branch by cleaning up some Choice in the Fog WML.

Modified:
    trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg?rev=20453&r1=20452&r2=20453&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg 
Sun Sep 16 20:39:21 2007
@@ -65,6 +65,11 @@
         description=Urza Afalas
         user_description= _ "Urza Afalas"
         profile=portraits/urza-afalas-masked.png
+
+        [modifications]
+            {TRAIT_RESILIENT}
+            {TRAIT_INTELLIGENT}
+        [/modifications]
 
         {GOLD 50 70 90}
         {INCOME 2 3 5}
@@ -405,41 +410,23 @@
                 id=accept_bandits
                 message= _ "Very well. All men must unite against the 
undead."
                 [command]
-                    [kill]
-                        side=2
-                        description=Urza Afalas
-                        animate=no
-                        fire_event=no
-                    [/kill]
-
-                    [scroll_to]
-                        x,y=40,20
-                    [/scroll_to]
-
-                    [sound]
-                        name=fanfare-short.wav
-                    [/sound]
-
-                    [move_unit_fake]
-                        type=Outlaw
-                        side=1
-                        x=40,30
-                        y=20,28
-                    [/move_unit_fake]
-
-                    [unit]
-                        description=Urza Afalas
-                        user_description= _ "Urza Afalas"
-                        type=Outlaw
-                        side=1
-                        {IS_HERO}
-                        x=30
-                        y=28
-                        [modifications]
-                            {TRAIT_RESILIENT}
-                            {TRAIT_INTELLIGENT}
-                        [/modifications]
-                    [/unit]
+                    {MODIFY_UNIT side=2 side 1}
+
+                    [store_unit]
+                        [filter]
+                            description=Urza Afalas
+                        [/filter]
+
+                        kill=yes
+                        variable=stored_Urza_Afalas
+                    [/store_unit]
+
+                    {VARIABLE stored_Urza_Afalas.overlays 
"misc/hero-icon.png"}
+                    {VARIABLE stored_Urza_Afalas.canrecruit 0}
+
+                    [unstore_unit]
+                        variable=stored_Urza_Afalas
+                    [/unstore_unit]
 
                     [redraw]
                     [/redraw]
@@ -472,10 +459,7 @@
                         message= _ "Do not fear, I can lead you out when the 
time is right."
                     [/message]
 
-                    [set_variable]
-                        name=side_with_bandits
-                        value=yes
-                    [/set_variable]
+                    {VARIABLE side_with_bandits yes}
 
                     [allow_recruit]
                         side=1
@@ -487,33 +471,6 @@
                         type=Elvish Shaman,Elvish Fighter
                     [/disallow_recruit]
 
-                    # switch the outlaws to your direct control
-                    [while]
-                        [have_unit]
-                            side=2
-                        [/have_unit]
-
-                        [do]
-                            [store_unit]
-                                [filter]
-                                    side=2
-                                [/filter]
-                                variable=unitstats
-                            [/store_unit]
-
-                            [set_variable]
-                                name=unitstats.side
-                                value=1
-                            [/set_variable]
-
-                            [unstore_unit]
-                                variable=unitstats
-                            [/unstore_unit]
-                        [/do]
-                    [/while]
-
-                    {CLEAR_VARIABLE unitstats}
-
                     [remove_shroud]
                         side=1
                         x,y=1-60,1-50
@@ -522,7 +479,7 @@
                     [objectives]
                         side=1
                         [objective]
-                            description= _ "Find the source of the undead 
and destroy it."
+                            description= _ "Find the source of the undead 
and destroy it"
                             condition=win
                         [/objective]
                         [objective]
@@ -620,8 +577,7 @@
             [/variable]
             [then]
                 [message]
-                    speaker=unit
-                    image=portraits/urza-afalas.png
+                    description=Urza Afalas
                     message= _ "Now I pay for my crimes. But how many others 
will also suffer for them?"
                 [/message]
                 [endlevel]




Related Messages


Powered by MHonArc, Updated Sun Sep 16 21:20:31 2007