X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=dot-files%2F_angband%2FHengband%2Fpickpref_prf;h=1504ab37668310830c50cd7181509beacbc0f68d;hb=HEAD;hp=e00013890a896c4ce73c0f2a95fdd8dbcefbcec9;hpb=d08916db61b0755d2ba624a32d79f7acc71f49d5;p=sugar.git

diff --git a/dot-files/_angband/Hengband/pickpref_prf b/dot-files/_angband/Hengband/pickpref_prf
index e000138..1504ab3 100644
--- a/dot-files/_angband/Hengband/pickpref_prf
+++ b/dot-files/_angband/Hengband/pickpref_prf
@@ -39,6 +39,8 @@ elvish waybread#@E0
 
 mushroom of restoring#!k!s!d
 ~mushroom of restore
+!mushroom of disease
+!mushroom of unhealth
 
 #===============================================================
 #  Light sources
@@ -69,6 +71,7 @@ Feanorian Lamp
 #===============================================================
 phial of galadriel#%all;@A0!!
 
+unidentified:^stone
 stone of lore#!s!d@A8
 A:\e\e\\A8\e(
 P:^e
@@ -103,11 +106,22 @@ artifact weapons:broken
 # We don't want to discard rare weapons or armors even if they aren't
 # ego.
 !worthless weapons:blade of chaos
-weapons:blade of chaos
-shields:mirror shield#!k
+weapons:falcon sword
 weapons:poison needle
+shields:mirror shield#%all!k
 armors:dragon#%all
 armors:mythril
+armors:elvenkind#%all
+armors:elven
+armors:black clothes
+
+# Shovels are never useful after the very beginning of the game.
+?:[AND [GEQ $MONEY 1000] [NOT [EQU $CLASS Weaponsmith]]]
+!dwarven pick
+!mattock
+!orcish pick
+!shovel
+?:
 
 # Discard boring weapons and armors depending on the player level.
 # TODO: Move the Weaponsmith to the class-specific file.
@@ -116,18 +130,37 @@ armors:mythril
 !average armors
 
 ?:[AND [GEQ $LEVEL 25] [NOT [EQU $CLASS Weaponsmith]]]
+!average weapons:blade of chaos
 !good weapons
 !good armors
+
+?:[AND [GEQ $LEVEL 30] [NOT [EQU $CLASS Weaponsmith]]]
+!good weapons:blade of chaos
+# We don't need "Sword of Slay Human" but we may need "Sword of
+# Slaying".
+~ego weapons:of slaying
+!ego weapons:slay
+# Armors of Olog-Hai are almost useless, because all they have is a
+# single element resistance. The same goes for Dwarven.
+!ego armors:of Dwarven
+!ego armors:of Olog-Hai
 ?:1
 
 # Unidentified weapons are potentially useful. Pick them all.
 unidentified weapons
 unidentified armors
 
+# Pick known bad-ego items. They may not be worth using but
+# potentially are.
+ego:of demon
+ego:(demonic)
+
 #===============================================================
 #  Potions
 #===============================================================
 potion of heroism
+potion of resist cold
+potion of resist heat
 potion of cure critical wounds#@q0
 
 potion of speed#!*
@@ -172,7 +205,8 @@ scroll of teleportation#@r1
 scroll of teleport level#!k!s!r
 
 scroll of monster confusion#!k@r2
-scroll of identify#@r8
+~scroll of identify#@r8
+scroll of *identify*#!r
 
 # Players may be relying on Rod of Recall. If they aren't collecting
 # the scrolls leave them on the floor. If they are, pick them with a
@@ -204,7 +238,7 @@ wand of rockets#!k!s
 wand of dragon's flame#!k!s
 wand of dragon's frost#!k!s
 
-# Magic-eaters should pick every wand except for useless ones.
+# Magic-eaters should pick every wand except for truly useless ones.
 ?:[EQU $CLASS Magic-Eater]
 magical devices:wand
 
@@ -275,8 +309,9 @@ magical devices:rod
 !worthless:ring
 
 # Pick useful ones.
+identified:ring of chaos resistance#%all
 identified:ring of nether resistance#%all
-identified:ring of speed#!k
+identified:ring of speed#!k!s!d
 ring of extra#!k
 
 # Ring of teleportation is a bad item.
@@ -299,6 +334,13 @@ unidentified:ring
 # Some amulets are totally worthless, like Amulet of Strength [-5].
 !worthless:amulet
 
+# Amulet of Charisma may be worth selling in the early game, but soon
+# becomes completely worthless.
+?:[GEQ $MONEY 10000]
+!amulet of charisma
+?:
+
+amulet of resistance#%all
 ~amulet of resist
 ~amulet of charisma
 
@@ -316,6 +358,7 @@ unidentified:amulet
 #===============================================================
 #  Books
 #===============================================================
+
 ~first realm's first spellbooks#@ma!k
 ~first realm's second spellbooks#@mb!k
 first realm's third spellbooks#@mc!k
@@ -326,9 +369,17 @@ first realm's fourth spellbooks#@md!k
 second realm's third spellbooks#@mg!k
 second realm's fourth spellbooks#@mh!k
 
+# We want to pick up expensive unreadable books for money. Note that
+# Arcane and Kendo ones are cheap.
 !unreadable first spellbooks
 !unreadable second spellbooks
-~unreadable third spellbooks
+
+!unreadable third spellbooks:arcane
+!unreadable third spellbooks:kendo
+unreadable third spellbooks
+
+~unreadable fourth spellbooks:arcane
+~unreadable fourth spellbooks:kendo
 unreadable fourth spellbooks
 
 #===============================================================