From d08916db61b0755d2ba624a32d79f7acc71f49d5 Mon Sep 17 00:00:00 2001 From: PHO Date: Mon, 20 Sep 2021 13:37:46 +0900 Subject: [PATCH] Auto commit by The Sugar System. --- .../Hengband/pick_d/classes/archer_prf | 16 +- .../Hengband/pick_d/classes/magic-eater_prf | 8 +- dot-files/_angband/Hengband/pickpref_prf | 351 ++++++++++-------- 3 files changed, 203 insertions(+), 172 deletions(-) diff --git a/dot-files/_angband/Hengband/pick_d/classes/archer_prf b/dot-files/_angband/Hengband/pick_d/classes/archer_prf index 9e24d72..c29dead 100644 --- a/dot-files/_angband/Hengband/pick_d/classes/archer_prf +++ b/dot-files/_angband/Hengband/pick_d/classes/archer_prf @@ -1,12 +1,14 @@ -#============================ +# -*- hengband-pickpref -*- +#=============================================================== # Class: Archer -#============================ +#=============================================================== ?:[EQU $CLASS Archer] -worthless skeleton -worthless pottery -worthless bone -worthless stick -worthless skull + +worthless:skeleton +worthless:pottery +worthless:bone +worthless:stick +worthless:skull !iron shot !mithril shot !rounded pebble diff --git a/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf b/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf index 0e6bc67..8955483 100644 --- a/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf +++ b/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf @@ -1,7 +1,7 @@ # -*- hengband-pickpref -*- -#============================ +#=============================================================== # Class: Magic-Eater -#============================ +#=============================================================== ?:[EQU $CLASS Magic-Eater] # Staff of Perception @@ -28,4 +28,8 @@ P:^c A:\e\e\e\\mBg P:S +# Leave missiles on the ground, as magic-eaters usually don't use +# missiles. +~missiles + ?:1 diff --git a/dot-files/_angband/Hengband/pickpref_prf b/dot-files/_angband/Hengband/pickpref_prf index 81a7fb1..e000138 100644 --- a/dot-files/_angband/Hengband/pickpref_prf +++ b/dot-files/_angband/Hengband/pickpref_prf @@ -21,18 +21,28 @@ # applied. Possibly a bug? V:6:0x01:0x60:0x60:0xFE -#============================ -# Food -#============================ +#=============================================================== +# Class specific configurations: they should have the highest +# preference. +#=============================================================== +%:pick.d/classes/archer.prf +%:pick.d/classes/magic-eater.prf +%:pick.d/classes/mirror-master.prf +%:pick.d/classes/monk.prf +%:pick.d/classes/ninja.prf + +#=============================================================== +# Foods +#=============================================================== ration of food#@E0 elvish waybread#@E0 mushroom of restoring#!k!s!d -!mushroom of +~mushroom of restore -#============================ +#=============================================================== # Light sources -#============================ +#=============================================================== # No players would rely on torches. Just leave them on the floor. ~Wooden Torch @@ -54,9 +64,18 @@ Feanorian Lamp ?:1 -#============================ +#=============================================================== +# Artifacts +#=============================================================== +phial of galadriel#%all;@A0!! + +stone of lore#!s!d@A8 +A:\e\e\\A8\e( +P:^e + +#=============================================================== # Archery -#============================ +#=============================================================== !arrow of flame !arrow of frost !arrow of holy might @@ -69,72 +88,49 @@ Feanorian Lamp seeker arrow#!k@f1 long bow -#============================ -# Teleportation -#============================ -scroll of phase door#@r0 -A:\e\e\\r0 -P:\t -scroll of teleportation#@r1 -scroll of teleport level#!k!s!r -!ring of teleportation -amulet of anti-teleportation#!w!k!s - -#============================ -# Identification -#============================ -scroll of identify#@r8 -staff of perception#!k@u8 -rod of perception#!k!s!d@z8!! -A:\e\e\\z8( -P:, -stone of lore#!s!d@A8 -A:\e\e\\A8\e( -P:^e - -#============================ -# Recall -#============================ -rod of recall#!k!s!d!z@z9!! -scroll of word of recall#!k!d!r@r9 - -#============================ -# Detection -#============================ -rod of trap location#!k@z0 -rod of detection#!k!s@z0!! -staff of trap location#!k@u0 -staff of detect evil#!k!s@u1 +# Unidentified missiles are potentially useful. +unidentified missiles -#============================ -# Illumination -#============================ -phial of galadriel#%all;@A0!! -rod of illumination#!k@z1 +#=============================================================== +# Weapons and Armors +#=============================================================== + +# Ego or artifact broken daggers or swords are repairable. Always pick +# them. +ego weapons:broken +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:poison needle +armors:dragon#%all +armors:mythril -#============================ -# Boosting speed -#============================ -potion of speed#!* -staff of speed#!* +# Discard boring weapons and armors depending on the player level. +# TODO: Move the Weaponsmith to the class-specific file. +?:[AND [GEQ $LEVEL 10] [NOT [EQU $CLASS Weaponsmith]]] +!average weapons +!average armors -#============================ -# Acquirement -#============================ -scroll of acquirement#!* +?:[AND [GEQ $LEVEL 25] [NOT [EQU $CLASS Weaponsmith]]] +!good weapons +!good armors +?:1 -#============================ -# Destruction -#============================ -scroll of destruction#!* -scroll of *destruction*#!* -staff of *destruction*#!* +# Unidentified weapons are potentially useful. Pick them all. +unidentified weapons +unidentified armors -#============================ +#=============================================================== # Potions -#============================ +#=============================================================== +potion of heroism potion of cure critical wounds#@q0 +potion of speed#!* potion of resistance#!* potion of healing#!* potion of *healing*#!* @@ -151,6 +147,9 @@ potion of constitution#!k potion of intelligence#!k potion of charisma#!k +potion of restore life levels#!k!s!d +~potion of restore charisma + !potion of apple juice !potion of boldness !potion of cure light wounds @@ -161,11 +160,31 @@ potion of charisma#!k !potion of slow poison !potion of water -#============================ +#=============================================================== # Scrolls -#============================ +#=============================================================== + +# Teleportation +scroll of phase door#@r0 +A:\e\e\\r0 +P:\t +scroll of teleportation#@r1 +scroll of teleport level#!k!s!r + scroll of monster confusion#!k@r2 +scroll of identify#@r8 + +# 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 +# specific inscription. +collecting:scroll of word of recall +~scroll of word of recall#!k!d!r@r9 + +scroll of destruction#!* +scroll of *destruction*#!* +scroll of acquirement#!* scroll of genocide#!* +scroll of mundanity#!* scroll of recharging#!* scroll of reset recall#!* @@ -173,9 +192,9 @@ scroll of reset recall#!* !scroll of curse armor !scroll of rumour -#============================ +#=============================================================== # Wands -#============================ +#=============================================================== !wand of wonder wand of stone to mud#!k!s @@ -196,20 +215,36 @@ magical devices:wand ~wand of sleep monster ?:1 -#============================ +#=============================================================== # Staffs -#============================ +#=============================================================== +staff of trap location#!k@u0 +staff of detect evil#!k!s@u1 +staff of perception#!k@u8 + +staff of speed#!* staff of healing#!k!s!d staff of power#!k!s!d +staff of *destruction*#!* + # Magic-eaters should pick every staff. ?:[EQU $CLASS Magic-Eater] magical devices:staff ?:1 -#============================ +#=============================================================== # Rods -#============================ +#=============================================================== +rod of trap location#!k@z0 +rod of detection#!k!s@z0!! +rod of illumination#!k@z1 + +rod of perception#!k!s!d@z8!! +A:\e\e\\z8( +P:, + +rod of recall#!k!s!d!z@z9!! rod of stone to mud#!k!s rod of acid balls @@ -232,127 +267,117 @@ magical devices:rod ~rod of sleep monster ?:1 -#============================ -# Chest -#============================ -!chest (empty) -~chest +#=============================================================== +# Rings +#=============================================================== -#============================ -# Junk -#============================ -!{cursed} -!empty bottle +# Some rings are totally worthless, like Ring of Protection [-5]. +!worthless:ring -#============================ -# Rings -#============================ -*identified* ring of nether resistance#%all -identified ring of speed#!k +# Pick useful ones. +identified:ring of nether resistance#%all +identified:ring of speed#!k ring of extra#!k -#============================ -# Sustaining stats -#============================ +# Ring of teleportation is a bad item. +!ring of teleportation + +# Some rings may have some value but are not worth wearing. ?:[GEQ $LEVEL 10] !ring of sustain !ring of searching ?:1 -~ring of resist -#============================ +# Unidentified rings are always worth identifying, unless they are +# known to be useless. +unidentified:ring + +#=============================================================== # Amulets -#============================ +#=============================================================== + +# Some amulets are totally worthless, like Amulet of Strength [-5]. +!worthless:amulet + ~amulet of resist -amulet of anti-magic#!w!k!s ~amulet of charisma !amulet of adornment !amulet of teleportation -#============================ -# Classes -#============================ -%:pick.d/classes/archer.prf -%:pick.d/classes/magic-eater.prf -%:pick.d/classes/mirror-master.prf -%:pick.d/classes/monk.prf -%:pick.d/classes/ninja.prf - -#============================ -# Unordered -#============================ - -mirror shield#!k +# Useful but dangerous at the same time. +amulet of anti-magic#!w!k!s +amulet of anti-teleportation#!w!k!s -wanted corpses or skeletons#!k +# Unidentified amulets are always worth identifying, unless they are +# known to be useless. +unidentified:amulet -unaware items -collecting magical devices -collecting missiles -(collecting items +#=============================================================== +# Books +#=============================================================== +~first realm's first spellbooks#@ma!k +~first realm's second spellbooks#@mb!k +first realm's third spellbooks#@mc!k +first realm's fourth spellbooks#@md!k -# Auto-inscribe resistances ( {%all} has special meaning. ) -~*identified* artifact items#%all -~*identified* ego items#%all +~second realm's first spellbooks#@me!k +~second realm's second spellbooks#@mf!k +second realm's third spellbooks#@mg!k +second realm's fourth spellbooks#@mh!k -# Simple version of Auto-inscribe ( {%} has special meaning. ) -#~*identified* artifact items#% -#~*identified* ego items#% +!unreadable first spellbooks +!unreadable second spellbooks +~unreadable third spellbooks +unreadable fourth spellbooks -*Destruction* -Genocide -scroll of mundanity#!r!k +#=============================================================== +# Statues +#=============================================================== -first realm's fourth spellbooks#@md!k -first realm's third spellbooks#@mc!k -second realm's fourth spellbooks#@mh!k -second realm's third spellbooks#@mg!k +# Statues are useless but some are expensive. +golden statue +ivory statue +mithril statue +ornate statue -unidentified dice boosted weapons -unidentified more than 25 dice weapons -unidentified weapons -unidentified armors -unidentified missiles +!statue -~first realm's second spellbooks#@mb!k -~first realm's first spellbooks#@ma!k -~second realm's second spellbooks#@mf!k -~second realm's first spellbooks#@me!k +#=============================================================== +# Chests +#=============================================================== +!chest (empty) +~chest -!unreadable first spellbooks +#=============================================================== +# Corpses or Skeletons +#=============================================================== +wanted corpses or skeletons#!k -!worthless -!iron spike -?:[GEQ $LEVEL 10] -missiles -rings -amulets -lights -poison needle -gold statue -!statue +#=============================================================== +# Misc. +#=============================================================== -armors:dragon#%all -armors:mythril -rare -blade of chaos -!unreadable second spellbooks +# Auto-inscribe resistances. +~*identified* artifact items#%all +~*identified* ego items#%all -?:[AND [GEQ $LEVEL 10] [NOT [EQU $CLASS Weaponsmith]]] -!average weapons -!average armors +unaware items +rare items +(collecting missiles +collecting items -?:[AND [GEQ $LEVEL 25] [NOT [EQU $CLASS Weaponsmith]]] -!good weapons -!good armors -?:1 +#=============================================================== +# Catch-all +#=============================================================== -~unreadable third spellbooks -unreadable fourth spellbooks +# Discard junk items +!worthless items +!iron spike +!empty bottle +# Pick all the non-junks until the player reaches a specific level. ?:[GEQ $LEVEL 25] ~all ?:1 - all -- 2.40.0