EQU演算子の説明の修正.

* 自動拾いサンプルでのEQUの使い方を新EQU仕様に対応.
* 英語版でEQUの説明が旧仕様のままだったので修正.
* "囲むことと演算子として" -> "囲むと演算子として".

diff --git a/autopick.txt b/autopick.txt
index d71a813..09678f2 100644 (file)
--- a/autopick.txt
+++ b/autopick.txt
@@ -357,8 +357,7 @@
 ?: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]]]
 (!¿©ÎÁ
 (!¥¹¥é¥¤¥à¥â¥ë¥É
 (!¥¨¥ë¥Õ¤Î¹ÔÎÈ
@@ -433,7 +432,7 @@
 
 # Àï»Î¤È¶¸Àï»Î¤Ï¾åµéËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤë¤Î¤Ç¡¢½¦¤¦¡£
 # À¸Ì¿¥Ñ¥é¥Ç¥£¥ó¤âÀ¸Ì¿°Ê³°¤ÎËâË¡½ñ¤ò¼êÆ°¤ÇÇ˲õ¤¹¤ë¤È·Ð¸³Ãͤˤʤ롣
-?:[IOR [EQU $CLASS Warrior] [EQU $CLASS Berserker] [AND [EQU $CLASS Paladin] [EQU $REALM1 Life]]]
+?:[IOR [EQU $CLASS Warrior Berserker] [AND [EQU $CLASS Paladin] [EQU $REALM1 Life]]]
 (~Æɤá¤Ê¤¤4ºýÌܤÎÈë½Ñ¤ÎËâË¡½ñ
 Æɤá¤Ê¤¤4ºýÌܤÎËâË¡½ñ
 (~Æɤá¤Ê¤¤3ºýÌܤÎÈë½Ñ¤ÎËâË¡½ñ

diff --git a/autopick_eng.txt b/autopick_eng.txt
index cd51f71..af4e96b 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -212,7 +212,7 @@
 #    
 #      - usage of operators
 #        [EQU arg1 arg2 ...]
-#          If all args are same, returns "1", or else returns "0".
+#          If all args are the same as arg1, returns "1", or else returns "0".
 #        [IOR arg1 arg2 ...]
 #        [AND arg1 arg2 ...]
 #          IOR evaluates and returns all args' logical OR. AND is logical AND.
@@ -357,8 +357,7 @@ Iron Spike#@v0
 ?:1
 
 # complex example; destroy needless food items.
-?:[AND [GEQ $LEVEL 20] [IOR [EQU $REALM1 Life] [EQU $REALM2 Life] [EQU $REALM1 Nature] [EQU $REALM2 Nature] [EQU $REALM1 Craft] [EQU $REALM2 Craft]]]
-(!Satisfy Hunger
+?:[AND [GEQ $LEVEL 20] [IOR [EQU $REALM1 Life Nature Craft] [EQU $REALM2 Life Nature Craft]]]
 (!food
 (!Slime Mold
 (!of Elvish Waybread
@@ -420,7 +419,7 @@ collecting spellbooks
 ?:1
 
 # pick up for experience
-?:[IOR [EQU $CLASS Warrior] [EQU $CLASS Berserker] [AND [EQU $CLASS Paladin] [EQU $REALM1 Life]]]
+?:[IOR [EQU $CLASS Warrior Berserker] [AND [EQU $CLASS Paladin] [EQU $REALM1 Life]]]
 (~unreadable third spellbooks:arcane
 (~unreadable fourth spellbooks:arcane
 unreadable fourth spellbooks

diff --git a/lib/help/editor.txt b/lib/help/editor.txt
index 727e2b2..c349f2b 100644 (file)
--- a/lib/help/editor.txt
+++ b/lib/help/editor.txt
@@ -295,7 +295,7 @@ Special Notes:
 
   - usage of operators
     [EQU arg1 arg2 ...]
-      If all args are same, returns "1", or else returns "0".
+      If all args are the same as arg1, returns "1", or else returns "0".
     [IOR arg1 arg2 ...]
     [AND arg1 arg2 ...]
       IOR evaluates and returns all args' logical OR. IAND is logical AND.

diff --git a/lib/help/jeditor.txt b/lib/help/jeditor.txt
index bb9f6ad..4847b76 100644 (file)
--- a/lib/help/jeditor.txt
+++ b/lib/help/jeditor.txt
@@ -511,7 +511,7 @@ picktype.prf 
 
 ---  »ÈÍѲÄǽ¤Ê±é»»»Ò  ---
 
-ÆÃÊ̤Êʸ»úÎó¤È¤¤¤¯¤Ä¤«¤Î°ú¿ô¤Î¥ê¥¹¥È¤ò'['¤È']'¤Ç°Ï¤à¤³¤È¤È±é»»»Ò¤È¤·¤Æ
+ÆÃÊ̤Êʸ»úÎó¤È¤¤¤¯¤Ä¤«¤Î°ú¿ô¤Î¥ê¥¹¥È¤ò'['¤È']'¤Ç°Ï¤à¤È±é»»»Ò¤È¤·¤Æ
 ¤ÎƯ¤­¤ò¤·¤Æ¡¢·ë²Ì¤¬¿¿ "1" ¤Ç¤¢¤ë¤«¡¢ µ¶ "0" ¤Ç¤¢¤ë¤«¤òÊÖ¤·¤Þ¤¹¡£
 
 [EQU °ú¿ô£± °ú¿ô£² ...]