From 2ba0610903de32d61d443e285728dea3ca4a8905 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 19 Nov 2021 13:03:17 +0900 Subject: [PATCH] Auto commit by The Sugar System. --- .../Hengband/pick_d/classes/magic-eater_prf | 4 ++++ dot-files/_angband/Hengband/pickpref_prf | 21 ++++++++++++++++++- dot-files/_emacs_el | 10 ++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) 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 8955483..8526151 100644 --- 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] +# Absorb Magic +A:\e\e\e\\Ua +P:^a + # 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 926dca7..1504ab3 100644 --- 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 -weapons:blade of chaos weapons:falcon sword weapons:poison needle shields:mirror shield#%all!k @@ -116,6 +115,14 @@ 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. ?:[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 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 #=============================================================== @@ -291,6 +309,7 @@ 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!s!d ring of extra#!k diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 7084821..48a9e47 100644 --- a/dot-files/_emacs_el +++ b/dot-files/_emacs_el @@ -174,6 +174,11 @@ ;; 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) @@ -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 -(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" @@ -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 - (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") -- 2.40.0