X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=autopick.txt;h=640f2a5f1b42e2841099a67ea18d47aa52bb626c;hb=27827b78eb908c6fc80486a4cc18a6e050390c61;hp=d71a8130303c24eeff9689d31539f2bc1b0add59;hpb=71cee1c14b1f6a7d891bba8405ceef0d828ce74f;p=hengband%2Fhengband.git

diff --git a/autopick.txt b/autopick.txt
index d71a81303..640f2a5f1 100644
--- a/autopick.txt
+++ b/autopick.txt
@@ -242,7 +242,9 @@
 #          Ninja
 #          ¤Î¤É¤ì¤«
 #        $PLAYER
-#          ¥×¥ì¥¤¥ä¡¼¤Î̾Á°¤òÊÖ¤¹¡£
+#          ¥×¥ì¥¤¥ä¡¼¤Î̾Á°¤òÊÖ¤¹¡£¤¿¤À¤·¡¢' '(¥¹¥Ú¡¼¥¹)¡¢'['¡¢']'¤Ï
+#          pref¤ÎÀ©Ìó¤Ç¤½¤Î¤Þ¤Þ»È¤¨¤Ê¤¤¤¿¤á¡¢'_'¤ËÃÖ¤­´¹¤¨¤ÆÊÖ¤¹¡£
+#          Îã: ̾Á°¤¬"[ Temp ]"¤Ê¤é¤Ð¡¢$PLAYER¤Ï"__Temp__"¤òÊÖ¤¹¡£
 #        $REALM1
 #          Â裱ËâË¡Îΰè¤ò±Ñ¸ì̾¤ÇÊÖ¤¹¡£
 #          none, Life, Sorcery, Nature, Chaos, Death, Trump, Arcane,
@@ -339,9 +341,9 @@
 ?:1
 
 # ¥ì¥Ù¥ë¤¬10°Ê¾å¤Ê¤éÇ˲õ¤¹¤ëÎã
-#   ¾ò·ïʬ´ô¤ÎȽÄê¤Ï¼«Æ°½¦¤¤¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤È¤­¤À¤±¹Ô¤¦¤Î¤Ç
-#   ¥ì¥Ù¥ë¤¬10°Ê¾å¤Ë¾å¤¬¤Ã¤¿Ä¾¸å¤Ï¤Þ¤ÀÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-#   '$'¥³¥Þ¥ó¥É¤ÇÆɤ߹þ¤à¤«¥²¡¼¥à¤òºÆ³«¤¹¤ë¤È¤Á¤ã¤ó¤ÈÆɤ߹þ¤Þ¤ì¤Þ¤¹¡£
+#   ¥ì¥Ù¥ë¤¬10°Ê¾å¤Ë¾å¤¬¤Ã¤¿Ä¾¸å¤«¤éÍ­¸ú¤Ç¤¹¡£
+#   ¾ò·ï¤Î¥ì¥Ù¥ë¤òÊѹ¹¤·¤¿¾ì¹ç¤Ï'$'¥³¥Þ¥ó¥É¤ÇÆɤ߹þ¤à¤«¥²¡¼¥à¤òºÆ³«¤¹¤ë¤È
+#   ¤Á¤ã¤ó¤ÈÆɤ߹þ¤Þ¤ì¤Þ¤¹¡£
 #
 ?:[GEQ $LEVEL 10]
 (!¥ê¥ó¥´¥¸¥å¡¼¥¹¤ÎÌô
@@ -356,9 +358,8 @@
 (~̲¤ê¤ÎÌô
 ?:1
 
-#Ê£»¨¤ÊÎã¡Êï¤â»È¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤³¤Î¤Þ¤Þ¥³¥Ô¡¼¤¹¤ë¾ì¹ç°Ê³°¤Ï¡Ä¡Ë
-?:[AND [GEQ $LEVEL 20] [IOR [EQU $REALM1 Life] [EQU $REALM2 Life] [EQU $REALM1 Nature] [EQU $REALM2 Nature] [EQU $REALM1 Craft] [EQU $REALM2 Craft]]]
-(!¶õÊ¢½¼Â­
+# Ê£»¨¤ÊÎã¡Êï¤â»È¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤³¤Î¤Þ¤Þ¥³¥Ô¡¼¤¹¤ë¾ì¹ç°Ê³°¤Ï¡Ä¡Ë
+?:[AND [GEQ $LEVEL 20] [IOR [EQU $REALM1 Life Nature Craft] [EQU $REALM2 Life Nature Craft]]]
 (!¿©ÎÁ
 (!¥¹¥é¥¤¥à¥â¥ë¥É
 (!¥¨¥ë¥Õ¤Î¹ÔÎÈ
@@ -432,18 +433,31 @@
 ?:1
 
 # Àï»Î¤È¶¸Àï»Î¤Ï¾åµéËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤë¤Î¤Ç¡¢½¦¤¦¡£
-# À¸Ì¿¥Ñ¥é¥Ç¥£¥ó¤âÀ¸Ì¿°Ê³°¤ÎËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤ롣
-?:[IOR [EQU $CLASS Warrior] [EQU $CLASS Berserker] [AND [EQU $CLASS Paladin] [EQU $REALM1 Life]]]
+?:[EQU $CLASS Warrior Berserker]
 (~Æɤá¤Ê¤¤4ºýÌܤÎÈë½Ñ¤ÎËâË¡½ñ
 Æɤá¤Ê¤¤4ºýÌܤÎËâË¡½ñ
 (~Æɤá¤Ê¤¤3ºýÌܤÎÈë½Ñ¤ÎËâË¡½ñ
 Æɤá¤Ê¤¤3ºýÌܤÎËâË¡½ñ
 ?:1
 
-#°Å¹õ¤Î¥Ñ¥é¥Ç¥£¥ó¤ÏÀ¸Ì¿¤ÎËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤ롣
+# Ç˼٥ѥé¥Ç¥£¥ó¤ÏÀ¸Ì¿¤ÈÇ˼ٰʳ°¤ÎËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤ롣
+# ·Ð¸³Ãͤˤʤé¤Ê¤¤À¸Ì¿¤Î¾åµéËâË¡½ñ¤Ï¹â¤¯Çä¤ì¤ë¤¬¹â¥ì¥Ù¥ë¤Ç¤ÏÊüÃÖ¤¹¤ë¡£
+?:[AND [EQU $CLASS Paladin] [EQU $REALM1 Crusade] [GEQ $LEVEL 30]]
+(~Æɤá¤Ê¤¤4ºýÌܤÎÀ¸Ì¿¤ÎËâË¡½ñ
+(~Æɤá¤Ê¤¤3ºýÌܤÎÀ¸Ì¿¤ÎËâË¡½ñ
+?:[AND [EQU $CLASS Paladin] [EQU $REALM1 Crusade]]
+(~Æɤá¤Ê¤¤4ºýÌܤÎÈë½Ñ¤ÎËâË¡½ñ
+Æɤá¤Ê¤¤4ºýÌܤÎËâË¡½ñ
+(~Æɤá¤Ê¤¤3ºýÌܤÎÈë½Ñ¤ÎËâË¡½ñ
+Æɤá¤Ê¤¤3ºýÌܤÎËâË¡½ñ
+?:1
+
+# °Å¹õ¥Ñ¥é¥Ç¥£¥ó¤ÏÀ¸Ì¿¤ÈÇ˼٤ÎËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤ롣
 ?:[AND [EQU $CLASS Paladin] [EQU $REALM1 Death]]
 Æɤá¤Ê¤¤4ºýÌܤÎÀ¸Ì¿¤ÎËâË¡½ñ
+Æɤá¤Ê¤¤4ºýÌܤÎÇ˼٤ÎËâË¡½ñ
 Æɤá¤Ê¤¤3ºýÌܤÎÀ¸Ì¿¤ÎËâË¡½ñ
+Æɤá¤Ê¤¤3ºýÌܤÎÇ˼٤ÎËâË¡½ñ
 ?:1
 
 # ¤½¤Î¾¤Î¾ì¹ç¤â¾åµéËâË¡½ñ¤Ï¹â¤¯Çä¤ì¤ë¤Î¤ÇÄã¥ì¥Ù¥ë¤Ç¤Ï½¦¤¦¡£