mail[Wesnoth-commits] r20492 - in /trunk/data/campaigns/The_South_Guard: maps/ scenarios/


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

Header


Content

Posted by lari . nieminen on September 17, 2007 - 16:33:
Author: zookeeper
Date: Mon Sep 17 16:32:42 2007
New Revision: 20492

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20492&view=rev
Log:
Little fixes to the last scenarios of the bandit branch.

Modified:
    trunk/data/campaigns/The_South_Guard/maps/7b_Pebbles_In_The_Flood.map
    
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg

Modified: 
trunk/data/campaigns/The_South_Guard/maps/7b_Pebbles_In_The_Flood.map
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/maps/7b_Pebbles_In_The_Flood.map?rev=20492&r1=20491&r2=20492&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/maps/7b_Pebbles_In_The_Flood.map 
(original)
+++ trunk/data/campaigns/The_South_Guard/maps/7b_Pebbles_In_The_Flood.map Mon 
Sep 17 16:32:42 2007
@@ -6,8 +6,8 @@
 Aa^Fpa      , Aa^Fpa      , Ha          , Aa^Fpa      , Aa^Fpa      , Aa     
     , Aa          , Gs          , Gs          , Gs          , Aa          , 
Aa          , Aa          , Gs          , Gs          , Gs          , Gs      
    , Gs          , Rr          , Gs          , Gs          , Gs          , 
Gs          , Gs          , Gs          , Gs          , Gs          , Gs      
    , Aa^Vha      , Aa          , Aa          , Gs          , Re          , 
Gs          , Aa          , Ai          , Aa          , Aa^Fpa      , Ha      
    , Gg          
 Gs          , Aa          , Ha          , Aa^Fpa      , Gs^Fp       , Gs^Fp  
     , Aa          , Gs          , Gs          , Gs          , Gs          , 
Gs          , Gs          , Gg^Vh       , Gs          , Gs          , Gs      
    , Ce          , Rr          , Ce          , Gs          , Gs          , 
Aa          , Gs          , Gs          , Gs          , Gs          , Gs      
    , Aa          , Aa          , Gs          , Re          , Re          , 
Gs          , Aa          , Aa          , Ai          , Ww          , Ww      
    , Ww          
 Gs          , Gs          , Gs          , Gs          , Gs          , Gs     
     , Gs          , Gs          , Aa          , Aa          , Gs          , 
Gs          , Gs          , Gs          , Gs          , Gs          , Ce      
    , Gg^Vh       , Rr          , Gg^Vh       , Ce          , Gs          , 
Gs          , Gs          , Gg^Vh       , Gs          , Gs          , Gs      
    , Gs          , Gs          , Gs          , Re          , Gs          , 
Hh          , Gs          , Hh          , Aa          , Aa          , Aa      
    , Aa          
-Gs          , Gs          , Aa^Fpa      , Gs          , Gs          , Re     
     , Gs          , Gs          , Aa          , Gs          , Gs          , 
Gs          , Gs          , Gs          , Gs          , Gs          , Ce      
    , Ce          , Rr          , Ce          , Ce          , Ha          , 
Ha          , Aa          , Gs          , Gs          , Gs          , Gs      
    , Aa^Fpa      , Aa^Fpa      , Gs          , Re          , Gs          , 
Gs          , Hh          , Ha          , Aa          , Gs          , Gs      
    , Gs          
-Gs          , Gs          , Gs          , Ce          , Ce          , Ce     
     , Re          , Re          , Gs          , Re          , Aa          , 
Aa          , Gs          , Gs          , Gs          , Gs          , Gs      
    , Re          , 1 Ke        , Gs          , Aa^Fpa      , Ha          , 
Ha          , Aa          , Gs          , Gs          , Gs          , Aa      
    , Aa^Fpa      , Aa^Fpa      , Re          , Aa          , Ce          , 
Ce          , Ha          , Ha          , Ha          , Hh          , Gs      
    , Gs          
+Gs          , Gs          , Aa^Fpa      , Gs          , Gs          , Re     
     , Gs          , Gs          , Aa          , Gs          , Gs          , 
Gs          , Gs          , Gs          , Gs          , Gs          , Ce      
    , Ce          , Rr          , 1 Ce        , Ce          , Ha          , 
Ha          , Aa          , Gs          , Gs          , Gs          , Gs      
    , Aa^Fpa      , Aa^Fpa      , Gs          , Re          , Gs          , 
Gs          , Hh          , Ha          , Aa          , Gs          , Gs      
    , Gs          
+Gs          , Gs          , Gs          , Ce          , Ce          , Ce     
     , Re          , Re          , Gs          , Re          , Aa          , 
Aa          , Gs          , Gs          , Gs          , Gs          , Gs      
    , Re          , Ke          , Gs          , Aa^Fpa      , Ha          , 
Ha          , Aa          , Gs          , Gs          , Gs          , Aa      
    , Aa^Fpa      , Aa^Fpa      , Re          , Aa          , Ce          , 
Ce          , Ha          , Ha          , Ha          , Hh          , Gs      
    , Gs          
 Gs          , Gs          , Gs          , Gs          , Ce          , Aa^Fpa 
     , Gs          , Gs          , Re          , Gs          , Re          , 
Re          , Re          , Re          , Re          , Re          , Re      
    , Gs          , Re          , Re          , Gs          , Gs          , 
Aa          , Re          , Re          , Re          , Re          , Re      
    , Aa          , Re          , Re          , Gs          , Ce          , 
Ce          , Ce          , Gs          , Ha          , Hh          , Gs      
    , Gs          
 Gs          , Aa          , Gs          , Gs          , Gs          , Aa^Fpa 
     , Gs          , Gs          , Gs          , Hh          , Gs          , 
Aa          , Ce          , Ce          , Gs          , Gs          , Aa      
    , Aa          , Gs          , Qxu         , Re          , Re          , 
Re          , Ce          , Gs          , Gs          , Gs          , Gs      
    , Re          , Aa          , Gs          , Gs          , Ha          , 
Ha          , Gs          , Gs          , Gs          , Gs          , Gs      
    , Gs          
 Aa          , Aa          , Gs          , Gs          , Aa^Fpa      , Gs     
     , Aa^Fpa      , Gs          , Gs          , Aa          , Hh          , 
Aa          , Ce          , Gs          , Gs          , Aa^Fpa      , Aa      
    , Aa^Fpa      , Qxu         , Gs          , Qxu         , Gs          , 
Ce          , Aa          , Aa          , Gs          , Gs          , Gs      
    , Aa          , Gs          , Gs          , Gs          , Gs          , 
Gs          , Gs          , Gs          , Gs          , Aa          , Gs      
    , Gs          
@@ -23,4 +23,3 @@
 Mm          , Ha          , Ha          , Ha          , Ha          , Mm     
     , Mm          , Ha          , Aa          , Aa^Fpa      , Aa^Fpa      , 
Aa^Fpa      , Rd          , Ch          , Rd          , Rd          , Rd      
    , Gs          , Rd          , Aa^Fpa      , Gs          , Aa^Fpa      , 
Hh          , Ha          , Aa^Fpa      , Mm          , Rd          , Cud     
    , Cud         , Cud         , Mm          , Mm          , Ha          , 
Aa^Fpa      , Gs          , Gs          , Gs          , Aa          , Gs      
    , Gs          
 Mm          , Ha          , Ha          , Mm          , Mm          , Mm     
     , Mm          , Mm          , Mm          , Ha          , Aa^Fpa      , 
Aa          , Ch          , 3 Kh        , Ch          , Ch          , Rd      
    , Rd          , Gs          , Aa^Fpa      , Aa^Fpa      , Hh          , 
Hh          , Ha          , Mm          , Mm          , Cud         , 2 Kud   
    , Cud         , Mm          , Mm          , Mm          , Ha          , 
Aa^Fpa      , Aa^Fpa      , Aa          , Aa          , Gs          , Gs      
    , Gs          
 Mm          , Ha          , Ha          , Mm          , Mm          , Mm     
     , Mm          , Mm          , Ha          , Ha          , Aa^Fpa      , 
Rd          , Ch          , Ch          , Ch          , Rd          , Rd      
    , Gs          , Gs          , Gs          , Hh          , Ha          , 
Ha          , Ha          , Mm          , Mm          , Mm          , Mm      
    , Cud         , Mm          , Mm          , Mm          , Ha          , 
Gs          , Aa          , Aa          , Gs          , Gs          , Gs      
    , Gs          
-

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg?rev=20492&r1=20491&r2=20492&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg 
(original)
+++ 
trunk/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_In_The_Flood.cfg 
Mon Sep 17 16:32:42 2007
@@ -42,12 +42,11 @@
         {GOLD 250 200 125}
         {INCOME 4 2 0}
 
-        fog=yes
-        shroud=no
-
         canrecruit=1
         recruit=Bowman, Spearman, Cavalryman, Footpad, Thug
     [/side]
+
+    {STARTING_VILLAGES 1 15}
 
     # The Undead Hordes
 
@@ -56,6 +55,8 @@
         type=Ancient Lich
         description="Mal M'Brin"
         user_description= _ "Mal M'Brin"
+        profile=portraits/mal-mbrin.png
+        facing=sw
 
         team_name=The_Undead_Hordes
         controller=ai
@@ -149,6 +150,8 @@
 
         {SG_GUARD Draug (Death Guard) (_"Death Guard") 2 26 23}
         {SG_GUARD Draug (Death Guard) (_"Death Guard") 2 29 22}
+
+        {MODIFY_UNIT x,y=24-40,5-25 facing sw}
     [/event]
 
     #start
@@ -156,9 +159,11 @@
         name=start
         [recall]
             description=Sir Gerrick
+            x,y=19,10
         [/recall]
         [recall]
             description=Urza Afalas
+            x,y=18,9
         [/recall]
 
         [message]
@@ -182,74 +187,25 @@
             message= _ "Make no promises you know you cannot keep. Organize 
the defense of Westin, and if you survive, remember those who fell here."
         [/message]
 
-        # Switch the leader from Deoran to Sir Gerrick
-        # Thanks to "shade" for help with this!
+        {MOVE_UNIT description=Deoran 18 5}
+
+        [message]
+            speaker=Deoran
+            message= _ "Your name will be sounded in the roll of heroes, and 
you will be avenged. Thank you, my friend."
+        [/message]
+
+        {MOVE_UNIT description=Deoran 17 1}
 
         [store_unit]
-            variable=deoran_store
             [filter]
                 description=Deoran
             [/filter]
+
             kill=yes
+            variable=stored_Deoran
         [/store_unit]
 
-        {VARIABLE deoran_store.canrecruit 0}
-
-        [move_unit_fake]
-            type=$deoran_store.type
-            side=1
-            x=19,19,19,19,19,18,18,18,18,17,17
-            y=10,9,8,7,6,5,4,3,2,2,1
-        [/move_unit_fake]
-
-        [unstore_unit]
-            variable=deoran_store
-        [/unstore_unit]
-
-        [hide_unit]
-            x=19
-            y=10
-        [/hide_unit]
-
-        [teleport]
-            [filter]
-                description=Deoran
-            [/filter]
-            x,y=17,1
-        [/teleport]
-
-        [unhide_unit]
-        [/unhide_unit]
-
-        [store_unit]
-            variable=Sir_Gerrick_Store
-            [filter]
-                description=Sir Gerrick
-            [/filter]
-            kill=no
-        [/store_unit]
-
-        {VARIABLE Sir_Gerrick_Store.canrecruit 1}
-
-        [unstore_unit]
-            variable=Sir_Gerrick_Store
-        [/unstore_unit]
-
-        {CLEAR_VARIABLE Sir_Gerrick_Store}
-
-        [message]
-            id=sg_7_intro_6
-            speaker=Deoran
-            message= _ "Your name will be sounded in the roll of heroes, and 
you will be avenged. Thank you, my friend."
-        [/message]
-
-        [store_unit]
-            variable=deoran_store
-            [filter]
-                description=Deoran
-            [/filter]
-            kill=yes
-        [/store_unit]
+        {MODIFY_UNIT (description=Sir Gerrick) canrecruit 1}
 
         [message]
             speaker=Lt. Illan

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg?rev=20492&r1=20491&r2=20492&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg 
Mon Sep 17 16:32:42 2007
@@ -89,26 +89,15 @@
         [/gold]
         {CLEAR_VARIABLE pebbles_starting_gold}
 
-        # Make Deoran the leader again.
-        # Thanks to "shade" for help with this!
-
-        [store_unit]
-            variable=sir_gerrick_store
-            [filter]
-                description=Sir Gerrick
-            [/filter]
-            kill=yes
-        [/store_unit]
-
-        {VARIABLE deoran_store.canrecruit 1}
-        {VARIABLE deoran_store.x 22}
-        {VARIABLE deoran_store.y 16}
+        {VARIABLE stored_Deoran.x 22}
+        {VARIABLE stored_Deoran.y 16}
 
         [unstore_unit]
             variable=deoran_store
+            find_vacant=no
         [/unstore_unit]
 
-        {CLEAR_VARIABLE deoran_store}
+        {CLEAR_VARIABLE stored_Deoran}
 
         [if]
             [variable]




Related Messages


Powered by MHonArc, Updated Mon Sep 17 17:20:47 2007