Author: espreon
Date: Tue Oct 25 19:07:13 2011
New Revision: 51637

URL: http://svn.gna.org/viewcvs/wesnoth?rev=51637&view=rev
Log:
Made it so that Tallin's moves are actually restored; ensured that Tallin gets 
the right ellipse image set after transformation.

Modified:
    trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
    trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg

Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg?rev=51637&r1=51636&r2=51637&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/05b_Compelled.cfg Tue Oct 
25 19:07:13 2011
@@ -104,22 +104,40 @@
             [case]
                 value=0,1
                 {VARIABLE new_tallin_type "Dark Adept"}
+                {VARIABLE new_tallin_moves 5}
             [/case]
 
             [case]
                 value=2
                 {VARIABLE new_tallin_type "Dark Sorcerer"}
+                {VARIABLE new_tallin_moves 5}
             [/case]
 
             [else]
                 {VARIABLE new_tallin_type Lich}
+                {VARIABLE new_tallin_moves 6}
             [/else]
         [/switch]
 
-        {TRANSFORM_UNIT id=Tallin $new_tallin_type}
-        {FULL_HEAL id=Tallin}
-
-        {CLEAR_VARIABLE old_tallin_level,new_tallin_type}
+        [modify_unit]
+            [filter]
+                id=Tallin
+            [/filter]
+
+            type=$new_tallin_type
+            moves=$new_tallin_moves
+        [/modify_unit]
+
+        # Sadly, due to some limitation, we cannot change the ellipse in the 
[modify_unit] block above
+        [modify_unit]
+            [filter]
+                id=Tallin
+            [/filter]
+
+            ellipse="misc/ellipse"
+        [/modify_unit]
+
+        {CLEAR_VARIABLE old_tallin_level,new_tallin_type,new_tallin_moves}
 
         [store_gold]
             side=1

Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg?rev=51637&r1=51636&r2=51637&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg 
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg Tue Oct 
25 19:07:13 2011
@@ -280,8 +280,23 @@
             [/else]
         [/switch]
 
-        {TRANSFORM_UNIT id=Tallin $new_tallin_type}
-        {FULL_HEAL id=Tallin}
+        [modify_unit]
+            [filter]
+                id=Tallin
+            [/filter]
+
+            type=$new_tallin_type
+            moves=6
+        [/modify_unit]
+
+        # Sadly, due to some limitation, we cannot change the ellipse in the 
[modify_unit] block above
+        [modify_unit]
+            [filter]
+                id=Tallin
+            [/filter]
+
+            ellipse="misc/ellipse"
+        [/modify_unit]
 
         {CLEAR_VARIABLE old_tallin_level,new_tallin_type}
     [/event]


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

Reply via email to