Merge branch 'master' of https://github.com/EQEmu/Server into io_work

# Conflicts:
#	common/ruletypes.h

common/eq_constants.h

@@ -459,4 +459,9 @@ enum ChatChannelNames : uint16
 	ChatChannel_Emotes = 22
 };
 
+namespace ZoneBlockedSpellTypes {
+	const uint8 ZoneWide = 1;
+	const uint8 Region   = 2;
+};
+
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/ruletypes.h

@@ -342,6 +342,7 @@ RULE_INT(Spells, CharismaEffectiveness, 10, "Deterimes how much resist modificat
 RULE_INT(Spells, CharismaEffectivenessCap, 255, "Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod")
 RULE_BOOL(Spells, CharismaCharmDuration, false, "Allow CHA resist mod to extend charm duration")
 RULE_INT(Spells, CharmBreakCheckChance, 25, "Determines chance for a charm break check to occur each buff tick")
+RULE_BOOL(Spells, CharmDisablesSpecialAbilities, false, "When charm is cast on an NPC, strip their special abilities")
 RULE_INT(Spells, MaxCastTimeReduction, 50, "Max percent your spell cast time can be reduced by spell haste")
 RULE_INT(Spells, RootBreakFromSpells, 55, "Chance for root to break when cast on")
 RULE_INT(Spells, DeathSaveCharismaMod, 3, "Determines how much charisma effects chance of death save firing")

common/version.h

@@ -31,7 +31,7 @@
 */
 
 
-#define CURRENT_BINARY_DATABASE_VERSION 9141
+#define CURRENT_BINARY_DATABASE_VERSION 9142
 
 #ifdef BOTS
 	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9025