From 280d409759be7af8b54366f07ccba17348ea24f9 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 13 Sep 2009 16:04:24 +0000 Subject: 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 --- crawl-ref/source/spl-mis.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/spl-mis.cc') diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc index b1b365106f..b547edc719 100644 --- a/crawl-ref/source/spl-mis.cc +++ b/crawl-ref/source/spl-mis.cc @@ -566,13 +566,15 @@ bool MiscastEffect::_lose_stat(unsigned char which_stat, if (which_stat == STAT_RANDOM) { const int might = you.duration[DUR_MIGHT] ? 5 : 0; + const int brilliant = you.duration[DUR_BRILLIANCE] ? 5 : 0; + const int agile = you.duration[DUR_AGILITY] ? 5 : 0; std::vector stat_types; if ((you.strength - might - stat_loss) > 0) stat_types.push_back(STAT_STRENGTH); - if ((you.intel - stat_loss) > 0) + if ((you.intel - brilliant - stat_loss) > 0) stat_types.push_back(STAT_INTELLIGENCE); - if ((you.dex - stat_loss) > 0) + if ((you.dex - agile - stat_loss) > 0) stat_types.push_back(STAT_DEXTERITY); if (stat_types.size() == 0) -- cgit v1.2.3-54-g00ecf