Battlelust rage effect changed to 'building rage': you will go berserk

next turn. (You can drink a !oBR to cancel the effect. Another rage
card effect, however, will just stack on and make you go berserk
the next turn.)
Breaks savefiles.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2111 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 2 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 9921435574..406b6df672 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1849,6 +1849,10 @@ static void decrement_durations()
     else
         you.duration[DUR_GOURMAND] = 0;
 
+    // must come before might/haste/berserk
+    if (decrement_a_duration(DUR_BUILDING_RAGE))
+        go_berserk(false);
+
     // paradox: it both lasts longer & does more damage overall if you're
     //          moving slower.
     // rationalisation: I guess it gets rubbed off/falls off/etc if you
@@ -1885,10 +1889,10 @@ static void decrement_durations()
         {
             mpr("Your icy shield dissipates!", MSGCH_DURATION);
             you.duration[DUR_CONDENSATION_SHIELD] = 0;
-            you.redraw_armour_class = 1;
+            you.redraw_armour_class = true;
         }
     }
-
+   
     if (decrement_a_duration(DUR_ICY_ARMOUR, "Your icy armour evaporates."))
         you.redraw_armour_class = true;