summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-12 09:49:39 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-12 09:49:39 +0000
commitbc721ca0cd58a2ffed55245d300266962cf3c123 (patch)
treeee9cc82c7fc7c451549cf180c02a8035f51472f8 /crawl-ref/source/player.cc
parente80122a2ce9321aaa14f1c80321525fb580182dd (diff)
downloadcrawl-ref-bc721ca0cd58a2ffed55245d300266962cf3c123.tar.gz
crawl-ref-bc721ca0cd58a2ffed55245d300266962cf3c123.zip
* Fix compilation.
* Fix wording of stair slide chaos effect. * Add new stimulation triggers for Xom (monsters being polymorphed, accidentally hasted/healed, or going berserk) which has the side effect of keeping Xom's interest up if you actually use the chaos branded weapon he gifted you. * Greatly reduce stimulation possible from deliberately quaffing bad potions. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9596 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index c8bceea2f8..ba506a7fa7 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -4872,6 +4872,9 @@ void rot_hp( int hp_loss )
you.base_hp -= hp_loss;
calc_hp();
+ if (you.species != SP_GHOUL)
+ xom_is_stimulated(hp_loss * 32);
+
you.redraw_hit_points = true;
}
@@ -5059,7 +5062,7 @@ int get_real_mp(bool include_items)
enp += std::max(spell_extra, invoc_extra);
enp = stepdown_value(enp, 9, 18, 45, 100);
- // this is our "rotted" base (applied after scaling):
+ // This is our "rotted" base (applied after scaling):
enp += (you.base_magic_points - 5000);
// Yes, we really do want this duplication... this is so the stepdown