Author: sapient
Date: Sat Aug 16 09:57:42 2008
New Revision: 28624

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28624&view=rev
Log:
Fix the fix for exp tracking in the tutorial

Modified:
    trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg
    trunk/data/campaigns/tutorial/scenarios/2_Tutorial.cfg

Modified: trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg?rev=28624&r1=28623&r2=28624&view=diff
==============================================================================
--- trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg (original)
+++ trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg Sat Aug 16 09:57:42 
2008
@@ -1097,4 +1097,12 @@
         {CLEAR_VARIABLE next_turn}
         {CLEAR_VARIABLE target_hex}
     [/event]
+
+    # Experience tracking needed in Scenario2 code
+    [event]
+        name=advance
+        first_time_only=no
+        {VARIABLE_OP unit.variables.previous_xp add $unit.max_experience}
+    [/event]
+
 [/tutorial]

Modified: trunk/data/campaigns/tutorial/scenarios/2_Tutorial.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/tutorial/scenarios/2_Tutorial.cfg?rev=28624&r1=28623&r2=28624&view=diff
==============================================================================
--- trunk/data/campaigns/tutorial/scenarios/2_Tutorial.cfg (original)
+++ trunk/data/campaigns/tutorial/scenarios/2_Tutorial.cfg Sat Aug 16 09:57:42 
2008
@@ -461,25 +461,18 @@
         [store_unit]
             variable=recall
             [filter]
-                type=Elvish Fighter
-                [or]
-                    type=Elvish Hero
-                [/or]
-                [or]
-                    type=Elvish Captain
-                [/or]
+                [not]
+                    x,y=1-99,1-99
+                [/not]
             [/filter]
         [/store_unit]
 
-        # Level 2 units should come first.
-        # This kluge may not work if L3s ever become a possibility here.
+        # Higher Level units should come first.
         {VARIABLE recall_xp1 0}
         {VARIABLE recall_xp2 0}
         {FOREACH recall i}
-        {VARIABLE_OP temp_xp format $recall[$i].experience}
-        {VARIABLE_OP temp_level format $recall[$i].level}
-        {VARIABLE_OP temp_level multiply 8}
-        {VARIABLE_OP temp_xp add $temp_level}
+        {VARIABLE temp_xp $recall[$i].experience}
+        {VARIABLE_OP temp_xp add $recall[$i].variables.previous_xp}
         [if]
             [variable]
                 name=temp_xp


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

Reply via email to