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, 34 insertions, 4 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 5a0922f7af..bc8bebd375 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -40,15 +40,16 @@
 #include "ouch.h"
 #include "player.h"
 #include "randart.h"
-#include "religion.h"
 #include "skills2.h"
 #include "spells3.h"
 #include "spells4.h"
 #include "spl-book.h"
 #include "spl-util.h"
+#include "state.h"
 #include "stuff.h"
 #include "terrain.h"
 #include "view.h"
+#include "xom.h"
 
 // torment_monsters is called with power 0 because torment is
 // UNRESISTABLE except for being undead or having torment
@@ -158,10 +159,39 @@ void banished(dungeon_feature_type gate_type, const std::string &who)
         take_note(Note(NOTE_USER_NOTE, 0, 0, what.c_str()), true);
     }
 
-    down_stairs(you.your_level, gate_type);  // heh heh
+    // Now figure out how we got here.
+    if (who.find("self") != std::string::npos || who == you.your_name
+        || who == "you" || who == "You" || crawl_state.is_god_acting())
+    {
+        // down_stairs() will take care of setting things.
+        you.entry_cause = EC_UNKNOWN;
+    }
+    else if (who.find("distortion") != std::string::npos)
+    {
+        if (who.find("wield") != std::string::npos)
+        {
+            if (who.find("unknowing") != std::string::npos)
+                you.entry_cause = EC_SELF_ACCIDENT;
+            else
+                you.entry_cause = EC_SELF_RISKY;
+        }
+        else if (who.find("affixation") != std::string::npos)
+            you.entry_cause = EC_SELF_ACCIDENT;
+        else if (who.find("branding")  != std::string::npos)
+            you.entry_cause = EC_SELF_RISKY;
+        else
+            you.entry_cause = EC_MONSTER;
+    }
+    else if (who == "drawing a card")
+        you.entry_cause = EC_SELF_RISKY;
+    else if (who.find("miscast") != std::string::npos)
+        you.entry_cause = EC_MISCAST;
+    else if (who == "wizard command")
+        you.entry_cause = EC_SELF_EXPLICIT;
+    else
+        you.entry_cause = EC_MONSTER;
 
-    if (gate_type == DNGN_ENTER_ABYSS || gate_type == DNGN_ENTER_PANDEMONIUM)
-        xom_is_stimulated(255);
+    down_stairs(you.your_level, gate_type, you.entry_cause);  // heh heh
 }
 
 bool forget_spell(void)