mail[Wesnoth-commits] r20242 - /trunk/data/campaigns/The_South_Guard/scenarios/


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

Header


Content

Posted by mythological on September 09, 2007 - 22:23:
Author: mythological
Date: Sun Sep  9 22:23:10 2007
New Revision: 20242

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20242&view=rev
Log:
Changed the way Deoran gets dismounted and mounted again in TSG, fixing bug 
#8923 at the same time

Modified:
    
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
    trunk/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg

Modified: 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg?rev=20242&r1=20241&r2=20242&view=diff
==============================================================================
--- 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg 
(original)
+++ 
trunk/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg 
Sun Sep  9 22:23:10 2007
@@ -455,15 +455,15 @@
                 # Reinstate Deoran as the leader. Cleaner to do it here than 
at the
                 # beginning of the next scenario.
 
-                {VARIABLE stored_Deoran.x 16}
-                {VARIABLE stored_Deoran.y 23}
-
-                [unstore_unit]
-                    variable=stored_Deoran
-                [/unstore_unit]
-
-                {CLEAR_VARIABLE stored_Deoran}
-
+                #{VARIABLE stored_Deoran.x 16}
+                #{VARIABLE stored_Deoran.y 23}
+
+                #[unstore_unit]
+                    #variable=stored_Deoran
+                #[/unstore_unit]
+
+                #{CLEAR_VARIABLE stored_Deoran}
+                
                 [endlevel]
                     bonus=no
                     result=continue

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=20242&r1=20241&r2=20242&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 
Sun Sep  9 22:23:10 2007
@@ -170,7 +170,7 @@
         # Transform Deoran into a Foot Commander - thanks to Shadow for the 
graphics!
 
         [store_unit]
-            variable=deoran_store
+            variable=dummy_store
             kill=yes
             [filter]
                 description=Deoran
@@ -181,35 +181,48 @@
             time=100
         [/delay]
 
+        {VARIABLE stored_Deoran.x 6}
+        {VARIABLE stored_Deoran.y 2}
+
         [if]
             [variable]
-                name=deoran_store.type
+                name=stored_Deoran.type
+                equals=Junior Commander
+            [/variable]
+            [then]
+                [set_variable]
+                    name=stored_Deoran.type
+                    value=Dismounted Commander 1
+                [/set_variable]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=stored_Deoran.type
                 equals=Horseman Commander
             [/variable]
             [then]
                 [set_variable]
-                    name=deoran_store.type
-                    value=Dismounted Commander
-                [/set_variable]
-                [set_variable]
-                    name=mounted_deoran_unit_type
-                    value=Horseman Commander
+                    name=stored_Deoran.type
+                    value=Dismounted Commander 2
                 [/set_variable]
             [/then]
-            [else]
+        [/if]
+        [if]
+            [variable]
+                name=stored_Deoran.type
+                equals=Mounted General
+            [/variable]
+            [then]
                 [set_variable]
-                    name=deoran_store.type
-                    value=Dismounted Commander
+                    name=stored_Deoran.type
+                    value=Dismounted Commander 3
                 [/set_variable]
-                [set_variable]
-                    name=mounted_deoran_unit_type
-                    value=Lancer Commander
-                [/set_variable]
-            [/else]
+            [/then]
         [/if]
-
+       
         [unstore_unit]
-            variable=deoran_store
+            variable=stored_Deoran
             find_vacant=yes
         [/unstore_unit]
 
@@ -228,6 +241,8 @@
         [/unstore_unit]
 
         {CLEAR_VARIABLE deoran_store}
+
+        {CLEAR_VARIABLE dummy_store}
 
         {FULL_HEAL description=Deoran}
 

Modified: trunk/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg?rev=20242&r1=20241&r2=20242&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg 
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/08a_Vengeance.cfg Sun Sep  
9 22:23:10 2007
@@ -30,7 +30,7 @@
 
     [side]
         side=1
-        type=Dismounted Commander
+        type=Dismounted Commander 1
         description=Deoran
         user_description= _ "Deoran"
         unrenamable=yes
@@ -92,8 +92,6 @@
     [event]
         name=prestart
 
-        {MODIFY_UNIT description=Deoran type "Horseman Commander"}
-
         [disallow_recruit]
             side=1
             type=Elvish Fighter, Elvish Shaman
@@ -102,6 +100,76 @@
 
     [event]
         name=start
+        
+        [store_unit]
+            variable=deoran_store
+            kill=yes
+            [filter]
+                description=Deoran
+            [/filter]
+        [/store_unit]
+
+        [if]
+            [variable]
+                name=deoran_store.type
+                equals=Dismounted Commander 1
+            [/variable]
+            [then]
+                [set_variable]
+                    name=deoran_store.type
+                    value=Junior Commander
+                [/set_variable]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=deoran_store.type
+                equals=Dismounted Commander 2
+            [/variable]
+            [then]
+                [set_variable]
+                    name=deoran_store.type
+                    value=Horseman Commander
+                [/set_variable]
+            [/then]
+        [/if]
+        [if]
+            [variable]
+                name=deoran_store.type
+                equals=Dismounted Commander 3
+            [/variable]
+            [then]
+                [set_variable]
+                    name=deoran_store.type
+                    value=Mounted General
+                [/set_variable]
+            [/then]
+        [/if]
+
+
+        [unstore_unit]
+            variable=deoran_store
+            find_vacant=yes
+        [/unstore_unit]
+
+        [store_unit]
+            [filter]
+                description=Deoran
+            [/filter]
+
+            kill=yes
+            variable=deoran_store
+        [/store_unit]
+
+        [unstore_unit]
+            variable=deoran_store
+            find_vacant=no
+        [/unstore_unit]
+
+        {CLEAR_VARIABLE deoran_store}
+
+        {FULL_HEAL description=Deoran}
+
 
         [recall]
             description=Sir Gerrick




Related Messages


Powered by MHonArc, Updated Sun Sep 09 22:40:35 2007