From e3af78b8bb3ad47ea17162e6ef591ca881f0370e Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 9 Mar 2009 21:29:12 +0000 Subject: * 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 --- crawl-ref/settings/autopickup_exceptions.txt | 5 +---- crawl-ref/settings/init.txt | 5 +++-- crawl-ref/settings/menu_colours.txt | 6 +++--- crawl-ref/settings/standard_colours.txt | 3 ++- crawl-ref/source/itemname.cc | 7 ++++--- crawl-ref/source/spl-book.cc | 1 + crawl-ref/source/tiles.h | 10 +--------- 7 files changed, 15 insertions(+), 22 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 diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 9f10028228..185e9b86f4 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -2608,11 +2608,12 @@ bool is_useless_item(const item_def &item, bool temp) break; case OBJ_FOOD: - if (item.sub_type != FOOD_CHUNK || !is_inedible(item)) + if (!is_inedible(item)) return (false); - if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD) - || you.has_spell(SPELL_SIMULACRUM)) + if (item.sub_type == FOOD_CHUNK + && (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD) + || you.has_spell(SPELL_SIMULACRUM))) { return (false); } diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 7f6c98f44e..a7abd01d38 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -1075,6 +1075,7 @@ static int _which_spellbook( void ) mprf("You can memorise %d more level%s of spells.", avail_levels, (avail_levels > 1) ? "s" : "" ); + flush_prev_message(); book = prompt_invent_item("Memorise from which spellbook?", MT_INVLIST, OSEL_MEMORISE ); diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 14ca6ccdb9..9245dc272b 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -146,15 +146,7 @@ enum tile_flags TILE_FLAG_POISON = 0x00020000, TILE_FLAG_FLAME = 0x00040000, TILE_FLAG_ANIM_WEP = 0x00080000, -/* - // MDAM has 5 possibilities, so uses 3 bits. - TILE_FLAG_MDAM_MASK = 0x00780000, - TILE_FLAG_MDAM_LIGHT= 0x00100000, - TILE_FLAG_MDAM_MOD = 0x00180000, - TILE_FLAG_MDAM_HEAVY= 0x00200000, - TILE_FLAG_MDAM_SEV = 0x00280000, - TILE_FLAG_MDAM_ADEAD= 0x00400000, -*/ + // MDAM has 5 possibilities, so uses 3 bits. TILE_FLAG_MDAM_MASK = 0x03800000, TILE_FLAG_MDAM_LIGHT= 0x00800000, -- cgit v1.2.3-54-g00ecf