Merge pull request #1192 from hengband/feature/3.0.0Alpha26

[hengbandforosx/hengbandosx.git] / autopick_eng.txt

diff --git a/autopick_eng.txt b/autopick_eng.txt
index af4e96b..9b30830 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -232,6 +232,7 @@
 #          Nibelung, Dark-Elf, Draconian, Mindflayer, Imp, Golem,
 #          Skeleton, Zombie, Vampire, Spectre, Sprite, Beastman, Ent,
 #          Archon, Balrog, Dunadan, Shadow-Fairy, Kutar, Android,
+#          Merfolk
 #
 #        $CLASS
 #         Returns name of player class. One of below:
@@ -240,19 +241,22 @@
 #          Tourist, Imitator, BeastMaster, Sorcerer, Archer,
 #          Magic-Eater, Bard, Red-Mage, Samurai, ForceTrainer,
 #          Blue-Mage, Cavalry, Berserker, Weaponsmith, Mirror-Master,
-#          Ninja
+#          Ninja, Sniper, Elementalist
 #
 #        $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.
 #
 #------------------------------------------------------------------
 #
@@ -419,15 +423,26 @@ collecting spellbooks
 ?:1
 
 # pick up for experience
-?:[IOR [EQU $CLASS Warrior 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