From 9732543e9f33ed367f108f7b00509f67e8e9db81 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 15 Jul 2008 11:43:36 +0000 Subject: 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 --- crawl-ref/settings/autopickup_exceptions.txt | 11 ++++++++++- crawl-ref/settings/food_colouring.txt | 2 +- crawl-ref/settings/init.txt | 1 - crawl-ref/settings/menu_colours.txt | 17 ++++++++++------- crawl-ref/source/items.cc | 3 +-- crawl-ref/source/misc.cc | 25 +++++++++++++------------ 6 files changed, 35 insertions(+), 24 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 # diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index ccce30d015..7ee40289ca 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -2235,8 +2235,7 @@ bool item_needs_autopickup(const item_def &item) std::string itemname; return ((Options.autopickups & (1L << item.base_type) - && !is_useless_item(item) && !is_inedible(item) - || _is_forced_autopickup(item, itemname)) + || _is_forced_autopickup(item, itemname)) && (Options.pickup_dropped || !(item.flags & ISFLAG_DROPPED)) && !_is_denied_autopickup(item, itemname)); } diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4dd1b21753..f5be8ee92e 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -611,18 +611,19 @@ bool maybe_coagulate_blood_potions_inv(item_def &blood) if (freeslot >= 0 && freeslot < ENDOFPACK && !is_valid_item(you.inv[freeslot])) { - item_def &item = you.inv[freeslot]; - item.link = freeslot; - item.slot = index_to_letter(item.link); - item.base_type = OBJ_POTIONS; - item.sub_type = POT_BLOOD_COAGULATED; - item.quantity = coag_count; - item.x = -1; - item.y = -1; - item.plus = 0; - item.plus2 = 0; - item.special = 0; - item.flags = 0; + item_def &item = you.inv[freeslot]; + item.link = freeslot; + item.slot = index_to_letter(item.link); + item.base_type = OBJ_POTIONS; + item.sub_type = POT_BLOOD_COAGULATED; + item.quantity = coag_count; + item.x = -1; + item.y = -1; + item.plus = 0; + item.plus2 = 0; + item.special = 0; + item.flags = 0; + item.inscription = ""; item_colour(item); CrawlHashTable &props_new = item.props; -- cgit v1.2.3-54-g00ecf