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, 15 insertions, 0 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 4d9ac82043..61ddc607ce 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -171,6 +171,8 @@ enum attribute_type
     ATTR_GOD_GIFT_COUNT,        //jmf: added to help manage god gift giving
     ATTR_DELAYED_FIREBALL,      // bwr: reserve fireballs
     ATTR_HELD,                  // caught in a net
+    ATTR_ABYSS_ENTOURAGE,       // maximum number of hostile monsters in
+                                // sight of the player while in the Abyss.
     NUM_ATTRIBUTES
 };
 
@@ -1340,6 +1342,19 @@ enum level_area_type                   // you.level_type
     NUM_LEVEL_AREA_TYPES
 };
 
+enum entry_cause_type
+{
+    EC_UNKNOWN,
+    EC_SELF_EXPLICIT,
+    EC_SELF_RISKY,    // i.e., wielding an id'd distorion weapon
+    EC_SELF_ACCIDENT, // i.e., wielding an un-id'd distortion weapon
+    EC_MISCAST,
+    EC_GOD_RETRIUBTION,
+    EC_GOD_ACT, // Xom sending the player somewhere for amusement
+    EC_MONSTER,
+    NUM_ENTRY_CAUSE_TYPES
+};
+
 // Can't change this order without breaking saves.
 enum map_marker_type
 {