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, 6 insertions, 0 deletions

diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index 1f745b1a78..ce747fd17d 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -1392,6 +1392,9 @@ static void describe_mons_enchantment(const monsters &mons,
     // internally valid.
     if (paralysed && (ench.ench == ENCH_SLOW || ench.ench == ENCH_HASTE))
         return;
+
+    if (ench.ench == ENCH_HASTE && mons.has_ench(ENCH_BERSERK))
+        return;
             
     strcpy(info, mons_pronoun(mons.type, PRONOUN_CAP));
 
@@ -1412,6 +1415,9 @@ static void describe_mons_enchantment(const monsters &mons,
     case ENCH_SLOW:
         strcat(info, " is moving slowly.");
         break;
+    case ENCH_BERSERK:
+        strcat(info, " is berserk!");
+        break;
     case ENCH_HASTE:
         strcat(info, " is moving very quickly.");
         break;