Additional fixups.

Merge remote-tracking branch 'refs/remotes/origin/master' into 2002_fixes
Not sure how that happened
2026-05-23 04:52:29 +00:00 · 2017-03-16 13:27:58 -04:00 · 2017-03-16 13:23:56 -04:00 · 2017-03-16 12:56:21 -04:00 · 2017-03-16 12:52:58 -04:00 · 2017-03-15 15:25:42 -04:00
479 changed files with 74523 additions and 60401 deletions
@@ -13,6 +13,10 @@ script:
  - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON
  - make -j8
  - ./bin/tests
+branches:
+  only:
+    - master
+    - stable
 notifications:
  email: false
  irc:
@@ -30,6 +30,7 @@
 #EQEMU_BUILD_LUA
 #EQEMU_SANITIZE_LUA_LIBS
 #EQEMU_BUILD_CLIENT_FILES
+#EQEMU_USE_MAP_MMFS
 #EQEMU_MAP_DIR

 #We set a fairly new version (as of 2013) because I found finding perl was a bit... buggy on older ones
@@ -275,6 +276,11 @@ IF(EQEMU_BUILD_LUA)
 	ADD_DEFINITIONS(-DLUA_EQEMU)
 ENDIF(EQEMU_BUILD_LUA)

+OPTION(EQEMU_USE_MAP_MMFS "Create and use Zone Map MMF files." OFF)
+IF(EQEMU_USE_MAP_MMFS)
+	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
+ENDIF(EQEMU_USE_MAP_MMFS)
+
 SET(EQEMU_MAP_DIR "./Maps" CACHE STRING "The dir that maps, water maps, and paths are located in.")

 ADD_DEFINITIONS(-DEQDEBUG=${EQEMU_DEBUG_LEVEL})
@@ -331,14 +337,8 @@ IF(EQEMU_BUILD_LUA)
    ADD_SUBDIRECTORY(luabind)
 ENDIF(EQEMU_BUILD_LUA)

-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/recast/debug_utils/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/recast/detour/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/recast/detour_tile_cache/include")
-INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/recast/recast/include")
-
 IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS)
 	ADD_SUBDIRECTORY(common)
-	ADD_SUBDIRECTORY(recast)
 ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS)
 IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(shared_memory)
@@ -1,53 +1,59 @@
-EQEmu
-===
+# EQEmulator Core Server
+|Travis CI (Linux)|Appveyor (Windows)   |
+|:---:|:---:| 
+|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)   |[![Windows CI](https://ci.appveyor.com/api/projects/status/d0cvokm7u732v8vl/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server/branch/master)   |

-[![Build Status](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)
+***

-Overview
---
+**EQEmulator is a custom completely from-scratch open source server implementation for EverQuest built mostly on C++**
+ * MySQL/MariaDB is used as the database engine (over 200+ tables)
+ * Perl and LUA are both supported scripting languages for NPC/Player/Quest oriented events
+ * Open source database (Project EQ) has content up to expansion GoD (included in server installs)
+  * Game server environments and databases can be heavily customized to create all new experiences
+ * Hundreds of Quests/events created and maintained by Project EQ

-EQEmu is a custom server implementation for EverQuest
+## Server Installs
+||Windows|Linux|
+|:---:|:---:|:---:|
+|**Install Count**|![Windows Install Count](http://analytics.akkadius.com/?install_count&windows_count)|![Linux Install Count](http://analytics.akkadius.com/?install_count&linux_count)| 
+### > Windows 
+* [Easy Install](http://wiki.eqemulator.org/p?Akkas_PEQ_Server_Installer&frm=Main#from-scratch-installation-instructions-windows)
+* [Advanced Setup](http://wiki.eqemulator.org/p?Complete_Windows-based_Server_Setup_Guide)

-Dependencies
---
+### > Debian/Ubuntu

-For Windows: http://eqemu.github.io
+> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh

-Login Server dependencies for Windows/Linux/OSX: http://eqemu.github.io
+### > CentOS/Fedora

-For Debian based distros (adjust to your local flavor):
+> curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh

- libmysqlclient-dev
- libperl-dev
- liblua5.1-0-dev (5.2 should work as well)
- libboost-dev
+## Supported Clients

-Further instructions on building the source can be found on the
-[wiki](http://wiki.eqemulator.org/i?M=Wiki).
+|Titanium Edition|Secrets of Faydwer|Seeds of Destruction|Underfoot|Rain of Fear|
+|:---:|:---:|:---:|:---:|:---:|
+|<img src="http://i.imgur.com/hrwDxoM.jpg" height="150">|<img src="http://i.imgur.com/cRDW5tn.png" height="150">|<img src="http://i.imgur.com/V48kuVn.jpg" height="150">|<img src="http://i.imgur.com/IJQ0XMa.jpg" height="150">|<img src="http://i.imgur.com/OMpHkKa.png" height="100">|

-Bug reports
---
-
-Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
+## Bug Reports <img src="http://i.imgur.com/daf1Vjw.png" height="20">
+* Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
 reports or feature requests.
+* The [EQEmu Forums](http://www.eqemulator.org/forums/) are also a place to submit and get help with bugs.

-The [EQEmu Forums](http://www.eqemulator.org/forums/) also have forums to submit
-bugs/get help with bugs.
+## Contributions <img src="http://image.flaticon.com/icons/png/512/25/25231.png" width="20">

-Contributions
---
-
-The preferred way to contribute is to fork the repo and submit a pull request on
+* The preferred way to contribute is to fork the repo and submit a pull request on
 GitHub. If you need help with your changes, you can always post on the forums or
-try IRC. You can also post unified diffs (`git diff` should do the trick) on the
+try Discord. You can also post unified diffs (`git diff` should do the trick) on the
 [Server Code Submissions](http://www.eqemulator.org/forums/forumdisplay.php?f=669)
 forum, although pull requests will be much quicker and easier on all parties.

-Contact
---
- - **User IRC Channel**: `#eqemu` on `irc.eqemulator.net`
- - **Developer IRC Channel**: `#eqemucoders` on `irc.eqemulator.net`
+## Contact <img src="http://gamerescape.com/wp-content/uploads/2015/06/discord.png" height="20">

+ - Discord Channel: https://discord.gg/QHsm7CD
+ - **User Discord Channel**: `#general`
+ - **Developer Discord Channel**: `#eqemucoders`
+
+Resources
+---
 - [EQEmulator Forums](http://www.eqemulator.org/forums)
 - [EQEmulator Wiki](http://wiki.eqemulator.org/i?M=Wiki)
-
@@ -45,12 +45,12 @@ int main(int argc, char **argv) {
 		return 1;
 	}

-	const EQEmuConfig *config = EQEmuConfig::get();
+	auto Config = EQEmuConfig::get();

 	SharedDatabase database;
 	Log.Out(Logs::General, Logs::Status, "Connecting to database...");
-	if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(),
-		config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
+	if(!database.Connect(Config->DatabaseHost.c_str(), Config->DatabaseUsername.c_str(),
+		Config->DatabasePassword.c_str(), Config->DatabaseDB.c_str(), Config->DatabasePort)) {
 		Log.Out(Logs::General, Logs::Error, "Unable to connect to the database, cannot continue without a "
 			"database connection");
 		return 1;
@@ -43,12 +43,12 @@ int main(int argc, char **argv) {
 		return 1;
 	}

-	const EQEmuConfig *config = EQEmuConfig::get();
+	auto Config = EQEmuConfig::get();

 	SharedDatabase database;
 	Log.Out(Logs::General, Logs::Status, "Connecting to database...");
-	if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(),
-		config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
+	if(!database.Connect(Config->DatabaseHost.c_str(), Config->DatabaseUsername.c_str(),
+		Config->DatabasePassword.c_str(), Config->DatabaseDB.c_str(), Config->DatabasePort)) {
 		Log.Out(Logs::General, Logs::Error, "Unable to connect to the database, cannot continue without a "
 			"database connection");
 		return 1;
@@ -11,15 +11,20 @@ SET(common_sources
 	database_conversions.cpp
 	database_instances.cpp
 	dbcore.cpp
+	deity.cpp
+	emu_constants.cpp
+	emu_legacy.cpp
+	emu_limits.cpp
 	emu_opcodes.cpp
 	emu_tcp_connection.cpp
 	emu_tcp_server.cpp
-	eq_dictionary.cpp
+	emu_versions.cpp
 	eqdb.cpp
 	eqdb_res.cpp
 	eqemu_exception.cpp
 	eqemu_config.cpp
 	eqemu_logsys.cpp
+	eq_limits.cpp
 	eq_packet.cpp
 	eq_stream.cpp
 	eq_stream_factory.cpp
@@ -30,9 +35,14 @@ SET(common_sources
 	faction.cpp
 	guild_base.cpp
 	guilds.cpp
+	inventory_profile.cpp
+	inventory_slot.cpp
 	ipc_mutex.cpp
-	item.cpp
+	item_data.cpp
+	item_instance.cpp
+	light_source.cpp
 	md5.cpp
+	memory_buffer.cpp
 	memory_mapped_file.cpp
 	misc.cpp
 	misc_functions.cpp
@@ -51,6 +61,7 @@ SET(common_sources
 	races.cpp
 	rdtsc.cpp
 	rulesys.cpp
+	say_link.cpp
 	serverinfo.cpp
 	shareddb.cpp
 	skills.cpp
@@ -59,20 +70,26 @@ SET(common_sources
 	struct_strategy.cpp
 	tcp_connection.cpp
 	tcp_server.cpp
+	textures.cpp
 	timeoutmgr.cpp
 	timer.cpp
 	unix.cpp
 	worldconn.cpp
 	xml_parser.cpp
-	pathfind.cpp
 	platform.cpp
 	patches/patches.cpp
 	patches/sod.cpp
+	patches/sod_limits.cpp
 	patches/sof.cpp
+	patches/sof_limits.cpp
 	patches/rof.cpp
+	patches/rof_limits.cpp
 	patches/rof2.cpp
+	patches/rof2_limits.cpp
 	patches/titanium.cpp
+	patches/titanium_limits.cpp
 	patches/uf.cpp
+	patches/uf_limits.cpp
 	SocketLib/Base64.cpp
 	SocketLib/File.cpp
 	SocketLib/HttpdCookies.cpp
@@ -105,12 +122,15 @@ SET(common_headers
 	database.h
 	dbcore.h
 	deity.h
+	emu_constants.h
+	emu_legacy.h
+	emu_limits.h
 	emu_opcodes.h
 	emu_oplist.h
 	emu_tcp_connection.h
 	emu_tcp_server.h
+	emu_versions.h
 	eq_constants.h
-	eq_dictionary.h
 	eq_packet_structs.h
 	eqdb.h
 	eqdb_res.h
@@ -118,6 +138,7 @@ SET(common_headers
 	eqemu_config.h
 	eqemu_config_elements.h
 	eqemu_logsys.h
+	eq_limits.h
 	eq_packet.h
 	eq_stream.h
 	eq_stream_factory.h
@@ -136,15 +157,19 @@ SET(common_headers
 	global_define.h
 	guild_base.h
 	guilds.h
+	inventory_profile.h
+	inventory_slot.h
 	ipc_mutex.h
-	item.h
+	item_data.h
 	item_fieldlist.h
-	item_struct.h
+	item_instance.h
 	languages.h
+	light_source.h
 	linked_list.h
 	loottable.h
 	mail_oplist.h
 	md5.h
+	memory_buffer.h
 	memory_mapped_file.h
 	misc.h
 	misc_functions.h
@@ -157,7 +182,6 @@ SET(common_headers
 	packet_dump.h
 	packet_dump_file.h
 	packet_functions.h
-	pathfind.h
 	platform.h
 	proc_launcher.h
 	profiler.h
@@ -168,6 +192,7 @@ SET(common_headers
 	rdtsc.h
 	rulesys.h
 	ruletypes.h
+	say_link.h
 	seperator.h
 	serverinfo.h
 	servertalk.h
@@ -179,6 +204,7 @@ SET(common_headers
 	tcp_basic_server.h
 	tcp_connection.h
 	tcp_server.h
+	textures.h
 	timeoutmgr.h
 	timer.h
 	types.h
@@ -190,37 +216,30 @@ SET(common_headers
 	zone_numbers.h
 	patches/patches.h
 	patches/sod.h
-	patches/sod_constants.h
-	patches/sod_itemfields.h
+	patches/sod_limits.h
 	patches/sod_ops.h
 	patches/sod_structs.h
 	patches/sof.h
-	patches/sof_constants.h
-	patches/sof_itemfields.h
-	patches/sof_opcode_list.h
+	patches/sof_limits.h
 	patches/sof_ops.h
 	patches/sof_structs.h
 	patches/ss_declare.h
 	patches/ss_define.h
 	patches/ss_register.h
 	patches/rof.h
-	patches/rof_constants.h
-	patches/rof_itemfields.h
+	patches/rof_limits.h
 	patches/rof_ops.h
 	patches/rof_structs.h
 	patches/rof2.h
-	patches/rof2_constants.h
-	patches/rof2_itemfields.h
+	patches/rof2_limits.h
 	patches/rof2_ops.h
 	patches/rof2_structs.h
 	patches/titanium.h
-	patches/titanium_constants.h
-	patches/titanium_itemfields.h
+	patches/titanium_limits.h
 	patches/titanium_ops.h
 	patches/titanium_structs.h
 	patches/uf.h
-	patches/uf_constants.h
-	patches/uf_itemfields.h
+	patches/uf_limits.h
 	patches/uf_ops.h
 	patches/uf_structs.h
 	SocketLib/Base64.h
@@ -243,46 +262,45 @@ SET(common_headers
 SOURCE_GROUP(Patches FILES
 	patches/patches.h
 	patches/sod.h
-	patches/sod_itemfields.h
+	patches/sod_limits.h
 	patches/sod_ops.h
-	patches/sod_constants.h
 	patches/sod_structs.h
 	patches/sof.h
-	patches/sof_itemfields.h
-	patches/sof_opcode_list.h
+	patches/sof_limits.h
 	patches/sof_ops.h
-	patches/sof_constants.h
 	patches/sof_structs.h
 	patches/ss_declare.h
 	patches/ss_define.h
 	patches/ss_register.h
 	patches/rof.h
-	patches/rof_itemfields.h
+	patches/rof_limits.h
 	patches/rof_ops.h
-	patches/rof_constants.h
 	patches/rof_structs.h
 	patches/rof2.h
-	patches/rof2_itemfields.h
+	patches/rof2_limits.h
 	patches/rof2_ops.h
-	patches/rof2_constants.h
 	patches/rof2_structs.h
 	patches/titanium.h
-	patches/titanium_itemfields.h
+	patches/titanium_limits.h
 	patches/titanium_ops.h
-	patches/titanium_constants.h
 	patches/titanium_structs.h
 	patches/uf.h
-	patches/uf_itemfields.h
+	patches/uf_limits.h
 	patches/uf_ops.h
-	patches/uf_constants.h
 	patches/uf_structs.h
 	patches/patches.cpp
 	patches/sod.cpp
+	patches/sod_limits.cpp
 	patches/sof.cpp
+	patches/sof_limits.cpp
 	patches/rof.cpp
+	patches/rof_limits.cpp
 	patches/rof2.cpp
+	patches/rof2_limits.cpp
 	patches/titanium.cpp
+	patches/titanium_limits.cpp
 	patches/uf.cpp
+	patches/uf_limits.cpp
 )

 SOURCE_GROUP(SocketLib FILES
@@ -22,10 +22,10 @@
 #include <stdio.h>
 #include <string.h>

-#ifdef WIN32
+#ifdef _WINDOWS
 	#include <time.h>
-	#include <windows.h>
 	#include <winsock2.h>
+	#include <windows.h>
 #else
 	#include <sys/time.h>
 	#include <netinet/in.h>
@@ -63,7 +63,7 @@ public:
 	void WriteFloat(float value) { *(float *)(pBuffer + _wpos) = value; _wpos += sizeof(float); }
 	void WriteDouble(double value) { *(double *)(pBuffer + _wpos) = value; _wpos += sizeof(double); }
 	void WriteString(const char * str) { uint32 len = static_cast<uint32>(strlen(str)) + 1; memcpy(pBuffer + _wpos, str, len); _wpos += len; }
-	void WriteData(const void *ptr, size_t n) { memcpy(pBuffer + _wpos, ptr, n); _wpos += (uint32)n; }
+	void WriteData(const void *ptr, size_t n) { memcpy(pBuffer + _wpos, ptr, n); _wpos += n; }

 	uint8 ReadUInt8() { uint8 value = *(uint8 *)(pBuffer + _rpos); _rpos += sizeof(uint8); return value; }
 	uint8 ReadUInt8(uint32 Offset) const { uint8 value = *(uint8 *)(pBuffer + Offset); return value; }
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -18,275 +18,576 @@
 #include "../common/global_define.h"
 #include "../common/classes.h"

-const char* GetEQClassName(uint8 class_, uint8 level) {
-	switch(class_) {
-		case WARRIOR:
-			if (level >= 70)
-				return "Vanquisher";
-			else if (level >= 65)
-				return "Overlord"; //Baron-Sprite: LEAVE MY CLASSES ALONE.
-			else if (level >= 60)
-				return "Warlord";
-			else if (level >= 55)
-				return "Myrmidon";
-			else if (level >= 51)
-				return "Champion";
-			else
-				return "Warrior";
-		case CLERIC:
-			if (level >= 70)
-				return "Prelate";
-			else if (level >= 65)
-				return "Archon";
-			else if (level >= 60)
-				return "High Priest";
-			else if (level >= 55)
-				return "Templar";
-			else if (level >= 51)
-				return "Vicar";
-			else
-				return "Cleric";
-		case PALADIN:
-			if (level >= 70)
-				return "Lord";
-			else if (level >= 65)
-				return "Lord Protector";
-			else if (level >= 60)
-				return "Crusader";
-			else if (level >= 55)
-				return "Knight";
-			else if (level >= 51)
-				return "Cavalier";
-			else
-				return "Paladin";
-		case RANGER:
-			if (level >= 70)
-				return "Plainswalker";
-			else if (level >= 65)
-				return "Forest Stalker";
-			else if (level >= 60)
-				return "Warder";
-			else if (level >= 55)
-				return "Outrider";
-			else if (level >= 51)
-				return "Pathfinder";
-			else
-				return "Ranger";
-		case SHADOWKNIGHT:
-			if (level >= 70)
-				return "Scourge Knight";
-			else if (level >= 65)
-				return "Dread Lord";
-			else if (level >= 60)
-				return "Grave Lord";
-			else if (level >= 55)
-				return "Revenant";
-			else if (level >= 51)
-				return "Reaver";
-			else
-				return "Shadowknight";
-		case DRUID:
-			if (level >= 70)
-				return "Natureguard";
-			else if (level >= 65)
-				return "Storm Warden";
-			else if (level >= 60)
-				return "Hierophant";
-			else if (level >= 55)
-				return "Preserver";
-			else if (level >= 51)
-				return "Wanderer";
-			else
-				return "Druid";
-		case MONK:
-			if (level >= 70)
-				return "Stone Fist";
-			else if (level >= 65)
-				return "Transcendent";
-			else if (level >= 60)
-				return "Grandmaster";
-			else if (level >= 55)
-				return "Master";
-			else if (level >= 51)
-				return "Disciple";
-			else
-				return "Monk";
-		case BARD:
-			if (level >= 70)
-				return "Performer";
-			else if (level >= 65)
-				return "Maestro";
-			else if (level >= 60)
-				return "Virtuoso";
-			else if (level >= 55)
-				return "Troubadour";
-			else if (level >= 51)
-				return "Minstrel";
-			else
-				return "Bard";
-		case ROGUE:
-			if (level >= 70)
-				return "Nemesis";
-			else if (level >= 65)
-				return "Deceiver";
-			else if (level >= 60)
-				return "Assassin";
-			else if (level >= 55)
-				return "Blackguard";
-			else if (level >= 51)
-				return "Rake";
-			else
-				return "Rogue";
-		case SHAMAN:
-			if (level >= 70)
-				return "Soothsayer";
-			else if (level >= 65)
-				return "Prophet";
-			else if (level >= 60)
-				return "Oracle";
-			else if (level >= 55)
-				return "Luminary";
-			else if (level >= 51)
-				return "Mystic";
-			else
-				return "Shaman";
-		case NECROMANCER:
-			if (level >= 70)
-				return "Wraith";
-			else if (level >= 65)
-				return "Arch Lich";
-			else if (level >= 60)
-				return "Warlock";
-			else if (level >= 55)
-				return "Defiler";
-			else if (level >= 51)
-				return "Heretic";
-			else
-				return "Necromancer";
-		case WIZARD:
-			if (level >= 70)
-				return "Grand Arcanist";
-			else if (level >= 65)
-				return "Arcanist";
-			else if (level >= 60)
-				return "Sorcerer";
-			else if (level >= 55)
-				return "Evoker";
-			else if (level >= 51)
-				return "Channeler";
-			else
-				return "Wizard";
-		case MAGICIAN:
-			if (level >= 70)
-				return "Arch Magus";
-			else if (level >= 65)
-				return "Arch Convoker";
-			else if (level >= 60)
-				return "Arch Mage";
-			else if (level >= 55)
-				return "Conjurer";
-			if (level >= 51)
-				return "Elementalist";
-			else
-				return "Magician";
-		case ENCHANTER:
-			if (level >= 70)
-				return "Bedazzler";
-			else if (level >= 65)
-				return "Coercer";
-			else if (level >= 60)
-				return "Phantasmist";
-			else if (level >= 55)
-				return "Beguiler";
-			else if (level >= 51)
-				return "Illusionist";
-			else
-				return "Enchanter";
-		case BEASTLORD:
-			if (level >= 70)
-				return "Wildblood";
-			else if (level >= 65)
-				return "Feral Lord";
-			else if (level >= 60)
-				return "Savage Lord";
-			else if (level >= 55)
-				return "Animist";
-			else if (level >= 51)
-				return "Primalist";
-			else
-				return "Beastlord";
-		case BERSERKER:
-			if (level >= 70)
-				return "Ravager";
-			else if (level >= 65)
-				return "Fury";
-			else if (level >= 60)
-				return "Rager";
-			else if (level >= 55)
-				return "Vehement";
-			else if (level >= 51)
-				return "Brawler";
-			else
-				return "Berserker";
-		case BANKER:
-			if (level >= 70)
-				return "Master Banker";
-			else if (level >= 65)
-				return "Elder Banker";
-			else if (level >= 60)
-				return "Oldest Banker";
-			else if (level >= 55)
-				return "Older Banker";
-			else if (level >= 51)
-				return "Old Banker";
-			else
-				return "Banker";
-		case WARRIORGM:
-			return "Warrior Guildmaster";
-		case CLERICGM:
-			return "Cleric Guildmaster";
-		case PALADINGM:
-			return "Paladin Guildmaster";
-		case RANGERGM:
-			return "Ranger Guildmaster";
-		case SHADOWKNIGHTGM:
-			return "Shadowknight Guildmaster";
-		case DRUIDGM:
-			return "Druid Guildmaster";
-		case MONKGM:
-			return "Monk Guildmaster";
-		case BARDGM:
-			return "Bard Guildmaster";
-		case ROGUEGM:
-			return "Rogue Guildmaster";
-		case SHAMANGM:
-			return "Shaman Guildmaster";
-		case NECROMANCERGM:
-			return "Necromancer Guildmaster";
-		case WIZARDGM:
-			return "Wizard Guildmaster";
-		case MAGICIANGM:
-			return "Magician Guildmaster";
-		case ENCHANTERGM:
-			return "Enchanter Guildmaster";
-		case BEASTLORDGM:
-			return "Beastlord Guildmaster";
-		case BERSERKERGM:
-			return "Berserker Guildmaster";
-		case MERCHANT:
-			return "Merchant";
-		case ADVENTURERECRUITER:
-			return "Adventure Recruiter";
-		case ADVENTUREMERCHANT:
-			return "Adventure Merchant";
-		case CORPSE_CLASS:
-			return "Corpse Class";
-		case TRIBUTE_MASTER:
-			return "Tribute Master";
-		case GUILD_TRIBUTE_MASTER:
-			return "Guild Tribute Master";
-		default:
-			return "Unknown";
+const char* GetClassIDName(uint8 class_id, uint8 level)
+{
+	switch (class_id) {
+	case WARRIOR:
+		if (level >= 70)
+			return "Vanquisher";
+		else if (level >= 65)
+			return "Overlord"; //Baron-Sprite: LEAVE MY CLASSES ALONE.
+		else if (level >= 60)
+			return "Warlord";
+		else if (level >= 55)
+			return "Myrmidon";
+		else if (level >= 51)
+			return "Champion";
+		else
+			return "Warrior";
+	case CLERIC:
+		if (level >= 70)
+			return "Prelate";
+		else if (level >= 65)
+			return "Archon";
+		else if (level >= 60)
+			return "High Priest";
+		else if (level >= 55)
+			return "Templar";
+		else if (level >= 51)
+			return "Vicar";
+		else
+			return "Cleric";
+	case PALADIN:
+		if (level >= 70)
+			return "Lord";
+		else if (level >= 65)
+			return "Lord Protector";
+		else if (level >= 60)
+			return "Crusader";
+		else if (level >= 55)
+			return "Knight";
+		else if (level >= 51)
+			return "Cavalier";
+		else
+			return "Paladin";
+	case RANGER:
+		if (level >= 70)
+			return "Plainswalker";
+		else if (level >= 65)
+			return "Forest Stalker";
+		else if (level >= 60)
+			return "Warder";
+		else if (level >= 55)
+			return "Outrider";
+		else if (level >= 51)
+			return "Pathfinder";
+		else
+			return "Ranger";
+	case SHADOWKNIGHT:
+		if (level >= 70)
+			return "Scourge Knight";
+		else if (level >= 65)
+			return "Dread Lord";
+		else if (level >= 60)
+			return "Grave Lord";
+		else if (level >= 55)
+			return "Revenant";
+		else if (level >= 51)
+			return "Reaver";
+		else
+			return "Shadowknight";
+	case DRUID:
+		if (level >= 70)
+			return "Natureguard";
+		else if (level >= 65)
+			return "Storm Warden";
+		else if (level >= 60)
+			return "Hierophant";
+		else if (level >= 55)
+			return "Preserver";
+		else if (level >= 51)
+			return "Wanderer";
+		else
+			return "Druid";
+	case MONK:
+		if (level >= 70)
+			return "Stone Fist";
+		else if (level >= 65)
+			return "Transcendent";
+		else if (level >= 60)
+			return "Grandmaster";
+		else if (level >= 55)
+			return "Master";
+		else if (level >= 51)
+			return "Disciple";
+		else
+			return "Monk";
+	case BARD:
+		if (level >= 70)
+			return "Performer";
+		else if (level >= 65)
+			return "Maestro";
+		else if (level >= 60)
+			return "Virtuoso";
+		else if (level >= 55)
+			return "Troubadour";
+		else if (level >= 51)
+			return "Minstrel";
+		else
+			return "Bard";
+	case ROGUE:
+		if (level >= 70)
+			return "Nemesis";
+		else if (level >= 65)
+			return "Deceiver";
+		else if (level >= 60)
+			return "Assassin";
+		else if (level >= 55)
+			return "Blackguard";
+		else if (level >= 51)
+			return "Rake";
+		else
+			return "Rogue";
+	case SHAMAN:
+		if (level >= 70)
+			return "Soothsayer";
+		else if (level >= 65)
+			return "Prophet";
+		else if (level >= 60)
+			return "Oracle";
+		else if (level >= 55)
+			return "Luminary";
+		else if (level >= 51)
+			return "Mystic";
+		else
+			return "Shaman";
+	case NECROMANCER:
+		if (level >= 70)
+			return "Wraith";
+		else if (level >= 65)
+			return "Arch Lich";
+		else if (level >= 60)
+			return "Warlock";
+		else if (level >= 55)
+			return "Defiler";
+		else if (level >= 51)
+			return "Heretic";
+		else
+			return "Necromancer";
+	case WIZARD:
+		if (level >= 70)
+			return "Grand Arcanist";
+		else if (level >= 65)
+			return "Arcanist";
+		else if (level >= 60)
+			return "Sorcerer";
+		else if (level >= 55)
+			return "Evoker";
+		else if (level >= 51)
+			return "Channeler";
+		else
+			return "Wizard";
+	case MAGICIAN:
+		if (level >= 70)
+			return "Arch Magus";
+		else if (level >= 65)
+			return "Arch Convoker";
+		else if (level >= 60)
+			return "Arch Mage";
+		else if (level >= 55)
+			return "Conjurer";
+		if (level >= 51)
+			return "Elementalist";
+		else
+			return "Magician";
+	case ENCHANTER:
+		if (level >= 70)
+			return "Bedazzler";
+		else if (level >= 65)
+			return "Coercer";
+		else if (level >= 60)
+			return "Phantasmist";
+		else if (level >= 55)
+			return "Beguiler";
+		else if (level >= 51)
+			return "Illusionist";
+		else
+			return "Enchanter";
+	case BEASTLORD:
+		if (level >= 70)
+			return "Wildblood";
+		else if (level >= 65)
+			return "Feral Lord";
+		else if (level >= 60)
+			return "Savage Lord";
+		else if (level >= 55)
+			return "Animist";
+		else if (level >= 51)
+			return "Primalist";
+		else
+			return "Beastlord";
+	case BERSERKER:
+		if (level >= 70)
+			return "Ravager";
+		else if (level >= 65)
+			return "Fury";
+		else if (level >= 60)
+			return "Rager";
+		else if (level >= 55)
+			return "Vehement";
+		else if (level >= 51)
+			return "Brawler";
+		else
+			return "Berserker";
+	case BANKER:
+		if (level >= 70)
+			return "Master Banker";
+		else if (level >= 65)
+			return "Elder Banker";
+		else if (level >= 60)
+			return "Oldest Banker";
+		else if (level >= 55)
+			return "Older Banker";
+		else if (level >= 51)
+			return "Old Banker";
+		else
+			return "Banker";
+	case WARRIORGM:
+		return "Warrior Guildmaster";
+	case CLERICGM:
+		return "Cleric Guildmaster";
+	case PALADINGM:
+		return "Paladin Guildmaster";
+	case RANGERGM:
+		return "Ranger Guildmaster";
+	case SHADOWKNIGHTGM:
+		return "Shadowknight Guildmaster";
+	case DRUIDGM:
+		return "Druid Guildmaster";
+	case MONKGM:
+		return "Monk Guildmaster";
+	case BARDGM:
+		return "Bard Guildmaster";
+	case ROGUEGM:
+		return "Rogue Guildmaster";
+	case SHAMANGM:
+		return "Shaman Guildmaster";
+	case NECROMANCERGM:
+		return "Necromancer Guildmaster";
+	case WIZARDGM:
+		return "Wizard Guildmaster";
+	case MAGICIANGM:
+		return "Magician Guildmaster";
+	case ENCHANTERGM:
+		return "Enchanter Guildmaster";
+	case BEASTLORDGM:
+		return "Beastlord Guildmaster";
+	case BERSERKERGM:
+		return "Berserker Guildmaster";
+	case MERCHANT:
+		return "Merchant";
+	case ADVENTURERECRUITER:
+		return "Adventure Recruiter";
+	case ADVENTUREMERCHANT:
+		return "Adventure Merchant";
+	case CORPSE_CLASS:
+		return "Corpse Class";
+	case TRIBUTE_MASTER:
+		return "Tribute Master";
+	case GUILD_TRIBUTE_MASTER:
+		return "Guild Tribute Master";
+	default:
+		return "Unknown";
 	}
 }

+const char* GetPlayerClassName(uint32 player_class_value, uint8 level)
+{
+	return GetClassIDName(GetClassIDFromPlayerClassValue(player_class_value), level);
+}
+
+uint32 GetPlayerClassValue(uint8 class_id)
+{
+	switch (class_id) {
+	case WARRIOR:
+	case CLERIC:
+	case PALADIN:
+	case RANGER:
+	case SHADOWKNIGHT:
+	case DRUID:
+	case MONK:
+	case BARD:
+	case ROGUE:
+	case SHAMAN:
+	case NECROMANCER:
+	case WIZARD:
+	case MAGICIAN:
+	case ENCHANTER:
+	case BEASTLORD:
+	case BERSERKER:
+		return class_id;
+	default:
+		return PLAYER_CLASS_UNKNOWN; // watch
+	}
+}
+
+uint32 GetPlayerClassBit(uint8 class_id)
+{
+	switch (class_id) {
+	case WARRIOR:
+		return PLAYER_CLASS_WARRIOR_BIT;
+	case CLERIC:
+		return PLAYER_CLASS_CLERIC_BIT;
+	case PALADIN:
+		return PLAYER_CLASS_PALADIN_BIT;
+	case RANGER:
+		return PLAYER_CLASS_RANGER_BIT;
+	case SHADOWKNIGHT:
+		return PLAYER_CLASS_SHADOWKNIGHT_BIT;
+	case DRUID:
+		return PLAYER_CLASS_DRUID_BIT;
+	case MONK:
+		return PLAYER_CLASS_MONK_BIT;
+	case BARD:
+		return PLAYER_CLASS_BARD_BIT;
+	case ROGUE:
+		return PLAYER_CLASS_ROGUE_BIT;
+	case SHAMAN:
+		return PLAYER_CLASS_SHAMAN_BIT;
+	case NECROMANCER:
+		return PLAYER_CLASS_NECROMANCER_BIT;
+	case WIZARD:
+		return PLAYER_CLASS_WIZARD_BIT;
+	case MAGICIAN:
+		return PLAYER_CLASS_MAGICIAN_BIT;
+	case ENCHANTER:
+		return PLAYER_CLASS_ENCHANTER_BIT;
+	case BEASTLORD:
+		return PLAYER_CLASS_BEASTLORD_BIT;
+	case BERSERKER:
+		return PLAYER_CLASS_BERSERKER_BIT;
+	default:
+		return PLAYER_CLASS_UNKNOWN_BIT;
+	}
+}
+
+uint8 GetClassIDFromPlayerClassValue(uint32 player_class_value)
+{
+	switch (player_class_value) {
+	case PLAYER_CLASS_WARRIOR:
+	case PLAYER_CLASS_CLERIC:
+	case PLAYER_CLASS_PALADIN:
+	case PLAYER_CLASS_RANGER:
+	case PLAYER_CLASS_SHADOWKNIGHT:
+	case PLAYER_CLASS_DRUID:
+	case PLAYER_CLASS_MONK:
+	case PLAYER_CLASS_BARD:
+	case PLAYER_CLASS_ROGUE:
+	case PLAYER_CLASS_SHAMAN:
+	case PLAYER_CLASS_NECROMANCER:
+	case PLAYER_CLASS_WIZARD:
+	case PLAYER_CLASS_MAGICIAN:
+	case PLAYER_CLASS_ENCHANTER:
+	case PLAYER_CLASS_BEASTLORD:
+	case PLAYER_CLASS_BERSERKER:
+		return player_class_value;
+	default:
+		return PLAYER_CLASS_UNKNOWN; // watch
+	}
+}
+
+uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit)
+{
+	switch (player_class_bit) {
+	case PLAYER_CLASS_WARRIOR_BIT:
+		return WARRIOR;
+	case PLAYER_CLASS_CLERIC_BIT:
+		return CLERIC;
+	case PLAYER_CLASS_PALADIN_BIT:
+		return PALADIN;
+	case PLAYER_CLASS_RANGER_BIT:
+		return RANGER;
+	case PLAYER_CLASS_SHADOWKNIGHT_BIT:
+		return SHADOWKNIGHT;
+	case PLAYER_CLASS_DRUID_BIT:
+		return DRUID;
+	case PLAYER_CLASS_MONK_BIT:
+		return MONK;
+	case PLAYER_CLASS_BARD_BIT:
+		return BARD;
+	case PLAYER_CLASS_ROGUE_BIT:
+		return ROGUE;
+	case PLAYER_CLASS_SHAMAN_BIT:
+		return SHAMAN;
+	case PLAYER_CLASS_NECROMANCER_BIT:
+		return NECROMANCER;
+	case PLAYER_CLASS_WIZARD_BIT:
+		return WIZARD;
+	case PLAYER_CLASS_MAGICIAN_BIT:
+		return MAGICIAN;
+	case PLAYER_CLASS_ENCHANTER_BIT:
+		return ENCHANTER;
+	case PLAYER_CLASS_BEASTLORD_BIT:
+		return BEASTLORD;
+	case PLAYER_CLASS_BERSERKER_BIT:
+		return BERSERKER;
+	default:
+		return PLAYER_CLASS_UNKNOWN; // watch
+	}
+}
+
+bool IsFighterClass(uint8 class_id)
+{
+	switch (class_id) {
+	case WARRIOR:
+	case PALADIN:
+	case RANGER:
+	case SHADOWKNIGHT:
+	case MONK:
+	case BARD:
+	case ROGUE:
+	case BEASTLORD:
+	case BERSERKER:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsSpellFighterClass(uint8 class_id)
+{
+	switch (class_id) {
+	case PALADIN:
+	case RANGER:
+	case SHADOWKNIGHT:
+	case BEASTLORD:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsNonSpellFighterClass(uint8 class_id)
+{
+	switch (class_id) {
+	case WARRIOR:
+	case MONK:
+	case BARD:
+	case ROGUE:
+	case BERSERKER:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsCasterClass(uint8 class_id)
+{
+	switch (class_id) {
+	case CLERIC:
+	case DRUID:
+	case SHAMAN:
+	case NECROMANCER:
+	case WIZARD:
+	case MAGICIAN:
+	case ENCHANTER:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsINTCasterClass(uint8 class_id)
+{
+	switch (class_id) {
+	case NECROMANCER:
+	case WIZARD:
+	case MAGICIAN:
+	case ENCHANTER:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsWISCasterClass(uint8 class_id)
+{
+	switch (class_id) {
+	case CLERIC:
+	case DRUID:
+	case SHAMAN:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsPlateClass(uint8 class_id)
+{
+	switch (class_id) {
+	case WARRIOR:
+	case CLERIC:
+	case PALADIN:
+	case SHADOWKNIGHT:
+	case BARD:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsChainClass(uint8 class_id)
+{
+	switch (class_id) {
+	case RANGER:
+	case ROGUE:
+	case SHAMAN:
+	case BERSERKER:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsLeatherClass(uint8 class_id)
+{
+	switch (class_id) {
+	case DRUID:
+	case MONK:
+	case BEASTLORD:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool IsClothClass(uint8 class_id)
+{
+	switch (class_id) {
+	case NECROMANCER:
+	case WIZARD:
+	case MAGICIAN:
+	case ENCHANTER:
+		return true;
+	default:
+		return false;
+	}
+}
+
+uint8 ClassArmorType(uint8 class_id)
+{
+	switch (class_id) {
+	case WARRIOR:
+	case CLERIC:
+	case PALADIN:
+	case SHADOWKNIGHT:
+	case BARD:
+		return ARMOR_TYPE_PLATE;
+	case RANGER:
+	case ROGUE:
+	case SHAMAN:
+	case BERSERKER:
+		return ARMOR_TYPE_CHAIN;
+	case DRUID:
+	case MONK:
+	case BEASTLORD:
+		return ARMOR_TYPE_LEATHER;
+	case NECROMANCER:
+	case WIZARD:
+	case MAGICIAN:
+	case ENCHANTER:
+		return ARMOR_TYPE_CLOTH;
+	default:
+		return ARMOR_TYPE_UNKNOWN;
+	}
+}
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -17,26 +17,25 @@
 */
 #ifndef CLASSES_CH
 #define CLASSES_CH
+
 #include "../common/types.h"

-#define Array_Class_UNKNOWN 0
-#define WARRIOR			1
-#define CLERIC			2
-#define PALADIN			3
-#define RANGER			4
-#define SHADOWKNIGHT	5
-#define DRUID			6
-#define MONK			7
-#define BARD			8
-#define ROGUE			9
-#define SHAMAN			10
-#define NECROMANCER		11
-#define WIZARD			12
-#define MAGICIAN		13
-#define ENCHANTER		14
-#define BEASTLORD		15
-#define BERSERKER		16
-#define PLAYER_CLASS_COUNT	16 // used for array defines, must be the count of playable classes
+#define WARRIOR 1
+#define CLERIC 2
+#define PALADIN 3
+#define RANGER 4
+#define SHADOWKNIGHT 5
+#define DRUID 6
+#define MONK 7
+#define BARD 8
+#define ROGUE 9
+#define SHAMAN 10
+#define NECROMANCER 11
+#define WIZARD 12
+#define MAGICIAN 13
+#define ENCHANTER 14
+#define BEASTLORD 15
+#define BERSERKER 16
 #define WARRIORGM 20
 #define CLERICGM 21
 #define PALADINGM 22
@@ -58,33 +57,92 @@
 #define DISCORD_MERCHANT 59
 #define ADVENTURERECRUITER 60
 #define ADVENTUREMERCHANT 61
-#define LDON_TREASURE 62 //objects you can use /open on first seen in LDONs
-#define CORPSE_CLASS 62	//only seen on Danvi's Corpse in Akheva so far..
-#define TRIBUTE_MASTER	63
-#define GUILD_TRIBUTE_MASTER	64	//not sure
+#define LDON_TREASURE 62	// objects you can use /open on first seen in LDONs
+#define CORPSE_CLASS 62	// only seen on Danvi's Corpse in Akheva so far..
+#define TRIBUTE_MASTER 63
+#define GUILD_TRIBUTE_MASTER 64	// not sure
 #define NORRATHS_KEEPERS_MERCHANT 67
 #define DARK_REIGN_MERCHANT 68
 #define FELLOWSHIP_MASTER 69
 #define ALT_CURRENCY_MERCHANT 70
 #define MERCERNARY_MASTER 71
-#define warrior_1 1
-#define monk_1 64
-#define paladin_1 4
-#define shadow_1 16
-#define bard_1 128
-#define cleric_1 2
-#define necromancer_1 1024
-#define ranger_1 8
-#define druid_1 32
-#define mage_1 4096
-#define wizard_1 2048
-#define enchanter_1 8192
-#define rogue_1 256
-#define shaman_1 512
-#define beastlord_1 16384
-#define berserker_1 32768
-#define call_1 65536

-const char* GetEQClassName(uint8 class_, uint8 level = 0);
+
+// player class values
+#define PLAYER_CLASS_UNKNOWN 0
+#define PLAYER_CLASS_WARRIOR 1
+#define PLAYER_CLASS_CLERIC 2
+#define PLAYER_CLASS_PALADIN 3
+#define PLAYER_CLASS_RANGER 4
+#define PLAYER_CLASS_SHADOWKNIGHT 5
+#define PLAYER_CLASS_DRUID 6
+#define PLAYER_CLASS_MONK 7
+#define PLAYER_CLASS_BARD 8
+#define PLAYER_CLASS_ROGUE 9
+#define PLAYER_CLASS_SHAMAN 10
+#define PLAYER_CLASS_NECROMANCER 11
+#define PLAYER_CLASS_WIZARD 12
+#define PLAYER_CLASS_MAGICIAN 13
+#define PLAYER_CLASS_ENCHANTER 14
+#define PLAYER_CLASS_BEASTLORD 15
+#define PLAYER_CLASS_BERSERKER 16
+
+#define PLAYER_CLASS_COUNT 16
+
+
+// player class bits
+#define PLAYER_CLASS_UNKNOWN_BIT 0
+#define PLAYER_CLASS_WARRIOR_BIT 1
+#define PLAYER_CLASS_CLERIC_BIT 2
+#define PLAYER_CLASS_PALADIN_BIT 4
+#define PLAYER_CLASS_RANGER_BIT 8
+#define PLAYER_CLASS_SHADOWKNIGHT_BIT 16
+#define PLAYER_CLASS_DRUID_BIT 32
+#define PLAYER_CLASS_MONK_BIT 64
+#define PLAYER_CLASS_BARD_BIT 128
+#define PLAYER_CLASS_ROGUE_BIT 256
+#define PLAYER_CLASS_SHAMAN_BIT 512
+#define PLAYER_CLASS_NECROMANCER_BIT 1024
+#define PLAYER_CLASS_WIZARD_BIT 2048
+#define PLAYER_CLASS_MAGICIAN_BIT 4096
+#define PLAYER_CLASS_ENCHANTER_BIT 8192
+#define PLAYER_CLASS_BEASTLORD_BIT 16384
+#define PLAYER_CLASS_BERSERKER_BIT 32768
+
+#define PLAYER_CLASS_ALL_MASK 65535	// was 65536
+
+
+#define ARMOR_TYPE_UNKNOWN 0
+#define ARMOR_TYPE_CLOTH 1
+#define ARMOR_TYPE_LEATHER 2
+#define ARMOR_TYPE_CHAIN 3
+#define ARMOR_TYPE_PLATE 4
+
+#define ARMOR_TYPE_FIRST ARMOR_TYPE_UNKNOWN
+#define ARMOR_TYPE_LAST ARMOR_TYPE_PLATE
+#define ARMOR_TYPE_COUNT 5
+
+
+const char* GetClassIDName(uint8 class_id, uint8 level = 0);
+const char* GetPlayerClassName(uint32 player_class_value, uint8 level = 0);
+
+uint32 GetPlayerClassValue(uint8 class_id);
+uint32 GetPlayerClassBit(uint8 class_id);
+
+uint8 GetClassIDFromPlayerClassValue(uint32 player_class_value);
+uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit);
+
+bool IsFighterClass(uint8 class_id);
+bool IsSpellFighterClass(uint8 class_id);
+bool IsNonSpellFighterClass(uint8 class_id);
+bool IsCasterClass(uint8 class_id);
+bool IsINTCasterClass(uint8 class_id);
+bool IsWISCasterClass(uint8 class_id);
+
+bool IsPlateClass(uint8 class_id);
+bool IsChainClass(uint8 class_id);
+bool IsLeatherClass(uint8 class_id);
+bool IsClothClass(uint8 class_id);
+uint8 ClassArmorType(uint8 class_id);
+
 #endif
-
@@ -1,182 +0,0 @@
-/*
-EQEMu:  Everquest Server Emulator
-
-Copyright (C) 2001-2015 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef CLIENTVERSIONS_H
-#define CLIENTVERSIONS_H
-
-#include "types.h"
-
-static const uint32 BIT_Client62			= 0x00000001; // 1 (unsupported - placeholder for scripts)
-
-static const uint32 BIT_Titanium			= 0x00000002; // 2
-static const uint32 BIT_SoF					= 0x00000004; // 4
-static const uint32 BIT_SoD					= 0x00000008; // 8
-static const uint32 BIT_UF					= 0x00000010; // 16
-static const uint32 BIT_RoF					= 0x00000020; // 32
-static const uint32 BIT_RoF2				= 0x00000040; // 64
-
-static const uint32 BIT_TitaniumAndEarlier	= 0x00000003; // 3
-static const uint32 BIT_SoFAndEarlier		= 0x00000007; // 7
-static const uint32 BIT_SoDAndEarlier		= 0x0000000F; // 15
-static const uint32 BIT_UFAndEarlier		= 0x0000001F; // 31
-static const uint32 BIT_RoFAndEarlier		= 0x0000003F; // 63
-
-static const uint32 BIT_SoFAndLater			= 0xFFFFFFFC; // 4294967292
-static const uint32 BIT_SoDAndLater			= 0xFFFFFFF8; // 4294967288
-static const uint32 BIT_UFAndLater			= 0xFFFFFFF0; // 4294967280
-static const uint32 BIT_RoFAndLater			= 0xFFFFFFE0; // 4294967264
-static const uint32 BIT_RoF2AndLater		= 0xFFFFFFC0; // 4294967232
-
-static const uint32 BIT_AllClients			= 0xFFFFFFFF;
-
-enum class ClientVersion
-{
-	Unknown = 0,
-	Client62,	// Build: 'Aug  4 2005 15:40:59'
-	Titanium,	// Build: 'Oct 31 2005 10:33:37'
-	SoF,		// Build: 'Sep  7 2007 09:11:49'
-	SoD,		// Build: 'Dec 19 2008 15:22:49'
-	UF,			// Build: 'Jun  8 2010 16:44:32'
-	RoF,		// Build: 'Dec 10 2012 17:35:44'
-	RoF2,		// Build: 'May 10 2013 23:30:08'
-
-	MobNPC,
-	MobMerc,
-	MobBot,
-	MobPet,
-};
-
-#define CLIENT_VERSION_COUNT 12
-#define LAST_PC_CLIENT ClientVersion::RoF2
-#define LAST_NPC_CLIENT ClientVersion::MobPet
-
-
-static const char* ClientVersionName(ClientVersion version)
-{
-	switch (version)
-	{
-	case ClientVersion::Unknown:
-		return "Unknown";
-	case ClientVersion::Client62:
-		return "Client62";
-	case ClientVersion::Titanium:
-		return "Titanium";
-	case ClientVersion::SoF:
-		return "SoF";
-	case ClientVersion::SoD:
-		return "SoD";
-	case ClientVersion::UF:
-		return "UF";
-	case ClientVersion::RoF:
-		return "RoF";
-	case ClientVersion::RoF2:
-		return "RoF2";
-	case ClientVersion::MobNPC:
-		return "MobNPC";
-	case ClientVersion::MobMerc:
-		return "MobMerc";
-	case ClientVersion::MobBot:
-		return "MobBot";
-	case ClientVersion::MobPet:
-		return "MobPet";
-	default:
-		return "<ERROR> Invalid ClientVersion";
-	};
-}
-
-static uint32 ClientBitFromVersion(ClientVersion clientVersion)
-{
-	switch (clientVersion)
-	{
-	case ClientVersion::Unknown:
-	case ClientVersion::Client62:
-		return 0;
-	case ClientVersion::Titanium:
-	case ClientVersion::SoF:
-	case ClientVersion::SoD:
-	case ClientVersion::UF:
-	case ClientVersion::RoF:
-	case ClientVersion::RoF2:
-	case ClientVersion::MobNPC:
-	case ClientVersion::MobMerc:
-	case ClientVersion::MobBot:
-	case ClientVersion::MobPet:
-		return ((uint32)1 << (static_cast<unsigned int>(clientVersion) - 1));
-	default:
-		return 0;
-	}
-}
-
-static ClientVersion ClientVersionFromBit(uint32 clientVersionBit)
-{
-	switch (clientVersionBit)
-	{
-	case (uint32)static_cast<unsigned int>(ClientVersion::Unknown):
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::Client62) - 1)):
-		return ClientVersion::Unknown;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::Titanium) - 1)):
-		return ClientVersion::Titanium;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::SoF) - 1)):
-		return ClientVersion::SoF;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::SoD) - 1)):
-		return ClientVersion::SoD;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::UF) - 1)):
-		return ClientVersion::UF;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::RoF) - 1)):
-		return ClientVersion::RoF;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::RoF2) - 1)):
-		return ClientVersion::RoF2;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::MobNPC) - 1)):
-		return ClientVersion::MobNPC;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::MobMerc) - 1)):
-		return ClientVersion::MobMerc;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::MobBot) - 1)):
-		return ClientVersion::MobBot;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::MobPet) - 1)):
-		return ClientVersion::MobPet;
-	default:
-		return ClientVersion::Unknown;
-	}
-}
-
-static uint32 ExpansionFromClientVersion(ClientVersion clientVersion)
-{
-	switch(clientVersion)
-	{
-	case ClientVersion::Unknown:
-	case ClientVersion::Client62:
-	case ClientVersion::Titanium:
-		return 0x000007FFU;
-	case ClientVersion::SoF:
-		return 0x00007FFFU;
-	case ClientVersion::SoD:
-		return 0x0000FFFFU;
-	case ClientVersion::UF:
-		return 0x0001FFFFU;
-	case ClientVersion::RoF:
-	case ClientVersion::RoF2:
-		return 0x000FFFFFU;
-	default:
-		return 0;
-	}
-}
-
-#endif /* CLIENTVERSIONS_H */
@@ -1,5 +1,6 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -13,36 +14,42 @@

 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
 #ifndef COMMON_DATA_VERIFICATION_H
 #define COMMON_DATA_VERIFICATION_H

 #include <algorithm>

+
 namespace EQEmu
 {
+	template <typename T>
+	T Clamp(const T& value, const T& lower, const T& upper) {
+		return std::max(lower, std::min(value, upper));
+	}

-template <typename T>
-T Clamp(const T& value, const T& lower, const T& upper) {
-	return std::max(lower, std::min(value, upper));
-}
+	template <typename T>
+	T ClampLower(const T& value, const T& lower) {
+		return std::max(lower, value);
+	}

-template <typename T>
-T ClampLower(const T& value, const T& lower) {
-	return std::max(lower, value);
-}
+	template <typename T>
+	T ClampUpper(const T& value, const T& upper) {
+		return std::min(value, upper);
+	}

-template <typename T>
-T ClampUpper(const T& value, const T& upper) {
-	return std::min(value, upper);
-}
+	template <typename T>
+	bool ValueWithin(const T& value, const T& lower, const T& upper) {
+		return value >= lower && value <= upper;
+	}

-template <typename T>
-bool ValueWithin(const T& value, const T& lower, const T& upper) {
-	return value >= lower && value <= upper;
-}
+	template <typename T1, typename T2, typename T3>
+	bool ValueWithin(const T1& value, const T2& lower, const T3& upper) {
+		return value >= (T1)lower && value <= (T1)upper;
+	}

-}
+} /*EQEmu*/

-#endif
+#endif /*COMMON_DATA_VERIFICATION_H*/
@@ -23,6 +23,7 @@
 #include <iomanip>
 #include <iostream>
 #include <map>
+#include <algorithm>
 #include <mysqld_error.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +49,6 @@
 extern Client client;

 Database::Database () {
-	DBInitVars();
 }

 /*
@@ -57,7 +57,6 @@ Establish a connection to a mysql database with the supplied parameters

 Database::Database(const char* host, const char* user, const char* passwd, const char* database, uint32 port)
 {
-	DBInitVars();
 	Connect(host, user, passwd, database, port);
 }

@@ -74,25 +73,12 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 	}
 }

-void Database::DBInitVars() { 
-	varcache_array = 0;
-	varcache_max = 0;
-	varcache_lastupdate = 0;
-}
-
 /*
 	Close the connection to the database
 */

 Database::~Database()
 {
-	unsigned int x;
-	if (varcache_array) {
-		for (x=0; x<varcache_max; x++) {
-			safe_delete_array(varcache_array[x]);
-		}
-		safe_delete_array(varcache_array);
-	}
 }

 /*
@@ -313,11 +299,15 @@ bool Database::DeleteCharacter(char *name) {
 	std::string query = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", name);
 	auto results = QueryDatabase(query);
 	for (auto row = results.begin(); row != results.end(); ++row) { charid = atoi(row[0]); }
-	if (charid <= 0){ std::cerr << "Database::DeleteCharacter :: Character not found, stopping delete...\n"; return false; }
+	if (charid <= 0){ 
+		Log.Out(Logs::General, Logs::Error, "Database::DeleteCharacter :: Character (%s) not found, stopping delete...", name);
+		return false; 
+	}

 	query = StringFormat("DELETE FROM `quest_globals` WHERE `charid` = '%d'", charid); QueryDatabase(query);
 	query = StringFormat("DELETE FROM `character_activities` WHERE `charid` = '%d'", charid); QueryDatabase(query);
 	query = StringFormat("DELETE FROM `character_enabledtasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_tasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
 	query = StringFormat("DELETE FROM `completed_tasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
 	query = StringFormat("DELETE FROM `friends` WHERE `charid` = '%d'", charid); QueryDatabase(query);
 	query = StringFormat("DELETE FROM `mail` WHERE `charid` = '%d'", charid); QueryDatabase(query);
@@ -636,12 +626,25 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 	);
 	auto results = QueryDatabase(query);
 	/* Save Bind Points */
-	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
+	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
+		"(%u, %u, %u, %f, %f, %f, %f, %i), "
+		"(%u, %u, %u, %f, %f, %f, %f, %i), "
+		"(%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i)",
 		character_id, pp->binds[0].zoneId, 0, pp->binds[0].x, pp->binds[0].y, pp->binds[0].z, pp->binds[0].heading, 0,
-		character_id, pp->binds[4].zoneId, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading, 1
-	); results = QueryDatabase(query); 
+		character_id, pp->binds[1].zoneId, 0, pp->binds[1].x, pp->binds[1].y, pp->binds[1].z, pp->binds[1].heading, 1,
+		character_id, pp->binds[2].zoneId, 0, pp->binds[2].x, pp->binds[2].y, pp->binds[2].z, pp->binds[2].heading, 2,
+		character_id, pp->binds[3].zoneId, 0, pp->binds[3].x, pp->binds[3].y, pp->binds[3].z, pp->binds[3].heading, 3,
+		character_id, pp->binds[4].zoneId, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading, 4
+	); results = QueryDatabase(query);
+
+        /* HoTT Ability */
+        if(RuleB(Character, GrantHoTTOnCreate))
+        {
+                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, rank) VALUES (%u, %i, %i)", character_id, 14, 1);
+                results = QueryDatabase(query);
+        }

 	/* Save Skills */
 	int firstquery = 0;
@@ -677,7 +680,7 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 }

 /* This only for new Character creation storing */
-bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inventory* inv) {
+bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv) {
 	uint32 charid = 0; 
 	char zone[50]; 
 	float x, y, z; 
@@ -705,8 +708,8 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven

 	/* Insert starting inventory... */
 	std::string invquery;
-	for (int16 i=EmuConstants::EQUIPMENT_BEGIN; i<=EmuConstants::BANK_BAGS_END;) {
-		const ItemInst* newinv = inv->GetItem(i);
+	for (int16 i = EQEmu::legacy::EQUIPMENT_BEGIN; i <= EQEmu::legacy::BANK_BAGS_END;) {
+		const EQEmu::ItemInstance* newinv = inv->GetItem(i);
 		if (newinv) {
 			invquery = StringFormat("INSERT INTO `inventory` (charid, slotid, itemid, charges, color) VALUES (%u, %i, %u, %i, %u)",
 				charid, i, newinv->GetItem()->ID, newinv->GetCharges(), newinv->GetColor()); 
@@ -714,16 +717,16 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven
 			auto results = QueryDatabase(invquery); 
 		}

-		if (i == MainCursor) { 
-			i = EmuConstants::GENERAL_BAGS_BEGIN; 
+		if (i == EQEmu::inventory::slotCursor) {
+			i = EQEmu::legacy::GENERAL_BAGS_BEGIN; 
 			continue;
 		}
-		else if (i == EmuConstants::CURSOR_BAG_END) { 
-			i = EmuConstants::BANK_BEGIN; 
+		else if (i == EQEmu::legacy::CURSOR_BAG_END) { 
+			i = EQEmu::legacy::BANK_BEGIN; 
 			continue; 
 		}
-		else if (i == EmuConstants::BANK_END) { 
-			i = EmuConstants::BANK_BAGS_BEGIN; 
+		else if (i == EQEmu::legacy::BANK_END) { 
+			i = EQEmu::legacy::BANK_BAGS_BEGIN; 
 			continue; 
 		} 
 		i++;
@@ -836,7 +839,7 @@ void Database::GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID

 }

-void Database::GetCharName(uint32 char_id, char* name) { 
+void Database::GetCharName(uint32 char_id, char* name) {
 	std::string query = StringFormat("SELECT `name` FROM `character_data` WHERE id='%i'", char_id);
 	auto results = QueryDatabase(query);

@@ -851,145 +854,69 @@ void Database::GetCharName(uint32 char_id, char* name) {
 }

 bool Database::LoadVariables() {
-	char *query = nullptr;
-
-	auto results = QueryDatabase(query, LoadVariables_MQ(&query));
+	auto results = QueryDatabase(StringFormat("SELECT varname, value, unix_timestamp() FROM variables where unix_timestamp(ts) >= %d", varcache.last_update));

 	if (!results.Success())
-	{
-		safe_delete_array(query);
 		return false;
-	}
-
-	safe_delete_array(query);
-	return LoadVariables_result(std::move(results));
-}
-
-uint32 Database::LoadVariables_MQ(char** query)
-{
-	return MakeAnyLenString(query, "SELECT varname, value, unix_timestamp() FROM variables where unix_timestamp(ts) >= %d", varcache_lastupdate);
-}
-
-// always returns true? not sure about this.
-bool Database::LoadVariables_result(MySQLRequestResult results)
-{
-	uint32 i = 0;
-	LockMutex lock(&Mvarcache);

 	if (results.RowCount() == 0)
 		return true;

-	if (!varcache_array) {
-		varcache_max = results.RowCount();
-		varcache_array = new VarCache_Struct*[varcache_max];
-		for (i=0; i<varcache_max; i++)
-			varcache_array[i] = 0;
-	}
-	else {
-		uint32 tmpnewmax = varcache_max + results.RowCount();
-		VarCache_Struct** tmp = new VarCache_Struct*[tmpnewmax];
-		for (i=0; i<tmpnewmax; i++)
-			tmp[i] = 0;
-		for (i=0; i<varcache_max; i++)
-			tmp[i] = varcache_array[i];
-		VarCache_Struct** tmpdel = varcache_array;
-		varcache_array = tmp;
-		varcache_max = tmpnewmax;
-		delete [] tmpdel;
-	}
+	LockMutex lock(&Mvarcache);

-	for (auto row = results.begin(); row != results.end(); ++row)
-	{
-		varcache_lastupdate = atoi(row[2]);
-		for (i=0; i<varcache_max; i++) {
-			if (varcache_array[i]) {
-				if (strcasecmp(varcache_array[i]->varname, row[0]) == 0) {
-					delete varcache_array[i];
-					varcache_array[i] = (VarCache_Struct*) new uint8[sizeof(VarCache_Struct) + strlen(row[1]) + 1];
-					strn0cpy(varcache_array[i]->varname, row[0], sizeof(varcache_array[i]->varname));
-					strcpy(varcache_array[i]->value, row[1]);
-					break;
-				}
-			}
-			else {
-				varcache_array[i] = (VarCache_Struct*) new uint8[sizeof(VarCache_Struct) + strlen(row[1]) + 1];
-				strcpy(varcache_array[i]->varname, row[0]);
-				strcpy(varcache_array[i]->value, row[1]);
-				break;
-			}
-		}
+	std::string key, value;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		varcache.last_update = atoi(row[2]); // ahh should we be comparing if this is newer?
+		key = row[0];
+		value = row[1];
+		std::transform(std::begin(key), std::end(key), std::begin(key), ::tolower); // keys are lower case, DB doesn't have to be
+		varcache.Add(key, value);
 	}

-	uint32 max_used = 0;
-	for (i=0; i<varcache_max; i++) {
-		if (varcache_array[i]) {
-			if (i > max_used)
-				max_used = i;
-		}
-	}
-
-	varcache_max = max_used + 1;
-
 	return true;
 }

 // Gets variable from 'variables' table
-bool Database::GetVariable(const char* varname, char* varvalue, uint16 varvalue_len) {
-	varvalue[0] = '\0';
+bool Database::GetVariable(std::string varname, std::string &varvalue)
+{
+	varvalue.clear();

 	LockMutex lock(&Mvarcache);
-	if (strlen(varname) <= 1)
-		return false;
-	for (uint32 i=0; i<varcache_max; i++) {

-		if (varcache_array[i]) {
-			if (strcasecmp(varcache_array[i]->varname, varname) == 0) {
-				snprintf(varvalue, varvalue_len, "%s", varcache_array[i]->value);
-				varvalue[varvalue_len-1] = 0;
-				return true;
-			}
-		}
-		else
-			return false;
+	if (varname.empty())
+		return false;
+
+	std::transform(std::begin(varname), std::end(varname), std::begin(varname), ::tolower); // all keys are lower case
+	auto tmp = varcache.Get(varname);
+	if (tmp) {
+		varvalue = *tmp;
+		return true;
 	}
 	return false;
 }

-bool Database::SetVariable(const char* varname_in, const char* varvalue_in) {
-	
-	char *varname,*varvalue;
-
-	varname=(char *)malloc(strlen(varname_in)*2+1);
-	varvalue=(char *)malloc(strlen(varvalue_in)*2+1);
-	DoEscapeString(varname, varname_in, strlen(varname_in));
-	DoEscapeString(varvalue, varvalue_in, strlen(varvalue_in));
-
-	std::string query = StringFormat("Update variables set value='%s' WHERE varname like '%s'", varvalue, varname);
+bool Database::SetVariable(const std::string varname, const std::string &varvalue)
+{
+	std::string escaped_name = EscapeString(varname);
+	std::string escaped_value = EscapeString(varvalue);
+	std::string query = StringFormat("Update variables set value='%s' WHERE varname like '%s'", escaped_value.c_str(), escaped_name.c_str());
 	auto results = QueryDatabase(query);

 	if (!results.Success())
-	{
-		free(varname);
-		free(varvalue);
 		return false;
-	}

 	if (results.RowsAffected() == 1)
 	{
 		LoadVariables(); // refresh cache
-		free(varname);
-		free(varvalue);
 		return true;
 	}

-	query = StringFormat("Insert Into variables (varname, value) values ('%s', '%s')", varname, varvalue);
+	query = StringFormat("Insert Into variables (varname, value) values ('%s', '%s')", escaped_name.c_str(), escaped_value.c_str());
 	results = QueryDatabase(query);
-	free(varname);
-	free(varvalue);

 	if (results.RowsAffected() != 1)
 		return false;
-	
+
 	LoadVariables(); // refresh cache
 	return true;
 }
@@ -1555,8 +1482,9 @@ void Database::SetFirstLogon(uint32 CharID, uint8 firstlogon) {
 	QueryDatabase(query); 
 }

-void Database::AddReport(std::string who, std::string against, std::string lines) { 
-	char *escape_str = new char[lines.size()*2+1];
+void Database::AddReport(std::string who, std::string against, std::string lines)
+{
+	auto escape_str = new char[lines.size() * 2 + 1];
 	DoEscapeString(escape_str, lines.c_str(), lines.size());

 	std::string query = StringFormat("INSERT INTO reports (name, reported, reported_text) VALUES('%s', '%s', '%s')", EscapeString(who).c_str(), EscapeString(against).c_str(), escape_str);
@@ -2216,3 +2144,27 @@ bool Database::SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year
 	return results.Success();

 }
+
+int Database::GetIPExemption(std::string account_ip) {
+	std::string query = StringFormat("SELECT `exemption_amount` FROM `ip_exemptions` WHERE `exemption_ip` = '%s'", account_ip.c_str());
+	auto results = QueryDatabase(query);
+	
+	if (results.Success() && results.RowCount() > 0) {
+		auto row = results.begin();
+		return atoi(row[0]);
+	}
+	
+	return RuleI(World, MaxClientsPerIP);
+}
+
+int Database::GetInstanceID(uint32 char_id, uint32 zone_id) {
+	std::string query = StringFormat("SELECT instance_list.id FROM instance_list INNER JOIN instance_list_player ON instance_list.id = instance_list_player.id WHERE instance_list.zone = '%i' AND instance_list_player.charid = '%i'", zone_id, char_id);
+	auto results = QueryDatabase(query);
+
+	if (results.Success() && results.RowCount() > 0) {
+		auto row = results.begin();
+		return atoi(row[0]);;
+	}
+
+	return 0;
+}
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net)
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -37,10 +37,14 @@
 //atoi is not uint32 or uint32 safe!!!!
 #define atoul(str) strtoul(str, nullptr, 10)

-class Inventory;
 class MySQLRequestResult;
 class Client;

+namespace EQEmu
+{
+	class InventoryProfile;
+}
+
 struct EventLogDetails_Struct {
 	uint32	id;
 	char	accountname[64];
@@ -67,8 +71,14 @@ struct npcDecayTimes_Struct {


 struct VarCache_Struct {
-	char varname[26];	
-	char value[0];
+	std::map<std::string, std::string> m_cache;
+	uint32 last_update;
+	VarCache_Struct() : last_update(0) { }
+	void Add(const std::string &key, const std::string &value) { m_cache[key] = value; }
+	const std::string *Get(const std::string &key) {
+		auto it = m_cache.find(key);
+		return (it != m_cache.end() ? &it->second : nullptr);
+	}
 };

 class PTimerList;
@@ -88,7 +98,7 @@ class Database : public DBcore {
 public:
 	Database();
 	Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
-	bool Connect(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
+	bool Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port);
 	~Database();

 	/* Character Creation */
@@ -103,7 +113,7 @@ public:
 	bool	SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp);
 	bool	SetHackerFlag(const char* accountname, const char* charactername, const char* hacked);
 	bool	SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone);
-	bool	StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inventory* inv);
+	bool	StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv);
 	bool	UpdateName(const char* oldname, const char* newname);

 	/* General Information Queries */
@@ -180,6 +190,10 @@ public:

 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
 	void	SetAgreementFlag(uint32 acctid);
+	
+	int		GetIPExemption(std::string account_ip);
+
+	int		GetInstanceID(uint32 char_id, uint32 zone_id);


 	/* Groups */
@@ -215,11 +229,9 @@ public:

 	/* Database Variables */

-	bool	GetVariable(const char* varname, char* varvalue, uint16 varvalue_len);
-	bool	SetVariable(const char* varname, const char* varvalue);
+	bool	GetVariable(std::string varname, std::string &varvalue);
+	bool	SetVariable(const std::string varname, const std::string &varvalue);
 	bool	LoadVariables();
-	uint32	LoadVariables_MQ(char** query);
-	bool	LoadVariables_result(MySQLRequestResult results);

 	/* General Queries */

@@ -256,14 +268,10 @@ public:
 	void	LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);

 private:
-	void DBInitVars();
-
 	std::map<uint32,std::string>	zonename_array;

-	Mutex				Mvarcache;
-	uint32				varcache_max;
-	VarCache_Struct**	varcache_array;
-	uint32				varcache_lastupdate;
+	Mutex Mvarcache;
+	VarCache_Struct varcache;

 	/* Groups, utility methods. */
 	void    ClearAllGroupLeaders();
@@ -186,7 +186,7 @@ namespace Convert {
 		/*002*/	uint32 HP;
 		/*006*/	uint32 Mana;
 		/*010*/	Convert::SpellBuff_Struct Buffs[BUFF_COUNT];
-		/*510*/	uint32 Items[_MaterialCount];
+		/*510*/	uint32 Items[EQEmu::textures::materialCount];
 		/*546*/	char Name[64];
 		/*610*/
 	};
@@ -227,9 +227,9 @@ namespace Convert {
 		/*0304*/	uint8							ability_time_minutes;
 		/*0305*/	uint8							ability_time_hours;	//place holder
 		/*0306*/	uint8							unknown0306[6];		// @bp Spacer/Flag?
-		/*0312*/	uint32							item_material[_MaterialCount];	// Item texture/material of worn/held items
+		/*0312*/	uint32							item_material[EQEmu::textures::materialCount];	// Item texture/material of worn/held items
 		/*0348*/	uint8							unknown0348[44];
-		/*0392*/	Convert::Color_Struct			item_tint[_MaterialCount];
+		/*0392*/	Convert::Color_Struct			item_tint[EQEmu::textures::materialCount];
 		/*0428*/	Convert::AA_Array				aa_array[MAX_PP_AA_ARRAY];
 		/*2348*/	float							unknown2384;		//seen ~128, ~47
 		/*2352*/	char							servername[32];		// length probably not right
@@ -330,7 +330,7 @@ namespace Convert {
 		/*7212*/	uint32							tribute_points;
 		/*7216*/	uint32							unknown7252;
 		/*7220*/	uint32							tribute_active;		//1=active
-		/*7224*/	Convert::Tribute_Struct			tributes[EmuConstants::TRIBUTE_SIZE];
+		/*7224*/	Convert::Tribute_Struct			tributes[EQEmu::legacy::TRIBUTE_SIZE];
 		/*7264*/	Convert::Disciplines_Struct		disciplines;
 		/*7664*/	uint32							recastTimers[MAX_RECAST_TYPES];	// Timers (GMT of last use)
 		/*7744*/	char							unknown7780[160];
@@ -472,31 +472,18 @@ bool Database::CheckDatabaseConversions() {
 	CheckDatabaseConvertPPDeblob();
 	CheckDatabaseConvertCorpseDeblob();

-	/* Fetch Automatic Upgrade Script */
-	if (!std::ifstream("eqemu_update.pl")){
+	/* Fetch EQEmu Server script */
+	if (!std::ifstream("eqemu_server.pl")){
 		std::cout << "Pulling down automatic database upgrade script..." << std::endl;
 #ifdef _WIN32
-		system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_update.pl'); if ($response->is_success){ open(FILE, '> eqemu_update.pl'); print FILE $response->decoded_content; close(FILE); }\"");
+		system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\"");
 #else
-		system("wget --no-check-certificate -O eqemu_update.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_update.pl");
+		system("wget --no-check-certificate -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
 #endif
 	}

-	/*
-		Automatic (Database) Upgrade Script
-		Script: eqemu_update.pl V 1 - the number that world passes to the script will
-		force the script to check for a newer version to update itself with
-		eqemu_update.pl ran_from_world - won't bring up a menu if your database versions match
-		eqemu_update.pl - ran standalone will bring up a menu prompt
-	*/
-
-	/* Check for a new version of this script, the arg passed
-	would have to be higher than the copy they have downloaded
-	locally and they will re fetch */
-	system("perl eqemu_update.pl V 14"); 
-
-	/* Run Automatic Database Upgrade Script */
-	system("perl eqemu_update.pl ran_from_world");
+	/* Run EQEmu Server script (Checks for database updates) */
+	system("perl eqemu_server.pl ran_from_world");

 	return true;
 }
@@ -1416,7 +1403,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				if (rquery != ""){ results = QueryDatabase(rquery); }
 				/* Run Material Color Convert */
 				first_entry = 0; rquery = "";
-				for (i = 0; i < _MaterialCount; i++){
+				for (i = EQEmu::textures::textureBegin; i < EQEmu::textures::materialCount; i++){
 					if (pp->item_tint[i].color > 0){
 						if (first_entry != 1){
 							rquery = StringFormat("REPLACE INTO `character_material` (id, slot, blue, green, red, use_tint, color) VALUES (%u, %u, %u, %u, %u, %u, %u)", character_id, i, pp->item_tint[i].rgb.blue, pp->item_tint[i].rgb.green, pp->item_tint[i].rgb.red, pp->item_tint[i].rgb.use_tint, pp->item_tint[i].color);
@@ -1428,7 +1415,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				if (rquery != ""){ results = QueryDatabase(rquery); }
 				/* Run Tribute Convert */
 				first_entry = 0; rquery = "";
-				for (i = 0; i < EmuConstants::TRIBUTE_SIZE; i++){
+				for (i = 0; i < EQEmu::legacy::TRIBUTE_SIZE; i++){
 					if (pp->tributes[i].tribute > 0 && pp->tributes[i].tribute != 4294967295){
 						if (first_entry != 1){
 							rquery = StringFormat("REPLACE INTO `character_tribute` (id, tier, tribute) VALUES (%u, %u, %u)", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
@@ -98,14 +98,14 @@ MySQLRequestResult DBcore::QueryDatabase(const char* query, uint32 querylen, boo

 			pStatus = Error;

-			char *errorBuffer = new char[MYSQL_ERRMSG_SIZE];
+			auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];

 			snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));

 			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32)mysql_errno(&mysql), errorBuffer);
 		}

-		char *errorBuffer = new char[MYSQL_ERRMSG_SIZE];
+		auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
 		snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));

 		/* Implement Logging at the Root */
@@ -2,7 +2,7 @@
 #define DBCORE_H

 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif

@@ -0,0 +1,149 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "deity.h"
+
+
+EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
+{
+	switch (deity_type) {
+	case DeityBertoxxulous:
+		return bit_DeityBertoxxulous;
+	case DeityBrellSirilis:
+		return bit_DeityBrellSirilis;
+	case DeityCazicThule:
+		return bit_DeityCazicThule;
+	case DeityErollisiMarr:
+		return bit_DeityErollisiMarr;
+	case DeityBristlebane:
+		return bit_DeityBristlebane;
+	case DeityInnoruuk:
+		return bit_DeityInnoruuk;
+	case DeityKarana:
+		return bit_DeityKarana;
+	case DeityMithanielMarr:
+		return bit_DeityMithanielMarr;
+	case DeityPrexus:
+		return bit_DeityPrexus;
+	case DeityQuellious:
+		return bit_DeityQuellious;
+	case DeityRallosZek:
+		return bit_DeityRallosZek;
+	case DeityRodcetNife:
+		return bit_DeityRodcetNife;
+	case DeitySolusekRo:
+		return bit_DeitySolusekRo;
+	case DeityTheTribunal:
+		return bit_DeityTheTribunal;
+	case DeityTunare:
+		return bit_DeityTunare;
+	case DeityVeeshan:
+		return bit_DeityVeeshan;
+	case DeityAgnostic_LB:
+	case DeityAgnostic:
+		return bit_DeityAgnostic;
+	default:
+		return bit_DeityAll;
+	};
+}
+
+EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
+{
+	switch (deity_type_bit) {
+	case bit_DeityAgnostic:
+		return DeityAgnostic;
+	case bit_DeityBertoxxulous:
+		return DeityBertoxxulous;
+	case bit_DeityBrellSirilis:
+		return DeityBrellSirilis;
+	case bit_DeityCazicThule:
+		return DeityCazicThule;
+	case bit_DeityErollisiMarr:
+		return DeityErollisiMarr;
+	case bit_DeityBristlebane:
+		return DeityBristlebane;
+	case bit_DeityInnoruuk:
+		return DeityInnoruuk;
+	case bit_DeityKarana:
+		return DeityKarana;
+	case bit_DeityMithanielMarr:
+		return DeityMithanielMarr;
+	case bit_DeityPrexus:
+		return DeityPrexus;
+	case bit_DeityQuellious:
+		return DeityQuellious;
+	case bit_DeityRallosZek:
+		return DeityRallosZek;
+	case bit_DeityRodcetNife:
+		return DeityRodcetNife;
+	case bit_DeitySolusekRo:
+		return DeitySolusekRo;
+	case bit_DeityTheTribunal:
+		return DeityTheTribunal;
+	case bit_DeityTunare:
+		return DeityTunare;
+	case bit_DeityVeeshan:
+		return DeityVeeshan;
+	default:
+		return DeityUnknown;
+	};
+}
+
+const char* EQEmu::deity::DeityName(DeityType deity_type)
+{
+	switch (deity_type) {
+	case DeityBertoxxulous:
+		return "Bertoxxulous";
+	case DeityBrellSirilis:
+		return "Brell Serilis";
+	case DeityCazicThule:
+		return "Cazic-Thule";
+	case DeityErollisiMarr:
+		return "Erollisi Marr";
+	case DeityBristlebane:
+		return "Bristlebane";
+	case DeityInnoruuk:
+		return "Innoruuk";
+	case DeityKarana:
+		return "Karana";
+	case DeityMithanielMarr:
+		return "Mithaniel Marr";
+	case DeityPrexus:
+		return "Prexus";
+	case DeityQuellious:
+		return "Quellious";
+	case DeityRallosZek:
+		return "Rallos Zek";
+	case DeityRodcetNife:
+		return "Rodcet Nife";
+	case DeitySolusekRo:
+		return "Solusek Ro";
+	case DeityTheTribunal:
+		return "The Tribunal";
+	case DeityTunare:
+		return "Tunare";
+	case DeityVeeshan:
+		return "Veeshan";
+	case DeityAgnostic_LB:
+	case DeityAgnostic:
+		return "Agnostic";
+	default:
+		return "Unknown";
+	};
+}
@@ -1,5 +1,6 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -13,154 +14,67 @@

 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#ifndef DEITY_H
-#define DEITY_H
+
+#ifndef COMMON_DEITY_H
+#define COMMON_DEITY_H

 #include "types.h"
-#include <string>

-// NOTE: This code is not fully implemented since there are no references in the existing code

-/*
-**	Diety types
-**
-**	(ref: eqstr_us.txt)
-**
-**	(Another orphaned enumeration...)
-*/
-enum DeityTypes
+namespace EQEmu
 {
-/*----*/	DeityUnknown = 0,
-/*----*/	DeityAgnostic_LB = 140,
-/*3251*/	DeityBertoxxulous = 201,
-/*3262*/	DeityBrellSirilis,
-/*3253*/	DeityCazicThule,
-/*3256*/	DeityErollisiMarr,
-/*3252*/	DeityBristlebane,
-/*3254*/	DeityInnoruuk,
-/*3255*/	DeityKarana,
-/*3257*/	DeityMithanielMarr,
-/*3259*/	DeityPrexus,
-/*3260*/	DeityQuellious,
-/*3266*/	DeityRallosZek,
-/*3258*/	DeityRodcetNife,
-/*3261*/	DeitySolusekRo,
-/*3263*/	DeityTheTribunal,
-/*3264*/	DeityTunare,
-/*3265*/	DeityVeeshan,
-/*3250*/	DeityAgnostic = 396
-};
+	namespace deity {
+		enum DeityType {
+			DeityUnknown = 0,
+			DeityAgnostic_LB = 140,
+			DeityBertoxxulous = 201,
+			DeityBrellSirilis,
+			DeityCazicThule,
+			DeityErollisiMarr,
+			DeityBristlebane,
+			DeityInnoruuk,
+			DeityKarana,
+			DeityMithanielMarr,
+			DeityPrexus,
+			DeityQuellious,
+			DeityRallosZek,
+			DeityRodcetNife,
+			DeitySolusekRo,
+			DeityTheTribunal,
+			DeityTunare,
+			DeityVeeshan,
+			DeityAgnostic = 396
+		};

-/*
-**	Deity type bits
-**
-**	(New orphan, but make use of it!)
-*/
-enum DeityTypeBits : uint32
-{
-	BIT_DeityAll			= 0x00000000,
-	BIT_DeityAgnostic		= 0x00000001,
-	BIT_DeityBertoxxulous	= 0x00000002,
-	BIT_DeityBrellSirilis	= 0x00000004,
-	BIT_DeityCazicThule		= 0x00000008,
-	BIT_DeityErollisiMarr	= 0x00000010,
-	BIT_DeityBristlebane	= 0x00000020,
-	BIT_DeityInnoruuk		= 0x00000040,
-	BIT_DeityKarana			= 0x00000080,
-	BIT_DeityMithanielMarr	= 0x00000100,
-	BIT_DeityPrexus			= 0x00000200,
-	BIT_DeityQuellious		= 0x00000400,
-	BIT_DeityRallosZek		= 0x00000800,
-	BIT_DeityRodcetNife		= 0x00001000,
-	BIT_DeitySolusekRo		= 0x00002000,
-	BIT_DeityTheTribunal	= 0x00004000,
-	BIT_DeityTunare			= 0x00008000,
-	BIT_DeityVeeshan		= 0x00010000
-};
+		enum DeityTypeBit : uint32 {
+			bit_DeityAll = 0x00000000,
+			bit_DeityAgnostic = 0x00000001,
+			bit_DeityBertoxxulous = 0x00000002,
+			bit_DeityBrellSirilis = 0x00000004,
+			bit_DeityCazicThule = 0x00000008,
+			bit_DeityErollisiMarr = 0x00000010,
+			bit_DeityBristlebane = 0x00000020,
+			bit_DeityInnoruuk = 0x00000040,
+			bit_DeityKarana = 0x00000080,
+			bit_DeityMithanielMarr = 0x00000100,
+			bit_DeityPrexus = 0x00000200,
+			bit_DeityQuellious = 0x00000400,
+			bit_DeityRallosZek = 0x00000800,
+			bit_DeityRodcetNife = 0x00001000,
+			bit_DeitySolusekRo = 0x00002000,
+			bit_DeityTheTribunal = 0x00004000,
+			bit_DeityTunare = 0x00008000,
+			bit_DeityVeeshan = 0x00010000
+		};

-static DeityTypeBits ConvertDeityToBitDeity(DeityTypes deity)
-{
-	switch(deity)
-	{
-		case DeityBertoxxulous:		{ return BIT_DeityBertoxxulous; }
-		case DeityBrellSirilis:		{ return BIT_DeityBrellSirilis; }
-		case DeityCazicThule:		{ return BIT_DeityCazicThule; }
-		case DeityErollisiMarr:		{ return BIT_DeityErollisiMarr; }
-		case DeityBristlebane:		{ return BIT_DeityBristlebane; }
-		case DeityInnoruuk:			{ return BIT_DeityInnoruuk; }
-		case DeityKarana:			{ return BIT_DeityKarana; }
-		case DeityMithanielMarr:	{ return BIT_DeityMithanielMarr; }
-		case DeityPrexus:			{ return BIT_DeityPrexus; }
-		case DeityQuellious:		{ return BIT_DeityQuellious; }
-		case DeityRallosZek:		{ return BIT_DeityRallosZek; }
-		case DeityRodcetNife:		{ return BIT_DeityRodcetNife; }
-		case DeitySolusekRo:		{ return BIT_DeitySolusekRo; }
-		case DeityTheTribunal:		{ return BIT_DeityTheTribunal; }
-		case DeityTunare:			{ return BIT_DeityTunare; }
-		case DeityVeeshan:			{ return BIT_DeityVeeshan; }
-		case DeityAgnostic_LB:
-		case DeityAgnostic:			{ return BIT_DeityAgnostic; }
-		default: { break; }
-	};
+		extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
+		extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
+		extern const char* DeityName(DeityType deity_type);

-	return BIT_DeityAll;
-};
+	} /*deity*/

-static DeityTypes ConvertBitDeityToDeity(DeityTypeBits deity_bit)
-{
-	switch(deity_bit)
-	{
-		case BIT_DeityAgnostic:			{ return DeityAgnostic; }
-		case BIT_DeityBertoxxulous:		{ return DeityBertoxxulous; }
-		case BIT_DeityBrellSirilis:		{ return DeityBrellSirilis; }
-		case BIT_DeityCazicThule:		{ return DeityCazicThule; }
-		case BIT_DeityErollisiMarr:		{ return DeityErollisiMarr; }
-		case BIT_DeityBristlebane:		{ return DeityBristlebane; }
-		case BIT_DeityInnoruuk:			{ return DeityInnoruuk; }
-		case BIT_DeityKarana:			{ return DeityKarana; }
-		case BIT_DeityMithanielMarr:	{ return DeityMithanielMarr; }
-		case BIT_DeityPrexus:			{ return DeityPrexus; }
-		case BIT_DeityQuellious:		{ return DeityQuellious; }
-		case BIT_DeityRallosZek:		{ return DeityRallosZek; }
-		case BIT_DeityRodcetNife:		{ return DeityRodcetNife; }
-		case BIT_DeitySolusekRo:		{ return DeitySolusekRo; }
-		case BIT_DeityTheTribunal:		{ return DeityTheTribunal; }
-		case BIT_DeityTunare:			{ return DeityTunare; }
-		case BIT_DeityVeeshan:			{ return DeityVeeshan; }
-		default: { break; }
-	};
+} /*EQEmu*/

-	return DeityUnknown;
-};
-
-static std::string GetDeityName(DeityTypes deity)
-{
-	switch(deity)
-	{
-		case DeityBertoxxulous:		{ return "Bertoxxulous"; }
-		case DeityBrellSirilis:		{ return "Brell Serilis"; }
-		case DeityCazicThule:		{ return "Cazic-Thule"; }
-		case DeityErollisiMarr:		{ return "Erollisi Marr"; }
-		case DeityBristlebane:		{ return "Bristlebane"; }
-		case DeityInnoruuk:			{ return "Innoruuk"; }
-		case DeityKarana:			{ return "Karana"; }
-		case DeityMithanielMarr:	{ return "Mithaniel Marr"; }
-		case DeityPrexus:			{ return "Prexus"; }
-		case DeityQuellious:		{ return "Quellious"; }
-		case DeityRallosZek:		{ return "Rallos Zek"; }
-		case DeityRodcetNife:		{ return "Rodcet Nife"; }
-		case DeitySolusekRo:		{ return "Solusek Ro"; }
-		case DeityTheTribunal:		{ return "The Tribunal"; }
-		case DeityTunare:			{ return "Tunare"; }
-		case DeityVeeshan:			{ return "Veeshan"; }
-		case DeityAgnostic_LB:
-		case DeityAgnostic:			{ return "Agnostic"; }
-		default: { break; }
-	};
-
-	return "Unknown";
-};
-
-#endif
+#endif /* COMMON_DEITY_H */
@@ -0,0 +1,20 @@
+/*	EQEMu:  Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "emu_constants.h"
@@ -0,0 +1,158 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_EMU_CONSTANTS_H
+#define COMMON_EMU_CONSTANTS_H
+
+#include "eq_limits.h"
+#include "emu_legacy.h"
+#include "emu_versions.h"
+
+#include <string>
+
+
+namespace EQEmu
+{
+	namespace inventory {
+		//using namespace RoF2::invtype;
+		//using namespace RoF2::invslot;
+		//using namespace RoF2::invbag;
+		//using namespace RoF2::invaug;
+
+		enum : int16 { typeInvalid = -1, slotInvalid = -1, containerInvalid = -1, socketInvalid = -1 }; // temporary
+		enum : int16 { typeBegin = 0, slotBegin = 0, containerBegin = 0, socketBegin = 0 }; // temporary
+
+		enum PossessionsSlots : int16 { // temporary
+			slotCharm = 0,
+			slotEar1,
+			slotHead,
+			slotFace,
+			slotEar2,
+			slotNeck, // 5
+			slotShoulders,
+			slotArms,
+			slotBack,
+			slotWrist1,
+			slotWrist2, // 10
+			slotRange,
+			slotHands,
+			slotPrimary,
+			slotSecondary,
+			slotFinger1, // 15
+			slotFinger2,
+			slotChest,
+			slotLegs,
+			slotFeet,
+			slotWaist, // 20
+			slotPowerSource = 9999,
+			slotAmmo = 21,
+			slotGeneral1,
+			slotGeneral2,
+			slotGeneral3,
+			slotGeneral4, // 25
+			slotGeneral5,
+			slotGeneral6,
+			slotGeneral7,
+			slotGeneral8,
+			slotCursor, // 30
+			slotCount
+		};
+
+		enum InventoryTypes : int16 { // temporary
+			typePossessions = 0,
+			typeBank,
+			typeSharedBank,
+			typeTrade,
+			typeWorld,
+			typeLimbo, // 5
+			typeTribute,
+			typeTrophyTribute,
+			typeGuildTribute,
+			typeMerchant,
+			typeDeleted, // 10
+			typeCorpse,
+			typeBazaar,
+			typeInspect,
+			typeRealEstate,
+			typeViewMODPC, // 15
+			typeViewMODBank,
+			typeViewMODSharedBank,
+			typeViewMODLimbo,
+			typeAltStorage,
+			typeArchived, // 20
+			typeMail,
+			typeGuildTrophyTribute,
+			typeKrono,
+			typeOther,
+			typeCount
+		};
+
+		static int16 SlotCount(int16 type_index) { return 0; } // temporary
+
+		const int16 ContainerCount = 10; // temporary
+		const int16 SocketCount = 6; // temporary
+
+	} /*inventory*/
+
+	namespace constants {
+		const EQEmu::versions::ClientVersion CharacterCreationClient = EQEmu::versions::ClientVersion::RoF2;
+		const size_t CharacterCreationMax = RoF2::constants::CharacterCreationLimit;
+
+		const size_t SayLinkBodySize = RoF2::constants::SayLinkBodySize;
+
+		const int LongBuffs = RoF2::constants::LongBuffs;
+		const int ShortBuffs = RoF2::constants::ShortBuffs;
+		const int DiscBuffs = RoF2::constants::DiscBuffs;
+		const int TotalBuffs = RoF2::constants::TotalBuffs;
+		const int NPCBuffs = RoF2::constants::NPCBuffs;
+		const int PetBuffs = RoF2::constants::PetBuffs;
+		const int MercBuffs = RoF2::constants::MercBuffs;
+
+	} /*constants*/
+
+	enum class CastingSlot : uint32 {
+		Gem1       = 0,
+		Gem2       = 1,
+		Gem3       = 2,
+		Gem4       = 3,
+		Gem5       = 4,
+		Gem6       = 5,
+		Gem7       = 6,
+		Gem8       = 7,
+		Gem9       = 8,
+		Gem10      = 9,
+		Gem11      = 10,
+		Gem12      = 11,
+		MaxGems    = 12,
+		Ability    = 20, // HT/LoH for Tit
+		PotionBelt = 21, // Tit uses a different slot for PB
+		Item       = 22,
+		Discipline = 23,
+		AltAbility = 0xFF
+	};
+
+} /*EQEmu*/
+
+#endif /*COMMON_EMU_CONSTANTS_H*/
+
+/*	hack list to prevent circular references
+	
+	eq_limits.h:EQEmu::inventory::LookupEntry::InventoryTypeSize[n];
+
+*/
@@ -0,0 +1,20 @@
+/*	EQEMu:  Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "emu_legacy.h"
@@ -0,0 +1,182 @@
+/*	EQEMu:  Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_EMU_LEGACY_H
+#define COMMON_EMU_LEGACY_H
+
+#include "types.h"
+
+#include <stdlib.h>
+
+
+namespace EQEmu
+{
+	// this is for perl and other legacy systems
+	namespace legacy {
+		enum InventorySlot {
+			SLOT_CHARM = 0,
+			SLOT_EAR01 = 1,
+			SLOT_HEAD = 2,
+			SLOT_FACE = 3,
+			SLOT_EAR02 = 4,
+			SLOT_NECK = 5,
+			SLOT_SHOULDER = 6,
+			SLOT_ARMS = 7,
+			SLOT_BACK = 8,
+			SLOT_BRACER01 = 9,
+			SLOT_BRACER02 = 10,
+			SLOT_RANGE = 11,
+			SLOT_HANDS = 12,
+			SLOT_PRIMARY = 13,
+			SLOT_SECONDARY = 14,
+			SLOT_RING01 = 15,
+			SLOT_RING02 = 16,
+			SLOT_CHEST = 17,
+			SLOT_LEGS = 18,
+			SLOT_FEET = 19,
+			SLOT_WAIST = 20,
+			SLOT_POWER_SOURCE = 9999,
+			SLOT_AMMO = 21,
+			SLOT_GENERAL_1 = 22,
+			SLOT_GENERAL_2 = 23,
+			SLOT_GENERAL_3 = 24,
+			SLOT_GENERAL_4 = 25,
+			SLOT_GENERAL_5 = 26,
+			SLOT_GENERAL_6 = 27,
+			SLOT_GENERAL_7 = 28,
+			SLOT_GENERAL_8 = 29,
+			SLOT_CURSOR = 30,
+			SLOT_CURSOR_END = (int16)0xFFFE, // I hope no one is using this...
+			SLOT_TRADESKILL = 1000,
+			SLOT_AUGMENT = 1001,
+			SLOT_INVALID = (int16)0xFFFF,
+			SLOT_POSSESSIONS_BEGIN = 0,
+			SLOT_POSSESSIONS_END = 30,
+			SLOT_EQUIPMENT_BEGIN = 0,
+			SLOT_EQUIPMENT_END = 21,
+			SLOT_PERSONAL_BEGIN = 22,
+			SLOT_PERSONAL_END = 29,
+			SLOT_PERSONAL_BAGS_BEGIN = 251,
+			SLOT_PERSONAL_BAGS_END = 330,
+			SLOT_CURSOR_BAG_BEGIN = 331,
+			SLOT_CURSOR_BAG_END = 340,
+			SLOT_TRIBUTE_BEGIN = 400,
+			SLOT_TRIBUTE_END = 404,
+			SLOT_BANK_BEGIN = 2000,
+			SLOT_BANK_END = 2023,
+			SLOT_BANK_BAGS_BEGIN = 2031,
+			SLOT_BANK_BAGS_END = 2270,
+			SLOT_SHARED_BANK_BEGIN = 2500,
+			SLOT_SHARED_BANK_END = 2501,
+			SLOT_SHARED_BANK_BAGS_BEGIN = 2531,
+			SLOT_SHARED_BANK_BAGS_END = 2550,
+			SLOT_TRADE_BEGIN = 3000,
+			SLOT_TRADE_END = 3007,
+			SLOT_TRADE_BAGS_BEGIN = 3031,
+			SLOT_TRADE_BAGS_END = 3110,
+			SLOT_WORLD_BEGIN = 4000,
+			SLOT_WORLD_END = 4009
+		};
+
+		// these are currently hard-coded for existing inventory system..do not use in place of special client version handlers until ready
+		static const uint16	TYPE_POSSESSIONS_SIZE = 31;
+		static const uint16 TYPE_BANK_SIZE = 24;
+		static const uint16 TYPE_SHARED_BANK_SIZE = 2;
+		static const uint16 TYPE_TRADE_SIZE = 8;
+		static const uint16 TYPE_WORLD_SIZE = 10;
+		static const uint16 TYPE_LIMBO_SIZE = 36;
+		static const uint16 TYPE_TRIBUTE_SIZE = 5; // (need client values)
+		static const uint16 TYPE_TROPHY_TRIBUTE_SIZE = 0;
+		static const uint16 TYPE_GUILD_TRIBUTE_SIZE = 0;
+		static const uint16 TYPE_MERCHANT_SIZE = 0;
+		static const uint16 TYPE_DELETED_SIZE = 0;
+		static const uint16 TYPE_CORPSE_SIZE = 31; // no bitmask use..limits to size of client corpse window (see EQLimits::InventoryMapSize(MapCorpse, <EQClientVersion))
+		static const uint16 TYPE_BAZAAR_SIZE = 80;
+		static const uint16 TYPE_INSPECT_SIZE = 22;
+		static const uint16 TYPE_REAL_ESTATE_SIZE = 0;
+		static const uint16 TYPE_VIEW_MOD_PC_SIZE = 0;
+		static const uint16 TYPE_VIEW_MOD_BANK_SIZE = 0;
+		static const uint16 TYPE_VIEW_MOD_SHARED_BANK_SIZE = 0;
+		static const uint16 TYPE_VIEW_MOD_LIMBO_SIZE = 0;
+		static const uint16 TYPE_ALT_STORAGE_SIZE = 0;
+		static const uint16 TYPE_ARCHIVED_SIZE = 0;
+		static const uint16 TYPE_MAIL_SIZE = 0;
+		static const uint16 TYPE_GUILD_TROPHY_TRIBUTE_SIZE = 0;
+		static const uint16 TYPE_KRONO_SIZE = 0;
+		static const uint16 TYPE_OTHER_SIZE = 0;
+
+		// most of these definitions will go away with the structure-based system..this maintains compatibility for now
+		// (these are mainly to assign specific values to constants used in conversions and to identify per-client ranges/offsets)
+		static const int16 EQUIPMENT_BEGIN = 0;
+		static const int16 EQUIPMENT_END = 21;
+		static const uint16 EQUIPMENT_SIZE = 22; // does not account for 'Power Source' - used mainly for npc equipment arrays
+
+		static const int16 GENERAL_BEGIN = 22;
+		static const int16 GENERAL_END = 29;
+		static const uint16 GENERAL_SIZE = 8;
+		static const int16 GENERAL_BAGS_BEGIN = 251;
+		static const int16 GENERAL_BAGS_END_OFFSET = 79;
+		static const int16 GENERAL_BAGS_END = GENERAL_BAGS_BEGIN + GENERAL_BAGS_END_OFFSET;
+
+		static const int16 CURSOR_BAG_BEGIN = 331;
+		static const int16 CURSOR_BAG_END_OFFSET = 9;
+		static const int16 CURSOR_BAG_END = CURSOR_BAG_BEGIN + CURSOR_BAG_END_OFFSET;
+
+		static const int16 BANK_BEGIN = 2000;
+		static const int16 BANK_END = 2023;
+		static const int16 BANK_BAGS_BEGIN = 2031;
+		static const int16 BANK_BAGS_END_OFFSET = 239;
+		static const int16 BANK_BAGS_END = BANK_BAGS_BEGIN + BANK_BAGS_END_OFFSET;
+
+		static const int16 SHARED_BANK_BEGIN = 2500;
+		static const int16 SHARED_BANK_END = 2501;
+		static const int16 SHARED_BANK_BAGS_BEGIN = 2531;
+		static const int16 SHARED_BANK_BAGS_END_OFFSET = 19;
+		static const int16 SHARED_BANK_BAGS_END = SHARED_BANK_BAGS_BEGIN + SHARED_BANK_BAGS_END_OFFSET;
+
+		static const int16 TRADE_BEGIN = 3000;
+		static const int16 TRADE_END = 3007;
+		static const int16 TRADE_NPC_END = 3003;
+		static const int16 TRADE_BAGS_BEGIN = 3031;
+		static const int16 TRADE_BAGS_END_OFFSET = 79;
+		static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET;
+
+		static const int16 WORLD_BEGIN = 4000;
+		static const int16 WORLD_END = 4009;
+		static const int16 WORLD_SIZE = TYPE_WORLD_SIZE;
+
+		static const int16 TRIBUTE_BEGIN = 400;
+		static const int16 TRIBUTE_END = 404;
+		static const int16 TRIBUTE_SIZE = TYPE_TRIBUTE_SIZE;
+
+		static const int16 CORPSE_BEGIN = 22;
+
+		// BANDOLIERS_SIZE sets maximum limit..active limit will need to be handled by the appropriate AA or spell (or item?)
+		static const size_t BANDOLIERS_SIZE = 20;		// number of bandolier instances
+		static const size_t BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
+
+		// POTION_BELT_SIZE sets maximum limit..active limit will need to be handled by the appropriate AA or spell (or item?)
+		static const size_t POTION_BELT_ITEM_COUNT = 5;
+
+		static const size_t TEXT_LINK_BODY_LENGTH = 56;
+	}
+
+}
+
+#endif /* COMMON_EMU_LEGACY_H */
@@ -0,0 +1,18 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
@@ -0,0 +1,104 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_EMU_LIMITS_H
+#define COMMON_EMU_LIMITS_H
+
+#include "types.h"
+
+#include <stdlib.h>
+
+
+namespace EntityLimits
+{
+	namespace NPC {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*NPC*/
+
+	namespace NPCMerchant {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*NPCMerchant*/
+
+	namespace Merc {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*Merc*/
+
+	namespace Bot {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 8;
+
+	} /*Bot*/
+
+	namespace ClientPet {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*Pet*/
+
+	namespace NPCPet {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*Pet*/
+
+	namespace MercPet {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*Pet*/
+
+	namespace BotPet {
+		enum : int { Invalid = -1, Null, Safety };
+
+		enum : bool { False = false, True = true };
+
+		const size_t InvTypeTradeSize = 4;
+
+	} /*Pet*/
+
+}; /*EntityLimits*/
+
+#endif /*COMMON_EMU_LIMITS_H*/
@@ -25,6 +25,9 @@ N(OP_AdventureRequest),
 N(OP_AdventureStatsReply),
 N(OP_AdventureStatsRequest),
 N(OP_AdventureUpdate),
+N(OP_AggroMeterLockTarget),
+N(OP_AggroMeterTargetInfo),
+N(OP_AggroMeterUpdate),
 N(OP_AltCurrency),
 N(OP_AltCurrencyMerchantReply),
 N(OP_AltCurrencyMerchantRequest),
@@ -64,6 +67,7 @@ N(OP_BuffRemoveRequest),
 N(OP_Bug),
 N(OP_CameraEffect),
 N(OP_Camp),
+N(OP_CancelSneakHide),
 N(OP_CancelTask),
 N(OP_CancelTrade),
 N(OP_CastSpell),
@@ -164,6 +168,7 @@ N(OP_FinishTrade),
 N(OP_FinishWindow),
 N(OP_FinishWindow2),
 N(OP_Fishing),
+N(OP_Fling),
 N(OP_FloatListThing),
 N(OP_Forage),
 N(OP_ForceFindPerson),
@@ -287,6 +292,7 @@ N(OP_LFGuild),
 N(OP_LFPCommand),
 N(OP_LFPGetMatchesRequest),
 N(OP_LFPGetMatchesResponse),
+N(OP_LinkedReuse),
 N(OP_LoadSpellSet),
 N(OP_LocInfo),
 N(OP_LockoutTimerInfo),
@@ -456,21 +456,21 @@ void EmuTCPConnection::SendNetErrorPacket(const char* reason) {
 			std::cout << reason;
 		std::cout << "': " << inet_ntoa(in) << ":" << GetPort() << std::endl;
 	#endif
-	ServerPacket* pack = new ServerPacket(0);
-	pack->size = 1;
-	if (reason)
-		pack->size += strlen(reason) + 1;
-	pack->pBuffer = new uchar[pack->size];
-	memset(pack->pBuffer, 0, pack->size);
-	pack->pBuffer[0] = 255;
-	strcpy((char*) &pack->pBuffer[1], reason);
-	SendPacket(pack);
-	safe_delete(pack);
+		auto pack = new ServerPacket(0);
+		pack->size = 1;
+		if (reason)
+			pack->size += strlen(reason) + 1;
+		pack->pBuffer = new uchar[pack->size];
+		memset(pack->pBuffer, 0, pack->size);
+		pack->pBuffer[0] = 255;
+		strcpy((char *)&pack->pBuffer[1], reason);
+		SendPacket(pack);
+		safe_delete(pack);
 }

 void EmuTCPConnection::RemoveRelay(EmuTCPConnection* relay, bool iSendRelayDisconnect) {
 	if (iSendRelayDisconnect) {
-		ServerPacket* pack = new ServerPacket(0, 5);
+		auto pack = new ServerPacket(0, 5);
 		pack->pBuffer[0] = 3;
 		*((uint32*) &pack->pBuffer[1]) = relay->GetRemoteID();
 		SendPacket(pack);
@@ -609,7 +609,7 @@ bool EmuTCPConnection::ProcessReceivedDataAsPackets(char* errbuf) {
 		if (base >= recvbuf_used) {
 			safe_delete_array(recvbuf);
 		} else {
-			uchar* tmpbuf = new uchar[recvbuf_size - base];
+			auto tmpbuf = new uchar[recvbuf_size - base];
 			memcpy(tmpbuf, &recvbuf[base], recvbuf_used - base);
 			safe_delete_array(recvbuf);
 			recvbuf = tmpbuf;
@@ -683,7 +683,7 @@ bool EmuTCPConnection::ProcessReceivedDataAsOldPackets(char* errbuf) {
 			safe_delete_array(recvbuf);
 		}
 		else {
-			uchar* tmpbuf = new uchar[recvbuf_size - base];
+			auto tmpbuf = new uchar[recvbuf_size - base];
 			memcpy(tmpbuf, &recvbuf[base], recvbuf_used - base);
 			safe_delete_array(recvbuf);
 			recvbuf = tmpbuf;
@@ -739,7 +739,8 @@ void EmuTCPConnection::ProcessNetworkLayerPacket(ServerPacket* pack) {
 				SendNetErrorPacket("New RelayClient: illegal on outgoing connection");
 				break;
 			}
-			EmuTCPConnection* con = new EmuTCPConnection(Server->GetNextID(), Server, this, *((uint32*) data), *((uint32*) &data[4]), *((uint16*) &data[8]));
+			auto con = new EmuTCPConnection(Server->GetNextID(), Server, this, *((uint32 *)data),
+							*((uint32 *)&data[4]), *((uint16 *)&data[8]));
 			Server->AddConnection(con);
 			RelayCount++;
 			break;
@@ -787,7 +788,7 @@ bool EmuTCPConnection::SendData(bool &sent_something, char* errbuf) {
 	if(sent_something)
 		keepalive_timer.Start();
 	else if (TCPMode == modePacket && keepalive_timer.Check()) {
-		ServerPacket* pack = new ServerPacket(0, 0);
+		auto pack = new ServerPacket(0, 0);
 		SendPacket(pack);
 		safe_delete(pack);
 		#if TCPN_DEBUG >= 5
@@ -24,7 +24,7 @@ void EmuTCPServer::Process() {

 void EmuTCPServer::CreateNewConnection(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort)
 {
-	EmuTCPConnection *conn = new EmuTCPConnection(ID, this, in_socket, irIP, irPort, pOldFormat);
+	auto conn = new EmuTCPConnection(ID, this, in_socket, irIP, irPort, pOldFormat);
 	AddConnection(conn);
 }

@@ -0,0 +1,370 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "emu_versions.h"
+
+
+bool EQEmu::versions::IsValidClientVersion(ClientVersion client_version)
+{
+	if (client_version <= ClientVersion::Unknown || client_version > LastClientVersion)
+		return false;
+
+	return true;
+}
+
+EQEmu::versions::ClientVersion EQEmu::versions::ValidateClientVersion(ClientVersion client_version)
+{
+	if (client_version <= ClientVersion::Unknown || client_version > LastClientVersion)
+		return ClientVersion::Unknown;
+
+	return client_version;
+}
+
+const char* EQEmu::versions::ClientVersionName(ClientVersion client_version)
+{
+	switch (client_version) {
+	case ClientVersion::Unknown:
+		return "Unknown Version";
+	case ClientVersion::Client62:
+		return "Client 6.2";
+	case ClientVersion::Titanium:
+		return "Titanium";
+	case ClientVersion::SoF:
+		return "SoF";
+	case ClientVersion::SoD:
+		return "SoD";
+	case ClientVersion::UF:
+		return "UF";
+	case ClientVersion::RoF:
+		return "RoF";
+	case ClientVersion::RoF2:
+		return "RoF2";
+	default:
+		return "Invalid Version";
+	};
+}
+
+uint32 EQEmu::versions::ConvertClientVersionToClientVersionBit(ClientVersion client_version)
+{
+	switch (client_version) {
+	case ClientVersion::Unknown:
+	case ClientVersion::Client62:
+		return bit_Unknown;
+	case ClientVersion::Titanium:
+		return bit_Titanium;
+	case ClientVersion::SoF:
+		return bit_SoF;
+	case ClientVersion::SoD:
+		return bit_SoD;
+	case ClientVersion::UF:
+		return bit_UF;
+	case ClientVersion::RoF:
+		return bit_RoF;
+	case ClientVersion::RoF2:
+		return bit_RoF2;
+	default:
+		return bit_Unknown;
+	}
+}
+
+EQEmu::versions::ClientVersion EQEmu::versions::ConvertClientVersionBitToClientVersion(uint32 client_version_bit)
+{
+	switch (client_version_bit) {
+	case (uint32)static_cast<unsigned int>(ClientVersion::Unknown) :
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::Client62) - 1)) :
+		return ClientVersion::Unknown;
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::Titanium) - 1)) :
+		return ClientVersion::Titanium;
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::SoF) - 1)) :
+		return ClientVersion::SoF;
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::SoD) - 1)) :
+		return ClientVersion::SoD;
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::UF) - 1)) :
+		return ClientVersion::UF;
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::RoF) - 1)) :
+		return ClientVersion::RoF;
+	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::RoF2) - 1)) :
+		return ClientVersion::RoF2;
+	default:
+		return ClientVersion::Unknown;
+	}
+}
+
+uint32 EQEmu::versions::ConvertClientVersionToExpansion(ClientVersion client_version)
+{
+	switch (client_version) {
+	case ClientVersion::Unknown:
+	case ClientVersion::Client62:
+	case ClientVersion::Titanium:
+		return 0x000007FFU;
+	case ClientVersion::SoF:
+		return 0x00007FFFU;
+	case ClientVersion::SoD:
+		return 0x0000FFFFU;
+	case ClientVersion::UF:
+		return 0x0001FFFFU;
+	case ClientVersion::RoF:
+	case ClientVersion::RoF2:
+		return 0x000FFFFFU;
+	default:
+		return 0;
+	}
+}
+
+bool EQEmu::versions::IsValidMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= MobVersion::Unknown || mob_version > LastMobVersion)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::versions::IsValidPCMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= MobVersion::Unknown || mob_version > LastPCMobVersion)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::versions::IsValidNonPCMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= LastPCMobVersion || mob_version > LastNonPCMobVersion)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::versions::IsValidOfflinePCMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= LastNonPCMobVersion || mob_version > LastOfflinePCMobVersion)
+		return false;
+
+	return true;
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ValidateMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= MobVersion::Unknown || mob_version > LastMobVersion)
+		return MobVersion::Unknown;
+
+	return mob_version;
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ValidatePCMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= MobVersion::Unknown || mob_version > LastPCMobVersion)
+		return MobVersion::Unknown;
+
+	return mob_version;
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ValidateNonPCMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= LastPCMobVersion || mob_version > LastNonPCMobVersion)
+		return MobVersion::Unknown;
+
+	return mob_version;
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ValidateOfflinePCMobVersion(MobVersion mob_version)
+{
+	if (mob_version <= LastNonPCMobVersion || mob_version > LastOfflinePCMobVersion)
+		return MobVersion::Unknown;
+
+	return mob_version;
+}
+
+const char* EQEmu::versions::MobVersionName(MobVersion mob_version)
+{
+	switch (mob_version) {
+	case MobVersion::Unknown:
+		return "Unknown Version";
+	case MobVersion::Client62:
+		return "Client 6.2";
+	case MobVersion::Titanium:
+		return "Titanium";
+	case MobVersion::SoF:
+		return "SoF";
+	case MobVersion::SoD:
+		return "SoD";
+	case MobVersion::UF:
+		return "UF";
+	case MobVersion::RoF:
+		return "RoF";
+	case MobVersion::RoF2:
+		return "RoF2";
+	case MobVersion::NPC:
+		return "NPC";
+	case MobVersion::NPCMerchant:
+		return "NPC Merchant";
+	case MobVersion::Merc:
+		return "Merc";
+	case MobVersion::Bot:
+		return "Bot";
+	case MobVersion::ClientPet:
+		return "Client Pet";
+	case MobVersion::NPCPet:
+		return "NPC Pet";
+	case MobVersion::MercPet:
+		return "Merc Pet";
+	case MobVersion::BotPet:
+		return "Bot Pet";
+	case MobVersion::OfflineTitanium:
+		return "Offline Titanium";
+	case MobVersion::OfflineSoF:
+		return "Offline SoF";
+	case MobVersion::OfflineSoD:
+		return "Offline SoD";
+	case MobVersion::OfflineUF:
+		return "Offline UF";
+	case MobVersion::OfflineRoF:
+		return "Offline RoF";
+	case MobVersion::OfflineRoF2:
+		return "Offline RoF2";
+	default:
+		return "Invalid Version";
+	};
+}
+
+EQEmu::versions::ClientVersion EQEmu::versions::ConvertMobVersionToClientVersion(MobVersion mob_version)
+{
+	switch (mob_version) {
+	case MobVersion::Unknown:
+	case MobVersion::Client62:
+		return ClientVersion::Unknown;
+	case MobVersion::Titanium:
+		return ClientVersion::Titanium;
+	case MobVersion::SoF:
+		return ClientVersion::SoF;
+	case MobVersion::SoD:
+		return ClientVersion::SoD;
+	case MobVersion::UF:
+		return ClientVersion::UF;
+	case MobVersion::RoF:
+		return ClientVersion::RoF;
+	case MobVersion::RoF2:
+		return ClientVersion::RoF2;
+	default:
+		return ClientVersion::Unknown;
+	}
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToMobVersion(ClientVersion client_version)
+{
+	switch (client_version) {
+	case ClientVersion::Unknown:
+	case ClientVersion::Client62:
+		return MobVersion::Unknown;
+	case ClientVersion::Titanium:
+		return MobVersion::Titanium;
+	case ClientVersion::SoF:
+		return MobVersion::SoF;
+	case ClientVersion::SoD:
+		return MobVersion::SoD;
+	case ClientVersion::UF:
+		return MobVersion::UF;
+	case ClientVersion::RoF:
+		return MobVersion::RoF;
+	case ClientVersion::RoF2:
+		return MobVersion::RoF2;
+	default:
+		return MobVersion::Unknown;
+	}
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ConvertPCMobVersionToOfflinePCMobVersion(MobVersion mob_version)
+{
+	switch (mob_version) {
+	case MobVersion::Titanium:
+		return MobVersion::OfflineTitanium;
+	case MobVersion::SoF:
+		return MobVersion::OfflineSoF;
+	case MobVersion::SoD:
+		return MobVersion::OfflineSoD;
+	case MobVersion::UF:
+		return MobVersion::OfflineUF;
+	case MobVersion::RoF:
+		return MobVersion::OfflineRoF;
+	case MobVersion::RoF2:
+		return MobVersion::OfflineRoF2;
+	default:
+		return MobVersion::Unknown;
+	}
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ConvertOfflinePCMobVersionToPCMobVersion(MobVersion mob_version)
+{
+	switch (mob_version) {
+	case MobVersion::OfflineTitanium:
+		return MobVersion::Titanium;
+	case MobVersion::OfflineSoF:
+		return MobVersion::SoF;
+	case MobVersion::OfflineSoD:
+		return MobVersion::SoD;
+	case MobVersion::OfflineUF:
+		return MobVersion::UF;
+	case MobVersion::OfflineRoF:
+		return MobVersion::RoF;
+	case MobVersion::OfflineRoF2:
+		return MobVersion::RoF2;
+	default:
+		return MobVersion::Unknown;
+	}
+}
+
+EQEmu::versions::ClientVersion EQEmu::versions::ConvertOfflinePCMobVersionToClientVersion(MobVersion mob_version)
+{
+	switch (mob_version) {
+	case MobVersion::OfflineTitanium:
+		return ClientVersion::Titanium;
+	case MobVersion::OfflineSoF:
+		return ClientVersion::SoF;
+	case MobVersion::OfflineSoD:
+		return ClientVersion::SoD;
+	case MobVersion::OfflineUF:
+		return ClientVersion::UF;
+	case MobVersion::OfflineRoF:
+		return ClientVersion::RoF;
+	case MobVersion::OfflineRoF2:
+		return ClientVersion::RoF2;
+	default:
+		return ClientVersion::Unknown;
+	}
+}
+
+EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToOfflinePCMobVersion(ClientVersion client_version)
+{
+	switch (client_version) {
+	case ClientVersion::Titanium:
+		return MobVersion::OfflineTitanium;
+	case ClientVersion::SoF:
+		return MobVersion::OfflineSoF;
+	case ClientVersion::SoD:
+		return MobVersion::OfflineSoD;
+	case ClientVersion::UF:
+		return MobVersion::OfflineUF;
+	case ClientVersion::RoF:
+		return MobVersion::OfflineRoF;
+	case ClientVersion::RoF2:
+		return MobVersion::OfflineRoF2;
+	default:
+		return MobVersion::Unknown;
+	}
+}
@@ -0,0 +1,128 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_EMU_VERSIONS_H
+#define COMMON_EMU_VERSIONS_H
+
+#include "types.h"
+
+#include <stdlib.h>
+
+
+namespace EQEmu
+{
+	namespace versions {
+		enum class ClientVersion {
+			Unknown = 0,
+			Client62,	// Build: 'Aug  4 2005 15:40:59'
+			Titanium,	// Build: 'Oct 31 2005 10:33:37'
+			SoF,		// Build: 'Sep  7 2007 09:11:49'
+			SoD,		// Build: 'Dec 19 2008 15:22:49'
+			UF,			// Build: 'Jun  8 2010 16:44:32'
+			RoF,		// Build: 'Dec 10 2012 17:35:44'
+			RoF2		// Build: 'May 10 2013 23:30:08'
+		};
+
+		enum ClientVersionBit : uint32 {
+			bit_Unknown = 0,
+			bit_Client62 = 0x00000001, // unsupported (placeholder for scripts)
+			bit_Titanium = 0x00000002,
+			bit_SoF = 0x00000004,
+			bit_SoD = 0x00000008,
+			bit_UF = 0x00000010,
+			bit_RoF = 0x00000020,
+			bit_RoF2 = 0x00000040,
+			bit_TitaniumAndEarlier = 0x00000003,
+			bit_SoFAndEarlier = 0x00000007,
+			bit_SoDAndEarlier = 0x0000000F,
+			bit_UFAndEarlier = 0x0000001F,
+			bit_RoFAndEarlier = 0x0000003F,
+			bit_SoFAndLater = 0xFFFFFFFC,
+			bit_SoDAndLater = 0xFFFFFFF8,
+			bit_UFAndLater = 0xFFFFFFF0,
+			bit_RoFAndLater = 0xFFFFFFE0,
+			bit_RoF2AndLater = 0xFFFFFFC0,
+			bit_AllClients = 0xFFFFFFFF
+		};
+
+		const ClientVersion LastClientVersion = ClientVersion::RoF2;
+		const size_t ClientVersionCount = (static_cast<size_t>(LastClientVersion) + 1);
+
+		bool IsValidClientVersion(ClientVersion client_version);
+		ClientVersion ValidateClientVersion(ClientVersion client_version);
+		const char* ClientVersionName(ClientVersion client_version);
+		uint32 ConvertClientVersionToClientVersionBit(ClientVersion client_version);
+		ClientVersion ConvertClientVersionBitToClientVersion(uint32 client_version_bit);
+		uint32 ConvertClientVersionToExpansion(ClientVersion client_version);
+
+
+		enum class MobVersion {
+			Unknown = 0,
+			Client62,
+			Titanium,
+			SoF,
+			SoD,
+			UF,
+			RoF,
+			RoF2,
+			NPC,
+			NPCMerchant,
+			Merc,
+			Bot,
+			ClientPet,
+			NPCPet,
+			MercPet,
+			BotPet,
+			OfflineTitanium,
+			OfflineSoF,
+			OfflineSoD,
+			OfflineUF,
+			OfflineRoF,
+			OfflineRoF2
+		};
+
+		const MobVersion LastMobVersion = MobVersion::OfflineRoF2;
+		const MobVersion LastPCMobVersion = MobVersion::RoF2;
+		const MobVersion LastNonPCMobVersion = MobVersion::BotPet;
+		const MobVersion LastOfflinePCMobVersion = MobVersion::OfflineRoF2;
+		const size_t MobVersionCount = (static_cast<size_t>(LastMobVersion) + 1);
+
+		bool IsValidMobVersion(MobVersion mob_version);
+		bool IsValidPCMobVersion(MobVersion mob_version);
+		bool IsValidNonPCMobVersion(MobVersion mob_version);
+		bool IsValidOfflinePCMobVersion(MobVersion mob_version);
+
+		MobVersion ValidateMobVersion(MobVersion mob_version);
+		MobVersion ValidatePCMobVersion(MobVersion mob_version);
+		MobVersion ValidateNonPCMobVersion(MobVersion mob_version);
+		MobVersion ValidateOfflinePCMobVersion(MobVersion mob_version);
+
+		const char* MobVersionName(MobVersion mob_version);
+		ClientVersion ConvertMobVersionToClientVersion(MobVersion mob_version);
+		MobVersion ConvertClientVersionToMobVersion(ClientVersion client_version);
+		MobVersion ConvertPCMobVersionToOfflinePCMobVersion(MobVersion mob_version);
+		MobVersion ConvertOfflinePCMobVersionToPCMobVersion(MobVersion mob_version);
+		ClientVersion ConvertOfflinePCMobVersionToClientVersion(MobVersion mob_version);
+		MobVersion ConvertClientVersionToOfflinePCMobVersion(ClientVersion client_version);
+
+	} /*versions*/
+
+} /*EQEmu*/
+
+#endif /*COMMON_EMU_VERSIONS_H*/
@@ -1,5 +1,6 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -13,407 +14,57 @@

 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#ifndef EQ_CONSTANTS_H
-#define EQ_CONSTANTS_H
+
+#ifndef COMMON_EQ_CONSTANTS_H
+#define COMMON_EQ_CONSTANTS_H

 #include "skills.h"
 #include "types.h"

-/*
-** Light Types
-**
-*/
-enum LightTypes
-{
-	lightTypeNone = 0,
-	lightTypeCandle,
-	lightTypeTorch,
-	lightTypeTinyGlowingSkull,
-	lightTypeSmallLantern,
-	lightTypeSteinOfMoggok,
-	lightTypeLargeLantern,
-	lightTypeFlamelessLantern,
-	lightTypeGlobeOfStars,
-	lightTypeLightGlobe,
-	lightTypeLightstone,
-	lightTypeGreaterLightstone,
-	lightTypeFireBeetleEye,
-	lightTypeColdlight,
-	lightTypeUnknown1,
-	lightTypeUnknown2
-};

-#define LIGHT_TYPES_COUNT 16
+//SpawnAppearance types: (compared two clients for server-originating types: SoF & RoF2)
+#define AT_Die 0			// this causes the client to keel over and zone to bind point (default action)
+#define AT_WhoLevel 1		// the level that shows up on /who
+//#define AT_2 2			// unknown
+#define AT_Invis 3			// 0 = visible, 1 = invisible
+#define AT_PVP 4			// 0 = blue, 1 = pvp (red)
+#define AT_Light 5			// light type emitted by player (lightstone, shiny shield)
+#define AT_Anim 14			// 100=standing, 110=sitting, 111=ducking, 115=feigned, 105=looting
+#define AT_Sneak 15			// 0 = normal, 1 = sneaking
+#define AT_SpawnID 16		// server to client, sets player spawn id
+#define AT_HP 17			// Client->Server, my HP has changed (like regen tic)
+#define AT_Linkdead 18		// 0 = normal, 1 = linkdead
+#define AT_Levitate 19		// 0=off, 1=flymode, 2=levitate
+#define AT_GM 20			// 0 = normal, 1 = GM - all odd numbers seem to make it GM
+#define AT_Anon 21			// 0 = normal, 1 = anon, 2 = roleplay
+#define AT_GuildID 22
+#define AT_GuildRank 23		// 0=member, 1=officer, 2=leader
+#define AT_AFK 24			// 0 = normal, 1 = afk
+#define AT_Pet 25			// Param is EntityID of owner, or 0 for when charm breaks
+//#define AT_27 27			// unknown
+#define AT_Split 28			// 0 = normal, 1 = autosplit on (not showing in SoF+) (client-to-server only)
+#define AT_Size 29			// spawn's size (present: SoF, absent: RoF2)
+//#define AT_30 30			// unknown
+#define AT_NPCName 31		// change PC's name's color to NPC color 0 = normal, 1 = npc name
+//#define AT_32 32			// unknown
+//#define AT_33 33			// unknown
+//#define AT_34 34			// unknown (present: SoF, absent: RoF2)
+//#define AT_35 35			// unknown
+//#define AT_36 36			// unknown
+//#define AT_37 37			// unknown
+//#define AT_38 38			// unknown
+//#define AT_39 39			// unknown
+#define AT_ShowHelm 43		// 0 = hide graphic, 1 = show graphic
+#define AT_DamageState 44	// The damage state of a destructible object (0 through 4)
+//#define AT_46 46			// unknown
+//#define AT_48 48			// unknown
+//#define AT_49 49			// unknown
+//#define AT_52 52			// (absent: SoF, present: RoF2) (not a replacement for RoF absent 29 or 34)
+//#define AT_53 53			// (absent: SoF, present: RoF2) (not a replacement for RoF absent 29 or 34)

-/*
-** Light Levels
-**
-*/
-enum LightLevels
-{
-	lightLevelUnlit = 0,
-	lightLevelCandle,
-	lightLevelTorch,
-	lightLevelSmallMagic,
-	lightLevelRedLight,
-	lightLevelBlueLight,
-	lightLevelSmallLantern,
-	lightLevelMagicLantern,
-	lightLevelLargeLantern,
-	lightLevelLargeMagic,
-	lightLevelBrilliant
-};
-
-#define LIGHT_LEVELS_COUNT 11
-
-/*
-**	Item attributes
-**
-**	(There are no grepwin hits other than these declarations... Do they have a use?)
-*/
-enum ItemAttributes : uint32
-{
-	ItemAttrNone			= 0x00000000,
-	ItemAttrLore			= 0x00000001,
-	ItemAttrArtifact		= 0x00000002,
-	ItemAttrSummoned		= 0x00000004,
-	ItemAttrMagic			= 0x00000008,
-	ItemAttrAugment			= 0x00000010,
-	ItemAttrPendingLore		= 0x00000020,
-	ItemAttrUnknown			= 0xFFFFFFFF
-};
-
-/*
-**	Item class types
-**
-*/
-enum ItemClassTypes
-{
-	ItemClassCommon = 0,
-	ItemClassContainer,
-	ItemClassBook,
-	_ItemClassCount
-};
-
-/*
-**	Item use types
-**
-**	(ref: database and eqstr_us.txt)
-**
-**	(Looking at a recent database, it's possible that some of the item values may be off [10-27-2013])
-*/
-enum ItemUseTypes : uint8
-{
-/*9138*/	ItemType1HSlash = 0,
-/*9141*/	ItemType2HSlash,
-/*9140*/	ItemType1HPiercing,
-/*9139*/	ItemType1HBlunt,
-/*9142*/	ItemType2HBlunt,
-/*5504*/	ItemTypeBow,
-/*----*/	ItemTypeUnknown1,
-/*----*/	ItemTypeLargeThrowing,
-/*5505*/	ItemTypeShield,
-/*5506*/	ItemTypeScroll,
-/*5507*/	ItemTypeArmor,
-/*5508*/	ItemTypeMisc,			// a lot of random crap has this item use.
-/*7564*/	ItemTypeLockPick,
-/*----*/	ItemTypeUnknown2,
-/*5509*/	ItemTypeFood,
-/*5510*/	ItemTypeDrink,
-/*5511*/	ItemTypeLight,
-/*5512*/	ItemTypeCombinable,		// not all stackable items are this use...
-/*5513*/	ItemTypeBandage,
-/*----*/	ItemTypeSmallThrowing,
-/*----*/	ItemTypeSpell,			// spells and tomes
-/*5514*/	ItemTypePotion,
-/*----*/	ItemTypeUnknown3,
-/*0406*/	ItemTypeWindInstrument,
-/*0407*/	ItemTypeStringedInstrument,
-/*0408*/	ItemTypeBrassInstrument,
-/*0405*/	ItemTypePercussionInstrument,
-/*5515*/	ItemTypeArrow,
-/*----*/	ItemTypeUnknown4,
-/*5521*/	ItemTypeJewelry,
-/*----*/	ItemTypeSkull,
-/*5516*/	ItemTypeBook,			// skill-up tomes/books? (would probably need a pp flag if true...)
-/*5517*/	ItemTypeNote,
-/*5518*/	ItemTypeKey,
-/*----*/	ItemTypeCoin,
-/*5520*/	ItemType2HPiercing,
-/*----*/	ItemTypeFishingPole,
-/*----*/	ItemTypeFishingBait,
-/*5519*/	ItemTypeAlcohol,
-/*----*/	ItemTypeKey2,			// keys and satchels?? (questable keys?)
-/*----*/	ItemTypeCompass,
-/*----*/	ItemTypeUnknown5,
-/*----*/	ItemTypePoison,			// might be wrong, but includes poisons
-/*----*/	ItemTypeUnknown6,
-/*----*/	ItemTypeUnknown7,
-/*5522*/	ItemTypeMartial,
-/*----*/	ItemTypeUnknown8,
-/*----*/	ItemTypeUnknown9,
-/*----*/	ItemTypeUnknown10,
-/*----*/	ItemTypeUnknown11,
-/*----*/	ItemTypeSinging,
-/*5750*/	ItemTypeAllInstrumentTypes,
-/*5776*/	ItemTypeCharm,
-/*----*/	ItemTypeDye,
-/*----*/	ItemTypeAugmentation,
-/*----*/	ItemTypeAugmentationSolvent,
-/*----*/	ItemTypeAugmentationDistiller,
-/*----*/	ItemTypeUnknown12,
-/*----*/	ItemTypeFellowshipKit,
-/*----*/	ItemTypeUnknown13,
-/*----*/	ItemTypeRecipe,
-/*----*/	ItemTypeAdvancedRecipe,
-/*----*/	ItemTypeJournal,		// only one(1) database entry
-/*----*/	ItemTypeAltCurrency,	// alt-currency (as opposed to coinage)
-/*5881*/	ItemTypePerfectedAugmentationDistiller,
-/*----*/	_ItemTypeCount
-
-/*
-	Unknowns:
-
-	Mounts?
-	Ornamentations?
-	GuildBanners?
-	Collectible? 
-	Placeable?
-	(others?)
-*/
-};
-
-/*
-**	Augmentation use type bitmasks (1-based)
-**
-**	(ref: dbstr_us.txt)
-**
-*/
-enum AugmentationUseTypeBitmasks : uint32 {
-	AugUseNone					= 0x00000000,
-	AugUseGeneralSingleStat		= 0x00000001,	/*1^16^1 (General: Single Stat)^0*/
-	AugUseGeneralMultipleStat	= 0x00000002,	/*2^16^2 (General: Multiple Stat)^0*/
-	AugUseGeneralSpellEffect	= 0x00000004,	/*3^16^3 (General: Spell Effect)^0*/
-	AugUseWeaponGeneral			= 0x00000008,	/*4^16^4 (Weapon: General)^0*/
-	AugUseWeaponElemDamage		= 0x00000010,	/*5^16^5 (Weapon: Elem Damage)^0*/
-	AugUseWeaponBaseDamage		= 0x00000020,	/*6^16^6 (Weapon: Base Damage)^0*/
-	AugUseGeneralGroup			= 0x00000040,	/*7^16^7 (General: Group)^0*/
-	AugUseGeneralRaid			= 0x00000080,	/*8^16^8 (General: Raid)^0*/
-	AugUseGeneralDragonsPoints	= 0x00000100,	/*9^16^9 (General: Dragons Points)^0*/
-	AugUseCraftedCommon			= 0x00000200,	/*10^16^10 (Crafted: Common)^0*/
-	AugUseCraftedGroup1			= 0x00000400,	/*11^16^11 (Crafted: Group)^0*/
-	AugUseCraftedRaid1			= 0x00000800,	/*12^16^12 (Crafted: Raid)^0*/
-	AugUseEnergeiacGroup		= 0x00001000,	/*13^16^13 (Energeiac: Group)^0*/
-	AugUseEnergeiacRaid			= 0x00002000,	/*14^16^14 (Energeiac: Raid)^0*/
-	AugUseEmblem				= 0x00004000,	/*15^16^15 (Emblem)^0*/
-	AugUseCraftedGroup2			= 0x00008000,	/*16^16^16 (Crafted: Group)^0*/
-	AugUseCraftedRaid2			= 0x00010000,	/*17^16^17 (Crafted: Raid)^0*/
-	AugUseUnknown1				= 0x00020000,	/*18^16^18^0*/
-	AugUseUnknown2				= 0x00040000,	/*19^16^19^0*/
-	AugUseOrnamentation			= 0x00080000,	/*20^16^20 (Ornamentation)^0*/
-	AugUseSpecialOrnamentation	= 0x00100000,	/*21^16^21 (Special Ornamentation)^0*/
-	AugUseUnknown3				= 0x00200000,	/*22^16^22^0*/
-	AugUseUnknown4				= 0x00400000,	/*23^16^23^0*/
-	AugUseUnknown5				= 0x00800000,	/*24^16^24^0*/
-	AugUseUnknown6				= 0x01000000,	/*25^16^25^0*/
-	AugUseUnknown7				= 0x02000000,	/*26^16^26^0*/
-	AugUseUnknown8				= 0x04000000,	/*27^16^27^0*/
-	AugUseUnknown9				= 0x08000000,	/*28^16^28^0*/
-	AugUseUnknown10				= 0x10000000,	/*29^16^29^0*/
-	AugUseEpic25				= 0x20000000,	/*30^16^30^0*/
-	AugUseTest					= 0x40000000,	/*31^16^Test^0*/ // listed as 31^16^31^0 in 5-10 client
-	AugUseAll					= 0xFFFFFFFF
-};
-
-/*
-**	Augmentation use types (enumerated)
-**
-*/
-enum AugmentationUseTypes : uint8 {
-	AugTypeNone = 0,
-	AugTypeGeneralSingleStat,
-	AugTypeGeneralMultipleStat,
-	AugTypeGeneralSpellEffect,
-	AugTypeWeaponGeneral,
-	AugTypeWeaponElemDamage,
-	AugTypeWeaponBaseDamage,
-	AugTypeGeneralGroup,
-	AugTypeGeneralRaid,
-	AugTypeGeneralDragonsPoints,
-	AugTypeCraftedCommon,
-	AugTypeCraftedGroup1,
-	AugTypeCraftedRaid1,
-	AugTypeEnergeiacGroup,
-	AugTypeEnergeiacRaid,
-	AugTypeEmblem,
-	AugTypeCraftedGroup2,
-	AugTypeCraftedRaid2,
-	AugTypeUnknown1,
-	AugTypeUnknown2,
-	AugTypeOrnamentation,
-	AugTypeSpecialOrnamentation,
-	AugTypeUnknown3,
-	AugTypeUnknown4,
-	AugTypeUnknown5,
-	AugTypeUnknown6,
-	AugTypeUnknown7,
-	AugTypeUnknown8,
-	AugTypeUnknown9,
-	AugTypeUnknown10,
-	AugTypeEpic25,
-	AugTypeTest,
-	_AugTypeCount,
-	AugTypeAll = 255
-};
-
-/*
-**	Augmentation restriction types (in-work)
-**
-**	(ref: eqstr_us.txt)
-**
-*/
-enum AugmentationRestrictionTypes : uint8 {
-/*4690*/	AugRestrAny = 0,
-/*9134*/	AugRestrArmor,
-/*9135*/	AugRestrWeapons,
-/*9136*/	AugRestr1HWeapons,
-/*9137*/	AugRestr2HWeapons,
-/*9138*/	AugRestr1HSlash,
-/*9139*/	AugRestr1HBlunt,
-/*9140*/	AugRestrPiercing,
-/*9148*/	AugRestrHandToHand,
-/*9141*/	AugRestr2HSlash,
-/*9142*/	AugRestr2HBlunt,
-/*9143*/	AugRestr2HPierce,
-/*9144*/	AugRestrBows,
-/*9145*/	AugRestrShields,
-/*8052*/	AugRestr1HSlash1HBluntOrHandToHand,
-/*9200*/	AugRestr1HBluntOrHandToHand,		// no listed peq entries
-
-// these three appear to be post-RoF (12-10-2012) and can not be verified until RoF (05-10-2013) is supported
-/*????*/	AugRestrUnknown1,
-/*????*/	AugRestrUnknown2,
-/*????*/	AugRestrUnknown3,					// last value in peq entries
-			_AugRestrCount
-
-/*4687*/	//AugTypeAllItems, // ?? unknown atm
-/*4688*/	//AugTypePrestige, // ?? unknown atm
-/*4689*/	//AugTypeNonPrestige, // ?? unknown atm
-};
-
-/*
-**	Container use types
-**
-**	This correlates to world 'object.type' (object.h/Object.cpp) as well as Item_Struct.BagType
-**
-**	(ref: database, web forums and eqstr_us.txt)
-*/
-enum ContainerUseTypes : uint8
-{
-/*3400*/	BagTypeSmallBag = 0,
-/*3401*/	BagTypeLargeBag,
-/*3402*/	BagTypeQuiver,
-/*3403*/	BagTypeBeltPouch,
-/*3404*/	BagTypeWristPouch,
-/*3405*/	BagTypeBackPack,
-/*3406*/	BagTypeSmallChest,
-/*3407*/	BagTypeLargeChest,
-/*----*/	BagTypeBandolier,				// <*Database Reference Only>
-/*3408*/	BagTypeMedicineBag,
-/*3409*/	BagTypeToolBox,
-/*3410*/	BagTypeLexicon,
-/*3411*/	BagTypeMortar,
-/*3412*/	BagTypeSelfDusting,				// Quest container (Auto-clear contents?)
-/*3413*/	BagTypeMixingBowl,
-/*3414*/	BagTypeOven,
-/*3415*/	BagTypeSewingKit,
-/*3416*/	BagTypeForge,
-/*3417*/	BagTypeFletchingKit,
-/*3418*/	BagTypeBrewBarrel,
-/*3419*/	BagTypeJewelersKit,
-/*3420*/	BagTypePotteryWheel,
-/*3421*/	BagTypeKiln,
-/*3422*/	BagTypeKeymaker,				// (no database entries as of peq rev 69)
-/*3423*/	BagTypeWizardsLexicon,
-/*3424*/	BagTypeMagesLexicon,
-/*3425*/	BagTypeNecromancersLexicon,
-/*3426*/	BagTypeEnchantersLexicon,
-/*----*/	BagTypeUnknown1,				// (a coin pouch/purse?) (no database entries as of peq rev 69)
-/*----*/	BagTypeConcordanceofResearch,	// <*Database Reference Only>
-/*3427*/	BagTypeAlwaysWorks,				// Quest container (Never-fail combines?)
-/*3428*/	BagTypeKoadaDalForge,			// High Elf
-/*3429*/	BagTypeTeirDalForge,			// Dark Elf
-/*3430*/	BagTypeOggokForge,				// Ogre
-/*3431*/	BagTypeStormguardForge,			// Dwarf
-/*3432*/	BagTypeAkanonForge,				// Gnome
-/*3433*/	BagTypeNorthmanForge,			// Barbarian
-/*----*/	BagTypeUnknown2,				// (no database entries as of peq rev 69)
-/*3434*/	BagTypeCabilisForge,			// Iksar
-/*3435*/	BagTypeFreeportForge,			// Human 1
-/*3436*/	BagTypeRoyalQeynosForge,		// Human 2
-/*3439*/	BagTypeHalflingTailoringKit,
-/*3438*/	BagTypeErudTailoringKit,
-/*3440*/	BagTypeFierDalTailoringKit,		// Wood Elf
-/*3441*/	BagTypeFierDalFletchingKit,		// Wood Elf
-/*3437*/	BagTypeIksarPotteryWheel,
-/*3442*/	BagTypeTackleBox,
-/*3443*/	BagTypeTrollForge,
-/*3445*/	BagTypeFierDalForge,			// Wood Elf
-/*3444*/	BagTypeValeForge,				// Halfling
-/*3446*/	BagTypeErudForge,
-/*----*/	BagTypeTradersSatchel,			// <*Database Reference Only> (db: Yellow Trader's Satchel Token?)
-/*5785*/	BagTypeGuktaForge,				// Froglok (no database entries as of peq rev 69)
-/*3359*/	BagTypeAugmentationSealer,
-/*----*/	BagTypeIceCreamChurn,			// <*Database Reference Only>
-/*6325*/	BagTypeTransformationmold,		// Ornamentation
-/*6340*/	BagTypeDetransformationmold,	// Ornamentation Stripper
-/*5400*/	BagTypeUnattuner,
-/*7684*/	BagTypeTradeskillBag,
-/*7692*/	BagTypeCollectibleBag,
-/*----*/	_BagTypeCount
-};
-
-/*
-** Item Effect Types
-**
-*/
-enum {
-	ET_CombatProc = 0,
-	ET_ClickEffect = 1,
-	ET_WornEffect = 2,
-	ET_Expendable = 3,
-	ET_EquipClick = 4,
-	ET_ClickEffect2 = 5,	//name unknown
-	ET_Focus = 6,
-	ET_Scroll = 7
-};
-
-//SpawnAppearance types:
-#define AT_Die			0	// this causes the client to keel over and zone to bind point
-#define AT_WhoLevel		1	// the level that shows up on /who
-#define AT_Invis		3	// 0 = visible, 1 = invisible
-#define AT_PVP			4	// 0 = blue, 1 = pvp (red)
-#define AT_Light		5	// light type emitted by player (lightstone, shiny shield)
-#define AT_Anim			14	// 100=standing, 110=sitting, 111=ducking, 115=feigned, 105=looting
-#define AT_Sneak		15	// 0 = normal, 1 = sneaking
-#define AT_SpawnID		16	// server to client, sets player spawn id
-#define AT_HP			17	// Client->Server, my HP has changed (like regen tic)
-#define AT_Linkdead		18	// 0 = normal, 1 = linkdead
-#define AT_Levitate		19	// 0=off, 1=flymode, 2=levitate
-#define AT_GM			20	// 0 = normal, 1 = GM - all odd numbers seem to make it GM
-#define AT_Anon			21	// 0 = normal, 1 = anon, 2 = roleplay
-#define AT_GuildID		22
-#define AT_GuildRank	23	// 0=member, 1=officer, 2=leader
-#define AT_AFK			24	// 0 = normal, 1 = afk
-#define AT_Pet			25	// Param is EntityID of owner, or 0 for when charm breaks
-#define AT_Split		28	// 0 = normal, 1 = autosplit on
-#define AT_Size			29	// spawn's size
-#define AT_NPCName		31	// change PC's name's color to NPC color 0 = normal, 1 = npc name
-#define AT_ShowHelm		43	// 0 = do not show helmet graphic, 1 = show graphic
-#define AT_DamageState	44	// The damage state of a destructible object (0 through 4)
-//#define AT_Trader		300	// Bazzar Trader Mode
+//#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)

 // animations for AT_Anim
 #define ANIM_FREEZE	102
@@ -519,15 +170,40 @@ typedef enum {
 #define MT_StrikeThrough		339
 #define MT_Stun					340

+// TODO: Really should combine above and below into one
+
 //from showeq
 enum ChatColor
 {
+	/*
 	CC_Default					= 0,
 	CC_DarkGrey					= 1,
 	CC_DarkGreen				= 2,
 	CC_DarkBlue					= 3,
 	CC_Purple					= 5,
 	CC_LightGrey				= 6,
+	*/
+
+	CC_WhiteSmoke				= 0,	// FF|F0F0F0
+	CC_Green					= 2,	// FF|008000
+	CC_BrightBlue				= 3,	// FF|0040FF
+	CC_Magenta					= 5,	// FF|F000F0
+	CC_Gray						= 6,	// FF|808080
+	CC_LightGray				= 7,	// FF|E0E0E0
+	//CC_WhiteSmoke2				= 10,	// FF|F0F0F0
+	CC_DarkGray					= 12,	// FF|A0A0A0
+	CC_Red						= 13,	// FF|F00000
+	CC_Lime						= 14,	// FF|00F000
+	CC_Yellow					= 15,	// FF|F0F000
+	CC_Blue						= 16,	// FF|0000F0
+	CC_LightNavy				= 17,	// FF|0000AF
+	CC_Cyan						= 18,	// FF|00F0F0
+	CC_Black					= 20,	// FF|000000
+	
+	// any index <= 255 that is not defined above
+	CC_DimGray					= 1,	// FF|606060
+	CC_Default					= 1,
+
 	CC_User_Say					= 256,
 	CC_User_Tell				= 257,
 	CC_User_Group				= 258,
@@ -723,7 +399,7 @@ static const uint8 DamageTypeUnknown	= 0xFF;
 **
 **	(indexed by 'Skill' of SkillUseTypes)
 */
-static const uint8 SkillDamageTypes[HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated
+static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated
 {
 /*1HBlunt*/					0,
 /*1HSlashing*/				1,
@@ -799,29 +475,10 @@ static const uint8 SkillDamageTypes[HIGHEST_SKILL + 1] = // change to _SkillServ
 /*Intimidation*/			DamageTypeUnknown,
 /*Berserking*/				DamageTypeUnknown,
 /*Taunt*/					DamageTypeUnknown,
-/*Frenzy*/					74 //,
-// /*RemoveTrap*/				DamageTypeUnknown,	// Needs research (set for SenseTrap value)
-// /*TripleAttack*/			DamageTypeUnknown,	// Needs research (set for DoubleAttack value)
-// /*2HPiercing*/				36					// Needs research (set for 1HPiercing value - similar to slash/blunt)
-};
-
-/*
-**	Material use slots
-**
-*/
-enum MaterialUseSlots : uint8
-{
-	MaterialHead = 0,
-	MaterialChest,
-	MaterialArms,
-	MaterialWrist,
-	MaterialHands,
-	MaterialLegs,
-	MaterialFeet,
-	MaterialPrimary,
-	MaterialSecondary,
-	_MaterialCount,
-	_MaterialInvalid = 255
+/*Frenzy*/					74,
+/*RemoveTrap*/				DamageTypeUnknown,	// Needs research (set for SenseTrap value)
+/*TripleAttack*/			DamageTypeUnknown,	// Needs research (set for DoubleAttack value)
+/*2HPiercing*/				36					// Needs research (set for 1HPiercing value - similar to slash/blunt)
 };

 /*
@@ -858,164 +515,8 @@ enum MaterialUseSlots : uint8
 **
 */

-enum InventoryMapTypes : int16 {
-	MapPossessions = 0,
-	MapBank,
-	MapSharedBank,
-	MapTrade,
-	MapWorld,
-	MapLimbo,
-	MapTribute,
-	MapTrophyTribute,
-	MapGuildTribute,
-	MapMerchant,
-	MapDeleted,
-	MapCorpse,
-	MapBazaar,
-	MapInspect,
-	MapRealEstate,
-	MapViewMODPC,
-	MapViewMODBank,
-	MapViewMODSharedBank,
-	MapViewMODLimbo,
-	MapAltStorage,
-	MapArchived,
-	MapMail,
-	MapGuildTrophyTribute,
-	MapKrono,
-	MapOther,
-	_MapCount
-};
-
-enum InventoryMainTypes : int16 {
-	MainCharm = 0,
-	MainEar1,
-	MainHead,
-	MainFace,
-	MainEar2,
-	MainNeck,
-	MainShoulders,
-	MainArms,
-	MainBack,
-	MainWrist1,
-	MainWrist2,
-	MainRange,
-	MainHands,
-	MainPrimary,
-	MainSecondary,
-	MainFinger1,
-	MainFinger2,
-	MainChest,
-	MainLegs,
-	MainFeet,
-	MainWaist,
-	MainPowerSource = 9999, // temp
-	MainAmmo = 21, // temp
-	MainGeneral1,
-	MainGeneral2,
-	MainGeneral3,
-	MainGeneral4,
-	MainGeneral5,
-	MainGeneral6,
-	MainGeneral7,
-	MainGeneral8,
-	//MainGeneral9,
-	//MainGeneral10,
-	MainCursor,
-	_MainCount
-};
-
 #define INVALID_INDEX	-1
-#define NOT_USED		0
-#define NO_ITEM			0
-
-// yes..these are redundant... but, they help to identify and define what is actually being performed
-// plus, since they're pre-op's, they don't affect the actual binary size
-#define MAP_BEGIN	0
-#define MAIN_BEGIN	0
-#define SUB_BEGIN	0
-#define AUG_BEGIN	0
-
-namespace legacy {
-	// this is for perl and other legacy systems
-
-	typedef enum {
-		SLOT_CHARM			= 0,
-		SLOT_EAR01			= 1,
-		SLOT_HEAD			= 2,
-		SLOT_FACE			= 3,
-		SLOT_EAR02			= 4,
-		SLOT_NECK			= 5,
-		SLOT_SHOULDER		= 6,
-		SLOT_ARMS			= 7,
-		SLOT_BACK			= 8,
-		SLOT_BRACER01		= 9,
-		SLOT_BRACER02		= 10,
-		SLOT_RANGE			= 11,
-		SLOT_HANDS			= 12,
-		SLOT_PRIMARY		= 13,
-		SLOT_SECONDARY		= 14,
-		SLOT_RING01			= 15,
-		SLOT_RING02			= 16,
-		SLOT_CHEST			= 17,
-		SLOT_LEGS			= 18,
-		SLOT_FEET			= 19,
-		SLOT_WAIST			= 20,
-		SLOT_POWER_SOURCE	= 9999,
-		SLOT_AMMO			= 21,
-		SLOT_GENERAL_1		= 22,
-		SLOT_GENERAL_2		= 23,
-		SLOT_GENERAL_3		= 24,
-		SLOT_GENERAL_4		= 25,
-		SLOT_GENERAL_5		= 26,
-		SLOT_GENERAL_6		= 27,
-		SLOT_GENERAL_7		= 28,
-		SLOT_GENERAL_8		= 29,
-		//SLOT_GENERAL_9	= not supported
-		//SLOT_GENERAL_10	= not supported
-		SLOT_CURSOR			= 30,
-		SLOT_CURSOR_END		= (int16)0xFFFE, // I hope no one is using this...
-		SLOT_TRADESKILL		= 1000,
-		SLOT_AUGMENT		= 1001,
-		SLOT_INVALID		= (int16)0xFFFF,
-
-		SLOT_POSSESSIONS_BEGIN	= 0,
-		SLOT_POSSESSIONS_END	= 30,
-
-		SLOT_EQUIPMENT_BEGIN	= 0,
-		SLOT_EQUIPMENT_END		= 21,
-
-		SLOT_PERSONAL_BEGIN		= 22,
-		SLOT_PERSONAL_END		= 29,
-		SLOT_PERSONAL_BAGS_BEGIN	= 251,
-		SLOT_PERSONAL_BAGS_END		= 330,
-
-		SLOT_CURSOR_BAG_BEGIN		= 331,
-		SLOT_CURSOR_BAG_END			= 340,
-
-		SLOT_TRIBUTE_BEGIN	= 400,
-		SLOT_TRIBUTE_END	= 404,
-
-		SLOT_BANK_BEGIN			= 2000,
-		SLOT_BANK_END			= 2023,
-		SLOT_BANK_BAGS_BEGIN	= 2031,
-		SLOT_BANK_BAGS_END		= 2270,
-
-		SLOT_SHARED_BANK_BEGIN		= 2500,
-		SLOT_SHARED_BANK_END		= 2501,
-		SLOT_SHARED_BANK_BAGS_BEGIN	= 2531,
-		SLOT_SHARED_BANK_BAGS_END	= 2550,
-
-		SLOT_TRADE_BEGIN		= 3000,
-		SLOT_TRADE_END			= 3007,
-		SLOT_TRADE_BAGS_BEGIN	= 3031,
-		SLOT_TRADE_BAGS_END		= 3110,
-
-		SLOT_WORLD_BEGIN	= 4000,
-		SLOT_WORLD_END		= 4009
-	} InventorySlot;
-}

 static const uint32 MAX_SPELL_DB_ID_VAL = 65535;

-#endif
+#endif /*COMMON_EQ_CONSTANTS_H*/
@@ -1,943 +0,0 @@
-/*
-EQEMu:  Everquest Server Emulator
-
-Copyright (C) 2001-2015 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#include "eq_dictionary.h"
-#include "string_util.h"
-
-//
-// class EmuConstants
-//
-uint16 EmuConstants::InventoryMapSize(int16 indexMap)
-{
-	switch (indexMap)
-	{
-	case MapPossessions:
-		return MAP_POSSESSIONS_SIZE;
-	case MapBank:
-		return MAP_BANK_SIZE;
-	case MapSharedBank:
-		return MAP_SHARED_BANK_SIZE;
-	case MapTrade:
-		return MAP_TRADE_SIZE;
-	case MapWorld:
-		return MAP_WORLD_SIZE;
-	case MapLimbo:
-		return MAP_LIMBO_SIZE;
-	case MapTribute:
-		return MAP_TRIBUTE_SIZE;
-	case MapTrophyTribute:
-		return MAP_TROPHY_TRIBUTE_SIZE;
-	case MapGuildTribute:
-		return MAP_GUILD_TRIBUTE_SIZE;
-	case MapMerchant:
-		return MAP_MERCHANT_SIZE;
-	case MapDeleted:
-		return MAP_DELETED_SIZE;
-	case MapCorpse:
-		return MAP_CORPSE_SIZE;
-	case MapBazaar:
-		return MAP_BAZAAR_SIZE;
-	case MapInspect:
-		return MAP_INSPECT_SIZE;
-	case MapRealEstate:
-		return MAP_REAL_ESTATE_SIZE;
-	case MapViewMODPC:
-		return MAP_VIEW_MOD_PC_SIZE;
-	case MapViewMODBank:
-		return MAP_VIEW_MOD_BANK_SIZE;
-	case MapViewMODSharedBank:
-		return MAP_VIEW_MOD_SHARED_BANK_SIZE;
-	case MapViewMODLimbo:
-		return MAP_VIEW_MOD_LIMBO_SIZE;
-	case MapAltStorage:
-		return MAP_ALT_STORAGE_SIZE;
-	case MapArchived:
-		return MAP_ARCHIVED_SIZE;
-	case MapMail:
-		return MAP_MAIL_SIZE;
-	case MapGuildTrophyTribute:
-		return MAP_GUILD_TROPHY_TRIBUTE_SIZE;
-	case MapKrono:
-		return MAP_KRONO_SIZE;
-	case MapOther:
-		return MAP_OTHER_SIZE;
-	default:
-		return NOT_USED;
-	}
-}
-
-/*
-std::string EmuConstants::InventoryLocationName(Location_Struct location)
-{
-	// not ready for implementation...
-	std::string ret_str;
-	StringFormat(ret_str, "%s, %s, %s, %s", InventoryMapName(location.map), InventoryMainName(location.main), InventorySubName(location.sub), InventoryAugName(location.aug));
-	return  ret_str;
-}
-*/
-
-std::string EmuConstants::InventoryMapName(int16 indexMap)
-{
-	switch (indexMap)
-	{
-	case INVALID_INDEX:
-		return "Invalid Map";
-	case MapPossessions:
-		return "Possessions";
-	case MapBank:
-		return "Bank";
-	case MapSharedBank:
-		return "SharedBank";
-	case MapTrade:
-		return "Trade";
-	case MapWorld:
-		return "World";
-	case MapLimbo:
-		return "Limbo";
-	case MapTribute:
-		return "Tribute";
-	case MapTrophyTribute:
-		return "TrophyTribute";
-	case MapGuildTribute:
-		return "GuildTribute";
-	case MapMerchant:
-		return "Merchant";
-	case MapDeleted:
-		return "Deleted";
-	case MapCorpse:
-		return "Corpse";
-	case MapBazaar:
-		return "Bazaar";
-	case MapInspect:
-		return "Inspect";
-	case MapRealEstate:
-		return "RealEstate";
-	case MapViewMODPC:
-		return "ViewMODPC";
-	case MapViewMODBank:
-		return "ViewMODBank";
-	case MapViewMODSharedBank:
-		return "ViewMODSharedBank";
-	case MapViewMODLimbo:
-		return "ViewMODLimbo";
-	case MapAltStorage:
-		return "AltStorage";
-	case MapArchived:
-		return "Archived";
-	case MapMail:
-		return "Mail";
-	case MapGuildTrophyTribute:
-		return "GuildTrophyTribute";
-	case MapKrono:
-		return "Krono";
-	case MapOther:
-		return "Other";
-	default:
-		return "Unknown Map";
-	}
-}
-
-std::string EmuConstants::InventoryMainName(int16 indexMain)
-{
-	switch (indexMain)
-	{
-	case INVALID_INDEX:
-		return "Invalid Main";
-	case MainCharm:
-		return "Charm";
-	case MainEar1:
-		return "Ear1";
-	case MainHead:
-		return "Head";
-	case MainFace:
-		return "Face";
-	case MainEar2:
-		return "Ear2";
-	case MainNeck:
-		return "Neck";
-	case MainShoulders:
-		return "Shoulders";
-	case MainArms:
-		return "Arms";
-	case MainBack:
-		return "Back";
-	case MainWrist1:
-		return "Wrist1";
-	case MainWrist2:
-		return "Wrist2";
-	case MainRange:
-		return "Range";
-	case MainHands:
-		return "Hands";
-	case MainPrimary:
-		return "Primary";
-	case MainSecondary:
-		return "Secondary";
-	case MainFinger1:
-		return "Finger1";
-	case MainFinger2:
-		return "Finger2";
-	case MainChest:
-		return "Chest";
-	case MainLegs:
-		return "Legs";
-	case MainFeet:
-		return "Feet";
-	case MainWaist:
-		return "Waist";
-	case MainPowerSource:
-		return "PowerSource";
-	case MainAmmo:
-		return "Ammo";
-	case MainGeneral1:
-		return "General1";
-	case MainGeneral2:
-		return "General2";
-	case MainGeneral3:
-		return "General3";
-	case MainGeneral4:
-		return "General4";
-	case MainGeneral5:
-		return "General5";
-	case MainGeneral6:
-		return "General6";
-	case MainGeneral7:
-		return "General7";
-	case MainGeneral8:
-		return "General8";
-	/*
-	case MainGeneral9:
-		return "General9";
-	case MainGeneral10:
-		return "General10";
-	*/
-	case MainCursor:
-		return "Cursor";
-	default:
-		return "Unknown Main";
-	}
-}
-
-std::string EmuConstants::InventorySubName(int16 indexSub)
-{
-	if (indexSub == INVALID_INDEX)
-		return "Invalid Sub";
-
-	if ((uint16)indexSub >= ITEM_CONTAINER_SIZE)
-		return "Unknown Sub";
-
-	std::string ret_str;
-	ret_str = StringFormat("Container%i", (indexSub + 1)); // zero-based index..but, count starts at one
-
-	return ret_str;
-}
-
-std::string EmuConstants::InventoryAugName(int16 indexAug)
-{
-	if (indexAug == INVALID_INDEX)
-		return "Invalid Aug";
-
-	if ((uint16)indexAug >= ITEM_COMMON_SIZE)
-		return "Unknown Aug";
-
-	std::string ret_str;
-	ret_str = StringFormat("Augment%i", (indexAug + 1)); // zero-based index..but, count starts at one
-
-	return ret_str;
-}
-
-
-// 
-// class EQLimits
-//
-// client validation
-bool EQLimits::IsValidPCClientVersion(ClientVersion clientVersion)
-{
-	if (clientVersion > ClientVersion::Unknown && clientVersion <= LAST_PC_CLIENT)
-		return true;
-
-	return false;
-}
-
-ClientVersion EQLimits::ValidatePCClientVersion(ClientVersion clientVersion)
-{
-	if (clientVersion > ClientVersion::Unknown && clientVersion <= LAST_PC_CLIENT)
-		return clientVersion;
-
-	return ClientVersion::Unknown;
-}
-
-// npc validation
-bool EQLimits::IsValidNPCClientVersion(ClientVersion clientVersion)
-{
-	if (clientVersion > LAST_PC_CLIENT && clientVersion <= LAST_NPC_CLIENT)
-		return true;
-
-	return false;
-}
-
-ClientVersion EQLimits::ValidateNPCClientVersion(ClientVersion clientVersion)
-{
-	if (clientVersion > LAST_PC_CLIENT && clientVersion <= LAST_NPC_CLIENT)
-		return clientVersion;
-
-	return ClientVersion::Unknown;
-}
-
-// mob validation
-bool EQLimits::IsValidMobClientVersion(ClientVersion clientVersion)
-{
-	if (clientVersion > ClientVersion::Unknown && clientVersion <= LAST_NPC_CLIENT)
-		return true;
-
-	return false;
-}
-
-ClientVersion EQLimits::ValidateMobClientVersion(ClientVersion clientVersion)
-{
-	if (clientVersion > ClientVersion::Unknown && clientVersion <= LAST_NPC_CLIENT)
-		return clientVersion;
-
-	return ClientVersion::Unknown;
-}
-
-// database
-size_t EQLimits::CharacterCreationLimit(ClientVersion clientVersion)
-{
-	static const size_t local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*Client62*/	NOT_USED,
-/*Titanium*/	Titanium::consts::CHARACTER_CREATION_LIMIT,
-/*SoF*/			SoF::consts::CHARACTER_CREATION_LIMIT,
-/*SoD*/			SoD::consts::CHARACTER_CREATION_LIMIT,
-/*UF*/			UF::consts::CHARACTER_CREATION_LIMIT,
-/*RoF*/			RoF::consts::CHARACTER_CREATION_LIMIT,
-/*RoF2*/		RoF2::consts::CHARACTER_CREATION_LIMIT,
-
-/*MobNPC*/		NOT_USED,
-/*MobMerc*/		NOT_USED,
-/*MobBot*/		NOT_USED,
-/*MobPet*/		NOT_USED
-	};
-
-	return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-// inventory
-uint16 EQLimits::InventoryMapSize(int16 indexMap, ClientVersion clientVersion)
-{
-	// not all maps will have an instantiated container..some are references for queue generators (i.e., bazaar, mail, etc...)
-	// a zero '0' indicates a needed value..otherwise, change to '_NOTUSED' for a null value so indices requiring research can be identified
-	// ALL of these values need to be verified before pushing to live
-	//
-	// make sure that you transcribe the actual value from 'defaults' to here before updating or client crashes will ensue..and/or...
-	// insert older clients inside of the progression of client order
-	//
-	// MAP_POSSESSIONS_SIZE does not reflect all actual <client>_constants size due to bitmask-use compatibility
-	//
-	// when setting NPC-based values, try to adhere to an EmuConstants::<property> or NOT_USED value to avoid unnecessary issues
-
-	static const uint16 local[_MapCount][CLIENT_VERSION_COUNT] = {
-		// server and database are sync'd to current MapPossessions's client as set in 'using namespace RoF::slots;' and
-		// 'EmuConstants::MAP_POSSESSIONS_SIZE' - use/update EquipmentBitmask(), GeneralBitmask() and CursorBitmask()
-		// for partial range validation checks and 'EmuConstants::MAP_POSSESSIONS_SIZE' for full range iterations
-		{ // local[MainPossessions]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*Titanium*/	EmuConstants::MAP_POSSESSIONS_SIZE,
-/*SoF*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*SoD*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*Underfoot*/	EmuConstants::MAP_POSSESSIONS_SIZE,
-/*RoF*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*RoF2*/		EmuConstants::MAP_POSSESSIONS_SIZE,
-
-/*NPC*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*Merc*/		EmuConstants::MAP_POSSESSIONS_SIZE,
-/*Bot*/			EmuConstants::MAP_POSSESSIONS_SIZE,
-/*Pet*/			EmuConstants::MAP_POSSESSIONS_SIZE
-		},
-		{ // local[MapBank]
-/*Unknown*/		NOT_USED,
-/*62*/			NOT_USED,
-/*Titanium*/	Titanium::consts::MAP_BANK_SIZE,
-/*SoF*/			EmuConstants::MAP_BANK_SIZE,
-/*SoD*/			EmuConstants::MAP_BANK_SIZE,
-/*Underfoot*/	EmuConstants::MAP_BANK_SIZE,
-/*RoF*/			EmuConstants::MAP_BANK_SIZE,
-/*RoF2*/		EmuConstants::MAP_BANK_SIZE,
-
-/*NPC*/			NOT_USED,
-/*Merc*/		NOT_USED,
-/*Bot*/			NOT_USED,
-/*Pet*/			NOT_USED
-		},
-		{ // local[MapSharedBank]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_SHARED_BANK_SIZE,
-/*Titanium*/	EmuConstants::MAP_SHARED_BANK_SIZE,
-/*SoF*/			EmuConstants::MAP_SHARED_BANK_SIZE,
-/*SoD*/			EmuConstants::MAP_SHARED_BANK_SIZE,
-/*Underfoot*/	EmuConstants::MAP_SHARED_BANK_SIZE,
-/*RoF*/			EmuConstants::MAP_SHARED_BANK_SIZE,
-/*RoF2*/		EmuConstants::MAP_SHARED_BANK_SIZE,
-
-/*NPC*/			NOT_USED,
-/*Merc*/		NOT_USED,
-/*Bot*/			NOT_USED,
-/*Pet*/			NOT_USED
-		},
-		{ // local[MapTrade]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_TRADE_SIZE,
-/*Titanium*/	EmuConstants::MAP_TRADE_SIZE,
-/*SoF*/			EmuConstants::MAP_TRADE_SIZE,
-/*SoD*/			EmuConstants::MAP_TRADE_SIZE,
-/*Underfoot*/	EmuConstants::MAP_TRADE_SIZE,
-/*RoF*/			EmuConstants::MAP_TRADE_SIZE,
-/*RoF2*/		EmuConstants::MAP_TRADE_SIZE,
-
-/*NPC*/			4,
-/*Merc*/		4,
-/*Bot*/			EmuConstants::MAP_TRADE_SIZE, // client thinks this is another client
-/*Pet*/			4
-		},
-		{ // local[MapWorld]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_WORLD_SIZE,
-/*Titanium*/	EmuConstants::MAP_WORLD_SIZE,
-/*SoF*/			EmuConstants::MAP_WORLD_SIZE,
-/*SoD*/			EmuConstants::MAP_WORLD_SIZE,
-/*Underfoot*/	EmuConstants::MAP_WORLD_SIZE,
-/*RoF*/			EmuConstants::MAP_WORLD_SIZE,
-/*RoF2*/		EmuConstants::MAP_WORLD_SIZE,
-
-/*NPC*/			NOT_USED,
-/*Merc*/		NOT_USED,
-/*Bot*/			NOT_USED,
-/*Pet*/			NOT_USED
-		},
-		{ // local[MapLimbo]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_LIMBO_SIZE,
-/*Titanium*/	EmuConstants::MAP_LIMBO_SIZE,
-/*SoF*/			EmuConstants::MAP_LIMBO_SIZE,
-/*SoD*/			EmuConstants::MAP_LIMBO_SIZE,
-/*Underfoot*/	EmuConstants::MAP_LIMBO_SIZE,
-/*RoF*/			EmuConstants::MAP_LIMBO_SIZE,
-/*RoF2*/		EmuConstants::MAP_LIMBO_SIZE,
-
-/*NPC*/			NOT_USED,
-/*Merc*/		NOT_USED,
-/*Bot*/			NOT_USED,
-/*Pet*/			NOT_USED
-		},
-		{ // local[MapTribute]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_TRIBUTE_SIZE,
-/*Titanium*/	EmuConstants::MAP_TRIBUTE_SIZE,
-/*SoF*/			EmuConstants::MAP_TRIBUTE_SIZE,
-/*SoD*/			EmuConstants::MAP_TRIBUTE_SIZE,
-/*Underfoot*/	EmuConstants::MAP_TRIBUTE_SIZE,
-/*RoF*/			EmuConstants::MAP_TRIBUTE_SIZE,
-/*RoF2*/		EmuConstants::MAP_TRIBUTE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapTrophyTribute]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_TROPHY_TRIBUTE_SIZE,
-/*RoF2*/		EmuConstants::MAP_TROPHY_TRIBUTE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapGuildTribute]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_GUILD_TRIBUTE_SIZE,
-/*RoF2*/		EmuConstants::MAP_GUILD_TRIBUTE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapMerchant]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_MERCHANT_SIZE,
-/*RoF2*/		EmuConstants::MAP_MERCHANT_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapDeleted]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_DELETED_SIZE,
-/*RoF2*/		EmuConstants::MAP_DELETED_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapCorpse]
-/*Unknown*/		NOT_USED,
-/*62*/			NOT_USED,
-/*Titanium*/	Titanium::consts::MAP_CORPSE_SIZE,
-/*SoF*/			SoF::consts::MAP_CORPSE_SIZE,
-/*SoD*/			SoD::consts::MAP_CORPSE_SIZE,
-/*Underfoot*/	UF::consts::MAP_CORPSE_SIZE,
-/*RoF*/			RoF::consts::MAP_CORPSE_SIZE,
-/*RoF2*/		RoF2::consts::MAP_CORPSE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapBazaar]
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::MAP_BAZAAR_SIZE,
-/*Titanium*/	EmuConstants::MAP_BAZAAR_SIZE,
-/*SoF*/			EmuConstants::MAP_BAZAAR_SIZE,
-/*SoD*/			EmuConstants::MAP_BAZAAR_SIZE,
-/*Underfoot*/	EmuConstants::MAP_BAZAAR_SIZE,
-/*RoF*/			EmuConstants::MAP_BAZAAR_SIZE,
-/*RoF2*/		EmuConstants::MAP_BAZAAR_SIZE,
-
-/*NPC*/			0, // this may need to be 'EmuConstants::MAP_BAZAAR_SIZE' if offline client traders respawn as an npc
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapInspect]
-/*Unknown*/		NOT_USED,
-/*62*/			NOT_USED,
-/*Titanium*/	Titanium::consts::MAP_INSPECT_SIZE,
-/*SoF*/			SoF::consts::MAP_INSPECT_SIZE,
-/*SoD*/			SoD::consts::MAP_INSPECT_SIZE,
-/*Underfoot*/	UF::consts::MAP_INSPECT_SIZE,
-/*RoF*/			RoF::consts::MAP_INSPECT_SIZE,
-/*RoF2*/		RoF2::consts::MAP_INSPECT_SIZE,
-
-/*NPC*/			NOT_USED,
-/*Merc*/		NOT_USED,
-/*Bot*/			NOT_USED,
-/*Pet*/			NOT_USED
-		},
-		{ // local[MapRealEstate]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_REAL_ESTATE_SIZE,
-/*RoF2*/		EmuConstants::MAP_REAL_ESTATE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapViewMODPC]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_VIEW_MOD_PC_SIZE,
-/*RoF2*/		EmuConstants::MAP_VIEW_MOD_PC_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapViewMODBank]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_VIEW_MOD_BANK_SIZE,
-/*RoF2*/		EmuConstants::MAP_VIEW_MOD_BANK_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapViewMODSharedBank]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE,
-/*RoF2*/		EmuConstants::MAP_VIEW_MOD_SHARED_BANK_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapViewMODLimbo]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE,
-/*RoF2*/		EmuConstants::MAP_VIEW_MOD_LIMBO_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapAltStorage]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_ALT_STORAGE_SIZE,
-/*RoF2*/		EmuConstants::MAP_ALT_STORAGE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapArchived]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_ARCHIVED_SIZE,
-/*RoF2*/		EmuConstants::MAP_ARCHIVED_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapMail]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_MAIL_SIZE,
-/*RoF2*/		EmuConstants::MAP_MAIL_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapGuildTrophyTribute]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE,
-/*RoF2*/		EmuConstants::MAP_GUILD_TROPHY_TRIBUTE_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapKrono]
-/*Unknown*/		NOT_USED,
-/*62*/			NOT_USED,
-/*Titanium*/	NOT_USED,
-/*SoF*/			NOT_USED,
-/*SoD*/			NOT_USED,
-/*Underfoot*/	NOT_USED,
-/*RoF*/			EmuConstants::MAP_KRONO_SIZE,
-/*RoF2*/		EmuConstants::MAP_KRONO_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		},
-		{ // local[MapOther]
-/*Unknown*/		NOT_USED,
-/*62*/			0,
-/*Titanium*/	0,
-/*SoF*/			0,
-/*SoD*/			0,
-/*Underfoot*/	0,
-/*RoF*/			EmuConstants::MAP_OTHER_SIZE,
-/*RoF2*/		EmuConstants::MAP_OTHER_SIZE,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-		}
-	};
-
-	if ((uint16)indexMap < _MapCount)
-		return local[indexMap][static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-
-	return NOT_USED;
-}
-
-uint64 EQLimits::PossessionsBitmask(ClientVersion clientVersion)
-{
-	// these are for the new inventory system (RoF)..not the current (Ti) one...
-	// 0x0000000000200000 is SlotPowerSource (SoF+)
-	// 0x0000000080000000 is SlotGeneral9 (RoF+)
-	// 0x0000000100000000 is SlotGeneral10 (RoF+)
-
-	static const uint64 local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*62*/			0x000000027FDFFFFF,
-/*Titanium*/	0x000000027FDFFFFF,
-/*SoF*/			0x000000027FFFFFFF,
-/*SoD*/			0x000000027FFFFFFF,
-/*Underfoot*/	0x000000027FFFFFFF,
-/*RoF*/			0x00000003FFFFFFFF,
-/*RoF2*/		0,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-	};
-
-	return NOT_USED;
-	//return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-uint64 EQLimits::EquipmentBitmask(ClientVersion clientVersion)
-{
-	static const uint64 local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*62*/			0x00000000005FFFFF,
-/*Titanium*/	0x00000000005FFFFF,
-/*SoF*/			0x00000000007FFFFF,
-/*SoD*/			0x00000000007FFFFF,
-/*Underfoot*/	0x00000000007FFFFF,
-/*RoF*/			0x00000000007FFFFF,
-/*RoF2*/		0,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-	};
-
-	return NOT_USED;
-	//return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-uint64 EQLimits::GeneralBitmask(ClientVersion clientVersion)
-{
-	static const uint64 local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*62*/			0x000000007F800000,
-/*Titanium*/	0x000000007F800000,
-/*SoF*/			0x000000007F800000,
-/*SoD*/			0x000000007F800000,
-/*Underfoot*/	0x000000007F800000,
-/*RoF*/			0x00000001FF800000,
-/*RoF2*/		0,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-	};
-
-	return NOT_USED;
-	//return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-uint64 EQLimits::CursorBitmask(ClientVersion clientVersion)
-{
-	static const uint64 local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*62*/			0x0000000200000000,
-/*Titanium*/	0x0000000200000000,
-/*SoF*/			0x0000000200000000,
-/*SoD*/			0x0000000200000000,
-/*Underfoot*/	0x0000000200000000,
-/*RoF*/			0x0000000200000000,
-/*RoF2*/		0,
-
-/*NPC*/			0,
-/*Merc*/		0,
-/*Bot*/			0,
-/*Pet*/			0
-	};
-
-	return NOT_USED;
-	//return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-bool EQLimits::AllowsEmptyBagInBag(ClientVersion clientVersion)
-{
-	static const bool local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		false,
-/*62*/			false,
-/*Titanium*/	Titanium::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-/*SoF*/			SoF::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-/*SoD*/			SoD::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-/*Underfoot*/	UF::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-/*RoF*/			RoF::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-/*RoF2*/		RoF2::limits::ALLOWS_EMPTY_BAG_IN_BAG,
-
-/*NPC*/			false,
-/*Merc*/		false,
-/*Bot*/			false,
-/*Pet*/			false
-	};
-
-	return false; // not implemented
-	//return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-bool EQLimits::AllowsClickCastFromBag(ClientVersion clientVersion)
-{
-	static const bool local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		false,
-/*62*/			false,
-/*Titanium*/	Titanium::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-/*SoF*/			SoF::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-/*SoD*/			SoD::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-/*Underfoot*/	UF::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-/*RoF*/			RoF::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-/*RoF2*/		RoF2::limits::ALLOWS_CLICK_CAST_FROM_BAG,
-
-/*NPC*/			false,
-/*Merc*/		false,
-/*Bot*/			false,
-/*Pet*/			false
-	};
-
-	return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-// items
-uint16 EQLimits::ItemCommonSize(ClientVersion clientVersion)
-{
-	static const uint16 local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::ITEM_COMMON_SIZE,
-/*Titanium*/	EmuConstants::ITEM_COMMON_SIZE,
-/*SoF*/			EmuConstants::ITEM_COMMON_SIZE,
-/*SoD*/			EmuConstants::ITEM_COMMON_SIZE,
-/*Underfoot*/	EmuConstants::ITEM_COMMON_SIZE,
-/*RoF*/			EmuConstants::ITEM_COMMON_SIZE,
-/*RoF2*/		EmuConstants::ITEM_COMMON_SIZE,
-
-/*NPC*/			EmuConstants::ITEM_COMMON_SIZE,
-/*Merc*/		EmuConstants::ITEM_COMMON_SIZE,
-/*Bot*/			EmuConstants::ITEM_COMMON_SIZE,
-/*Pet*/			EmuConstants::ITEM_COMMON_SIZE
-	};
-
-	return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-uint16 EQLimits::ItemContainerSize(ClientVersion clientVersion)
-{
-	static const uint16 local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		NOT_USED,
-/*62*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*Titanium*/	EmuConstants::ITEM_CONTAINER_SIZE,
-/*SoF*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*SoD*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*Underfoot*/	EmuConstants::ITEM_CONTAINER_SIZE,
-/*RoF*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*RoF2*/		EmuConstants::ITEM_CONTAINER_SIZE,
-
-/*NPC*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*Merc*/		EmuConstants::ITEM_CONTAINER_SIZE,
-/*Bot*/			EmuConstants::ITEM_CONTAINER_SIZE,
-/*Pet*/			EmuConstants::ITEM_CONTAINER_SIZE
-	};
-
-	return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
-
-bool EQLimits::CoinHasWeight(ClientVersion clientVersion)
-{
-	static const bool local[CLIENT_VERSION_COUNT] = {
-/*Unknown*/		true,
-/*62*/			true,
-/*Titanium*/	Titanium::limits::COIN_HAS_WEIGHT,
-/*SoF*/			SoF::limits::COIN_HAS_WEIGHT,
-/*SoD*/			SoD::limits::COIN_HAS_WEIGHT,
-/*Underfoot*/	UF::limits::COIN_HAS_WEIGHT,
-/*RoF*/			RoF::limits::COIN_HAS_WEIGHT,
-/*RoF2*/		RoF::limits::COIN_HAS_WEIGHT,
-
-/*NPC*/			true,
-/*Merc*/		true,
-/*Bot*/			true,
-/*Pet*/			true
-	};
-
-	return local[static_cast<unsigned int>(ValidateMobClientVersion(clientVersion))];
-}
@@ -1,205 +0,0 @@
-/*
-EQEMu:  Everquest Server Emulator
-
-Copyright (C) 2001-2015 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef EQ_DICTIONARY_H
-#define EQ_DICTIONARY_H
-
-#include "types.h"
-#include "eq_constants.h"
-#include "clientversions.h"
-#include <string>
-#include "../common/patches/titanium_constants.h"
-#include "../common/patches/sof_constants.h"
-#include "../common/patches/sod_constants.h"
-#include "../common/patches/uf_constants.h"
-#include "../common/patches/rof_constants.h"
-#include "../common/patches/rof2_constants.h"
-
-// *** DO NOT CHANGE without a full understanding of the consequences..the server is set up to use these settings explicitly!! ***
-// *** You will cause compilation failures and corrupt your database if partial or incorrect attempts to change them are made!! ***
-
-// Hard-coded values usually indicate that further research is needed and the values given are from the old (known) system
-
-// (future use)
-//using namespace RoF2::maps;	// server inventory maps enumeration (code and database sync'd to reference)
-//using namespace RoF::slots;	// server possessions slots enumeration (code and database sync'd to reference)
-
-class EmuConstants
-{
-	// an immutable value is required to initialize arrays, etc... use this class as a repository for those
-public:
-	// database
-	static const ClientVersion CHARACTER_CREATION_CLIENT = ClientVersion::RoF2; // adjust according to starting item placement and target client
-
-	static const size_t CHARACTER_CREATION_LIMIT = RoF2::consts::CHARACTER_CREATION_LIMIT;
-
-	// inventory
-	static uint16 InventoryMapSize(int16 indexMap);
-	//static std::string InventoryLocationName(Location_Struct location);
-	static std::string InventoryMapName(int16 indexMap);
-	static std::string InventoryMainName(int16 indexMain);
-	static std::string InventorySubName(int16 indexSub);
-	static std::string InventoryAugName(int16 indexAug);
-
-	// these are currently hard-coded for existing inventory system..do not use in place of special client version handlers until ready
-	static const uint16	MAP_POSSESSIONS_SIZE = _MainCount;
-	static const uint16 MAP_BANK_SIZE = 24;
-	static const uint16 MAP_SHARED_BANK_SIZE = 2;
-	static const uint16 MAP_TRADE_SIZE = 8;
-	static const uint16 MAP_WORLD_SIZE = 10;
-	static const uint16 MAP_LIMBO_SIZE = 36;
-	static const uint16 MAP_TRIBUTE_SIZE = 5; // (need client values)
-	static const uint16 MAP_TROPHY_TRIBUTE_SIZE = 0;
-	static const uint16 MAP_GUILD_TRIBUTE_SIZE = 0;
-	static const uint16 MAP_MERCHANT_SIZE = 0;
-	static const uint16 MAP_DELETED_SIZE = 0;
-	static const uint16 MAP_CORPSE_SIZE = _MainCount; // no bitmask use..limits to size of client corpse window (see EQLimits::InventoryMapSize(MapCorpse, <EQClientVersion))
-	static const uint16 MAP_BAZAAR_SIZE = 80;
-	static const uint16 MAP_INSPECT_SIZE = 22;
-	static const uint16 MAP_REAL_ESTATE_SIZE = 0;
-	static const uint16 MAP_VIEW_MOD_PC_SIZE = NOT_USED;
-	static const uint16 MAP_VIEW_MOD_BANK_SIZE = NOT_USED;
-	static const uint16 MAP_VIEW_MOD_SHARED_BANK_SIZE = NOT_USED;
-	static const uint16 MAP_VIEW_MOD_LIMBO_SIZE = NOT_USED;
-	static const uint16 MAP_ALT_STORAGE_SIZE = 0;
-	static const uint16 MAP_ARCHIVED_SIZE = 0;
-	static const uint16 MAP_MAIL_SIZE = 0;
-	static const uint16 MAP_GUILD_TROPHY_TRIBUTE_SIZE = 0;
-	static const uint16 MAP_KRONO_SIZE = 0;
-	static const uint16 MAP_OTHER_SIZE = 0;
-
-	// most of these definitions will go away with the structure-based system..this maintains compatibility for now
-	// (these are mainly to assign specific values to constants used in conversions and to identify per-client ranges/offsets)
-	static const int16 EQUIPMENT_BEGIN = MainCharm;
-	static const int16 EQUIPMENT_END = MainAmmo;
-	static const uint16 EQUIPMENT_SIZE = 22; // does not account for 'Power Source' - used mainly for npc equipment arrays
-
-	static const int16 GENERAL_BEGIN = MainGeneral1;
-	static const int16 GENERAL_END = MainGeneral8;
-	static const uint16 GENERAL_SIZE = 8;
-	static const int16 GENERAL_BAGS_BEGIN = 251;
-	static const int16 GENERAL_BAGS_END_OFFSET = 79;
-	static const int16 GENERAL_BAGS_END = GENERAL_BAGS_BEGIN + GENERAL_BAGS_END_OFFSET;
-
-	static const int16 CURSOR_BAG_BEGIN = 331;
-	static const int16 CURSOR_BAG_END_OFFSET = 9;
-	static const int16 CURSOR_BAG_END = CURSOR_BAG_BEGIN + CURSOR_BAG_END_OFFSET;
-
-	static const int16 BANK_BEGIN = 2000;
-	static const int16 BANK_END = 2023;
-	static const int16 BANK_BAGS_BEGIN = 2031;
-	static const int16 BANK_BAGS_END_OFFSET = 239;
-	static const int16 BANK_BAGS_END = BANK_BAGS_BEGIN + BANK_BAGS_END_OFFSET;
-
-	static const int16 SHARED_BANK_BEGIN = 2500;
-	static const int16 SHARED_BANK_END = 2501;
-	static const int16 SHARED_BANK_BAGS_BEGIN = 2531;
-	static const int16 SHARED_BANK_BAGS_END_OFFSET = 19;
-	static const int16 SHARED_BANK_BAGS_END = SHARED_BANK_BAGS_BEGIN + SHARED_BANK_BAGS_END_OFFSET;
-
-	static const int16 TRADE_BEGIN = 3000;
-	static const int16 TRADE_END = 3007;
-	static const int16 TRADE_NPC_END = 3003;
-	static const int16 TRADE_BAGS_BEGIN = 3031;
-	static const int16 TRADE_BAGS_END_OFFSET = 79;
-	static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET;
-
-	static const int16 WORLD_BEGIN = 4000;
-	static const int16 WORLD_END = 4009;
-	static const int16 WORLD_SIZE = MAP_WORLD_SIZE;
-
-	static const int16 TRIBUTE_BEGIN = 400;
-	static const int16 TRIBUTE_END = 404;
-	static const int16 TRIBUTE_SIZE = MAP_TRIBUTE_SIZE;
-
-	static const int16 CORPSE_BEGIN = 22;
-	//static const int16 CORPSE_END = RoF::consts::CORPSE_END; // not ready for use
-
-	static const int16 MATERIAL_BEGIN = MaterialHead;
-	static const int16 MATERIAL_END = MaterialSecondary;
-	static const int16 MATERIAL_TINT_END = MaterialFeet;
-	static const int16 MATERIAL_SIZE = _MaterialCount;
-
-	// items
-	// common and container sizes will not increase until the new 'location' struct is implemented
-	static const uint16 ITEM_COMMON_SIZE = RoF::consts::ITEM_COMMON_SIZE;
-	static const uint16 ITEM_CONTAINER_SIZE = Titanium::consts::ITEM_CONTAINER_SIZE;
-
-	// BANDOLIERS_SIZE sets maximum limit..active limit will need to be handled by the appropriate AA or spell (or item?)
-	static const size_t BANDOLIERS_SIZE = RoF2::consts::BANDOLIERS_SIZE;			// number of bandolier instances
-	static const size_t BANDOLIER_ITEM_COUNT = RoF2::consts::BANDOLIER_ITEM_COUNT;	// number of equipment slots in bandolier instance
-
-	// POTION_BELT_SIZE sets maximum limit..active limit will need to be handled by the appropriate AA or spell (or item?)
-	static const size_t POTION_BELT_ITEM_COUNT = RoF2::consts::POTION_BELT_ITEM_COUNT;
-
-	static const size_t TEXT_LINK_BODY_LENGTH = RoF2::consts::TEXT_LINK_BODY_LENGTH;
-};
-
-class EQLimits
-{
-	// values should default to a non-beneficial value..unless value conflicts with intended operation
-	//
-	// EmuConstants may be used as references..but, not every reference needs to be in EmuConstants (i.e., AllowsEmptyBagInBag(), CoinHasWeight(), etc...)
-public:
-	// client version validation (checks to avoid crashing zone server when accessing reference arrays)
-	// use this inside of class Client (limits to actual clients)
-	static bool IsValidPCClientVersion(ClientVersion clientVersion);
-	static ClientVersion ValidatePCClientVersion(ClientVersion clientVersion);
-
-	// basically..any non-client classes - do not when setting a valid client
-	static bool IsValidNPCClientVersion(ClientVersion clientVersion);
-	static ClientVersion ValidateNPCClientVersion(ClientVersion clientVersion);
-
-	// these are 'universal' - do not when setting a valid client
-	static bool IsValidMobClientVersion(ClientVersion clientVersion);
-	static ClientVersion ValidateMobClientVersion(ClientVersion clientVersion);
-
-	// database
-	static size_t CharacterCreationLimit(ClientVersion clientVersion);
-
-	// inventory
-	static uint16 InventoryMapSize(int16 indexMap, ClientVersion clientVersion);
-	static uint64 PossessionsBitmask(ClientVersion clientVersion);
-	static uint64 EquipmentBitmask(ClientVersion clientVersion);
-	static uint64 GeneralBitmask(ClientVersion clientVersion);
-	static uint64 CursorBitmask(ClientVersion clientVersion);
-
-	static bool AllowsEmptyBagInBag(ClientVersion clientVersion);
-	static bool AllowsClickCastFromBag(ClientVersion clientVersion);
-
-	// items
-	static uint16 ItemCommonSize(ClientVersion clientVersion);
-	static uint16 ItemContainerSize(ClientVersion clientVersion);
-
-	// player profile
-	static bool CoinHasWeight(ClientVersion clientVersion);
-};
-
-#endif /* EQ_DICTIONARY_H */
-
-/*
-Working Notes:
--------------
-
- full review of client_packet.cpp and client translators needed
-
-
-*/
@@ -0,0 +1,983 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "emu_constants.h"
+#include "emu_limits.h"
+
+
+static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versions::ClientVersionCount] =
+{
+	{
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null
+	},
+	{
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null
+	},
+	{
+		Titanium::constants::CharacterCreationLimit,
+		Titanium::constants::LongBuffs,
+		Titanium::constants::ShortBuffs,
+		Titanium::constants::DiscBuffs,
+		Titanium::constants::TotalBuffs,
+		Titanium::constants::NPCBuffs,
+		Titanium::constants::PetBuffs,
+		Titanium::constants::MercBuffs
+	},
+	{
+		SoF::constants::CharacterCreationLimit,
+		SoF::constants::LongBuffs,
+		SoF::constants::ShortBuffs,
+		SoF::constants::DiscBuffs,
+		SoF::constants::TotalBuffs,
+		SoF::constants::NPCBuffs,
+		SoF::constants::PetBuffs,
+		SoF::constants::MercBuffs
+	},
+	{
+		SoD::constants::CharacterCreationLimit,
+		SoD::constants::LongBuffs,
+		SoD::constants::ShortBuffs,
+		SoD::constants::DiscBuffs,
+		SoD::constants::TotalBuffs,
+		SoD::constants::NPCBuffs,
+		SoD::constants::PetBuffs,
+		SoD::constants::MercBuffs
+	},
+	{
+		UF::constants::CharacterCreationLimit,
+		UF::constants::LongBuffs,
+		UF::constants::ShortBuffs,
+		UF::constants::DiscBuffs,
+		UF::constants::TotalBuffs,
+		UF::constants::NPCBuffs,
+		UF::constants::PetBuffs,
+		UF::constants::MercBuffs
+	},
+	{
+		RoF::constants::CharacterCreationLimit,
+		RoF::constants::LongBuffs,
+		RoF::constants::ShortBuffs,
+		RoF::constants::DiscBuffs,
+		RoF::constants::TotalBuffs,
+		RoF::constants::NPCBuffs,
+		RoF::constants::PetBuffs,
+		RoF::constants::MercBuffs
+	},
+	{
+		RoF2::constants::CharacterCreationLimit,
+		RoF2::constants::LongBuffs,
+		RoF2::constants::ShortBuffs,
+		RoF2::constants::DiscBuffs,
+		RoF2::constants::TotalBuffs,
+		RoF2::constants::NPCBuffs,
+		RoF2::constants::PetBuffs,
+		RoF2::constants::MercBuffs
+	}
+};
+
+const EQEmu::constants::LookupEntry* EQEmu::constants::Lookup(versions::ClientVersion client_version)
+{
+	return &constants_lookup_entries[static_cast<int>(versions::ValidateClientVersion(client_version))];
+}
+
+static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versions::MobVersionCount] =
+{
+	{
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+		ClientUnknown::Null,
+
+		ClientUnknown::False,
+		ClientUnknown::False,
+		ClientUnknown::False,
+		ClientUnknown::False
+	},
+	{
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+
+		Client62::Null,
+		Client62::Null,
+		Client62::Null,
+
+		Client62::False,
+		Client62::False,
+		Client62::False,
+		Client62::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*Titanium::invtype::InvTypePossessionsSize,*/
+		Titanium::invtype::InvTypeBankSize,
+		Titanium::invtype::InvTypeSharedBankSize,
+		Titanium::invtype::InvTypeTradeSize,
+		Titanium::invtype::InvTypeWorldSize,
+		Titanium::invtype::InvTypeLimboSize,
+		Titanium::invtype::InvTypeTributeSize,
+		Titanium::Null,
+		Titanium::Null, /*Titanium::invtype::InvTypeGuildTributeSize,*/
+		Titanium::invtype::InvTypeMerchantSize,
+		Titanium::Null,
+		Titanium::invtype::InvTypeCorpseSize,
+		EQEmu::legacy::TYPE_BAZAAR_SIZE, /*Titanium::invtype::InvTypeBazaarSize,*/
+		Titanium::invtype::InvTypeInspectSize,
+		Titanium::Null,
+		Titanium::invtype::InvTypeViewMODPCSize,
+		Titanium::invtype::InvTypeViewMODBankSize,
+		Titanium::invtype::InvTypeViewMODSharedBankSize,
+		Titanium::invtype::InvTypeViewMODLimboSize,
+		Titanium::invtype::InvTypeAltStorageSize,
+		Titanium::invtype::InvTypeArchivedSize,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::invtype::InvTypeOtherSize,
+
+		Titanium::Null, /*0x000000027FDFFFFF,*/
+		EQEmu::inventory::ContainerCount, /*Titanium::invbag::ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*Titanium::invaug::ItemAugSize,*/
+
+		Titanium::inventory::AllowEmptyBagInBag,
+		Titanium::inventory::AllowClickCastFromBag,
+		Titanium::inventory::ConcatenateInvTypeLimbo,
+		Titanium::inventory::AllowOverLevelEquipment
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*SoF::invtype::InvTypePossessionsSize,*/
+		SoF::invtype::InvTypeBankSize,
+		SoF::invtype::InvTypeSharedBankSize,
+		SoF::invtype::InvTypeTradeSize,
+		SoF::invtype::InvTypeWorldSize,
+		SoF::invtype::InvTypeLimboSize,
+		SoF::invtype::InvTypeTributeSize,
+		SoF::Null,
+		SoF::Null, /*SoF::invtype::InvTypeGuildTributeSize,*/
+		SoF::invtype::InvTypeMerchantSize,
+		SoF::Null,
+		SoF::invtype::InvTypeCorpseSize,
+		EQEmu::legacy::TYPE_BAZAAR_SIZE, /*SoF::invtype::InvTypeBazaarSize,*/
+		SoF::invtype::InvTypeInspectSize,
+		SoF::Null,
+		SoF::invtype::InvTypeViewMODPCSize,
+		SoF::invtype::InvTypeViewMODBankSize,
+		SoF::invtype::InvTypeViewMODSharedBankSize,
+		SoF::invtype::InvTypeViewMODLimboSize,
+		SoF::invtype::InvTypeAltStorageSize,
+		SoF::invtype::InvTypeArchivedSize, SoF::Null, SoF::Null, SoF::Null, SoF::invtype::InvTypeOtherSize,
+
+		SoF::Null, /*0x000000027FFFFFFF,*/
+		EQEmu::inventory::ContainerCount, /*SoF::invbag::ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*SoF::invaug::ItemAugSize,*/
+
+		SoF::inventory::AllowEmptyBagInBag,
+		SoF::inventory::AllowClickCastFromBag,
+		SoF::inventory::ConcatenateInvTypeLimbo,
+		SoF::inventory::AllowOverLevelEquipment
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*SoD::invtype::InvTypePossessionsSize,*/
+		SoD::invtype::InvTypeBankSize,
+		SoD::invtype::InvTypeSharedBankSize,
+		SoD::invtype::InvTypeTradeSize,
+		SoD::invtype::InvTypeWorldSize,
+		SoD::invtype::InvTypeLimboSize,
+		SoD::invtype::InvTypeTributeSize,
+		SoD::Null,
+		SoD::Null, /*SoD::invtype::InvTypeGuildTributeSize,*/
+		SoD::invtype::InvTypeMerchantSize,
+		SoD::Null,
+		SoD::invtype::InvTypeCorpseSize,
+		EQEmu::legacy::TYPE_BAZAAR_SIZE, /*SoD::invtype::InvTypeBazaarSize,*/
+		SoD::invtype::InvTypeInspectSize,
+		SoD::Null,
+		SoD::invtype::InvTypeViewMODPCSize,
+		SoD::invtype::InvTypeViewMODBankSize,
+		SoD::invtype::InvTypeViewMODSharedBankSize,
+		SoD::invtype::InvTypeViewMODLimboSize,
+		SoD::invtype::InvTypeAltStorageSize,
+		SoD::invtype::InvTypeArchivedSize,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::invtype::InvTypeOtherSize,
+
+		SoD::Null, /*0x000000027FFFFFFF,*/
+		EQEmu::inventory::ContainerCount, /*SoD::invbag::ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*SoD::invaug::ItemAugSize,*/
+
+		SoD::inventory::AllowEmptyBagInBag,
+		SoD::inventory::AllowClickCastFromBag,
+		SoD::inventory::ConcatenateInvTypeLimbo,
+		SoD::inventory::AllowOverLevelEquipment
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*UF::invtype::InvTypePossessionsSize,*/
+		UF::invtype::InvTypeBankSize,
+		UF::invtype::InvTypeSharedBankSize,
+		UF::invtype::InvTypeTradeSize,
+		UF::invtype::InvTypeWorldSize,
+		UF::invtype::InvTypeLimboSize,
+		UF::invtype::InvTypeTributeSize,
+		UF::Null,
+		UF::Null, /*UF::invtype::InvTypeGuildTributeSize,*/
+		UF::invtype::InvTypeMerchantSize,
+		UF::Null,
+		UF::invtype::InvTypeCorpseSize,
+		EQEmu::legacy::TYPE_BAZAAR_SIZE, /*UF::invtype::InvTypeBazaarSize,*/
+		UF::invtype::InvTypeInspectSize,
+		UF::Null,
+		UF::invtype::InvTypeViewMODPCSize,
+		UF::invtype::InvTypeViewMODBankSize,
+		UF::invtype::InvTypeViewMODSharedBankSize,
+		UF::invtype::InvTypeViewMODLimboSize,
+		UF::invtype::InvTypeAltStorageSize,
+		UF::invtype::InvTypeArchivedSize,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::invtype::InvTypeOtherSize,
+
+		UF::Null, /*0x000000027FFFFFFF,*/
+		EQEmu::inventory::ContainerCount, /*UF::invbag::ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*UF::invaug::ItemAugSize,*/
+
+		UF::inventory::AllowEmptyBagInBag,
+		UF::inventory::AllowClickCastFromBag,
+		UF::inventory::ConcatenateInvTypeLimbo,
+		UF::inventory::AllowOverLevelEquipment
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*RoF::invtype::InvTypePossessionsSize,*/
+		RoF::invtype::InvTypeBankSize,
+		RoF::invtype::InvTypeSharedBankSize,
+		RoF::invtype::InvTypeTradeSize,
+		RoF::invtype::InvTypeWorldSize,
+		RoF::invtype::InvTypeLimboSize,
+		RoF::invtype::InvTypeTributeSize,
+		RoF::Null, /*RoF::invtype::InvTypeTrophyTributeSize,*/
+		RoF::Null, /*RoF::invtype::InvTypeGuildTributeSize,*/
+		RoF::invtype::InvTypeMerchantSize,
+		RoF::Null, /*RoF::invtype::InvTypeDeletedSize,*/
+		RoF::invtype::InvTypeCorpseSize,
+		EQEmu::legacy::TYPE_BAZAAR_SIZE, /*RoF::invtype::InvTypeBazaarSize,*/
+		RoF::invtype::InvTypeInspectSize,
+		RoF::Null, /*RoF::invtype::InvTypeRealEstateSize,*/
+		RoF::invtype::InvTypeViewMODPCSize,
+		RoF::invtype::InvTypeViewMODBankSize,
+		RoF::invtype::InvTypeViewMODSharedBankSize,
+		RoF::invtype::InvTypeViewMODLimboSize,
+		RoF::invtype::InvTypeAltStorageSize,
+		RoF::invtype::InvTypeArchivedSize,
+		RoF::invtype::InvTypeMailSize,
+		RoF::invtype::InvTypeGuildTrophyTributeSize,
+		RoF::Null,
+		RoF::invtype::InvTypeOtherSize,
+
+		RoF::Null, /*0x00000003FFFFFFFF,*/
+		EQEmu::inventory::ContainerCount, /*RoF::invbag::ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*RoF::invaug::ItemAugSize,*/
+
+		RoF::False, /*RoF::inventory::AllowEmptyBagInBag,*/
+		RoF::inventory::AllowClickCastFromBag,
+		RoF::inventory::ConcatenateInvTypeLimbo,
+		RoF::inventory::AllowOverLevelEquipment
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*RoF2::invtype::InvTypePossessionsSize,*/
+		RoF2::invtype::InvTypeBankSize,
+		RoF2::invtype::InvTypeSharedBankSize,
+		RoF2::invtype::InvTypeTradeSize,
+		RoF2::invtype::InvTypeWorldSize,
+		RoF2::invtype::InvTypeLimboSize,
+		RoF2::invtype::InvTypeTributeSize,
+		RoF2::Null, /*RoF2::invtype::InvTypeTrophyTributeSize,*/
+		RoF2::Null, /*RoF2::invtype::InvTypeGuildTributeSize,*/
+		RoF2::invtype::InvTypeMerchantSize,
+		RoF2::Null, /*RoF2::invtype::InvTypeDeletedSize,*/
+		RoF2::invtype::InvTypeCorpseSize,
+		EQEmu::legacy::TYPE_BAZAAR_SIZE, /*RoF2::invtype::InvTypeBazaarSize,*/
+		RoF2::invtype::InvTypeInspectSize,
+		RoF2::Null, /*RoF2::invtype::InvTypeRealEstateSize*/
+		RoF2::invtype::InvTypeViewMODPCSize,
+		RoF2::invtype::InvTypeViewMODBankSize,
+		RoF2::invtype::InvTypeViewMODSharedBankSize,
+		RoF2::invtype::InvTypeViewMODLimboSize,
+		RoF2::invtype::InvTypeAltStorageSize,
+		RoF2::invtype::InvTypeArchivedSize,
+		RoF2::invtype::InvTypeMailSize,
+		RoF2::invtype::InvTypeGuildTrophyTributeSize,
+		RoF2::invtype::InvTypeKronoSize,
+		RoF2::invtype::InvTypeOtherSize,
+
+		RoF2::Null, /*0x00000003FFFFFFFF,*/
+		EQEmu::inventory::ContainerCount, /*RoF2::invbag::ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*RoF2::invaug::ItemAugSize,*/
+
+		RoF2::False, /*RoF2::inventory::AllowEmptyBagInBag,*/
+		RoF2::inventory::AllowClickCastFromBag,
+		RoF2::inventory::ConcatenateInvTypeLimbo,
+		RoF2::inventory::AllowOverLevelEquipment
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::InvTypeTradeSize,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+		EntityLimits::NPC::Null,
+
+		EntityLimits::NPC::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::NPC::False,
+		EntityLimits::NPC::False,
+		EntityLimits::NPC::False,
+		EntityLimits::NPC::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::InvTypeTradeSize,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+		EntityLimits::NPCMerchant::Null,
+
+		EntityLimits::NPCMerchant::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::NPCMerchant::False,
+		EntityLimits::NPCMerchant::False,
+		EntityLimits::NPCMerchant::False,
+		EntityLimits::NPCMerchant::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::InvTypeTradeSize,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+		EntityLimits::Merc::Null,
+
+		EntityLimits::Merc::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::Merc::False,
+		EntityLimits::Merc::False,
+		EntityLimits::Merc::False,
+		EntityLimits::Merc::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::InvTypeTradeSize,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null, 
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+		EntityLimits::Bot::Null,
+
+		EntityLimits::Bot::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::Bot::False,
+		EntityLimits::Bot::False,
+		EntityLimits::Bot::False,
+		EntityLimits::Bot::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::InvTypeTradeSize,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+		EntityLimits::ClientPet::Null,
+
+		EntityLimits::ClientPet::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::ClientPet::False,
+		EntityLimits::ClientPet::False,
+		EntityLimits::ClientPet::False,
+		EntityLimits::ClientPet::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::InvTypeTradeSize,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+		EntityLimits::NPCPet::Null,
+
+		EntityLimits::NPCPet::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::NPCPet::False,
+		EntityLimits::NPCPet::False,
+		EntityLimits::NPCPet::False,
+		EntityLimits::NPCPet::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::InvTypeTradeSize,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+		EntityLimits::MercPet::Null,
+
+		EntityLimits::MercPet::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::MercPet::False,
+		EntityLimits::MercPet::False,
+		EntityLimits::MercPet::False,
+		EntityLimits::MercPet::False
+	},
+	{
+		EQEmu::legacy::TYPE_POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::InvTypeTradeSize,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null, /*InvTypeCorpseSize,*/
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+		EntityLimits::BotPet::Null,
+
+		EntityLimits::BotPet::Null,
+		EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
+		EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+
+		EntityLimits::BotPet::False,
+		EntityLimits::BotPet::False,
+		EntityLimits::BotPet::False,
+		EntityLimits::BotPet::False
+	},
+	{ // OfflineTitanium
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::invtype::InvTypeTradeSize,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::invtype::InvTypeMerchantSize,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null, /*Titanium::invtype::InvTypeBazaarSize,*/
+		Titanium::invtype::InvTypeInspectSize,
+		Titanium::Null,
+		Titanium::invtype::InvTypeViewMODPCSize,
+		Titanium::invtype::InvTypeViewMODBankSize,
+		Titanium::invtype::InvTypeViewMODSharedBankSize,
+		Titanium::invtype::InvTypeViewMODLimboSize,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+		Titanium::Null,
+
+		Titanium::Null,
+		EQEmu::inventory::ContainerCount, /*Titanium::Null,*/
+		Titanium::Null,
+
+		Titanium::False,
+		Titanium::False,
+		Titanium::False,
+		Titanium::False
+	},
+	{ // OfflineSoF
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::invtype::InvTypeTradeSize,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::invtype::InvTypeMerchantSize,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null, /*SoF::invtype::InvTypeBazaarSize,*/
+		SoF::invtype::InvTypeInspectSize,
+		SoF::Null,
+		SoF::invtype::InvTypeViewMODPCSize,
+		SoF::invtype::InvTypeViewMODBankSize,
+		SoF::invtype::InvTypeViewMODSharedBankSize,
+		SoF::invtype::InvTypeViewMODLimboSize,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+		SoF::Null,
+
+		SoF::Null,
+		EQEmu::inventory::ContainerCount, /*SoF::Null,*/
+		SoF::Null,
+
+		SoF::False,
+		SoF::False,
+		SoF::False,
+		SoF::False
+	},
+	{ // OfflineSoD
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::invtype::InvTypeTradeSize,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::invtype::InvTypeMerchantSize,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null, /*SoD::invtype::InvTypeBazaarSize,*/
+		SoD::invtype::InvTypeInspectSize,
+		SoD::Null,
+		SoD::invtype::InvTypeViewMODPCSize,
+		SoD::invtype::InvTypeViewMODBankSize,
+		SoD::invtype::InvTypeViewMODSharedBankSize,
+		SoD::invtype::InvTypeViewMODLimboSize,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+		SoD::Null,
+
+		SoD::Null,
+		EQEmu::inventory::ContainerCount, /*SoD::Null,*/
+		SoD::Null,
+
+		SoD::False,
+		SoD::False,
+		SoD::False,
+		SoD::False
+	},
+	{ // OfflineUF
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::invtype::InvTypeTradeSize,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::invtype::InvTypeMerchantSize,
+		UF::Null,
+		UF::Null,
+		UF::Null, /*UF::invtype::InvTypeBazaarSize,*/
+		UF::invtype::InvTypeInspectSize,
+		UF::Null,
+		UF::invtype::InvTypeViewMODPCSize,
+		UF::invtype::InvTypeViewMODBankSize,
+		UF::invtype::InvTypeViewMODSharedBankSize,
+		UF::invtype::InvTypeViewMODLimboSize,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+		UF::Null,
+
+		UF::Null,
+		EQEmu::inventory::ContainerCount, /*UF::Null,*/
+		UF::Null,
+
+		UF::False,
+		UF::False,
+		UF::False,
+		UF::False
+	},
+	{ // OfflineRoF
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::invtype::InvTypeTradeSize,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::invtype::InvTypeMerchantSize,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null, /*RoF::invtype::InvTypeBazaarSize,*/
+		RoF::invtype::InvTypeInspectSize,
+		RoF::Null,
+		RoF::invtype::InvTypeViewMODPCSize,
+		RoF::invtype::InvTypeViewMODBankSize,
+		RoF::invtype::InvTypeViewMODSharedBankSize,
+		RoF::invtype::InvTypeViewMODLimboSize,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+		RoF::Null,
+
+		RoF::Null,
+		EQEmu::inventory::ContainerCount, /*RoF::Null,*/
+		RoF::Null,
+
+		RoF::False,
+		RoF::False,
+		RoF::False,
+		RoF::False
+	},
+	{ // OfflineRoF2
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::invtype::InvTypeTradeSize,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::invtype::InvTypeMerchantSize,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null, /*RoF2::invtype::InvTypeBazaarSize,*/
+		RoF2::invtype::InvTypeInspectSize,
+		RoF2::Null,
+		RoF2::invtype::InvTypeViewMODPCSize,
+		RoF2::invtype::InvTypeViewMODBankSize,
+		RoF2::invtype::InvTypeViewMODSharedBankSize,
+		RoF2::invtype::InvTypeViewMODLimboSize,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+		RoF2::Null,
+
+		RoF2::Null,
+		EQEmu::inventory::ContainerCount, /*RoF2::Null,*/
+		RoF2::Null,
+
+		RoF2::False,
+		RoF2::False,
+		RoF2::False,
+		RoF2::False
+	}
+};
+
+const EQEmu::inventory::LookupEntry* EQEmu::inventory::Lookup(versions::MobVersion mob_version)
+{
+	return &inventory_lookup_entries[static_cast<int>(versions::ValidateMobVersion(mob_version))];
+}
+
+static const EQEmu::behavior::LookupEntry behavior_lookup_entries[EQEmu::versions::MobVersionCount] =
+{
+	{ // Unknown
+		ClientUnknown::True
+	},
+	{ // Client62
+		Client62::True
+	},
+	{ // Titanium
+		Titanium::behavior::CoinHasWeight
+	},
+	{ // SoF
+		SoF::behavior::CoinHasWeight
+	},
+	{ // SoD
+		SoD::behavior::CoinHasWeight
+	},
+	{ // UF
+		UF::behavior::CoinHasWeight
+	},
+	{ // RoF
+		RoF::behavior::CoinHasWeight
+	},
+	{ // RoF2
+		RoF2::behavior::CoinHasWeight
+	},
+	{ // NPC
+		EntityLimits::NPC::True /*CoinHasWeight*/
+	},
+	{ // NPCMerchant
+		EntityLimits::NPC::True /*CoinHasWeight*/
+	},
+	{ // Merc
+		EntityLimits::Merc::True /*CoinHasWeight*/
+	},
+	{ // Bot
+		EntityLimits::Bot::True /*CoinHasWeight*/
+	},
+	{ // ClientPet
+		EntityLimits::ClientPet::True /*CoinHasWeight*/
+	},
+	{ // NPCPet
+		EntityLimits::NPCPet::True /*CoinHasWeight*/
+	},
+	{ // MercPet
+		EntityLimits::MercPet::True /*CoinHasWeight*/
+	},
+	{ // BotPet
+		EntityLimits::BotPet::True /*CoinHasWeight*/
+	},
+	{ // OfflineTitanium
+		Titanium::False
+	},
+	{ // OfflineSoF
+		SoF::False
+	},
+	{ // OfflineSoD
+		SoD::False
+	},
+	{ // OfflineUF
+		UF::False
+	},
+	{ // OfflineRoF
+		RoF::False
+	},
+	{ // OfflineRoF2
+		RoF2::False
+	}
+};
+
+const EQEmu::behavior::LookupEntry* EQEmu::behavior::Lookup(versions::MobVersion mob_version)
+{
+	return &behavior_lookup_entries[static_cast<int>(versions::ValidateMobVersion(mob_version))];
+}
@@ -0,0 +1,101 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_EQ_LIMITS_H
+#define COMMON_EQ_LIMITS_H
+
+#include "emu_legacy.h"
+#include "types.h"
+#include "eq_constants.h"
+#include "emu_versions.h"
+#include "../common/patches/titanium_limits.h"
+#include "../common/patches/sof_limits.h"
+#include "../common/patches/sod_limits.h"
+#include "../common/patches/uf_limits.h"
+#include "../common/patches/rof_limits.h"
+#include "../common/patches/rof2_limits.h"
+
+
+namespace EQEmu
+{
+	namespace constants {
+		class LookupEntry {
+		public:
+			size_t CharacterCreationLimit;
+			int LongBuffs;
+			int ShortBuffs;
+			int DiscBuffs;
+			int TotalBuffs;
+			int NPCBuffs;
+			int PetBuffs;
+			int MercBuffs;
+		};
+
+		const LookupEntry* Lookup(versions::ClientVersion client_version);
+
+	} /*constants*/
+	
+	namespace inventory {
+		class LookupEntry {
+		public:
+			size_t InventoryTypeSize[25]; // should reflect EQEmu::inventory::typeCount referenced in emu_constants.h
+
+			uint64 PossessionsBitmask;
+			size_t ItemBagSize;
+			size_t ItemAugSize;
+
+			bool AllowEmptyBagInBag;
+			bool AllowClickCastFromBag;
+			bool ConcatenateInvTypeLimbo;
+			bool AllowOverLevelEquipment;
+		};
+
+		const LookupEntry* Lookup(versions::MobVersion mob_version);
+
+	} /*inventory*/
+	
+	namespace behavior {
+		class LookupEntry {
+		public:
+			bool CoinHasWeight;
+		};
+
+		const LookupEntry* Lookup(versions::MobVersion mob_version);
+
+	} /*behavior*/
+
+} /*EQEmu*/
+
+namespace ClientUnknown
+{
+	enum : int { Invalid = -1, Null, Safety };
+
+	enum : bool { False = false, True = true };
+
+} /*ClientUnknown*/
+
+namespace Client62
+{
+	enum : int { Invalid = -1, Null, Safety };
+
+	enum : bool { False = false, True = true };
+
+} /*Client62*/
+
+#endif /*COMMON_EQ_LIMITS_H*/
@@ -260,7 +260,7 @@ bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
 bool result=false;
 	if (opcode==OP_Combined && size+rhs->size+5<256) {
-		unsigned char *tmpbuffer=new unsigned char [size+rhs->size+3];
+		auto tmpbuffer = new unsigned char[size + rhs->size + 3];
 		memcpy(tmpbuffer,pBuffer,size);
 		uint32 offset=size;
 		tmpbuffer[offset++]=rhs->Size();
@@ -270,7 +270,7 @@ bool result=false;
 		pBuffer=tmpbuffer;
 		result=true;
 	} else if (size+rhs->size+7<256) {
-		unsigned char *tmpbuffer=new unsigned char [size+rhs->size+6];
+		auto tmpbuffer = new unsigned char[size + rhs->size + 6];
 		uint32 offset=0;
 		tmpbuffer[offset++]=Size();
 		offset+=serialize(tmpbuffer+offset);
@@ -457,7 +457,7 @@ EQApplicationPacket *EQApplicationPacket::Copy() const {
 }

 EQRawApplicationPacket *EQProtocolPacket::MakeAppPacket() const {
-	EQRawApplicationPacket *res = new EQRawApplicationPacket(opcode, pBuffer, size);
+	auto res = new EQRawApplicationPacket(opcode, pBuffer, size);
 	res->copyInfo(this);
 	return(res);
 }
@@ -62,7 +62,7 @@ class EQProtocolPacket : public BasePacket {
 	friend class EQStream;
 	friend class EQStreamPair;
 public:
-	EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len) : BasePacket(buf,len), opcode(op) { acked = false; }
+	EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len) : BasePacket(buf, len), opcode(op) { acked = false; sent_time = 0; }
 //	EQProtocolPacket(const unsigned char *buf, uint32 len);
 	bool combine(const EQProtocolPacket *rhs);
 	uint32 serialize (unsigned char *dest) const;
@@ -70,6 +70,7 @@ public:
 	EQRawApplicationPacket *MakeAppPacket() const;

 	bool acked;
+	uint32 sent_time;

 	virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const;
 	virtual void build_header_dump(char *buffer) const;
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net)
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -25,16 +25,17 @@
 #include <list>
 #include <time.h>
 #include "../common/version.h"
-//#include "../common/item_struct.h"
+#include "emu_constants.h"
+#include "textures.h"
+

 static const uint32 BUFF_COUNT = 25;
+static const uint32 PET_BUFF_COUNT = 30;
 static const uint32 MAX_MERC = 100;
 static const uint32 MAX_MERC_GRADES = 10;
 static const uint32 MAX_MERC_STANCES = 10;
 static const uint32 BLOCKED_BUFF_COUNT = 20;

-//#include "eq_constants.h"
-#include "eq_dictionary.h"

 /*
 ** Compiler override to ensure
@@ -126,37 +127,7 @@ struct LDoNTrapTemplate

 // All clients translate the character select information to some degree

-struct Color_Struct
-{
-	union {
-		struct {
-			uint8 Blue;
-			uint8 Green;
-			uint8 Red;
-			uint8 UseTint;	// if there's a tint this is FF
-		} RGB;
-		uint32 Color;
-	};
-};
-
-struct EquipStruct
-{
-	uint32 Material;
-	uint32 Unknown1;
-	uint32 EliteMaterial;
-	uint32 HeroForgeModel;
-	uint32 Material2;	// Same as material?
-};
-
-struct CharSelectEquip
-{
-	uint32 Material;
-	uint32 Unknown1;
-	uint32 EliteMaterial;
-	uint32 HeroForgeModel;
-	uint32 Material2;
-	Color_Struct Color;
-};
+struct CharSelectEquip : EQEmu::textures::Texture_Struct, EQEmu::textures::Tint_Struct {};

 // RoF2-based hybrid struct
 struct CharacterSelectEntry_Struct
@@ -171,7 +142,7 @@ struct CharacterSelectEntry_Struct
 	uint16 Instance;
 	uint8 Gender;
 	uint8 Face;
-	CharSelectEquip	Equip[9];
+	CharSelectEquip	Equip[EQEmu::textures::materialCount];
 	uint8 Unknown15;			// Seen FF
 	uint8 Unknown19;			// Seen FF
 	uint32 DrakkinTattoo;
@@ -280,22 +251,7 @@ struct Spawn_Struct {
 /*0189*/ uint32	petOwnerId;			// If this is a pet, the spawn id of owner
 /*0193*/ uint8	guildrank;			// 0=normal, 1=officer, 2=leader
 /*0194*/ uint8	unknown0194[3];
-/*0197*/ union
-{
-	struct
-	{
-		/*0000*/ EquipStruct equip_helmet;     // Equipment: Helmet visual
-		/*0000*/ EquipStruct equip_chest;      // Equipment: Chest visual
-		/*0000*/ EquipStruct equip_arms;       // Equipment: Arms visual
-		/*0000*/ EquipStruct equip_bracers;    // Equipment: Wrist visual
-		/*0000*/ EquipStruct equip_hands;      // Equipment: Hands visual
-		/*0000*/ EquipStruct equip_legs;       // Equipment: Legs visual
-		/*0000*/ EquipStruct equip_feet;       // Equipment: Boots visual
-		/*0000*/ EquipStruct equip_primary;    // Equipment: Main visual
-		/*0000*/ EquipStruct equip_secondary;  // Equipment: Off visual
-	} equip;
-	/*0000*/ EquipStruct equipment[_MaterialCount];
-};
+/*0197*/ EQEmu::TextureProfile equipment;
 /*0233*/ float	runspeed;		// Speed when running
 /*0036*/ uint8	afk;			// 0=no, 1=afk
 /*0238*/ uint32	guildID;		// Current guild
@@ -326,22 +282,7 @@ union
 /*0340*/ uint32 spawnId;		// Spawn Id
 /*0344*/ uint8 unknown0344[3];
 /*0347*/ uint8 IsMercenary;
-/*0348*/ union
-		 {
-			struct
-			{
-				/*0348*/ Color_Struct color_helmet;		// Color of helmet item
-				/*0352*/ Color_Struct color_chest;		// Color of chest item
-				/*0356*/ Color_Struct color_arms;		// Color of arms item
-				/*0360*/ Color_Struct color_bracers;	// Color of bracers item
-				/*0364*/ Color_Struct color_hands;		// Color of hands item
-				/*0368*/ Color_Struct color_legs;		// Color of legs item
-				/*0372*/ Color_Struct color_feet;		// Color of feet item
-				/*0376*/ Color_Struct color_primary;	// Color of primary item
-				/*0380*/ Color_Struct color_secondary;	// Color of secondary item
-			} equipment_colors;
-			/*0348*/ Color_Struct colors[_MaterialCount]; // Array elements correspond to struct equipment_colors above
-		 };
+/*0348*/ EQEmu::TintProfile equipment_tint;
 /*0384*/ uint8	lfg;			// 0=off, 1=lfg on
 /*0385*/

@@ -446,7 +387,19 @@ struct MemorizeSpell_Struct {
 uint32 slot;		// Spot in the spell book/memorized slot
 uint32 spell_id;	// Spell id (200 or c8 is minor healing, etc)
 uint32 scribing;	// 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
-uint32 unknown12;
+uint32 reduction;	// lower reuse
+};
+
+/*
+** Linked Spell Reuse Timer
+** Length: 12
+** Comes before the OP_Memorize
+** Live (maybe TDS steam) has an extra DWORD after timer_id
+*/
+struct LinkedSpellReuseTimer_Struct {
+	uint32 timer_id; // Timer ID of the spell
+	uint32 end_time; // timestamp of when it will be ready
+	uint32 start_time; // timestamp of when it started
 };

 /*
@@ -479,10 +432,11 @@ struct DeleteSpell_Struct

 struct ManaChange_Struct
 {
-	uint32	new_mana; // New Mana AMount
-	uint32	stamina;
-	uint32	spell_id;
-	uint32	unknown12;
+/*00*/	uint32	new_mana;		// New Mana AMount
+/*04*/	uint32	stamina;
+/*08*/	uint32	spell_id;
+/*12*/	uint8	keepcasting;	// won't stop the cast. Change mana while casting?
+/*13*/	uint8	padding[3];		// client doesn't read it, garbage data seems like
 };

 struct SwapSpell_Struct
@@ -548,30 +502,28 @@ struct SpawnAppearance_Struct
 // this is used inside profile
 struct SpellBuff_Struct
 {
-/*000*/	uint8	slotid;		//badly named... seems to be 2 for a real buff, 0 otherwise
-/*001*/ uint8	level;
+/*000*/	uint8	effect_type;	// 0 = no buff, 2 = buff, 4 = inverse affects of buff
+/*001*/	uint8	level;
 /*002*/	uint8	bard_modifier;
-/*003*/	uint8	effect;			//not real
+/*003*/	uint8	unknown003;		// MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking? -- OSX client calls this "activated"
 /*004*/	uint32	spellid;
-/*008*/ int32	duration;
-/*012*/	uint32	counters;
-/*016*/	uint32	player_id;	//'global' ID of the caster, for wearoff messages
-/*020*/
+/*008*/	int32	duration;
+/*012*/	uint32	counters;	// single book keeping value (counters, rune/vie)
+/*016*/	uint32	player_id;	// caster ID, pretty sure just zone ID
+// extra stuff for newer packets
+/*020*/	uint32	num_hits;
+/*024*/	float	y;				// referenced by SPA 441
+/*028*/	float	x;				// unsure if all buffs get them
+/*032*/	float	z;				// as valid data
+/*036*/
 };

-struct SpellBuffFade_Struct {
+struct SpellBuffPacket_Struct {
 /*000*/	uint32 entityid;
-/*004*/	uint8 slot;
-/*005*/	uint8 level;
-/*006*/	uint8 effect;
-/*007*/	uint8 unknown7;
-/*008*/	uint32 spellid;
-/*012*/	int32 duration;
-/*016*/	uint32 num_hits;
-/*020*/	uint32 unknown020;	//prolly global player ID
-/*024*/	uint32 slotid;
-/*028*/	uint32 bufffade;
-/*032*/
+/*004*/	SpellBuff_Struct buff;
+/*040*/	uint32 slotid;
+/*044*/	uint32 bufffade;
+/*048*/
 };

 // Underfoot & later struct.
@@ -584,8 +536,8 @@ struct BuffRemoveRequest_Struct

 struct PetBuff_Struct {
 /*000*/ uint32 petid;
-/*004*/ uint32 spellid[BUFF_COUNT+5];
-/*124*/ int32 ticsremaining[BUFF_COUNT+5];
+/*004*/ uint32 spellid[PET_BUFF_COUNT];
+/*124*/ int32 ticsremaining[PET_BUFF_COUNT];
 /*244*/ uint32 buffcount;
 };

@@ -777,7 +729,7 @@ struct BandolierItem_Struct
 struct Bandolier_Struct
 {
 	char Name[32];
-	BandolierItem_Struct Items[EmuConstants::BANDOLIER_ITEM_COUNT];
+	BandolierItem_Struct Items[EQEmu::legacy::BANDOLIER_ITEM_COUNT];
 };

 //len = 72
@@ -791,7 +743,7 @@ struct PotionBeltItem_Struct
 //len = 288
 struct PotionBelt_Struct
 {
-	PotionBeltItem_Struct Items[EmuConstants::POTION_BELT_ITEM_COUNT];
+	PotionBeltItem_Struct Items[EQEmu::legacy::POTION_BELT_ITEM_COUNT];
 };

 struct MovePotionToBelt_Struct
@@ -882,7 +834,7 @@ struct SuspendedMinion_Struct
 	/*002*/	uint32 HP;
 	/*006*/	uint32 Mana;
 	/*010*/	SpellBuff_Struct Buffs[BUFF_COUNT];
-	/*510*/	uint32 Items[_MaterialCount];
+	/*510*/	EQEmu::TextureMaterialProfile Items;
 	/*546*/	char Name[64];
 	/*610*/
 };
@@ -896,7 +848,7 @@ struct SuspendedMinion_Struct
 */
 static const uint32 MAX_PP_LANGUAGE = 28;
 static const uint32 MAX_PP_SPELLBOOK = 480;	// Set for all functions
-static const uint32 MAX_PP_MEMSPELL = 9; // Set to latest client so functions can work right
+static const uint32 MAX_PP_MEMSPELL = static_cast<uint32>(EQEmu::CastingSlot::MaxGems); // Set to latest client so functions can work right -- 12
 static const uint32 MAX_PP_REF_SPELLBOOK = 480;	// Set for Player Profile size retain
 static const uint32 MAX_PP_REF_MEMSPELL = 9; // Set for Player Profile size retain

@@ -977,7 +929,7 @@ struct PlayerProfile_Struct
 /*0245*/	uint8				guildbanker;
 /*0246*/	uint8				unknown0246[6];		//
 /*0252*/	uint32				intoxication;
-/*0256*/	uint32				spellSlotRefresh[MAX_PP_REF_MEMSPELL];	//in ms
+/*0256*/	uint32				spellSlotRefresh[MAX_PP_MEMSPELL];	//in ms
 /*0292*/	uint32				abilitySlotRefresh;
 /*0296*/	uint8				haircolor;			// Player hair color
 /*0297*/	uint8				beardcolor;			// Player beard color
@@ -990,9 +942,9 @@ struct PlayerProfile_Struct
 /*0304*/	uint8				ability_time_minutes;
 /*0305*/	uint8				ability_time_hours;	//place holder
 /*0306*/	uint8				unknown0306[6];		// @bp Spacer/Flag?
-/*0312*/	uint32				item_material[_MaterialCount];	// Item texture/material of worn/held items
+/*0312*/	EQEmu::TextureMaterialProfile	item_material;	// Item texture/material of worn/held items
 /*0348*/	uint8				unknown0348[44];
-/*0392*/	Color_Struct		item_tint[_MaterialCount];
+/*0392*/	EQEmu::TintProfile	item_tint;
 /*0428*/	AA_Array			aa_array[MAX_PP_AA_ARRAY];
 /*2348*/	float				unknown2384;		//seen ~128, ~47
 /*2352*/	char				servername[32];		// length probably not right
@@ -1018,7 +970,7 @@ struct PlayerProfile_Struct
 /*2580*/	uint8				unknown2616[4];
 /*2584*/	uint32				spell_book[MAX_PP_REF_SPELLBOOK];
 /*4504*/	uint8				unknown4540[128];	// Was [428] all 0xff
-/*4632*/	uint32				mem_spells[MAX_PP_REF_MEMSPELL];
+/*4632*/	uint32				mem_spells[MAX_PP_MEMSPELL];
 /*4668*/	uint8				unknown4704[32];	//
 /*4700*/	float				y;					// Player y position
 /*4704*/	float				x;					// Player x position
@@ -1093,7 +1045,7 @@ struct PlayerProfile_Struct
 /*7212*/	uint32				tribute_points;
 /*7216*/	uint32				unknown7252;
 /*7220*/	uint32				tribute_active;		//1=active
-/*7224*/	Tribute_Struct		tributes[EmuConstants::TRIBUTE_SIZE];
+/*7224*/	Tribute_Struct		tributes[EQEmu::legacy::TRIBUTE_SIZE];
 /*7264*/	Disciplines_Struct	disciplines;
 /*7664*/	uint32				recastTimers[MAX_RECAST_TYPES];	// Timers (GMT of last use)
 /*7744*/	char				unknown7780[160];
@@ -1120,7 +1072,7 @@ struct PlayerProfile_Struct
 /*12800*/	uint32				expAA;
 /*12804*/	uint32				aapoints;			//avaliable, unspent
 /*12808*/	uint8				unknown12844[36];
-/*12844*/	Bandolier_Struct	bandoliers[EmuConstants::BANDOLIERS_SIZE];
+/*12844*/	Bandolier_Struct	bandoliers[EQEmu::legacy::BANDOLIERS_SIZE];
 /*14124*/	uint8				unknown14160[4506];
 /*18630*/	SuspendedMinion_Struct	SuspendedMinion; // No longer in use
 /*19240*/	uint32				timeentitledonaccount;
@@ -1227,7 +1179,7 @@ struct WearChange_Struct{
 /*010*/ uint32 elite_material;	// 1 for Drakkin Elite Material
 /*014*/ uint32 hero_forge_model; // New to VoA
 /*018*/ uint32 unknown18; // New to RoF
-/*022*/ Color_Struct color;
+/*022*/ EQEmu::textures::Tint_Struct color;
 /*026*/ uint8 wear_slot_id;
 /*027*/
 };
@@ -1518,17 +1470,38 @@ struct ExpUpdate_Struct
 enum ItemPacketType
 {
 	ItemPacketViewLink			= 0x00,
+	ItemPacketMerchant			= 0x64,
 	ItemPacketTradeView			= 0x65,
 	ItemPacketLoot				= 0x66,
 	ItemPacketTrade				= 0x67,
 	ItemPacketCharInventory		= 0x69,
-	ItemPacketSummonItem		= 0x6A,
-	ItemPacketTributeItem		= 0x6C,
-	ItemPacketMerchant			= 0x64,
+	ItemPacketLimbo				= 0x6A,
 	ItemPacketWorldContainer	= 0x6B,
-	ItemPacketCharmUpdate		= 0x6E,
+	ItemPacketTributeItem		= 0x6C,
+	ItemPacketGuildTribute		= 0x6D,
+	ItemPacketCharmUpdate		= 0x6E, // noted as incorrect
 	ItemPacketInvalid			= 0xFF
 };
+
+//enum ItemPacketType
+//{
+//	ItemPacketMerchant			= /*100*/ 0x64, // Titanium+
+//	ItemPacketTradeView			= /*101*/ 0x65,
+//	ItemPacketLoot				= /*102*/ 0x66,
+//	ItemPacketTrade				= /*103*/ 0x67,
+//	ItemPacketCharInventory		= /*105*/ 0x69, // 105 looks like raw item packet (no appearance update) thru shared bank..110, possibly possessions with appearance update
+//	ItemPacketLimbo				= /*106*/ 0x6A,
+//	ItemPacketWorldContainer	= /*107*/ 0x6B,
+//	ItemPacketTributeItem		= /*108*/ 0x6C,
+//	ItemPacketGuildTribute		= /*109*/ 0x6D, // missing from EQEmu
+//	ItemPacket10				= /*110*/ 0x6E,
+//	ItemPacket11				= /*111*/ 0x6F, // UF+ (equipment slots only) (RoF+ checks '(WORD*)slot + 4 != -1' [(WORD*)]slot + 2 would be bag index - if used) (guess) (appearance (over-level) items?)
+//	ItemPacket12				= /*112*/ 0x70, // RoF+ (causes stat update) (could be TrophyTribute and GuildTrophyTribute together - two case methodology - is it checking for GuildID?)
+//	ItemPacketMerchantRecovery	= /*113*/ 0x71,
+//	ItemPacket14				= /*115*/ 0x73, (real estate/moving crate?)
+//	ItemPacket__				= /*xxx*/ 0xXX // switch 'default' - all clients
+//};
+
 struct ItemPacket_Struct
 {
 /*00*/	ItemPacketType	PacketType;
@@ -1670,7 +1643,7 @@ struct LootingItem_Struct {
 /*002*/	uint32	looter;
 /*004*/	uint16	slot_id;
 /*006*/	uint8	unknown3[2];
-/*008*/	uint32	auto_loot;
+/*008*/	int32	auto_loot;
 };

 struct GuildManageStatus_Struct{
@@ -1961,8 +1934,7 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 		uint32	unknown12;
-/*016*/	uint8	quantity;		// Already sold
-/*017*/ uint8	Unknown016[3];
+/*016*/	uint32	quantity;
 /*020*/ uint32	price;
 };
 struct Merchant_Purchase_Struct {
@@ -2099,7 +2071,7 @@ struct AdventureLeaderboard_Struct
 /*struct Item_Shop_Struct {
 	uint16 merchantid;
 	uint8 itemtype;
-	Item_Struct item;
+	EQEmu::ItemData item;
 	uint8 iss_unknown001[6];
 };*/

@@ -2125,7 +2097,7 @@ struct Illusion_Struct { //size: 256 - SoF
 /*092*/	uint32	drakkin_heritage;	//
 /*096*/	uint32	drakkin_tattoo;		//
 /*100*/	uint32	drakkin_details;	//
-/*104*/	uint32	armor_tint[_MaterialCount];	//
+/*104*/	EQEmu::TintProfile	armor_tint;	//
 /*140*/	uint8	eyecolor1;		// Field Not Identified in any Illusion Struct
 /*141*/	uint8	eyecolor2;		// Field Not Identified in any Illusion Struct
 /*142*/	uint8	unknown138[114];	//
@@ -2271,6 +2243,7 @@ struct GroupFollow_Struct { // SoF Follow Struct
 /*0132*/
 };

+// this is generic struct
 struct GroupLeaderChange_Struct
 {
 /*000*/		char	Unknown000[64];
@@ -2523,6 +2496,7 @@ struct BookRequest_Struct {
 	uint8 window;	// where to display the text (0xFF means new window)
 	uint8 type;		//type: 0=scroll, 1=book, 2=item info.. prolly others.
 	uint32 invslot;	// Only used in Sof and later clients;
+	int16 subslot; // The subslot inside of a bag if it is inside one.
 	char txtfile[20];
 };

@@ -2536,23 +2510,25 @@ struct BookRequest_Struct {
 */
 struct Object_Struct {
 /*00*/	uint32	linked_list_addr[2];// They are, get this, prev and next, ala linked list
-/*08*/	uint16	size;				//
+/*08*/	float	size;				//
 /*10*/	uint16	solidtype;			//
 /*12*/	uint32	drop_id;			// Unique object id for zone
 /*16*/	uint16	zone_id;			// Redudant, but: Zone the object appears in
 /*18*/	uint16	zone_instance;		//
 /*20*/	uint32	unknown020;			//
 /*24*/	uint32	unknown024;			//
-/*28*/	float	heading;			// heading
-/*32*/	float	z;					// z coord
-/*36*/	float	x;					// x coord
-/*40*/	float	y;					// y coord
-/*44*/	char	object_name[32];	// Name of object, usually something like IT63_ACTORDEF
-/*76*/	uint32	unknown076;			//
-/*80*/	uint32	object_type;		// Type of object, not directly translated to OP_OpenObject
-/*84*/	uint32	unknown084;			//set to 0xFF
-/*88*/	uint32	spawn_id;			// Spawn Id of client interacting with object
-/*92*/
+/*28*/	float	tilt_x;
+/*32*/	float	tilt_y;
+/*36*/	float	heading;			// heading
+/*40*/	float	z;					// z coord
+/*44*/	float	x;					// x coord
+/*76*/	float	y;					// y coord
+/*80*/	char	object_name[32];	// Name of object, usually something like IT63_ACTORDEF
+/*84*/	uint32	unknown076;			//
+/*88*/	uint32	object_type;		// Type of object, not directly translated to OP_OpenObject
+/*92*/	uint32	unknown084;			//set to 0xFF
+		uint32	spawn_id;			// Spawn Id of client interacting with object
+
 };
 // 01 = generic drop, 02 = armor, 19 = weapon
 //[13:40] and 0xff seems to be indicative of the tradeskill/openable items that end up returning the old style item type in the OP_OpenObject
@@ -3395,27 +3371,6 @@ struct PetitionBug_Struct{
 	char	text[1028];
 };

-struct DyeStruct
-{
-	union
-	{
-		struct
-		{
-			struct Color_Struct head;
-			struct Color_Struct chest;
-			struct Color_Struct arms;
-			struct Color_Struct wrists;
-			struct Color_Struct hands;
-			struct Color_Struct legs;
-			struct Color_Struct feet;
-			struct Color_Struct primary;	// you can't actually dye this
-			struct Color_Struct secondary;	// or this
-		}
-		dyes;
-		struct Color_Struct dye[_MaterialCount];
-	};
-};
-
 struct ApproveZone_Struct {
 	char	name[64];
 	uint32	zoneid;
@@ -3473,8 +3428,8 @@ struct SelectTributeReply_Struct {

 struct TributeInfo_Struct {
 	uint32	active;		//0 == inactive, 1 == active
-	uint32	tributes[EmuConstants::TRIBUTE_SIZE];	//-1 == NONE
-	uint32	tiers[EmuConstants::TRIBUTE_SIZE];		//all 00's
+	uint32	tributes[EQEmu::legacy::TRIBUTE_SIZE];	//-1 == NONE
+	uint32	tiers[EQEmu::legacy::TRIBUTE_SIZE];		//all 00's
 	uint32	tribute_master_id;
 };

@@ -3564,6 +3519,20 @@ struct RecipeAutoCombine_Struct {
 								// f5 ff ff ff in 'you dont have all the stuff' reply
 };

+// this is the "value#a" data
+enum EParticlePoint {
+	eDefault,
+	eChest,
+	eHead,
+	eLeftHand,
+	eRigthHand,
+	eLeftFoot,
+	eRightFood,
+	eLeftEye,
+	eRightEye,
+	eMouth
+};
+
 struct LevelAppearance_Struct { //Sends a little graphic on level up
 	uint32	spawn_id;
 	uint32	parm1;
@@ -5343,21 +5312,18 @@ struct ClientMarqueeMessage_Struct {

 typedef std::list<ServerLootItem_Struct*> ItemList;

-struct TextLinkBody_Struct {
-	// Current server mask: EQClientRoF2
-	uint8 unknown_1;		/* %1X */
-	uint32 item_id;			/* %05X */
-	uint32 augment_1;		/* %05X */
-	uint32 augment_2;		/* %05X */
-	uint32 augment_3;		/* %05X */
-	uint32 augment_4;		/* %05X */
-	uint32 augment_5;		/* %05X */
-	uint32 augment_6;		/* %05X */
-	uint8 is_evolving;		/* %1X */
-	uint32 evolve_group;	/* %05X */
-	uint8 evolve_level;		/* %02X */
-	uint32 ornament_icon;	/* %05X */
-	int hash;				/* %08X */
+
+struct fling_struct {
+/* 00 */ uint32 collision; // 0 collision is off, anything else it's on
+/* 04 */ int32 travel_time; // ms -- UF we need to calc this, RoF+ -1 auto calcs
+/* 08 */ uint8 unk3; // bool, set to 1 has something to do with z-axis or something weird things happen if the new Z is above or equal to yours
+/* 09 */ uint8 disable_fall_damage; // 1 you take no fall damage, 0 you take fall damage
+/* 10 */ uint8 padding[2];
+/* 12 */ float speed_z;
+/* 16 */ float new_y;
+/* 20 */ float new_x;
+/* 24 */ float new_z;
+/* 28 */
 };

 // Restore structure packing to default
@@ -75,7 +75,7 @@ void EQStream::init(bool resetSession) {
 	sent_packet_count = 0;
 	received_packet_count = 0;
 	SequencedBase = 0;
-	NextSequencedSend = 0;
+	AverageDelta = 500;

 	if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
 		retransmittimer = Timer::GetCurrentTime();
@@ -86,10 +86,6 @@ void EQStream::init(bool resetSession) {
 	if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
 		Log.Out(Logs::Detail, Logs::Netcode, _L "init Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 	}
-	
-	if(NextSequencedSend > SequencedQueue.size()) {
-		Log.Out(Logs::Detail, Logs::Netcode, _L "init Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-	}
 }

 EQRawApplicationPacket *EQStream::MakeApplicationPacket(EQProtocolPacket *p)
@@ -292,10 +288,8 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		}
 		break;
 		case OP_KeepAlive: {
-#ifndef COLLECTOR
 			NonSequencedPush(new EQProtocolPacket(p->opcode,p->pBuffer,p->size));
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Received and queued reply to keep alive" __L);
-#endif
 		}
 		break;
 		case OP_Ack: {
@@ -304,14 +298,12 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_Ack that was of malformed size" __L);
 				break;
 			}
-#ifndef COLLECTOR
 			uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
 			AckPackets(seq);

 			if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
 				retransmittimer = Timer::GetCurrentTime();
 			}
-#endif
 		}
 		break;
 		case OP_SessionRequest: {
@@ -320,7 +312,6 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_SessionRequest that was of malformed size" __L);
 				break;
 			}
-#ifndef COLLECTOR
 			if (GetState()==ESTABLISHED) {
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_SessionRequest in ESTABLISHED state (%d) streamactive (%i) attempt (%i)" __L, GetState(),streamactive,sessionAttempts);

@@ -333,7 +324,6 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					break;
 				}
 			}
-#endif
 			sessionAttempts++;
 			// we set established below, so statistics will not be reset for session attempts/stream active.
 			init(GetState()!=ESTABLISHED);
@@ -343,10 +333,8 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			SetMaxLen(ntohl(Request->MaxLength));
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_SessionRequest: session %lu, maxlen %d" __L, (unsigned long)Session, MaxLen);
 			SetState(ESTABLISHED);
-#ifndef COLLECTOR
 			Key=0x11223344;
 			SendSessionResponse();
-#endif
 		}
 		break;
 		case OP_SessionResponse: {
@@ -412,7 +400,6 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck that was of malformed size" __L);
 				break;
 			}
-#ifndef COLLECTOR
 			uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
 			MOutboundQueue.lock();

@@ -420,36 +407,30 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-OOA Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
 			
-			if(NextSequencedSend > SequencedQueue.size()) {
-				Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-OOA Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-			}
 			//if the packet they got out of order is between our last acked packet and the last sent packet, then its valid.
 			if (CompareSequence(SequencedBase,seq) != SeqPast && CompareSequence(NextOutSeq,seq) == SeqPast) {
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck for sequence %d, starting retransmit at the start of our unacked buffer (seq %d, was %d)." __L,
-					seq, SequencedBase, SequencedBase+NextSequencedSend);
+					seq, SequencedBase, SequencedBase+SequencedQueue.size());

-				bool retransmit_acked_packets = false;
-				if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
-					retransmit_acked_packets = RETRANSMIT_ACKED_PACKETS;
-				}
-
-				if(!retransmit_acked_packets) {
-					uint16 sqsize = SequencedQueue.size();
-					uint16 index = seq - SequencedBase;
-					Log.Out(Logs::Detail, Logs::Netcode, _L "OP_OutOfOrderAck marking packet acked in queue (queue index = %d, queue size = %d)." __L, index, sqsize);
-					if (index < sqsize) {
-						std::deque<EQProtocolPacket *>::iterator sitr;
-						sitr = SequencedQueue.begin();
-						sitr += index;
-						(*sitr)->acked = true;
+				uint16 sqsize = SequencedQueue.size();
+				uint16 index = seq - SequencedBase;
+				Log.Out(Logs::Detail, Logs::Netcode, _L "OP_OutOfOrderAck marking packet acked in queue (queue index = %d, queue size = %d)." __L, index, sqsize);
+				if (index < sqsize) {
+					SequencedQueue[index]->acked = true;
+					// flag packets for a resend
+					uint16 count = 0;
+					uint32 timeout = AverageDelta * 2 + 100;
+					for (auto sitr = SequencedQueue.begin(); sitr != SequencedQueue.end() && count < index; ++sitr, ++count) {
+						if (!(*sitr)->acked && (*sitr)->sent_time > 0 && (((*sitr)->sent_time + timeout) < Timer::GetCurrentTime())) {
+							(*sitr)->sent_time = 0;
+							Log.Out(Logs::Detail, Logs::Netcode, _L "OP_OutOfOrderAck Flagging packet %d for retransmission" __L, SequencedBase + count);
+						}
 					}
 				}

 				if(RETRANSMIT_TIMEOUT_MULT) {
 					retransmittimer = Timer::GetCurrentTime();
 				}
-
-				NextSequencedSend = 0;
 			} else {
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck for out-of-window %d. Window (%d->%d)." __L, seq, SequencedBase, NextOutSeq);
 			}
@@ -458,11 +439,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Post-OOA Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}

-			if(NextSequencedSend > SequencedQueue.size()) {
-				Log.Out(Logs::Detail, Logs::Netcode, _L "Post-OOA Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-			}
 			MOutboundQueue.unlock();
-#endif
 		}
 		break;
 		case OP_SessionStatRequest: {
@@ -471,7 +448,6 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Received OP_SessionStatRequest that was of malformed size" __L);
 				break;
 			}
-#ifndef COLLECTOR
 			ClientSessionStats *ClientStats=(ClientSessionStats *)p->pBuffer;
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Received Stats: %lu packets received, %lu packets sent, Deltas: local %lu, (%lu <- %lu -> %lu) remote %lu" __L,
 				(unsigned long)ntohl(ClientStats->packets_received), (unsigned long)ntohl(ClientStats->packets_sent), (unsigned long)ntohl(ClientStats->last_local_delta),
@@ -489,6 +465,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					} else {
 						retransmittimeout = ntohl(ClientStats->average_delta) * 2 * RETRANSMIT_TIMEOUT_MULT;
 					}
+					retransmittimeout += 300;
 					if(retransmittimeout > RETRANSMIT_TIMEOUT_MAX)
 						retransmittimeout = RETRANSMIT_TIMEOUT_MAX;
 					Log.Out(Logs::Detail, Logs::Netcode, _L "Retransmit timeout recalculated to %dms" __L, retransmittimeout);
@@ -505,7 +482,6 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			ServerStats->packets_received = htonll(GetPacketsReceived());

 			NonSequencedPush(new EQProtocolPacket(OP_SessionStatResponse, p->pBuffer, p->size));
-#endif
 		}
 		break;
 		case OP_SessionStatResponse: {
@@ -585,12 +561,12 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 	if (p->size>(MaxLen-8)) { // proto-op(2), seq(2), app-op(2) ... data ... crc(2)
 		Log.Out(Logs::Detail, Logs::Netcode, _L "Making oversized packet, len %d" __L, p->Size());

-		unsigned char *tmpbuff=new unsigned char[p->size+3];
+		auto tmpbuff = new unsigned char[p->size + 3];
 		length=p->serialize(opcode, tmpbuff);
 		if (length != p->Size())
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Packet adjustment, len %d to %d" __L, p->Size(), length);

-		EQProtocolPacket *out=new EQProtocolPacket(OP_Fragment,nullptr,MaxLen-4);
+		auto out = new EQProtocolPacket(OP_Fragment, nullptr, MaxLen - 4);
 		*(uint32 *)(out->pBuffer+2)=htonl(length);
 		used=MaxLen-10;
 		memcpy(out->pBuffer+6,tmpbuff,used);
@@ -611,10 +587,10 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 		delete[] tmpbuff;
 	} else {

-		unsigned char *tmpbuff=new unsigned char[p->Size()+3];
+		auto tmpbuff = new unsigned char[p->Size() + 3];
 		length=p->serialize(opcode, tmpbuff+2) + 2;

-		EQProtocolPacket *out=new EQProtocolPacket(OP_Packet,tmpbuff,length);
+		auto out = new EQProtocolPacket(OP_Packet, tmpbuff, length);

 		delete[] tmpbuff;
 		SequencedPush(out);
@@ -624,42 +600,32 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)

 void EQStream::SequencedPush(EQProtocolPacket *p)
 {
-#ifdef COLLECTOR
-	delete p;
-#else
 	MOutboundQueue.lock();
-if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Push Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
-}
-if(NextSequencedSend > SequencedQueue.size()) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Push Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-}
+	if (uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
+		Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Push Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L,
+			SequencedBase, SequencedQueue.size(), NextOutSeq);
+	}

-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pushing sequenced packet %d of length %d. Base Seq is %d." __L, NextOutSeq, p->size, SequencedBase);
-	*(uint16 *)(p->pBuffer)=htons(NextOutSeq);
+	Log.Out(Logs::Detail, Logs::Netcode, _L "Pushing sequenced packet %d of length %d. Base Seq is %d." __L,
+		NextOutSeq, p->size, SequencedBase);
+	*(uint16 *)(p->pBuffer) = htons(NextOutSeq);
 	SequencedQueue.push_back(p);
 	NextOutSeq++;

-if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Push Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
-}
-if(NextSequencedSend > SequencedQueue.size()) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Push Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-}
+	if (uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
+		Log.Out(Logs::Detail, Logs::Netcode, _L "Push Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L,
+			SequencedBase, SequencedQueue.size(), NextOutSeq);
+	}
+
 	MOutboundQueue.unlock();
-#endif
 }

 void EQStream::NonSequencedPush(EQProtocolPacket *p)
 {
-#ifdef COLLECTOR
-	delete p;
-#else
 	MOutboundQueue.lock();
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Pushing non-sequenced packet of length %d" __L, p->size);
 	NonSequencedQueue.push(p);
 	MOutboundQueue.unlock();
-#endif
 }

 void EQStream::SendAck(uint16 seq)
@@ -703,21 +669,15 @@ void EQStream::Write(int eq_fd)
 	// Place to hold the base packet t combine into
 	EQProtocolPacket *p=nullptr;

-	if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
-		// if we have a timeout defined and we have not received an ack recently enough, retransmit from beginning of queue
-		if (RETRANSMIT_TIMEOUT_MULT && !SequencedQueue.empty() && NextSequencedSend &&
-			(GetState()==ESTABLISHED) && ((retransmittimer+retransmittimeout) < Timer::GetCurrentTime())) {
-			Log.Out(Logs::Detail, Logs::Netcode, _L "Timeout since last ack received, starting retransmit at the start of our unacked "
-				"buffer (seq %d, was %d)." __L, SequencedBase, SequencedBase+NextSequencedSend);
-			NextSequencedSend = 0;
-			retransmittimer = Timer::GetCurrentTime(); // don't want to endlessly retransmit the first packet
-		}
-	}
-
 	// Find the next sequenced packet to send from the "queue"
 	sitr = SequencedQueue.begin();
-	if (sitr!=SequencedQueue.end())
-	sitr += NextSequencedSend;
+
+	uint16 count = 0;
+	// get to start of packets
+	while (sitr != SequencedQueue.end() && (*sitr)->sent_time > 0) {
+		++sitr;
+		++count;
+	}

 	// Loop until both are empty or MaxSends is reached
 	while(!SeqEmpty || !NonSeqEmpty) {
@@ -731,7 +691,7 @@ void EQStream::Write(int eq_fd)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Starting combined packet with non-seq packet of len %d" __L, p->size);
 				NonSequencedQueue.pop();
 			} else if (!p->combine(NonSequencedQueue.front())) {
-				// Tryint to combine this packet with the base didn't work (too big maybe)
+				// Trying to combine this packet with the base didn't work (too big maybe)
 				// So just send the base packet (we'll try this packet again later)
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Combined packet full at len %d, next non-seq packet is len %d" __L, p->size, (NonSequencedQueue.front())->size);
 				ReadyToSend.push(p);
@@ -754,16 +714,9 @@ void EQStream::Write(int eq_fd)
 			NonSeqEmpty=true;
 		}

-		if (sitr!=SequencedQueue.end()) {
-			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-				Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Send Seq NSS=%d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, NextSequencedSend, SequencedBase, SequencedQueue.size(), NextOutSeq);
-			}
+		if (sitr != SequencedQueue.end()) {
+			uint16 seq_send = SequencedBase + count;	//just for logging...

-			if(NextSequencedSend > SequencedQueue.size()) {
-				Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Send Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-			}
-			uint16 seq_send = SequencedBase + NextSequencedSend;	//just for logging...
-			
 			if(SequencedQueue.empty()) {
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Tried to write a packet with an empty queue (%d is past next out %d)" __L, seq_send, NextOutSeq);
 				SeqEmpty=true;
@@ -771,26 +724,32 @@ void EQStream::Write(int eq_fd)
 			}

 			if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
-				if (!RETRANSMIT_ACKED_PACKETS && (*sitr)->acked) {
+				if ((*sitr)->acked || (*sitr)->sent_time != 0) {
+					++sitr;
+					++count;
+					if (p) {
+						Log.Out(Logs::Detail, Logs::Netcode, _L "Final combined packet not full, len %d" __L, p->size);
+						ReadyToSend.push(p);
+						BytesWritten += p->size;
+						p = nullptr;
+					}
 					Log.Out(Logs::Detail, Logs::Netcode, _L "Not retransmitting seq packet %d because already marked as acked" __L, seq_send);
-					sitr++;
-					NextSequencedSend++;
 				} else if (!p) {
 					// If we don't have a packet to try to combine into, use this one as the base
 					// Copy it first as it will still live until it is acked
 					p=(*sitr)->Copy();
 					Log.Out(Logs::Detail, Logs::Netcode, _L "Starting combined packet with seq packet %d of len %d" __L, seq_send, p->size);
+					(*sitr)->sent_time = Timer::GetCurrentTime();
 					++sitr;
-					NextSequencedSend++;
+					++count;
 				} else if (!p->combine(*sitr)) {
 					// Trying to combine this packet with the base didn't work (too big maybe)
 					// So just send the base packet (we'll try this packet again later)
-					Log.Out(Logs::Detail, Logs::Netcode, _L "Combined packet full at len %d, next seq packet %d is len %d" __L, p->size, seq_send, (*sitr)->size);
+					Log.Out(Logs::Detail, Logs::Netcode, _L "Combined packet full at len %d, next seq packet %d is len %d" __L, p->size, seq_send + 1, (*sitr)->size);
 					ReadyToSend.push(p);
 					BytesWritten+=p->size;
 					p=nullptr;
-
-					if (BytesWritten > threshold) {
+					if ((*sitr)->opcode != OP_Fragment && BytesWritten > threshold) {
 						// Sent enough this round, lets stop to be fair
 						Log.Out(Logs::Detail, Logs::Netcode, _L "Exceeded write threshold in seq (%d > %d)" __L, BytesWritten, threshold);
 						break;
@@ -798,17 +757,28 @@ void EQStream::Write(int eq_fd)
 				} else {
 					// Combine worked
 					Log.Out(Logs::Detail, Logs::Netcode, _L "Combined seq packet %d of len %d, yeilding %d combined." __L, seq_send, (*sitr)->size, p->size);
+					(*sitr)->sent_time = Timer::GetCurrentTime();
 					++sitr;
-					NextSequencedSend++;
+					++count;
 				}
 			} else {
-				if (!p) {
+				if ((*sitr)->sent_time != 0) {
+					++sitr;
+					++count;
+					if (p) {
+						Log.Out(Logs::Detail, Logs::Netcode, _L "Final combined packet not full, len %d" __L, p->size);
+						ReadyToSend.push(p);
+						BytesWritten += p->size;
+						p = nullptr;
+					}
+				} else if (!p) {
 					// If we don't have a packet to try to combine into, use this one as the base
 					// Copy it first as it will still live until it is acked
 					p=(*sitr)->Copy();
+					(*sitr)->sent_time = Timer::GetCurrentTime();
 					Log.Out(Logs::Detail, Logs::Netcode, _L "Starting combined packet with seq packet %d of len %d" __L, seq_send, p->size);
 					++sitr;
-					NextSequencedSend++;
+					++count;
 				} else if (!p->combine(*sitr)) {
 					// Trying to combine this packet with the base didn't work (too big maybe)
 					// So just send the base packet (we'll try this packet again later)
@@ -824,18 +794,16 @@ void EQStream::Write(int eq_fd)
 					}
 				} else {
 					// Combine worked
-					Log.Out(Logs::Detail, Logs::Netcode, _L "Combined seq packet %d of len %d, yeilding %d combined." __L, seq_send, (*sitr)->size, p->size);
+					Log.Out(Logs::Detail, Logs::Netcode, _L "Combined seq packet %d of len %d, yielding %d combined." __L, seq_send, (*sitr)->size, p->size);
+					(*sitr)->sent_time = Timer::GetCurrentTime();
 					++sitr;
-					NextSequencedSend++;
+					++count;
 				}
 			}

 			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
 				Log.Out(Logs::Detail, Logs::Netcode, _L "Post send Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
-			if(NextSequencedSend > SequencedQueue.size()) {
-				Log.Out(Logs::Detail, Logs::Netcode, _L "Post send Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-			}
 		} else {
 			// No more sequenced packets
 			SeqEmpty=true;
@@ -894,9 +862,11 @@ sockaddr_in address;
 	length=p->serialize(buffer);
 	if (p->opcode!=OP_SessionRequest && p->opcode!=OP_SessionResponse) {
 		if (compressed) {
+			BytesWritten -= p->size;
 			uint32 newlen=EQProtocolPacket::Compress(buffer,length, _tempBuffer, 2048);
 			memcpy(buffer,_tempBuffer,newlen);
 			length=newlen;
+			BytesWritten += newlen;
 		}
 		if (encoded) {
 			EQProtocolPacket::ChatEncode(buffer,length,Key);
@@ -912,7 +882,7 @@ sockaddr_in address;

 void EQStream::SendSessionResponse()
 {
-EQProtocolPacket *out=new EQProtocolPacket(OP_SessionResponse,nullptr,sizeof(SessionResponse));
+	auto out = new EQProtocolPacket(OP_SessionResponse, nullptr, sizeof(SessionResponse));
 	SessionResponse *Response=(SessionResponse *)out->pBuffer;
 	Response->Session=htonl(Session);
 	Response->MaxLength=htonl(MaxLen);
@@ -934,7 +904,7 @@ EQProtocolPacket *out=new EQProtocolPacket(OP_SessionResponse,nullptr,sizeof(Ses

 void EQStream::SendSessionRequest()
 {
-EQProtocolPacket *out=new EQProtocolPacket(OP_SessionRequest,nullptr,sizeof(SessionRequest));
+	auto out = new EQProtocolPacket(OP_SessionRequest, nullptr, sizeof(SessionRequest));
 	SessionRequest *Request=(SessionRequest *)out->pBuffer;
 	memset(Request,0,sizeof(SessionRequest));
 	Request->Session=htonl(time(nullptr));
@@ -950,7 +920,7 @@ void EQStream::_SendDisconnect()
 	if(GetState() == CLOSED)
 		return;

-	EQProtocolPacket *out=new EQProtocolPacket(OP_SessionDisconnect,nullptr,sizeof(uint32));
+	auto out = new EQProtocolPacket(OP_SessionDisconnect, nullptr, sizeof(uint32));
 	*(uint32 *)out->pBuffer=htonl(Session);
 	NonSequencedPush(out);

@@ -969,8 +939,8 @@ EQApplicationPacket *EQStream::PopPacket()
 EQRawApplicationPacket *p=nullptr;

 	MInboundQueue.lock();
-	if (InboundQueue.size()) {
-		std::vector<EQRawApplicationPacket *>::iterator itr=InboundQueue.begin();
+	if (!InboundQueue.empty()) {
+		auto itr = InboundQueue.begin();
 		p=*itr;
 		InboundQueue.erase(itr);
 	}
@@ -994,8 +964,8 @@ EQRawApplicationPacket *EQStream::PopRawPacket()
 EQRawApplicationPacket *p=nullptr;

 	MInboundQueue.lock();
-	if (InboundQueue.size()) {
-		std::vector<EQRawApplicationPacket *>::iterator itr=InboundQueue.begin();
+	if (!InboundQueue.empty()) {
+		auto itr = InboundQueue.begin();
 		p=*itr;
 		InboundQueue.erase(itr);
 	}
@@ -1021,8 +991,8 @@ EQRawApplicationPacket *EQStream::PeekPacket()
 EQRawApplicationPacket *p=nullptr;

 	MInboundQueue.lock();
-	if (InboundQueue.size()) {
-		std::vector<EQRawApplicationPacket *>::iterator itr=InboundQueue.begin();
+	if (!InboundQueue.empty()) {
+		auto itr = InboundQueue.begin();
 		p=*itr;
 	}
 	MInboundQueue.unlock();
@@ -1158,13 +1128,6 @@ void EQStream::AckPackets(uint16 seq)
 std::deque<EQProtocolPacket *>::iterator itr, tmp;

 	MOutboundQueue.lock();
-//do a bit of sanity checking.
-if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Ack Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
-}
-if(NextSequencedSend > SequencedQueue.size()) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-}

 	SeqOrder ord = CompareSequence(SequencedBase, seq);
 	if(ord == SeqInOrder) {
@@ -1180,28 +1143,21 @@ if(NextSequencedSend > SequencedQueue.size()) {
 		//this is a good ack, we get to ack some blocks.
 		seq++;	//we stop at the block right after their ack, counting on the wrap of both numbers.
 		while(SequencedBase != seq) {
-if(SequencedQueue.empty()) {
-Log.Out(Logs::Detail, Logs::Netcode, _L "OUT OF PACKETS acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, NextSequencedSend);
-	SequencedBase = NextOutSeq;
-	NextSequencedSend = 0;
-	break;
-}
-			Log.Out(Logs::Detail, Logs::Netcode, _L "Removing acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, NextSequencedSend);
+			if(SequencedQueue.empty()) {
+				Log.Out(Logs::Detail, Logs::Netcode, _L "OUT OF PACKETS acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, SequencedQueue.size());
+				SequencedBase = NextOutSeq;
+				break;
+			}
+			Log.Out(Logs::Detail, Logs::Netcode, _L "Removing acked packet with sequence %lu." __L, (unsigned long)SequencedBase);
 			//clean out the acked packet
 			delete SequencedQueue.front();
 			SequencedQueue.pop_front();
-			//adjust our "next" pointer
-			if(NextSequencedSend > 0)
-				NextSequencedSend--;
 			//advance the base sequence number to the seq of the block after the one we just got rid of.
 			SequencedBase++;
 		}
-if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack on %d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, seq, SequencedBase, SequencedQueue.size(), NextOutSeq);
-}
-if(NextSequencedSend > SequencedQueue.size()) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-}
+		if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
+			Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack on %d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, seq, SequencedBase, SequencedQueue.size(), NextOutSeq);
+		}
 	}

 	MOutboundQueue.unlock();
@@ -1379,6 +1335,18 @@ void EQStream::Decay()
 		if (BytesWritten<0)
 			BytesWritten=0;
 	}
+	// check for any timed out acks
+	if ((GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) && RETRANSMIT_TIMEOUT_MULT && retransmittimeout) {
+		int count = 0;
+		MOutboundQueue.lock();
+		for (auto sitr = SequencedQueue.begin(); sitr != SequencedQueue.end(); ++sitr, count++) {
+			if (!(*sitr)->acked && (*sitr)->sent_time > 0 && ((*sitr)->sent_time + retransmittimeout) < Timer::GetCurrentTime()) {
+				(*sitr)->sent_time = 0;
+				Log.Out(Logs::Detail, Logs::Netcode, _L "Timeout exceeded for seq %d.  Flagging packet for retransmission" __L, SequencedBase + count);
+			}
+		}
+		MOutboundQueue.unlock();
+	}
 }

 void EQStream::AdjustRates(uint32 average_delta)
@@ -1386,18 +1354,24 @@ void EQStream::AdjustRates(uint32 average_delta)
 	if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
 		if (average_delta && (average_delta <= AVERAGE_DELTA_MAX)) {
 			MRate.lock();
+			AverageDelta = average_delta;
 			RateThreshold=RATEBASE/average_delta;
 			DecayRate=DECAYBASE/average_delta;
+			if (BytesWritten > RateThreshold)
+				BytesWritten = RateThreshold + DecayRate;
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, 
 				RateThreshold, DecayRate, average_delta);
 			MRate.unlock();
 		} else {
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L, 
 				average_delta, AVERAGE_DELTA_MAX);
+			AverageDelta = AVERAGE_DELTA_MAX;
 		}
 	} else {
 		if (average_delta) {
 			MRate.lock();
+			AverageDelta = average_delta;
+			BytesWritten = 0;
 			RateThreshold=RATEBASE/average_delta;
 			DecayRate=DECAYBASE/average_delta;
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, 
@@ -153,7 +153,6 @@ class EQStream : public EQStreamInterface {
 		std::deque<EQProtocolPacket *> SequencedQueue;
 		uint16 NextOutSeq;
 		uint16 SequencedBase;	//the sequence number of SequencedQueue[0]
-		long NextSequencedSend;	//index into SequencedQueue
 		Mutex MOutboundQueue;

 		//a buffer we use for compression/decompression
@@ -174,7 +173,7 @@ class EQStream : public EQStreamInterface {
 		Mutex MRate;
 		int32 RateThreshold;
 		int32 DecayRate;
-
+		uint32 AverageDelta;

 		OpcodeManager **OpMgr;

@@ -3,7 +3,7 @@
 #include "eq_stream_factory.h"

 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <process.h>
 	#include <io.h>
 	#include <stdio.h>
@@ -120,7 +120,7 @@ std::shared_ptr<EQStream> EQStreamFactory::Pop()
 {
 	std::shared_ptr<EQStream> s = nullptr;
 	MNewStreams.lock();
-	if (NewStreams.size()) {
+	if (!NewStreams.empty()) {
 		s = NewStreams.front();
 		NewStreams.pop();
 		s->PutInUse();
@@ -235,7 +235,7 @@ void EQStreamFactory::CheckTimeout()
 				//give it a little time for everybody to finish with it
 			} else {
 				//everybody is done, we can delete it now
-				std::map<std::pair<uint32, uint16>, std::shared_ptr<EQStream>>::iterator temp = stream_itr;
+				auto temp = stream_itr;
 				++stream_itr;
 				temp->second = nullptr;
 				Streams.erase(temp);
@@ -250,8 +250,7 @@ void EQStreamFactory::CheckTimeout()

 void EQStreamFactory::WriterLoop()
 {
-	std::map<std::pair<uint32, uint16>, std::shared_ptr<EQStream>>::iterator stream_itr;
-	bool havework=true;
+	bool havework = true;
 	std::vector<std::shared_ptr<EQStream>> wants_write;
 	std::vector<std::shared_ptr<EQStream>>::iterator cur, end;
 	bool decay = false;
@@ -260,7 +259,7 @@ void EQStreamFactory::WriterLoop()
 	WriterRunning = true;
 	DecayTimer.Enable();

-	while(sock!=-1) {
+	while (sock != -1) {
 		MWriterRunning.lock();
 		if (!WriterRunning)
 			break;
@@ -269,34 +268,36 @@ void EQStreamFactory::WriterLoop()
 		havework = false;
 		wants_write.clear();

-		decay=DecayTimer.Check();
+		decay = DecayTimer.Check();

-		//copy streams into a seperate list so we dont have to keep
-		//MStreams locked while we are writting
+		// copy streams into a seperate list so we dont have to keep
+		// MStreams locked while we are writting
 		MStreams.lock();
-		for(stream_itr=Streams.begin();stream_itr!=Streams.end();++stream_itr) {
+		for (auto stream_itr = Streams.begin(); stream_itr != Streams.end(); ++stream_itr) {
 			// If it's time to decay the bytes sent, then let's do it before we try to write
 			if (decay)
 				stream_itr->second->Decay();

-			//bullshit checking, to see if this is really happening, GDB seems to think so...
-			if(stream_itr->second == nullptr) {
-				fprintf(stderr, "ERROR: nullptr Stream encountered in EQStreamFactory::WriterLoop for: %i:%i", stream_itr->first.first, stream_itr->first.second);
+			// bullshit checking, to see if this is really happening, GDB seems to think so...
+			if (stream_itr->second == nullptr) {
+				fprintf(stderr,
+					"ERROR: nullptr Stream encountered in EQStreamFactory::WriterLoop for: %i:%i",
+					stream_itr->first.first, stream_itr->first.second);
 				continue;
 			}

 			if (stream_itr->second->HasOutgoingData()) {
-				havework=true;
+				havework = true;
 				stream_itr->second->PutInUse();
 				wants_write.push_back(stream_itr->second);
 			}
 		}
 		MStreams.unlock();

-		//do the actual writes
+		// do the actual writes
 		cur = wants_write.begin();
 		end = wants_write.end();
-		for(; cur != end; ++cur) {
+		for (; cur != end; ++cur) {
 			(*cur)->Write(sock);
 			(*cur)->ReleaseFromUse();
 		}
@@ -1,3 +1,5 @@
+#include <utility>
+
 #include "global_define.h"
 #include "eqemu_logsys.h"
 #include "eq_stream_ident.h"
@@ -25,7 +27,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 }

 void EQStreamIdentifier::RegisterPatch(const EQStream::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
-	Patch *p = new Patch;
+	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
 	p->opcodes = opcodes;
@@ -156,7 +158,7 @@ EQStreamInterface *EQStreamIdentifier::PopIdentified() {
 }

 EQStreamIdentifier::Record::Record(std::shared_ptr<EQStream> s)
-:	stream(s),
+:	stream(std::move(s)),
 	expire(STREAM_IDENT_WAIT_MS)
 {
 }
@@ -4,7 +4,7 @@
 //this is the only part of an EQStream that is seen by the application.

 #include <string>
-#include "clientversions.h"
+#include "emu_versions.h"

 typedef enum {
 	ESTABLISHED,
@@ -35,7 +35,7 @@ public:
 	virtual const uint32 GetBytesRecieved() const { return 0; }
 	virtual const uint32 GetBytesSentPerSecond() const { return 0; }
 	virtual const uint32 GetBytesRecvPerSecond() const { return 0; }
-	virtual const ClientVersion GetClientVersion() const { return ClientVersion::Unknown; }
+	virtual const EQEmu::versions::ClientVersion ClientVersion() const { return EQEmu::versions::ClientVersion::Unknown; }
 };

 #endif /*EQSTREAMINTF_H_*/
@@ -21,9 +21,9 @@ std::string EQStreamProxy::Describe() const {
 	return(m_structs->Describe());
 }

-const ClientVersion EQStreamProxy::GetClientVersion() const
+const EQEmu::versions::ClientVersion EQStreamProxy::ClientVersion() const
 {
-	return m_structs->GetClientVersion();
+	return m_structs->ClientVersion();
 }

 void EQStreamProxy::QueuePacket(const EQApplicationPacket *p, bool ack_req) {
@@ -28,7 +28,7 @@ public:
 	virtual void RemoveData();
 	virtual bool CheckState(EQStreamState state);
 	virtual std::string Describe() const;
-	virtual const ClientVersion GetClientVersion() const;
+	virtual const EQEmu::versions::ClientVersion ClientVersion() const;

 	virtual const uint32 GetBytesSent() const;
 	virtual const uint32 GetBytesRecieved() const;
@@ -63,7 +63,7 @@ EQDBRes * EQDB::query(Const_char *q) {
 //NOT THREAD SAFE!
 Const_char *EQDB::escape_string(Const_char *from) {
 	int len = strlen(from);
-	char *res = new char[len*2+1];
+	auto res = new char[len * 2 + 1];

 	mysql_real_escape_string(mysql_ref,res,from,len);

@@ -80,7 +80,7 @@ void EQEmuConfig::do_world(TiXmlElement *ele)
 			sprintf(str, "loginserver%i", ++LoginCount);
 			sub_ele = ele->FirstChildElement(str);
 			if (sub_ele) {
-				LoginConfig* loginconfig = new LoginConfig;
+				auto loginconfig = new LoginConfig;
 				text = ParseTextBlock(sub_ele, "host", true);
 				if (text) {
 					loginconfig->LoginHost = text;
@@ -254,6 +254,10 @@ void EQEmuConfig::do_files(TiXmlElement *ele)
 	if (text) {
 		OpCodesFile = text;
 	}
+	text = ParseTextBlock(ele, "plugin.pl", true);
+	if (text) {
+		PluginPlFile = text;
+	}
 }

 void EQEmuConfig::do_directories(TiXmlElement *ele)
@@ -262,14 +266,45 @@ void EQEmuConfig::do_directories(TiXmlElement *ele)
 	text = ParseTextBlock(ele, "maps", true);
 	if (text) {
 		MapDir = text;
+		if ( MapDir.back() != '/' )
+			MapDir += '/';
 	}
 	text = ParseTextBlock(ele, "quests", true);
 	if (text) {
 		QuestDir = text;
+		if ( QuestDir.back() != '/' )
+			QuestDir += '/';
 	}
 	text = ParseTextBlock(ele, "plugins", true);
 	if (text) {
 		PluginDir = text;
+		if ( PluginDir.back() != '/' )
+			PluginDir += '/';
+	}
+	text = ParseTextBlock(ele, "lua_modules", true);
+	if (text) {
+		LuaModuleDir = text;
+		if ( LuaModuleDir.back() != '/' )
+			LuaModuleDir += '/';
+	}
+	text = ParseTextBlock(ele, "patches", true);
+	if (text) {
+		PatchDir = text;
+		if ( PatchDir.back() != '/' )
+			PatchDir += '/';
+	}
+	text = ParseTextBlock(ele, "shared_memory", true);
+	if (text) {
+		SharedMemDir = text;
+		if ( SharedMemDir.back() != '/' )
+			SharedMemDir += '/';
+	}
+	//Not Fully Implemented yet LogDir
+	text = ParseTextBlock(ele, "logs", true);
+	if (text) {
+		LogDir = text;
+		if ( LogDir.back() != '/' )
+			LogDir += '/';
 	}
 }

@@ -404,6 +439,9 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 	if (var_name == "OpCodesFile") {
 		return (OpCodesFile);
 	}
+	if (var_name == "PluginPlFile") {
+		return (PluginPlFile);
+	}
 	if (var_name == "MapDir") {
 		return (MapDir);
 	}
@@ -413,6 +451,18 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 	if (var_name == "PluginDir") {
 		return (PluginDir);
 	}
+	if (var_name == "LuaModuleDir") {
+		return (LuaModuleDir);
+	}
+	if (var_name == "PatchDir") {
+		return (PatchDir);
+	}
+	if (var_name == "SharedMemDir") {
+		return (SharedMemDir);
+	}
+	if (var_name == "LogDir") {
+		return (LogDir);
+	}
 	if (var_name == "LogPrefix") {
 		return (LogPrefix);
 	}
@@ -468,9 +518,14 @@ void EQEmuConfig::Dump() const
 	std::cout << "QSDatabasePort = " << QSDatabasePort << std::endl;
 	std::cout << "SpellsFile = " << SpellsFile << std::endl;
 	std::cout << "OpCodesFile = " << OpCodesFile << std::endl;
+	std::cout << "PluginPlFile = " << PluginPlFile << std::endl;
 	std::cout << "MapDir = " << MapDir << std::endl;
 	std::cout << "QuestDir = " << QuestDir << std::endl;
 	std::cout << "PluginDir = " << PluginDir << std::endl;
+	std::cout << "LuaModuleDir = " << LuaModuleDir << std::endl;
+	std::cout << "PatchDir = " << PatchDir << std::endl;
+	std::cout << "SharedMemDir = " << SharedMemDir << std::endl;
+	std::cout << "LogDir = " << LogDir << std::endl;
 	std::cout << "ZonePortLow = " << ZonePortLow << std::endl;
 	std::cout << "ZonePortHigh = " << ZonePortHigh << std::endl;
 	std::cout << "DefaultStatus = " << (int)DefaultStatus << std::endl;
@@ -79,11 +79,16 @@ class EQEmuConfig : public XMLParser
 		// From <files/>
 		std::string SpellsFile;
 		std::string OpCodesFile;
+		std::string PluginPlFile;

 		// From <directories/>
 		std::string MapDir;
 		std::string QuestDir;
 		std::string PluginDir;
+		std::string LuaModuleDir;
+		std::string PatchDir;
+		std::string SharedMemDir;
+		std::string LogDir;

 		// From <launcher/>
 		std::string LogPrefix;
@@ -153,10 +158,16 @@ class EQEmuConfig : public XMLParser
 			// Files
 			SpellsFile = "spells_us.txt";
 			OpCodesFile = "opcodes.conf";
+			PluginPlFile = "plugin.pl";
 			// Dirs
-			MapDir = "Maps";
-			QuestDir = "quests";
-			PluginDir = "plugins";
+			MapDir = "Maps/";
+			QuestDir = "quests/";
+			PluginDir = "plugins/";
+			LuaModuleDir = "lua_modules/";
+			PatchDir = "./";
+			SharedMemDir = "shared/";
+			LogDir = "logs/";
+
 			// Launcher
 			LogPrefix = "logs/zone-";
 			LogSuffix = ".log";
@@ -253,6 +253,7 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category,

 void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...)
 {
+
 	bool log_to_console = true;
 	if (log_settings[log_category].log_to_console < debug_level) {
 		log_to_console = false;
@@ -276,9 +277,9 @@ void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::st
 	va_start(args, message);
 	std::string output_message = vStringFormat(message.c_str(), args);
 	va_end(args);
-	
+
 	std::string output_debug_message = EQEmuLogSys::FormatOutMessageString(log_category, output_message);
-	
+
 	if (log_to_console) EQEmuLogSys::ProcessConsoleMessage(debug_level, log_category, output_debug_message);
 	if (log_to_gmsay) EQEmuLogSys::ProcessGMSay(debug_level, log_category, output_debug_message);
 	if (log_to_file) EQEmuLogSys::ProcessLogWrite(debug_level, log_category, output_debug_message);
@@ -83,6 +83,7 @@ namespace Logs {
 		Server_Client_Packet_With_Dump,
 		Client_Server_Packet_With_Dump,
 		Login_Server,
+		Client_Login,
 		MaxCategoryID	/* Don't Remove this*/
 	};

@@ -131,7 +132,8 @@ namespace Logs {
 		"Packet :: Client -> Server Unhandled",
 		"Packet :: Server -> Client (Dump)",
 		"Packet :: Client -> Server (Dump)",
-		"Login Server"
+		"Login Server",
+		"Client Login"
 	};
 }

@@ -19,7 +19,7 @@
 #define EXTENDED_PROFILE_H

 #include "eq_packet_structs.h"
-#include "item.h"
+#include "inventory_profile.h"

 #pragma pack(1)

@@ -40,7 +40,7 @@ struct ExtendedProfile_Struct {
 	uint16				old_pet_hp; /* Not Used */
 	uint16				old_pet_mana; /* Not Used */
 	SpellBuff_Struct	pet_buffs[BUFF_COUNT]; /* Not Used */
-	uint32				pet_items[_MaterialCount]; /* Not Used */
+	EQEmu::TextureMaterialProfile	pet_items; /* Not Used */
 	char				merc_name[64]; /* Used */

 	uint32				aa_effects; /* Used */
@@ -213,8 +213,8 @@ enum {	//some random constants
 #define MAX_NPC_FACTIONS 20

 //individual faction pool
-#define MAX_PERSONAL_FACTION 1200
-#define MIN_PERSONAL_FACTION -3000
+#define MAX_PERSONAL_FACTION 2000
+#define MIN_PERSONAL_FACTION -2000

 //The Level Cap:
 //#define LEVEL_CAP RuleI(Character, MaxLevel)	//hard cap is 127
@@ -235,6 +235,9 @@ enum {	//some random constants

 #define ZONE_CONTROLLER_NPC_ID 10

+// Timer to update aggrometer
+#define AGGRO_METER_UPDATE_MS 1000
+
 //Some hard coded statuses from commands and other places:
 enum {
 	minStatusToBeGM = 40,
@@ -16,6 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

+// WHY IS THIS UP HERE
 #if defined(_DEBUG) && defined(WIN32)
 	#ifndef _CRTDBG_MAP_ALLOC
 		#include <stdlib.h>
@@ -26,16 +27,9 @@
 #ifndef EQDEBUG_H
 #define EQDEBUG_H

-#define _WINSOCKAPI_	//stupid windows, trying to fix the winsock2 vs. winsock issues
-#if defined(WIN32) && ( defined(PACKETCOLLECTOR) || defined(COLLECTOR) )
-	// Packet Collector on win32 requires winsock.h due to latest pcap.h
-	// winsock.h must come before windows.h
-	#include <winsock.h>
-#endif
-
 #ifdef _WINDOWS
-	#include <windows.h>
 	#include <winsock2.h>
+	#include <windows.h>
 #endif

 #endif
@@ -179,7 +179,7 @@ BaseGuildManager::GuildInfo *BaseGuildManager::_CreateGuild(uint32 guild_id, con
 	}

 	//make the new entry and store it into the map.
-	GuildInfo *info = new GuildInfo;
+	auto info = new GuildInfo;
 	info->name = guild_name;
 	info->leader_char_id = leader_char_id;
 	info->minstatus = minstatus;
@@ -236,9 +236,9 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) {
 	results = m_db->QueryDatabase(query);

 	//escape our strings.
-	char *name_esc = new char[info->name.length()*2+1];
-	char *motd_esc = new char[info->motd.length()*2+1];
-	char *motd_set_esc = new char[info->motd_setter.length()*2+1];
+	auto name_esc = new char[info->name.length() * 2 + 1];
+	auto motd_esc = new char[info->motd.length() * 2 + 1];
+	auto motd_set_esc = new char[info->motd_setter.length() * 2 + 1];
 	m_db->DoEscapeString(name_esc, info->name.c_str(), info->name.length());
 	m_db->DoEscapeString(motd_esc, info->motd.c_str(), info->motd.length());
 	m_db->DoEscapeString(motd_set_esc, info->motd_setter.c_str(), info->motd_setter.length());
@@ -264,7 +264,7 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) {
 	for(rank = 0; rank <= GUILD_MAX_RANK; rank++) {
 		const RankInfo &rankInfo = info->ranks[rank];

-		char *title_esc = new char[rankInfo.name.length()*2+1];
+		auto title_esc = new char[rankInfo.name.length() * 2 + 1];
 		m_db->DoEscapeString(title_esc, rankInfo.name.c_str(), rankInfo.name.length());

        query = StringFormat("INSERT INTO guild_ranks "
@@ -564,7 +564,7 @@ bool BaseGuildManager::DBRenameGuild(uint32 guild_id, const char* name) {

 	//escape our strings.
 	uint32 len = strlen(name);
-	char *esc = new char[len*2+1];
+	auto esc = new char[len * 2 + 1];
 	m_db->DoEscapeString(esc, name, len);

 	//insert the new `guilds` entry
@@ -636,8 +636,8 @@ bool BaseGuildManager::DBSetGuildMOTD(uint32 guild_id, const char* motd, const c
 	//escape our strings.
 	uint32 len = strlen(motd);
 	uint32 len2 = strlen(setter);
-	char *esc = new char[len*2+1];
-	char *esc_set = new char[len2*2+1];
+	auto esc = new char[len * 2 + 1];
+	auto esc_set = new char[len2 * 2 + 1];
 	m_db->DoEscapeString(esc, motd, len);
 	m_db->DoEscapeString(esc_set, setter, len2);

@@ -675,7 +675,7 @@ bool BaseGuildManager::DBSetGuildURL(uint32 GuildID, const char* URL)

 	//escape our strings.
 	uint32 len = strlen(URL);
-	char *esc = new char[len*2+1];
+	auto esc = new char[len * 2 + 1];
 	m_db->DoEscapeString(esc, URL, len);

    std::string query = StringFormat("UPDATE guilds SET url='%s' WHERE id=%d", esc, GuildID);
@@ -709,7 +709,7 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel)

 	//escape our strings.
 	uint32 len = strlen(Channel);
-	char *esc = new char[len*2+1];
+	auto esc = new char[len * 2 + 1];
 	m_db->DoEscapeString(esc, Channel, len);

    std::string query = StringFormat("UPDATE guilds SET channel='%s' WHERE id=%d", esc, GuildID);
@@ -832,7 +832,7 @@ bool BaseGuildManager::DBSetPublicNote(uint32 charid, const char* note) {

 	//escape our strings.
 	uint32 len = strlen(note);
-	char *esc = new char[len*2+1];
+	auto esc = new char[len * 2 + 1];
 	m_db->DoEscapeString(esc, note, len);

 	//insert the new `guilds` entry
@@ -918,8 +918,8 @@ bool BaseGuildManager::GetEntireGuild(uint32 guild_id, std::vector<CharGuildInfo
 		return false;
 	}

-    for (auto row = results.begin(); row != results.end(); ++row) {
-		CharGuildInfo *ci = new CharGuildInfo;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		auto ci = new CharGuildInfo;
 		ProcessGuildMember(row, *ci);
 		members.push_back(ci);
 	}
@@ -937,7 +937,7 @@ bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) {

 	//escape our strings.
 	uint32 nl = strlen(char_name);
-	char *esc = new char[nl*2+1];
+	auto esc = new char[nl * 2 + 1];
 	m_db->DoEscapeString(esc, char_name, nl);

 	//load up the rank info for each guild.
@@ -994,7 +994,7 @@ uint8 *BaseGuildManager::MakeGuildList(const char *head_name, uint32 &length) co
 	//dynamic structs will make this a lot less painful.

 	length = sizeof(GuildsList_Struct);
-	uint8 *buffer = new uint8[length];
+	auto buffer = new uint8[length];

 	//a bit little better than memsetting the whole thing...
 	uint32 r,pos;
@@ -0,0 +1,230 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  04111-1307  USA
+*/
+
+// @merth notes:
+// These classes could be optimized with database reads/writes by storing
+// a status flag indicating how object needs to interact with database
+
+#ifndef COMMON_INVENTORY_PROFILE_H
+#define COMMON_INVENTORY_PROFILE_H
+
+
+#include "item_instance.h"
+
+#include <list>
+
+
+//FatherNitwit: location bits for searching specific
+//places with HasItem() and HasItemByUse()
+enum {
+	invWhereWorn		= 0x01,
+	invWherePersonal	= 0x02,	//in the character's inventory
+	invWhereBank		= 0x04,
+	invWhereSharedBank	= 0x08,
+	invWhereTrading		= 0x10,
+	invWhereCursor		= 0x20
+};
+
+// ########################################
+// Class: Queue
+//	Queue that allows a read-only iterator
+class ItemInstQueue
+{
+public:
+	~ItemInstQueue();
+	/////////////////////////
+	// Public Methods
+	/////////////////////////
+
+	inline std::list<EQEmu::ItemInstance*>::const_iterator cbegin() { return m_list.cbegin(); }
+	inline std::list<EQEmu::ItemInstance*>::const_iterator cend() { return m_list.cend(); }
+
+	inline int size() { return static_cast<int>(m_list.size()); } // TODO: change to size_t
+	inline bool empty() { return m_list.empty(); }
+
+	void push(EQEmu::ItemInstance* inst);
+	void push_front(EQEmu::ItemInstance* inst);
+	EQEmu::ItemInstance* pop();
+	EQEmu::ItemInstance* pop_back();
+	EQEmu::ItemInstance* peek_front() const;
+
+protected:
+	/////////////////////////
+	// Protected Members
+	/////////////////////////
+
+	std::list<EQEmu::ItemInstance*> m_list;
+};
+
+// ########################################
+// Class: EQEmu::InventoryProfile
+//	Character inventory
+namespace EQEmu
+{
+	class InventoryProfile
+	{
+		friend class ItemInstance;
+	public:
+		///////////////////////////////
+		// Public Methods
+		///////////////////////////////
+
+		InventoryProfile() { m_mob_version = versions::MobVersion::Unknown; m_mob_version_set = false; }
+		~InventoryProfile();
+
+		bool SetInventoryVersion(versions::MobVersion inventory_version) {
+			if (!m_mob_version_set) {
+				m_mob_version = versions::ValidateMobVersion(inventory_version);
+				return (m_mob_version_set = true);
+			}
+			else {
+				return false;
+			}
+		}
+		bool SetInventoryVersion(versions::ClientVersion client_version) { return SetInventoryVersion(versions::ConvertClientVersionToMobVersion(client_version)); }
+
+		versions::MobVersion InventoryVersion() { return m_mob_version; }
+
+		static void CleanDirty();
+		static void MarkDirty(ItemInstance *inst);
+
+		// Retrieve a writeable item at specified slot
+		ItemInstance* GetItem(int16 slot_id) const;
+		ItemInstance* GetItem(int16 slot_id, uint8 bagidx) const;
+
+		inline std::list<ItemInstance*>::const_iterator cursor_cbegin() { return m_cursor.cbegin(); }
+		inline std::list<ItemInstance*>::const_iterator cursor_cend() { return m_cursor.cend(); }
+
+		inline int CursorSize() { return m_cursor.size(); }
+		inline bool CursorEmpty() { return m_cursor.empty(); }
+
+		// Retrieve a read-only item from inventory
+		inline const ItemInstance* operator[](int16 slot_id) const { return GetItem(slot_id); }
+
+		// Add item to inventory
+		int16 PutItem(int16 slot_id, const ItemInstance& inst);
+
+		// Add item to cursor queue
+		int16 PushCursor(const ItemInstance& inst);
+
+		// Get cursor item in front of queue
+		ItemInstance* GetCursorItem();
+
+		// Swap items in inventory
+		bool SwapItem(int16 slot_a, int16 slot_b);
+
+		// Remove item from inventory
+		bool DeleteItem(int16 slot_id, uint8 quantity = 0);
+
+		// Checks All items in a bag for No Drop
+		bool CheckNoDrop(int16 slot_id, bool recurse = true);
+
+		// Remove item from inventory (and take control of memory)
+		ItemInstance* PopItem(int16 slot_id);
+
+		// Check whether there is space for the specified number of the specified item.
+		bool HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity);
+
+		// Check whether item exists in inventory
+		// where argument specifies OR'd list of invWhere constants to look
+		int16 HasItem(uint32 item_id, uint8 quantity = 0, uint8 where = 0xFF);
+
+		// Check whether item exists in inventory
+		// where argument specifies OR'd list of invWhere constants to look
+		int16 HasItemByUse(uint8 use, uint8 quantity = 0, uint8 where = 0xFF);
+
+		// Check whether item exists in inventory
+		// where argument specifies OR'd list of invWhere constants to look
+		int16 HasItemByLoreGroup(uint32 loregroup, uint8 where = 0xFF);
+
+		// Locate an available inventory slot
+		int16 FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size = 0, bool is_arrow = false);
+		int16 FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start = legacy::GENERAL_BEGIN, uint8 bag_start = inventory::containerBegin);
+
+		// Calculate slot_id for an item within a bag
+		static int16 CalcSlotId(int16 slot_id); // Calc parent bag's slot_id
+		static int16 CalcSlotId(int16 bagslot_id, uint8 bagidx); // Calc slot_id for item inside bag
+		static uint8 CalcBagIdx(int16 slot_id); // Calc bagidx for slot_id
+		static int16 CalcSlotFromMaterial(uint8 material);
+		static uint8 CalcMaterialFromSlot(int16 equipslot);
+
+		static bool CanItemFitInContainer(const ItemData *ItemToTry, const ItemData *Container);
+
+		//  Test for valid inventory casting slot
+		bool SupportsClickCasting(int16 slot_id);
+		bool SupportsPotionBeltCasting(int16 slot_id);
+
+		// Test whether a given slot can support a container item
+		static bool SupportsContainers(int16 slot_id);
+
+		int GetSlotByItemInst(ItemInstance *inst);
+
+		uint8 FindBrightestLightType();
+
+		void dumpEntireInventory();
+		void dumpWornItems();
+		void dumpInventory();
+		void dumpBankItems();
+		void dumpSharedBankItems();
+
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
+		std::string GetCustomItemData(int16 slot_id, std::string identifier);
+	protected:
+		///////////////////////////////
+		// Protected Methods
+		///////////////////////////////
+
+		int GetSlotByItemInstCollection(const std::map<int16, ItemInstance*> &collection, ItemInstance *inst);
+		void dumpItemCollection(const std::map<int16, ItemInstance*> &collection);
+		void dumpBagContents(ItemInstance *inst, std::map<int16, ItemInstance*>::const_iterator *it);
+
+		// Retrieves item within an inventory bucket
+		ItemInstance* _GetItem(const std::map<int16, ItemInstance*>& bucket, int16 slot_id) const;
+
+		// Private "put" item into bucket, without regard for what is currently in bucket
+		int16 _PutItem(int16 slot_id, ItemInstance* inst);
+
+		// Checks an inventory bucket for a particular item
+		int16 _HasItem(std::map<int16, ItemInstance*>& bucket, uint32 item_id, uint8 quantity);
+		int16 _HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity);
+		int16 _HasItemByUse(std::map<int16, ItemInstance*>& bucket, uint8 use, uint8 quantity);
+		int16 _HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity);
+		int16 _HasItemByLoreGroup(std::map<int16, ItemInstance*>& bucket, uint32 loregroup);
+		int16 _HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup);
+
+
+		// Player inventory
+		std::map<int16, ItemInstance*>	m_worn;		// Items worn by character
+		std::map<int16, ItemInstance*>	m_inv;		// Items in character personal inventory
+		std::map<int16, ItemInstance*>	m_bank;		// Items in character bank
+		std::map<int16, ItemInstance*>	m_shbank;	// Items in character shared bank
+		std::map<int16, ItemInstance*>	m_trade;	// Items in a trade session
+		::ItemInstQueue					m_cursor;	// Items on cursor: FIFO
+
+	private:
+		// Active mob version
+		versions::MobVersion m_mob_version;
+		bool m_mob_version_set;
+	};
+}
+
+#endif /*COMMON_INVENTORY_PROFILE_H*/
@@ -0,0 +1,397 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "inventory_slot.h"
+#include "textures.h"
+#include "string_util.h"
+
+
+int8 EQEmu::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index)
+{
+	switch (slot_index) {
+	case slotHead:
+		return textures::armorHead;
+	case slotChest:
+		return textures::armorChest;
+	case slotArms:
+		return textures::armorArms;
+	case slotWrist1:
+		return textures::armorWrist;
+	case slotHands:
+		return textures::armorHands;
+	case slotLegs:
+		return textures::armorLegs;
+	case slotFeet:
+		return textures::armorFeet;
+	case slotPrimary:
+		return textures::weaponPrimary;
+	case slotSecondary:
+		return textures::weaponSecondary;
+	default:
+		return textures::textureInvalid;
+	}
+}
+
+int8 EQEmu::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& inventory_slot)
+{
+	if ((!inventory_slot.Typeless() && !inventory_slot.IsTypeIndex(typePossessions)) || !inventory_slot.IsContainerIndex(containerInvalid) || !inventory_slot.IsSocketIndex(socketInvalid))
+		return textures::textureInvalid;
+
+	return ConvertEquipmentIndexToTextureIndex(inventory_slot.SlotIndex());
+}
+
+int16 EQEmu::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index)
+{
+	switch (texture_index) {
+	case textures::armorHead:
+		return slotHead;
+	case textures::armorChest:
+		return slotChest;
+	case textures::armorArms:
+		return slotArms;
+	case textures::armorWrist:
+		return slotWrist1;
+	case textures::armorHands:
+		return slotHands;
+	case textures::armorLegs:
+		return slotLegs;
+	case textures::armorFeet:
+		return slotFeet;
+	case textures::weaponPrimary:
+		return slotPrimary;
+	case textures::weaponSecondary:
+		return slotSecondary;
+	default:
+		return slotInvalid;
+	}
+}
+
+bool EQEmu::InventorySlot::IsValidSlot() const
+{
+	if (_typeless)
+		return false;
+	
+	int16 slot_count = inventory::SlotCount(_type_index);
+	if (!slot_count || _slot_index < inventory::slotBegin || _slot_index >= slot_count)
+		return false;
+
+	if (_container_index < inventory::containerInvalid || _container_index >= inventory::ContainerCount)
+		return false;
+
+	if (_socket_index < inventory::socketInvalid || _socket_index >= inventory::SocketCount)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsDeleteSlot() const
+{
+	if (_typeless)
+		return (_slot_index == inventory::slotInvalid && _container_index == inventory::containerInvalid && _socket_index == inventory::socketInvalid);
+	else
+		return (_type_index == inventory::typeInvalid && _slot_index == inventory::slotInvalid && _container_index == inventory::containerInvalid && _socket_index == inventory::socketInvalid);
+}
+
+bool EQEmu::InventorySlot::IsEquipmentIndex(int16 slot_index)
+{
+	/*if (slot_index < inventory::EquipmentBegin || slot_index > inventory::EquipmentEnd)
+		return false;*/
+	if ((slot_index < legacy::EQUIPMENT_BEGIN || slot_index > legacy::EQUIPMENT_END) && slot_index != legacy::SLOT_POWER_SOURCE)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsGeneralIndex(int16 slot_index)
+{
+	/*if (slot_index < inventory::GeneralBegin || slot_index > inventory::GeneralEnd)
+		return false;*/
+	if (slot_index < legacy::GENERAL_BEGIN || slot_index > legacy::GENERAL_END)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsCursorIndex(int16 slot_index)
+{
+	/*if (slot_index != inventory::slotCursor)
+		return false;*/
+	if (slot_index != legacy::SLOT_CURSOR)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsWeaponIndex(int16 slot_index)
+{
+	/*if ((slot_index != inventory::slotRange) && (slot_index != inventory::slotPrimary) && (slot_index != inventory::slotSecondary))
+		return false;*/
+	if ((slot_index != legacy::SLOT_RANGE) && (slot_index != legacy::SLOT_PRIMARY) && (slot_index != legacy::SLOT_SECONDARY))
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsTextureIndex(int16 slot_index)
+{
+	switch (slot_index) {
+	case inventory::slotHead:
+	case inventory::slotChest:
+	case inventory::slotArms:
+	case inventory::slotWrist1:
+	case inventory::slotHands:
+	case inventory::slotLegs:
+	case inventory::slotFeet:
+	case inventory::slotPrimary:
+	case inventory::slotSecondary:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool EQEmu::InventorySlot::IsTintableIndex(int16 slot_index)
+{
+	switch (slot_index) {
+	case inventory::slotHead:
+	case inventory::slotChest:
+	case inventory::slotArms:
+	case inventory::slotWrist1:
+	case inventory::slotHands:
+	case inventory::slotLegs:
+	case inventory::slotFeet:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool EQEmu::InventorySlot::IsEquipmentSlot() const
+{
+	if (!_typeless && (_type_index != inventory::typePossessions))
+		return false;
+
+	if ((_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+		return false;
+
+	return IsEquipmentIndex(_slot_index);
+}
+
+bool EQEmu::InventorySlot::IsGeneralSlot() const
+{
+	if (!_typeless && (_type_index != inventory::typePossessions))
+		return false;
+
+	if ((_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+		return false;
+
+	return IsGeneralIndex(_socket_index);
+}
+
+bool EQEmu::InventorySlot::IsCursorSlot() const
+{
+	if (!_typeless && (_type_index != inventory::typePossessions))
+		return false;
+
+	if ((_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+		return false;
+
+	return IsCursorIndex(_slot_index);
+}
+
+bool EQEmu::InventorySlot::IsWeaponSlot() const
+{
+	if (!_typeless && (_type_index != inventory::typePossessions))
+		return false;
+
+	if ((_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+		return false;
+
+	return IsWeaponIndex(_slot_index);
+}
+
+bool EQEmu::InventorySlot::IsTextureSlot() const
+{
+	if (!_typeless && (_type_index != inventory::typePossessions))
+		return false;
+
+	if ((_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+		return false;
+
+	return IsTextureIndex(_slot_index);
+}
+
+bool EQEmu::InventorySlot::IsTintableSlot() const
+{
+	if (!_typeless && (_type_index != inventory::typePossessions))
+		return false;
+
+	if ((_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+		return false;
+
+	return IsTintableIndex(_slot_index);
+}
+
+bool EQEmu::InventorySlot::IsSlot() const
+{
+	if (!_typeless && (_type_index == inventory::typeInvalid))
+		return false;
+	if (_slot_index == inventory::slotInvalid)
+		return false;
+	if (_container_index != inventory::containerInvalid)
+		return false;
+	if (_socket_index != inventory::socketInvalid)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsSlotSocket() const
+{
+	if (!_typeless && (_type_index == inventory::typeInvalid))
+		return false;
+	if (_slot_index == inventory::slotInvalid)
+		return false;
+	if (_container_index != inventory::containerInvalid)
+		return false;
+	if (_socket_index == inventory::socketInvalid)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsContainer() const
+{
+	if (!_typeless && (_type_index == inventory::typeInvalid))
+		return false;
+	if (_slot_index == inventory::slotInvalid)
+		return false;
+	if (_container_index == inventory::containerInvalid)
+		return false;
+	if (_socket_index != inventory::socketInvalid)
+		return false;
+
+	return true;
+}
+
+bool EQEmu::InventorySlot::IsContainerSocket() const
+{
+	if (!_typeless && (_type_index == inventory::typeInvalid))
+		return false;
+	if (_slot_index == inventory::slotInvalid)
+		return false;
+	if (_container_index == inventory::containerInvalid)
+		return false;
+	if (_socket_index == inventory::socketInvalid)
+		return false;
+
+	return true;
+}
+
+EQEmu::InventorySlot EQEmu::InventorySlot::ToTopOwner() const
+{
+	return InventorySlot(_type_index, _slot_index);
+}
+
+EQEmu::InventorySlot EQEmu::InventorySlot::ToOwner() const
+{
+	if (IsSlot() || IsSlotSocket() || IsContainer())
+		return InventorySlot(_type_index, _slot_index);
+
+	if (IsContainerSocket())
+		return InventorySlot(_type_index, _slot_index, _container_index);
+
+	return InventorySlot();
+}
+
+const std::string EQEmu::InventorySlot::ToString() const
+{
+	return StringFormat("(%i%s, %i, %i, %i)", _type_index, (_typeless ? " [typeless]" : ""), _slot_index, _container_index, _socket_index);
+}
+
+const std::string EQEmu::InventorySlot::ToName() const
+{
+	return StringFormat("InventorySlot - _type_index: %i%s, _slot_index: %i, _container_index: %i, _socket_index: %i", _type_index, (_typeless ? " [typeless]" : ""), _slot_index, _container_index, _socket_index);
+}
+
+void EQEmu::InventorySlot::SetInvalidSlot()
+{
+	_type_index = inventory::typeInvalid;
+	_slot_index = inventory::slotInvalid;
+	_container_index = inventory::containerInvalid;
+	_socket_index = inventory::socketInvalid;
+}
+
+//bool EQEmu::InventorySlot::IsBonusIndex(int16 slot_index)
+//{
+//	if ((slot_index >= inventory::EquipmentBegin) && (slot_index <= inventory::EquipmentEnd) && (slot_index != inventory::slotAmmo))
+//		return true;
+//
+//	return false;
+//}
+
+//bool EQEmu::InventorySlot::IsBonusSlot() const
+//{
+//	if ((_type_index != inventory::typePossessions) || (_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
+//		return false;
+//
+//	return IsBonusIndex(_slot_index);
+//}
+
+bool inventory_slot_typeless_lessthan(const EQEmu::InventorySlot& lhs, const EQEmu::InventorySlot& rhs)
+{
+	if (lhs.SlotIndex() < rhs.SlotIndex())
+		return true;
+
+	if ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() < rhs.ContainerIndex()))
+		return true;
+
+	if ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() < rhs.SocketIndex()))
+		return true;
+
+	return false;
+}
+
+bool EQEmu::InventorySlot::operator<(const InventorySlot& rhs) const
+{
+	if (Typeless() || rhs.Typeless())
+		return inventory_slot_typeless_lessthan(*this, rhs);
+	
+	if (TypeIndex() < rhs.TypeIndex())
+		return true;
+
+	if ((TypeIndex() == rhs.TypeIndex()) && (SlotIndex() < rhs.SlotIndex()))
+		return true;
+
+	if ((TypeIndex() == rhs.TypeIndex()) && (SlotIndex() == rhs.SlotIndex()) && (ContainerIndex() < rhs.ContainerIndex()))
+		return true;
+
+	if ((TypeIndex() == rhs.TypeIndex()) && (SlotIndex() == rhs.SlotIndex()) && (ContainerIndex() == rhs.ContainerIndex()) && (SocketIndex() < rhs.SocketIndex()))
+		return true;
+
+	return false;
+}
+
+bool EQEmu::operator==(const InventorySlot& lhs, const InventorySlot& rhs)
+{
+	if (lhs.Typeless() || rhs.Typeless())
+		return ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex()));
+	
+	return ((lhs.TypeIndex() == rhs.TypeIndex()) && (lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex()));
+}
@@ -0,0 +1,133 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_INVENTORY_SLOT
+#define COMMON_INVENTORY_SLOT
+
+#include "emu_constants.h"
+
+
+namespace EQEmu
+{
+	class InventorySlot;
+
+	namespace inventory {
+		int8 ConvertEquipmentIndexToTextureIndex(int16 slot_index);
+		int8 ConvertEquipmentSlotToTextureIndex(const InventorySlot& inventory_slot);
+		int16 ConvertTextureIndexToEquipmentIndex(int8 texture_index);
+	}
+	
+	class InventorySlot {
+	public:
+		InventorySlot() : _type_index(inventory::typeInvalid), _slot_index(inventory::slotInvalid), _container_index(inventory::containerInvalid), _socket_index(inventory::socketInvalid), _typeless(false) { }
+		InventorySlot(int16 type_index) : _type_index(type_index), _slot_index(inventory::slotInvalid), _container_index(inventory::containerInvalid), _socket_index(inventory::socketInvalid), _typeless(false) { }
+		InventorySlot(int16 type_index, int16 parent_index) : _type_index(type_index), _slot_index(parent_index), _container_index(inventory::containerInvalid), _socket_index(inventory::socketInvalid), _typeless(false) { }
+		InventorySlot(int16 type_index, int16 parent_index, int16 bag_index) : _type_index(type_index), _slot_index(parent_index), _container_index(bag_index), _socket_index(inventory::socketInvalid), _typeless(false) { }
+		InventorySlot(int16 type_index, int16 parent_index, int16 bag_index, int16 aug_index) : _type_index(type_index), _slot_index(parent_index), _container_index(bag_index), _socket_index(aug_index), _typeless(false) { }
+		InventorySlot(const InventorySlot& r) : _type_index(r._type_index), _slot_index(r._slot_index), _container_index(r._container_index), _socket_index(r._socket_index), _typeless(r._typeless) { }
+		InventorySlot(int16 type_index, const InventorySlot& r) : _type_index(type_index), _slot_index(r._slot_index), _container_index(r._container_index), _socket_index(r._socket_index), _typeless(false) { }
+
+		inline int16 TypeIndex() const { return _type_index; }
+		inline int16 SlotIndex() const { return _slot_index; }
+		inline int16 ContainerIndex() const { return _container_index; }
+		inline int16 SocketIndex() const { return _socket_index; }
+
+		bool Typeless() const { return _typeless; }
+
+		bool IsValidSlot() const;
+		bool IsDeleteSlot() const;
+
+		static bool IsEquipmentIndex(int16 slot_index);
+		static bool IsGeneralIndex(int16 slot_index);
+		static bool IsCursorIndex(int16 slot_index);
+		static bool IsWeaponIndex(int16 slot_index);
+		static bool IsTextureIndex(int16 slot_index);
+		static bool IsTintableIndex(int16 slot_index);
+
+		bool IsEquipmentSlot() const;
+		bool IsGeneralSlot() const;
+		bool IsCursorSlot() const;
+		bool IsWeaponSlot() const;
+		bool IsTextureSlot() const;
+		bool IsTintableSlot() const;
+
+		bool IsSlot() const;
+		bool IsSlotSocket() const;
+		bool IsContainer() const;
+		bool IsContainerSocket() const;
+
+		InventorySlot ToTopOwner() const;
+		InventorySlot ToOwner() const;
+
+		const std::string ToString() const;
+		const std::string ToName() const;
+
+		bool IsTypeIndex(int16 type_index) const { return (_type_index == type_index); }
+		bool IsSlotIndex(int16 slot_index) const { return (_slot_index == slot_index); }
+		bool IsContainerIndex(int16 container_index) const { return (_container_index == container_index); }
+		bool IsSocketIndex(int16 socket_index) const { return (_socket_index == socket_index); }
+
+		void SetType(int16 type_index) { _type_index = type_index; }
+		void SetSlot(int16 slot_index) { _slot_index = slot_index; }
+		void SetContainer(int16 container_index) { _container_index = container_index; }
+		void SetSocket(int16 socket_index) { _socket_index = socket_index; }
+
+		void SetInvalidSlot();
+
+		void SetTypeInvalid() { _type_index = inventory::typeInvalid; }
+		void SetSlotInvalid() { _slot_index = inventory::slotInvalid; }
+		void SetContainerInvalid() { _container_index = inventory::containerInvalid; }
+		void SetSocketInvalid() { _socket_index = inventory::socketInvalid; }
+
+		void SetTypeBegin() { _type_index = inventory::typeBegin; }
+		void SetSlotBegin() { _slot_index = inventory::slotBegin; }
+		void SetContainerBegin() { _container_index = inventory::containerBegin; }
+		void SetSocketBegin() { _socket_index = inventory::socketBegin; }
+
+		void IncrementType() { ++_type_index; }
+		void IncrementSlot() { ++_slot_index; }
+		void IncrementContainer() { ++_container_index; }
+		void IncrementSocket() { ++_socket_index; }
+
+		void SetTypeless() { _typeless = true; }
+		void ClearTypeless() { _typeless = false; }
+
+		// these two methods should really check for all bonus-valid slots..currently checks for equipment only (rework needed)
+		//static bool IsBonusIndex(int16 slot_index);
+		//bool IsBonusSlot() const;
+
+		bool operator<(const InventorySlot& rhs) const;
+
+	private:
+		int16 _type_index;
+		//int16 _unknown2; // not implemented
+		int16 _slot_index;
+		int16 _container_index;
+		int16 _socket_index;
+		//int16 _unknown1; // not implemented
+
+		bool _typeless;
+	};
+
+	bool operator==(const InventorySlot& lhs, const InventorySlot& rhs);
+	bool operator!=(const InventorySlot& lhs, const InventorySlot& rhs) { return (!(lhs == rhs)); }
+
+} /*EQEmu*/
+
+#endif /*COMMON_INVENTORY_SLOT*/
@@ -18,7 +18,9 @@

 #include "ipc_mutex.h"
 #ifdef _WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#undef WIN32_LEAN_AND_MEAN
 #else
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -27,7 +29,7 @@
 #endif
 #include "types.h"
 #include "eqemu_exception.h"
-
+#include "eqemu_config.h"

 namespace EQEmu {
 	struct IPCMutex::Implementation {
@@ -41,7 +43,8 @@ namespace EQEmu {
 	IPCMutex::IPCMutex(std::string name) : locked_(false) {
 		imp_ = new Implementation;
 #ifdef _WINDOWS
-		std::string final_name = "EQEmuMutex_";
+		auto Config = EQEmuConfig::get();
+		std::string final_name = Config->SharedMemDir + "EQEmuMutex_";
 		final_name += name;

 		imp_->mut_ = CreateMutex(nullptr,
@@ -52,7 +55,8 @@ namespace EQEmu {
 			EQ_EXCEPT("IPC Mutex", "Could not create mutex.");
 		}
 #else
-		std::string final_name = name;
+		auto Config = EQEmuConfig::get();
+		std::string final_name = Config->SharedMemDir + name;
 		final_name += ".lock";

 #ifdef __DARWIN
@@ -1,567 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-// @merth notes:
-// These classes could be optimized with database reads/writes by storing
-// a status flag indicating how object needs to interact with database
-
-#ifndef __ITEM_H
-#define __ITEM_H
-
-class ItemParse;			// Parses item packets
-class EvolveInfo;			// Stores information about an evolving item family
-
-#include "../common/eq_constants.h"
-#include "../common/item_struct.h"
-#include "../common/timer.h"
-#include "../common/bodytypes.h"
-
-#include <list>
-#include <map>
-
-
-namespace ItemField
-{
-	enum
-	{
-		source = 0,
-#define F(x) x,
-#include "item_fieldlist.h"
-#undef F
-		updated
-	};
-};
-
-// Specifies usage type for item inside ItemInst
-enum ItemInstTypes
-{
-	ItemInstNormal = 0,
-	ItemInstWorldContainer
-};
-
-typedef enum {
-	byFlagIgnore,	//do not consider this flag
-	byFlagSet,		//apply action if the flag is set
-	byFlagNotSet	//apply action if the flag is NOT set
-} byFlagSetting;
-
-
-//FatherNitwit: location bits for searching specific
-//places with HasItem() and HasItemByUse()
-enum {
-	invWhereWorn		= 0x01,
-	invWherePersonal	= 0x02,	//in the character's inventory
-	invWhereBank		= 0x04,
-	invWhereSharedBank	= 0x08,
-	invWhereTrading		= 0x10,
-	invWhereCursor		= 0x20
-};
-
-
-// ########################################
-// Class: Queue
-//	Queue that allows a read-only iterator
-class ItemInstQueue
-{
-public:
-	~ItemInstQueue();
-	/////////////////////////
-	// Public Methods
-	/////////////////////////
-
-	inline std::list<ItemInst*>::const_iterator cbegin() { return m_list.cbegin(); }
-	inline std::list<ItemInst*>::const_iterator cend() { return m_list.cend(); }
-
-	inline int size() { return static_cast<int>(m_list.size()); } // TODO: change to size_t
-	inline bool empty() { return m_list.empty(); }
-
-	void push(ItemInst* inst);
-	void push_front(ItemInst* inst);
-	ItemInst* pop();
-	ItemInst* pop_back();
-	ItemInst* peek_front() const;
-
-protected:
-	/////////////////////////
-	// Protected Members
-	/////////////////////////
-
-	std::list<ItemInst*> m_list;
-};
-
-// ########################################
-// Class: Inventory
-//	Character inventory
-class Inventory
-{
-	friend class ItemInst;
-public:
-	///////////////////////////////
-	// Public Methods
-	///////////////////////////////
-
-	Inventory() { m_version = ClientVersion::Unknown; m_versionset = false; }
-	~Inventory();
-
-	// Inventory v2 creep
-	bool SetInventoryVersion(ClientVersion version) {
-		if (!m_versionset) {
-			m_version = version;
-			return (m_versionset = true);
-		}
-		else {
-			return false;
-		}
-	}
-
-	ClientVersion GetInventoryVersion() { return m_version; }
-
-	static void CleanDirty();
-	static void MarkDirty(ItemInst *inst);
-
-	// Retrieve a writeable item at specified slot
-	ItemInst* GetItem(int16 slot_id) const;
-	ItemInst* GetItem(int16 slot_id, uint8 bagidx) const;
-
-	inline std::list<ItemInst*>::const_iterator cursor_cbegin() { return m_cursor.cbegin(); }
-	inline std::list<ItemInst*>::const_iterator cursor_cend() { return m_cursor.cend(); }
-
-	inline int CursorSize() { return m_cursor.size(); }
-	inline bool CursorEmpty() { return m_cursor.empty(); }
-
-	// Retrieve a read-only item from inventory
-	inline const ItemInst* operator[](int16 slot_id) const { return GetItem(slot_id); }
-
-	// Add item to inventory
-	int16 PutItem(int16 slot_id, const ItemInst& inst);
-
-	// Add item to cursor queue
-	int16 PushCursor(const ItemInst& inst);
-
-	// Get cursor item in front of queue
-	ItemInst* GetCursorItem();
-
-	// Swap items in inventory
-	bool SwapItem(int16 slot_a, int16 slot_b);
-
-	// Remove item from inventory
-	bool DeleteItem(int16 slot_id, uint8 quantity=0);
-
-	// Checks All items in a bag for No Drop
-	bool CheckNoDrop(int16 slot_id);
-
-	// Remove item from inventory (and take control of memory)
-	ItemInst* PopItem(int16 slot_id);
-
-	// Check whether there is space for the specified number of the specified item.
-	bool HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity);
-
-	// Check whether item exists in inventory
-	// where argument specifies OR'd list of invWhere constants to look
-	int16 HasItem(uint32 item_id, uint8 quantity = 0, uint8 where = 0xFF);
-
-	// Check whether item exists in inventory
-	// where argument specifies OR'd list of invWhere constants to look
-	int16 HasItemByUse(uint8 use, uint8 quantity=0, uint8 where=0xFF);
-
-	// Check whether item exists in inventory
-	// where argument specifies OR'd list of invWhere constants to look
-	int16 HasItemByLoreGroup(uint32 loregroup, uint8 where=0xFF);
-
-	// Locate an available inventory slot
-	int16 FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size = 0, bool is_arrow = false);
-	int16 FindFreeSlotForTradeItem(const ItemInst* inst);
-
-	// Calculate slot_id for an item within a bag
-	static int16 CalcSlotId(int16 slot_id); // Calc parent bag's slot_id
-	static int16 CalcSlotId(int16 bagslot_id, uint8 bagidx); // Calc slot_id for item inside bag
-	static uint8 CalcBagIdx(int16 slot_id); // Calc bagidx for slot_id
-	static int16 CalcSlotFromMaterial(uint8 material);
-	static uint8 CalcMaterialFromSlot(int16 equipslot);
-
-	static bool CanItemFitInContainer(const Item_Struct *ItemToTry, const Item_Struct *Container);
-
-	//  Test for valid inventory casting slot
-	bool SupportsClickCasting(int16 slot_id);
-	bool SupportsPotionBeltCasting(int16 slot_id);
-
-	// Test whether a given slot can support a container item
-	static bool SupportsContainers(int16 slot_id);
-
-	int GetSlotByItemInst(ItemInst *inst);
-
-	uint8 FindBrightestLightType();
-
-	void dumpEntireInventory();
-	void dumpWornItems();
-	void dumpInventory();
-	void dumpBankItems();
-	void dumpSharedBankItems();
-
-	void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
-	void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
-	void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
-	void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
-	std::string GetCustomItemData(int16 slot_id, std::string identifier);
-protected:
-	///////////////////////////////
-	// Protected Methods
-	///////////////////////////////
-
-	int GetSlotByItemInstCollection(const std::map<int16, ItemInst*> &collection, ItemInst *inst);
-	void dumpItemCollection(const std::map<int16, ItemInst*> &collection);
-	void dumpBagContents(ItemInst *inst, std::map<int16, ItemInst*>::const_iterator *it);
-
-	// Retrieves item within an inventory bucket
-	ItemInst* _GetItem(const std::map<int16, ItemInst*>& bucket, int16 slot_id) const;
-
-	// Private "put" item into bucket, without regard for what is currently in bucket
-	int16 _PutItem(int16 slot_id, ItemInst* inst);
-
-	// Checks an inventory bucket for a particular item
-	int16 _HasItem(std::map<int16, ItemInst*>& bucket, uint32 item_id, uint8 quantity);
-	int16 _HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity);
-	int16 _HasItemByUse(std::map<int16, ItemInst*>& bucket, uint8 use, uint8 quantity);
-	int16 _HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity);
-	int16 _HasItemByLoreGroup(std::map<int16, ItemInst*>& bucket, uint32 loregroup);
-	int16 _HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup);
-
-
-	// Player inventory
-	std::map<int16, ItemInst*>	m_worn;		// Items worn by character
-	std::map<int16, ItemInst*>	m_inv;		// Items in character personal inventory
-	std::map<int16, ItemInst*>	m_bank;		// Items in character bank
-	std::map<int16, ItemInst*>	m_shbank;	// Items in character shared bank
-	std::map<int16, ItemInst*>	m_trade;	// Items in a trade session
-	ItemInstQueue				m_cursor;	// Items on cursor: FIFO
-
-private:
-	// Active inventory version
-	ClientVersion m_version;
-	bool m_versionset;
-};
-
-class SharedDatabase;
-
-// ########################################
-// Class: ItemInst
-//	Base class for an instance of an item
-//	An item instance encapsulates item data + data specific
-//	to an item instance (includes dye, augments, charges, etc)
-class ItemInst
-{
-public:
-	/////////////////////////
-	// Methods
-	/////////////////////////
-
-	// Constructors/Destructor
-	ItemInst(const Item_Struct* item = nullptr, int16 charges = 0);
-
-	ItemInst(SharedDatabase *db, uint32 item_id, int16 charges = 0);
-
-	ItemInst(ItemInstTypes use_type);
-
-	ItemInst(const ItemInst& copy);
-
-	~ItemInst();
-
-	// Query item type
-	bool IsType(ItemClassTypes item_class) const;
-
-	// Can item be stacked?
-	bool IsStackable() const;
-	bool IsCharged() const;
-
-	// Can item be equipped by/at?
-	bool IsEquipable(uint16 race, uint16 class_) const;
-	bool IsEquipable(int16 slot_id) const;
-
-	//
-	// Augments
-	//
-	bool IsAugmentable() const;
-	bool AvailableWearSlot(uint32 aug_wear_slots) const;
-	int8 AvailableAugmentSlot(int32 augtype) const;
-	bool IsAugmentSlotAvailable(int32 augtype, uint8 slot) const;
-	inline int32 GetAugmentType() const { return ((m_item) ? m_item->AugType : NO_ITEM); }
-
-	inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == ET_Expendable ) || (m_item->ItemType == ItemTypePotion)) : false); }
-
-	//
-	// Contents
-	//
-	ItemInst* GetItem(uint8 slot) const;
-	uint32 GetItemID(uint8 slot) const;
-	inline const ItemInst* operator[](uint8 slot) const { return GetItem(slot); }
-	void PutItem(uint8 slot, const ItemInst& inst);
-	void PutItem(SharedDatabase *db, uint8 slot, uint32 item_id) { return; } // not defined anywhere...
-	void DeleteItem(uint8 slot);
-	ItemInst* PopItem(uint8 index);
-	void Clear();
-	void ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent);
-	uint8 FirstOpenSlot() const;
-	uint8 GetTotalItemCount() const;
-	bool IsNoneEmptyContainer();
-	std::map<uint8, ItemInst*>* GetContents() { return &m_contents; }
-
-	//
-	// Augments
-	//
-	ItemInst* GetAugment(uint8 slot) const;
-	uint32 GetAugmentItemID(uint8 slot) const;
-	void PutAugment(uint8 slot, const ItemInst& inst);
-	void PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id);
-	void DeleteAugment(uint8 slot);
-	ItemInst* RemoveAugment(uint8 index);
-	bool IsAugmented();
-	ItemInst* GetOrnamentationAug(int32 ornamentationAugtype) const;
-	bool UpdateOrnamentationInfo();
-	static bool CanTransform(const Item_Struct *ItemToTry, const Item_Struct *Container, bool AllowAll = false);
-	
-	// Has attack/delay?
-	bool IsWeapon() const;
-	bool IsAmmo() const;
-
-	// Accessors
-	const uint32 GetID() const { return ((m_item) ? m_item->ID : NO_ITEM); }
-	const uint32 GetItemScriptID() const { return ((m_item) ? m_item->ScriptFileID : NO_ITEM); }
-	const Item_Struct* GetItem() const;
-	const Item_Struct* GetUnscaledItem() const;
-
-	int16 GetCharges() const				{ return m_charges; }
-	void SetCharges(int16 charges)			{ m_charges = charges; }
-
-	uint32 GetPrice() const					{ return m_price; }
-	void SetPrice(uint32 price)				{ m_price = price; }
-
-	void SetColor(uint32 color)				{ m_color = color; }
-	uint32 GetColor() const					{ return m_color; }
-
-	uint32 GetMerchantSlot() const			{ return m_merchantslot; }
-	void SetMerchantSlot(uint32 slot)		{ m_merchantslot = slot; }
-
-	int32 GetMerchantCount() const			{ return m_merchantcount; }
-	void SetMerchantCount(int32 count)		{ m_merchantcount = count; }
-
-	int16 GetCurrentSlot() const			{ return m_currentslot; }
-	void SetCurrentSlot(int16 curr_slot)	{ m_currentslot = curr_slot; }
-
-	// Is this item already attuned?
-	bool IsAttuned() const					{ return m_attuned; }
-	void SetAttuned(bool flag)				{ m_attuned=flag; }
-
-	std::string GetCustomDataString() const;
-	std::string GetCustomData(std::string identifier);
-	void SetCustomData(std::string identifier, std::string value);
-	void SetCustomData(std::string identifier, int value);
-	void SetCustomData(std::string identifier, float value);
-	void SetCustomData(std::string identifier, bool value);
-	void DeleteCustomData(std::string identifier);
-
-	// Allows treatment of this object as though it were a pointer to m_item
-	operator bool() const { return (m_item != nullptr); }
-
-	// Compare inner Item_Struct of two ItemInst objects
-	bool operator==(const ItemInst& right) const { return (this->m_item == right.m_item); }
-	bool operator!=(const ItemInst& right) const { return (this->m_item != right.m_item); }
-
-	// Clone current item
-	ItemInst* Clone() const;
-
-	bool IsSlotAllowed(int16 slot_id) const;
-
-	bool IsScaling() const				{ return m_scaling; }
-	bool IsEvolving() const				{ return (m_evolveLvl >= 1); }
-	uint32 GetExp() const				{ return m_exp; }
-	void SetExp(uint32 exp)				{ m_exp = exp; }
-	void AddExp(uint32 exp)				{ m_exp += exp; }
-	bool IsActivated()					{ return m_activated; }
-	void SetActivated(bool activated)	{ m_activated = activated; }
-	int8 GetEvolveLvl() const			{ return m_evolveLvl; }
-	void SetScaling(bool v)				{ m_scaling = v; }
-	uint32 GetOrnamentationIcon() const							{ return m_ornamenticon; }
-	void SetOrnamentIcon(uint32 ornament_icon)					{ m_ornamenticon = ornament_icon; }
-	uint32 GetOrnamentationIDFile() const						{ return m_ornamentidfile; }
-	void SetOrnamentationIDFile(uint32 ornament_idfile)			{ m_ornamentidfile = ornament_idfile; }
-	uint32 GetOrnamentHeroModel(int32 material_slot = -1) const;
-	void SetOrnamentHeroModel(uint32 ornament_hero_model)		{ m_ornament_hero_model = ornament_hero_model; }
-	uint32 GetRecastTimestamp() const							{ return m_recast_timestamp; }
-	void SetRecastTimestamp(uint32 in)							{ m_recast_timestamp = in; }
-
-	void Initialize(SharedDatabase *db = nullptr);
-	void ScaleItem();
-	bool EvolveOnAllKills() const;
-	int8 GetMaxEvolveLvl() const;
-	uint32 GetKillsNeeded(uint8 currentlevel);
-
-	std::string Serialize(int16 slot_id) const { InternalSerializedItem_Struct s; s.slot_id=slot_id; s.inst=(const void *)this; std::string ser; ser.assign((char *)&s,sizeof(InternalSerializedItem_Struct)); return ser; }
-	inline int32 GetSerialNumber() const { return m_SerialNumber; }
-	inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }
-
-	std::map<std::string, Timer>& GetTimers() { return m_timers; }
-	void SetTimer(std::string name, uint32 time);
-	void StopTimer(std::string name);
-	void ClearTimers();
-
-	// Get a total of a stat, including augs
-	// These functions should be used in place of other code manually totaling
-	// to centralize where it is done to make future changes easier (ex. whenever powersources come around)
-	// and to minimize errors. CalcItemBonuses however doesn't use these in interest of performance
-	// by default these do not recurse into augs
-	int GetItemArmorClass(bool augments = false) const;
-	int GetItemElementalDamage(int &magic, int &fire, int &cold, int &poison, int &disease, int &chromatic, int &prismatic, int &physical, int &corruption, bool augments = false) const;
-	// These two differ in the fact that they're quick checks (they are checked BEFORE the one above
-	int GetItemElementalFlag(bool augments = false) const;
-	int GetItemElementalDamage(bool augments = false) const;
-	int GetItemRecommendedLevel(bool augments = false) const;
-	int GetItemRequiredLevel(bool augments = false) const;
-	int GetItemWeaponDamage(bool augments = false) const;
-	int GetItemBackstabDamage(bool augments = false) const;
-	// these two are just quick checks
-	int GetItemBaneDamageBody(bool augments = false) const;
-	int GetItemBaneDamageRace(bool augments = false) const;
-	int GetItemBaneDamageBody(bodyType against, bool augments = false) const;
-	int GetItemBaneDamageRace(uint16 against, bool augments = false) const;
-	int GetItemMagical(bool augments = false) const;
-	int GetItemHP(bool augments = false) const;
-	int GetItemMana(bool augments = false) const;
-	int GetItemEndur(bool augments = false) const;
-	int GetItemAttack(bool augments = false) const;
-	int GetItemStr(bool augments = false) const;
-	int GetItemSta(bool augments = false) const;
-	int GetItemDex(bool augments = false) const;
-	int GetItemAgi(bool augments = false) const;
-	int GetItemInt(bool augments = false) const;
-	int GetItemWis(bool augments = false) const;
-	int GetItemCha(bool augments = false) const;
-	int GetItemMR(bool augments = false) const;
-	int GetItemFR(bool augments = false) const;
-	int GetItemCR(bool augments = false) const;
-	int GetItemPR(bool augments = false) const;
-	int GetItemDR(bool augments = false) const;
-	int GetItemCorrup(bool augments = false) const;
-	int GetItemHeroicStr(bool augments = false) const;
-	int GetItemHeroicSta(bool augments = false) const;
-	int GetItemHeroicDex(bool augments = false) const;
-	int GetItemHeroicAgi(bool augments = false) const;
-	int GetItemHeroicInt(bool augments = false) const;
-	int GetItemHeroicWis(bool augments = false) const;
-	int GetItemHeroicCha(bool augments = false) const;
-	int GetItemHeroicMR(bool augments = false) const;
-	int GetItemHeroicFR(bool augments = false) const;
-	int GetItemHeroicCR(bool augments = false) const;
-	int GetItemHeroicPR(bool augments = false) const;
-	int GetItemHeroicDR(bool augments = false) const;
-	int GetItemHeroicCorrup(bool augments = false) const;
-	int GetItemHaste(bool augments = false) const;
-
-protected:
-	//////////////////////////
-	// Protected Members
-	//////////////////////////
-	std::map<uint8, ItemInst*>::const_iterator _cbegin() { return m_contents.cbegin(); }
-	std::map<uint8, ItemInst*>::const_iterator _cend() { return m_contents.cend(); }
-
-	friend class Inventory;
-
-
-	void _PutItem(uint8 index, ItemInst* inst) { m_contents[index] = inst; }
-
-	ItemInstTypes		m_use_type;	// Usage type for item
-	const Item_Struct*	m_item;		// Ptr to item data
-	int16				m_charges;	// # of charges for chargeable items
-	uint32				m_price;	// Bazaar /trader price
-	uint32				m_color;
-	uint32				m_merchantslot;
-	int16				m_currentslot;
-	bool				m_attuned;
-	int32				m_merchantcount;		//number avaliable on the merchant, -1=unlimited
-	int32				m_SerialNumber;	// Unique identifier for this instance of an item. Needed for Bazaar.
-	uint32				m_exp;
-	int8				m_evolveLvl;
-	bool				m_activated;
-	Item_Struct*		m_scaledItem;
-	EvolveInfo*			m_evolveInfo;
-	bool				m_scaling;
-	uint32				m_ornamenticon;
-	uint32				m_ornamentidfile;
-	uint32				m_ornament_hero_model;
-	uint32				m_recast_timestamp;
-
-	//
-	// Items inside of this item (augs or contents);
-	std::map<uint8, ItemInst*>			m_contents; // Zero-based index: min=0, max=9
-	std::map<std::string, std::string>	m_custom_data;
-	std::map<std::string, Timer>		m_timers;
-};
-
-class EvolveInfo {
-public:
-	friend class ItemInst;
-	//temporary
-	uint16				LvlKills[9];
-	uint32				FirstItem;
-	uint8				MaxLvl;
-	bool				AllKills;
-
-	EvolveInfo();
-	EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10);
-	~EvolveInfo();
-};
-
-struct LightProfile_Struct
-{
-	/*
-	Current criteria (light types):
-	Equipment:	{ 0 .. 15 }
-	General:	{ 9 .. 13 }
-
-	Notes:
-	- Initial character load and item movement updates use different light source update behaviors
-	-- Server procedure matches the item movement behavior since most updates occur post-character load
-	- MainAmmo is not considered when determining light sources
-	- No 'Sub' or 'Aug' items are recognized as light sources
-	- Light types '< 9' and '> 13' are not considered for general (carried) light sources
-	- If values > 0x0F are valid, then assignment limiters will need to be removed
-	- MainCursor 'appears' to be a valid light source update slot..but, have not experienced updates during debug sessions
-	- All clients have a bug regarding stackable items (light and sound updates are not processed when picking up an item)
-	-- The timer-based update cancels out the invalid light source
-	*/
-
-	static uint8 TypeToLevel(uint8 lightType);
-	static bool IsLevelGreater(uint8 leftType, uint8 rightType);
-
-	// Light types (classifications)
-	struct {
-		uint8 Innate;		// Defined by db field `npc_types`.`light` - where appropriate
-		uint8 Equipment;	// Item_Struct::light value of worn/carried equipment
-		uint8 Spell;		// Set value of any light-producing spell (can be modded to mimic equip_light behavior)
-		uint8 Active;		// Highest value of all light sources
-	} Type;
-
-	// Light levels (intensities) - used to determine which light source should be active
-	struct {
-		uint8 Innate;
-		uint8 Equipment;
-		uint8 Spell;
-		uint8 Active;
-	} Level;
-};
-
-#endif // #define __ITEM_H
@@ -0,0 +1,227 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "item_data.h"
+#include "classes.h"
+#include "races.h"
+//#include "deity.h"
+
+
+uint32 EQEmu::item::ConvertAugTypeToAugTypeBit(uint8 aug_type)
+{
+	switch (aug_type) {
+	case AugTypeGeneralSingleStat:
+		return bit_AugTypeGeneralSingleStat;
+	case AugTypeGeneralMultipleStat:
+		return bit_AugTypeGeneralMultipleStat;
+	case AugTypeGeneralSpellEffect:
+		return bit_AugTypeGeneralSpellEffect;
+	case AugTypeWeaponGeneral:
+		return bit_AugTypeWeaponGeneral;
+	case AugTypeWeaponElemDamage:
+		return bit_AugTypeWeaponElemDamage;
+	case AugTypeWeaponBaseDamage:
+		return bit_AugTypeWeaponBaseDamage;
+	case AugTypeGeneralGroup:
+		return bit_AugTypeGeneralGroup;
+	case AugTypeGeneralRaid:
+		return bit_AugTypeGeneralRaid;
+	case AugTypeGeneralDragonsPoints:
+		return bit_AugTypeGeneralDragonsPoints;
+	case AugTypeCraftedCommon:
+		return bit_AugTypeCraftedCommon;
+	case AugTypeCraftedGroup1:
+		return bit_AugTypeCraftedGroup1;
+	case AugTypeCraftedRaid1:
+		return bit_AugTypeCraftedRaid1;
+	case AugTypeEnergeiacGroup:
+		return bit_AugTypeEnergeiacGroup;
+	case AugTypeEnergeiacRaid:
+		return bit_AugTypeEnergeiacRaid;
+	case AugTypeEmblem:
+		return bit_AugTypeEmblem;
+	case AugTypeCraftedGroup2:
+		return bit_AugTypeCraftedGroup2;
+	case AugTypeCraftedRaid2:
+		return bit_AugTypeCraftedRaid2;
+	case AugTypeUnknown1:
+		return bit_AugTypeUnknown1;
+	case AugTypeUnknown2:
+		return bit_AugTypeUnknown2;
+	case AugTypeOrnamentation:
+		return bit_AugTypeOrnamentation;
+	case AugTypeSpecialOrnamentation:
+		return bit_AugTypeSpecialOrnamentation;
+	case AugTypeUnknown3:
+		return bit_AugTypeUnknown3;
+	case AugTypeUnknown4:
+		return bit_AugTypeUnknown4;
+	case AugTypeUnknown5:
+		return bit_AugTypeUnknown5;
+	case AugTypeUnknown6:
+		return bit_AugTypeUnknown6;
+	case AugTypeUnknown7:
+		return bit_AugTypeUnknown7;
+	case AugTypeUnknown8:
+		return bit_AugTypeUnknown8;
+	case AugTypeUnknown9:
+		return bit_AugTypeUnknown9;
+	case AugTypeUnknown10:
+		return bit_AugTypeUnknown10;
+	case AugTypeEpic2_5:
+		return bit_AugTypeEpic2_5;
+	case AugTypeTest:
+		return bit_AugTypeTest;
+	case AugTypeAll:
+		return bit_AugTypeAll;
+	default:
+		return bit_AugTypeNone;
+	}
+}
+
+uint8 EQEmu::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit)
+{
+	switch (aug_type_bit) {
+	case bit_AugTypeGeneralSingleStat:
+		return AugTypeGeneralSingleStat;
+	case bit_AugTypeGeneralMultipleStat:
+		return AugTypeGeneralMultipleStat;
+	case bit_AugTypeGeneralSpellEffect:
+		return AugTypeGeneralSpellEffect;
+	case bit_AugTypeWeaponGeneral:
+		return AugTypeWeaponGeneral;
+	case bit_AugTypeWeaponElemDamage:
+		return AugTypeWeaponElemDamage;
+	case bit_AugTypeWeaponBaseDamage:
+		return AugTypeWeaponBaseDamage;
+	case bit_AugTypeGeneralGroup:
+		return AugTypeGeneralGroup;
+	case bit_AugTypeGeneralRaid:
+		return AugTypeGeneralRaid;
+	case bit_AugTypeGeneralDragonsPoints:
+		return AugTypeGeneralDragonsPoints;
+	case bit_AugTypeCraftedCommon:
+		return AugTypeCraftedCommon;
+	case bit_AugTypeCraftedGroup1:
+		return AugTypeCraftedGroup1;
+	case bit_AugTypeCraftedRaid1:
+		return AugTypeCraftedRaid1;
+	case bit_AugTypeEnergeiacGroup:
+		return AugTypeEnergeiacGroup;
+	case bit_AugTypeEnergeiacRaid:
+		return AugTypeEnergeiacRaid;
+	case bit_AugTypeEmblem:
+		return AugTypeEmblem;
+	case bit_AugTypeCraftedGroup2:
+		return AugTypeCraftedGroup2;
+	case bit_AugTypeCraftedRaid2:
+		return AugTypeCraftedRaid2;
+	case bit_AugTypeUnknown1:
+		return AugTypeUnknown1;
+	case bit_AugTypeUnknown2:
+		return AugTypeUnknown2;
+	case bit_AugTypeOrnamentation:
+		return AugTypeOrnamentation;
+	case bit_AugTypeSpecialOrnamentation:
+		return AugTypeSpecialOrnamentation;
+	case bit_AugTypeUnknown3:
+		return AugTypeUnknown3;
+	case bit_AugTypeUnknown4:
+		return AugTypeUnknown4;
+	case bit_AugTypeUnknown5:
+		return AugTypeUnknown5;
+	case bit_AugTypeUnknown6:
+		return AugTypeUnknown6;
+	case bit_AugTypeUnknown7:
+		return AugTypeUnknown7;
+	case bit_AugTypeUnknown8:
+		return AugTypeUnknown8;
+	case bit_AugTypeUnknown9:
+		return AugTypeUnknown9;
+	case bit_AugTypeUnknown10:
+		return AugTypeUnknown10;
+	case bit_AugTypeEpic2_5:
+		return AugTypeEpic2_5;
+	case bit_AugTypeTest:
+		return AugTypeTest;
+	case bit_AugTypeAll:
+		return AugTypeAll;
+	default:
+		return AugTypeNone;
+	}
+}
+
+bool EQEmu::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const
+{
+	if (!(Races & GetPlayerRaceBit(race_id)))
+		return false;
+
+	if (!(Classes & GetPlayerClassBit(GetPlayerClassValue(class_id))))
+		return false;
+
+	return true;
+}
+
+bool EQEmu::ItemData::IsClassCommon() const
+{
+	return (ItemClass == item::ItemClassCommon);
+}
+
+bool EQEmu::ItemData::IsClassBag() const
+{
+	return (ItemClass == item::ItemClassBag);
+}
+
+bool EQEmu::ItemData::IsClassBook() const
+{
+	return (ItemClass == item::ItemClassBook);
+}
+
+bool EQEmu::ItemData::IsType1HWeapon() const
+{
+	return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing) || (ItemType == item::ItemTypeMartial));
+}
+
+bool EQEmu::ItemData::IsType2HWeapon() const
+{
+	return ((ItemType == item::ItemType2HBlunt) || (ItemType == item::ItemType2HSlash) || (ItemType == item::ItemType2HPiercing));
+}
+
+bool EQEmu::ItemData::IsTypeShield() const
+{
+	return (ItemType == item::ItemTypeShield);
+}
+
+bool EQEmu::ItemData::CheckLoreConflict(const ItemData* l_item, const ItemData* r_item)
+{
+	if (!l_item || !r_item)
+		return false;
+
+	if (!l_item->LoreGroup || !r_item->LoreGroup)
+		return false;
+
+	if (l_item->LoreGroup == r_item->LoreGroup) {
+		if ((l_item->LoreGroup == -1) && (l_item->ID != r_item->ID))
+			return false;
+
+		return true;
+	}
+
+	return false;
+}
@@ -0,0 +1,548 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  04111-1307  USA
+*/
+
+#ifndef COMMON_ITEM_DATA_H
+#define COMMON_ITEM_DATA_H
+
+
+/*
+ * Note: (Doodman)
+ *	This structure has field names that match the DB name exactly.
+ *	Please take care as to not mess this up as it should make
+ *	everyones life (i.e. mine) much easier. And the DB names
+ *	match the field name from the 13th floor (SEQ) item collectors,
+ *	so please maintain that as well.
+ *
+ * Note #2: (Doodman)
+ *	UnkXXX fields are left in here for completeness but commented
+ *	out since they are really unknown and since the items are now
+ *	preserialized they should not be needed. Conversly if they
+ *	-are- needed, then they shouldn't be unkown.
+ *
+ * Note #3: (Doodman)
+ *	Please take care when adding new found data fields to add them
+ *	to the appropriate structure. Item_Struct has elements that are
+ *	global to all types of items only.
+ *
+ * Note #4: (Doodman)
+ *	Made ya look! Ha!
+ */
+
+#include "emu_constants.h"
+
+
+namespace EQEmu
+{
+	namespace item {
+		enum ItemClass {
+			ItemClassCommon = 0,
+			ItemClassBag,
+			ItemClassBook,
+			ItemClassCount
+		};
+
+		enum ItemType : uint8 {
+/*9138*/	ItemType1HSlash = 0,
+/*9141*/	ItemType2HSlash,
+/*9140*/	ItemType1HPiercing,
+/*9139*/	ItemType1HBlunt,
+/*9142*/	ItemType2HBlunt,
+/*5504*/	ItemTypeBow, // 5
+/*----*/	ItemTypeUnknown1,
+/*----*/	ItemTypeLargeThrowing,
+/*5505*/	ItemTypeShield,
+/*5506*/	ItemTypeScroll,
+/*5507*/	ItemTypeArmor, // 10
+/*5508*/	ItemTypeMisc,			// a lot of random crap has this item use.
+/*7564*/	ItemTypeLockPick,
+/*----*/	ItemTypeUnknown2,
+/*5509*/	ItemTypeFood,
+/*5510*/	ItemTypeDrink, // 15
+/*5511*/	ItemTypeLight,
+/*5512*/	ItemTypeCombinable,		// not all stackable items are this use...
+/*5513*/	ItemTypeBandage,
+/*----*/	ItemTypeSmallThrowing,
+/*----*/	ItemTypeSpell, // 20	// spells and tomes
+/*5514*/	ItemTypePotion,
+/*----*/	ItemTypeUnknown3,
+/*0406*/	ItemTypeWindInstrument,
+/*0407*/	ItemTypeStringedInstrument,
+/*0408*/	ItemTypeBrassInstrument, // 25
+/*0405*/	ItemTypePercussionInstrument,
+/*5515*/	ItemTypeArrow,
+/*----*/	ItemTypeUnknown4,
+/*5521*/	ItemTypeJewelry,
+/*----*/	ItemTypeSkull, // 30
+/*5516*/	ItemTypeBook,			// skill-up tomes/books? (would probably need a pp flag if true...)
+/*5517*/	ItemTypeNote,
+/*5518*/	ItemTypeKey,
+/*----*/	ItemTypeCoin,
+/*5520*/	ItemType2HPiercing, // 35
+/*----*/	ItemTypeFishingPole,
+/*----*/	ItemTypeFishingBait,
+/*5519*/	ItemTypeAlcohol,
+/*----*/	ItemTypeKey2,			// keys and satchels?? (questable keys?)
+/*----*/	ItemTypeCompass, // 40
+/*----*/	ItemTypeUnknown5,
+/*----*/	ItemTypePoison,			// might be wrong, but includes poisons
+/*----*/	ItemTypeUnknown6,
+/*----*/	ItemTypeUnknown7,
+/*5522*/	ItemTypeMartial, // 45
+/*----*/	ItemTypeUnknown8,
+/*----*/	ItemTypeUnknown9,
+/*----*/	ItemTypeUnknown10,
+/*----*/	ItemTypeUnknown11,
+/*----*/	ItemTypeSinging, // 50
+/*5750*/	ItemTypeAllInstrumentTypes,
+/*5776*/	ItemTypeCharm,
+/*----*/	ItemTypeDye,
+/*----*/	ItemTypeAugmentation,
+/*----*/	ItemTypeAugmentationSolvent, // 55
+/*----*/	ItemTypeAugmentationDistiller,
+/*----*/	ItemTypeUnknown12,
+/*----*/	ItemTypeFellowshipKit,
+/*----*/	ItemTypeUnknown13,
+/*----*/	ItemTypeRecipe, // 60
+/*----*/	ItemTypeAdvancedRecipe,
+/*----*/	ItemTypeJournal,		// only one(1) database entry
+/*----*/	ItemTypeAltCurrency,	// alt-currency (as opposed to coinage)
+/*5881*/	ItemTypePerfectedAugmentationDistiller,
+/*----*/	ItemTypeCount
+
+/*
+			Unknowns:
+
+			Mounts?
+			Ornamentations?
+			GuildBanners?
+			Collectible? 
+			Placeable?
+			(others?)
+*/
+		};
+
+		enum AugTypeBit : uint32 {
+			bit_AugTypeNone = 0x00000000,
+			bit_AugTypeGeneralSingleStat = 0x00000001,		/*1^16^1 (General: Single Stat)^0*/
+			bit_AugTypeGeneralMultipleStat = 0x00000002,	/*2^16^2 (General: Multiple Stat)^0*/
+			bit_AugTypeGeneralSpellEffect = 0x00000004,		/*3^16^3 (General: Spell Effect)^0*/
+			bit_AugTypeWeaponGeneral = 0x00000008,			/*4^16^4 (Weapon: General)^0*/
+			bit_AugTypeWeaponElemDamage = 0x00000010,		/*5^16^5 (Weapon: Elem Damage)^0*/
+			bit_AugTypeWeaponBaseDamage = 0x00000020,		/*6^16^6 (Weapon: Base Damage)^0*/
+			bit_AugTypeGeneralGroup = 0x00000040,			/*7^16^7 (General: Group)^0*/
+			bit_AugTypeGeneralRaid = 0x00000080,			/*8^16^8 (General: Raid)^0*/
+			bit_AugTypeGeneralDragonsPoints = 0x00000100,	/*9^16^9 (General: Dragons Points)^0*/
+			bit_AugTypeCraftedCommon = 0x00000200,			/*10^16^10 (Crafted: Common)^0*/
+			bit_AugTypeCraftedGroup1 = 0x00000400,			/*11^16^11 (Crafted: Group)^0*/
+			bit_AugTypeCraftedRaid1 = 0x00000800,			/*12^16^12 (Crafted: Raid)^0*/
+			bit_AugTypeEnergeiacGroup = 0x00001000,			/*13^16^13 (Energeiac: Group)^0*/
+			bit_AugTypeEnergeiacRaid = 0x00002000,			/*14^16^14 (Energeiac: Raid)^0*/
+			bit_AugTypeEmblem = 0x00004000,					/*15^16^15 (Emblem)^0*/
+			bit_AugTypeCraftedGroup2 = 0x00008000,			/*16^16^16 (Crafted: Group)^0*/
+			bit_AugTypeCraftedRaid2 = 0x00010000,			/*17^16^17 (Crafted: Raid)^0*/
+			bit_AugTypeUnknown1 = 0x00020000,				/*18^16^18^0*/
+			bit_AugTypeUnknown2 = 0x00040000,				/*19^16^19^0*/
+			bit_AugTypeOrnamentation = 0x00080000,			/*20^16^20 (Ornamentation)^0*/
+			bit_AugTypeSpecialOrnamentation = 0x00100000,	/*21^16^21 (Special Ornamentation)^0*/
+			bit_AugTypeUnknown3 = 0x00200000,				/*22^16^22^0*/
+			bit_AugTypeUnknown4 = 0x00400000,				/*23^16^23^0*/
+			bit_AugTypeUnknown5 = 0x00800000,				/*24^16^24^0*/
+			bit_AugTypeUnknown6 = 0x01000000,				/*25^16^25^0*/
+			bit_AugTypeUnknown7 = 0x02000000,				/*26^16^26^0*/
+			bit_AugTypeUnknown8 = 0x04000000,				/*27^16^27^0*/
+			bit_AugTypeUnknown9 = 0x08000000,				/*28^16^28^0*/
+			bit_AugTypeUnknown10 = 0x10000000,				/*29^16^29^0*/
+			bit_AugTypeEpic2_5 = 0x20000000,				/*30^16^30^0*/
+			bit_AugTypeTest = 0x40000000,					/*31^16^Test^0*/ // listed as 31^16^31^0 in 5-10 client
+			bit_AugTypeAll = 0xFFFFFFFF
+		};
+
+		enum AugType : uint8 {
+			AugTypeNone = 0,
+			AugTypeGeneralSingleStat,
+			AugTypeGeneralMultipleStat,
+			AugTypeGeneralSpellEffect,
+			AugTypeWeaponGeneral,
+			AugTypeWeaponElemDamage, // 5
+			AugTypeWeaponBaseDamage,
+			AugTypeGeneralGroup,
+			AugTypeGeneralRaid,
+			AugTypeGeneralDragonsPoints,
+			AugTypeCraftedCommon, // 10
+			AugTypeCraftedGroup1,
+			AugTypeCraftedRaid1,
+			AugTypeEnergeiacGroup,
+			AugTypeEnergeiacRaid,
+			AugTypeEmblem, // 15
+			AugTypeCraftedGroup2,
+			AugTypeCraftedRaid2,
+			AugTypeUnknown1,
+			AugTypeUnknown2,
+			AugTypeOrnamentation, // 20
+			AugTypeSpecialOrnamentation,
+			AugTypeUnknown3,
+			AugTypeUnknown4,
+			AugTypeUnknown5,
+			AugTypeUnknown6, // 25
+			AugTypeUnknown7,
+			AugTypeUnknown8,
+			AugTypeUnknown9,
+			AugTypeUnknown10,
+			AugTypeEpic2_5, // 30
+			AugTypeTest,
+			AugTypeCount,
+			AugTypeAll = 255
+		};
+
+		enum AugRestriction : uint8 {
+/*4690*/	AugRestrictionAny = 0,
+/*9134*/	AugRestrictionArmor,
+/*9135*/	AugRestrictionWeapons,
+/*9136*/	AugRestriction1HWeapons,
+/*9137*/	AugRestriction2HWeapons,
+/*9138*/	AugRestriction1HSlash, // 5
+/*9139*/	AugRestriction1HBlunt,
+/*9140*/	AugRestrictionPiercing,
+/*9148*/	AugRestrictionHandToHand,
+/*9141*/	AugRestriction2HSlash,
+/*9142*/	AugRestriction2HBlunt, // 10
+/*9143*/	AugRestriction2HPierce,
+/*9144*/	AugRestrictionBows,
+/*9145*/	AugRestrictionShields,
+/*8052*/	AugRestriction1HSlash1HBluntOrHandToHand,
+/*9200*/	AugRestriction1HBluntOrHandToHand, // 15	// no listed peq entries
+
+		// these three appear to be post-RoF (12-10-2012) and can not be verified until RoF (05-10-2013) is supported
+/*????*/	AugRestrictionUnknown1,
+/*????*/	AugRestrictionUnknown2,
+/*????*/	AugRestrictionUnknown3,					// last value in peq entries
+			AugRestrictionCount
+
+/*4687*/	//AugTypeAllItems, // ?? unknown atm
+/*4688*/	//AugTypePrestige, // ?? unknown atm
+/*4689*/	//AugTypeNonPrestige, // ?? unknown atm
+		};
+
+		enum BagType : uint8 {
+/*3400*/	BagTypeSmallBag = 0,
+/*3401*/	BagTypeLargeBag,
+/*3402*/	BagTypeQuiver,
+/*3403*/	BagTypeBeltPouch,
+/*3404*/	BagTypeWristPouch,
+/*3405*/	BagTypeBackPack, // 5
+/*3406*/	BagTypeSmallChest,
+/*3407*/	BagTypeLargeChest,
+/*----*/	BagTypeBandolier,				// <*Database Reference Only>
+/*3408*/	BagTypeMedicineBag,
+/*3409*/	BagTypeToolBox, // 10
+/*3410*/	BagTypeLexicon,
+/*3411*/	BagTypeMortar,
+/*3412*/	BagTypeSelfDusting,				// Quest container (Auto-clear contents?)
+/*3413*/	BagTypeMixingBowl,
+/*3414*/	BagTypeOven, // 15
+/*3415*/	BagTypeSewingKit,
+/*3416*/	BagTypeForge,
+/*3417*/	BagTypeFletchingKit,
+/*3418*/	BagTypeBrewBarrel,
+/*3419*/	BagTypeJewelersKit, // 20
+/*3420*/	BagTypePotteryWheel,
+/*3421*/	BagTypeKiln,
+/*3422*/	BagTypeKeymaker,				// (no database entries as of peq rev 69)
+/*3423*/	BagTypeWizardsLexicon,
+/*3424*/	BagTypeMagesLexicon, // 25
+/*3425*/	BagTypeNecromancersLexicon,
+/*3426*/	BagTypeEnchantersLexicon,
+/*----*/	BagTypeUnknown1,				// (a coin pouch/purse?) (no database entries as of peq rev 69)
+/*----*/	BagTypeConcordanceofResearch,	// <*Database Reference Only>
+/*3427*/	BagTypeAlwaysWorks, // 30		// Quest container (Never-fail combines?)
+/*3428*/	BagTypeKoadaDalForge,			// High Elf
+/*3429*/	BagTypeTeirDalForge,			// Dark Elf
+/*3430*/	BagTypeOggokForge,				// Ogre
+/*3431*/	BagTypeStormguardForge,			// Dwarf
+/*3432*/	BagTypeAkanonForge, // 35		// Gnome
+/*3433*/	BagTypeNorthmanForge,			// Barbarian
+/*----*/	BagTypeUnknown2,				// (no database entries as of peq rev 69)
+/*3434*/	BagTypeCabilisForge,			// Iksar
+/*3435*/	BagTypeFreeportForge,			// Human 1
+/*3436*/	BagTypeRoyalQeynosForge, // 40	// Human 2
+/*3439*/	BagTypeHalflingTailoringKit,
+/*3438*/	BagTypeErudTailoringKit,
+/*3440*/	BagTypeFierDalTailoringKit,		// Wood Elf
+/*3441*/	BagTypeFierDalFletchingKit,		// Wood Elf
+/*3437*/	BagTypeIksarPotteryWheel, // 45
+/*3442*/	BagTypeTackleBox,
+/*3443*/	BagTypeTrollForge,
+/*3445*/	BagTypeFierDalForge,			// Wood Elf
+/*3444*/	BagTypeValeForge,				// Halfling
+/*3446*/	BagTypeErudForge, // 50
+/*----*/	BagTypeTradersSatchel,			// <*Database Reference Only> (db: Yellow Trader's Satchel Token?)
+/*5785*/	BagTypeGuktaForge,				// Froglok (no database entries as of peq rev 69)
+/*3359*/	BagTypeAugmentationSealer,
+/*----*/	BagTypeIceCreamChurn,			// <*Database Reference Only>
+/*6325*/	BagTypeTransformationmold, // 55	// Ornamentation
+/*6340*/	BagTypeDetransformationmold,	// Ornamentation Stripper
+/*5400*/	BagTypeUnattuner,
+/*7684*/	BagTypeTradeskillBag,
+/*7692*/	BagTypeCollectibleBag,
+/*----*/	BagTypeCount
+		};
+
+		enum ItemEffect {
+			ItemEffectCombatProc = 0,
+			ItemEffectClick,
+			ItemEffectWorn,
+			ItemEffectExpendable,
+			ItemEffectEquipClick,
+			ItemEffectClick2, //5		//name unknown
+			ItemEffectFocus,
+			ItemEffectScroll,
+			ItemEffectCount
+		};
+
+		enum ItemSize : uint8 {
+			ItemSizeTiny = 0,
+			ItemSizeSmall,
+			ItemSizeMedium,
+			ItemSizeLarge,
+			ItemSizeGiant,
+			ItemSizeCount
+		};
+
+		enum ItemDataType : uint8 {
+			ItemDataBase = 0,
+			ItemDataScaling,
+			ItemDataEvolving,
+			ItemDataCount
+		};
+
+		struct ItemEffect_Struct {
+			int16	Effect;
+			uint8	Type;
+			uint8	Level;
+			uint8	Level2;
+			//MaxCharges
+			//CastTime
+			//RecastDelay
+			//RecastType
+			//ProcRate
+		};
+
+		uint32 ConvertAugTypeToAugTypeBit(uint8 aug_type);
+		uint8 ConvertAugTypeBitToAugType(uint32 aug_type_bit);
+
+	} /*item*/
+
+	struct InternalSerializedItem_Struct {
+		int16 slot_id;
+		const void * inst;
+	};
+
+	struct ItemData {
+		// Non packet based fields
+		uint8	MinStatus;
+
+		// Packet based fields
+		uint8	ItemClass;		// Item Type: 0=common, 1=container, 2=book
+		char	Name[64];		// Name
+		char	Lore[80];		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
+		char	IDFile[30];		// Visible model
+		uint32	ID;				// Unique ID (also PK for DB)
+		int32	Weight;			// Item weight * 10
+		uint8	NoRent;			// No Rent: 0=norent, 255=not norent
+		uint8	NoDrop;			// No Drop: 0=nodrop, 255=not nodrop
+		uint8	Size;			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
+		uint32	Slots;			// Bitfield for which slots this item can be used in
+		uint32	Price;			// Item cost (?)
+		uint32	Icon;			// Icon Number
+		uint32	LoreGroup;		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
+		bool	LoreFlag;		// This will be true if LoreGroup is non-zero
+		bool	PendingLoreFlag;
+		bool	ArtifactFlag;
+		bool	SummonedFlag;
+		uint8	FVNoDrop;		// Firiona Vie nodrop flag
+		uint32	Favor;			// Individual favor
+		uint32	GuildFavor;		// Guild favor
+		uint32	PointType;
+
+		//uint32	Unk117;
+		//uint32	Unk118;
+		//uint32	Unk121;
+		//uint32	Unk124;
+
+		uint8	BagType;		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
+		uint8	BagSlots;		// Number of slots: can only be 2, 4, 6, 8, or 10
+		uint8	BagSize;		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
+		uint8	BagWR;			// 0->100
+
+		bool	BenefitFlag;
+		bool	Tradeskills;	// Is this a tradeskill item?
+		int8	CR;				// Save vs Cold
+		int8	DR;				// Save vs Disease
+		int8	PR;				// Save vs Poison
+		int8	MR;				// Save vs Magic
+		int8	FR;				// Save vs Fire
+		int8	AStr;			// Strength
+		int8	ASta;			// Stamina
+		int8	AAgi;			// Agility
+		int8	ADex;			// Dexterity
+		int8	ACha;			// Charisma
+		int8	AInt;			// Intelligence
+		int8	AWis;			// Wisdom
+		int32	HP;				// HP
+		int32	Mana;			// Mana
+		int32	AC;				// AC
+		uint32	Deity;			// Bitmask of Deities that can equip this item
+		//uint32	Unk033
+		int32	SkillModValue;	// % Mod to skill specified in SkillModType
+		int32	SkillModMax;	// Max skill point modification
+		uint32	SkillModType;	// Type of skill for SkillModValue to apply to
+		uint32	BaneDmgRace;	// Bane Damage Race
+		int8	BaneDmgAmt;		// Bane Damage Body Amount
+		uint32	BaneDmgBody;	// Bane Damage Body
+		bool	Magic;			// True=Magic Item, False=not
+		int32	CastTime_;
+		uint8	ReqLevel;		// Required Level to use item
+		uint32	BardType;		// Bard Skill Type
+		int32	BardValue;		// Bard Skill Amount
+		int8	Light;			// Light
+		uint8	Delay;			// Delay * 10
+		uint8	RecLevel;		// Recommended level to use item
+		uint8	RecSkill;		// Recommended skill to use item (refers to primary skill of item)
+		uint8	ElemDmgType;	// Elemental Damage Type (1=magic, 2=fire)
+		uint8	ElemDmgAmt;		// Elemental Damage
+		uint8	Range;			// Range of item
+		uint32	Damage;			// Delay between item usage (in 0.1 sec increments)
+		uint32	Color;			// RR GG BB 00 <-- as it appears in pc
+		uint32	Classes;		// Bitfield of classes that can equip item (1 << class#)
+		uint32	Races;			// Bitfield of races that can equip item (1 << race#)
+		//uint32	Unk054;
+		int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
+		uint8	ItemType;		// Item Type/Skill (itemClass* from above)
+		uint8	Material;		// Item material type
+		uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
+		float	SellRate;		// Sell rate
+		//uint32	Unk059;
+		union {
+			uint32 Fulfilment;	// Food fulfilment (How long it lasts)
+			uint32 CastTime;		// Cast Time for clicky effects, in milliseconds
+		};
+		uint32 EliteMaterial;
+		int32	ProcRate;
+		int8	CombatEffects;	// PoP: Combat Effects +
+		int8	Shielding;		// PoP: Shielding %
+		int8	StunResist;		// PoP: Stun Resist %
+		int8	StrikeThrough;	// PoP: Strike Through %
+		uint32	ExtraDmgSkill;
+		uint32	ExtraDmgAmt;
+		int8	SpellShield;	// PoP: Spell Shield %
+		int8	Avoidance;		// PoP: Avoidance +
+		int8	Accuracy;		// PoP: Accuracy +
+		uint32	CharmFileID;
+		int32	FactionMod1;	// Faction Mod 1
+		int32	FactionMod2;	// Faction Mod 2
+		int32	FactionMod3;	// Faction Mod 3
+		int32	FactionMod4;	// Faction Mod 4
+		int32	FactionAmt1;	// Faction Amt 1
+		int32	FactionAmt2;	// Faction Amt 2
+		int32	FactionAmt3;	// Faction Amt 3
+		int32	FactionAmt4;	// Faction Amt 4
+		char	CharmFile[32];	// ?
+		uint32	AugType;
+		uint8	AugSlotType[inventory::SocketCount];	// RoF: Augment Slot 1-6 Type
+		uint8	AugSlotVisible[inventory::SocketCount];	// RoF: Augment Slot 1-6 Visible
+		uint8	AugSlotUnk2[inventory::SocketCount];	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
+		uint32	LDoNTheme;
+		uint32	LDoNPrice;
+		uint32	LDoNSold;
+		uint32	BaneDmgRaceAmt;
+		uint32	AugRestrict;
+		uint32	Endur;
+		uint32	DotShielding;
+		uint32	Attack;
+		uint32	Regen;
+		uint32	ManaRegen;
+		uint32	EnduranceRegen;
+		uint32	Haste;
+		uint32	DamageShield;
+		uint32	RecastDelay;
+		uint32	RecastType;
+		uint32	AugDistiller;
+		bool	Attuneable;
+		bool	NoPet;
+		bool	PotionBelt;
+		bool	Stackable;
+		bool	NoTransfer;
+		bool	QuestItemFlag;
+		int16	StackSize;
+		uint8	PotionBeltSlots;
+		item::ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard;
+
+		uint8	Book;			// 0=Not book, 1=Book
+		uint32	BookType;
+		char	Filename[33];	// Filename for book data
+		// Begin SoF Fields
+		int32 SVCorruption;
+		uint32 Purity;
+		uint8 EvolvingItem;
+		uint32 EvolvingID;
+		uint8 EvolvingLevel;
+		uint8 EvolvingMax;
+		uint32 BackstabDmg;
+		uint32 DSMitigation;
+		int32 HeroicStr;
+		int32 HeroicInt;
+		int32 HeroicWis;
+		int32 HeroicAgi;
+		int32 HeroicDex;
+		int32 HeroicSta;
+		int32 HeroicCha;
+		int32 HeroicMR;
+		int32 HeroicFR;
+		int32 HeroicCR;
+		int32 HeroicDR;
+		int32 HeroicPR;
+		int32 HeroicSVCorrup;
+		int32 HealAmt;
+		int32 SpellDmg;
+		uint32 LDoNSellBackRate;
+		uint32 ScriptFileID;
+		uint16 ExpendableArrow;
+		uint32 Clairvoyance;
+		char	ClickName[65];
+		char	ProcName[65];
+		char	WornName[65];
+		char	FocusName[65];
+		char	ScrollName[65];
+		//BardName
+
+		bool IsEquipable(uint16 Race, uint16 Class) const;
+		bool IsClassCommon() const;
+		bool IsClassBag() const;
+		bool IsClassBook() const;
+		bool IsType1HWeapon() const;
+		bool IsType2HWeapon() const;
+		bool IsTypeShield() const;
+
+		static bool CheckLoreConflict(const ItemData* l_item, const ItemData* r_item);
+		bool CheckLoreConflict(const ItemData* item) const { return CheckLoreConflict(this, item); }
+	};
+
+} /*EQEmu*/
+
+#endif /*COMMON_ITEM_DATA_H*/
@@ -0,0 +1,334 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  04111-1307  USA
+*/
+
+// @merth notes:
+// These classes could be optimized with database reads/writes by storing
+// a status flag indicating how object needs to interact with database
+
+#ifndef COMMON_ITEM_INSTANCE_H
+#define COMMON_ITEM_INSTANCE_H
+
+
+class ItemParse;			// Parses item packets
+class EvolveInfo;			// Stores information about an evolving item family
+
+#include "../common/eq_constants.h"
+#include "../common/item_data.h"
+#include "../common/timer.h"
+#include "../common/bodytypes.h"
+#include "../common/deity.h"
+#include "../common/memory_buffer.h"
+
+#include <map>
+
+
+// Specifies usage type for item inside EQEmu::ItemInstance
+enum ItemInstTypes
+{
+	ItemInstNormal = 0,
+	ItemInstWorldContainer
+};
+
+typedef enum {
+	byFlagIgnore,	//do not consider this flag
+	byFlagSet,		//apply action if the flag is set
+	byFlagNotSet	//apply action if the flag is NOT set
+} byFlagSetting;
+
+class SharedDatabase;
+
+// ########################################
+// Class: EQEmu::ItemInstance
+//	Base class for an instance of an item
+//	An item instance encapsulates item data + data specific
+//	to an item instance (includes dye, augments, charges, etc)
+namespace EQEmu
+{
+	class InventoryProfile;
+	
+	class ItemInstance {
+	public:
+		/////////////////////////
+		// Methods
+		/////////////////////////
+
+		// Constructors/Destructor
+		ItemInstance(const ItemData* item = nullptr, int16 charges = 0);
+
+		ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges = 0);
+
+		ItemInstance(ItemInstTypes use_type);
+
+		ItemInstance(const ItemInstance& copy);
+
+		~ItemInstance();
+
+		// Query item type
+		bool IsType(item::ItemClass item_class) const;
+
+		bool IsClassCommon() const;
+		bool IsClassBag() const;
+		bool IsClassBook() const;
+
+		// Can item be stacked?
+		bool IsStackable() const;
+		bool IsCharged() const;
+
+		// Can item be equipped by/at?
+		bool IsEquipable(uint16 race, uint16 class_) const;
+		bool IsEquipable(int16 slot_id) const;
+
+		//
+		// Augments
+		//
+		bool IsAugmentable() const;
+		bool AvailableWearSlot(uint32 aug_wear_slots) const;
+		int8 AvailableAugmentSlot(int32 augtype) const;
+		bool IsAugmentSlotAvailable(int32 augtype, uint8 slot) const;
+		inline int32 GetAugmentType() const { return ((m_item) ? m_item->AugType : 0); }
+
+		inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == item::ItemEffectExpendable) || (m_item->ItemType == item::ItemTypePotion)) : false); }
+
+		//
+		// Contents
+		//
+		ItemInstance* GetItem(uint8 slot) const;
+		uint32 GetItemID(uint8 slot) const;
+		inline const ItemInstance* operator[](uint8 slot) const { return GetItem(slot); }
+		void PutItem(uint8 slot, const ItemInstance& inst);
+		void PutItem(SharedDatabase *db, uint8 slot, uint32 item_id) { return; } // not defined anywhere...
+		void DeleteItem(uint8 slot);
+		ItemInstance* PopItem(uint8 index);
+		void Clear();
+		void ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent);
+		uint8 FirstOpenSlot() const;
+		uint8 GetTotalItemCount() const;
+		bool IsNoneEmptyContainer();
+		std::map<uint8, ItemInstance*>* GetContents() { return &m_contents; }
+
+		//
+		// Augments
+		//
+		ItemInstance* GetAugment(uint8 slot) const;
+		uint32 GetAugmentItemID(uint8 slot) const;
+		void PutAugment(uint8 slot, const ItemInstance& inst);
+		void PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id);
+		void DeleteAugment(uint8 slot);
+		ItemInstance* RemoveAugment(uint8 index);
+		bool IsAugmented();
+		ItemInstance* GetOrnamentationAug(int32 ornamentationAugtype) const;
+		bool UpdateOrnamentationInfo();
+		static bool CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll = false);
+
+		// Has attack/delay?
+		bool IsWeapon() const;
+		bool IsAmmo() const;
+
+		// Accessors
+		const uint32 GetID() const { return ((m_item) ? m_item->ID : 0); }
+		const uint32 GetItemScriptID() const { return ((m_item) ? m_item->ScriptFileID : 0); }
+		const ItemData* GetItem() const;
+		const ItemData* GetUnscaledItem() const;
+
+		int16 GetCharges() const				{ return m_charges; }
+		void SetCharges(int16 charges)			{ m_charges = charges; }
+
+		uint32 GetPrice() const					{ return m_price; }
+		void SetPrice(uint32 price)				{ m_price = price; }
+
+		void SetColor(uint32 color)				{ m_color = color; }
+		uint32 GetColor() const					{ return m_color; }
+
+		uint32 GetMerchantSlot() const			{ return m_merchantslot; }
+		void SetMerchantSlot(uint32 slot)		{ m_merchantslot = slot; }
+
+		int32 GetMerchantCount() const			{ return m_merchantcount; }
+		void SetMerchantCount(int32 count)		{ m_merchantcount = count; }
+
+		int16 GetCurrentSlot() const			{ return m_currentslot; }
+		void SetCurrentSlot(int16 curr_slot)	{ m_currentslot = curr_slot; }
+
+		// Is this item already attuned?
+		bool IsAttuned() const					{ return m_attuned; }
+		void SetAttuned(bool flag)				{ m_attuned = flag; }
+
+		std::string GetCustomDataString() const;
+		std::string GetCustomData(std::string identifier);
+		void SetCustomData(std::string identifier, std::string value);
+		void SetCustomData(std::string identifier, int value);
+		void SetCustomData(std::string identifier, float value);
+		void SetCustomData(std::string identifier, bool value);
+		void DeleteCustomData(std::string identifier);
+
+		// Allows treatment of this object as though it were a pointer to m_item
+		operator bool() const { return (m_item != nullptr); }
+
+		// Compare inner Item_Struct of two ItemInstance objects
+		bool operator==(const ItemInstance& right) const { return (this->m_item == right.m_item); }
+		bool operator!=(const ItemInstance& right) const { return (this->m_item != right.m_item); }
+
+		// Clone current item
+		ItemInstance* Clone() const;
+
+		bool IsSlotAllowed(int16 slot_id) const;
+
+		bool IsDroppable(bool recurse = true) const;
+
+		bool IsScaling() const				{ return m_scaling; }
+		bool IsEvolving() const				{ return (m_evolveLvl >= 1); }
+		uint32 GetExp() const				{ return m_exp; }
+		void SetExp(uint32 exp)				{ m_exp = exp; }
+		void AddExp(uint32 exp)				{ m_exp += exp; }
+		bool IsActivated()					{ return m_activated; }
+		void SetActivated(bool activated)	{ m_activated = activated; }
+		int8 GetEvolveLvl() const			{ return m_evolveLvl; }
+		void SetScaling(bool v)				{ m_scaling = v; }
+		uint32 GetOrnamentationIcon() const							{ return m_ornamenticon; }
+		void SetOrnamentIcon(uint32 ornament_icon)					{ m_ornamenticon = ornament_icon; }
+		uint32 GetOrnamentationIDFile() const						{ return m_ornamentidfile; }
+		void SetOrnamentationIDFile(uint32 ornament_idfile)			{ m_ornamentidfile = ornament_idfile; }
+		uint32 GetOrnamentHeroModel(int32 material_slot = -1) const;
+		void SetOrnamentHeroModel(uint32 ornament_hero_model)		{ m_ornament_hero_model = ornament_hero_model; }
+		uint32 GetRecastTimestamp() const							{ return m_recast_timestamp; }
+		void SetRecastTimestamp(uint32 in)							{ m_recast_timestamp = in; }
+
+		void Initialize(SharedDatabase *db = nullptr);
+		void ScaleItem();
+		bool EvolveOnAllKills() const;
+		int8 GetMaxEvolveLvl() const;
+		uint32 GetKillsNeeded(uint8 currentlevel);
+
+		std::string Serialize(int16 slot_id) const { InternalSerializedItem_Struct s; s.slot_id = slot_id; s.inst = (const void*)this; std::string ser; ser.assign((char*)&s, sizeof(InternalSerializedItem_Struct)); return ser; }
+		void Serialize(OutBuffer& ob, int16 slot_id) const { InternalSerializedItem_Struct isi; isi.slot_id = slot_id; isi.inst = (const void*)this; ob.write((const char*)&isi, sizeof(isi)); }
+
+		inline int32 GetSerialNumber() const { return m_SerialNumber; }
+		inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }
+
+		std::map<std::string, Timer>& GetTimers() { return m_timers; }
+		void SetTimer(std::string name, uint32 time);
+		void StopTimer(std::string name);
+		void ClearTimers();
+
+		// Get a total of a stat, including augs
+		// These functions should be used in place of other code manually totaling
+		// to centralize where it is done to make future changes easier (ex. whenever powersources come around)
+		// and to minimize errors. CalcItemBonuses however doesn't use these in interest of performance
+		// by default these do not recurse into augs
+		int GetItemArmorClass(bool augments = false) const;
+		int GetItemElementalDamage(int &magic, int &fire, int &cold, int &poison, int &disease, int &chromatic, int &prismatic, int &physical, int &corruption, bool augments = false) const;
+		// These two differ in the fact that they're quick checks (they are checked BEFORE the one above
+		int GetItemElementalFlag(bool augments = false) const;
+		int GetItemElementalDamage(bool augments = false) const;
+		int GetItemRecommendedLevel(bool augments = false) const;
+		int GetItemRequiredLevel(bool augments = false) const;
+		int GetItemWeaponDamage(bool augments = false) const;
+		int GetItemBackstabDamage(bool augments = false) const;
+		// these two are just quick checks
+		int GetItemBaneDamageBody(bool augments = false) const;
+		int GetItemBaneDamageRace(bool augments = false) const;
+		int GetItemBaneDamageBody(bodyType against, bool augments = false) const;
+		int GetItemBaneDamageRace(uint16 against, bool augments = false) const;
+		int GetItemMagical(bool augments = false) const;
+		int GetItemHP(bool augments = false) const;
+		int GetItemMana(bool augments = false) const;
+		int GetItemEndur(bool augments = false) const;
+		int GetItemAttack(bool augments = false) const;
+		int GetItemStr(bool augments = false) const;
+		int GetItemSta(bool augments = false) const;
+		int GetItemDex(bool augments = false) const;
+		int GetItemAgi(bool augments = false) const;
+		int GetItemInt(bool augments = false) const;
+		int GetItemWis(bool augments = false) const;
+		int GetItemCha(bool augments = false) const;
+		int GetItemMR(bool augments = false) const;
+		int GetItemFR(bool augments = false) const;
+		int GetItemCR(bool augments = false) const;
+		int GetItemPR(bool augments = false) const;
+		int GetItemDR(bool augments = false) const;
+		int GetItemCorrup(bool augments = false) const;
+		int GetItemHeroicStr(bool augments = false) const;
+		int GetItemHeroicSta(bool augments = false) const;
+		int GetItemHeroicDex(bool augments = false) const;
+		int GetItemHeroicAgi(bool augments = false) const;
+		int GetItemHeroicInt(bool augments = false) const;
+		int GetItemHeroicWis(bool augments = false) const;
+		int GetItemHeroicCha(bool augments = false) const;
+		int GetItemHeroicMR(bool augments = false) const;
+		int GetItemHeroicFR(bool augments = false) const;
+		int GetItemHeroicCR(bool augments = false) const;
+		int GetItemHeroicPR(bool augments = false) const;
+		int GetItemHeroicDR(bool augments = false) const;
+		int GetItemHeroicCorrup(bool augments = false) const;
+		int GetItemHaste(bool augments = false) const;
+
+	protected:
+		//////////////////////////
+		// Protected Members
+		//////////////////////////
+		friend class InventoryProfile;
+
+		std::map<uint8, ItemInstance*>::const_iterator _cbegin() { return m_contents.cbegin(); }
+		std::map<uint8, ItemInstance*>::const_iterator _cend() { return m_contents.cend(); }
+
+		void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }
+
+		ItemInstTypes		m_use_type;	// Usage type for item
+		const ItemData*		m_item;		// Ptr to item data
+		int16				m_charges;	// # of charges for chargeable items
+		uint32				m_price;	// Bazaar /trader price
+		uint32				m_color;
+		uint32				m_merchantslot;
+		int16				m_currentslot;
+		bool				m_attuned;
+		int32				m_merchantcount;		//number avaliable on the merchant, -1=unlimited
+		int32				m_SerialNumber;	// Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32				m_exp;
+		int8				m_evolveLvl;
+		bool				m_activated;
+		ItemData*			m_scaledItem;
+		::EvolveInfo*		m_evolveInfo;
+		bool				m_scaling;
+		uint32				m_ornamenticon;
+		uint32				m_ornamentidfile;
+		uint32				m_ornament_hero_model;
+		uint32				m_recast_timestamp;
+
+		//
+		// Items inside of this item (augs or contents);
+		std::map<uint8, ItemInstance*>		m_contents; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>	m_custom_data;
+		std::map<std::string, Timer>		m_timers;
+	};
+}
+
+class EvolveInfo {
+public:
+	friend class EQEmu::ItemInstance;
+	//temporary
+	uint16				LvlKills[9];
+	uint32				FirstItem;
+	uint8				MaxLvl;
+	bool				AllKills;
+
+	EvolveInfo();
+	EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32 L3, uint32 L4, uint32 L5, uint32 L6, uint32 L7, uint32 L8, uint32 L9, uint32 L10);
+	~EvolveInfo();
+};
+
+#endif /*COMMON_ITEM_INSTANCE_H*/
@@ -1,255 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2003 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 04111-1307 USA
-*/
-
-#ifndef ITEM_STRUCT_H
-#define ITEM_STRUCT_H
-
-/*
- * Note: (Doodman)
- *	This structure has field names that match the DB name exactly.
- *	Please take care as to not mess this up as it should make
- *	everyones life (i.e. mine) much easier. And the DB names
- *	match the field name from the 13th floor (SEQ) item collectors,
- *	so please maintain that as well.
- *
- * Note #2: (Doodman)
- *	UnkXXX fields are left in here for completeness but commented
- *	out since they are really unknown and since the items are now
- *	preserialized they should not be needed. Conversly if they
- *	-are- needed, then they shouldn't be unkown.
- *
- * Note #3: (Doodman)
- *	Please take care when adding new found data fields to add them
- *	to the appropriate structure. Item_Struct has elements that are
- *	global to all types of items only.
- *
- * Note #4: (Doodman)
- *	Made ya look! Ha!
- */
-
-//#include "eq_constants.h"
-#include "eq_dictionary.h"
-
-/*
-** Child struct of Item_Struct:
-**	Effect data: Click, Proc, Focus, Worn, Scroll
-**
-*/
-struct ItemEffect_Struct {
-	int32	Effect;
-	uint8	Type;
-	uint8	Level;
-	uint8	Level2;
-	//MaxCharges
-	//CastTime
-	//RecastDelay
-	//RecastType
-	//ProcRate
-};
-
-class ItemInst;
-
-struct InternalSerializedItem_Struct {
-	int16 slot_id;
-	const void * inst;
-};
-
-// use EmuConstants::ITEM_COMMON_SIZE
-//#define MAX_AUGMENT_SLOTS 5
-
-struct Item_Struct {
-	bool IsEquipable(uint16 Race, uint16 Class) const;
-	// Non packet based fields
-	uint8	MinStatus;
-
-	// Packet based fields
-	uint8	ItemClass;		// Item Type: 0=common, 1=container, 2=book
-	char	Name[64];		// Name
-	char	Lore[80];		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
-	char	IDFile[30];		// Visible model
-	uint32	ID;				// Unique ID (also PK for DB)
-	uint8	Weight;			// Item weight * 10
-	uint8	NoRent;			// No Rent: 0=norent, 255=not norent
-	uint8	NoDrop;			// No Drop: 0=nodrop, 255=not nodrop
-	uint8	Size;			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
-	uint32	Slots;			// Bitfield for which slots this item can be used in
-	uint32	Price;			// Item cost (?)
-	uint32	Icon;			// Icon Number
-	uint32	LoreGroup;		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
-	bool	LoreFlag;		// This will be true if LoreGroup is non-zero
-	bool	PendingLoreFlag;
-	bool	ArtifactFlag;
-	bool	SummonedFlag;
-	uint8	FVNoDrop;		// Firiona Vie nodrop flag
-	uint32	Favor;			// Individual favor
-	uint32	GuildFavor;		// Guild favor
-	uint32	PointType;
-
-	//uint32	Unk117;
-	//uint32	Unk118;
-	//uint32	Unk121;
-	//uint32	Unk124;
-
-	uint8	BagType;		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
-	uint8	BagSlots;		// Number of slots: can only be 2, 4, 6, 8, or 10
-	uint8	BagSize;		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
-	uint8	BagWR;			// 0->100
-
-	bool	BenefitFlag;
-	bool	Tradeskills;	// Is this a tradeskill item?
-	int8	CR;				// Save vs Cold
-	int8	DR;				// Save vs Disease
-	int8	PR;				// Save vs Poison
-	int8	MR;				// Save vs Magic
-	int8	FR;				// Save vs Fire
-	int8	AStr;			// Strength
-	int8	ASta;			// Stamina
-	int8	AAgi;			// Agility
-	int8	ADex;			// Dexterity
-	int8	ACha;			// Charisma
-	int8	AInt;			// Intelligence
-	int8	AWis;			// Wisdom
-	int32	HP;				// HP
-	int32	Mana;			// Mana
-	int32	AC;				// AC
-	uint32	Deity;			// Bitmask of Deities that can equip this item
-	//uint32	Unk033
-	int32	SkillModValue;	// % Mod to skill specified in SkillModType
-	int32	SkillModMax;	// Max skill point modification
-	uint32	SkillModType;	// Type of skill for SkillModValue to apply to
-	uint32	BaneDmgRace;	// Bane Damage Race
-	int8	BaneDmgAmt;		// Bane Damage Body Amount
-	uint32	BaneDmgBody;	// Bane Damage Body
-	bool	Magic;			// True=Magic Item, False=not
-	int32	CastTime_;
-	uint8	ReqLevel;		// Required Level to use item
-	uint32	BardType;		// Bard Skill Type
-	int32	BardValue;		// Bard Skill Amount
-	int8	Light;			// Light
-	uint8	Delay;			// Delay * 10
-	uint8	RecLevel;		// Recommended level to use item
-	uint8	RecSkill;		// Recommended skill to use item (refers to primary skill of item)
-	uint8	ElemDmgType;	// Elemental Damage Type (1=magic, 2=fire)
-	uint8	ElemDmgAmt;		// Elemental Damage
-	uint8	Range;			// Range of item
-	uint32	Damage;			// Delay between item usage (in 0.1 sec increments)
-	uint32	Color;			// RR GG BB 00 <-- as it appears in pc
-	uint32	Classes;		// Bitfield of classes that can equip item (1 << class#)
-	uint32	Races;			// Bitfield of races that can equip item (1 << race#)
-	//uint32	Unk054;
-	int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
-	uint8	ItemType;		// Item Type/Skill (itemClass* from above)
-	uint8	Material;		// Item material type
-	uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
-	float	SellRate;		// Sell rate
-	//uint32	Unk059;
-	union {
-		uint32 Fulfilment;	// Food fulfilment (How long it lasts)
-		int16 CastTime;		// Cast Time for clicky effects, in milliseconds
-	};
-	uint32 EliteMaterial;
-	int32	ProcRate;
-	int8	CombatEffects;	// PoP: Combat Effects +
-	int8	Shielding;		// PoP: Shielding %
-	int8	StunResist;		// PoP: Stun Resist %
-	int8	StrikeThrough;	// PoP: Strike Through %
-	uint32	ExtraDmgSkill;
-	uint32	ExtraDmgAmt;
-	int8	SpellShield;	// PoP: Spell Shield %
-	int8	Avoidance;		// PoP: Avoidance +
-	int8	Accuracy;		// PoP: Accuracy +
-	uint32	CharmFileID;
-	int32	FactionMod1;	// Faction Mod 1
-	int32	FactionMod2;	// Faction Mod 2
-	int32	FactionMod3;	// Faction Mod 3
-	int32	FactionMod4;	// Faction Mod 4
-	int32	FactionAmt1;	// Faction Amt 1
-	int32	FactionAmt2;	// Faction Amt 2
-	int32	FactionAmt3;	// Faction Amt 3
-	int32	FactionAmt4;	// Faction Amt 4
-	char	CharmFile[32];	// ?
-	uint32	AugType;
-	uint8	AugSlotType[EmuConstants::ITEM_COMMON_SIZE];	// RoF: Augment Slot 1-6 Type
-	uint8	AugSlotVisible[EmuConstants::ITEM_COMMON_SIZE];	// RoF: Augment Slot 1-6 Visible
-	uint8	AugSlotUnk2[EmuConstants::ITEM_COMMON_SIZE];	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
-	uint32	LDoNTheme;
-	uint32	LDoNPrice;
-	uint32	LDoNSold;
-	uint32	BaneDmgRaceAmt;
-	uint32	AugRestrict;
-	uint32	Endur;
-	uint32	DotShielding;
-	uint32	Attack;
-	uint32	Regen;
-	uint32	ManaRegen;
-	uint32	EnduranceRegen;
-	uint32	Haste;
-	uint32	DamageShield;
-	uint32	RecastDelay;
-	uint32	RecastType;
-	uint32	AugDistiller;
-	bool	Attuneable;
-	bool	NoPet;
-	bool	PotionBelt;
-	bool	Stackable;
-	bool	NoTransfer;
-	bool	QuestItemFlag;
-	int16	StackSize;
-	uint8	PotionBeltSlots;
-	ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard;
-
-	uint8	Book;			// 0=Not book, 1=Book
-	uint32	BookType;
-	char	Filename[33];	// Filename for book data
-	// Begin SoF Fields
-	int32 SVCorruption;
-	uint32 Purity;
-	uint8 EvolvingItem;
-	uint32 EvolvingID;
-	uint8 EvolvingLevel;
-	uint8 EvolvingMax;
-	uint32 BackstabDmg;
-	uint32 DSMitigation;
-	int32 HeroicStr;
-	int32 HeroicInt;
-	int32 HeroicWis;
-	int32 HeroicAgi;
-	int32 HeroicDex;
-	int32 HeroicSta;
-	int32 HeroicCha;
-	int32 HeroicMR;
-	int32 HeroicFR;
-	int32 HeroicCR;
-	int32 HeroicDR;
-	int32 HeroicPR;
-	int32 HeroicSVCorrup;
-	int32 HealAmt;
-	int32 SpellDmg;
-	uint32 LDoNSellBackRate;
-	uint32 ScriptFileID;
-	uint16 ExpendableArrow;
-	uint32 Clairvoyance;
-	char	ClickName[65];
-	char	ProcName[65];
-	char	WornName[65];
-	char	FocusName[65];
-	char	ScrollName[65];
-
-};
-
-#endif
@@ -0,0 +1,99 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "light_source.h"
+
+#include <string.h>
+
+
+uint8 EQEmu::lightsource::TypeToLevel(uint8 light_type)
+{
+	switch (light_type) {
+	case LightTypeGlobeOfStars:
+		return LightLevelBrilliant;		// 10
+	case LightTypeFlamelessLantern:
+	case LightTypeGreaterLightstone:
+		return LightLevelLargeMagic;	// 9
+	case LightTypeLargeLantern:
+		return LightLevelLargeLantern;	// 8
+	case LightTypeSteinOfMoggok:
+	case LightTypeLightstone:
+		return LightLevelMagicLantern;	// 7
+	case LightTypeSmallLantern:
+		return LightLevelSmallLantern;	// 6
+	case LightTypeColdlight:
+	case LightTypeUnknown2:
+		return LightLevelBlueLight;		// 5
+	case LightTypeFireBeetleEye:
+	case LightTypeUnknown1:
+		return LightLevelRedLight;		// 4
+	case LightTypeTinyGlowingSkull:
+	case LightTypeLightGlobe:
+		return LightLevelSmallMagic;	// 3
+	case LightTypeTorch:
+		return LightLevelTorch;			// 2
+	case LightTypeCandle:
+		return LightLevelCandle;		// 1
+	default:
+		return LightLevelUnlit;			// 0
+	}
+}
+
+bool EQEmu::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type)
+{
+	static const uint8 light_levels[LightTypeCount] = {
+		LightLevelUnlit,			/* LightTypeNone */
+		LightLevelCandle,			/* LightTypeCandle */
+		LightLevelTorch,			/* LightTypeTorch */
+		LightLevelSmallMagic,		/* LightTypeTinyGlowingSkull */
+		LightLevelSmallLantern,		/* LightTypeSmallLantern */
+		LightLevelMagicLantern,		/* LightTypeSteinOfMoggok */
+		LightLevelLargeLantern,		/* LightTypeLargeLantern */
+		LightLevelLargeMagic,		/* LightTypeFlamelessLantern */
+		LightLevelBrilliant,		/* LightTypeGlobeOfStars */
+		LightLevelSmallMagic,		/* LightTypeLightGlobe */
+		LightLevelMagicLantern,		/* LightTypeLightstone */
+		LightLevelLargeMagic,		/* LightTypeGreaterLightstone */
+		LightLevelRedLight,			/* LightTypeFireBeetleEye */
+		LightLevelBlueLight,		/* LightTypeColdlight */
+		LightLevelRedLight,			/* LightTypeUnknown1 */
+		LightLevelBlueLight			/* LightTypeUnknown2 */
+	};
+
+	if (left_type >= LightTypeCount) { left_type = LightTypeNone; }
+	if (right_type >= LightTypeCount) { right_type = LightTypeNone; }
+
+	return (light_levels[left_type] > light_levels[right_type]);
+}
+
+EQEmu::LightSource_Struct::LightSource_Struct()
+{
+	Clear();
+}
+
+void EQEmu::LightSource_Struct::Clear()
+{
+	memset(&Slot, 0, (sizeof(uint8) * lightsource::LightCount));
+}
+
+void EQEmu::LightSourceProfile::Clear()
+{
+	Type.Clear();
+	Level.Clear();
+}
@@ -0,0 +1,115 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_LIGHT_SOURCE_H
+#define COMMON_LIGHT_SOURCE_H
+
+#include "types.h"
+
+
+namespace EQEmu
+{
+	namespace lightsource {
+		enum LightSlot {
+			LightInnate = 0,	// Defined by db field `npc_types`.`light` - where appropriate
+			LightEquipment,		// Item_Struct::light value of worn/carried equipment
+			LightSpell,			// Set value of any light-producing spell (can be modded to mimic equip_light behavior)
+			LightActive,		// Highest value of all light sources
+			LightCount
+		};
+
+		enum LightType {
+			LightTypeNone = 0,
+			LightTypeCandle,
+			LightTypeTorch,
+			LightTypeTinyGlowingSkull,
+			LightTypeSmallLantern,
+			LightTypeSteinOfMoggok, // 5
+			LightTypeLargeLantern,
+			LightTypeFlamelessLantern,
+			LightTypeGlobeOfStars,
+			LightTypeLightGlobe,
+			LightTypeLightstone, // 10
+			LightTypeGreaterLightstone,
+			LightTypeFireBeetleEye,
+			LightTypeColdlight,
+			LightTypeUnknown1,
+			LightTypeUnknown2, // 15
+			LightTypeCount
+		};
+
+		enum LightLevel {
+			LightLevelUnlit = 0,
+			LightLevelCandle,
+			LightLevelTorch,
+			LightLevelSmallMagic,
+			LightLevelRedLight,
+			LightLevelBlueLight, // 5
+			LightLevelSmallLantern,
+			LightLevelMagicLantern,
+			LightLevelLargeLantern,
+			LightLevelLargeMagic,
+			LightLevelBrilliant, // 10
+			LightLevelCount
+		};
+
+		extern uint8 TypeToLevel(uint8 light_type);
+		extern bool IsLevelGreater(uint8 left_type, uint8 right_type);
+	
+	}; /*lightsource*/
+
+	struct LightSource_Struct {
+		uint8 Slot[lightsource::LightCount];
+
+		LightSource_Struct();
+
+		void Clear();
+
+		inline uint8& operator[](lightsource::LightSlot index) { return Slot[index]; }
+	};
+
+	struct LightSourceProfile {
+		/*
+		Current criteria (light types):
+		Equipment:	{ 0 .. 15 }
+		General:	{ 9 .. 13 }
+
+		Notes:
+		- Initial character load and item movement updates use different light source update behaviors
+		-- Server procedure matches the item movement behavior since most updates occur post-character load
+		- MainAmmo is not considered when determining light sources
+		- No 'Sub' or 'Aug' items are recognized as light sources
+		- Light types '< 9' and '> 13' are not considered for general (carried) light sources
+		- If values > 0x0F are valid, then assignment limiters will need to be removed
+		- MainCursor 'appears' to be a valid light source update slot..but, have not experienced updates during debug sessions
+		- All clients have a bug regarding stackable items (light and sound updates are not processed when picking up an item)
+		-- The timer-based update cancels out the invalid light source
+		*/
+
+		LightSource_Struct Type; // Light types (classifications)
+		LightSource_Struct Level; // Light levels (intensities) - used to determine which light source should be active
+
+		LightSourceProfile() { }
+
+		void Clear();
+	};
+
+} /*EQEmu*/
+
+#endif /*COMMON_LIGHT_SOURCE_H*/
@@ -0,0 +1,277 @@
+/*	EQEMu:  Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+*/
+
+#include "memory_buffer.h"
+
+
+EQEmu::MemoryBuffer::MemoryBuffer()
+{
+	buffer_ = nullptr;
+	size_ = 0;
+	capacity_ = 0;
+	read_pos_ = 0;
+	write_pos_ = 0;
+}
+
+EQEmu::MemoryBuffer::MemoryBuffer(size_t sz)
+{
+	buffer_ = nullptr;
+	size_ = 0;
+	capacity_ = 0;
+	read_pos_ = 0;
+	write_pos_ = 0;
+	Resize(sz);
+}
+
+EQEmu::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other)
+{
+	if(other.capacity_) {
+		buffer_ = new uchar[other.capacity_];
+		memcpy(buffer_, other.buffer_, other.capacity_);
+	} else {
+		buffer_ = nullptr;
+	}
+
+	size_ = other.size_;
+	capacity_ = other.capacity_;
+	write_pos_ = other.write_pos_;
+	read_pos_ = other.read_pos_;
+}
+
+EQEmu::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other)
+{
+	uchar *tbuf = other.buffer_;
+	size_t tsz = other.size_;
+	size_t tcapacity = other.capacity_;
+	size_t twrite_pos = other.write_pos_;
+	size_t tread_pos = other.read_pos_;
+
+	other.buffer_ = nullptr;
+	other.size_ = 0;
+	other.capacity_ = 0;
+	other.read_pos_ = 0;
+	other.write_pos_ = 0;
+
+	buffer_ = tbuf;
+	size_ = tsz;
+	capacity_ = tcapacity;
+	write_pos_ = twrite_pos;
+	read_pos_ = tread_pos;
+}
+
+EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(const MemoryBuffer &other)
+{
+	if(this == &other) {
+		return *this;
+	}
+
+	if(buffer_) {
+		delete[] buffer_;
+	}
+
+	if(other.capacity_) {
+		buffer_ = new uchar[other.capacity_];
+		memcpy(buffer_, other.buffer_, other.capacity_);
+	}
+	else {
+		buffer_ = nullptr;
+	}
+
+	size_ = other.size_;
+	capacity_ = other.capacity_;
+	write_pos_ = other.write_pos_;
+	read_pos_ = other.read_pos_;
+	return *this;
+}
+
+EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(MemoryBuffer &&other)
+{
+	uchar *tbuf = other.buffer_;
+	size_t tsz = other.size_;
+	size_t tcapacity = other.capacity_;
+	size_t twrite_pos = other.write_pos_;
+	size_t tread_pos = other.read_pos_;
+
+	other.buffer_ = nullptr;
+	other.size_ = 0;
+	other.capacity_ = 0;
+	other.read_pos_ = 0;
+	other.write_pos_ = 0;
+
+	buffer_ = tbuf;
+	size_ = tsz;
+	capacity_ = tcapacity;
+	write_pos_ = twrite_pos;
+	read_pos_ = tread_pos;
+	return *this;
+}
+
+EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator+=(const MemoryBuffer &rhs)
+{
+	if(!rhs.buffer_) {
+		return *this;
+	}
+
+	if(buffer_) {
+		size_t old_size = size_;
+		Resize(size_ + rhs.size_);
+		memcpy(&buffer_[old_size], rhs.buffer_, rhs.size_);
+	} else {
+		buffer_ = new uchar[rhs.capacity_];
+		memcpy(buffer_, rhs.buffer_, rhs.capacity_);
+		size_ = rhs.size_;
+		capacity_ = rhs.capacity_;
+	}
+
+	return *this;
+}
+
+EQEmu::MemoryBuffer::~MemoryBuffer()
+{
+	Clear();
+}
+
+uchar& EQEmu::MemoryBuffer::operator[](size_t pos)
+{
+	return buffer_[pos];
+}
+
+const uchar& EQEmu::MemoryBuffer::operator[](size_t pos) const
+{
+	return buffer_[pos];
+}
+
+bool EQEmu::MemoryBuffer::Empty()
+{
+	return size_ == 0;
+}
+
+bool EQEmu::MemoryBuffer::Empty() const
+{
+	return size_ == 0;
+}
+
+size_t EQEmu::MemoryBuffer::Size()
+{
+	return size_;
+}
+
+size_t EQEmu::MemoryBuffer::Size() const
+{
+	return size_;
+}
+
+size_t EQEmu::MemoryBuffer::Capacity()
+{
+	return capacity_;
+}
+
+size_t EQEmu::MemoryBuffer::Capacity() const
+{
+	return capacity_;
+}
+
+void EQEmu::MemoryBuffer::Resize(size_t sz)
+{
+	if(!buffer_) {
+		size_t new_size = sz + 64;
+		buffer_ = new uchar[new_size];
+		capacity_ = new_size;
+		size_ = sz;
+		memset(buffer_, 0, capacity_);
+		return;
+	}
+
+	if(sz > capacity_) {
+		size_t new_size = sz + 32;
+		uchar *temp = new uchar[new_size];
+		memcpy(temp, buffer_, capacity_);
+		delete[] buffer_;
+		buffer_ = temp;
+		
+		capacity_ = new_size;
+		size_ = sz;
+	}
+	else {
+		size_ = sz;
+	}
+}
+
+void EQEmu::MemoryBuffer::Clear()
+{
+	if(buffer_) {
+		delete[] buffer_;
+		buffer_ = nullptr;
+	}
+	
+	size_ = 0;
+	capacity_ = 0;
+	write_pos_ = 0;
+	read_pos_ = 0;
+}
+
+void EQEmu::MemoryBuffer::Zero()
+{
+	if(buffer_) {
+		memset(buffer_, 0, capacity_);
+	}
+}
+
+void EQEmu::MemoryBuffer::Write(const char *val, size_t len)
+{
+	size_t size_needed = write_pos_ + len;
+	Resize(size_needed);
+
+	memcpy(&buffer_[write_pos_], val, len);
+	write_pos_ += len;
+}
+
+void EQEmu::MemoryBuffer::Read(uchar *buf, size_t len)
+{
+	memcpy(buf, &buffer_[read_pos_], len);
+	read_pos_ += len;
+}
+
+void EQEmu::MemoryBuffer::Read(char *str)
+{
+	size_t len = strlen((const char*)&buffer_[read_pos_]);
+	memcpy(str, &buffer_[read_pos_], len);
+	read_pos_ += len;
+}
+
+void EQEmu::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str, std::streamsize _Count)
+{
+	auto last_pos = tellp();
+	seekp(position);
+	write(_Str, _Count);
+	seekp(last_pos);
+}
+
+uchar* EQEmu::OutBuffer::detach()
+{
+	size_t buffer_size = tellp();
+	if (buffer_size == 0)
+		return nullptr;
+
+	auto out_buffer = new uchar[buffer_size];
+	memcpy(out_buffer, str().c_str(), buffer_size);
+	flush();
+
+	return out_buffer;
+}
@@ -0,0 +1,134 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_MEMORY_BUFFER
+#define COMMON_MEMORY_BUFFER
+
+#include "types.h"
+
+#include <type_traits>
+#include <string.h>
+#include <string>
+#include <sstream>
+
+
+namespace EQEmu
+{
+	class MemoryBuffer {
+	public:
+		MemoryBuffer();
+		MemoryBuffer(size_t sz);
+		MemoryBuffer(const MemoryBuffer &other);
+		MemoryBuffer(MemoryBuffer &&other);
+		MemoryBuffer& operator=(const MemoryBuffer &other);
+		MemoryBuffer& operator=(MemoryBuffer &&other);
+		MemoryBuffer& operator+=(const MemoryBuffer &rhs);
+		friend MemoryBuffer operator+(MemoryBuffer lhs, const MemoryBuffer& rhs) { return lhs += rhs; }
+		~MemoryBuffer();
+		
+		uchar& operator[](size_t pos);
+		const uchar& operator[](size_t pos) const;
+
+		template<typename T>
+		operator T*() {
+			return reinterpret_cast<T*>(buffer_);
+		}
+
+		template<typename T>
+		operator T*() const {
+			return reinterpret_cast<T*>(buffer_);
+		}
+
+		operator bool() { return buffer_ != nullptr; }
+		operator bool() const { return buffer_ != nullptr; }
+
+		bool Empty();
+		bool Empty() const;
+		size_t Size();
+		size_t Size() const;
+		size_t Capacity();
+		size_t Capacity() const;
+		
+		void Resize(size_t sz);
+		void Clear();
+		void Zero();
+
+		template<typename T>
+		void Write(T val) {
+			static_assert(std::is_pod<T>::value, "MemoryBuffer::Write<T>(T val) only works on pod and string types.");
+			Write((const char*)&val, sizeof(T));
+		}
+
+		template<typename T>
+		T Read() {
+			static_assert(std::is_pod<T>::value, "MemoryBuffer::Read<T>() only works on pod and string types.");
+			T temp;
+			Read((uchar*)&temp, sizeof(T));
+			return temp;
+		}
+
+		void Write(const std::string &val) {
+			Write(val.c_str(), val.length());
+			Write((uint8)0);
+		}
+
+		void Write(const char *val) {
+			size_t len = strlen(val);
+			Write(val, len);
+			Write((uint8)0);
+		}
+
+		std::string ReadString() {
+			std::string ret;
+			size_t len = strlen((const char*)&buffer_[read_pos_]);
+			ret.resize(len);
+			memcpy(&ret[0], &buffer_[read_pos_], len);
+			read_pos_ += len + 1;
+			return ret;
+		}
+	
+		void Write(const char *val, size_t len);
+		void Read(uchar *buf, size_t len);
+		void Read(char *str);
+
+		inline size_t GetWritePosition() { return write_pos_; }
+		inline void SetWritePosition(size_t wp) { write_pos_ = wp; }
+		inline void WriteSkipBytes(size_t skip) { write_pos_ += skip; }
+		inline size_t GetReadPosition() { return read_pos_; }
+		inline void SetReadPosition(size_t rp) { read_pos_ = rp; }
+		inline void ReadSkipBytes(size_t skip) { read_pos_ += skip; }
+		
+	private:
+		uchar *buffer_;
+		size_t size_;
+		size_t capacity_;
+		size_t write_pos_;
+		size_t read_pos_;
+	};
+
+	class OutBuffer : public std::stringstream {
+	public:
+		inline size_t size() { return tellp(); }
+		void overwrite(OutBuffer::pos_type position, const char *_Str, std::streamsize _Count);
+		uchar* detach();
+	};
+
+} /*EQEmu*/
+
+#endif /*COMMON_MEMORY_BUFFER*/
@@ -18,7 +18,7 @@
 #ifndef MYMUTEX_H
 #define MYMUTEX_H
 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #else
 	#include <pthread.h>
@@ -2,7 +2,7 @@
 #define MYSQL_REQUEST_RESULT_H

 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif

@@ -10,6 +10,12 @@
 #include "types.h"
 #include "mysql_request_row.h"

+#ifdef __FreeBSD__
+	#include <string>
+	#include <sstream>
+	#include <iostream>
+#endif
+
 class MySQLRequestResult {
 private:
 	MYSQL_RES* m_Result;
@@ -2,7 +2,7 @@
 #define MYSQL_REQUEST_ROW_H

 #ifdef _WINDOWS
-	#include <winsock.h>
+	#include <winsock2.h>
 	#include <windows.h>
 #endif

@@ -173,7 +173,7 @@ IN(OP_TradeAcceptClick, TradeAccept_Struct);
 IN(OP_BoardBoat, EntityId_Struct);		//not really the struct, just 4 bytes
 INz(OP_LeaveBoat);		//?
 IN(OP_RandomReq, RandomReq_Struct);
-IN(OP_Buff, SpellBuffFade_Struct);
+IN(OP_Buff, SpellBuffPacket_Struct);
 IN(OP_GMHideMe, SpawnAppearance_Struct);
 IN(OP_GMNameChange, GMName_Struct);
 IN(OP_GMKill, GMKill_Struct);
@@ -415,7 +415,7 @@ OUTv(OP_SendAATable, SendAA_Struct);
 OUT(OP_AAAction, UseAA_Struct);
 OUT(OP_Bazaar, BazaarReturnDone_Struct);
 //alt:OUT(OP_Bazaar, BazaarWelcome_Struct);
-OUT(OP_Buff, SpellBuffFade_Struct);
+OUT(OP_Buff, SpellBuffPacket_Struct);
 OUT(OP_ClickObject, ClickObject_Struct);
 OUT(OP_ClientUpdate, PlayerPositionUpdateServer_Struct);
 OUT(OP_SpawnPositionUpdate, SpawnPositionUpdate_Struct);
@@ -54,7 +54,7 @@ void DumpPacketHex(const uchar* buf, uint32 size, uint32 cols, uint32 skip) {
 	// Output as HEX
 	char output[4];
 	int j = 0;
-	char* ascii = new char[cols+1];
+	auto ascii = new char[cols + 1];
 	memset(ascii, 0, cols+1);
 	uint32 i;
 	for(i=skip; i<size; i++)
@@ -100,7 +100,7 @@ std::string DumpPacketHexToString(const uchar* buf, uint32 size, uint32 cols, ui
 	// Output as HEX
 	char output[4];
 	int j = 0;
-	char* ascii = new char[cols + 1];
+	auto ascii = new char[cols + 1];
 	memset(ascii, 0, cols + 1);
 	uint32 i;
 	for (i = skip; i < size; i++)
@@ -94,7 +94,9 @@ void FileDumpPacketHex(const char* filename, const uchar* buf, uint32 size, uint
 	std::ofstream logfile(filename, std::ios::app);
 	// Output as HEX
 	char output[4];
-	int j = 0; char* ascii = new char[cols+1]; memset(ascii, 0, cols+1);
+	int j = 0;
+	auto ascii = new char[cols + 1];
+	memset(ascii, 0, cols + 1);
 	uint32 i;
 	for(i=skip; i<size; i++)
 	{
@@ -0,0 +1,19 @@
+/*
+
+
+These fields must be in the order of how they are serialized!
+
+
+
+*/
+
+
+/* 000 */	//I(ItemClass) Leave this one off on purpose
+/* 001 */	S(Name)
+/* 002 */	S(Lore)
+/* 003 */	S(IDFile)
+/* 004 */	I(ID)
+
+/* 005 */	//I(Weight) handled manually
+
+// titanium_itemfields_b.h
@@ -8,12 +8,10 @@ These fields must be in the order of how they are serialized!
 */


-/* 000 */	//I(ItemClass) Leave this one off on purpose
-/* 001 */	S(Name)
-/* 002 */	S(Lore)
-/* 003 */	S(IDFile)
-/* 004 */	I(ID)
-/* 005 */	I(Weight)
+// titanium_itemfields_a.h
+
+/* 005 */	//I(Weight) handled manually
+
 /* 006 */	I(NoRent)
 /* 007 */	I(NoDrop)
 /* 008 */	I(Size)
@@ -41,7 +39,7 @@ These fields must be in the order of how they are serialized!
 /* 030 */	I(AC)
 /* 031 */	I(Deity)
 /* 032 */	I(SkillModValue)
-/* 033 */	C("0")
+/* 033 */	I(SkillModMax)
 /* 034 */	I(SkillModType)
 /* 035 */	I(BaneDmgRace)
 /* 036 */	I(BaneDmgAmt)
@@ -5,7 +5,7 @@ if [ -z "$1" ]; then
 	exit 1
 fi

-for ext in .cpp .h _ops.h _constants.h _structs.h
+for ext in .cpp _limits.cpp .h _ops.h _limits.h _structs.h
 do
 	cp template$ext $1$ext
 	perl -pi -e "s/TEMPLATE/$1/g" $1$ext
@@ -1,3 +1,21 @@
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/

 #include "../global_define.h"
 #include "patches.h"
@@ -9,7 +27,9 @@
 #include "rof.h"
 #include "rof2.h"

-void RegisterAllPatches(EQStreamIdentifier &into) {
+
+void RegisterAllPatches(EQStreamIdentifier &into)
+{
 	Titanium::Register(into);
 	SoF::Register(into);
 	SoD::Register(into);
@@ -18,7 +38,8 @@ void RegisterAllPatches(EQStreamIdentifier &into) {
 	RoF2::Register(into);
 }

-void ReloadAllPatches() {
+void ReloadAllPatches()
+{
 	Titanium::Reload();
 	SoF::Reload();
 	SoD::Reload();
@@ -1,5 +1,25 @@
-#ifndef PATCHES_H_
-#define PATCHES_H_
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_PATCHES_H
+#define COMMON_PATCHES_H
+

 /*enum {
 	Patch_062,
@@ -12,4 +32,4 @@ class EQStreamIdentifier;
 void RegisterAllPatches(EQStreamIdentifier &into);
 void ReloadAllPatches();

-#endif /*PATCHES_H_*/
+#endif /*COMMON_PATCHES_H*/
@@ -1,11 +1,31 @@
-#ifndef ROF_H_
-#define ROF_H_
+/*	EQEMu: Everquest Server Emulator
+
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_ROF_H
+#define COMMON_ROF_H

 #include "../struct_strategy.h"

 class EQStreamIdentifier;

-namespace RoF {
+namespace RoF
+{

 	//these are the only public member of this namespace.
 	extern void Register(EQStreamIdentifier &into);
@@ -23,13 +43,31 @@ namespace RoF {
 	protected:

 		virtual std::string Describe() const;
-		virtual const ClientVersion GetClientVersion() const;
+		virtual const EQEmu::versions::ClientVersion ClientVersion() const;

 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"
 		#include "rof_ops.h"
 	};

-};
+	enum class CastingSlot : uint32 {
+		Gem1       = 0,
+		Gem2       = 1,
+		Gem3       = 2,
+		Gem4       = 3,
+		Gem5       = 4,
+		Gem6       = 5,
+		Gem7       = 6,
+		Gem8       = 7,
+		Gem9       = 8,
+		Gem10      = 9,
+		Gem11      = 10,
+		Gem12      = 11,
+		Item       = 12,
+		Discipline = 13,
+		AltAbility = 0xFF
+	};

-#endif /*ROF_H_*/
+}; /*RoF*/
+
+#endif /*COMMON_ROF_H*/
@@ -1,11 +1,31 @@
-#ifndef ROF2_H_
-#define ROF2_H_
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_ROF2_H
+#define COMMON_ROF2_H

 #include "../struct_strategy.h"

 class EQStreamIdentifier;

-namespace RoF2 {
+namespace RoF2
+{

 	//these are the only public member of this namespace.
 	extern void Register(EQStreamIdentifier &into);
@@ -23,13 +43,31 @@ namespace RoF2 {
 	protected:

 		virtual std::string Describe() const;
-		virtual const ClientVersion GetClientVersion() const;
+		virtual const EQEmu::versions::ClientVersion ClientVersion() const;

 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"
 		#include "rof2_ops.h"
 	};

-};
+	enum class CastingSlot : uint32 {
+		Gem1       = 0,
+		Gem2       = 1,
+		Gem3       = 2,
+		Gem4       = 3,
+		Gem5       = 4,
+		Gem6       = 5,
+		Gem7       = 6,
+		Gem8       = 7,
+		Gem9       = 8,
+		Gem10      = 9,
+		Gem11      = 10,
+		Gem12      = 11,
+		Item       = 12,
+		Discipline = 13,
+		AltAbility = 0xFF
+	};

-#endif /*ROF2_H_*/
+}; /*RoF2*/
+
+#endif /*COMMON_ROF2_H*/
@@ -1,222 +0,0 @@
-/*
-EQEMu:  Everquest Server Emulator
-
-Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef ROF2_CONSTANTS_H_
-#define ROF2_CONSTANTS_H_
-
-#include "../types.h"
-
-namespace RoF2 {
-	namespace maps {
-		typedef enum : int16 {
-			MapPossessions = 0,
-			MapBank,
-			MapSharedBank,
-			MapTrade,
-			MapWorld,
-			MapLimbo,
-			MapTribute,
-			MapTrophyTribute,
-			MapGuildTribute,
-			MapMerchant,
-			MapDeleted,
-			MapCorpse,
-			MapBazaar,
-			MapInspect,
-			MapRealEstate,
-			MapViewMODPC,
-			MapViewMODBank,
-			MapViewMODSharedBank,
-			MapViewMODLimbo,
-			MapAltStorage,
-			MapArchived,
-			MapMail,
-			MapGuildTrophyTribute,
-			MapKrono,
-			MapOther,
-			_MapCount
-		} InventoryMaps;
-	}
-
-	namespace slots {
-		typedef enum : int16 {
-			MainCharm = 0,
-			MainEar1,
-			MainHead,
-			MainFace,
-			MainEar2,
-			MainNeck,
-			MainShoulders,
-			MainArms,
-			MainBack,
-			MainWrist1,
-			MainWrist2,
-			MainRange,
-			MainHands,
-			MainPrimary,
-			MainSecondary,
-			MainFinger1,
-			MainFinger2,
-			MainChest,
-			MainLegs,
-			MainFeet,
-			MainWaist,
-			MainPowerSource,
-			MainAmmo,
-			MainGeneral1,
-			MainGeneral2,
-			MainGeneral3,
-			MainGeneral4,
-			MainGeneral5,
-			MainGeneral6,
-			MainGeneral7,
-			MainGeneral8,
-			MainGeneral9,
-			MainGeneral10,
-			MainCursor,
-			_MainCount,
-			_MainEquipmentBegin = MainCharm,
-			_MainEquipmentEnd = MainAmmo,
-			_MainEquipmentCount = (_MainEquipmentEnd - _MainEquipmentBegin + 1),
-			_MainGeneralBegin = MainGeneral1,
-			_MainGeneralEnd = MainGeneral10,
-			_MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1)
-		} EquipmentSlots;
-	}
-
-	namespace consts {
-		static const size_t CHARACTER_CREATION_LIMIT = 12;
-
-		static const uint16	MAP_POSSESSIONS_SIZE = slots::_MainCount;
-		static const uint16 MAP_BANK_SIZE = 24;
-		static const uint16 MAP_SHARED_BANK_SIZE = 2;
-		static const uint16 MAP_TRADE_SIZE = 8;
-		static const uint16 MAP_WORLD_SIZE = 10;
-		static const uint16 MAP_LIMBO_SIZE = 36;
-		static const uint16 MAP_TRIBUTE_SIZE = 0; //?
-		static const uint16 MAP_TROPHY_TRIBUTE_SIZE = 0;
-		static const uint16 MAP_GUILD_TRIBUTE_SIZE = 0;
-		static const uint16 MAP_MERCHANT_SIZE = 0;
-		static const uint16 MAP_DELETED_SIZE = 0;
-		static const uint16 MAP_CORPSE_SIZE = slots::_MainCount;
-		static const uint16 MAP_BAZAAR_SIZE = 200;
-		static const uint16 MAP_INSPECT_SIZE = slots::_MainEquipmentCount;
-		static const uint16 MAP_REAL_ESTATE_SIZE = 0;
-		static const uint16 MAP_VIEW_MOD_PC_SIZE = MAP_POSSESSIONS_SIZE;
-		static const uint16 MAP_VIEW_MOD_BANK_SIZE = MAP_BANK_SIZE;
-		static const uint16 MAP_VIEW_MOD_SHARED_BANK_SIZE = MAP_SHARED_BANK_SIZE;
-		static const uint16 MAP_VIEW_MOD_LIMBO_SIZE = MAP_LIMBO_SIZE;
-		static const uint16 MAP_ALT_STORAGE_SIZE = 0;
-		static const uint16 MAP_ARCHIVED_SIZE = 0;
-		static const uint16 MAP_MAIL_SIZE = 0;
-		static const uint16 MAP_GUILD_TROPHY_TRIBUTE_SIZE = 0;
-		static const uint16 MAP_KRONO_SIZE = NOT_USED;
-		static const uint16 MAP_OTHER_SIZE = 0;
-
-		// most of these definitions will go away with the structure-based system..this maintains compatibility for now
-		// (bag slots and main slots beyond Possessions are assigned for compatibility with current server coding)
-		static const int16 EQUIPMENT_BEGIN = slots::MainCharm;
-		static const int16 EQUIPMENT_END = slots::MainAmmo;
-		static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount;
-
-		static const int16 GENERAL_BEGIN = slots::MainGeneral1;
-		static const int16 GENERAL_END = slots::MainGeneral10;
-		static const uint16 GENERAL_SIZE = slots::_MainGeneralCount;
-		static const int16 GENERAL_BAGS_BEGIN = 251;
-		static const int16 GENERAL_BAGS_END_OFFSET = 99;
-		static const int16 GENERAL_BAGS_END = GENERAL_BAGS_BEGIN + GENERAL_BAGS_END_OFFSET;
-
-		static const int16 CURSOR = slots::MainCursor;
-		static const int16 CURSOR_BAG_BEGIN = 351;
-		static const int16 CURSOR_BAG_END_OFFSET = 9;
-		static const int16 CURSOR_BAG_END = CURSOR_BAG_BEGIN + CURSOR_BAG_END_OFFSET;
-
-		static const int16 BANK_BEGIN = 2000;
-		static const int16 BANK_END = 2023;
-		static const int16 BANK_BAGS_BEGIN = 2031;
-		static const int16 BANK_BAGS_END_OFFSET = 239;
-		static const int16 BANK_BAGS_END = BANK_BAGS_BEGIN + BANK_BAGS_END_OFFSET;
-
-		static const int16 SHARED_BANK_BEGIN = 2500;
-		static const int16 SHARED_BANK_END = 2501;
-		static const int16 SHARED_BANK_BAGS_BEGIN = 2531;
-		static const int16 SHARED_BANK_BAGS_END_OFFSET = 19;
-		static const int16 SHARED_BANK_BAGS_END = SHARED_BANK_BAGS_BEGIN + SHARED_BANK_BAGS_END_OFFSET;
-
-		static const int16 TRADE_BEGIN = 3000;
-		static const int16 TRADE_END = 3007;
-		static const int16 TRADE_NPC_END = 3003;
-		static const int16 TRADE_BAGS_BEGIN = 3031;
-		static const int16 TRADE_BAGS_END_OFFSET = 79;
-		static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET;
-
-		static const int16 WORLD_BEGIN = 4000;
-		static const int16 WORLD_END = 4009;
-
-		static const int16 TRIBUTE_BEGIN = 400;
-		static const int16 TRIBUTE_END = 404;
-
-		static const int16 CORPSE_BEGIN = slots::MainGeneral1;
-		static const int16 CORPSE_END = slots::MainGeneral1 + slots::MainCursor;
-
-		static const uint16 ITEM_COMMON_SIZE = 6;
-		static const uint16 ITEM_CONTAINER_SIZE = 255; // 255; (server max will be 255..unsure what actual client is - test)
-
-		static const size_t BANDOLIERS_SIZE = 20;		// number of bandolier instances
-		static const size_t BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
-
-		static const size_t POTION_BELT_ITEM_COUNT = 5;
-
-		static const size_t TEXT_LINK_BODY_LENGTH = 56;
-	}
-
-	namespace limits {
-		static const bool ALLOWS_EMPTY_BAG_IN_BAG = true;
-		static const bool ALLOWS_CLICK_CAST_FROM_BAG = true;
-		static const bool COIN_HAS_WEIGHT = false;
-	}
-
-};	//end namespace RoF2
-
-#endif /*ROF2_CONSTANTS_H_*/
-
-/*
-RoF2 Notes:
-	** Structure-based inventory **
-ok	Possessions: ( 0, { 0 .. 33 }, -1, -1 ) (Corpse: { 23 .. 56 } [Offset 23])
-ok		[Equipment: ( 0, { 0 .. 22 }, -1, -1 )]
-ok		[General: ( 0, { 23 .. 32 }, -1, -1 )]
-ok		[Cursor: ( 0, 33, -1, -1 )]
-	General Bags: ( 0, { 23 .. 32 }, { 0 .. (maxsize - 1) }, -1 )
-	Cursor Bags: ( 0, 33, { 0 .. (maxsize - 1) }, -1 )
-
-	Bank: ( 1, { 0 .. 23 }, -1, -1 )
-	Bank Bags: ( 1, { 0 .. 23 }, { 0 .. (maxsize - 1)}, -1 )
-
-	Shared Bank: ( 2, { 0 .. 1 }, -1, -1 )
-	Shared Bank Bags: ( 2, { 0 .. 1 }, { 0 .. (maxsize - 1) }, -1 )
-
-	Trade: ( 3, { 0 .. 8 }, -1, -1 )
-	(Trade Bags: 3031 - 3110 -- server values)
-
-	World: ( 4, { 0 .. 10 }, -1, -1 )
-
-*/
@@ -0,0 +1,284 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "rof2_limits.h"
+
+#include "../string_util.h"
+
+
+size_t RoF2::invtype::GetInvTypeSize(int inv_type)
+{
+	switch (inv_type) {
+	case invtype::InvTypePossessions:
+		return invtype::InvTypePossessionsSize;
+	case invtype::InvTypeBank:
+		return invtype::InvTypeBankSize;
+	case invtype::InvTypeSharedBank:
+		return invtype::InvTypeSharedBankSize;
+	case invtype::InvTypeTrade:
+		return invtype::InvTypeTradeSize;
+	case invtype::InvTypeWorld:
+		return invtype::InvTypeWorldSize;
+	case invtype::InvTypeLimbo:
+		return invtype::InvTypeLimboSize;
+	case invtype::InvTypeTribute:
+		return invtype::InvTypeTributeSize;
+	case invtype::InvTypeTrophyTribute:
+		return invtype::InvTypeTrophyTributeSize;
+	case invtype::InvTypeGuildTribute:
+		return invtype::InvTypeGuildTributeSize;
+	case invtype::InvTypeMerchant:
+		return invtype::InvTypeMerchantSize;
+	case invtype::InvTypeDeleted:
+		return invtype::InvTypeDeletedSize;
+	case invtype::InvTypeCorpse:
+		return invtype::InvTypeCorpseSize;
+	case invtype::InvTypeBazaar:
+		return invtype::InvTypeBazaarSize;
+	case invtype::InvTypeInspect:
+		return invtype::InvTypeInspectSize;
+	case invtype::InvTypeRealEstate:
+		return invtype::InvTypeRealEstateSize;
+	case invtype::InvTypeViewMODPC:
+		return invtype::InvTypeViewMODPCSize;
+	case invtype::InvTypeViewMODBank:
+		return invtype::InvTypeViewMODBankSize;
+	case invtype::InvTypeViewMODSharedBank:
+		return invtype::InvTypeViewMODSharedBankSize;
+	case invtype::InvTypeViewMODLimbo:
+		return invtype::InvTypeViewMODLimboSize;
+	case invtype::InvTypeAltStorage:
+		return invtype::InvTypeAltStorageSize;
+	case invtype::InvTypeArchived:
+		return invtype::InvTypeArchivedSize;
+	case invtype::InvTypeMail:
+		return invtype::InvTypeMailSize;
+	case invtype::InvTypeGuildTrophyTribute:
+		return invtype::InvTypeGuildTrophyTributeSize;
+	case invtype::InvTypeKrono:
+		return invtype::InvTypeKronoSize;
+	case invtype::InvTypeOther:
+		return invtype::InvTypeOtherSize;
+	default:
+		return 0;
+	}
+}
+
+const char* RoF2::invtype::GetInvTypeName(int inv_type)
+{
+	switch (inv_type) {
+	case invtype::InvTypeInvalid:
+		return "Invalid Type";
+	case invtype::InvTypePossessions:
+		return "Possessions";
+	case invtype::InvTypeBank:
+		return "Bank";
+	case invtype::InvTypeSharedBank:
+		return "Shared Bank";
+	case invtype::InvTypeTrade:
+		return "Trade";
+	case invtype::InvTypeWorld:
+		return "World";
+	case invtype::InvTypeLimbo:
+		return "Limbo";
+	case invtype::InvTypeTribute:
+		return "Tribute";
+	case invtype::InvTypeTrophyTribute:
+		return "Trophy Tribute";
+	case invtype::InvTypeGuildTribute:
+		return "Guild Tribute";
+	case invtype::InvTypeMerchant:
+		return "Merchant";
+	case invtype::InvTypeDeleted:
+		return "Deleted";
+	case invtype::InvTypeCorpse:
+		return "Corpse";
+	case invtype::InvTypeBazaar:
+		return "Bazaar";
+	case invtype::InvTypeInspect:
+		return "Inspect";
+	case invtype::InvTypeRealEstate:
+		return "Real Estate";
+	case invtype::InvTypeViewMODPC:
+		return "View MOD PC";
+	case invtype::InvTypeViewMODBank:
+		return "View MOD Bank";
+	case invtype::InvTypeViewMODSharedBank:
+		return "View MOD Shared Bank";
+	case invtype::InvTypeViewMODLimbo:
+		return "View MOD Limbo";
+	case invtype::InvTypeAltStorage:
+		return "Alt Storage";
+	case invtype::InvTypeArchived:
+		return "Archived";
+	case invtype::InvTypeMail:
+		return "Mail";
+	case invtype::InvTypeGuildTrophyTribute:
+		return "Guild Trophy Tribute";
+	case invtype::InvTypeKrono:
+		return "Krono";
+	case invtype::InvTypeOther:
+		return "Other";
+	default:
+		return "Unknown Type";
+	}
+}
+
+bool RoF2::invtype::IsInvTypePersistent(int inv_type)
+{
+	switch (inv_type) {
+	case invtype::InvTypePossessions:
+	case invtype::InvTypeBank:
+	case invtype::InvTypeSharedBank:
+	case invtype::InvTypeTrade:
+	case invtype::InvTypeWorld:
+	case invtype::InvTypeLimbo:
+	case invtype::InvTypeTribute:
+	case invtype::InvTypeTrophyTribute:
+	case invtype::InvTypeGuildTribute:
+		return true;
+	default:
+		return false;
+	}
+}
+
+const char* RoF2::invslot::GetInvPossessionsSlotName(int inv_slot)
+{
+	switch (inv_slot) {
+	case invslot::InvSlotInvalid:
+		return "Invalid Slot";
+	case invslot::PossessionsCharm:
+		return "Charm";
+	case invslot::PossessionsEar1:
+		return "Ear 1";
+	case invslot::PossessionsHead:
+		return "Head";
+	case invslot::PossessionsFace:
+		return "Face";
+	case invslot::PossessionsEar2:
+		return "Ear 2";
+	case invslot::PossessionsNeck:
+		return "Neck";
+	case invslot::PossessionsShoulders:
+		return "Shoulders";
+	case invslot::PossessionsArms:
+		return "Arms";
+	case invslot::PossessionsBack:
+		return "Back";
+	case invslot::PossessionsWrist1:
+		return "Wrist 1";
+	case invslot::PossessionsWrist2:
+		return "Wrist 2";
+	case invslot::PossessionsRange:
+		return "Range";
+	case invslot::PossessionsHands:
+		return "Hands";
+	case invslot::PossessionsPrimary:
+		return "Primary";
+	case invslot::PossessionsSecondary:
+		return "Secondary";
+	case invslot::PossessionsFinger1:
+		return "Finger 1";
+	case invslot::PossessionsFinger2:
+		return "Finger 2";
+	case invslot::PossessionsChest:
+		return "Chest";
+	case invslot::PossessionsLegs:
+		return "Legs";
+	case invslot::PossessionsFeet:
+		return "Feet";
+	case invslot::PossessionsWaist:
+		return "Waist";
+	case invslot::PossessionsPowerSource:
+		return "Power Source";
+	case invslot::PossessionsAmmo:
+		return "Ammo";
+	case invslot::PossessionsGeneral1:
+		return "General 1";
+	case invslot::PossessionsGeneral2:
+		return "General 2";
+	case invslot::PossessionsGeneral3:
+		return "General 3";
+	case invslot::PossessionsGeneral4:
+		return "General 4";
+	case invslot::PossessionsGeneral5:
+		return "General 5";
+	case invslot::PossessionsGeneral6:
+		return "General 6";
+	case invslot::PossessionsGeneral7:
+		return "General 7";
+	case invslot::PossessionsGeneral8:
+		return "General 8";
+	case invslot::PossessionsGeneral9:
+		return "General 9";
+	case invslot::PossessionsGeneral10:
+		return "General 10";
+	case invslot::PossessionsCursor:
+		return "Cursor";
+	default:
+		return "Unknown Slot";
+	}
+}
+
+const char* RoF2::invslot::GetInvSlotName(int inv_type, int inv_slot)
+{
+	if (inv_type == invtype::InvTypePossessions)
+		return invslot::GetInvPossessionsSlotName(inv_slot);
+
+	size_t type_size = invtype::GetInvTypeSize(inv_type);
+
+	if (!type_size || inv_slot == invslot::InvSlotInvalid)
+		return "Invalid Slot";
+
+	if ((size_t)(inv_slot + 1) >= type_size)
+		return "Unknown Slot";
+
+	static std::string ret_str;
+	ret_str = StringFormat("Slot %i", (inv_slot + 1));
+
+	return ret_str.c_str();
+}
+
+const char* RoF2::invbag::GetInvBagIndexName(int bag_index)
+{
+	if (bag_index == invbag::InvBagInvalid)
+		return "Invalid Bag";
+
+	if ((size_t)bag_index >= invbag::ItemBagSize)
+		return "Unknown Bag";
+
+	static std::string ret_str;
+	ret_str = StringFormat("Bag %i", (bag_index + 1));
+
+	return ret_str.c_str();
+}
+
+const char* RoF2::invaug::GetInvAugIndexName(int aug_index)
+{
+	if (aug_index == invaug::InvAugInvalid)
+		return "Invalid Augment";
+
+	if ((size_t)aug_index >= invaug::ItemAugSize)
+		return "Unknown Augment";
+
+	static std::string ret_str;
+	ret_str = StringFormat("Augment %i", (aug_index + 1));
+
+	return ret_str.c_str();
+}
@@ -0,0 +1,302 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_ROF2_LIMITS_H
+#define COMMON_ROF2_LIMITS_H
+
+#include "../types.h"
+#include "../emu_versions.h"
+#include "../skills.h"
+
+
+namespace RoF2
+{
+	enum : int { Invalid = -1, Null, Safety };
+
+	enum : bool { False = false, True = true };
+
+	// pre-declarations
+	namespace inventory {
+		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+	} /*inventory*/
+
+	namespace invtype {
+		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+		enum : int { InvTypeInvalid = -1, InvTypeBegin };
+
+		enum InventoryType : int {
+			InvTypePossessions = InvTypeBegin,
+			InvTypeBank,
+			InvTypeSharedBank,
+			InvTypeTrade,
+			InvTypeWorld,
+			InvTypeLimbo,
+			InvTypeTribute,
+			InvTypeTrophyTribute,
+			InvTypeGuildTribute,
+			InvTypeMerchant,
+			InvTypeDeleted,
+			InvTypeCorpse,
+			InvTypeBazaar,
+			InvTypeInspect,
+			InvTypeRealEstate,
+			InvTypeViewMODPC,
+			InvTypeViewMODBank,
+			InvTypeViewMODSharedBank,
+			InvTypeViewMODLimbo,
+			InvTypeAltStorage,
+			InvTypeArchived,
+			InvTypeMail,
+			InvTypeGuildTrophyTribute,
+			InvTypeKrono,
+			InvTypeOther,
+			InvTypeCount
+		};
+
+	} /*invtype*/
+
+	namespace invslot {
+		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+		enum : int { InvSlotInvalid = -1, InvSlotBegin };
+
+		enum PossessionsSlot : int {
+			PossessionsCharm = InvSlotBegin,
+			PossessionsEar1,
+			PossessionsHead,
+			PossessionsFace,
+			PossessionsEar2,
+			PossessionsNeck,
+			PossessionsShoulders,
+			PossessionsArms,
+			PossessionsBack,
+			PossessionsWrist1,
+			PossessionsWrist2,
+			PossessionsRange,
+			PossessionsHands,
+			PossessionsPrimary,
+			PossessionsSecondary,
+			PossessionsFinger1,
+			PossessionsFinger2,
+			PossessionsChest,
+			PossessionsLegs,
+			PossessionsFeet,
+			PossessionsWaist,
+			PossessionsPowerSource,
+			PossessionsAmmo,
+			PossessionsGeneral1,
+			PossessionsGeneral2,
+			PossessionsGeneral3,
+			PossessionsGeneral4,
+			PossessionsGeneral5,
+			PossessionsGeneral6,
+			PossessionsGeneral7,
+			PossessionsGeneral8,
+			PossessionsGeneral9,
+			PossessionsGeneral10,
+			PossessionsCursor,
+			PossessionsCount
+		};
+
+		const int EquipmentBegin = PossessionsCharm;
+		const int EquipmentEnd = PossessionsAmmo;
+		const int EquipmentCount = (EquipmentEnd - EquipmentBegin + 1);
+
+		const int GeneralBegin = PossessionsGeneral1;
+		const int GeneralEnd = PossessionsGeneral10;
+		const int GeneralCount = (GeneralEnd - GeneralBegin + 1);
+
+	} /*invslot*/
+
+	namespace invbag {
+		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+		enum : int { InvBagInvalid = -1, InvBagBegin };
+
+	} /*invbag*/
+
+	namespace invaug {
+		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+		enum : int { InvAugInvalid = -1, InvAugBegin };
+
+	} /*invaug*/
+
+	namespace item {
+		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+		//enum Unknown : int { // looks like item class..but, RoF has it too - nothing in UF-
+		//	Unknown1 = 0,
+		//	Unknown2 = 1,
+		//	Unknown3 = 2,
+		//	Unknown4 = 5 // krono?
+		//};
+
+		enum ItemPacketType : int {
+			ItemPacketMerchant = 100,
+			ItemPacketTradeView = 101,
+			ItemPacketLoot = 102,
+			ItemPacketTrade = 103,
+			ItemPacketCharInventory = 105,
+			ItemPacketLimbo = 106,
+			ItemPacketWorldContainer = 107,
+			ItemPacketTributeItem = 108,
+			ItemPacketGuildTribute = 109,
+			ItemPacket10 = 110,
+			ItemPacket11 = 111,
+			ItemPacket12 = 112,
+			ItemPacketRecovery = 113,
+			ItemPacket14 = 115
+		};
+
+	} /*item*/
+
+	namespace profile {
+		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+	} /*profile*/
+
+	namespace constants {
+		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+	} /*constants*/
+
+	namespace behavior {
+		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+	} /*behavior*/
+
+	namespace skills {
+		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF2; }
+
+	} /*skills*/
+
+
+	// declarations
+	namespace inventory {
+		const bool ConcatenateInvTypeLimbo = false;
+
+		const bool AllowOverLevelEquipment = true;
+
+		const bool AllowEmptyBagInBag = true;
+		const bool AllowClickCastFromBag = true;
+
+	} /*inventory*/
+
+	namespace invtype {
+		const size_t InvTypePossessionsSize = invslot::PossessionsCount;
+		const size_t InvTypeBankSize = 24;
+		const size_t InvTypeSharedBankSize = 2;
+		const size_t InvTypeTradeSize = 8;
+		const size_t InvTypeWorldSize = 10;
+		const size_t InvTypeLimboSize = 36;
+		const size_t InvTypeTributeSize = 5;
+		const size_t InvTypeTrophyTributeSize = 0;//unknown
+		const size_t InvTypeGuildTributeSize = 2;//unverified
+		const size_t InvTypeMerchantSize = 200;
+		const size_t InvTypeDeletedSize = 0;//unknown - "Recovery Tab"
+		const size_t InvTypeCorpseSize = InvTypePossessionsSize;
+		const size_t InvTypeBazaarSize = 200;
+		const size_t InvTypeInspectSize = invslot::EquipmentCount;
+		const size_t InvTypeRealEstateSize = 0;//unknown
+		const size_t InvTypeViewMODPCSize = InvTypePossessionsSize;
+		const size_t InvTypeViewMODBankSize = InvTypeBankSize;
+		const size_t InvTypeViewMODSharedBankSize = InvTypeSharedBankSize;
+		const size_t InvTypeViewMODLimboSize = InvTypeLimboSize;
+		const size_t InvTypeAltStorageSize = 0;//unknown - "Shroud Bank"
+		const size_t InvTypeArchivedSize = 0;//unknown
+		const size_t InvTypeMailSize = 0;//unknown
+		const size_t InvTypeGuildTrophyTributeSize = 0;//unknown
+		const size_t InvTypeKronoSize = 0;//unknown
+		const size_t InvTypeOtherSize = 0;//unknown
+
+		extern size_t GetInvTypeSize(int inv_type);
+		extern const char* GetInvTypeName(int inv_type);
+
+		extern bool IsInvTypePersistent(int inv_type);
+
+	} /*invtype*/
+
+	namespace invslot {
+		extern const char* GetInvPossessionsSlotName(int inv_slot);
+		extern const char* GetInvSlotName(int inv_type, int inv_slot);
+
+	} /*invslot*/
+
+	namespace invbag {
+		const size_t ItemBagSize = 255; // server Size will be 255..unsure what actual client is (test)
+
+		extern const char* GetInvBagIndexName(int bag_index);
+
+	} /*invbag*/
+
+	namespace invaug {
+		const size_t ItemAugSize = 6;
+
+		extern const char* GetInvAugIndexName(int aug_index);
+
+	} /*invaug*/
+
+	namespace item {
+
+	} /*item*/
+
+	namespace profile {
+		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
+
+		const size_t BandoliersSize = 20;		// number of bandolier instances
+		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
+
+		const size_t PotionBeltSize = 5;
+
+		const size_t SkillArraySize = 100;
+
+	} /*profile*/
+
+	namespace constants {
+		const size_t CharacterCreationLimit = 12;
+
+		const size_t SayLinkBodySize = 56;
+
+		const int LongBuffs = 42;
+		const int ShortBuffs = 20;
+		const int DiscBuffs = 1;
+		const int TotalBuffs = LongBuffs + ShortBuffs + DiscBuffs;
+		const int NPCBuffs = 97;
+		const int PetBuffs = NPCBuffs;
+		const int MercBuffs = LongBuffs;
+
+	} /*constants*/
+
+	namespace behavior {
+		const bool CoinHasWeight = false;
+
+	} /*behavior*/
+
+	namespace skills {
+		const size_t LastUsableSkill = EQEmu::skills::Skill2HPiercing;
+
+	} /*skills*/
+
+}; /*RoF2*/
+
+#endif /*COMMON_ROF2_LIMITS_H*/
@@ -1,3 +1,23 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
 // out-going packets that require an ENCODE translation:
 // Begin RoF2 Encodes

@@ -65,7 +85,6 @@ E(OP_HPUpdate)
 E(OP_Illusion)
 E(OP_InspectBuffs)
 E(OP_InspectRequest)
-E(OP_InterruptCast)
 E(OP_ItemLinkResponse)
 E(OP_ItemPacket)
 E(OP_ItemVerifyReply)
@@ -121,6 +140,7 @@ E(OP_ZoneEntry)
 E(OP_ZonePlayerToBind)
 E(OP_ZoneServerInfo)
 E(OP_ZoneSpawns)
+E(OP_CrystalCountUpdate)
 // Begin RoF Decodes
 D(OP_AdventureMerchantSell)
 D(OP_AltCurrencySell)
@@ -1,7 +1,28 @@
-#ifndef ROF2_STRUCTS_H_
-#define ROF2_STRUCTS_H_
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

-namespace RoF2 {
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_ROF2_STRUCTS_H
+#define COMMON_ROF2_STRUCTS_H
+
+
+namespace RoF2
+{
 	namespace structs {

 /*
@@ -29,22 +50,24 @@ struct WorldObjectsSent_Struct {
 };

 // New for RoF2 - Size: 12
-struct ItemSlotStruct {
-/*000*/	int16	SlotType;	// Worn and Normal inventory = 0, Bank = 1, Shared Bank = 2, Delete Item = -1
+struct InventorySlot_Struct
+{
+/*000*/	int16	Type;		// Worn and Normal inventory = 0, Bank = 1, Shared Bank = 2, Delete Item = -1
 /*002*/	int16	Unknown02;
-/*004*/	int16	MainSlot;
-/*006*/	int16	SubSlot;
-/*008*/	int16	AugSlot;	// Guessing - Seen 0xffff
+/*004*/	int16	Slot;
+/*006*/	int16	SubIndex;
+/*008*/	int16	AugIndex;	// Guessing - Seen 0xffff
 /*010*/	int16	Unknown01;	// Normally 0 - Seen 13262 when deleting an item, but didn't match item ID
 /*012*/
 };

 // New for RoF2 - Used for Merchant_Purchase_Struct
 // Can't sellfrom other than main inventory so Slot Type is not needed.
-struct MainInvItemSlotStruct {
-/*000*/	int16	MainSlot;
-/*002*/	int16	SubSlot;
-/*004*/	int16	AugSlot;
+struct TypelessInventorySlot_Struct
+{
+/*000*/	int16	Slot;
+/*002*/	int16	SubIndex;
+/*004*/	int16	AugIndex;
 /*006*/	int16	Unknown01;
 /*008*/
 };
@@ -140,7 +163,7 @@ struct AdventureInfo {
 ** Merth: Gave struct a name so gcc 2.96 would compile
 **
 */
-struct Color_Struct
+struct Tint_Struct
 {
 	union {
 		struct {
@@ -148,21 +171,65 @@ struct Color_Struct
 			uint8 Green;
 			uint8 Red;
 			uint8 UseTint;	// if there's a tint this is FF
-		} RGB;
+		};
 		uint32 Color;
 	};
 };

-struct CharSelectEquip
+struct TintProfile
+{
+	union {
+		struct {
+			Tint_Struct Head;
+			Tint_Struct Chest;
+			Tint_Struct Arms;
+			Tint_Struct Wrist;
+			Tint_Struct Hands;
+			Tint_Struct Legs;
+			Tint_Struct Feet;
+			Tint_Struct Primary;
+			Tint_Struct Secondary;
+		};
+		Tint_Struct Slot[EQEmu::textures::materialCount];
+	};
+};
+
+/*
+* Visible equiptment.
+* Size: 20 Octets
+*/
+struct Texture_Struct
 {
 	uint32 Material;
 	uint32 Unknown1;
 	uint32 EliteMaterial;
 	uint32 HeroForgeModel;
-	uint32 Material2;
-	Color_Struct Color;
+	uint32 Material2;	// Same as material?
 };

+// Needs more research regarding new slots
+//struct TextureProfile
+//{
+//	union {
+//		struct {
+//			Texture_Struct Head;
+//			Texture_Struct Chest;
+//			Texture_Struct Arms;
+//			Texture_Struct Wrist;
+//			Texture_Struct Hands;
+//			Texture_Struct Legs;
+//			Texture_Struct Feet;
+//			Texture_Struct Primary;
+//			Texture_Struct Secondary;
+//		};
+//		Texture_Struct Slot[EQEmu::textures::TextureCount];
+//	};
+//
+//	TextureProfile();
+//};
+
+struct CharSelectEquip : Texture_Struct, Tint_Struct {};
+
 struct CharacterSelectEntry_Struct
 {
 /*0000*/	char Name[1];				// Name null terminated
@@ -208,21 +275,6 @@ struct CharacterSelect_Struct
 /*004*/	CharacterSelectEntry_Struct Entries[0];
 };

-/*
-* Visible equiptment.
-* Size: 20 Octets
-*/
-struct EquipStruct
-{
-	/*00*/ uint32 Material;
-	/*04*/ uint32 Unknown1;
-	/*08*/ uint32 EliteMaterial;
-	/*12*/ uint32 HeroForgeModel;
-	/*16*/ uint32 Material2;	// Same as material?
-	/*20*/
-};
-
-
 struct Membership_Entry_Struct
 {
 /*000*/ uint32 purchase_id;		// Seen 1, then increments 90287 to 90300
@@ -424,39 +476,24 @@ struct Spawn_Struct
 /*0000*/ uint32 unknown18;
 /*0000*/ uint32 unknown19;
 	 Spawn_Struct_Position Position;
-/*0000*/ union
-         {
-           struct
-           {
-               /*0000*/ Color_Struct color_helmet;    // Color of helmet item
-               /*0000*/ Color_Struct color_chest;     // Color of chest item
-               /*0000*/ Color_Struct color_arms;      // Color of arms item
-               /*0000*/ Color_Struct color_bracers;   // Color of bracers item
-               /*0000*/ Color_Struct color_hands;     // Color of hands item
-               /*0000*/ Color_Struct color_legs;      // Color of legs item
-               /*0000*/ Color_Struct color_feet;      // Color of feet item
-               /*0000*/ Color_Struct color_primary;   // Color of primary item
-               /*0000*/ Color_Struct color_secondary; // Color of secondary item
-           } equipment_colors;
-            /*0000*/ Color_Struct colors[9]; // Array elements correspond to struct equipment_colors above
-         };
+/*0000*/ TintProfile equipment_tint;

 // skip these bytes if not a valid player race
 /*0000*/ union
         {
           struct
           {
-               /*0000*/ EquipStruct equip_helmet;     // Equiptment: Helmet visual
-               /*0000*/ EquipStruct equip_chest;      // Equiptment: Chest visual
-               /*0000*/ EquipStruct equip_arms;       // Equiptment: Arms visual
-               /*0000*/ EquipStruct equip_bracers;    // Equiptment: Wrist visual
-               /*0000*/ EquipStruct equip_hands;      // Equiptment: Hands visual
-               /*0000*/ EquipStruct equip_legs;       // Equiptment: Legs visual
-               /*0000*/ EquipStruct equip_feet;       // Equiptment: Boots visual
-               /*0000*/ EquipStruct equip_primary;    // Equiptment: Main visual
-               /*0000*/ EquipStruct equip_secondary;  // Equiptment: Off visual
+			   /*0000*/ Texture_Struct equip_helmet;     // Equiptment: Helmet visual
+			   /*0000*/ Texture_Struct equip_chest;      // Equiptment: Chest visual
+			   /*0000*/ Texture_Struct equip_arms;       // Equiptment: Arms visual
+			   /*0000*/ Texture_Struct equip_bracers;    // Equiptment: Wrist visual
+			   /*0000*/ Texture_Struct equip_hands;      // Equiptment: Hands visual
+			   /*0000*/ Texture_Struct equip_legs;       // Equiptment: Legs visual
+			   /*0000*/ Texture_Struct equip_feet;       // Equiptment: Boots visual
+			   /*0000*/ Texture_Struct equip_primary;    // Equiptment: Main visual
+			   /*0000*/ Texture_Struct equip_secondary;  // Equiptment: Off visual
           } equip;
-           /*0000*/ EquipStruct equipment[9];
+		   /*0000*/ Texture_Struct equipment[9];
         };

 /*0000*/ //char title[0];  // only read if(hasTitleOrSuffix & 4)
@@ -598,7 +635,7 @@ struct MemorizeSpell_Struct {
 uint32 slot;     // Spot in the spell book/memorized slot
 uint32 spell_id; // Spell id (200 or c8 is minor healing, etc)
 uint32 scribing; // 1 if memorizing a spell, set to 0 if scribing to book, 2 if un-memming
-uint32 unknown12;
+uint32 reduction; // lowers reuse
 };

 /*
@@ -631,11 +668,12 @@ struct DeleteSpell_Struct

 struct ManaChange_Struct
 {
-	uint32	new_mana;                  // New Mana AMount
-	uint32	stamina;
-	uint32	spell_id;
-	uint32	unknown12;
-	uint32	unknown16;
+/*00*/	uint32	new_mana;		// New Mana AMount
+/*04*/	uint32	stamina;
+/*08*/	uint32	spell_id;
+/*12*/	uint8	keepcasting;	// won't stop the cast. Change mana while casting?
+/*13*/	uint8	padding[3];		// client doesn't read it, garbage data seems like
+/*16*/	int32	slot;			// -1 for normal usage slot for when we want silent interrupt? I think it does timer stuff or something. Linked Spell Reuse interrupt uses it
 };

 struct SwapSpell_Struct
@@ -656,7 +694,7 @@ struct CastSpell_Struct
 {
 /*00*/	uint32	slot;
 /*04*/	uint32	spell_id;
-/*08*/	ItemSlotStruct inventoryslot;  // slot for clicky item, Seen unknown of 131 = normal cast
+/*08*/	InventorySlot_Struct inventory_slot;  // slot for clicky item, Seen unknown of 131 = normal cast
 /*20*/	uint32	target_id;
 /*24*/	uint32	cs_unknown[2];
 /*32*/	float	y_pos;
@@ -682,69 +720,31 @@ struct SpawnAppearance_Struct

 struct SpellBuff_Struct
 {
-/*000*/	uint8 slotid;				// badly named... seems to be 2 for a real buff, 0 otherwise
-/*001*/	float unknown004;			// Seen 1 for no buff
-/*005*/	uint32 player_id;			// 'global' ID of the caster, for wearoff messages
-/*009*/ uint32 unknown016;
-/*013*/	uint8 bard_modifier;
-/*014*/	int32 duration;
-/*018*/ uint8 level;
-/*019*/ uint32 spellid;
-/*023*/ uint32 counters;
-/*027*/ uint8 unknown0028[53];
-/*080*/
-};
-
-struct SpellBuff_Struct_Old
-{
-/*000*/	uint8 slotid;				// badly named... seems to be 2 for a real buff, 0 otherwise
-/*001*/ uint8 level;
-/*002*/	uint8 bard_modifier;
-/*003*/	uint8 effect;				// not real
-/*004*/	float unknown004;			// Seen 1 for no buff
-/*008*/ uint32 spellid;
-/*012*/	int32 duration;
-/*016*/ uint32 unknown016;
-/*020*/	uint32 player_id;			// 'global' ID of the caster, for wearoff messages
-/*024*/ uint32 counters;
-/*028*/ uint8 unknown0028[60];
+/*000*/	uint8 effect_type;		// 0 = no buff, 2 = buff, 4 = inverse affects of buff
+/*001*/	uint8 level;			// Seen 1 for no buff
+/*002*/	uint8 unknown002;		//pretty sure padding now
+/*003*/	uint8 unknown003;   	// MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
+/*004*/	float bard_modifier;
+/*008*/	uint32 spellid;
+/*012*/	uint32 duration;
+/*016*/	uint32 player_id;		// caster ID, pretty sure just zone ID
+/*020*/	uint32 num_hits;
+/*024*/	float y;				// referenced by SPA 441
+/*028*/	float x;				// unsure if all buffs get them
+/*032*/	float z;				// as valid data
+/*036*/	uint32 unknown036;
+/*040*/	int32 slot_data[12];	// book keeping stuff per slot (counters, rune/vie)
 /*088*/
 };

-// Not functional yet, but this is what the packet looks like on Live
-struct SpellBuffFade_Struct_Live {
-/*000*/	uint32 entityid;	// Player id who cast the buff
-/*004*/	uint8 unknown004;
-/*005*/	uint8 level;
-/*006*/	uint8 effect;
-/*007*/	uint8 unknown007;
-/*008*/	float unknown008;
-/*012*/	uint32 spellid;
-/*016*/	int32 duration;
-/*020*/ uint32 playerId;	// Global player ID?
-/*024*/	uint32 num_hits;
-/*028*/ uint8 unknown0028[64];
+struct SpellBuffPacket_Struct {
+/*000*/	uint32 entityid;		// Player id who cast the buff
+/*004*/	SpellBuff_Struct buff;
 /*092*/	uint32 slotid;
 /*096*/	uint32 bufffade;
 /*100*/
 };

-struct SpellBuffFade_Struct {
-/*000*/	uint32 entityid;
-/*004*/	uint8 slot;
-/*005*/	uint8 level;
-/*006*/	uint8 effect;
-/*007*/	uint8 unknown7;
-/*008*/	uint32 spellid;
-/*012*/	int32 duration;
-/*016*/	uint32 num_hits;
-/*020*/	uint32 unknown020;		// Global player ID?
-/*024*/ uint32 playerId;		// Player id who cast the buff
-/*028*/	uint32 slotid;
-/*032*/	uint32 bufffade;
-/*036*/
-};
-
 struct BuffRemoveRequest_Struct
 {
 /*00*/ uint32 SlotID;
@@ -925,13 +925,13 @@ struct BandolierItem_Struct_Old
 struct Bandolier_Struct
 {
 	char Name[1];	// Variable Length
-	BandolierItem_Struct Items[consts::BANDOLIER_ITEM_COUNT];
+	BandolierItem_Struct Items[profile::BandolierItemCount];
 };

 struct Bandolier_Struct_Old
 {
 	char Name[32];
-	BandolierItem_Struct Items[consts::BANDOLIER_ITEM_COUNT];
+	BandolierItem_Struct Items[profile::BandolierItemCount];
 };

 struct PotionBeltItem_Struct
@@ -951,12 +951,12 @@ struct PotionBeltItem_Struct_Old

 struct PotionBelt_Struct
 {
-	PotionBeltItem_Struct Items[consts::POTION_BELT_ITEM_COUNT];
+	PotionBeltItem_Struct Items[profile::PotionBeltSize];
 };

 struct PotionBelt_Struct_Old
 {
-	PotionBeltItem_Struct_Old Items[consts::POTION_BELT_ITEM_COUNT];
+	PotionBeltItem_Struct_Old Items[profile::PotionBeltSize];
 };

 struct GroupLeadershipAA_Struct {
@@ -1055,38 +1055,38 @@ union
 {
 	struct
 	{
-		/*00184*/ EquipStruct equip_helmet;		// Equipment: Helmet visual
-		/*00204*/ EquipStruct equip_chest;		// Equipment: Chest visual
-		/*00224*/ EquipStruct equip_arms;		// Equipment: Arms visual
-		/*00244*/ EquipStruct equip_bracers;	// Equipment: Wrist visual
-		/*00264*/ EquipStruct equip_hands;		// Equipment: Hands visual
-		/*00284*/ EquipStruct equip_legs;		// Equipment: Legs visual
-		/*00304*/ EquipStruct equip_feet;		// Equipment: Boots visual
-		/*00324*/ EquipStruct equip_primary;	// Equipment: Main visual
-		/*00344*/ EquipStruct equip_secondary;	// Equipment: Off visual
+		/*00184*/ Texture_Struct equip_helmet;		// Equipment: Helmet visual
+		/*00204*/ Texture_Struct equip_chest;		// Equipment: Chest visual
+		/*00224*/ Texture_Struct equip_arms;		// Equipment: Arms visual
+		/*00244*/ Texture_Struct equip_bracers;	// Equipment: Wrist visual
+		/*00264*/ Texture_Struct equip_hands;		// Equipment: Hands visual
+		/*00284*/ Texture_Struct equip_legs;		// Equipment: Legs visual
+		/*00304*/ Texture_Struct equip_feet;		// Equipment: Boots visual
+		/*00324*/ Texture_Struct equip_primary;	// Equipment: Main visual
+		/*00344*/ Texture_Struct equip_secondary;	// Equipment: Off visual
 		// Below slots are just guesses, but all 0s anyway...
-		/*00364*/ EquipStruct equip_charm;		// Equipment: Non-visual
-		/*00384*/ EquipStruct equip_ear1;		// Equipment: Non-visual
-		/*00404*/ EquipStruct equip_ear2;		// Equipment: Non-visual
-		/*00424*/ EquipStruct equip_face;		// Equipment: Non-visual
-		/*00444*/ EquipStruct equip_neck;		// Equipment: Non-visual
-		/*00464*/ EquipStruct equip_shoulder;	// Equipment: Non-visual
-		/*00484*/ EquipStruct equip_bracer2;	// Equipment: Non-visual
-		/*00504*/ EquipStruct equip_range;		// Equipment: Non-visual
-		/*00524*/ EquipStruct equip_ring1;		// Equipment: Non-visual
-		/*00544*/ EquipStruct equip_ring2;		// Equipment: Non-visual
-		/*00564*/ EquipStruct equip_waist;		// Equipment: Non-visual
-		/*00584*/ EquipStruct equip_powersource;// Equipment: Non-visual
-		/*00604*/ EquipStruct equip_ammo;		// Equipment: Non-visual
+		/*00364*/ Texture_Struct equip_charm;		// Equipment: Non-visual
+		/*00384*/ Texture_Struct equip_ear1;		// Equipment: Non-visual
+		/*00404*/ Texture_Struct equip_ear2;		// Equipment: Non-visual
+		/*00424*/ Texture_Struct equip_face;		// Equipment: Non-visual
+		/*00444*/ Texture_Struct equip_neck;		// Equipment: Non-visual
+		/*00464*/ Texture_Struct equip_shoulder;	// Equipment: Non-visual
+		/*00484*/ Texture_Struct equip_bracer2;	// Equipment: Non-visual
+		/*00504*/ Texture_Struct equip_range;		// Equipment: Non-visual
+		/*00524*/ Texture_Struct equip_ring1;		// Equipment: Non-visual
+		/*00544*/ Texture_Struct equip_ring2;		// Equipment: Non-visual
+		/*00564*/ Texture_Struct equip_waist;		// Equipment: Non-visual
+		/*00584*/ Texture_Struct equip_powersource;// Equipment: Non-visual
+		/*00604*/ Texture_Struct equip_ammo;		// Equipment: Non-visual
 	} equip;
-	/*00184*/ EquipStruct equipment[22];		// Total Slots
+	/*00184*/ Texture_Struct equipment[22];		// Total Slots
 };
 /*00624*/ uint32 equip2_count;			// Seen 9
-/*00628*/ EquipStruct equipment2[_MaterialCount];	// Appears to be Visible slots, but all 0s
+/*00628*/ Texture_Struct equipment2[EQEmu::textures::materialCount];	// Appears to be Visible slots, but all 0s
 /*00808*/ uint32 tint_count;			// Seen 9
-/*00812*/ Color_Struct item_tint[_MaterialCount];	// RR GG BB 00
+/*00812*/ TintProfile item_tint;		// RR GG BB 00
 /*00848*/ uint32 tint_count2;			// Seen 9
-/*00852*/ Color_Struct item_tint2[_MaterialCount];	// RR GG BB 00
+/*00852*/ TintProfile item_tint2;		// RR GG BB 00
 /*00888*/ uint8   haircolor;			// Player hair color
 /*00889*/ uint8   beardcolor;			// Player beard color
 /*00890*/ uint32 unknown_rof5;			//
@@ -1166,7 +1166,7 @@ union
 /*12949*/ uint32 aapoints;				// Unspent AA points - Seen 1
 /*12953*/ uint16 unknown_rof20;			//
 /*12955*/ uint32 bandolier_count;		// Seen 20
-/*12959*/ Bandolier_Struct bandoliers[consts::BANDOLIERS_SIZE]; // [20] 740 bytes (Variable Name Sizes) - bandolier contents
+/*12959*/ Bandolier_Struct bandoliers[profile::BandoliersSize]; // [20] 740 bytes (Variable Name Sizes) - bandolier contents
 /*13699*/ uint32 potionbelt_count;		// Seen 5
 /*13703*/ PotionBelt_Struct potionbelt;	// [5] 45 bytes potion belt - (Variable Name Sizes)
 /*13748*/ int32 unknown_rof21;			// Seen -1
@@ -1362,7 +1362,7 @@ struct WearChange_Struct{
 /*010*/ uint32 elite_material;	// 1 for Drakkin Elite Material
 /*014*/ uint32 hero_forge_model; // New to VoA
 /*018*/ uint32 unknown18; // New to RoF2
-/*022*/ Color_Struct color;
+/*022*/ Tint_Struct color;
 /*026*/ uint8 wear_slot_id;
 /*027*/
 };
@@ -1747,7 +1747,7 @@ struct BulkItemPacket_Struct

 struct Consume_Struct
 {
-/*000*/ ItemSlotStruct	slot;
+/*000*/ InventorySlot_Struct	inventory_slot;
 /*012*/ uint32	auto_consumed;	// 0xffffffff when auto eating e7030000 when right click
 /*016*/ uint32	type;			// 0x01=Food 0x02=Water
 /*020*/ uint32	c_unknown1;		// Seen 2
@@ -1779,16 +1779,18 @@ struct ItemProperties_Struct {
 /*008*/
 };

-struct DeleteItem_Struct {
-/*0000*/ ItemSlotStruct	from_slot;
-/*0012*/ ItemSlotStruct	to_slot;
+struct DeleteItem_Struct
+{
+/*0000*/ InventorySlot_Struct	from_slot;
+/*0012*/ InventorySlot_Struct	to_slot;
 /*0024*/ uint32			number_in_stack;
 /*0028*/
 };

-struct MoveItem_Struct {
-/*0000*/ ItemSlotStruct	from_slot;
-/*0012*/ ItemSlotStruct	to_slot;
+struct MoveItem_Struct
+{
+/*0000*/ InventorySlot_Struct	from_slot;
+/*0012*/ InventorySlot_Struct	to_slot;
 /*0024*/ uint32			number_in_stack;
 /*0028*/
 };
@@ -2222,7 +2224,7 @@ struct Merchant_Sell_Struct {

 struct Merchant_Purchase_Struct {
 /*000*/	uint32	npcid;			// Merchant NPC's entity id
-/*004*/	MainInvItemSlotStruct	itemslot;
+/*004*/	TypelessInventorySlot_Struct	inventory_slot;
 /*012*/	uint32	quantity;
 /*016*/	uint32	price;
 /*020*/
@@ -2280,9 +2282,10 @@ struct AltCurrencyUpdate_Struct {

 //Client -> Server
 //When an item is selected while the alt currency merchant window is open
-struct AltCurrencySelectItem_Struct {
+struct AltCurrencySelectItem_Struct
+{
 /*000*/ uint32 merchant_entity_id;
-/*004*/ MainInvItemSlotStruct slot_id;
+/*004*/ TypelessInventorySlot_Struct inventory_slot;
 /*004*/ //uint32 slot_id;
 /*008*/ uint32 unknown008;
 /*012*/ uint32 unknown012;
@@ -2338,9 +2341,10 @@ struct AltCurrencyReclaim_Struct {
 /*012*/ uint32 reclaim_flag; //1 = this is reclaim
 };

-struct AltCurrencySellItem_Struct {
+struct AltCurrencySellItem_Struct
+{
 /*000*/ uint32 merchant_entity_id;
-/*004*/	MainInvItemSlotStruct slot_id;
+/*004*/	TypelessInventorySlot_Struct inventory_slot;
 /*004*/ //uint32 slot_id;
 /*016*/ uint32 charges;
 /*020*/ uint32 cost;
@@ -2356,7 +2360,7 @@ struct Adventure_Purchase_Struct {
 struct Adventure_Sell_Struct {
 /*000*/	uint32	unknown000;	//0x01 - Stack Size/Charges?
 /*004*/	uint32	npcid;
-/*008*/ MainInvItemSlotStruct slot;
+/*008*/ TypelessInventorySlot_Struct inventory_slot;
 /*016*/	uint32	charges;
 /*020*/	uint32	sell_price;
 /*024*/
@@ -2419,7 +2423,7 @@ struct AdventureLeaderboard_Struct
 /*struct Item_Shop_Struct {
 	uint16 merchantid;
 	uint8 itemtype;
-	Item_Struct item;
+	ItemData item;
 	uint8 iss_unknown001[6];
 };*/

@@ -2562,9 +2566,12 @@ struct GroupJoin_Struct_Live {	// New for Live
 };

 struct GroupJoin_Struct {
-/*000*/	char	unknown000[64];
+/*000*/	char	owner_name[64]; // merc
 /*064*/	char	membername[64];
-/*128*/	uint8	unknown128[20];	// Leadership AA ?
+/*128*/	uint8	merc;
+/*129*/	uint8	padding129[3];
+/*132*/	uint32	level;
+/*136*/	uint8	unknown136[12];	// group ID most likely in here judging from like captures (unused by client)
 /*148*/
 };

@@ -2702,9 +2709,9 @@ struct Stun_Struct { // 8 bytes total
 struct AugmentItem_Struct {
 /*00*/	uint32	dest_inst_id;			// The unique serial number for the item instance that is being augmented
 /*04*/	uint32	container_index;				// Seen 0
-/*08*/	ItemSlotStruct container_slot;	// Slot of the item being augmented
+/*08*/	InventorySlot_Struct container_slot;	// Slot of the item being augmented
 /*20*/	uint32	augment_index;				// Seen 0
-/*24*/	ItemSlotStruct augment_slot;	// Slot of the distiller to use (if one applies)
+/*24*/	InventorySlot_Struct augment_slot;	// Slot of the distiller to use (if one applies)
 /*36*/	int32	augment_action;			// Guessed - 0 = augment, 1 = remove with distiller, 3 = delete aug
 /*36*/	//int32	augment_slot;
 /*40*/
@@ -2822,7 +2829,8 @@ struct BookText_Struct {
 struct BookRequest_Struct {
 /*0000*/	uint32 window;		// where to display the text (0xFFFFFFFF means new window).
 /*0004*/	uint16 invslot;		// Is the slot, but the RoF2 conversion causes it to fail.  Turned to 0 since it isnt required anyway.
-/*0008*/	uint32 unknown006;	// Seen FFFFFFFF
+/*0006*/	int16 subslot;		// Inventory sub-slot (0-x)
+/*0008*/	uint16 unknown006;	// Seen FFFF
 /*0010*/	uint16 unknown008;	// seen 0000
 /*0012*/	uint32 type;		// 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
 /*0016*/	uint32 unknown0012;
@@ -2845,7 +2853,8 @@ struct Object_Struct {
 /*00*/	uint32	drop_id;			// Unique object id for zone
 /*00*/	uint32	unknown024;			// 53 9e f9 7e - same for all objects in the zone?
 /*00*/	float	heading;			// heading
-/*00*/	float	unknown032[2];		// 00 00 00 00 00 00 00 00
+/*00*/	float	x_tilt;				//Tilt entire object on X axis
+/*00*/	float	y_tilt;				//Tilt entire object on Y axis
 /*00*/	float	size;				// Size - default 1
 /*00*/	float	z;					// z coord
 /*00*/	float	x;					// x coord
@@ -3606,27 +3615,6 @@ struct PetitionBug_Struct{
 	char	text[1028];
 };

-struct DyeStruct
-{
-	union
-	{
-		struct
-		{
-			struct Color_Struct head;
-			struct Color_Struct chest;
-			struct Color_Struct arms;
-			struct Color_Struct wrists;
-			struct Color_Struct hands;
-			struct Color_Struct legs;
-			struct Color_Struct feet;
-			struct Color_Struct primary;	// you can't actually dye this
-			struct Color_Struct secondary;	// or this
-		}
-		dyes;
-		struct Color_Struct dye[9];
-	};
-};
-
 struct ApproveZone_Struct {
 	char	name[64];
 	uint32	zoneid;
@@ -3690,7 +3678,7 @@ struct TributeInfo_Struct {

 struct TributeItem_Struct
 {
-/*00*/	ItemSlotStruct	slot;
+/*00*/	InventorySlot_Struct	inventory_slot;
 /*12*/	uint32	quantity;
 /*16*/	uint32	tribute_master_id;
 /*20*/	int32	tribute_points;
@@ -3727,9 +3715,10 @@ struct Split_Struct
 ** Used In: OP_TradeSkillCombine
 ** Last Updated: 01-05-2013
 */
-struct NewCombine_Struct {
-/*00*/	ItemSlotStruct container_slot;
-/*12*/	ItemSlotStruct guildtribute_slot;	// Slot type is 8? (MapGuildTribute = 8)
+struct NewCombine_Struct
+{
+/*00*/	InventorySlot_Struct container_slot;
+/*12*/	InventorySlot_Struct guildtribute_slot;	// Slot type is 8? (MapGuildTribute = 8)
 /*24*/
 };

@@ -3768,8 +3757,8 @@ struct RecipeReply_Struct {
 struct RecipeAutoCombine_Struct {
 /*00*/	uint32 object_type;
 /*04*/	uint32 some_id;
-/*08*/	ItemSlotStruct container_slot;		//echoed in reply - Was uint32 unknown1
-/*20*/	ItemSlotStruct unknown_slot;		//echoed in reply
+/*08*/	InventorySlot_Struct container_slot;		//echoed in reply - Was uint32 unknown1
+/*20*/	InventorySlot_Struct unknown_slot;		//echoed in reply
 /*32*/	uint32 recipe_id;
 /*36*/	uint32 reply_code;
 /*40*/
@@ -4487,19 +4476,22 @@ struct ExpansionInfo_Struct {
 /*064*/	uint32	Expansions;
 };

-struct ApplyPoison_Struct {
-	MainInvItemSlotStruct inventorySlot;
+struct ApplyPoison_Struct
+{
+	TypelessInventorySlot_Struct inventorySlot;
 	uint32 success;
 };

-struct ItemVerifyRequest_Struct {
-/*000*/	ItemSlotStruct slot;
+struct ItemVerifyRequest_Struct
+{
+/*000*/	InventorySlot_Struct inventory_slot;
 /*012*/	uint32	target;		// Target Entity ID
 /*016*/
 };

-struct ItemVerifyReply_Struct {
-/*000*/	ItemSlotStruct slot;
+struct ItemVerifyReply_Struct
+{
+/*000*/	InventorySlot_Struct inventory_slot;
 /*012*/	uint32	spell;		// Spell ID to cast if different than item effect
 /*016*/	uint32	target;		// Target Entity ID
 /*020*/
@@ -4784,7 +4776,7 @@ struct ItemQuaternaryBodyStruct
 	int32 HeroicSVCorrup;
 	int32 HealAmt;
 	int32 SpellDmg;
-	int32 clairvoyance;
+	int32 Clairvoyance;
 	uint8 unknown18;	//Power Source Capacity or evolve filename?
 	uint32 evolve_string; // Some String, but being evolution related is just a guess
 	uint8 unknown19;
@@ -4822,7 +4814,6 @@ struct ItemQuaternaryBodyStruct
 	uint8 unknown37a;	// New to RoF2 - Probably variable length string
 	uint8 unknown38;	// 0
 	uint8 unknown39;	// 1
-	uint32 subitem_count;
 };

 struct AugmentInfo_Struct
@@ -5057,7 +5048,17 @@ struct MercenaryMerchantResponse_Struct {
 /*0004*/
 };

-	};	//end namespace structs
-};	//end namespace RoF2
+// Sent by Server to update character crystals.
+struct CrystalCountUpdate_Struct
+{
+	/*000*/	uint32	CurrentRadiantCrystals;
+	/*004*/	uint32	CareerRadiantCrystals;
+	/*008*/	uint32	CurrentEbonCrystals;
+	/*012*/	uint32	CareerEbonCrystals;
+};

-#endif /*ROF2_STRUCTS_H_*/
+	}; /*structs*/
+
+}; /*RoF2*/
+
+#endif /*COMMON_ROF2_STRUCTS_H*/
@@ -1,221 +0,0 @@
-/*
-EQEMu:  Everquest Server Emulator
-
-Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef ROF_CONSTANTS_H_
-#define ROF_CONSTANTS_H_
-
-#include "../types.h"
-
-namespace RoF {
-	namespace maps {
-		typedef enum : int16 {
-			MapPossessions = 0,
-			MapBank,
-			MapSharedBank,
-			MapTrade,
-			MapWorld,
-			MapLimbo,
-			MapTribute,
-			MapTrophyTribute,
-			MapGuildTribute,
-			MapMerchant,
-			MapDeleted,
-			MapCorpse,
-			MapBazaar,
-			MapInspect,
-			MapRealEstate,
-			MapViewMODPC,
-			MapViewMODBank,
-			MapViewMODSharedBank,
-			MapViewMODLimbo,
-			MapAltStorage,
-			MapArchived,
-			MapMail,
-			MapGuildTrophyTribute,
-			MapOther,
-			_MapCount
-		} InventoryMaps;
-	}
-
-	namespace slots {
-		typedef enum : int16 {
-			MainCharm = 0,
-			MainEar1,
-			MainHead,
-			MainFace,
-			MainEar2,
-			MainNeck,
-			MainShoulders,
-			MainArms,
-			MainBack,
-			MainWrist1,
-			MainWrist2,
-			MainRange,
-			MainHands,
-			MainPrimary,
-			MainSecondary,
-			MainFinger1,
-			MainFinger2,
-			MainChest,
-			MainLegs,
-			MainFeet,
-			MainWaist,
-			MainPowerSource,
-			MainAmmo,
-			MainGeneral1,
-			MainGeneral2,
-			MainGeneral3,
-			MainGeneral4,
-			MainGeneral5,
-			MainGeneral6,
-			MainGeneral7,
-			MainGeneral8,
-			MainGeneral9,
-			MainGeneral10,
-			MainCursor,
-			_MainCount,
-			_MainEquipmentBegin = MainCharm,
-			_MainEquipmentEnd = MainAmmo,
-			_MainEquipmentCount = (_MainEquipmentEnd - _MainEquipmentBegin + 1),
-			_MainGeneralBegin = MainGeneral1,
-			_MainGeneralEnd = MainGeneral10,
-			_MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1)
-		} EquipmentSlots;
-	}
-
-	namespace consts {
-		static const size_t CHARACTER_CREATION_LIMIT = 12;
-
-		static const uint16	MAP_POSSESSIONS_SIZE = slots::_MainCount;
-		static const uint16 MAP_BANK_SIZE = 24;
-		static const uint16 MAP_SHARED_BANK_SIZE = 2;
-		static const uint16 MAP_TRADE_SIZE = 8;
-		static const uint16 MAP_WORLD_SIZE = 10;
-		static const uint16 MAP_LIMBO_SIZE = 36;
-		static const uint16 MAP_TRIBUTE_SIZE = 0; //?
-		static const uint16 MAP_TROPHY_TRIBUTE_SIZE = 0;
-		static const uint16 MAP_GUILD_TRIBUTE_SIZE = 0;
-		static const uint16 MAP_MERCHANT_SIZE = 0;
-		static const uint16 MAP_DELETED_SIZE = 0;
-		static const uint16 MAP_CORPSE_SIZE = slots::_MainCount;
-		static const uint16 MAP_BAZAAR_SIZE = 200;
-		static const uint16 MAP_INSPECT_SIZE = slots::_MainEquipmentCount;
-		static const uint16 MAP_REAL_ESTATE_SIZE = 0;
-		static const uint16 MAP_VIEW_MOD_PC_SIZE = MAP_POSSESSIONS_SIZE;
-		static const uint16 MAP_VIEW_MOD_BANK_SIZE = MAP_BANK_SIZE;
-		static const uint16 MAP_VIEW_MOD_SHARED_BANK_SIZE = MAP_SHARED_BANK_SIZE;
-		static const uint16 MAP_VIEW_MOD_LIMBO_SIZE = MAP_LIMBO_SIZE;
-		static const uint16 MAP_ALT_STORAGE_SIZE = 0;
-		static const uint16 MAP_ARCHIVED_SIZE = 0;
-		static const uint16 MAP_MAIL_SIZE = 0;
-		static const uint16 MAP_GUILD_TROPHY_TRIBUTE_SIZE = 0;
-		static const uint16 MAP_KRONO_SIZE = NOT_USED;
-		static const uint16 MAP_OTHER_SIZE = 0;
-
-		// most of these definitions will go away with the structure-based system..this maintains compatibility for now
-		// (bag slots and main slots beyond Possessions are assigned for compatibility with current server coding)
-		static const int16 EQUIPMENT_BEGIN = slots::MainCharm;
-		static const int16 EQUIPMENT_END = slots::MainAmmo;
-		static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount;
-
-		static const int16 GENERAL_BEGIN = slots::MainGeneral1;
-		static const int16 GENERAL_END = slots::MainGeneral10;
-		static const uint16 GENERAL_SIZE = slots::_MainGeneralCount;
-		static const int16 GENERAL_BAGS_BEGIN = 251;
-		static const int16 GENERAL_BAGS_END_OFFSET = 99;
-		static const int16 GENERAL_BAGS_END = GENERAL_BAGS_BEGIN + GENERAL_BAGS_END_OFFSET;
-
-		static const int16 CURSOR = slots::MainCursor;
-		static const int16 CURSOR_BAG_BEGIN = 351;
-		static const int16 CURSOR_BAG_END_OFFSET = 9;
-		static const int16 CURSOR_BAG_END = CURSOR_BAG_BEGIN + CURSOR_BAG_END_OFFSET;
-
-		static const int16 BANK_BEGIN = 2000;
-		static const int16 BANK_END = 2023;
-		static const int16 BANK_BAGS_BEGIN = 2031;
-		static const int16 BANK_BAGS_END_OFFSET = 239;
-		static const int16 BANK_BAGS_END = BANK_BAGS_BEGIN + BANK_BAGS_END_OFFSET;
-
-		static const int16 SHARED_BANK_BEGIN = 2500;
-		static const int16 SHARED_BANK_END = 2501;
-		static const int16 SHARED_BANK_BAGS_BEGIN = 2531;
-		static const int16 SHARED_BANK_BAGS_END_OFFSET = 19;
-		static const int16 SHARED_BANK_BAGS_END = SHARED_BANK_BAGS_BEGIN + SHARED_BANK_BAGS_END_OFFSET;
-
-		static const int16 TRADE_BEGIN = 3000;
-		static const int16 TRADE_END = 3007;
-		static const int16 TRADE_NPC_END = 3003;
-		static const int16 TRADE_BAGS_BEGIN = 3031;
-		static const int16 TRADE_BAGS_END_OFFSET = 79;
-		static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET;
-
-		static const int16 WORLD_BEGIN = 4000;
-		static const int16 WORLD_END = 4009;
-
-		static const int16 TRIBUTE_BEGIN = 400;
-		static const int16 TRIBUTE_END = 404;
-
-		static const int16 CORPSE_BEGIN = slots::MainGeneral1;
-		static const int16 CORPSE_END = slots::MainGeneral1 + slots::MainCursor;
-
-		static const uint16 ITEM_COMMON_SIZE = 6;
-		static const uint16 ITEM_CONTAINER_SIZE = 255; // 255; (server max will be 255..unsure what actual client is - test)
-
-		static const size_t BANDOLIERS_SIZE = 20;		// number of bandolier instances
-		static const size_t BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
-
-		static const size_t POTION_BELT_ITEM_COUNT = 5;
-
-		static const size_t TEXT_LINK_BODY_LENGTH = 55;
-	}
-
-	namespace limits {
-		static const bool ALLOWS_EMPTY_BAG_IN_BAG = true;
-		static const bool ALLOWS_CLICK_CAST_FROM_BAG = true;
-		static const bool COIN_HAS_WEIGHT = false;
-	}
-
-};	//end namespace RoF
-
-#endif /*ROF_CONSTANTS_H_*/
-
-/*
-RoF Notes:
-	** Structure-based inventory **
-ok	Possessions: ( 0, { 0 .. 33 }, -1, -1 ) (Corpse: { 23 .. 56 } [Offset 23])
-ok		[Equipment: ( 0, { 0 .. 22 }, -1, -1 )]
-ok		[General: ( 0, { 23 .. 32 }, -1, -1 )]
-ok		[Cursor: ( 0, 33, -1, -1 )]
-	General Bags: ( 0, { 23 .. 32 }, { 0 .. (maxsize - 1) }, -1 )
-	Cursor Bags: ( 0, 33, { 0 .. (maxsize - 1) }, -1 )
-
-	Bank: ( 1, { 0 .. 23 }, -1, -1 )
-	Bank Bags: ( 1, { 0 .. 23 }, { 0 .. (maxsize - 1)}, -1 )
-
-	Shared Bank: ( 2, { 0 .. 1 }, -1, -1 )
-	Shared Bank Bags: ( 2, { 0 .. 1 }, { 0 .. (maxsize - 1) }, -1 )
-
-	Trade: ( 3, { 0 .. 8 }, -1, -1 )
-	(Trade Bags: 3031 - 3110 -- server values)
-
-	World: ( 4, { 0 .. 10 }, -1, -1 )
-
-*/
@@ -0,0 +1,280 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "rof_limits.h"
+
+#include "../string_util.h"
+
+
+size_t RoF::invtype::GetInvTypeSize(int inv_type)
+{
+	switch (inv_type) {
+	case invtype::InvTypePossessions:
+		return invtype::InvTypePossessionsSize;
+	case invtype::InvTypeBank:
+		return invtype::InvTypeBankSize;
+	case invtype::InvTypeSharedBank:
+		return invtype::InvTypeSharedBankSize;
+	case invtype::InvTypeTrade:
+		return invtype::InvTypeTradeSize;
+	case invtype::InvTypeWorld:
+		return invtype::InvTypeWorldSize;
+	case invtype::InvTypeLimbo:
+		return invtype::InvTypeLimboSize;
+	case invtype::InvTypeTribute:
+		return invtype::InvTypeTributeSize;
+	case invtype::InvTypeTrophyTribute:
+		return invtype::InvTypeTrophyTributeSize;
+	case invtype::InvTypeGuildTribute:
+		return invtype::InvTypeGuildTributeSize;
+	case invtype::InvTypeMerchant:
+		return invtype::InvTypeMerchantSize;
+	case invtype::InvTypeDeleted:
+		return invtype::InvTypeDeletedSize;
+	case invtype::InvTypeCorpse:
+		return invtype::InvTypeCorpseSize;
+	case invtype::InvTypeBazaar:
+		return invtype::InvTypeBazaarSize;
+	case invtype::InvTypeInspect:
+		return invtype::InvTypeInspectSize;
+	case invtype::InvTypeRealEstate:
+		return invtype::InvTypeRealEstateSize;
+	case invtype::InvTypeViewMODPC:
+		return invtype::InvTypeViewMODPCSize;
+	case invtype::InvTypeViewMODBank:
+		return invtype::InvTypeViewMODBankSize;
+	case invtype::InvTypeViewMODSharedBank:
+		return invtype::InvTypeViewMODSharedBankSize;
+	case invtype::InvTypeViewMODLimbo:
+		return invtype::InvTypeViewMODLimboSize;
+	case invtype::InvTypeAltStorage:
+		return invtype::InvTypeAltStorageSize;
+	case invtype::InvTypeArchived:
+		return invtype::InvTypeArchivedSize;
+	case invtype::InvTypeMail:
+		return invtype::InvTypeMailSize;
+	case invtype::InvTypeGuildTrophyTribute:
+		return invtype::InvTypeGuildTrophyTributeSize;
+	case invtype::InvTypeOther:
+		return invtype::InvTypeOtherSize;
+	default:
+		return 0;
+	}
+}
+
+const char* RoF::invtype::GetInvTypeName(int inv_type)
+{
+	switch (inv_type) {
+	case invtype::InvTypeInvalid:
+		return "Invalid Type";
+	case invtype::InvTypePossessions:
+		return "Possessions";
+	case invtype::InvTypeBank:
+		return "Bank";
+	case invtype::InvTypeSharedBank:
+		return "Shared Bank";
+	case invtype::InvTypeTrade:
+		return "Trade";
+	case invtype::InvTypeWorld:
+		return "World";
+	case invtype::InvTypeLimbo:
+		return "Limbo";
+	case invtype::InvTypeTribute:
+		return "Tribute";
+	case invtype::InvTypeTrophyTribute:
+		return "Trophy Tribute";
+	case invtype::InvTypeGuildTribute:
+		return "Guild Tribute";
+	case invtype::InvTypeMerchant:
+		return "Merchant";
+	case invtype::InvTypeDeleted:
+		return "Deleted";
+	case invtype::InvTypeCorpse:
+		return "Corpse";
+	case invtype::InvTypeBazaar:
+		return "Bazaar";
+	case invtype::InvTypeInspect:
+		return "Inspect";
+	case invtype::InvTypeRealEstate:
+		return "Real Estate";
+	case invtype::InvTypeViewMODPC:
+		return "View MOD PC";
+	case invtype::InvTypeViewMODBank:
+		return "View MOD Bank";
+	case invtype::InvTypeViewMODSharedBank:
+		return "View MOD Shared Bank";
+	case invtype::InvTypeViewMODLimbo:
+		return "View MOD Limbo";
+	case invtype::InvTypeAltStorage:
+		return "Alt Storage";
+	case invtype::InvTypeArchived:
+		return "Archived";
+	case invtype::InvTypeMail:
+		return "Mail";
+	case invtype::InvTypeGuildTrophyTribute:
+		return "Guild Trophy Tribute";
+	case invtype::InvTypeOther:
+		return "Other";
+	default:
+		return "Unknown Type";
+	}
+}
+
+bool RoF::invtype::IsInvTypePersistent(int inv_type)
+{
+	switch (inv_type) {
+	case invtype::InvTypePossessions:
+	case invtype::InvTypeBank:
+	case invtype::InvTypeSharedBank:
+	case invtype::InvTypeTrade:
+	case invtype::InvTypeWorld:
+	case invtype::InvTypeLimbo:
+	case invtype::InvTypeTribute:
+	case invtype::InvTypeTrophyTribute:
+	case invtype::InvTypeGuildTribute:
+		return true;
+	default:
+		return false;
+	}
+}
+
+const char* RoF::invslot::GetInvPossessionsSlotName(int inv_slot)
+{
+	switch (inv_slot) {
+	case invslot::InvSlotInvalid:
+		return "Invalid Slot";
+	case invslot::PossessionsCharm:
+		return "Charm";
+	case invslot::PossessionsEar1:
+		return "Ear 1";
+	case invslot::PossessionsHead:
+		return "Head";
+	case invslot::PossessionsFace:
+		return "Face";
+	case invslot::PossessionsEar2:
+		return "Ear 2";
+	case invslot::PossessionsNeck:
+		return "Neck";
+	case invslot::PossessionsShoulders:
+		return "Shoulders";
+	case invslot::PossessionsArms:
+		return "Arms";
+	case invslot::PossessionsBack:
+		return "Back";
+	case invslot::PossessionsWrist1:
+		return "Wrist 1";
+	case invslot::PossessionsWrist2:
+		return "Wrist 2";
+	case invslot::PossessionsRange:
+		return "Range";
+	case invslot::PossessionsHands:
+		return "Hands";
+	case invslot::PossessionsPrimary:
+		return "Primary";
+	case invslot::PossessionsSecondary:
+		return "Secondary";
+	case invslot::PossessionsFinger1:
+		return "Finger 1";
+	case invslot::PossessionsFinger2:
+		return "Finger 2";
+	case invslot::PossessionsChest:
+		return "Chest";
+	case invslot::PossessionsLegs:
+		return "Legs";
+	case invslot::PossessionsFeet:
+		return "Feet";
+	case invslot::PossessionsWaist:
+		return "Waist";
+	case invslot::PossessionsPowerSource:
+		return "Power Source";
+	case invslot::PossessionsAmmo:
+		return "Ammo";
+	case invslot::PossessionsGeneral1:
+		return "General 1";
+	case invslot::PossessionsGeneral2:
+		return "General 2";
+	case invslot::PossessionsGeneral3:
+		return "General 3";
+	case invslot::PossessionsGeneral4:
+		return "General 4";
+	case invslot::PossessionsGeneral5:
+		return "General 5";
+	case invslot::PossessionsGeneral6:
+		return "General 6";
+	case invslot::PossessionsGeneral7:
+		return "General 7";
+	case invslot::PossessionsGeneral8:
+		return "General 8";
+	case invslot::PossessionsGeneral9:
+		return "General 9";
+	case invslot::PossessionsGeneral10:
+		return "General 10";
+	case invslot::PossessionsCursor:
+		return "Cursor";
+	default:
+		return "Unknown Slot";
+	}
+}
+
+const char* RoF::invslot::GetInvSlotName(int inv_type, int inv_slot)
+{
+	if (inv_type == invtype::InvTypePossessions)
+		return invslot::GetInvPossessionsSlotName(inv_slot);
+
+	size_t type_size = invtype::GetInvTypeSize(inv_type);
+
+	if (!type_size || inv_slot == invslot::InvSlotInvalid)
+		return "Invalid Slot";
+
+	if ((size_t)(inv_slot + 1) >= type_size)
+		return "Unknown Slot";
+
+	static std::string ret_str;
+	ret_str = StringFormat("Slot %i", (inv_slot + 1));
+
+	return ret_str.c_str();
+}
+
+const char* RoF::invbag::GetInvBagIndexName(int bag_index)
+{
+	if (bag_index == invbag::InvBagInvalid)
+		return "Invalid Bag";
+
+	if ((size_t)bag_index >= invbag::ItemBagSize)
+		return "Unknown Bag";
+
+	static std::string ret_str;
+	ret_str = StringFormat("Bag %i", (bag_index + 1));
+
+	return ret_str.c_str();
+}
+
+const char* RoF::invaug::GetInvAugIndexName(int aug_index)
+{
+	if (aug_index == invaug::InvAugInvalid)
+		return "Invalid Augment";
+
+	if ((size_t)aug_index >= invaug::ItemAugSize)
+		return "Unknown Augment";
+
+	static std::string ret_str;
+	ret_str = StringFormat("Augment %i", (aug_index + 1));
+
+	return ret_str.c_str();
+}
@@ -0,0 +1,293 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef COMMON_ROF_LIMITS_H
+#define COMMON_ROF_LIMITS_H
+
+#include "../types.h"
+#include "../emu_versions.h"
+#include "../skills.h"
+
+
+namespace RoF
+{
+	enum : int { Invalid = -1, Null, Safety };
+
+	enum : bool { False = false, True = true };
+
+	// pre-declarations
+	namespace inventory {
+		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+	} /*inventory*/
+
+	namespace invtype {
+		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+		enum : int { InvTypeInvalid = -1, InvTypeBegin };
+
+		enum InventoryType : int {
+			InvTypePossessions = InvTypeBegin,
+			InvTypeBank,
+			InvTypeSharedBank,
+			InvTypeTrade,
+			InvTypeWorld,
+			InvTypeLimbo,
+			InvTypeTribute,
+			InvTypeTrophyTribute,
+			InvTypeGuildTribute,
+			InvTypeMerchant,
+			InvTypeDeleted,
+			InvTypeCorpse,
+			InvTypeBazaar,
+			InvTypeInspect,
+			InvTypeRealEstate,
+			InvTypeViewMODPC,
+			InvTypeViewMODBank,
+			InvTypeViewMODSharedBank,
+			InvTypeViewMODLimbo,
+			InvTypeAltStorage,
+			InvTypeArchived,
+			InvTypeMail,
+			InvTypeGuildTrophyTribute,
+			InvTypeOther,
+			InvTypeCount
+		};
+
+	} /*invtype*/
+
+	namespace invslot {
+		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+		enum : int { InvSlotInvalid = -1, InvSlotBegin };
+
+		enum PossessionsSlot : int {
+			PossessionsCharm = InvSlotBegin,
+			PossessionsEar1,
+			PossessionsHead,
+			PossessionsFace,
+			PossessionsEar2,
+			PossessionsNeck,
+			PossessionsShoulders,
+			PossessionsArms,
+			PossessionsBack,
+			PossessionsWrist1,
+			PossessionsWrist2,
+			PossessionsRange,
+			PossessionsHands,
+			PossessionsPrimary,
+			PossessionsSecondary,
+			PossessionsFinger1,
+			PossessionsFinger2,
+			PossessionsChest,
+			PossessionsLegs,
+			PossessionsFeet,
+			PossessionsWaist,
+			PossessionsPowerSource,
+			PossessionsAmmo,
+			PossessionsGeneral1,
+			PossessionsGeneral2,
+			PossessionsGeneral3,
+			PossessionsGeneral4,
+			PossessionsGeneral5,
+			PossessionsGeneral6,
+			PossessionsGeneral7,
+			PossessionsGeneral8,
+			PossessionsGeneral9,
+			PossessionsGeneral10,
+			PossessionsCursor,
+			PossessionsCount
+		};
+
+		const int EquipmentBegin = PossessionsCharm;
+		const int EquipmentEnd = PossessionsAmmo;
+		const int EquipmentCount = (EquipmentEnd - EquipmentBegin + 1);
+
+		const int GeneralBegin = PossessionsGeneral1;
+		const int GeneralEnd = PossessionsGeneral10;
+		const int GeneralCount = (GeneralEnd - GeneralBegin + 1);
+
+	} /*invslot*/
+
+	namespace invbag {
+		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+		enum : int { InvBagInvalid = -1, InvBagBegin };
+
+	} /*invbag*/
+
+	namespace invaug {
+		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+		enum : int { InvAugInvalid = -1, InvAugBegin };
+
+	} /*invaug*/
+
+	namespace item {
+		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+		enum ItemPacketType : int {
+			ItemPacketMerchant = 100,
+			ItemPacketTradeView = 101,
+			ItemPacketLoot = 102,
+			ItemPacketTrade = 103,
+			ItemPacketCharInventory = 105,
+			ItemPacketLimbo = 106,
+			ItemPacketWorldContainer = 107,
+			ItemPacketTributeItem = 108,
+			ItemPacketGuildTribute = 109,
+			ItemPacket10 = 110,
+			ItemPacket11 = 111,
+			ItemPacket12 = 112,
+			ItemPacketRecovery = 113,
+			ItemPacket14 = 115
+		};
+
+	} /*item*/
+
+	namespace profile {
+		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+	} /*profile*/
+
+	namespace constants {
+		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+	} /*constants*/
+
+	namespace behavior {
+		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+	} /*behavior*/
+
+	namespace skills {
+		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF; }
+
+	} /*skills*/
+
+
+	// declarations
+	namespace inventory {
+		const bool ConcatenateInvTypeLimbo = false;
+
+		const bool AllowOverLevelEquipment = true;
+
+		const bool AllowEmptyBagInBag = true;
+		const bool AllowClickCastFromBag = true;
+
+	} /*inventory*/
+
+	namespace invtype {
+		const size_t InvTypePossessionsSize = invslot::PossessionsCount;
+		const size_t InvTypeBankSize = 24;
+		const size_t InvTypeSharedBankSize = 2;
+		const size_t InvTypeTradeSize = 8;
+		const size_t InvTypeWorldSize = 10;
+		const size_t InvTypeLimboSize = 36;
+		const size_t InvTypeTributeSize = 5;
+		const size_t InvTypeTrophyTributeSize = 0;//unknown
+		const size_t InvTypeGuildTributeSize = 2;//unverified
+		const size_t InvTypeMerchantSize = 200;
+		const size_t InvTypeDeletedSize = 0;//unknown - "Recovery Tab"
+		const size_t InvTypeCorpseSize = InvTypePossessionsSize;
+		const size_t InvTypeBazaarSize = 200;
+		const size_t InvTypeInspectSize = invslot::EquipmentCount;
+		const size_t InvTypeRealEstateSize = 0;//unknown
+		const size_t InvTypeViewMODPCSize = InvTypePossessionsSize;
+		const size_t InvTypeViewMODBankSize = InvTypeBankSize;
+		const size_t InvTypeViewMODSharedBankSize = InvTypeSharedBankSize;
+		const size_t InvTypeViewMODLimboSize = InvTypeLimboSize;
+		const size_t InvTypeAltStorageSize = 0;//unknown - "Shroud Bank"
+		const size_t InvTypeArchivedSize = 0;//unknown
+		const size_t InvTypeMailSize = 0;//unknown
+		const size_t InvTypeGuildTrophyTributeSize = 0;//unknown
+		const size_t InvTypeOtherSize = 0;//unknown
+
+		extern size_t GetInvTypeSize(int inv_type);
+		extern const char* GetInvTypeName(int inv_type);
+
+		extern bool IsInvTypePersistent(int inv_type);
+
+	} /*invtype*/
+
+	namespace invslot {
+		extern const char* GetInvPossessionsSlotName(int inv_slot);
+		extern const char* GetInvSlotName(int inv_type, int inv_slot);
+
+	} /*invslot*/
+
+	namespace invbag {
+		const size_t ItemBagSize = 255; // server Size will be 255..unsure what actual client is (test)
+
+		extern const char* GetInvBagIndexName(int bag_index);
+
+	} /*invbag*/
+
+	namespace invaug {
+		const size_t ItemAugSize = 6;
+
+		extern const char* GetInvAugIndexName(int aug_index);
+
+	} /*invaug*/
+
+	namespace item {
+
+	} /*item*/
+
+	namespace profile {
+		const size_t TributeSize = invtype::InvTypeTributeSize;
+		const size_t GuildTributeSize = invtype::InvTypeGuildTributeSize;
+
+		const size_t BandoliersSize = 20;		// number of bandolier instances
+		const size_t BandolierItemCount = 4;	// number of equipment slots in bandolier instance
+
+		const size_t PotionBeltSize = 5;
+
+		const size_t SkillArraySize = 100;
+
+	} /*profile*/
+
+	namespace constants {
+		const size_t CharacterCreationLimit = 12;
+
+		const size_t SayLinkBodySize = 55;
+
+		const int LongBuffs = 42;
+		const int ShortBuffs = 20;
+		const int DiscBuffs = 1;
+		const int TotalBuffs = LongBuffs + ShortBuffs + DiscBuffs;
+		const int NPCBuffs = 97;
+		const int PetBuffs = NPCBuffs;
+		const int MercBuffs = LongBuffs;
+
+	} /*constants*/
+
+	namespace behavior {
+		const bool CoinHasWeight = false;
+
+	} /*behavior*/
+
+	namespace skills {
+		const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack;
+
+	} /*skills*/
+
+}; /*RoF*/
+
+#endif /*COMMON_ROF_LIMITS_H*/
@@ -1,3 +1,23 @@
+/*	EQEMu: Everquest Server Emulator
+	
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
 // out-going packets that require an ENCODE translation:
 E(OP_Action)
 E(OP_AdventureMerchantSell)
@@ -50,7 +70,6 @@ E(OP_HPUpdate)
 E(OP_Illusion)
 E(OP_InspectBuffs)
 E(OP_InspectRequest)
-E(OP_InterruptCast)
 E(OP_ItemLinkResponse)
 E(OP_ItemPacket)
 E(OP_ItemVerifyReply)
--- a/Show More
+++ b/Show More