diff options
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 |