diff options
| -rw-r--r-- | crawl-ref/docs/changes.stone_soup | 2 | ||||
| -rw-r--r-- | crawl-ref/docs/options_guide.txt | 14 | ||||
| -rw-r--r-- | crawl-ref/settings/init.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/externs.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/stash.cc | 13 |
6 files changed, 6 insertions, 34 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index f60ba71a93..7d21bc5de6 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -45,6 +45,8 @@ Interface * Evaporate can now be cancelled during potion/direction choice. * Portaled Projectile now allows choice of ammunition. * greedy_explore now defaults to true. +* Stash tracker now tracks how decayed corpses and flesh chunks become, + and removes them from the tracker once they rot away completely. Gods ---- diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index c0c39d151c..ed1e0dad61 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -54,8 +54,7 @@ The contents of this text are: trap_prompt, rest_wait_both 4-h Stashes. stash_tracking, stash_filter, annotate_item_class, - annoate_item_dropped, stash_track_decay, - stash_remove_decay + annoate_item_dropped 4-i Command Enhancements. auto_list, easy_open, easy_unequip, easy_confirm, allow_self_target, easy_butcher, always_confirm_butcher, @@ -938,17 +937,6 @@ annotate_item_dropped = false init.txt. Annotates dropped items with {dropped} for stash searching. -stash_track_decay = false - If set to true then the stash tracker will remember how long its - been since you've seen chunks of meat or a corpse or skeleton and - tell you what state its in by adding "rotten by now", - "skeletalised by now" or "gone by now" to its name. - -stash_remove_decay = false - If both this and stash_track_decay are set to true, anything that - would have been reported as "gone by now" will instead be - removed from the stash tracker's memory. - 4-i Command Enhancements. ----------------------------- diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index 01e9c0a1fb..cd1f75f9bb 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -195,8 +195,6 @@ include = travel_stoppers.txt # stash_filter = 14, 4:21 # annotate_item_class = true # annotate_item_dropped = true -# stash_track_decay = true -# stash_remove_decay = true ##### 4-i Command Enhancements ################## # diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 0fb8794be9..5e241f6292 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -1739,10 +1739,6 @@ public: int stash_tracking; // How stashes are tracked - bool stash_track_decay; // Keep track of how decayed corpses are - bool stash_remove_decay; // Remove corpses that have most probably - // completely rotted away - int tc_reachable; // Colour for squares that are reachable int tc_excluded; // Colour for excluded squares. int tc_exclude_circle; // Colour for squares in the exclusion radius diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 9127da00d7..2d8ec1b2ce 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -743,9 +743,6 @@ void game_options::reset_options() stash_tracking = STM_ALL; - stash_track_decay = false; - stash_remove_decay = false; - explore_stop = ES_ITEM | ES_STAIR | ES_PORTAL | ES_SHOP | ES_ALTAR | ES_GREEDY_PICKUP; @@ -2595,8 +2592,6 @@ void game_options::read_option_line(const std::string &str, bool runscript) field == "all" ? STM_ALL : STM_EXPLICIT; } - else BOOL_OPTION(stash_track_decay); - else BOOL_OPTION(stash_remove_decay); else if (key == "stash_filter") { std::vector<std::string> seg = split_string(",", field); diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 95a1f323d1..0ec9592511 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -390,7 +390,7 @@ std::string Stash::stash_item_name(const item_def &item) { std::string name = item.name(DESC_NOCAP_A); - if (!Options.stash_track_decay || !_is_rottable(item)) + if (!_is_rottable(item)) return name; if (item.plus2 <= _min_rot(item)) @@ -604,12 +604,8 @@ void Stash::_update_corpses(long rot_time) if (new_rot <= _min_rot(item)) { - if (Options.stash_remove_decay) - { - items.erase(items.begin() + i); - continue; - } - new_rot = _min_rot(item); + items.erase(items.begin() + i); + continue; } item.plus2 = static_cast<short>(new_rot); } @@ -1861,9 +1857,6 @@ bool StashTracker::display_search_results( void StashTracker::update_corpses() { - if (!Options.stash_track_decay) - return; - if (you.elapsed_time - last_corpse_update < 20.0) return; |