Merge branch 'master' into vehumet

Conflicts:
	crawl-ref/source/dat/descript/ability.txt
	crawl-ref/source/dat/descript/gods.txt
	crawl-ref/source/religion.cc

1 files changed, 7 insertions, 11 deletions

diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index 07805c3e0f..46e35cad27 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -9,7 +9,7 @@
 #define DEFINES_H
 
 // Minimum terminal size allowed.
-#define MIN_COLS  80
+#define MIN_COLS  79
 #define MIN_LINES 24
 
 #define NUM_MONSTER_SPELL_SLOTS  6
@@ -72,6 +72,9 @@ enum extra_monster_index_type
     MISC_MISCAST,
 };
 
+// number of monster attack specs
+#define MAX_NUM_ATTACKS 4
+
 // size of Pan monster sets. Also used for wave data in ZotDef.
 #define MAX_MONS_ALLOC 20
 
@@ -155,6 +158,8 @@ const int LABYRINTH_BORDER = 4;
 // changing this affects the total number of shops in a game
 #define MAX_RANDOM_SHOPS  5
 
+#define MAX_BRANCH_DEPTH 27
+
 // This value is used to make test_hit checks always succeed
 #define AUTOMATIC_HIT           1500
 
@@ -209,24 +214,15 @@ const int MAX_RECENT_SPELLS = 10;
 
 const int INVALID_ABSDEPTH = -1000;
 
-const int DEPTH_ABYSS = 51;
-const int DEPTH_PAN   = 52;
-
-const int BRANCH_DUNGEON_DEPTH = 27;
-
 //#define DEBUG_MIMIC
 #ifdef DEBUG_MIMIC
 // Missing stairs are replaced in fixup_branch_stairs, but replacing
 // too many breaks interlevel connectivity, so we don't use a chance of 1.
   #define FEATURE_MIMIC_CHANCE 2
   #define ITEM_MIMIC_CHANCE    1
-  #define FEATURE_MIMIC_DEPTH  1
-  #define ITEM_MIMIC_DEPTH     1
 #else
   #define FEATURE_MIMIC_CHANCE 100
-  #define ITEM_MIMIC_CHANCE    500
-  #define FEATURE_MIMIC_DEPTH   10
-  #define ITEM_MIMIC_DEPTH       7
+  #define ITEM_MIMIC_CHANCE    1000
 #endif
 
 const int ANTITRAIN_PENALTY = 2;