summaryrefslogtreecommitdiffstats
path: root/crawl-ref/settings
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-15 11:43:36 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-15 11:43:36 +0000
commit9732543e9f33ed367f108f7b00509f67e8e9db81 (patch)
tree7a507938a5929cfa3a06ca94303098b728b62dd1 /crawl-ref/settings
parentfdd9765b0b000fe63d19eba03fd13ff5916d6047 (diff)
downloadcrawl-ref-9732543e9f33ed367f108f7b00509f67e8e9db81.tar.gz
crawl-ref-9732543e9f33ed367f108f7b00509f67e8e9db81.zip
Apply settings changes, and fix dangling inscriptions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6555 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/autopickup_exceptions.txt11
-rw-r--r--crawl-ref/settings/food_colouring.txt2
-rw-r--r--crawl-ref/settings/init.txt1
-rw-r--r--crawl-ref/settings/menu_colours.txt17
4 files changed, 21 insertions, 10 deletions
diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt
index af54da7878..344f6f1686 100644
--- a/crawl-ref/settings/autopickup_exceptions.txt
+++ b/crawl-ref/settings/autopickup_exceptions.txt
@@ -15,7 +15,16 @@ function ch_autopickup(it)
end
end >
-# Exclude potentially useful items of high risk, like ?torment.
+# Exclude items useless in general (?paper, bad potions unless you know
+# Evaporate) or for your current character (such as food for Mummies or
+# armour you can't wear).
+ae = useless_item
+
+# Exclude food items your character cannot eat.
+ae = inedible
+
+# Exclude potentially useful items of high risk, like ?torment or
+# !mutation.
ae = dangerous_item
# Excluding amulets as you only need one of each. (If you know the
diff --git a/crawl-ref/settings/food_colouring.txt b/crawl-ref/settings/food_colouring.txt
index 12e9db5a1a..4136b43b61 100644
--- a/crawl-ref/settings/food_colouring.txt
+++ b/crawl-ref/settings/food_colouring.txt
@@ -11,8 +11,8 @@ inv := menu_colour
msg = $inedible:.*inedible.*
inv = $inedible:.*inedible.*
+msg = $evil:.*evil_eating.*
inv = $evil:.*evil_eating.*
-inv = $evil:.*evil_item.*
msg = $preferred:.*preferred.*
inv = $preferred:.*preferred.*
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 0354100b66..3b9e37c593 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -334,7 +334,6 @@ note_skill_levels = 1,5,10,15,27
note_all_skill_levels = true
note_skill_max = true
note_all_spells = true
-note_all_spells = true
note_items = rod of, acquirement, preservation, running, of Zot
note_messages = You pass through the gate
note_messages = [bB]anish.*Abyss
diff --git a/crawl-ref/settings/menu_colours.txt b/crawl-ref/settings/menu_colours.txt
index c0392544cd..fe3636919b 100644
--- a/crawl-ref/settings/menu_colours.txt
+++ b/crawl-ref/settings/menu_colours.txt
@@ -3,6 +3,14 @@
menu := menu_colour
ae := autopickup_exceptions
+# Useless items, overrides all other colours
+menu = darkgrey:.*useless_item.*
+
+: if you.race() == "Spriggan" then
+menu = darkgrey:.*jewellery.*(sustenance)
+ae = >ring.*(sustenance)
+:end
+
# Important game items
#
menu = lightmagenta:.*misc.*rune( of Zot)?
@@ -45,13 +53,8 @@ menu = lightred:.*bad_item.*
# Dangerous (but still useful) items
menu = magenta:.*dangerous_item.*
-# Useless items
-menu = darkgrey:.*useless_item.*
-
-: if you.race() == "Spriggan" then
-menu = darkgrey:.*jewellery.*(sustenance)
-ae = >ring.*(sustenance)
-:end
+# Evil items
+inv = $evil:.*evil_item.*
# Defaults for normal items
#