mail[Wesnoth-commits] r20389 - /trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg


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

Header


Content

Posted by ravanrooke on September 15, 2007 - 12:37:
Author: rhuvaen
Date: Sat Sep 15 12:36:49 2007
New Revision: 20389

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20389&view=rev
Log:
fixed: not all rehydrations should be "silent", only those with no effect.

Modified:
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg?rev=20389&r1=20388&r2=20389&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Harsh_Sands.cfg 
Sat Sep 15 12:36:49 2007
@@ -1783,8 +1783,8 @@
 # EFFECT < 0 is rehydration with notification
 
 #define APPLY_HYDRATION_EFFECT EFFECT
-{VARIABLE effect {EFFECT}}
 {FOREACH affected_unit i}
+  {VARIABLE effect {EFFECT}}
   {VARIABLE thirst $affected_unit[$i].variables.dehydration}
   {VARIABLE hp_to_regain 0}
   # are we dehydrating or rehydrating?
@@ -1832,6 +1832,17 @@
 #else
           {VARIABLE hp_to_regain 4}
 #endif
+        [/then]
+      [/if]
+      # make rehydrate silent if the unit isn't
+      # suffering dehydration
+      [if]
+        [variable]
+          name=thirst
+          less_than=1
+        [/variable]
+        [then]
+          {VARIABLE effect 0}
         [/then]
       [/if]
       {VARIABLE thirst 0}
@@ -1926,11 +1937,6 @@
         [variable]
           name=effect
           not_equals=0
-        [/variable]
-        # refresh silently if not dehydrated
-        [variable]
-          name=thirst
-          greater_than=0
         [/variable]
         [then]
           [unstore_unit]




Related Messages


Powered by MHonArc, Updated Sat Sep 15 13:20:33 2007