diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-09 21:29:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-09 21:29:12 +0000 |
| commit | e3af78b8bb3ad47ea17162e6ef591ca881f0370e (patch) | |
| tree | e982d1d591a4eaff043bbb8f77f6cefe2236836f /crawl-ref/settings | |
| parent | 31ecf11f2b7ff57426fb26fce5e3e63444e743c3 (diff) | |
| download | crawl-ref-e3af78b8bb3ad47ea17162e6ef591ca881f0370e.tar.gz crawl-ref-e3af78b8bb3ad47ea17162e6ef591ca881f0370e.zip | |
* Don't count chunks as "useless" (even if inedible) if the player knows
Sublimation of Blood or Simulacrum.
* Fix missing message flush when memorising spells.
(This should probably be handled globally in prompt_invent_item().)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9398 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/settings')
| -rw-r--r-- | crawl-ref/settings/autopickup_exceptions.txt | 5 | ||||
| -rw-r--r-- | crawl-ref/settings/init.txt | 5 | ||||
| -rw-r--r-- | crawl-ref/settings/menu_colours.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/settings/standard_colours.txt | 3 |
4 files changed, 9 insertions, 10 deletions
diff --git a/crawl-ref/settings/autopickup_exceptions.txt b/crawl-ref/settings/autopickup_exceptions.txt index d846db23c8..635bf1ec09 100644 --- a/crawl-ref/settings/autopickup_exceptions.txt +++ b/crawl-ref/settings/autopickup_exceptions.txt @@ -16,13 +16,10 @@ end end > # Exclude items useless in general (?paper, bad potions unless you know -# Evaporate) or for your current character (such as food for Mummies or +# Evaporate) or for your current character (such as inedible food 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 diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index 3579e5c5e3..9b0025a750 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -266,8 +266,9 @@ include = standard_colours.txt # # yellow = preferred food ($preferred) # darkgrey = cannot be eaten at all ($inedible) -# lightred = extremely dangerous, causes rot ($rot-inducing) -# magenta = mutagenic, or evil ($mutagenic, $evil) +# lightred = causes rot ($rot-inducing) +# magenta = dangerous to use, mutagenic ($dangerous, $mutagenic) +# red = considered "evil" by your deity ($evil) # lightgreen = poisonous ($poisonous) # brown = contaminated, may cause sickness ($contaminated) # diff --git a/crawl-ref/settings/menu_colours.txt b/crawl-ref/settings/menu_colours.txt index 4a44e4e9dd..d6257dc51a 100644 --- a/crawl-ref/settings/menu_colours.txt +++ b/crawl-ref/settings/menu_colours.txt @@ -1,6 +1,6 @@ # Changing colours of items in the inventory and other menus -menu := menu_colour +menu := menu_colour ae := autopickup_exceptions # Items currently not affecting you. @@ -29,7 +29,7 @@ menu = inventory:white:.*artefact.* #menu = white:.*identified.*artefact.* #menu = lightblue:.*unidentified.*artefact.* -# Ego items +# Ego items # : if options.menu_colour_prefix_class then menu = lightblue:(^identified armour .* pair of .* of ) @@ -54,7 +54,7 @@ menu = cyan:.*good_item.* menu = cyan:.*misc.*[lL]antern # Dangerous (but still useful) items -menu = magenta:.*dangerous_item.* +menu = $dangerous:.*dangerous_item.* # Evil items menu = $evil:.*evil_item.* diff --git a/crawl-ref/settings/standard_colours.txt b/crawl-ref/settings/standard_colours.txt index 6cae75834d..51fc12583f 100644 --- a/crawl-ref/settings/standard_colours.txt +++ b/crawl-ref/settings/standard_colours.txt @@ -1,10 +1,11 @@ ### standard colours to be used for menu and inventory colouring $inedible := darkgrey -$evil := magenta +$evil := red $preferred := yellow $rot-inducing := lightred $mutagenic := magenta +$dangerous := magenta $poisonous := lightgreen $contaminated := brown |