* Add a prompt when attacking monsters with an inappropriate weapon or

  when attempting to use (controlled) berserk while wielding an
  inappropriate weapon. (FR 1956656)

* Make monsters stop patrolling/travelling if they change levels (or are
  banished).

* Disable the friendly pickup toggle for characters unable to use them.
  Currently, only worshippers of TSO and Beogh are capable of gaining
  allies that are permanent (not summoned), permanently friendly (not
  charmed) and intelligent enough to pick up stuff (no zombies). I don't
  know if you keep your friends if you leave TSO. If so, the toggle
  should be enabled while that is the case (i.e. if you're still
  worshipping a good god)

* Re-order the wizmode commands in the help screen. They're now not
  listed strictly alphabetically anymore, but rather sorted into
  different categories that should make actually finding commands easier.



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

1 files changed, 52 insertions, 38 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 8f086eebea..34df390d2b 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1921,59 +1921,73 @@ static void _list_wizard_commands()
     cols.set_pagesize(get_number_of_lines());
 
     cols.add_formatted(0,
-                       "<w>a</w>      : acquirement\n"
+                       "<yellow>Player stats</yellow>\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>r</w>      : change character's species\n"
+                       "<w>s</w>      : gain 20000 skill points\n"
+                       "<w>S</w>      : set skill to level\n"
+                       "<w>x</w>      : gain an experience level\n"
+                       "<w>Ctrl-X</w> : change experience level\n"
+                       "<w>$</w>      : get 1000 gold\n"
+                       "<w>]</w>      : get a mutation\n"
+                       "<w>[</w>      : get a demonspawn mutation\n"
+                       "<w>^</w>      : gain piety\n"
+                       "<w>_</w>      : gain religion\n"
+                       "<w>@</w>      : set Str Int Dex\n"
+                       "\n"
+                       "<yellow>Other player related effects</yellow>\n"
+                       "<w>c</w>      : card effect\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>X</w>      : make Xom do something now\n"
+                       "<w>z</w>/<w>Z</w>    : cast spell by number/name\n"
+                       "\n"
+                       "<yellow>Item related commands</yellow>\n"
+                       "<w>a</w>      : acquirement\n"
+                       "<w>C</w>      : (un)curse item\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",
+                       "<w>t</w>      : tweak object properties\n"
+                       "<w>v</w>      : show gold value of an item\n"
+                       "<w>|</w>      : create all unrand/fixed artefacts\n"
+                       "<w>+</w>      : make randart from item\n"
+                       "<w>'</w>      : list items\n",
                        true, true);
 
     cols.add_formatted(1,
-                       "<w>t</w>      : tweak object properties\n"
+                       "<yellow>Monster related commands</yellow>\n"
+                       "<w>G</w>      : banish all monsters\n"
+                       "<w>m</w>/<w>M</w>    : create monster by number/name\n"
+                       "<w>\"</w>      : list monsters\n"
+                       "\n"
+                       "<yellow>Create level features</yellow>\n"
+                       "<w>l</w>      : make entrance to labyrinth\n"
+                       "<w>L</w>      : place a vault by name\n"
+                       "<w>p</w>      : make entrance to pandemonium\n"
+                       "<w>P</w>      : make a portal (i.e., bazaars)\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>(</w>/<w>)</w>    : make feature by number/name\n"
+                       "<w>\\</w>      : make a shop\n"
+                       "\n"
+                       "<yellow>Other level related commands</yellow>\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>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",
+                       "\n"
+                       "<yellow>Debugging commands</yellow>\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>Ctrl-I</w> : item generation stats\n"
+                       "\n"
+                       "\n"
+                       "<w>?</w>      : list wizard commands\n",
                        true, true);
 
     _show_keyhelp_menu(cols.formatted_lines(), false, true);