Auto commit by The Sugar System.

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 895548349260bf724459af1cf8aba94af6a43650..852615197f3512cfda3e255c23f51c435691d7fc 100644 (file)
--- a/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf
+++ b/dot-files/_angband/Hengband/pick_d/classes/magic-eater_prf
@@ -4,6 +4,10 @@
 #===============================================================
 ?:[EQU $CLASS Magic-Eater]
 
 #===============================================================
 ?:[EQU $CLASS Magic-Eater]
 

+# Absorb Magic
+A:\e\e\e\\Ua
+P:^a
+

 # Staff of Perception
 A:\e\e\e\\mAf
 P:^o
 # Staff of Perception
 A:\e\e\e\\mAf
 P:^o

diff --git a/dot-files/_angband/Hengband/pickpref_prf b/dot-files/_angband/Hengband/pickpref_prf
index 926dca7422bcd91a32bd804bcf8887b5b2e87cca..1504ab37668310830c50cd7181509beacbc0f68d 100644 (file)
--- a/dot-files/_angband/Hengband/pickpref_prf
+++ b/dot-files/_angband/Hengband/pickpref_prf
@@ -106,7 +106,6 @@ artifact weapons:broken
 # We don't want to discard rare weapons or armors even if they aren't
 # ego.
 !worthless weapons:blade of chaos
 # 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

 weapons:falcon sword
 weapons:poison needle
 shields:mirror shield#%all!k
 weapons:falcon sword
 weapons:poison needle
 shields:mirror shield#%all!k


@@ -116,6 +115,14 @@ armors:elvenkind#%all
 armors:elven
 armors:black clothes
 
 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.
 ?:[AND [GEQ $LEVEL 10] [NOT [EQU $CLASS Weaponsmith]]]
 # 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]]]


@@ -123,20 +130,31 @@ armors:black clothes
 !average armors
 
 ?:[AND [GEQ $LEVEL 25] [NOT [EQU $CLASS Weaponsmith]]]
 !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
 !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
 # 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
 
 ?: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
 #===============================================================
 #===============================================================
 #  Potions
 #===============================================================


@@ -291,6 +309,7 @@ magical devices:rod
 !worthless:ring
 
 # Pick useful ones.
 !worthless:ring
 
 # Pick useful ones.

+identified:ring of chaos resistance#%all

 identified:ring of nether resistance#%all
 identified:ring of speed#!k!s!d
 ring of extra#!k
 identified:ring of nether resistance#%all
 identified:ring of speed#!k!s!d
 ring of extra#!k

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 7084821c78d88798b7233c09569ac4480e08d0f9..48a9e4755ff15e3787915bedbfc31384698310d5 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -174,6 +174,11 @@
 ;; jaspace
 (require-if-present 'jaspace)
 
 ;; jaspace
 (require-if-present 'jaspace)
 

+;; json
+(require-if-present 'json-par)
+(if (featurep 'json-par)
+    (add-hook 'json-mode-hook #'json-par-mode))
+

 ;; pkgdiff
 (add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff")
 (autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t)
 ;; pkgdiff
 (add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff")
 (autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t)


@@ -331,8 +336,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'cleite "cleite" "Cleite RSS Aggregator -- Emacs Interface" t)
 
 ;; javascript
 (autoload 'cleite "cleite" "Cleite RSS Aggregator -- Emacs Interface" t)
 
 ;; javascript

-(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode))
-(add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode))

 
 ;; typescript
 (autoload 'typescript-mode "typescript-mode"
 
 ;; typescript
 (autoload 'typescript-mode "typescript-mode"


@@ -718,7 +722,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote

-    (elscreen-fr 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)))
+    (json-par nim-mode elscreen-fr 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)))

  '(projectile-mode t nil (projectile))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(projectile-mode t nil (projectile))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")