In an attempt to make bears not both rare and unremarkable, they now often berserk when fleeing. Uses berserk rage as an escape "spell". No changes to vaults (esp. Ice Caves) yet, the situation is being monitored. (patch by due)

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

3 files changed, 20 insertions, 8 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index cbc4892717..dfb355dc91 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2304,6 +2304,7 @@ enum mon_spellbook_type
     MST_CEREBOV,
     MST_GLOORX_VLOQ,
     MST_JESSICA,
+    MST_BERSERK_ESCAPE,               // 165
 
     MST_TEST_SPAWNER = 170,
     NUM_MSTYPES,
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index d0d24c270a..77934544da 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2688,49 +2688,49 @@ static monsterentry mondata[] = {
 // bears ('U')
 {
     MONS_BEAR, 'U', BROWN, "bear",
-    M_WARM_BLOOD,
+    M_WARM_BLOOD | M_SPELLCASTER,
     MR_NO_FLAGS,
     2000, 10, MONS_BEAR, MONS_BEAR, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 6}, {AT_CLAW, AF_PLAIN, 6},
        AT_NO_ATK },
     { 7, 3, 3, 0 },
-    4, 4, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
+    4, 4, MST_BERSERK_ESCAPE, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE
 },
 
 {
     MONS_GRIZZLY_BEAR, 'U', LIGHTGREY, "grizzly bear",
-    M_WARM_BLOOD,
+    M_WARM_BLOOD | M_SPELLCASTER,
     MR_NO_FLAGS,
     2500, 10, MONS_BEAR, MONS_GRIZZLY_BEAR, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8},
        AT_NO_ATK },
     { 7, 4, 4, 0 },
-    5, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
+    5, 8, MST_BERSERK_ESCAPE, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE
 },
 
 {
     MONS_POLAR_BEAR, 'U', WHITE, "polar bear",
-    M_WARM_BLOOD,
+    M_WARM_BLOOD | M_SPELLCASTER,
     MR_RES_COLD,
     2500, 10, MONS_BEAR, MONS_POLAR_BEAR, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5},
        AT_NO_ATK },
     { 7, 5, 3, 0 },
-    7, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
+    7, 8, MST_BERSERK_ESCAPE, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
     HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG
 },
 
 {
     MONS_BLACK_BEAR, 'U', BLUE, "black bear",
-    M_WARM_BLOOD,
+    M_WARM_BLOOD | M_SPELLCASTER,
     MR_NO_FLAGS,
     1800, 10, MONS_BEAR, MONS_BLACK_BEAR, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4},
        AT_NO_ATK },
     { 6, 3, 3, 0 },
-    2, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
+    2, 8, MST_BERSERK_ESCAPE, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM
 },
 
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 7a136b8873..2cec050c91 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -1200,6 +1200,17 @@
       }
     },
 
+    {  MST_BERSERK_ESCAPE,
+      {
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_BERSERKER_RAGE
+      }
+    },
+
     {  MST_TEST_SPAWNER,
       {
        SPELL_SHADOW_CREATURES,