Make patrolling monster movement more natural: don't always return to

the patrol centre, make it more likely to return to the patrol area
if the monster left it somehow but is still nearby, and make friendly 
monsters move around the player on their way to their target.

Also, highlight wizard commands in the wizard help.


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

1 files changed, 50 insertions, 50 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 52f8ec9226..5959825431 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1832,59 +1832,59 @@ static void _list_wizard_commands()
     cols.set_pagesize(get_number_of_lines());
 
     cols.add_formatted(0,
-                       "a      : acquirement\n"
-                       "A      : set all skills to level\n"
-                       "Ctrl-A : generate new Abyss area\n"
-                       "b      : controlled blink\n"
-                       "B      : banish yourself to the Abyss\n"
-                       "c      : card effect\n"
-                       "C      : (un)curse item\n"
-                       "g      : add a skill\n"
-                       "G      : banish all monsters\n"
-                       "Ctrl-G : save ghost (bones file)\n"
-                       "f      : player combat damage stats\n"
-                       "F      : combat stats with fsim_kit\n"
-                       "Ctrl-F : combat stats (monster vs PC)\n"
-                       "h/H    : heal yourself (super-Heal)\n"
-                       "i/I    : identify/unidentify inventory\n"
-                       "Ctrl-I : item generation stats\n"
-                       "l      : make entrance to labyrinth\n"
-                       "L      : place a vault by name\n"
-                       "m/M    : create monster by number/name\n"
-                       "o/%    : create an object\n"
-                       "p      : make entrance to pandemonium\n"
-                       "P      : make a portal (i.e., bazaars)\n"
-                       "r      : change character's species\n"
-                       "s      : gain 20000 skill points\n"
-                       "S      : set skill to level\n",
+                       "<w>a</w>      : acquirement\n"
+                       "<w>A</w>      : set all skills to level\n"
+                       "<w>Ctrl-A</w> : generate new Abyss area\n"
+                       "<w>b</w>      : controlled blink\n"
+                       "<w>B</w>      : banish yourself to the Abyss\n"
+                       "<w>c</w>      : card effect\n"
+                       "<w>C</w>      : (un)curse item\n"
+                       "<w>g</w>      : add a skill\n"
+                       "<w>G</w>      : banish all monsters\n"
+                       "<w>Ctrl-G</w> : save ghost (bones file)\n"
+                       "<w>f</w>      : player combat damage stats\n"
+                       "<w>F</w>      : combat stats with fsim_kit\n"
+                       "<w>Ctrl-F</w> : combat stats (monster vs PC)\n"
+                       "<w>h</w>/<w>H</w>    : heal yourself (super-Heal)\n"
+                       "<w>i</w>/<w>I</w>    : identify/unidentify inventory\n"
+                       "<w>Ctrl-I</w> : item generation stats\n"
+                       "<w>l</w>      : make entrance to labyrinth\n"
+                       "<w>L</w>      : place a vault by name\n"
+                       "<w>m</w>/<w>M</w>    : create monster by number/name\n"
+                       "<w>o</w>/<w>%</w>    : create an object\n"
+                       "<w>p</w>      : make entrance to pandemonium\n"
+                       "<w>P</w>      : make a portal (i.e., bazaars)\n"
+                       "<w>r</w>      : change character's species\n"
+                       "<w>s</w>      : gain 20000 skill points\n"
+                       "<w>S</w>      : set skill to level\n",
                        true, true);
 
     cols.add_formatted(1,
-                       "t      : tweak object properties\n"
-                       "T      : make a trap\n"
-                       "v      : show gold value of an item\n"
-                       "x      : gain an experience level\n"
-                       "Ctrl-X : change experience level\n"
-                       "X      : make Xom do something now\n"
-                       "z/Z    : cast spell by number/name\n"
-                       "$      : get 1000 gold\n"
-                       "</>    : create up/down staircase\n"
-                       "u/d    : shift up/down one level\n"
-                       "~      : go to a specific level\n"
-                       "(/)    : make feature by number/name\n"
-                       "]      : get a mutation\n"
-                       "[      : get a demonspawn mutation\n"
-                       ":      : find branches in the dungeon\n"
-                       "{      : magic mapping\n"
-                       "^      : gain piety\n"
-                       "_      : gain religion\n"
-                       "'      : list items\n"
-                       "\"      : list monsters\n"
-                       "?      : list wizard commands\n"
-                       "|      : make unrand/fixed artefacts\n"
-                       "+      : make randart from item\n"
-                       "@      : set Str Int Dex\n"
-                       "\\      : make a shop\n",
+                       "<w>t</w>      : tweak object properties\n"
+                       "<w>T</w>      : make a trap\n"
+                       "<w>v</w>      : show gold value of an item\n"
+                       "<w>x</w>      : gain an experience level\n"
+                       "<w>Ctrl-X</w> : change experience level\n"
+                       "<w>X</w>      : make Xom do something now\n"
+                       "<w>z</w>/<w>Z</w>    : cast spell by number/name\n"
+                       "<w>$</w>      : get 1000 gold\n"
+                       "<w><<</w>/<w>></w>    : create up/down staircase\n"
+                       "<w>u</w>/<w>d</w>    : shift up/down one level\n"
+                       "<w>~</w>      : go to a specific level\n"
+                       "<w>(</w>/<w>)</w>    : make feature by number/name\n"
+                       "<w>]</w>      : get a mutation\n"
+                       "<w>[</w>      : get a demonspawn mutation\n"
+                       "<w>:</w>      : find branches in the dungeon\n"
+                       "<w>{</w>      : magic mapping\n"
+                       "<w>^</w>      : gain piety\n"
+                       "<w>_</w>      : gain religion\n"
+                       "<w>'</w>      : list items\n"
+                       "<w>\"</w>      : list monsters\n"
+                       "<w>?</w>      : list wizard commands\n"
+                       "<w>|</w>      : create all unrand/fixed artefacts\n"
+                       "<w>+</w>      : make randart from item\n"
+                       "<w>@</w>      : set Str Int Dex\n"
+                       "<w>\\</w>      : make a shop\n",
                        true, true);
 
     _show_keyhelp_menu(cols.formatted_lines(), false, true);