diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 16:04:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 16:04:24 +0000 |
| commit | 280d409759be7af8b54366f07ccba17348ea24f9 (patch) | |
| tree | 99b931599c7a6544a9c9b3f4aeb7d9c99752b5d9 /crawl-ref/source/output.cc | |
| parent | 8b4a043aa12cf1492ff94b0ef071afce5997dff2 (diff) | |
| download | crawl-ref-280d409759be7af8b54366f07ccba17348ea24f9.tar.gz crawl-ref-280d409759be7af8b54366f07ccba17348ea24f9.zip | |
Commit several patches:
* patch 2849505 by weyrava: make submerged monsters use the correct colour
* patch 2857771 by caotto: another Feawn update
* patch 2838771 by camedo: add potions of brilliance/agility
* BR 2841651 by bookofjude: allow Merfolk to control-tele into deep water
Now we need tiles for the new potions!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10669 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
| -rw-r--r-- | crawl-ref/source/output.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index a83da80817..463a68c71c 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -388,7 +388,9 @@ short _get_stat_colour(stat_type stat) // Stat is magically increased. if (you.duration[DUR_DIVINE_STAMINA] - || stat == STAT_STRENGTH && you.duration[DUR_MIGHT]) + || stat == STAT_STRENGTH && you.duration[DUR_MIGHT] + || stat == STAT_INTELLIGENCE && you.duration[DUR_BRILLIANCE] + || stat == STAT_DEXTERITY && you.duration[DUR_AGILITY]) { return (LIGHTBLUE); // no end of effect warning } @@ -1919,8 +1921,10 @@ static std::vector<formatted_string> _get_overview_stats() const bool boosted_mp = you.duration[DUR_DIVINE_VIGOUR]; const bool boosted_str = you.duration[DUR_DIVINE_STAMINA] || you.duration[DUR_MIGHT]; - const bool boosted_int = you.duration[DUR_DIVINE_STAMINA]; - const bool boosted_dex = you.duration[DUR_DIVINE_STAMINA]; + const bool boosted_int = you.duration[DUR_DIVINE_STAMINA] + || you.duration[DUR_BRILLIANCE]; + const bool boosted_dex = you.duration[DUR_DIVINE_STAMINA] + || you.duration[DUR_AGILITY]; if (!player_rotted()) { @@ -2422,6 +2426,12 @@ std::string _status_mut_abilities() if (you.duration[DUR_MIGHT]) status.push_back("mighty"); + if (you.duration[DUR_BRILLIANCE]) + status.push_back("brilliance"); + + if (you.duration[DUR_AGILITY]) + status.push_back("agile"); + if (you.duration[DUR_DIVINE_VIGOUR]) status.push_back("divinely vigorous"); |