Auto commit by The Sugar System.

diff --git a/dot-files/_angband/Hengband/pickpref_prf b/dot-files/_angband/Hengband/pickpref_prf
index 3ffaa633b3e9aa264545061ec2e24c57a9bae15d..926dca7422bcd91a32bd804bcf8887b5b2e87cca 100644 (file)
--- a/dot-files/_angband/Hengband/pickpref_prf
+++ b/dot-files/_angband/Hengband/pickpref_prf
@@ -107,8 +107,9 @@ artifact weapons:broken
 # ego.
 !worthless weapons:blade of chaos
 weapons:blade of chaos
-shields:mirror shield#%all!k
+weapons:falcon sword
 weapons:poison needle
+shields:mirror shield#%all!k
 armors:dragon#%all
 armors:mythril
 armors:elvenkind#%all
@@ -186,7 +187,7 @@ 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
@@ -291,7 +292,7 @@ magical devices:rod
 
 # Pick useful ones.
 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.
@@ -314,6 +315,12 @@ 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
@@ -344,14 +351,16 @@ 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 ones are cheap.
+# Arcane and Kendo ones are cheap.
 !unreadable first spellbooks
 !unreadable second spellbooks
 
 !unreadable third spellbooks:arcane
+!unreadable third spellbooks:kendo
 unreadable third spellbooks
 
 ~unreadable fourth spellbooks:arcane
+~unreadable fourth spellbooks:kendo
 unreadable fourth spellbooks
 
 #===============================================================

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 712bf7a20861f2129076175ec52d84c3e511cfd5..11588d5426b272779cac5d23615e262787325e0f 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -206,13 +206,6 @@
 ;; midnight
 (require-if-present 'midnight)
 
-;; color-theme
-(require-if-present 'color-theme)
-(if (featurep 'color-theme)
-    (progn
-      (color-theme-initialize)
-      (color-theme-subtle-hacker)))
-
 ;; multi-term
 (autoload 'multi-term "multi-term"
   "Create new term buffer.
@@ -467,8 +460,8 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t)
 
 ;; migemo
-(require-if-present 'migemo)
-(setq migemo-isearch-enable-p nil)
+;(require-if-present 'migemo)
+;(setq migemo-isearch-enable-p nil)
 
 ;; tiarra-conf
 (setq load-path (cons (expand-file-name "~/sandbox/Tiarra") load-path))
@@ -593,6 +586,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
     (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi")))
  '(cperl-merge-trailing-else nil)
  '(csv-align-style (quote auto))
+ '(custom-enabled-themes (quote (gnome2)))
+ '(custom-safe-themes
+   (quote
+    ("64affc3597b4271ba6b0b428777d616cfb20d8f7f147dbd00f1de220b2b59bbf" "06e0662b31a2ae8da5c6b5e9a05b25fabd1dc8dd3c3661ac194201131cafb080" default)))
  '(default-frame-alist
     (quote
      ((tool-bar-lines . 0)
@@ -724,7 +721,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
+    (color-theme-modern elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist
@@ -782,7 +779,6 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(diff-added ((t (:inherit diff-changed :foreground "medium spring green" :weight extra-bold))))
  '(diff-removed ((t (:foreground "gold3" :weight extra-bold))))
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
- '(font-lock-function-name-face ((t (:foreground "sky blue" :weight bold))))
  '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
  '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
  '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))