Tweak change log a bit and add new commands to 034_changes.txt. Are

there more new commands I've forgotten? Please don't include wizmode
commands as they don't matter during normal game.


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

7 files changed, 42 insertions, 26 deletions

diff --git a/crawl-ref/docs/034_changes.txt b/crawl-ref/docs/034_changes.txt
index 5f472f6e7f..bf7688cafc 100644
--- a/crawl-ref/docs/034_changes.txt
+++ b/crawl-ref/docs/034_changes.txt
@@ -15,10 +15,23 @@ them:
    c         chop up          (was D, dissect)
    E         show experience  (was C)
    v         evoke            (was E)
-   F         fire/throw       (was t)
+   f, F      fire/throw       (was t)
    t         tell/yell        (was !)
    Ctrl-V    Tiles settings   (was Ctrl-Q)
    Ctrl-Q    quit             (was Q)
+
+* Added some new commands:
+   `         repeat previous command
+   0         repeat next command # of times
+   !         annotate dungeon level
+             (If your annotation contains '!' you'll be prompted whenever 
+             you attempt to enter the level.)
+   Ctrl-D    define macros (synonym to '~')
+   Ctrl-G    verbose list of monsters in sight
+   Ctrl-T    change your allies' pickup behaviour
+             (only available to some characters)
+   Q         quiver an item for firing
+
    There is a file called "keys.pdf" in the /docs directory. It should be
    printable and contains a reference sheet for all keys used in Crawl.
 
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 7d21bc5de6..74078c946e 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -1,4 +1,4 @@
-Stone Soup 0.4.0 (2008????)
+Stone Soup 0.4.0 (200807??)
 ---------------------------
 
 Disclaimer: These are merely the highlights, not an exhaustive list of changes.
@@ -6,8 +6,8 @@ Disclaimer: These are merely the highlights, not an exhaustive list of changes.
 Breaks saves and bones compatibility.
 
 
-Highlights
-----------
+0.4 Highlights
+--------------
 * Many interface improvements.
 * Greatly improved Tiles.
 * Allow all sensible species/class combinations.
@@ -44,16 +44,15 @@ Interface
 * Added harmful effects (poison etc.) to chunk descriptions.
 * Evaporate can now be cancelled during potion/direction choice.
 * Portaled Projectile now allows choice of ammunition.
+* Stash tracker now tracks decay of corpses/chunks, eventually removing them.
 * greedy_explore now defaults to true.
-* Stash tracker now tracks how decayed corpses and flesh chunks become,
-  and removes them from the tracker once they rot away completely.
 
 Gods
 ----
 * Overhauled the good gods: Zin/TSO completely new, Elyvilon more interesting.
 * Greatly improved Beogh and Nemelex, and made Xom more interesting.
 * Vehumet isn't evil anymore, and all boosts apply without prayer.
-* Increase cost for Lugonu's self-banishment.
+* Switch costs of Lugonu's self-banishment and leaving the Abyss.
 * Removed autoprayer and option to stop prayer.
 * Removed item sacrifices for all gods except Nemelex, TSO, Zin.
 * Upon failed sacrifice hint on accepted item types.
@@ -103,13 +102,13 @@ Monsters
 --------
 * New glyphs and colours for many monsters.
   (See /settings/034_monster_glyphs.txt.)
+* Beefed up demon lords.
 * Draconian ghosts of xl >= 7 get the shadow dragon breath attack.
 * Ghosts get Dispel Undead, Freezing Cloud, etc.
 * Mummy curses now only decay a random amount of a stack of potions.
+* Make Snorg go berserk.
 * Angels and Daevas may appear randomly in the Abyss.
 * Holy monsters may turn neutral if the player follows a good god.
-* Beefed up demon lords.
-* Make Snorg go berserk.
 * Unknown mimics are now consistently treated like items.
 * Changed monster resists to have several levels, like the player's.
 * Removed electricity resistance from several monsters.
@@ -127,7 +126,7 @@ Monsters
 * Monsters won't enter miasma if it harms them.
 * Implemented Dispel Undead for monsters.
 * Fix nagas/centaurs never being generating with bardings.
-* Monsters may use wands of disintegration and polymorph other (mutates).
+* Monsters may use wands of disintegration/polymorph other (mutate the player).
 * Make paralysed monsters stabbable.
 * Give a message for kills out of LOS.
 * No experience for killing summoned monsters.
@@ -160,11 +159,9 @@ Tiles
 * Adapted tutorial for tiles.
 * Improved mouse-click inventory/dungeon interaction.
 * Show travel exclusion in tile map and mini-map.
-* Fixed ghosts changing icons between saves.
 * Fixed Detect creatures revealing exact monster type.
 * Mimics posing as autopickable items now get marked as such.
 * Clicking on items now respects warning inscriptions.
-* Added item brand for plants.
 * General improvement.
 
 Miscellaneous
@@ -183,8 +180,8 @@ Miscellaneous
 * Overhaul of ghost structure.
 * Overhauled and improved the documentation.
 * Outsourced a lot of text into database files.
-* General code clean-up.
 * Lots of additional bugs squashed.
+* General code clean-up.
 
 
 Stone Soup 0.3.4 (20080129)
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 0b4fba6736..305f4379bb 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1561,7 +1561,7 @@ static void _input()
 
     if (you.turn_is_over)
     {
-        if ( apply_berserk_penalty )
+        if (apply_berserk_penalty)
             _do_berserk_no_combat_penalty();
 
         _world_reacts();
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index e4edca3747..f86f95082c 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -111,7 +111,7 @@ static std::string _get_version_information(void)
 
 static std::string _get_version_features(void)
 {
-    std::string result  = "<w>FEATURES</w>" EOL;
+    std::string result  = "<w>Features</w>" EOL;
                 result += "--------" EOL;
 
     for (unsigned int i = 0; i < ARRAYSZ(features); i++)
@@ -153,7 +153,7 @@ static std::string _get_version_changes(void)
         }
         help = buf;
         // Give up if you encountered the second set of underliners
-        // and still haven't found Highlights.
+        // and still haven't encountered the keyword "Highlights".
         if (help.find("---") != std::string::npos)
         {
             if (skip_lines)
@@ -197,8 +197,8 @@ static std::string _get_version_changes(void)
     {
         result += EOL;
         result += "For a more complete list of changes, see changes.stone_soup "
-                  "in the /docs " EOL
-                  "folder.";
+                  "in the " EOL
+                  "/docs folder.";
     }
     else
     {
@@ -1829,7 +1829,8 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "<w>[</w> : display worn armour\n"
             "<w>)</w> : display current weapons\n"
             "<w>\"</w> : display worn jewellery\n"
-            "<w>E</w> : display experience info\n",
+            "<w>E</w> : display experience info\n"
+            "<w>Ctrl-G</w> : list monsters in sight\n",
             true, true, _cmdhelp_textfilter);
 
     cols.add_formatted(
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 9c9d58be54..2f0bb6e661 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2671,7 +2671,8 @@ void handle_time(long time_delta)
     }
     // Exercise stealth skill:
     else if (you.burden_state == BS_UNENCUMBERED
-        && !you.duration[DUR_BERSERKER] && you.special_wield != SPWLD_SHADOW)
+             && !you.duration[DUR_BERSERKER]
+             && you.special_wield != SPWLD_SHADOW)
     {
         // Diminishing returns for stealth training by waiting.
         if ((you.equip[EQ_BODY_ARMOUR] == -1
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index b25274a9aa..abcd2a15f5 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -218,7 +218,7 @@ static void _hell_spawn_random_monsters()
     }
 }
 
-//#define DEBUG_MON_CREATION
+#define DEBUG_MON_CREATION
 void spawn_random_monsters()
 {
 #ifdef DEBUG_MON_CREATION
@@ -230,6 +230,11 @@ void spawn_random_monsters()
         return;
     }
 
+    mprf(MSGCH_DIAGNOSTICS, "dungeon? %s, temple? %s, descending? %s",
+         you.level_type == LEVEL_DUNGEON ? "true" : "false",
+         player_in_branch(BRANCH_ECUMENICAL_TEMPLE) ? "true" : "false",
+         you.char_direction == GDT_DESCENDING ? "true" : "false");
+
     // Place normal dungeon monsters,  but not in player LOS.
     if (you.level_type == LEVEL_DUNGEON
         && !player_in_branch( BRANCH_ECUMENICAL_TEMPLE )
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 7bb3e01029..baa7954078 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1959,7 +1959,7 @@ static char_choice_restriction _book_restriction(int booktype,
     case 1:    // Ice
         switch (you.species)
         {
-        case SP_OGRE_MAGE:
+        case SP_OGRE:
             if (!summon_too)
                 return (CC_RESTRICTED);
             // else fall-through
@@ -1974,7 +1974,7 @@ static char_choice_restriction _book_restriction(int booktype,
         case SP_GNOME:
         case SP_KOBOLD:
         case SP_NAGA:
-        case SP_OGRE:
+        case SP_OGRE_MAGE:
         case SP_GHOUL:
         case SP_VAMPIRE:
             return (CC_UNRESTRICTED);
@@ -2143,7 +2143,6 @@ static bool _choose_book( item_def& book, int firstbook, int numbooks )
 
 static char_choice_restriction _weapon_restriction(weapon_type wpn)
 {
-    // Short sword
     switch (wpn)
     {
     case WPN_UNARMED:
@@ -2162,8 +2161,8 @@ static char_choice_restriction _weapon_restriction(weapon_type wpn)
         // still better with them than any other starting weapon.
         case SP_SLUDGE_ELF:
         case SP_HALFLING:
-        case SP_KOBOLD:
         case SP_GNOME:
+        case SP_KOBOLD:
         case SP_SPRIGGAN:
         case SP_NAGA:
         case SP_MINOTAUR:
@@ -2207,12 +2206,12 @@ static char_choice_restriction _weapon_restriction(weapon_type wpn)
         case SP_HUMAN:
         case SP_HILL_ORC:
         case SP_MERFOLK:
-        case SP_MUMMY:
         case SP_NAGA:
         case SP_CENTAUR:
         case SP_OGRE_MAGE:
         case SP_MINOTAUR:
         case SP_KENKU:
+        case SP_MUMMY:
             return (CC_UNRESTRICTED);
 
         default: