Modify ?v to read in the list of changed command keys.

Modify version highlights.


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

6 files changed, 104 insertions, 20 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index c41090a9ac..db52f85f59 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -9,15 +9,13 @@ Breaks saves compatibility.
 0.5 Highlights
 --------------
 * New species and job: Deep Dwarf, Artificer.
-* Removed three species: Gnome, Grey Elf, Ogre-Mage.
 * Several cool new uniques and other monsters.
 * Several great new portal vaults.
-* Cooler labyrinths.
-* Much more useful monster descriptions.
-* Much more convenient tiles version.
 * Zombies and skeletons can no longer use stairs.
 * Transformations meld equipment instead of removing it.
 * Many spell ranges shortened.
+* Much more useful monster descriptions.
+* More convenient tiles version.
 
 Levels
 ------
diff --git a/crawl-ref/docs/key_changes.txt b/crawl-ref/docs/key_changes.txt
new file mode 100644
index 0000000000..9a1d1639ff
--- /dev/null
+++ b/crawl-ref/docs/key_changes.txt
@@ -0,0 +1,97 @@
+    DUNGEON CRAWL: Important interface changes
+    ==========================================
+
+Command key changes introduced in 0.5
+-------------------------------------
+There have been some command key changes in 0.5. There is no macrofile this
+time; you may have to resort to macros on your own. (This is probably only
+needed to interchange the Z and V commands if you refuse to learn that wands
+are nowadays activated with V.)
+            key        new command
+            V          evokes items in inventory like wands (was Z)
+            Z          cast a spell even if no monster is withing range
+            z          cast a spell (as before) but abort if no monster is
+                       within range
+            Ctrl-X     lists monsters, items and features in sight
+            Ctrl-S     saves game without prompt (was Ctrl-X)
+            On the level map (X):
+            e          set/remove travel exclusion (was Ctrl-X)
+            E          cycle travel exclusions (was x)
+
+
+
+Command key changes introduced in 0.4
+-------------------------------------
+In DCSS 0.4, for better ergonomics, many key bindings were changed. Also, a
+small number of new commands were introduced. The tables below list all of
+these. If you have been playing an older version and want to restore the old
+key set, do so by adding this line to the init.txt file:
+  additional_macro_file = 034_command_keys.txt
+
+The command for examining items (was v) is gone. Bring up the inventory and
+press the key matching an item’s slot in order to examine it.
+When chopping up a single corpse on the ground, there is no longer any prompt.
+You will only be prompted if there are two or more corpses. When answering this
+prompt, you can use the following shortcuts: c means yes, so you can press
+cccc. . . to chop up all corpses in one place, or you can just hit a to butcher
+of corpses on a square.
+
+The * Direction and Ctrl-Direction keys now both open and close doors.
+                 key         new command
+                             read message (only used for online play)
+                 !           annotate level (read annotations with Ctrl-O;
+                             annotations with an ! prompt when entering the level)
+                 (           cycle ammunition
+                 Q           quiver item
+                 ‘           redo previous command
+                 0           repeat next command
+                 V           verbose list of monsters in sight
+                 Ctrl-T      toggle ally pickup mode (only for permanent allies)
+                 Ctrl-D      add macro (a new synonym for ∼)
+                 new key     command                   old key
+                 z           cast spell                was Z
+                 Z           zap wand                  was z
+                 o           auto-explore              was Ctrl-O
+                 Ctrl-O      dungeon overview          was O
+                 O           open door                 was o
+                 C           close door                was c
+                 c           chop up                   was D, dissect
+                 E           show experience           was C
+                 v           evoke                     was E
+                 F           manually throw            was t
+                 t           tell/yell                 was !
+                 Ctrl-V      Tiles settings            was Ctrl-Q
+                 Ctrl-Q      quit                      was Q
+
+There are additional changes to the targeting interface:
+The functions of ! and . have been swapped. So firing with . will now stop at
+the target, whereas ! will shoot further if the target was missed (and Enter,
+Del, Space still behave as in 0.3.4).
+You can now target using the monster list as well; Ctrl-L toggles this option.
+You may quiver an item, meaning that you will preferably fire this ammunition
+(and keep doing so even if you run out of it temporarily). Quivering is done
+via Q (quiver the currently fired item) or fi (choose an item and quiver it) or
+also by using ( (cycling appropriate ammunition) and then firing. F also lets
+you select an item to be thrown, but this command does not affect the quiver.
+
+Other interface changes introduced in 0.4
+-----------------------------------------
+The colours of many monsters have been changed. Most notably, there are no
+darkgrey monsters anymore. In case darkgrey is actually better visible than
+blue on your system, you can swap these colours using the line
+    colour.blue = darkgrey
+in init.txt. Apart from that, more dangerous monsters are now generally
+displayed in lighter colours.
+
+We are content that all of these changes are genuine improvements. Should your
+brain be hardwired to the old settings, you can effectively enforce the 0.3.4
+state by using the following options:
+    include                            = 034_monster_glyphs.txt
+    additional_macro_file              = 034_command_keys.txt
+    always_confirm_butcher             = true
+
+Note that the header of init.txt contains these lines. (It contains some more
+options for using other old settings.) The options are commented out, so you
+just need to remove the # in front in order to activate them. You can choose to
+use only part of these options. In case you decide to use the old keyset, be
+aware that D and d are synonyms for ’yes’ in the butcher interface.
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 1b57c2f05d..d1d3838eac 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -2364,9 +2364,6 @@ void set_god_ability_slots()
     // Finally, add in current god's invocations in traditional slots.
     int num = 0;
 
-//     if (you.religion == GOD_ELYVILON)
-//         _set_god_ability_helper(ABIL_ELYVILON_DESTROY_WEAPONS, 'a' + num++);
-
     for (int i = 0; i < MAX_GOD_ABILITIES; ++i)
     {
         if (god_abilities[you.religion][i] != ABIL_NON_ABILITY)
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 30bb0eb893..8b07755b10 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -59,8 +59,6 @@ static void _adjust_spells(void);
 static void _adjust_ability(void);
 
 static const char *features[] = {
-    "Stash-tracking",
-
 #ifdef CLUA_BINDINGS
     "Lua user scripts",
 #endif
@@ -106,7 +104,7 @@ static std::string _get_version_information(void)
 #endif
                 result += VERSION_DETAIL ").";
 
-    result += "\n\n";
+    result += "\n";
 
     return (result);
 }
@@ -122,7 +120,6 @@ static std::string _get_version_features(void)
         result += features[i];
         result += EOL;
     }
-    result += "\n";
 
     return (result);
 }
@@ -229,7 +226,7 @@ static void _print_version(void)
     cmd_version.add_text(_get_version_features());
     cmd_version.add_text(_get_version_changes());
 
-    std::string fname = "034_changes.txt";
+    std::string fname = "key_changes.txt";
     // Read in information about changes in comparison to the latest version.
     FILE* fp = fopen(datafile_path(fname, false).c_str(), "r");
 
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index a00ebe3ea4..596e1c7374 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4963,16 +4963,12 @@ void read_scroll(int slot)
         break;
 
     case SCR_IMMOLATION:
-    {
         mpr("The scroll explodes in your hands!");
-        // We do this here to prevent it from blowing itself up.
-        set_ident_type(scroll, ID_KNOWN_TYPE);
-        dec_inv_item_quantity(item_slot, 1);
 
+        // Doesn't destroy scrolls anymore, so no special check needed. (jpeg)
         immolation(10, IMMOLATION_SCROLL, you.pos(), alreadyknown, &you);
         bad_effect = true;
         break;
-    }
 
     case SCR_CURSE_WEAPON:
         if (!you.weapon()
@@ -5175,8 +5171,7 @@ void read_scroll(int slot)
                                          : ID_TRIED_TYPE);
 
     // Finally, destroy and identify the scroll.
-    // Scrolls of immolation were already destroyed earlier.
-    if (which_scroll != SCR_PAPER && which_scroll != SCR_IMMOLATION)
+    if (which_scroll != SCR_PAPER)
     {
         if (id_the_scroll)
             set_ident_flags(scroll, ISFLAG_KNOW_TYPE); // for notes
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8f63c80d8e..2aac34031c 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3950,7 +3950,7 @@ void display_char_status()
     }
 
     _output_expiring_message(DUR_ICY_ARMOUR,
-                             "You are protected by an icy shield.");
+                             "You are protected by an icy armour.");
 
     _output_expiring_message(DUR_REPEL_MISSILES,
                              "You are protected from missiles.");