Auto commit by The Sugar System.

diff --git a/dot-files/_angband/Hengband/pick_d/classes/archer_prf b/dot-files/_angband/Hengband/pick_d/classes/archer_prf
new file mode 100644 (file)
index 0000000..9e24d72
--- /dev/null
+++ b/dot-files/_angband/Hengband/pick_d/classes/archer_prf
@@ -0,0 +1,31 @@
+#============================
+#  Class: Archer
+#============================
+?:[EQU $CLASS Archer]
+worthless skeleton
+worthless pottery
+worthless bone
+worthless stick
+worthless skull
+!iron shot
+!mithril shot
+!rounded pebble
+!steel bolt
+!bolt (1d5)
+!seeker bolt
+
+A:\e\e\e\\f0*t*\e
+P:X
+
+A:\e\e\e\\f1*t*\e
+P:^c
+
+A:\e\e\e\\Uaa(
+P:]
+
+# Type '(' to enchant the equipped bow
+scroll of enchant weapon#@rz
+A:\e\e\erz/c
+P:(
+
+?:1

diff --git a/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf b/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf
new file mode 100644 (file)
index 0000000..1a144e7
--- /dev/null
+++ b/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf
@@ -0,0 +1,30 @@
+#============================
+#  Class: Magic-Eater
+#============================
+?:[EQU $CLASS Magic-Eater]
+
+# Staff of Perception
+A:\e\e\e\\mAf
+P:^o
+
+# Rod of Trap Location
+A:\e\e\e\\mCa
+P:^t
+
+# Rod of Illumination
+A:\e\e\e\\mCe
+P:Q
+
+# Wand of Magic Missile
+A:\e\e\e\\mBp*t*\e
+P:X
+
+# Wand of Stinking Cloud
+A:\e\e\e\\mBo*t*\e
+P:^c
+
+# Wand of Stone to Mud
+A:\e\e\e\\mBg
+P:S
+
+?:1

diff --git a/dot-files/_angband/Hengband/pick_d/classes/mirror-master_prf b/dot-files/_angband/Hengband/pick_d/classes/mirror-master_prf
new file mode 100644 (file)
index 0000000..18490e3
--- /dev/null
+++ b/dot-files/_angband/Hengband/pick_d/classes/mirror-master_prf
@@ -0,0 +1,51 @@
+#============================
+#  Class: Mirror-Master
+#============================
+?:[EQU $CLASS Mirror-Master]
+potion of restore mana#!k!s!d
+
+# Making a mirror
+A:\e\e\\mb
+P:(
+
+# Break Mirrors
+A:\e\e\\Ua
+P:)
+
+# Mirror Concentration
+A:\e\e\\Ub
+P:]
+
+# Mirror of Seeing
+A:\e\e\\ma
+P:V
+
+# Drip of Light
+A:\e\e\\mc*t*\e
+P:X
+
+# Mirror of Light
+A:\e\e\\me
+P:Q
+
+# Mirror Crashing
+A:\e\e\\mi*t*\e
+P:^c
+
+# Robe of Dust
+A:\e\e\\mg
+P:`
+
+# Fire an arrow (not a magic!)
+A:\e\e\\f0*t*\e
+P:^g
+
+# Seeker Ray
+A:\e\e\\mk*
+P:^z
+
+# Warped Mirror
+A:\e\e\\md
+P:\t
+
+?:1
\ No newline at end of file

diff --git a/dot-files/_angband/Hengband/pick_d/classes/monk_prf b/dot-files/_angband/Hengband/pick_d/classes/monk_prf
new file mode 100644 (file)
index 0000000..24d420a
--- /dev/null
+++ b/dot-files/_angband/Hengband/pick_d/classes/monk_prf
@@ -0,0 +1,10 @@
+#============================
+#  Class: Monk
+#============================
+?:[EQU $CLASS Monk]
+
+# Lightning
+A:\e\e\e\\mab*t*\e
+P:X
+
+?:1

diff --git a/dot-files/_angband/Hengband/pick_d/classes/ninja_prf b/dot-files/_angband/Hengband/pick_d/classes/ninja_prf
new file mode 100644 (file)
index 0000000..a5708ab
--- /dev/null
+++ b/dot-files/_angband/Hengband/pick_d/classes/ninja_prf
@@ -0,0 +1,34 @@
+#============================
+#  Class: Ninja
+#============================
+?:[EQU $CLASS Ninja]
+lights:of Darkness
+lights#@k0
+!scroll of light
+
+# Quick Walk
+A:\\Ua
+P:]
+
+# Throw iron spikes
+Iron Spike#@v0
+A:\e\e\\v0*t*\e
+P:X
+
+# Create Darkness
+A:\\ma
+P:Q
+
+# Detect Near
+A:\\mb
+P:`
+
+# Hide in Leafs
+A:\\mc
+P:\t
+
+# Ancient Knowledge
+A:\\mh(
+P:^e
+
+?:1

diff --git a/dot-files/_angband/Hengband/pickpref_prf b/dot-files/_angband/Hengband/pickpref_prf
index c120e9897e2f1648b7687bf5fb604fff44d2d3c7..8b9bf94db6c3e4fe13071b03ebc6f67a8a9d1fb2 100644 (file)
--- a/dot-files/_angband/Hengband/pickpref_prf
+++ b/dot-files/_angband/Hengband/pickpref_prf
@@ -1,5 +1,6 @@
+# -*- hengband-pickpref -*-

 #
 #

-# Sample Preference of the Object Auto-picker/Destroyer
+# Preference of the Object Auto-picker/Destroyer

 #
 # Important commands
 #  a i ^Q      :  Insert mode
 #
 # Important commands
 #  a i ^Q      :  Insert mode


@@ -22,6 +23,33 @@
 ration of food#@E0
 elvish waybread#@E0
 
 ration of food#@E0
 elvish waybread#@E0
 

+mushroom of restoring#!k!s!d
+!mushroom of
+
+#============================
+#  Light sources
+#============================
+
+# No players would rely on torches. Just leave them on the floor.
+~Wooden Torch
+
+# Level 1..25: Players usually have no permanent light sources and
+# they rely on lanterns.
+?:[NOT [GEQ $LEVEL 25]]
+Brass Lantern
+Flask of oil
+Feanorian Lamp
+
+# Level 25..: Players usually have permanent light sources, and they
+# are often artifacts. Leave lanterns and feanorian lamps on the
+# floor, even if they are ego.
+?:[GEQ $LEVEL 25]
+~Brass Lantern
+~Flask of oil
+~Feanorian Lamp
+
+?:1
+

 #============================
 #  Archery
 #============================
 #============================
 #  Archery
 #============================


@@ -119,6 +147,16 @@ potion of constitution#!k
 potion of intelligence#!k
 potion of charisma#!k
 
 potion of intelligence#!k
 potion of charisma#!k
 

+!potion of apple juice
+!potion of boldness
+!potion of cure light wounds
+!potion of infra-vision
+!potion of neo-tsuyoshi special
+!potion of neutralize poison
+!potion of slime mold juice
+!potion of slow poison
+!potion of water
+

 #============================
 #  Scrolls
 #============================
 #============================
 #  Scrolls
 #============================


@@ -127,6 +165,10 @@ scroll of genocide#!*
 scroll of recharging#!*
 scroll of reset recall#!*
 
 scroll of recharging#!*
 scroll of reset recall#!*
 

+!scroll of curse weapon
+!scroll of curse armor
+!scroll of rumour
+

 #============================
 #  Wands
 #============================
 #============================
 #  Wands
 #============================


@@ -215,123 +257,35 @@ ring of extra#!k
 amulet of anti-magic#!w!k!s
 ~amulet of charisma
 
 amulet of anti-magic#!w!k!s
 ~amulet of charisma
 

+!amulet of adornment
+!amulet of teleportation
+

 #============================
 #  Junk
 #============================
 !{empty}
 !{cursed}
 #============================
 #  Junk
 #============================
 !{empty}
 !{cursed}

-
-!scroll of curse weapon
-!scroll of curse armor
-!scroll of rumour
-
-!potion of boldness
-!potion of infra-vision
-!potion of slow poison
-!potion of neutralize poison
-!potion of cure light wounds
-!potion of water
-!slime mold juice
-!apple juice

 !empty bottle
 
 !empty bottle
 

-!amulet of adornment
-!amulet of teleportation
-
-#============================
-#  Class: Magic-Eater
-#============================
-?:[EQU $CLASS Magic-Eater]
-
-# Staff of Perception
-A:\e\e\e\\mAf
-P:^o
-
-# Rod of Trap Location
-A:\e\e\e\\mCa
-P:^t
-
-# Rod of Illumination
-A:\e\e\e\\mCe
-P:Q
-
-# Wand of Magic Missile
-A:\e\e\e\\mBp*t*\e
-P:X
-
-# Wand of Stinking Cloud
-A:\e\e\e\\mBo*t*\e
-P:^c
-
-# Wand of Stone to Mud
-A:\e\e\e\\mBg
-P:S
-
-?:1
-
-#============================
-#  Class: Ninja
-#============================
-?:[EQU $CLASS Ninja]
-lights:of Darkness
-lights#@k0
-!scroll of light
-
-# Quick Walk
-A:\\Ua
-P:]
-
-# Throw iron spikes
-Iron Spike#@v0
-A:\e\e\\v0*t*\e
-P:X
-
-# Create Darkness
-A:\\ma
-P:Q
-
-# Detect Near
-A:\\mb
-P:`
-
-# Hide in Leafs
-A:\\mc
-P:\t
-
-# Ancient Knowledge
-A:\\mh(
-P:^e
-
-?:1
-

 #============================
 #============================

-#  Class: Monk
+#  Classes

 #============================
 #============================

-?:[EQU $CLASS Monk]
-
-# Lightning
-A:\e\e\e\\mab*t*\e
-P:X
-
-?:1
+%: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
 #============================
 
 #============================
 #  Unordered
 #============================

-!potion of neo-tsuyoshi special

 
 mirror shield#!k
 
 
 mirror shield#!k
 

-mushroom of restoring#!k!s!d
-!mushroom of
-
-wanted corpse#!k
-wanted Skeleton#!k
+wanted corpses or skeletons#!k

 
 unaware items
 
 unaware items

-collecting rod
-collecting potion
-collecting scroll
+collecting magical devices

 collecting missiles
 (collecting items
 
 collecting missiles
 (collecting items
 


@@ -347,67 +301,6 @@ collecting missiles
 Genocide
 scroll of mundanity#!r!k
 
 Genocide
 scroll of mundanity#!r!k
 

-?:[EQU $CLASS Archer]
-worthless skeleton
-worthless pottery
-worthless bone
-worthless stick
-worthless skull
-!iron shot
-!mithril shot
-!rounded pebble
-!steel bolt
-!bolt (1d5)
-!seeker bolt
-A:\e\e\e\\f0*t*\e
-P:X
-A:\e\e\e\\f1*t*\e
-P:^c
-A:\e\e\e\\Uaa(
-P:]
-
-# Type '(' to enchant the equipped bow
-scroll of enchant weapon#@rz
-A:\e\e\erz/c
-P:(
-
-?:[EQU $CLASS Mirror-Master]
-potion of restore mana#!k!s!d
-# Making a mirror
-A:\e\e\\mb
-P:(
-# Break Mirrors
-A:\e\e\\Ua
-P:)
-# Mirror Concentration
-A:\e\e\\Ub
-P:]
-# Mirror of Seeing
-A:\e\e\\ma
-P:V
-# Drip of Light
-A:\e\e\\mc*t*\e
-P:X
-# Mirror of Light
-A:\e\e\\me
-P:Q
-# Mirror Crashing
-A:\e\e\\mi*t*\e
-P:^c
-# Robe of Dust
-A:\e\e\\mg
-P:`
-# Fire an arrow (not a magic!)
-A:\e\e\\f0*t*\e
-P:^g
-# Seeker Ray
-A:\e\e\\mk*
-P:^z
-# Warped Mirror
-A:\e\e\\md
-P:\t
-?:1
-

 first realm's fourth spellbooks#@md!k
 first realm's third spellbooks#@mc!k
 second realm's fourth spellbooks#@mh!k
 first realm's fourth spellbooks#@md!k
 first realm's third spellbooks#@mc!k
 second realm's fourth spellbooks#@mh!k


@@ -439,6 +332,7 @@ gold statue
 
 armors:dragon#%all
 armors:mythril
 
 armors:dragon#%all
 armors:mythril

+rare

 blade of chaos
 !unreadable second spellbooks
 
 blade of chaos
 !unreadable second spellbooks
 

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 1d149cef97fab23eac4b3c9c64d0a60cec9fa30a..d84dc6e4eb5c766e89bfac3b2c6f9843063cb87e 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -175,6 +175,9 @@
 (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
 (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
 
 (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
 (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
 

+;; hengband-pickpref
+(autoload 'hengband-pickpref-mode "hengband-pickpref-mode" nil t)
+

 ;; jaspace
 (require-if-present 'jaspace)
 
 ;; jaspace
 (require-if-present 'jaspace)