コマンド説明リストの設定ファイル関係が分離してるのは見難いので

こっちにも追加。

diff --git a/lib/help/commdesc.txt b/lib/help/commdesc.txt
index 4627baf..a9796a7 100644 (file)
--- a/lib/help/commdesc.txt
+++ b/lib/help/commdesc.txt
@@ -613,6 +613,52 @@ Quit (commit suicide) (Q)
 See the file pref.hlp for a description of the user preference commands
 together with a detailed description of this function.
 
+Interact with options (=)
+     Allow you to interact with options. Note that using the "cheat"
+     options may mark your savefile as unsuitable for the high score
+     list. You may change normal options using the "X" and "Y" user
+     pref commands. You must use the "redraw" command (^R) after
+     changing certain options.
+
+Interact with macros (@)
+     Allow you to interact with macros. You may load or save macros
+     from user pref files, create macros of various types, or define
+     keymaps. You must define a "current action", shown at the bottom
+     of the screen, before you attempt to use any of the "create macro"
+     commands, which use that "current action" as their action. This
+     is a horrible interface, and will be fixed eventually.
+
+Interact with visuals (%)
+     Allow you to interact with visuals. You may load or save visuals
+     from user pref files, or modify the attr/char mappings for the
+     monsters, objects, and terrain features. You must use the "redraw"
+     command (^R) to redraw the map after changing attr/char mappings.
+
+Interact with colors (&)
+     Allow the user to interact with colors. This command only
+     works on some systems.
+ 
+Reload auto-picker/destroyer preference ($)
+     This command will reload "pickpref.prf" and
+     "pickpref-<<playername>>.prf" for object auto-picker/destroyer
+     after you edit these files with your text editor.
+
+Edit auto-picker/destroyer pref (_)
+     Allow the user to edit the pickpref-<player's name>.prf in the
+     user directry.  Basic usage of the editor is almost same as vi,
+     and also have emacs like commands.  Most commands is always
+     displayed on the first line and the right half of the screen.
+
+     Important commands 
+      'a', 'i' or ^Q :  Enter insert mode from command mode
+      ESC  or ^Q     :  Return to command mode from insert mode
+      'q'            :  Quit the editor (command mode only)
+      'hjkl2468'     :  Move cursor (command mode only)
+      ^B ^N ^P ^F    :  Move cursor (always)
+      ^I  : Choose an item from inventry/equipment, then insert its name
+      ^S  : Rotates action (pick up / destroy / leave on floor)
+      ^U  : Rotates idendify state (identified / unidentified / ...)
+
 
 ***** <Help> 
 --- Help ---

diff --git a/lib/help/jcommdesc.txt b/lib/help/jcommdesc.txt
index b35fe19..6c3a31f 100644 (file)
--- a/lib/help/jcommdesc.txt
+++ b/lib/help/jcommdesc.txt
@@ -580,9 +580,56 @@
 ***** <UserPref>
 --- ¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥³¥Þ¥ó¥É ---
 
-¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë´Ø·¸¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤·¤Æ¤Ï¡¢ÀßÄê¤ÎÊýË¡¤â¾Ü¤·¤¯½ñ¤¤¤Æ
+¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë´Ø·¸¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤·¤Æ¾Ü¤·¤¯¤Ï¡¢ÀßÄê¤ÎÊýË¡¤â½ñ¤¤¤Æ
 ¤¢¤ë jpref.hlp ¤ò¸«¤Æ²¼¤µ¤¤¡£
 
+¥ª¥×¥·¥ç¥ó¤ÎÀßÄê (=)
+     ¥ª¥×¥·¥ç¥óÀßÄê²èÌ̤òɽ¼¨¤·¤Æ¡¢¤½¤³¤ÇÊѶòÈÚÅܤÎÆ°ºî¤òÊѹ¹¤¹¤ë¤³¤È
+     ¤¬¤Ç¤­¤Þ¤¹¡£¡Öº¾µ½¥ª¥×¥·¥ç¥ó¡×¤Î°·¤¤¤Ë¤ÏÃí°Õ¤·¤Æ²¼¤µ¤¤¡£°ìÅ٤Ǥâ
+     ¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢¤½¤Î¤³¤È¤¬¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤Ëµ­Ï¿¤µ¤ì
+     ¤Æ¤·¤Þ¤Ã¤Æ¡¢¥Ï¥¤¥¹¥³¥¢¥ê¥¹¥È¤ËºÜ¤ë¤³¤È¤¬ÉÔ²Äǽ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ
+     ¤¹¡£Ä̾ï¤Î¥ª¥×¥·¥ç¥ó¤Ï¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç "X"¤È"Y"¥³¥Þ¥ó¥É
+     ¤ÇÀßÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¤Ï²èÌÌÉÁ¤­Ä¾¤·
+     ¥³¥Þ¥ó¥É (^R) ¤òÆþÎϤ·¤Ê¤¤¤ÈÍ­¸ú¤Ë¤Ê¤é¤Ê¤¤¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£
+
+¥Þ¥¯¥í¤ÎÀßÄê (@)
+     ¥Þ¥¯¥í¤ÎÀßÄê¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤«¤é¥Þ¥¯¥í
+     ¤òÆɤ߹þ¤ó¤À¤ê¡¢¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥Þ¥¯¥í¤ò¥»¡¼¥Ö¤·¤¿¤ê¡¢ÍÍ¡¹
+     ¤Ê¼ïÎà¤Î¥Þ¥¯¥í¤òÄêµÁ¤·¤¿¤ê¡¢¥­¡¼ÇÛÃÖ¤òÊѹ¹¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£
+
+²èÌÌɽ¼¨¤ÎÀßÄê (%)
+     ²èÌÌɽ¼¨¤Ë´Ø¤¹¤ëÀßÄê¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£²èÌÌɽ¼¨¤ÎÀßÄê¤ò¥æ¡¼
+     ¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤«¤éÆɤ߹þ¤ó¤À¤ê¡¢¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥»¡¼¥Ö¤·
+     ¤¿¤ê¡¢¥â¥ó¥¹¥¿¡¼¤ä¥¢¥¤¥Æ¥à¤äÃÏ·Á¤Î¿§¤äʸ»ú¤òÊѹ¹¤·¤¿¤ê¤¹¤ë¤³¤È¤¬
+     ¤Ç¤­¤Þ¤¹¡£ÀßÄê¤òÊѹ¹¤·¤¿¤é¡¢²èÌÌÉÁ¤­Ä¾¤·¥³¥Þ¥ó¥É (^R) ¤ò»È¤Ã¤Æ²è
+     Ì̤òÉÁ¤­Ä¾¤·¤Æ²¼¤µ¤¤¡£
+
+¥«¥é¡¼¤ÎÀßÄê (&)
+     ¥«¥é¡¼¤ÎÀßÄê¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ
+     ¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£ÀßÄê¤òÊѹ¹¤·¤¿¤é¡¢²èÌÌÉÁ¤­Ä¾¤·¥³¥Þ¥ó¥É (^R) ¤ò»È¤Ã
+     ¤Æ²èÌ̤òÉÁ¤­Ä¾¤·¤Æ²¼¤µ¤¤¡£
+
+¼«Æ°½¦¤¤/Ç˲õÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß ($)
+     ¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢"picktype.prf" ¤È "picktype-<¥­¥ã¥é¥¯¥¿¡¼
+     ̾>.prf"¤òÆɤ߹þ¤ß¤Þ¤¹¡£¥²¡¼¥àÃæ¤Ë¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥¨¥Ç¥£¥¿¤Ç½ñ
+     ¤­ÊѤ¨¤¿¤È¤­¤ËÊØÍø¤Ç¤·¤ç¤¦¡£
+
+¼«Æ°½¦¤¤/Ç˲õ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸ (_)
+     ¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È pickpref-<¥×¥ì¥¤¥ä¡¼¤Î̾Á°>.prf ¤òÊÔ½¸¤¹
+     ¤ë¥¨¥Ç¥£¥¿¡¼¤ËÆþ¤ê¤Þ¤¹¡£´ðËܤÎÁàºî¤Ï vi ¤Ë»÷¤Æ¤¤¤Æ¡¢¤¤¤¯¤Ä¤«¤Î
+     emacs ¤ÈƱ¤¸¥³¥Þ¥ó¥É¤â»È¤¨¤Þ¤¹¡£É¬Íפʥ³¥Þ¥ó¥É¤ÏÁ´¤Æ°ì¹ÔÌܤȥ¨¥Ç¥£
+     ¥¿¡¼²èÌ̤α¦È¾Ê¬¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+
+     ½ÅÍפʥ³¥Þ¥ó¥É
+      'a' ¤È 'i' ¤È ^Q :  ¥³¥Þ¥ó¥É¥â¡¼¥É¤«¤éÆþÎϥ⡼¥É¤Ë°Ü¤ê¤Þ¤¹¡£
+      ESC ¤È ^Q        :  ÆþÎϥ⡼¥É¤«¤é¥³¥Þ¥ó¥É¥â¡¼¥É¤ËÌá¤ê¤Þ¤¹¡£
+      'q'              :  ¥¨¥Ç¥£¥¿¡¼¤ò½ªÎ»¤·¤Þ¤¹¡£(¥³¥Þ¥ó¥É¥â¡¼¥É¤Î¤ß)
+      'hjkl2468'       :  ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£(¥³¥Þ¥ó¥É¥â¡¼¥É¤Î¤ß)
+      ^B ^N ^P ^F      :  ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£(¤¤¤Ä¤Ç¤â»È¤¨¤Þ¤¹)
+      ^I  : »ý¤Áʪ/ÁõÈ÷¤«¤é¥¢¥¤¥Æ¥à¤òÁª¤ó¤Ç¤½¤Î̾Á°¤òÁÞÆþ¤·¤Þ¤¹¡£
+      ^S  : ¥«¡¼¥½¥ë°ÌÃ֤Υ¢¥¤¥Æ¥à¤Î ½¦¤¦/Ç˲õ/ÊüÃÖ ¤ÎÀڤ괹¤¨
+      ^U  : ̤´ÕÄê/*̤´ÕÄê*/´ÕÄêºÑ¤ß/*´ÕÄê*ºÑ¤ß ¤ÎÀ©¸Â¤ÎÀڤ괹¤¨
+
 
 ***** <Help>
 ---  ¥Ø¥ë¥× ---