From be37101456ffb168dd64291d132e2aa52547aed9 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sun, 13 Jul 2008 20:22:01 +0000
Subject: Apply David's commits (r6524/5).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6532 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/command.cc    | 8 +++++---
 crawl-ref/source/dat/large.des | 2 +-
 crawl-ref/source/spl-cast.cc   | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index e276b49933..35333535c7 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1736,8 +1736,9 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "<w>s</w> : wait a turn; searches adjacent\n"
             "    squares (also <w>numpad-5</w>, <w>.</w>, <w>Del</w>)\n"
             "<w>5</w> : rest and long search; stops when\n"
-            "    HP or Magic full, something found \n"
-            "    or 100 turns over (<w>Shift-numpad-5</w>)\n",
+            "    Health or Magic become full,\n"
+            "    something is detected, or after\n"
+            "    100 turns over (<w>Shift-numpad-5</w>)\n",
             true, true, _cmdhelp_textfilter);
 
     cols.add_formatted(
@@ -1789,6 +1790,7 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "<w>a</w> : use special Ability\n"
             "<w>p</w> : Pray\n"
             "<w>z</w> : cast a spell\n"
+            "<w>I</w> : list all spells\n"
             "<w>t</w> : tell allies (<w>tt</w> to shout)\n"
             "<w>`</w> : re-do previous command\n"
             "<w>0</w> : repeat next command # of times\n",
@@ -1862,7 +1864,7 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "<w>M</w> : Memorise a spell from a book\n"
             "<w>w</w> : Wield an item ( <w>-</w> for none)\n"
             "<w>'</w> : wield item a, or switch to b\n"
-            "<w>v</w> : evoke power of wielded item\n"
+            "<w>v</w> : eVoke power of wielded item\n"
             "<w>W</w>/<w>T</w> : Wear or Take off armour\n"
             "<w>P</w>/<w>R</w> : Put on or Remove jewellery\n",
             true, true, _cmdhelp_textfilter);
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index 747a98c11f..de922d39b6 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -272,7 +272,7 @@ ENDMAP
 # With depth-appropriate inhabitants and loot
 #
 NAME:   lemuel_castle
-DEPTH:  D:2-27
+DEPTH:  D:3-27
 ORIENT: northwest
 TAGS:   no_monster_gen no_rotate
 : if you.absdepth() < 7 then
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 808e73e321..6364789e5f 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -203,8 +203,9 @@ int list_spells()
             "              Hunger    Level",
             MEL_TITLE));
     spell_menu.set_highlighter(NULL);
-    spell_menu.set_more(formatted_string("Press '!' to toggle spell view."));
+    spell_menu.set_more(formatted_string("Press '!' or 'I' to toggle spell view."));
     spell_menu.add_toggle_key('!');
+    spell_menu.add_toggle_key('I');
     spell_menu.set_tag("spell");
 
     for ( int i = 0; i < 52; ++i )
-- 
cgit v1.2.3-54-g00ecf