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/xom.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/xom.cc') diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index f4ff2c7c28..b613ab0a4d 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1052,7 +1052,7 @@ static bool _xom_do_potion() { pot = static_cast( random_choose(POT_HEALING, POT_HEAL_WOUNDS, POT_MAGIC, - POT_SPEED, POT_MIGHT, POT_INVISIBILITY, + POT_SPEED, POT_MIGHT, POT_AGILITY, POT_BRILLIANCE, POT_INVISIBILITY, POT_BERSERK_RAGE, POT_EXPERIENCE, -1)); if (pot == POT_EXPERIENCE && !one_chance_in(6)) @@ -1107,6 +1107,8 @@ static bool _xom_do_potion() case POT_MAGIC: potion_msg += "(magic)"; break; case POT_SPEED: potion_msg += "(speed)"; break; case POT_MIGHT: potion_msg += "(might)"; break; + case POT_AGILITY: potion_msg += "(agility)"; break; + case POT_BRILLIANCE: potion_msg += "(brilliance)"; break; case POT_INVISIBILITY: potion_msg += "(invisibility)"; break; case POT_BERSERK_RAGE: potion_msg += "(berserk)"; break; case POT_EXPERIENCE: potion_msg += "(experience)"; break; @@ -2214,7 +2216,9 @@ static bool _xom_lose_stats() // will die once might wears off. char vals[3] = {you.strength - (you.duration[DUR_MIGHT] ? 5 : 0), - you.dex, you.intel}; + you.dex - (you.duration[DUR_AGILITY] ? 5 : 0), + you.intel - (you.duration[DUR_BRILLIANCE] ? 5 : 0)}; + stat_type types[3] = {STAT_STRENGTH, STAT_DEXTERITY, STAT_INTELLIGENCE}; int tries = 0; -- cgit v1.2.3-54-g00ecf