Moth of wrath angering attack was lost in 0.2, reintroduced.

Monsters can now go berserk (the rage spell, or by moth of wrath attack).

Rupert is now a crusading-style berserker.

Moths of wrath can now enrage nearby monsters of similar attitude.

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

1 files changed, 3 insertions, 23 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 1369f7ed76..9fb999beee 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1678,32 +1678,12 @@ void weird_colours(unsigned char coll, char wc[30])
 
 bool go_berserk(bool intentional)
 {
-    if (you.berserker)
-    {
-        if (intentional)
-            mpr("You're already berserk!");
-        // or else you won't notice -- no message here.
-        return false;
-    }
-
-    if (you.exhausted)
-    {
-        if (intentional)
-            mpr("You're too exhausted to go berserk.");
-        // or else they won't notice -- no message here
-        return false;
-    }
-
-    if (you.is_undead)
-    {
-        if (intentional)
-            mpr("You cannot raise a blood rage in your lifeless body.");
-        // or else you won't notice -- no message here
-        return false;
-    }
+    if (!you.can_go_berserk(intentional))
+        return (false);
 
     if (Options.tutorial_left)
         Options.tut_berserk_counter++;
+    
     mpr("A red film seems to cover your vision as you go berserk!");
     mpr("You feel yourself moving faster!");
     mpr("You feel mighty!");