More stuff for the tutorial:

- Enhanced handling of spellbooks and artefacts. 
- Feature descriptions now cover altars.
- Added monster descriptions (out of depth and brands).

Also: 
- space-only inscription counts as no inscription
- ring of teleportation autoID's if no teleport randart

In my last commit I forgot to mention that the 
descriptions were suggested by Richard Gould, and
I'd like to give credit where credit is due. :)


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

1 files changed, 9 insertions, 3 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 9adc69245b..61d04151fc 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3388,10 +3388,10 @@ void describe_item( item_def &item, bool allow_inscribe )
     
     if (Options.tutorial_left)
     {
-        gotoxy(1, wherey() + 2);
         tutorial_describe_item(item);
     }
-    if (allow_inscribe)
+    // Don't ask if there aren't enough rows left
+    if (allow_inscribe && wherey() <= get_number_of_lines() - 3)
     {
         gotoxy(1, wherey() + 2);
         formatted_string::parse_string("<cyan>Do you wish to inscribe this item? ").display();
@@ -3606,7 +3606,7 @@ void describe_monsters(monsters& mons)
         case MONS_GUARDIAN_NAGA:
             description << getLongDescription("naga")
                         << "$These nagas are often used as guardians "
-                "by powerful creatures.$";
+                           "by powerful creatures.$";
             break;
         case MONS_GREATER_NAGA:
             description << getLongDescription("naga")
@@ -3731,6 +3731,12 @@ void describe_monsters(monsters& mons)
     clrscr();
     print_description(description.str());
 
+    if (Options.tutorial_left)
+    {
+        gotoxy(1, wherey() + 2);
+        tutorial_describe_monster(static_cast<const monsters*>(&mons));
+    }
+
     if (getch() == 0)
         getch();
 }                               // end describe_monsters