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, 18 insertions, 1 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index eeab91d2cc..73a9300e2d 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2232,7 +2232,6 @@ void jewellery_wear_effects(item_def &item)
     case RING_SUSTENANCE:
     case RING_SLAYING:
     case RING_SEE_INVISIBLE:
-    case RING_TELEPORTATION:
     case RING_WIZARDRY:
     case RING_REGENERATION:
     case RING_TELEPORT_CONTROL:
@@ -2286,6 +2285,15 @@ void jewellery_wear_effects(item_def &item)
         ident = ID_KNOWN_TYPE;
         break;
 
+    case RING_TELEPORTATION:
+        if (!scan_randarts( RAP_CAN_TELEPORT ))
+        {
+            mpr("You feel slightly jumpy.");
+            ident = ID_KNOWN_TYPE;
+            break;
+        }
+        break;
+        
     case AMU_RAGE:
         mpr("You feel a brief urge to hack something to bits.");
         ident = ID_KNOWN_TYPE;
@@ -2899,6 +2907,15 @@ void inscribe_item()
     mpr( "Inscribe with what? ", MSGCH_PROMPT );
     if (!cancelable_get_line(buf, sizeof buf))
     {
+        // strip spaces from the end
+        for (int i = strlen(buf) - 1; i >= 0; i--)
+        {
+            if (isspace( buf[i] ))
+                buf[i] = 0;
+            else
+                break;
+        }
+            
         you.inv[item_slot].inscription = std::string(buf);
         you.wield_change = true;
     }