Set manticores' number of spike volleys in the proper place.

2 files changed, 8 insertions, 5 deletions

diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index 6070ea0ee7..de6b5718e8 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -1222,7 +1222,7 @@ static int _place_monster_aux(const mgen_data &mg,
     else if (mons_class_itemuse(mg.cls) >= MONUSE_STARTING_EQUIPMENT)
     {
         give_item(id, mg.power, summoned);
-        // Give these monsters a second weapon -- bwr
+        // Give these monsters a second weapon. - bwr
         if (mons_class_wields_two_weapons(mg.cls))
             give_item(id, mg.power, summoned);
 
@@ -1230,10 +1230,6 @@ static int _place_monster_aux(const mgen_data &mg,
         mon->wield_melee_weapon(false);
     }
 
-    // Give manticores 8 to 16 spike volleys.
-    if (mg.cls == MONS_MANTICORE)
-        mon->number = 8 + random2(9);
-
     if (mg.cls == MONS_SLIME_CREATURE)
     {
         if (mg.number > 1)
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 22392fa3f1..5169f76542 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1534,16 +1534,23 @@ void define_monster(monsters &mons)
         ev = 7 + random2(5);
         break;
 
+    case MONS_MANTICORE:
+        // Manticores start off with 8 to 16 spike volleys.
+        monnumber = 8 + random2(9);
+        break;
+
     case MONS_SLIME_CREATURE:
         // Slime creatures start off as only single un-merged blobs.
         monnumber = 1;
         break;
 
     case MONS_HYDRA:
+        // Hydras start off with 4 to 8 heads.
         monnumber = random_range(4, 8);
         break;
 
     case MONS_LERNAEAN_HYDRA:
+        // The Lernaean hydra starts off with 27 heads.
         monnumber = 27;
         break;