Don't note monsters of HD <= 2. (Butterflies may be extremely rare, but

when they appear, it's not interesting enough to be noted.)
Tweak wizmode monster placement to never place monsters at the player
position. Rather, change one of the neighbouring square's terrain type,
if need be.


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

1 files changed, 9 insertions, 3 deletions

diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 4268ffbfaf..b462a5d3ac 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -505,6 +505,13 @@ void wizard_create_spec_monster_name()
         type = mspec.monbase;
 
     coord_def place = find_newmons_square(type, coord_def(x, y));
+    if (!in_bounds(place))
+    {
+        // Try again with habitat HT_LAND.
+        // (Will be changed to the necessary terrain type in dgn_place_monster.)
+        place = find_newmons_square(MONS_PROGRAM_BUG, coord_def(x,y));
+    }
+
     if (in_bounds(place))
     {
         x = place.x;
@@ -512,9 +519,8 @@ void wizard_create_spec_monster_name()
     }
     else
     {
-        // Reset to your position.
-        x = you.x_pos;
-        y = you.y_pos;
+        mpr("Found no space to place monster.", MSGCH_DIAGNOSTICS);
+        return;
     }
 
     // Wizmode users should be able to conjure up uniques even if they