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 20:43:17 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-15 20:43:17 +0000
commitdc0f066ad0fa14a48e652914b9a27e626f5eded1 (patch)
tree83173474fa7ecc57c9c6bb974445cb47d5d341e0 /crawl-ref/settings
parentd976570ee5fbcc53481d76b2d55d389908968bd5 (diff)
downloadcrawl-ref-dc0f066ad0fa14a48e652914b9a27e626f5eded1.tar.gz
crawl-ref-dc0f066ad0fa14a48e652914b9a27e626f5eded1.zip
Apply commits r6564 and r6567 to 0.4 trunk.
Also start on changes.stone_soup for 0.4.1. The mapmark.lua fixes are not actually in 0.4 trunk, are they? git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6568 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
-rw-r--r--crawl-ref/settings/menu_colours.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/settings/menu_colours.txt b/crawl-ref/settings/menu_colours.txt
index f6a2e00982..321c023392 100644
--- a/crawl-ref/settings/menu_colours.txt
+++ b/crawl-ref/settings/menu_colours.txt
@@ -3,7 +3,10 @@
menu := menu_colour
ae := autopickup_exceptions
-# Useless items, overrides all other colours
+# Bad items
+menu = lightred:.*bad_item.*
+
+# Useless items, comes here to override artefacts etc.
menu = darkgrey:.*useless_item.*
: if you.race() == "Spriggan" then
@@ -47,9 +50,6 @@ menu = yellow:.*emergency_item.*
menu = cyan:.*good_item.*
menu = cyan:.*misc.*[lL]antern
-# Bad items
-menu = lightred:.*bad_item.*
-
# Dangerous (but still useful) items
menu = magenta:.*dangerous_item.*