X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=blobdiff_plain;f=autopick_eng.txt;h=277262ad326c849f63da11b9697e01b1ff1129ce;hp=cbe827083ef61176156d5395f2bb4aa0fd7e873f;hb=726f216d5588550aed8640845ca131e63955ad9b;hpb=a42aab44c8b92b932f4d18e76c1d10197b72477e

diff --git a/autopick_eng.txt b/autopick_eng.txt
index cbe827083..277262ad3 100644
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -72,7 +72,6 @@
 #      collecting        : Matches if you already have that same item.
 #      unaware           : Items with unknown effects match.
 #      unidentified      : Unidentified items match.
-#      *unidentified*    : An item that is not *identified* match.
 #      identified        : Identified items match.
 #      *identified*      : *Identified* items match.
 #      dice boosted      : Weapons with boosted damage dice match.
@@ -81,7 +80,11 @@
 #      worthless         : Items which you cannot sell match.
 #      artifacts         : Artifact items match.
 #      ego               : Ego items match.
+#      good              : {good} items match.
 #      nameless          : Non ego/non artifact items match.
+#      average           : {average} items match.
+#      rare              : Rare equipment such as Dragon armors etc. match.
+#      common            : Any equipments except 'rare' equipment match.
 #      wanted            : Wanted monster's corpses or skeletons match.
 #      unique monster's  : Unique monster's corpses, skeletons or statues match.
 #      human             : Human corpses or skeletons match.
@@ -101,6 +104,7 @@
 #      magical devices   : Wands, staffs, rods and scrolls match.
 #      lights            : Light sources match.
 #      junks             : Junk items like Shard of Pottery or etc. match.
+#      corpses or skeletons : Corpses or skeletons of monsters match.
 #      spellbooks        : All books match.
 #      favorite weapons  : Weapons suitable for your class (for Priest, Monk,
 #                          BeastMaster, ForceTrainer, Cavalry, and Ninja)
@@ -177,13 +181,15 @@
 #      [! ~ ; (]
 #      [[all] [collecting]
 #       [unaware] [unidentified] [identified] [*identified*] 
+#       [artifact] [ego] [good] [nameless] [average]
+#       [worthless] [rare] [common]
 #       [dice boosted] [more than N dice] [more bonus than N] 
-#       [worthless] [artifact] [ego] [nameless] 
 #       [wanted] [unique monster's] [human] [unreadable] 
 #       [first realm's] [second realm's] [first] [second] [third] [fourth] 
-#       [items | weapons | armors | missiles | magical devices | 
-#        lights | junks | spellbooks | hafted weapons | shields | bows | 
-#        rings | amulets | suits | cloaks | helms | gloves | boots] :]
+#       [items | weapons | favorite weapons | armors | missiles |
+#        magical devices | lights | junks | corpses or skeletons | spellbooks |
+#        hafted weapons | shields | bows | rings | amulets | suits | cloaks |
+#        helms | gloves | boots] :]
 #      [[^]part-of-item-name] [#auto-inscription-string]
 #    
 #    
@@ -203,11 +209,10 @@
 #        %:filename
 #          Read a file named 'filename' as a new pick-pref file. The file 
 #          must be in the user directory.
-#          Caution: Avoid naming the parent file, or the game might freeze up.
 #    
 #      - 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.
@@ -235,19 +240,22 @@
 #          Tourist, Imitator, BeastMaster, Sorcerer, Archer,
 #          Magic-Eater, Bard, Red-Mage, Samurai, ForceTrainer,
 #          Blue-Mage, Cavalry, Berserker, Weaponsmith, Mirror-Master,
-#          Ninja
+#          Ninja, Sniper
 #
 #        $PLAYER
 #         Returns player name.
 #        $REALM1
 #         Returns player's first magic realm
 #          none, Life, Sorcery, Nature, Chaos, Death, Trump, Arcane,
-#          Craft, Daemon, Crusade, Music, Kendo
+#          Craft, Daemon, Crusade, Music, Kendo, Hex
 #        $REALM2
 #         Returns player's second magic realm
 #        $LEVEL
 #         Returns player level as two-character string.
 #          Ex. "01","09","10","50" etc.
+#        $MONEY
+#         Returns player money as 9 character string.
+#         Ex. "000012345" etc.
 #
 #------------------------------------------------------------------
 #
@@ -352,8 +360,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
@@ -415,15 +422,26 @@ collecting spellbooks
 ?:1
 
 # pick up for experience
-?:[IOR [EQU $CLASS Warrior] [EQU $CLASS Berserker] [AND [EQU $CLASS Paladin] [EQU $REALM1 Life]]]
+?:[EQU $CLASS Warrior Berserker]
+(~unreadable fourth spellbooks:arcane
+unreadable fourth spellbooks
 (~unreadable third spellbooks:arcane
+unreadable third spellbooks
+?:1
+?:[AND [EQU $CLASS Paladin] [EQU $REALM1 Crusade] [GEQ $LEVEL 30]]
+(~unreadable fourth spellbooks:life
+(~unreadable third spellbooks:life
+?:[AND [EQU $CLASS Paladin] [EQU $REALM1 Crusade]]
 (~unreadable fourth spellbooks:arcane
 unreadable fourth spellbooks
+(~unreadable third spellbooks:arcane
 unreadable third spellbooks
 ?:1
 ?:[AND [EQU $CLASS Paladin] [EQU $REALM1 Death]]
 unreadable fourth spellbooks:life
+unreadable fourth spellbooks:crusade
 unreadable third spellbooks:life
+unreadable third spellbooks:crusade
 ?:1
 
 # pick up for money