自動拾い関係、ヘルプとサンプル設定を大幅に変更/更新。

diff --git a/lib/help/jeditor.txt b/lib/help/jeditor.txt
index bd2d9df..60f312c 100644 (file)
--- a/lib/help/jeditor.txt
+++ b/lib/help/jeditor.txt
@@ -1,6 +1,6 @@
-#####G=== ¼«Æ°½¦¤¤/Ç˲õ ¥ª¥ó¥é¥¤¥ó¡¦¥Ø¥ë¥× ===
+[[[[[G=== ¼«Æ°½¦¤¤/Ç˲õ ¥ª¥ó¥é¥¤¥ó¡¦¥Ø¥ë¥× ===
 
-#####o»²¾È¤·¤¿¤¤¹àÌܤε­¹æ¤ò²¡¤·¤Æ²¼¤µ¤¤:
+[[[[[o»²¾È¤·¤¿¤¤¹àÌܤε­¹æ¤ò²¡¤·¤Æ²¼¤µ¤¤:
 
     (a) ¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¤Î´ðËÜÁàºî       (#Editor)
     (b) ¥«¥Ã¥È&¥Ú¡¼¥¹¥È                  (#CutAndPaste)
@@ -13,6 +13,7 @@
 
     (i) ¼«Æ°½¦¤¤/Ç˲õÀßÄê¤Î½ñ¼°»ÅÍÍ      (#AutopickFormat)
     (j) ¾ò·ï¼°¤Î½ñ¼°»ÅÍÍ                 (#ConditionFormat)
+    (k) ¥µ¥ó¥×¥ëÀßÄê                     (lib/pref/picktype.prf)
 
 ***** [a] jeditor.txt#Editor
 ***** [b] jeditor.txt#CutAndPaste
@@ -24,22 +25,23 @@
 ***** [h] jeditor.txt#AutoRegister
 ***** [i] jeditor.txt#AutopickFormat
 ***** [j] jeditor.txt#ConditionFormat
+***** [k] ../pref/picktype.prf
 
 ***** <Editor>
-#####G--- ¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¤Î´ðËÜÁàºî ---
+[[[[[G--- ¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¤Î´ðËÜÁàºî ---
 
 ¡Ö¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¡×¤Ï¡Ö¼«Æ°½¦¤¤/Ç˲õ¡×¤ÎÀßÄê¤ò½ñ¤¯¤¿¤á¤ÎÀìÍѤΥƥ­¥¹
 ¥È¥¨¥Ç¥£¥¿¤Ç¤¹¡£
 
-¥²¡¼¥àÃæ¤Ë ¡Ö_¡×¥­¡¼¤ò²¡¤¹¤«¡¢¥ª¥×¥·¥ç¥ó²èÌ̤ǡÖ(P) ¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¡×
+¥²¡¼¥àÃæ¤Ë [[[[[o¡Ö_¡×¥­¡¼]¤ò²¡¤¹¤«¡¢¥ª¥×¥·¥ç¥ó²èÌ̤ǡÖ(P) ¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¡×
 ¤òÁªÂò¤¹¤ë¤È¥¨¥Ç¥£¥¿²èÌ̤ËÆþ¤ê¤Þ¤¹¡£
 
 ´ðËÜŪ¤ËÉáÄ̤Υƥ­¥¹¥È¥¨¥Ç¥£¥¿¤Ç¤¹¤«¤é¡¢[[[[[o¥«¡¼¥½¥ë¥­¡¼] ¤ä [[[[[oHome]¡¢[[[[[oEnd]¡¢
 [[[[[oPageUp]¡¢[[[[[oPageDown]¤Î³Æ¥­¡¼¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Æ¡¢¼«Í³¤Ëʸ»ú¤òÆþÎϤ¹¤ë¤À¤±
 ¤ÇÀßÄê¤ò½ñ¤­ÊѤ¨¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£
 
-#####oÀßÄê¤ò½ªÎ»¤¹¤ë¤Ë¤Ï ^W ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£Êѹ¹¤Ï¼«Æ°Åª¤Ë¥»¡¼¥Ö¤µ¤ì¤Þ¤¹¡£
-#####o¤Þ¤¿¡¢^Q ¤ò²¡¤¹¤ÈÀßÄêÊѹ¹¤ò¼è¤ê¤ä¤á¤Æ²¿¤â¥»¡¼¥Ö¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¡£
+[[[[[oÀßÄê¤ò½ªÎ»¤¹¤ë¤Ë¤Ï ^W ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£Êѹ¹¤Ï¼«Æ°Åª¤Ë¥»¡¼¥Ö¤µ¤ì¤Þ¤¹¡£
+[[[[[o¤Þ¤¿¡¢^Q ¤ò²¡¤¹¤ÈÀßÄêÊѹ¹¤ò¼è¤ê¤ä¤á¤Æ²¿¤â¥»¡¼¥Ö¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¡£
 
 [[[[[oESC]¥­¡¼¤ò²¡¤¹¤È¥á¥Ë¥å¡¼¤¬³«¤­¤Þ¤¹¡£
 +----------------------------+
@@ -64,7 +66,7 @@
 
 
 ***** <CutAndPaste>
-#####G--- ¥«¥Ã¥È&¥Ú¡¼¥¹¥È ---
+[[[[[G--- ¥«¥Ã¥È&¥Ú¡¼¥¹¥È ---
 
 »÷¤¿¤è¤¦¤Ê¹Ô¤òÂô»³½ñ¤­¤¿¤¤»þ¤ä¡¢¹Ô¤Î½çÈÖ¤òÆþ¤ì´¹¤¨¤¿¤¤»þ¤Ë¤Ï¥«¥Ã¥È&¥Ú¡¼
 ¥¹¥È¤¬ÊØÍø¤Ç¤¹¡£
@@ -93,7 +95,7 @@
 
 
 ***** <RegisterName>
-#####G--- ¼«Æ°½¦¤¤¤Ë¥¢¥¤¥Æ¥à¤òÅÐÏ¿ ---
+[[[[[G--- ¼«Æ°½¦¤¤¤Ë¥¢¥¤¥Æ¥à¤òÅÐÏ¿ ---
 
 1¹Ô¤Ë1¤Ä¤º¤Ä¥¢¥¤¥Æ¥à¤Î̾Á°¤ò½ñ¤¯»ö¤Ç¡¢¤½¤Î¥¢¥¤¥Æ¥à¤ò¼«Æ°Åª¤Ë½¦¤¦¤è¤¦¤Ë
 ÀßÄꤵ¤ì¤Þ¤¹¡£
@@ -106,10 +108,10 @@
 ¤È½ñ¤¯¤À¤±¤Ç¤¹¡£¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¤Ï¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤Ê¤Î¤Ç¥­¡¼¤òÆþÎϤ¹¤ì
 ¤Ð¤½¤Î¤Þ¤Þ½ñ¤­¹þ¤Þ¤ì¤Þ¤¹¡£É¬ÍפʤéEnter¥­¡¼¤ò²¡¤·¤Æ²þ¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
 ¤³¤³¤Ç¡¢º£¡Ö¥¹¥Ô¡¼¥É¤ÎÌô¡×¤È½ñ¤¤¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò¹ç¤ï¤»¤ë¤È¡¢²èÌ̲¼¤Ë
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 Á´¤Æ¤Î¥¢¥¤¥Æ¥à¤Ç¡¢Ì¾Á°¤¬¡Ö¥¹¥Ô¡¼¥É¤ÎÌô¡×¤ò´Þ¤à¤â¤Î¤ò½¦¤¦¡£Á´ÂΥޥå×('M')¤Ç'M'¤ò
 ²¡¤·¤¿¤È¤­¤Ëɽ¼¨¤¹¤ë¡£
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 ¤³¤Î¤è¤¦¤ËÀßÄêÆâÍƤÎÀâÌÀ¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
 ¤â¤·¤¢¤Ê¤¿¤¬¶õÊ¢½¼Â­¤ÎËâË¡¤òÃΤäƤ¤¤Æ¡¢¿©ÎÁ¤Ï¤â¤Ï¤äɬÍ×̵¤¤¤Î¤Ê¤é¤Ð¡¢
 ¹Ô¤ÎÀèƬ¤Ë¼«Æ°Ç˲õ¤ò°ÕÌ£¤¹¤ëʸ»ú¡Ö!¡×¤ò½ñ¤­¹þ¤ß¤Þ¤¹¡£
@@ -118,10 +120,10 @@
 !¿©ÎÁ
 
 ¤½¤¦¤¹¤ë¤È¡¢²èÌ̲¼¤ÎÀâÌÀʸ¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 Á´¤Æ¤Î¥¢¥¤¥Æ¥à¤Ç¡¢Ì¾Á°¤¬¡Ö¿©ÎÁ¡×¤ò´Þ¤à¤â¤Î¤òÇ˲õ¤¹¤ë¡£Á´ÂΥޥå×('M')¤Ç'K'¤ò²¡¤·
 ¤¿¤È¤­¤Ëɽ¼¨¤¹¤ë¡£
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 
 ºÇ¸å¤Ë¡Ö^W¡×(¤Ä¤Þ¤ê¡¢¥³¥ó¥È¥í¡¼¥ë¥­¡¼¤ò²¡¤·¤Ê¤¬¤é W ¥­¡¼)¤ò²¡¤·¤Æ ¥¨¥Ç¥£
 ¥¿¤ò½ªÎ»¤¹¤ì¤ÐÀßÄê¤Ï½ª¤ï¤ê¤Ç¤¹¡£
@@ -131,7 +133,7 @@
 
 
 ***** <InsertObjectName>
-#####G--- »ý¤Áʪ¤Î̾Á°¤òÁÞÆþ ---
+[[[[[G--- »ý¤Áʪ¤Î̾Á°¤òÁÞÆþ ---
 
 Î㤨¤Ð¡¢¤¢¤Ê¤¿¤¬Âô»³¤Î¥¢¥¤¥Æ¥à¤ò³¹¤Ë»ý¤Áµ¢¤Ã¤Æ´ÕÄꤷ¤¿»þ¡¢
 ¥ê¥ó¥´¥¸¥å¡¼¥¹¡¢²óÉü¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ¡¢¸ºÆǤÎÌô¡¢±½¤Î´¬Êª¡¢
@@ -175,7 +177,7 @@
 ¤³¤³¤Ç¡Öc¡×¤ò²¡¤·¤Æ¡¢¥ê¥ó¥´¥¸¥å¡¼¥¹¤ÎÌô¤òÁªÂò¤¹¤ë¤È¡¢¤³¤Î̾Á°¤¬¼«Æ°½¦
 ¤¤¥¨¥Ç¥£¥¿¤Ë½ñ¤­¹þ¤Þ¤ì¤Þ¤¹¡£Â¾¤Î3¤Ä¤Ë¤Ä¤¤¤Æ¤âƱÍͤ˷«¤êÊÖ¤¹¤È¡¢
 
-¥ê¥ó¥´¥¸¥å¡¼¥¹
+¥ê¥ó¥´¥¸¥å¡¼¥¹¤ÎÌô
 ¸ºÆǤÎÌô
 ËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
 ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
@@ -186,16 +188,16 @@
 
 ¤È¤³¤í¤Ç¡¢´¬Êª¤ÈËâË¡ËÀ¤Ë¤Ä¤¤¤Æ¤Ï¡ÖËâË¡¥¢¥¤¥Æ¥à¡×¤È¤¤¤¦¥­¡¼¥ï¡¼¥É¤¬¼«Æ°
 Ū¤ËÉղ䵤ì¤Þ¤·¤¿¡£²èÌ̲¼¤ÎÀâÌÀ¤òÆɤà¤È°Ê²¼¤Î¤è¤¦¤Ë½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 Á´¤Æ¤Î´¬Êª¤äËâË¡ËÀ¤ä¾ó¤ä¥í¥Ã¥É¤Ç¡¢Ì¾Á°¤¬¡Ö±½¤Î´¬Êª¡×¤ò´Þ¤à¤â¤Î¤ò½¦¤¦¡£Á´ÂÎ¥Þ¥Ã
 ¥×('M')¤Ç'M'¤ò²¡¤·¤¿¤È¤­¤Ëɽ¼¨¤¹¤ë¡£
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 
 ¾¤Ë¤â¿§¡¹¤Ê¼ïÎà¤Î¥­¡¼¥ï¡¼¥É¤¬Êä½õŪ¤ËÉղ䵤ì¤ë»ö¤¬¤¢¤ê¤Þ¤¹¡£
 
 
 ***** <InsertKeyword>
-#####G--- Äê·¿¤Î¥­¡¼¥ï¡¼¥É¤òÆþÎÏ ---
+[[[[[G--- Äê·¿¤Î¥­¡¼¥ï¡¼¥É¤òÆþÎÏ ---
 
 Î㤨¤Ð¡¢¤Þ¤À´ÕÄꤷ¤Æ¤¤¤Ê¤¤¥Ö¡¼¥Ä¤òÁ´¤Æ¡Ö¡Á¤ò½¦¤¤¤Þ¤¹¤«¡© [y/n]¡×¤Î³Îǧ
 ÉÕ¤­¤Ç¼«Æ°½¦¤¤¤·¤¿¤¤¤È¤·¤Þ¤¹¡£¼«Æ°Ç˲õ¤ò»ØÄꤹ¤ëʸ»ú¤Ï¡Ö!¡×¤Ç¡¢ÊüÃÖ¤ò
@@ -215,10 +217,10 @@
 
 ¤Î½çÈÖ¤ËÁªÂò¤¹¤ì¤Ð´°Î»¤Ç¤¹¡£
 ¤³¤Î»þ¡¢²èÌ̲¼¤Îɽ¼¨¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 ̤´ÕÄê¤Î¥Ö¡¼¥Ä¤ò³Îǧ¤Î¸å¤Ë½¦¤¦¡£Á´ÂΥޥå×('M')¤Ç'M'¤ò²¡¤·¤¿¤È¤­¤Ëɽ¼¨¤¹¤ë
 
-#####D--------------------------------------------------------------------------------
+[[[[[D--------------------------------------------------------------------------------
 
 ¾¤Ë¤â¿¿ô¤Î¥­¡¼¥ï¡¼¥É¤¬¤¢¤ë¤Î¤Ç¼êÅö¤¿¤ê¼¡Âè¤Ë¿§¡¹ÁªÂò¤·¤Æ¼Â¸³¤·¤Æ¤ß¤Þ
 ¤·¤ç¤¦¡£²èÌ̲¼¤Îɽ¼¨¤Ç¤Á¤ã¤ó¤È²òÆɤ·¤Æ¤¯¤ì¤ë¤Î¤Ç°Â¿´¤Ç¤¹¡£°ìÄ̤ê¼Â¸³¤·
@@ -229,31 +231,31 @@
 
 
 ***** <MultiLines>
-#####G---  Ê£¿ô¤Î¹Ô¤òƱ»þ¤ËÊѹ¹  ---
+[[[[[G---  Ê£¿ô¤Î¹Ô¤òƱ»þ¤ËÊѹ¹  ---
 
 ¥·¥Õ¥È+¥«¡¼¥½¥ë¥­¡¼¤ÇÊ£¿ô¤Î¹Ô¤òÁªÂò¤·¤Æ¤«¤é¥á¥Ë¥å¡¼¤òÁª¤Ö¤È¡¢Æ±»þ¤ËÊ£
 ¿ô¤Î¹Ô¤Ë¥­¡¼¥ï¡¼¥É¤òÉÕ¤±²Ã¤¨¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤ÐÀèÄø¤ÎÎã¤Î4¹Ô¤òÁªÂò
 [[[[[o(¥·¥Õ¥È+²¼¸þ¤­¥«¡¼¥½¥ë¥­¡¼ ¤ò3²ó²¡¤¹)]¤·¤Æ¡¢
 
-#####y¥ê¥ó¥´¥¸¥å¡¼¥¹
-#####y¸ºÆǤÎÌô
-#####yËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
-#####yËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
+[[[[[y¥ê¥ó¥´¥¸¥å¡¼¥¹
+[[[[[y¸ºÆǤÎÌô
+[[[[[yËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
+[[[[[yËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
 
 ¤³¤ÎÍͤˤ·¤Æ¤«¤é¥á¥Ë¥å¡¼¤Ç
 ¡Öl) ½¦¤¤/Ç˲õ/ÊüÃÖ¤ÎÁªÂò ¢§¡× ¢ª ¡Öb) ¡Ö!¡× (¼«Æ°Ç˲õ)¡×
 ¤Î½çÈÖ¤ËÁª¤Ö¤È°ìÅÙ¤ÎÁàºî¤Ç
 
-#####y!¥ê¥ó¥´¥¸¥å¡¼¥¹
-#####y!¸ºÆǤÎÌô
-#####y!ËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
-#####y!ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
+[[[[[y!¥ê¥ó¥´¥¸¥å¡¼¥¹
+[[[[[y!¸ºÆǤÎÌô
+[[[[[y!ËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
+[[[[[y!ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
 
 ¤È½ñ¤­ÊѤ¨¤é¤ì¤Þ¤¹¡£Â¾¤Î¥­¡¼¥ï¡¼¥É¤âƱÍͤǤ¹¡£
 
 
 ***** <Conditionals>
-#####G---  ¾ò·ïʸ  ---
+[[[[[G---  ¾ò·ïʸ  ---
 
 ¼«Æ°½¦¤¤/Ç˲õ¤ÎÀßÄê¤Ï¥×¥ì¥¤¥ä¡¼¤Î¼ï²/¿¦¶È/¥ì¥Ù¥ëÅù¤Ç¾ò·ïÉÕ¤­¤ÇÀßÄꤹ
 ¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£
@@ -273,11 +275,11 @@
 ¤³¤Î2¹Ô¤Î´Ö¤Ë½ñ¤­¹þ¤ó¤ÀÀßÄê¹Ô¤Ï¤³¤Î¾ò·ï¤¬Ëþ¤¿¤µ¤ì¤ë¥­¥ã¥é¥¯¥¿¡¼¤ËÂФ·
 ¤Æ¤Î¤ßÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£Î㤨¤Ð¿Í´Ö¥á¥¤¥¸¤ËÂФ·¤Æ¤Ï
 
-#####D?:[AND [EQU $RACE Human] [EQU $CLASS Warrior] [GEQ $LEVEL 05]]
-#####D!¥ê¥ó¥´¥¸¥å¡¼¥¹
-#####D!¸ºÆǤÎÌô
-#####D!ËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
-#####D!ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
+[[[[[D?:[AND [EQU $RACE Human] [EQU $CLASS Warrior] [GEQ $LEVEL 05]]
+[[[[[D!¥ê¥ó¥´¥¸¥å¡¼¥¹
+[[[[[D!¸ºÆǤÎÌô
+[[[[[D!ËâË¡¥¢¥¤¥Æ¥à:±½¤Î´¬Êª
+[[[[[D!ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
 ?:1
 
 ¤ÎÍͤË[[[[[D°Å¤¤¿§]¤Î¥Æ¥­¥¹¥È¤Çɽ¼¨¤µ¤ì¡¢ÀßÄ̵꤬¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë»ö¤¬ÌÀ¼¨Åª¤ËȽ
@@ -288,11 +290,11 @@
 ?:[EQU $CLASS Warrior]
 ¤È¤¤¤¦É÷¤ËÊÔ½¸¤·¤Æ¤¯¤À¤µ¤¤¡£
 
-#####o¥«¥Ã¥È&¥Ú¡¼¥¹¥È¤ò³èÍѤ·¤Æ³Ú¤ËÊÔ½¸¤·¤Þ¤·¤ç¤¦¡£(#CutAndPaste [b]¤ò»²¾È)
+[[[[[o¥«¥Ã¥È&¥Ú¡¼¥¹¥È¤ò³èÍѤ·¤Æ³Ú¤ËÊÔ½¸¤·¤Þ¤·¤ç¤¦¡£(#CutAndPaste [b]¤ò»²¾È)
 
 
 ***** <AutoRegister>
-#####G---  ¥¨¥Ç¥£¥¿Ìµ¤·¤Ç¼«Æ°Ç˲õÅÐÏ¿  ---
+[[[[[G---  ¥¨¥Ç¥£¥¿Ìµ¤·¤Ç¼«Æ°Ç˲õÅÐÏ¿  ---
 
 ¥¢¥¤¥Æ¥à¤ò¼«Æ°Ç˲õ¤ËÅÐÏ¿¤¹¤ëºî¶È¤Ï¤µ¤é¤Ë´Êñ¤ÊÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
 [[[[[o¥¢¥¤¥Æ¥à¤ò²õ¤¹¥³¥Þ¥ó¥É(k ¤Þ¤¿¤Ï ^D)]¤Ç¼ê¸µ¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤·¡¢
@@ -302,7 +304,7 @@
 ¤È¤¤¤¦É÷¤Ë¼ÁÌ䤵¤ì¤¿»þ¤Ë¡ÖA¡×¤ò²¡¤·¤Þ¤¹¡£°Ê¾å¤Ç´°Î»¤Ç¤¹¡£
 ´Êñ¤Ç¤·¤ç¤¦¡©¤³¤ì¤À¤±¤Ç
 
-#####r(!ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
+[[[[[r(!ËâË¡¥¢¥¤¥Æ¥à:¥¹¥Ô¡¼¥É¡¦¥â¥ó¥¹¥¿¡¼¤ÎËâË¡ËÀ
 
 ¤È¤¤¤¦ÀßÄ꤬¼«Æ°½¦¤¤¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ë½ñ¤­¹þ¤Þ¤ì¤Þ¤¹¡£
 
@@ -313,52 +315,49 @@
 ÃΤδ¬Êª¤Ï¡¢¥È¥é¥Ã¥×´¶ÃΤΥí¥Ã¥É¤ò½¦¤Ã¤¿Ãʳ¬¤ÇÉÔÍפˤʤê¤Þ¤¹¤Í¡£
 
 ÁõÈ÷ÉʤˤĤ¤¤Æ¤âÍøÍѤ¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î»þ¤ÏÁõÈ÷Éʤ¬
-#####o(1)´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç
-#####o(2)´ÕÄꤵ¤ì¤Æ¤¤¤Æ̵ÌÃ(ʤȾå¼Á)¤Î¾ì¹ç
-#####o(3)´ÕÄꤵ¤ì¤Æ¤¤¤Æ¥¨¥´(¹âµéÉÊ)¤Î¾ì¹ç
+[[[[[o(1)´ÕÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç
+[[[[[o(2)´ÕÄꤵ¤ì¤Æ¤¤¤Æ̵ÌÃ(ʤȾå¼Á)¤Î¾ì¹ç
+[[[[[o(3)´ÕÄꤵ¤ì¤Æ¤¤¤Æ¥¨¥´(¹âµéÉÊ)¤Î¾ì¹ç
 ¤Î¤¤¤º¤ì¤«¤Ë¤è¤Ã¤Æ¼«Æ°ÅÐÏ¿¤µ¤ì¤ëÆâÍƤ¬°Û¤Ê¤ê¤Þ¤¹¡£
 ¶ñÂÎŪ¤Ë¤Ï°Ê²¼¤Îɽ¤Î¤è¤¦¤Ê´Ø·¸¤Ë¤Ê¤ê¤Þ¤¹¡£
 
-[[[[[BÁªÂò¤·¤¿¥¢¥¤¥Æ¥à]                [[[[[B¼«Æ°ÅÐÏ¿¤µ¤ì¤ëÆâÍÆ]
+ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à                ¼«Æ°ÅÐÏ¿¤µ¤ì¤ëÆâÍÆ
+[[[[[D--------------------------      ---------------------------
 ¥À¥¬¡¼ (1d4)[[[[[o(̤´ÕÄê¤Î¾ì¹ç)]  ¢ª  [[[[[r(!̤´ÕÄê¤ÎÉð´ï:¥À¥¬¡¼]
 ¥À¥¬¡¼ (1d4) {ÊÂ}           ¢ª  [[[[[r(!̵ÌäÎÉð´ï:¥À¥¬¡¼]
 ¥À¥¬¡¼ (1d4) (+0,+0)        ¢ª  [[[[[r(!̵ÌäÎÉð´ï:¥À¥¬¡¼]
 ¥À¥¬¡¼ (1d4) {¾å¼Á}         ¢ª  [[[[[r(!̵ÌäÎÉð´ï:¥À¥¬¡¼]
 ¥À¥¬¡¼ (1d4) (+3,+2)        ¢ª  [[[[[r(!̵ÌäÎÉð´ï:¥À¥¬¡¼]
 ¥À¥¬¡¼ (1d4) {¹âµéÉÊ}       ¢ª  [[[[[r(!¥¨¥´Éð´ï:¥À¥¬¡¼]
-¾Æ´þ¤Î¥À¥¬¡¼ (1d4) (+5,+5)  ¢ª  [[[[[r(!¥¨¥´Éð´ï:¾Æ´þ¤Î]
-
-[[[[[o(Ãí°Õ)] ´ÕÄêºÑ¤ß¤Î¥¨¥´¥¢¥¤¥Æ¥à¤ò¼«Æ°ÅÐÏ¿¤·¤¿»þ¤Ï¡¢¥Ù¡¼¥¹¥¢¥¤¥Æ¥à(¥À¥¬¡¼
-Åù)¤Î¼ïÎà¤Ë°Í¤é¤º¤Ë¡¢Á´¤Æ¤ÎƱ¼ï¤Î¥¨¥´¥¢¥¤¥Æ¥à¤ò¼«Æ°Ç˲õ¤¹¤ë»ö¤ËÃí°Õ¤·
-¤Æ¤¯¤À¤µ¤¤¡£
+¾Æ´þ¤Î¥À¥¬¡¼ (1d4) (+5,+5)  ¢ª  [[[[[r(!¤¢¤ê¤Õ¤ì¤¿¥¨¥´Éð´ï:¾Æ´þ¤Î]
 
 
 ¼«Æ°ÅÐÏ¿¤µ¤ì¤¿ÀßÄê¤ò¼è¤ê¾Ã¤·¤¿¤êÊÔ½¸¤¹¤ë¾ì¹ç¤Ï¡¢¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¤ò»È¤¤
 ¤Þ¤¹¡£°ìÈֺǸå¤ËÄɲ䵤ì¤Æ¤¤¤ë¤Î¤Ç¡¢[[[[[oEnd]¥­¡¼¤Ç°ÜÆ°¤¹¤ë¤ÈÊØÍø¤Ç¤·¤ç¤¦¡£
 Î㤨¤Ð¼¡¤Î¤è¤¦¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤¿¤Ê¤é¡¢
 
-#####r?:$AUTOREGISTER
-#####r# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°ÅÐÏ¿¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
-#####r# ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢É¬ÍפʹԤϾå¤ÎÊý¤Ø°ÜÆ°¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤
-#####r(!̵ÌäÎÉð´ï:¥À¥¬¡¼
-#####r(!ËâË¡¥¢¥¤¥Æ¥à:¥È¥é¥Ã¥×´¶ÃΤδ¬Êª
-#####r(!¥¹¥é¥¤¥à¥â¥ë¥É
+[[[[[r?:$AUTOREGISTER
+[[[[[r# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°ÅÐÏ¿¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
+[[[[[r# ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢É¬ÍפʹԤϾå¤ÎÊý¤Ø°ÜÆ°¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤
+[[[[[r(!̵ÌäÎÉð´ï:¥À¥¬¡¼
+[[[[[r(!ËâË¡¥¢¥¤¥Æ¥à:¥È¥é¥Ã¥×´¶ÃΤδ¬Êª
+[[[[[r(!¥¹¥é¥¤¥à¥â¥ë¥É
 
 ¥«¥Ã¥È(^X) & ¥Ú¡¼¥¹¥È(^V)¤ò»È¤Ã¤Æ¼¡¤Î¤è¤¦¤Ë¹Ô¤Î½çÈÖ¤òÆþ¤ì´¹¤¨¤ì¤Ð¡¢¥¹
 ¥é¥¤¥à¥â¥ë¥É¤Î¼«Æ°Ç˲õ¤Î¤ß¼¡°Ê¹ß¤Î¥­¥ã¥é¥¯¥¿¡¼¤Ç¤âÅÐÏ¿¤µ¤ì¤¿¤Þ¤Þ¤Ë¤Ê¤ê
 ¤Þ¤¹¡£Í­¸ú´ü¸Â¤¬Äê¤á¤é¤ì¤Æ¤¤¤ë¤Î¤ÏÀÖ¤¤Ê¸»ú¤Çɽ¼¨¤µ¤ì¤¿¹Ô¤À¤±¤Ê¤Î¤Ç¤¹¡£
 
 (!¥¹¥é¥¤¥à¥â¥ë¥É
-#####r?:$AUTOREGISTER
-#####r# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°ÅÐÏ¿¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
-#####r# ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢É¬ÍפʹԤϾå¤ÎÊý¤Ø°ÜÆ°¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤
-#####r(!̵ÌäÎÉð´ï:¥À¥¬¡¼
-#####r(!ËâË¡¥¢¥¤¥Æ¥à:¥È¥é¥Ã¥×´¶ÃΤδ¬Êª
+[[[[[r?:$AUTOREGISTER
+[[[[[r# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°ÅÐÏ¿¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
+[[[[[r# ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢É¬ÍפʹԤϾå¤ÎÊý¤Ø°ÜÆ°¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤
+[[[[[r(!̵ÌäÎÉð´ï:¥À¥¬¡¼
+[[[[[r(!ËâË¡¥¢¥¤¥Æ¥à:¥È¥é¥Ã¥×´¶ÃΤδ¬Êª
 
 
 
 ***** <AutopickFormat>
-#####G====  ¼«Æ°½¦¤¤/Ç˲õÀßÄê¤Î½ñ¼°»ÅÍÍ  ====
+[[[[[G====  ¼«Æ°½¦¤¤/Ç˲õÀßÄê¤Î½ñ¼°»ÅÍÍ  ====
 
 ¥æ¡¼¥¶¡¼¥Ç¥£¥ì¥¯¥È¥ê¤Ë"picktype.prf"Ëô¤Ï "picktype-<̾Á°>.prf" ¤È¤¤¤¦
 ¥Õ¥¡¥¤¥ë¤òºî¤Ã¤Æ³Æ¹Ô¤Ë¥¢¥¤¥Æ¥à¤Î̾Á°¤ò½ñ¤¯¤È¡¢ÊѶòÈÚÅܤˤ½¤Î¥¢¥¤¥Æ¥à¤ò
@@ -367,47 +366,30 @@
 ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï°Ê²¼¤Î¥¿¥¤¥ß¥ó¥°¤ÇÆɤ߹þ¤Þ¤ì¤Þ¤¹¡£
 ¡ü¥²¡¼¥à¤ò»Ï¤á¤ë»þ¡£
 ¡ü¼«Æ°½¦¤¤¥¨¥Ç¥£¥¿¤ò½ªÎ»¤·¤¿»þ¡£
-¡ü'$'¥³¥Þ¥ó¥É¤ò»È¤Ã¤¿»þ¡£(³°Éô¤Î¥¨¥Ç¥£¥¿¤ÇÀßÄê¤ò½ñ¤­ÊѤ¨¤¿»þ¤Ë»ÈÍÑ)
-
-¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤Ï¡¢Î㤨¤Ð¼¡¤Î¤è¤¦¤Ë½ñ¤­¤Þ¤¹¡£
----------
-¾Þ¶â¼ó¤Î¥¢¥¤¥Æ¥à
-!¤Î»àÂÎ
-!¤Î¹ü
-̤ȽÌÀ¤ÎÌô
-~̤´ÕÄê¤Î¸÷¸»
-~̤´ÕÄê¤ÎÉð´ï
-~̤´ÕÄê¤ÎËɶñ
-*Ç˲õ*
-Ëõ»¦
-ÂÎÎϲóÉü
-¥¹¥Ô¡¼¥É¤Î
-Ã×Ì¿½ý¤Î¼£Ìþ¤ÎÌô
----------
-
-¤â¤Ã¤È¼ÂÍÑŪ¤ÊÀßÄêÎã¤Ï (autopick.txt [y]) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-
-***** [y] ../autopick.txt
+¡ü¡Ö$¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤¿»þ¡£(³°Éô¤Î¥¨¥Ç¥£¥¿¤ÇÀßÄê¤ò½ñ¤­ÊѤ¨¤¿»þ¤Ë»ÈÍÑ)
+
+ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÎã¤Ï (lib/pref/picktype.prf [k]) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+
 
 --- ¼«Æ°½¦¤¤/Ç˲õ¤Î´ðËܽñ¼° ---
 
 ´ðËÜŪ¤Ë¡¢Ì¾Á°¤Î°ìÉô¤Ë¥Õ¥¡¥¤¥ë¤Ë½ñ¤¤¤¿Ê¸»úÎ󤬴ޤޤì¤Æ¤¤¤ì¤Ð¡¢¤½¤Î¥¢¥¤
-¥Æ¥à¤ò¼«Æ°Åª¤Ë½¦¤¤¤Þ¤¹¡£¤¿¤À¤·Æ¬¤Ë¡Ä¡¢
+¥Æ¥à¤ò¼«Æ°Åª¤Ë½¦¤¤¤Þ¤¹¡£¤¿¤À¤·¹Ô¤ÎÀèƬ¤Ë¡Ä¡¢
 
-¡¦¡Ö!¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥¢¥¤¥Æ¥à¤ò¼«Æ°Åª¤ËÇ˲õ¤·¤Þ¤¹¡£
-¡¦¡Ö~¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¤¤âÇ˲õ¤â¤»¤º¤Ë¾²¤Ë»Ä¤·¤Þ¤¹¡£
-¡¦¡Ö;¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£
+¡Ö!¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥¢¥¤¥Æ¥à¤ò[[[[[o¼«Æ°Åª¤ËÇ˲õ]¤·¤Þ¤¹¡£
+¡Ö~¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¤¤âÇ˲õ¤â¤»¤º¤Ë[[[[[o¾²¤Ë»Ä¤·¤Þ¤¹]¡£
+¡Ö;¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï[[[[[o½¦¤¦Á°¤Ë³Îǧ]¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£
+¡Ö(¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤ÏÁ´ÂοޡÖM¡×¥³¥Þ¥ó¥ÉÃæ¤Ç¤Î[[[[[oɽ¼¨¤òÍÞ»ß]¤·¤Þ¤¹¡£
 
-¤µ¤é¤Ë¡¢¤³¤ì¤é¤Ë²Ã¤¨¤Æ¡¢¡Ö(¡×¤òÉÕ¤±²Ã¤¨¤ë»ö¤Ç¥Þ¥Ã¥×¥³¥Þ¥ó¥ÉÃæ¤Ç¤Î¤½¤Î
-¥¢¥¤¥Æ¥à¤Îɽ¼¨¤òÍ޻ߤ¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£(°Ê²¼¤ÎTips¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
 picktype.prf ¤ÎÀèƬ¤«¤é½çÈÖ¤ËÍ¥ÀèŪ¤Ëɾ²Á¤¹¤ë¤Î¤Ç¡¢ÉÔÍפʤâ¤Î¤ÎÇ˲õ¤Î
-ÀßÄê¤Î²¼¤Ë¤½¤Î¾¤Î¥¢¥¤¥Æ¥à¤ò½¦¤¦ÀßÄê¤ò½ñ¤¤¤¿¤ê¡¢¹âµé¤Ê¥¢¥¤¥Æ¥à¤ò½¦¤¦Àß
-Äê¤Î²¼¤Ë¤½¤Î¾¤ÎÄã¼Á¤Ê¥¢¥¤¥Æ¥à¤òÇ˲õ¤¹¤ëÀßÄê¤ò½ñ¤¯¤Î¤¬ÊØÍø¤ÊÊýË¡¤Ç¤¹¡£
+ÀßÄê¤Î²¼¤Ë¤½¤Î¾¤Î¥¢¥¤¥Æ¥à¤ò½¦¤¦ÀßÄê¤ò½ñ¤¤¤¿¤ê¡¢Èæ³ÓŪ¹âµé¤Ê¥¢¥¤¥Æ¥à¤ò
+ÊüÃÖ¤¹¤ëÀßÄê¤Î²¼¤Ë¤½¤Î¾¤ÎÄã¼Á¤Ê¥¢¥¤¥Æ¥à¤òÇ˲õ¤¹¤ëÀßÄê¤ò½ñ¤¯¤Î¤¬ÊØÍø¤Ê
+ÊýË¡¤Ç¤¹¡£
 
-¼«Æ°½¦¤¤¤äÇ˲õ¤äÊüÃ֤Ȥ·¤ÆÀßÄꤵ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¥À¥ó¥¸¥ç¥ó¤ÎÁ´ÂοÞ'M'¥³
-¥Þ¥ó¥É¤ÎÃæ¤Ç¤½¤Î°ÌÃÖ¤È̾Á°¤òɽ¼¨¤¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£ÀßÄꥳ¥Þ¥ó¥É¤ÎÀâÌÀ
-(jcommdesc.txt#Looking [z])¤Î¥À¥ó¥¸¥ç¥ó¤ÎÁ´Âοޤòɽ¼¨¤ò»²¾È¤·¤Æ¤¯¤À¤µ
-¤¤¡£
+¼«Æ°½¦¤¤¤äÇ˲õ¤äÊüÃ֤Ȥ·¤ÆÀßÄꤵ¤ì¤¿¥¢¥¤¥Æ¥à¤Ï¡¢¡Ö(¡×¤ÇÍ޻ߤµ¤ì¤Ê¤¤¸Â
+¤ê[[[[[o¥À¥ó¥¸¥ç¥ó¤ÎÁ´ÂοޡÖM¡×¥³¥Þ¥ó¥É]¤ÎÃæ¤Ç¤½¤Î°ÌÃÖ¤È̾Á°¤òɽ¼¨¤¹¤ë»ö¤¬¤Ç
+¤­¤Þ¤¹¡£ÀßÄꥳ¥Þ¥ó¥É¤ÎÀâÌÀ(jcommdesc.txt#Looking [z])¤Î¥À¥ó¥¸¥ç¥ó¤ÎÁ´
+Âοޤòɽ¼¨¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 
 ***** [z] jcommdesc.txt#Looking
 
@@ -416,41 +398,44 @@ picktype.prf 
 ³Æ¹Ô¤Î°Ê²¼¤Î¤è¤¦¤Ê¥­¡¼¥ï¡¼¥É¤Ç»Ï¤Þ¤ë¤â¤Î¤ÏÆÃÊÌ°·¤¤¤Ë¤Ê¤ê¤Þ¤¹¡£
 
 ¡¦¤¹¤Ù¤Æ¤Î¡Á        : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¼ý½¸Ãæ¤Î¡Á        : ´û¤ËƱ¤¸¼ïÎà¤Îʪ¤ò»ý¤Ã¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : *´ÕÄê*¤µ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥À¥¤¥¹Ìܤΰ㤦¡Á  : »¦Ù¤¤ÎÉð´ïÅù¤Ç¥À¥¤¥¹¤ÎÌܤ¬Ä̾ï¤È°Û¤Ê¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥À¥¤¥¹ÌÜn°Ê¾å¤Î¡Á : ¥À¥¤¥¹¿ô¡ßÌÌ¿ô¤¬ n °Ê¾å¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦½¤ÀµÃÍn°Ê¾å¤Î¡Á   : ǽÎϽ¤ÀµÃͤ¬(+n)°Ê¾å¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦¼ý½¸Ãæ¤Î¡Á        : ´û¤ËƱ¤¸¼ïÎà¤Îʪ¤ò»ý¤Ã¤Æ¤¤¤ë¥¢¥¤¥Æ¥à
+¡¦Ì¤È½ÌÀ¤Î¡Á        : ¸ú²Ì¤Îʬ¤«¤é¤Ê¤¤¥¢¥¤¥Æ¥à
+¡¦´ÕÄêºÑ¤ß¤Î¡Á      : ´ÕÄꤵ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à
+¡¦*´ÕÄê*ºÑ¤ß¤Î¡Á    : *´ÕÄê*¤µ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à
+¡¦¥À¥¤¥¹Ìܤΰ㤦¡Á  : »¦Ù¤¤ÎÉð´ïÅù¤Ç¥À¥¤¥¹¤ÎÌܤ¬Ä̾ï¤È°Û¤Ê¤ë¥¢¥¤¥Æ¥à
+¡¦¥À¥¤¥¹ÌÜn°Ê¾å¤Î¡Á : ¥À¥¤¥¹¿ô¡ßÌÌ¿ô¤¬ n °Ê¾å¤Î¥¢¥¤¥Æ¥à
+¡¦½¤ÀµÃÍn°Ê¾å¤Î¡Á   : ǽÎϽ¤ÀµÃͤ¬(+n)°Ê¾å¤Î¥¢¥¤¥Æ¥à
                       ǽÎϽ¤Àµ¤¬Ìµ¤¤¾ì¹ç¤Ï¾¤Î¿ôÃͤ¬+n°Ê¾å¤Ê¤éÂоݤˤʤê¤Þ¤¹¡£
-¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü¤¬Âоݤˤʤê¤Þ¤¹¡£(°­ËâËâË¡¤Ç»ÈÍÑ)
-¡¦Æɤá¤Ê¤¤¡Á        : ÀìÌç¤È¤·¤Ê¤¤ËâË¡Îΰè¤ÎËâË¡½ñ¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦Âè°ìÎΰè¤Î¡Á      : Âè°ìÎΰè¤ÎËâË¡½ñ¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦ÂèÆóÎΰè¤Î¡Á      : ÂèÆóÎΰè¤ÎËâË¡½ñ¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦nºýÌܤΠ          : n¤¬1¤«¤é4¤Î¤È¤­¡¢nºýÌܤÎËâË¡½ñ¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦Ìµ²ÁÃͤΡÁ        : ²ÁÃͤΤʤ¤(ÇäµÑ¤Ç¤­¤Ê¤¤)¥¢¥¤¥Æ¥à
+¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¡Á: ȽÌÀ¤·¤Æ¤¤¤ë¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È
+¡¦¥¨¥´¡Á            : ȽÌÀ¤·¤Æ¤¤¤ë¥¨¥´ÁõÈ÷
+¡¦ÌµÌäΡÁ          : È󥨥´, È󥢡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÁõÈ÷
+¡¦¥ì¥¢¤Ê¡Á          : ¥É¥é¥´¥óËɶñÅù¤ÎÄÁ¤·¤¤¥Ù¡¼¥¹¥¢¥¤¥Æ¥à¤ÎÁõÈ÷
+¡¦¤¢¤ê¤Õ¤ì¤¿¡Á      : ¥É¥é¥´¥óËɶñÅù°Ê³°¤ÎÉáÄ̤Υ١¼¥¹¥¢¥¤¥Æ¥à¤ÎÁõÈ÷
+¡¦¾Þ¶â¼ó¤Î¡Á        : ¾Þ¶â¼ó¤Î»àÂΤޤ¿¤Ï¹ü
+¡¦¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î¡Á¡§ ¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î»àÂΡ¢¹ü¡¢Ä¦Áü
+¡¦¿Í´Ö¤Î¡Á          : ¿Í´Ö¤Î»àÂΤޤ¿¤Ï¹ü(°­ËâËâË¡¤Ç»ÈÍÑ)
+¡¦Æɤá¤Ê¤¤¡Á        : ÀìÌç¤È¤·¤Ê¤¤ËâË¡Îΰè¤ÎËâË¡½ñ
+¡¦Âè°ìÎΰè¤Î¡Á      : Âè°ìÎΰè¤ÎËâË¡½ñ
+¡¦ÂèÆóÎΰè¤Î¡Á      : ÂèÆóÎΰè¤ÎËâË¡½ñ
+¡¦nºýÌܤΡÁ         : n¤¬1¤«¤é4¤Î¤È¤­¡¢nºýÌܤÎËâË¡½ñ
 
 ¡Á¤ÎÉôʬ¤Ç¤Ï¡¢¥¢¥¤¥Æ¥à¤Î¼ïÎà¤òɽ¤¹°Ê²¼¤Î¤è¤¦¤Ê¥­¡¼¥ï¡¼¥É¤¬ÆÃÊÌ°·¤¤¤Ë¤Ê¤ê¤Þ¤¹
 
 ¡¦¥¢¥¤¥Æ¥à          : ¤¹¤Ù¤Æ¤Î¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Éð´ï              : Éð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦ÆÀ°ÕÉð´ï          : ¥×¥ê¡¼¥¹¥È/½¤¹ÔÁÎ/Ëâ½Ã»È¤¤/Îýµ¤½Ñ»Õ/µ³Ê¼/Ǧ¼Ô¤Ë¤È¤Ã¤Æ¡¢
+                      ÆÃÊ̤˰·¤¤¤ä¤¹¤¤¼ïÎà¤ÎÉð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
 ¡¦Ëɶñ              : Ëɶñ¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦Ìð                : Ìð¡¢¥¯¥í¥¹¥Ü¥¦¤ÎÌð¡¢ÀС¢ÃƤ¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦¸÷¸»              : ¤¿¤¤¤Þ¤Ä¤ä¥é¥ó¥¿¥óÅù¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦ËâË¡¥¢¥¤¥Æ¥à      : ´¬Êª¡¦¾ó¡¦ËâË¡ËÀ¡¦¥í¥Ã¥É¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦Ìð                : Ìð¡¢¥¯¥í¥¹¥Ü¥¦¤ÎÌð¡¢ÀС¢ÃÆ
+¡¦ËâË¡¥¢¥¤¥Æ¥à      : ´¬Êª¡¦¾ó¡¦ËâË¡ËÀ¡¦¥í¥Ã¥É
 ¡¦¤¬¤é¤¯¤¿          : Àޤ줿ËÀ¤äÁüÅù¤ÎÌò¤ËΩ¤¿¤Ê¤¤¤â¤Î¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦ËâË¡½ñ            : ËâË¡½ñ¡¢Éð·Ý¤Î½ñ¡¢²Î½¸¤¬Âоݤˤʤê¤Þ¤¹¡£
-¡¦ÆÀ°ÕÉð´ï          : ¥×¥ê¡¼¥¹¥È¡¢½¤¹ÔÁΡ¢Ëâ½Ã»È¤¤¡¢Îýµ¤½Ñ»Õ¡¢µ³Ê¼¡¢Ç¦¼Ô¤Ë¤È¤Ã¤Æ¡¢
-                      ÆÃÊ̤˰·¤¤¤ä¤¹¤¤¼ïÎà¤ÎÉð´ï¤¬Âоݤˤʤê¤Þ¤¹¡£
+¡¦»àÂΤä¹ü          : ¥â¥ó¥¹¥¿¡¼¤Î»àÂΤä¹ü
+¡¦ËâË¡½ñ            : ËâË¡½ñ¡¢Éð·Ý¤Î½ñ¡¢²Î½¸
 
-¾¤ËÉô°ÌÊ̤ÎÁõÈ÷ÉʤòÂоݤȤ¹¤ë¥­¡¼¥ï¡¼¥É: ½â¡¢µÝ¡¢»ØÎØ¡¢¥¢¥ß¥å¥ì¥Ã¥È¡¢
-³»¡¢¥¯¥í¡¼¥¯¡¢³õ¡¢äƼꡢ·¤ ¤¬»ÈÍѤǤ­¤Þ¤¹¡£
+¾¤ËÉô°ÌÊ̤ÎÁõÈ÷ÉʤòÂоݤȤ¹¤ë¥­¡¼¥ï¡¼¥É:
+ ½â¡¢µÝ¡¢»ØÎØ¡¢¥¢¥ß¥å¥ì¥Ã¥È¡¢¸÷¸»¡¢³»¡¢¥¯¥í¡¼¥¯¡¢³õ¡¢äƼꡢ·¤
+¤¬»ÈÍѤǤ­¤Þ¤¹¡£
 
 ¤³¤Î¸å¤Ë¶èÀڤ국¹æ¤Î¥³¥í¥ó¡Ö:¡×¤ò¶´¤ó¤Ç¤µ¤é¤Ëʸ»úÎó¤¬Â³¤¯¾ì¹ç¤Ï¡¢¤½¤Î
 ʸ»úÎó¤¬Ì¾Á°¤Î°ìÉô¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥¢¥¤¥Æ¥à¤¬Âоݤˤʤê¤Þ¤¹¡£¤³¤³¤Ç¡¢¥¢¥¤
@@ -474,21 +459,21 @@ picktype.prf 
 ¤Î¥­¡¼¥ï¡¼¥É¤Ï°ì¹Ô¤Ëʤ٤ƽñ¤¯»ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£
 ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥­¡¼¥ï¡¼¥É¤Î½çÈ֤⼫ͳ¤Ç¤¹¡£
 
-   [! ~ ; (]
-   [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
-    [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
-    [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
-    [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ]
-    [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
-    [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
-    [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|Ëɶñ|Ìð|¸÷¸»|ËâË¡¥¢¥¤¥Æ¥à|
-     ¤¬¤é¤¯¤¿|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|³»|¥¯¥í¡¼¥¯|
-     ³õ|äƼê|·¤] :]
-   [[^]¤½¤Î¾¤Îʸ»úÎó] [#¼«Æ°¹ï¤ßʸ»úÎó]
+ [! ~ ; (]
+ [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
+  [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
+  [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]
+  [̵²ÁÃͤÎ] [¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È] [¥¨¥´] [̵ÌäÎ] [¥ì¥¢¤Ê] [¤¢¤ê¤Õ¤ì¤¿]
+  [¾Þ¶â¼ó¤Î] [¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î] [¿Í´Ö¤Î]
+  [Æɤá¤Ê¤¤] [Âè°ìÎΰè¤Î] [ÂèÆóÎΰè¤Î] [nºýÌܤÎ]
+  [¥¢¥¤¥Æ¥à|¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È|Éð´ï|ÆÀ°ÕÉð´ï|Ëɶñ|Ìð|ËâË¡¥¢¥¤¥Æ¥à|
+   ¤¬¤é¤¯¤¿|ËâË¡½ñ|Æß´ï|½â|µÝ|»ØÎØ|¥¢¥ß¥å¥ì¥Ã¥È|¸÷¸»|³»|¥¯¥í¡¼¥¯|
+   ³õ|äƼê|·¤] :]
+ [[^]¤½¤Î¾¤Îʸ»úÎó] [#¼«Æ°¹ï¤ßʸ»úÎó]
 
 
 ***** <ConditionFormat>
-#####G===  ¾ò·ï¼°¤Î½ñ¼°»ÅÍÍ  ===
+[[[[[G===  ¾ò·ï¼°¤Î½ñ¼°»ÅÍÍ  ===
 
 Á´¤Æ¤Î¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢¼ï²¤ä¿¦¶È¡¢¥ì¥Ù¥ëÅù¤Ë¾ò·ï¤òÉÕ¤±¤ÆÀßÄꤹ
 ¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£Æä˼«Æ°½¦¤¤¤ä¥Þ¥¯¥í¤ÎÀßÄê¤ËÍøÍѤ¹¤ë¤ÈÊØÍø¤Ç¤¹¡£
@@ -510,7 +495,7 @@ picktype.prf 
 ¤ÎƯ¤­¤ò¤·¤Æ¡¢·ë²Ì¤¬¿¿ "1" ¤Ç¤¢¤ë¤«¡¢ µ¶ "0" ¤Ç¤¢¤ë¤«¤òÊÖ¤·¤Þ¤¹¡£
 
 [EQU °ú¿ô£± °ú¿ô£² ...]
-   Á´¤Æ¤Î°ú¿ô¤¬Åù¤·¤¤¤È¤­"1"¡¢Åù¤·¤¯¤Ê¤¤¤È¤­"0"¤òÊÖ¤¹¡£
+   °ú¿ô£±¤È¾¤Î¤É¤ì¤«¤Î°ú¿ô¤¬Åù¤·¤¤¤È"1"¡¢¤É¤ì¤âÅù¤·¤¯¤Ê¤¤¤È"0"¤òÊÖ¤¹¡£
 
 [IOR °ú¿ô£± °ú¿ô£² ...]
 [AND °ú¿ô£± °ú¿ô£² ...]
@@ -571,37 +556,6 @@ $LEVEL
 ---  ¥Õ¥¡¥¤¥ë¤ÎÁÞÆþ¤Î½ñ¼°  ---
 
 %:¥Õ¥¡¥¤¥ë̾
-   lib\user\¥Õ¥¡¥¤¥ë̾ ¤« ~/.angband/Hengband/¥Õ¥¡¥¤¥ë̾ ¤ò¼«
+   ¡Ölib\user\¥Õ¥¡¥¤¥ë̾¡× ¤« ¡Ö~/.angband/Hengband/¥Õ¥¡¥¤¥ë̾¡× ¤ò¼«
    Æ°½¦¤¤¤ÎÅÐÏ¿¥Õ¥¡¥¤¥ë¤È¤·¤ÆÆɤ߹þ¤ß¤Þ¤¹¡£
 
-
---- ¼«Æ°½¦¤¤ÀßÄê¤Ë³èÍѤ·¤¿Îã ---
-
-?:[EQU $CLASS Magic-Eater]
-¤Î¥í¥Ã¥É
-¤Î¾ó
-¤ÎËâË¡ËÀ
-
-?:[EQU $CLASS Archer]
-¤Î¹ü
-
-?:[EQU $CLASS Ninja]
-~¸÷¸»:°Å°Ç¤Î
-Å´¤Î¤¯¤µ¤Ó#@v0
-
-?:[EQU $RACE Vampire]
-(~°Å°Ç¤Î´¬Êª
-(~°Å°Ç¤Î¾ó
-?:1
-
-?:[GEQ $LEVEL 20]
-(!̵ÌäÎÉð´ï:(+0,+0)
-(!̵ÌäÎËɶñ:,+0]
-?:1
-
-?:[AND [GEQ $LEVEL 20] [IOR [EQU $REALM1 Life] [EQU $REALM2 Life] [EQU $REALM1 Nature] [EQU $REALM2 Nature] [EQU $REALM1 Craft] [EQU $REALM2 Craft]]]
-(!¶õÊ¢½¼Â­
-(!¿©ÎÁ
-(!¥¹¥é¥¤¥à¥â¥ë¥É
-(!¥¨¥ë¥Õ¤Î¹ÔÎÈ
-?:1

diff --git a/lib/help/jhelp.hlp b/lib/help/jhelp.hlp
index 0559e96..11527be 100644 (file)
--- a/lib/help/jhelp.hlp
+++ b/lib/help/jhelp.hlp
@@ -2,7 +2,7 @@
   »²¾È¤·¤¿¤¤¥Ø¥ë¥×¤Îµ­¹æ¤ò²¡¤·¤Æ²¼¤µ¤¤:
 
  (a)Á´ÂÎŪ¤Ê¾ðÊó        (jgeneral.hlp)  (o)ÄɲþðÊó    (jspecial.hlp)
- (b)¥­¥ã¥é¥¯¥¿¡¼¤ÎºîÀ®  (jbirth  .hlp)  (p)½é¿´¼Ô¥¬¥¤¥É(jtang   .txt)   
+ (b)¥­¥ã¥é¥¯¥¿¡¼¤ÎºîÀ®  (jbirth  .hlp)  [[[[[y(p)½é¿´¼Ô¥¬¥¤¥É(jtang   .txt)]   
  (c)¼ï²¡¢¿¦¶È¡¢À­³Ê    (jraceclas.hlp) (r)±Ñ¸ìÈǥإë¥×(help    .hlp)
  (d)³¹¤È¹ÓÌî            (jtown   .hlp)
  (e)¥À¥ó¥¸¥ç¥ó¤Îõ¸±    (jdungeon.hlp)
@@ -16,8 +16,7 @@
  (m)¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë(jpref   .hlp)
  (n)¼«Æ°½¦¤¤/Ç˲õ       (jeditor .txt)
 
-
- (?)¥Ø¥ë¥×¥·¥¹¥Æ¥à¤Î»ÈÍÑË¡      (jhelpinfo.txt)
+[[[[[y (?)¥Ø¥ë¥×¥·¥¹¥Æ¥à¤Î»ÈÍÑË¡      (jhelpinfo.txt)
 ***** [a] jgeneral.hlp
 ***** [b] jbirth.hlp
 ***** [c] jraceclas.hlp

diff --git a/lib/pref/picktype.prf b/lib/pref/picktype.prf
index 90d51ae..60678e7 100644 (file)
--- a/lib/pref/picktype.prf
+++ b/lib/pref/picktype.prf
@@ -1,60 +1,114 @@
+#==========================================#
+#    ¥¢¥¤¥Æ¥à¼«Æ°½¦¤¤/Ç˲õ ¥µ¥ó¥×¥ëÀßÄê    #
+#==========================================#
+
 #
-# ¥¢¥¤¥Æ¥à¼«Æ°½¦¤¤/Ç˲õ¤Î¥µ¥ó¥×¥ëÀßÄê
+# ¾Þ¶â¼ó¤Î»àÂΤÏ{¾Þ¶â¼ó}¤ÈÌäò¹ï¤ó¤Ç½¦¤¦¡£
 #
+¾Þ¶â¼ó¤Î»àÂΤä¹ü#¾Þ¶â¼ó
 
-¾Þ¶â¼ó¤Î»àÂÎ
-¾Þ¶â¼ó¤Î¹ü
-
+#
+# ¸ú²Ì¤¬ÉÔÌÀ¤ÎËâË¡¤Î¥¢¥¤¥Æ¥à¤Ï¤É¤ó¤É¤ó½¦¤¦¡£¸å¤Ç´ÕÄꤷ¤è¤¦¡£
+#
 ̤ȽÌÀ¤Î¥¢¥¤¥Æ¥à
 
+#
+# »ý¤Áʪ¤Ë½Å¤Í¤é¤ì¤ë¥¢¥¤¥Æ¥à¤Ï¤É¤ó¤É¤ó½¦¤¦¡£
+#
 ¼ý½¸Ãæ¤ÎÌô
 ¼ý½¸Ãæ¤Î´¬Êª
 ¼ý½¸Ãæ¤Î¥í¥Ã¥É
-¼ý½¸Ãæ¤ÎÌð
 (¼ý½¸Ãæ¤Î¥¢¥¤¥Æ¥à
 
-#¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ÎÂÑÀ­¤ò¼«Æ°¤Ç¹ï¤à¡£ ( {%} ¤ÏÆÃÊ̤ʸú²Ì¤ò»ý¤Á¤Þ¤¹¡£ )
-~*´ÕÄê*ºÑ¤ß¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¥¢¥¤¥Æ¥à#%
-~*´ÕÄê*ºÑ¤ß¤Î¥¨¥´¥¢¥¤¥Æ¥à#%
-
-#Á´¤Æ¤ÎÂÑÀ­¡¦Ç½ÎϤò¹ï¤ß¤¿¤¤¾ì¹ç ( {%all} ¤ÏÆÃÊ̤ʸú²Ì¤ò»ý¤Á¤Þ¤¹¡£ )
-#~*´ÕÄê*ºÑ¤ß¤Î¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¥¢¥¤¥Æ¥à#%all
-#~*´ÕÄê*ºÑ¤ß¤Î¥¨¥´¥¢¥¤¥Æ¥à#%all
-
-*Ç˲õ*
-Ëõ»¦
-
+#
+# µ®½Å¤ÊÌô¤Ï´Ö°ã¤Ã¤Æ²õ¤µ¤Ê¤¤¤è¤¦¤Ë{!k}¤È¹ï¤ó¤Ç½¦¤¦¡£
+#
 ÏÓÎϤÎÌô#!k
 ¸­¤µ¤ÎÌô#!k
 ´ïÍѤµ¤ÎÌô#!k
 Âѵ×ÎϤÎÌô#!k
 ÃÎǽ¤ÎÌô#!k
 Ì¥ÎϤÎÌô#!k
-À¸Ì¿¤ÎÌô#!k
-ÂÎÎϲóÉü#!k
+À¸Ì¿¤ÎÌô#!k!q
+*ÂÎÎϲóÉü*¤ÎÌô#!k!q
+ÂÎÎϲóÉü¤ÎÌô#!k
+¥¹¥Ô¡¼¥É¤ÎÌô#!k
 
-!¿å¤ÎÌô
+#
+# µ®½Å¤Ê´¬Êª¤Ï{!k}¤ÈÌäò¹ï¤ó¤Ç½¦¤¦¡£
+# ¶¸Àï»Î¤Î¾ì¹ç¤Ï´¬Êª¤òÆɤá¤Ê¤¤¤«¤é¤¤¤é¤Ê¤¤¡£
+#
+?:[NOT [EQU $CLASS Berserker]]
+¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥ÈÀ¸À®#!k
+*Ç˲õ*¤Î´¬Êª#!k
+Ëõ»¦¤Î´¬Êª#!k
+¼þÊÕËõ»¦¤Î´¬Êª#!k
+?:1
+
+#
+# ¥ê¥ó¥´¥¸¥å¡¼¥¹¤Ï¼«Æ°Ç˲õ¤¹¤ë¡£
+#
+!¥ê¥ó¥´¥¸¥å¡¼¥¹¤ÎÌô
 
 ?:[EQU $CLASS Archer]
-¤Î¹ü
+# ¥¢¡¼¥Á¥ã¡¼¤Ï¹ü¤ò½¦¤¦¡£
+»àÂΤä¹ü:¤Î¹ü
+
+?:[EQU $CLASS Magic-Eater]
+# ËâÆ»¶ñ½Ñ»Õ¤ÏµÛ¼ý¤Ç¤­¤ëʪ¤ò½¦¤¦¡£
+ËâË¡¥¢¥¤¥Æ¥à:¤Î¥í¥Ã¥É
+ËâË¡¥¢¥¤¥Æ¥à:¤Î¾ó
+ËâË¡¥¢¥¤¥Æ¥à:¤ÎËâË¡ËÀ
+
 ?:[EQU $CLASS Ninja]
-~¸÷¸»:°Å°Ç¤Î
+# Ǧ¼Ô¤Ï°Å°Ç¤Î¸÷¸»¤ò½¦¤¦¡£
+¥¨¥´¸÷¸»:°Å°Ç¤Î
+
+# Ǧ¼Ô¤ÏÅ´¤Î¤¯¤µ¤Ó¤ò½¦¤Ã¤Æ{@v0}¤ÈÌäò¹ï¤à¡£
 Å´¤Î¤¯¤µ¤Ó#@v0
+
+# Tab¥­¡¼¤Ë¤¯¤µ¤Ó¤òÅꤲ¤ë¥Þ¥¯¥í¤òÅÐÏ¿¡£
 A:\s\s\s\sv0*t
 P:\t
 ?:1
 
+#
+# ¥À¥¤¥¹Ìܤ¬ÉáÄ̤è¤êÂ礭¤¤ËâË¡¤ÎÉð´ï¤Ï½¦¤¦¡£
+#
+̤´ÕÄê¤Î¥À¥¤¥¹Ìܤΰ㤦Éð´ï
+
+#
+# ¥¨¥´¤Ç¤â¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ç¤â̵¤¤¤¢¤ê¤Õ¤ì¤¿ÁõÈ÷¤Ï
+# ¹â¥ì¥Ù¥ë¤Ç¤Ï¼«Æ°Ç˲õ¡£
+# ¥É¥é¥´¥óËɶñÅù¤Ï¡Ö¤¢¤ê¤Õ¤ì¤¿¡×ÁõÈ÷¤Ç¤Ï¤Ê¤¤¤«¤é²õ¤µ¤Ê¤¤¡£
+#
+?:[GEQ $LEVEL 30]
+#{ÊÂ}¤È{¾å¼Á}¤ÎξÊý¤òÇ˲õ¡£
+!̵ÌäΤ¢¤ê¤Õ¤ì¤¿¥¢¥¤¥Æ¥à
+
+?:[GEQ $LEVEL 20]
+#´ÕÄêºÑ¤ß¤ÎʤòÇ˲õ¡£
+!̵ÌäΤ¢¤ê¤Õ¤ì¤¿Éð´ï:) (+0,+0)
+!̵ÌäΤ¢¤ê¤Õ¤ì¤¿Ëɶñ:,+0]
+
+#µ¼»÷´ÕÄêºÑ¤ß¤Î{ÊÂ}¤òÇ˲õ¡£
+!̵ÌäΤ¢¤ê¤Õ¤ì¤¿¥¢¥¤¥Æ¥à:{ÊÂ}
+?:1
+
+#
+# ¹â°ÌËâË¡½ñ¤ÏÌäò¹ï¤ó¤Ç½¦¤¦¡£
+#
 Âè°ìÎΰè¤Î4ºýÌܤÎËâË¡½ñ#@md!k
-Âè°ìÎΰè¤Î3ºýÌܤÎËâË¡½ñ#@mc!k
 ÂèÆóÎΰè¤Î4ºýÌܤÎËâË¡½ñ#@mh!k
+Âè°ìÎΰè¤Î3ºýÌܤÎËâË¡½ñ#@mc!k
 ÂèÆóÎΰè¤Î3ºýÌܤÎËâË¡½ñ#@mg!k
 
-̤´ÕÄê¤Î¥À¥¤¥¹Ìܤΰ㤦Éð´ï
-~̤´ÕÄê¤ÎÉð´ï
-~̤´ÕÄê¤ÎËɶñ
-~̤´ÕÄê¤ÎÌð
-
+#
+# Äã°ÌËâË¡½ñ¤ÏÌäò¹ï¤à¤Î¤ß¡£
+#
 ~Âè°ìÎΰè¤Î2ºýÌܤÎËâË¡½ñ#@mb!k
-~Âè°ìÎΰè¤Î1ºýÌܤÎËâË¡½ñ#@ma!k
 ~ÂèÆóÎΰè¤Î2ºýÌܤÎËâË¡½ñ#@mf!k
+~Âè°ìÎΰè¤Î1ºýÌܤÎËâË¡½ñ#@ma!k
 ~ÂèÆóÎΰè¤Î1ºýÌܤÎËâË¡½ñ#@me!k
+
+