Modify manual and readme to really list the new doc names, and key

settings.
Add vampires to manual (still needs reference to aptitudes etc.!)
and reorder classes according to the new job order.

Re-introduce 't' as a synonym for 'f' in targetting, but don't 
document it anymore. (It's only in convenience to older players, 
anyway.) Also, change default wand inscription from !z to !Z, but
use a hack to check for either.

Oh, and restrict Blood Evaporate effect to Stinking cloud, Fire
and Steam (the latter two like !Rage).


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

1 files changed, 11 insertions, 3 deletions

diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 70c4cc4fa6..f7664f7eb3 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -1046,11 +1046,19 @@ bool has_warning_inscription(const item_def& item,
                              operation_types oper)
 {
     const char iletter = static_cast<char>(oper);
-    
+
     const std::string& r(item.inscription);
     for ( unsigned int i = 0; i + 1 < r.size(); ++i )
-        if (r[i] == '!' && (r[i+1] == iletter || r[i+1] == '*'))
-            return true;
+    {
+        if (r[i] == '!')
+        {
+            if (r[i+1] == iletter || r[i+1] == '*')
+                return true;
+            else if (oper == OPER_ZAP && r[i+1] == 'z') // for the 0.3.4. keys
+                return true;
+        }
+    }
+
     return false;
 }