Refixed draconian band sizes, and tweaked debug.cc so that wizmode create monster always calls allows a band of monsters, so it's easier to test band generation.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@73 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 14 insertions, 10 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 647c842d47..f6f1a2c4a2 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2560,7 +2560,7 @@ keycode_type get_next_keycode() {
 	const char DOSunidiocy[10]   = { "bjnh.lyku" };
 	const int DOScontrolidiocy[9] = {
 	    117, 145, 118, 115, 76, 116, 119, 141, 132
-	}
+	};
 	keyin = getch();
 	for (int j = 0; j < 9; ++j ) {
 	    if ( keyin == DOSidiocy[j] )
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index bd1bb85f67..5682415d73 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -619,7 +619,8 @@ void create_spec_monster(void)
     if (mon == -1)
         canned_msg( MSG_OK );
     else
-        create_monster( mon, 0, BEH_SLEEP, you.x_pos, you.y_pos, MHITNOT, 250 );
+        create_monster( mon, 0, BEH_SLEEP, 
+                you.x_pos, you.y_pos, MHITNOT, 250, true );
 }                               // end create_spec_monster()
 #endif
 
@@ -643,7 +644,8 @@ void create_spec_monster_name(void)
     }
     else
     {
-        create_monster(mon, 0, BEH_SLEEP, you.x_pos, you.y_pos, MHITNOT, 250);
+        create_monster(mon, 0, BEH_SLEEP, 
+                you.x_pos, you.y_pos, MHITNOT, 250, true);
     }
 }                               // end create_spec_monster_name()
 #endif
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 479e9bb1a5..fad7f6375b 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -1062,11 +1062,10 @@ static int band_member(int band, int power)
 
 int mons_place( int mon_type, char behaviour, int target, bool summoned,
                 int px, int py, int level_type, int proximity, int extra,
-                int dur )
+                int dur, bool permit_bands )
 {
     int mon_count = 0;
     int temp_rand;          // probabilty determination {dlb}
-    bool permit_bands = false;
 
     for (int il = 0; il < MAX_MONSTERS; il++)
     {
@@ -1102,7 +1101,9 @@ int mons_place( int mon_type, char behaviour, int target, bool summoned,
                                    : MONS_PIT_FIEND);                //  5.07%
     }
 
-    if (mon_type == RANDOM_MONSTER || level_type == LEVEL_PANDEMONIUM)
+    if (permit_bands 
+            || mon_type == RANDOM_MONSTER 
+            || level_type == LEVEL_PANDEMONIUM)
         permit_bands = true;
 
     int mid = -1;
@@ -1160,7 +1161,7 @@ int mons_place( int mon_type, char behaviour, int target, bool summoned,
 
 
 int create_monster( int cls, int dur, int beha, int cr_x, int cr_y,
-                    int hitting, int zsec )
+                    int hitting, int zsec, bool permit_bands )
 {
     int summd = -1;
     FixedVector < char, 2 > empty;
@@ -1177,7 +1178,7 @@ int create_monster( int cls, int dur, int beha, int cr_x, int cr_y,
     if (empty_surrounds( cr_x, cr_y, spcw, true, empty ))
     {
         summd = mons_place( cls, beha, hitting, true, empty[0], empty[1],
-                            you.level_type, 0, zsec, dur );
+                            you.level_type, 0, zsec, dur, permit_bands );
     }
 
     // determine whether creating a monster is successful (summd != -1) {dlb}:
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h
index ba45fe36d2..e1d7259953 100644
--- a/crawl-ref/source/monplace.h
+++ b/crawl-ref/source/monplace.h
@@ -37,7 +37,8 @@
 int mons_place( int mon_type, char behaviour, int target, bool summoned,
                 int px, int py, int level_type = LEVEL_DUNGEON, 
                 int proximity = PROX_ANYWHERE, int extra = 250,
-                int dur = 0 );
+                int dur = 0,
+                bool permit_bands = false );
 
 // last updated 12may2000 {dlb}
 /* ***********************************************************************
@@ -46,7 +47,7 @@ int mons_place( int mon_type, char behaviour, int target, bool summoned,
  *              spells2 - spells3 - spells4
  * *********************************************************************** */
 int create_monster( int cls, int dur, int beha, int cr_x, int cr_y, 
-                    int hitting, int zsec );
+                    int hitting, int zsec, bool permit_bands = false );
 
 
 // last updated 12may2000 {dlb}