This commit breaks save file compatability.

Lots of new things that amuse/stimulate Xom, and a few things which
don't amuse him as much anymore.  Among the new things is a corpse
turning into a skeleton while butchering it; if this is too harsh to
do just for Xom's amusement (previously turning into a skeleton while
butchering was an ignored case and still produced chunks of flesh) it
can be changed back.  Also, if a Xom worshiper draws the Blank card,
Xom makes it act like a Xom card, since a plain old Blank card is boring.

Keep track of which branch the Orb is in, if the player isn't carrying
it.

Keep track of how/why the player ended up in a particular level type
(Abyss, Pan, etc).

Changed most "a distortion effect" cause strings for distortion caused
tranlsocation miscast effects to something more specific.

Added new wizard commands 'C' to curse or uncruse an item, and 'Ctrl-A'
to re-generate the Abyss.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2256 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 3 deletions

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 3560fbb80f..f8e6621329 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -43,7 +43,6 @@
 #include "place.h"
 #include "player.h"
 #include "randart.h"
-#include "religion.h"
 #include "spells1.h"
 #include "spells4.h"
 #include "spl-cast.h"
@@ -51,6 +50,7 @@
 #include "stuff.h"
 #include "traps.h"
 #include "view.h"
+#include "xom.h"
 
 bool cast_selective_amnesia(bool force)
 {
@@ -654,10 +654,17 @@ static bool teleport_player( bool allow_control, bool new_abyss_area )
 void you_teleport_now( bool allow_control, bool new_abyss_area )
 {
     const bool randtele = teleport_player(allow_control, new_abyss_area);
+
     // Xom is amused by uncontrolled teleports that land you in a
-    // dangerous place.
-    if (randtele && player_in_a_dangerous_place())
+    // dangerous place, unless the player is in the Abyss and
+    // teleported to escape from all the monsters chasing him/her,
+    // since in that case the new dangerous area is almost certainly
+    // *less* dangerous than the old dangerous area.
+    if (randtele && player_in_a_dangerous_place()
+        && you.level_type != LEVEL_ABYSS)
+    {
         xom_is_stimulated(255);
+    }
 }
 
 bool entomb(int powc)