Moidfy DUR_TRANSFORMATION to be delay based.

5 files changed, 14 insertions, 14 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index ffd06ae434..90c28a20dc 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1544,7 +1544,7 @@ static bool _do_ability(const ability_def& abil)
 
     case ABIL_END_TRANSFORMATION:
         mpr("You feel almost normal.");
-        you.duration[DUR_TRANSFORMATION] = 2;
+        you.duration[DUR_TRANSFORMATION] = 2 * BASELINE_DELAY;
         break;
 
     // INVOCATIONS:
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 641aa5ce8c..ed5061be01 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -925,11 +925,11 @@ bool food_change(bool suppress_message)
                 }
                 int transform = you.attribute[ATTR_TRANSFORMATION];
                 if (transform != TRAN_NONE && transform != TRAN_BAT
-                    && you.duration[DUR_TRANSFORMATION] > 2)
+                    && you.duration[DUR_TRANSFORMATION] > 2 * BASELINE_DELAY)
                 {
                     mpr("Your blood-deprived body can't sustain your "
                         "transformation much longer.", MSGCH_DURATION);
-                    you.duration[DUR_TRANSFORMATION] = 2;
+                    you.duration[DUR_TRANSFORMATION] = 2 * BASELINE_DELAY;
                 }
             }
             else if (player_in_bat_form()
@@ -940,7 +940,7 @@ bool food_change(bool suppress_message)
                     "much longer.", MSGCH_WARN);
 
                 // Give more time because suddenly stopping flying can be fatal.
-                you.duration[DUR_TRANSFORMATION] = 5;
+                you.duration[DUR_TRANSFORMATION] = 5 * BASELINE_DELAY;
             }
             else if (newstate == HS_ENGORGED && is_vampire_feeding()) // Alive
             {
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 7a8b162b12..15ba2340d1 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -2252,7 +2252,7 @@ static void _decrement_durations()
     //jmf: More flexible weapon branding code.
     int last_value = you.duration[DUR_WEAPON_BRAND];
 
-    if(last_value > 0)
+    if (last_value > 0)
     {
         you.duration[DUR_WEAPON_BRAND] -= delay;
 
@@ -2303,7 +2303,7 @@ static void _decrement_durations()
 
     // Vampire bat transformations are permanent (until ended).
     if (you.species != SP_VAMPIRE || !player_in_bat_form()
-        || you.duration[DUR_TRANSFORMATION] <= 5)
+        || you.duration[DUR_TRANSFORMATION] <= 5 * BASELINE_DELAY)
     {
         if (_decrement_a_duration(DUR_TRANSFORMATION, delay, NULL, random2(3),
                                   "Your transformation is almost over."))
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index c52df3b731..c96e950c10 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -1300,9 +1300,9 @@ void extension(int pow)
             || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT))
     {
         mpr("Your transformation has been extended.");
-        you.duration[DUR_TRANSFORMATION] += random2(pow);
-        if (you.duration[DUR_TRANSFORMATION] > 100)
-            you.duration[DUR_TRANSFORMATION] = 100;
+        you.duration[DUR_TRANSFORMATION] += random2(pow) * BASELINE_DELAY;
+        if (you.duration[DUR_TRANSFORMATION] > 100 * BASELINE_DELAY)
+            you.duration[DUR_TRANSFORMATION] = 100 * BASELINE_DELAY;
 
         // Give a warning if it won't last long enough for the
         // timeout messages.
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 716dba0c9c..ae5f5e1221 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -550,7 +550,7 @@ bool transform(int pow, transformation_type which_trans, bool force,
     if (you.attribute[ATTR_TRANSFORMATION]
         == static_cast<unsigned>(which_trans))
     {
-        if (you.duration[DUR_TRANSFORMATION] < 100)
+        if (you.duration[DUR_TRANSFORMATION] < 100 * BASELINE_DELAY)
         {
             if (just_check)
                 return (true);
@@ -559,10 +559,10 @@ bool transform(int pow, transformation_type which_trans, bool force,
                 mpr("You feel you'll be a pig longer.");
             else
                 mpr("You extend your transformation's duration.");
-            you.duration[DUR_TRANSFORMATION] += random2(pow);
+            you.duration[DUR_TRANSFORMATION] += random2(pow) * BASELINE_DELAY;
 
-            if (you.duration[DUR_TRANSFORMATION] > 100)
-                you.duration[DUR_TRANSFORMATION] = 100;
+            if (you.duration[DUR_TRANSFORMATION] > 100 * BASELINE_DELAY)
+                you.duration[DUR_TRANSFORMATION] = 100 * BASELINE_DELAY;
 
             return (true);
         }
@@ -756,7 +756,7 @@ bool transform(int pow, transformation_type which_trans, bool force,
 
     // Update your status.
     you.attribute[ATTR_TRANSFORMATION] = which_trans;
-    you.duration[DUR_TRANSFORMATION]   = dur;
+    you.duration[DUR_TRANSFORMATION]   = dur * BASELINE_DELAY;
     you.symbol = symbol;
     you.colour = colour;