Merge branch 'master' into lets_move

Update recast
2026-05-22 20:33:01 +00:00 · 2016-01-25 14:34:16 -08:00 · 2016-01-25 14:33:40 -08:00 · 2016-01-22 19:17:38 -08:00 · 2016-01-22 19:16:14 -08:00 · 2016-01-18 20:15:36 -08:00
417 changed files with 51872 additions and 43970 deletions
@@ -13,10 +13,6 @@ 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,7 +30,6 @@
 #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
@@ -276,11 +275,6 @@ 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})
@@ -337,8 +331,14 @@ 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,59 +1,53 @@
-# 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)   |
+EQEmu
+===

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

-**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
+Overview
+---

-## 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)
+EQEmu is a custom server implementation for EverQuest

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

-> 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
+For Windows: http://eqemu.github.io

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

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

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

-|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">|
+Further instructions on building the source can be found on the
+[wiki](http://wiki.eqemulator.org/i?M=Wiki).

-## 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
+Bug reports
+---
+
+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.

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

-* The preferred way to contribute is to fork the repo and submit a pull request on
+Contributions
+---
+
+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 Discord. You can also post unified diffs (`git diff` should do the trick) on the
+try IRC. 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 <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
+Contact
 ---
+ - **User IRC Channel**: `#eqemu` on `irc.eqemulator.net`
+ - **Developer IRC Channel**: `#eqemucoders` on `irc.eqemulator.net`
+
 - [EQEmulator Forums](http://www.eqemulator.org/forums)
 - [EQEmulator Wiki](http://wiki.eqemulator.org/i?M=Wiki)
+
@@ -1,256 +1,5 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
-== 09/12/2016 ==
-Akkadius: Massive overhaul of the update system and EQEmu Server management utility framework 
-	(known as eqemu_update.pl) now known as eqemu_server.pl
-	- eqemu_server.pl is now a general EQEmu Server management utiltiy framework that can be used
-		to extend to many purposes. It's main purpose is to simplify server management
-	- eqemu_server.pl changes:
-		- Menu has been completely changed, instead of a number based (enter number and hit enter)
-		you now type commands within the menu (Ex: 'database')
-		- Handles last mile installation for Windows Servers (See Github Readme)
-		- Handles last mile installation for Linux Servers (See Github Readme)
-			- Ubuntu
-			- Debian
-			- Fedora
-			- CentOS
-		- Now checks for Internet connection before performing web requests
-		- Database:
-			- Regular schema updates now happen automatically, if new binaries present updated
-				database schema changes, script will backup first, auto update database, and continue
-				world bootup
-			- Regular bots database schema changes now happen automatically similarily to the above
-			- Database checks can also be ran manually via the script menu
-		- CLI Arguments
-			- Arguments passed to eqemu_server.pl can execute the same name-based operations that 
-				are present in the interactive menu
-					- Example: "perl eqemu_server.pl opcodes" will download opcodes
-					- Example: "perl eqemu_server.pl backup_player_tables" will backup and export player tables
-		- Bots
-			- Bots can now be automatically setup in Linux or Windows via the 'setup_bots' command
-				- Windows will auto download binaries and install, along with installing bots db schema
-				- Linxu will auto compile binaries and install, along with installings bots db schema
-		- Utility scripts
-			- Linux now has the following utility scripts for download, available via menu 'utility_scripts'
-				and via Linux default install:
-					- server_launcher.pl
-					- server_start_dev.sh
-					- server_start.sh
-					- server_status.sh
-					- server_stop.sh 
-		- Usage analytics
-			- eqemu_server.pl now collects usage analytics, this is very helpful for our developers
-				- Example: We can see how many installs have been performed:
-					https://github.com/EQEmu/Server#server-installs
-				- This helps us see how often certain utilities are used as well
-		- Console Messages
-			- All script messages have been prefixed with a bracket action Ex: [Update] [Database] [Info]
-				to be more consistent with our log conventions
-		- 'New Server' Utility
-			- Running 'new_server' from the main menu or 'perl eqemu_server.pl new_server' while in
-				a completely new folder with just the script present, will allow a server operator
-				to initiate a full clean PEQ install in that folder. Pulling down all assets and 
-				installing a PEQ database with the name the server operator gives the prompts in the 
-				script
-	
-== 09/10/2016 ==
-noudess: Task system experience based on a % of a level did not take into
-account the hell levels rule.  Now it does.
-
-== 09/04/2016 (Changes over past few months) ==
-Akkadius: Fixed an issue where clients would crash with health marquee's
-Akkadius: Fixed issues with NPC's "ghosting" when they path
-Akkadius: Overhauled worldserver logging
-Akkadius: Pets now don't actually spawn until the player has fully entered the zone (Live-like)
-demonstar/KLS: Adjusted some background workings on how spell buff tics are synced with the client
-Uleat: Optimizations to map loading and zone times
-Uleat/Akkadius: Fixed bandolier exploit where you could equip a 2H and Shield
-mackal: Re-worked spell re-use timer logic
-mackal: Source optimizations all over, crash fixes
-mackal: Fixed some issues with illusions on zoning
-mackal: Fixed some client DOT stacking bugs
-mackal: Invis will now break on AA spell casts and item cast
-mackal: Changed how Loot response code works
-mackal: Implemented 3 additional spell gems with (Mnemonic Retention)
-mackal: Instant spells now have instrument mods
-mackal: Rate limit character saves
-mackal: Made it so items no longer do TGB (Live-like) Rule implemented to disable
-mackal: Set pet buffs limit to 30
-
-== 09/03/2016 ==
-Uleat: Changed 'Bind Wound' behavior to match the best references that I could find for post-2004 era.
-	Note: If you wish to retain the old method, source in the optional '2016_09_03_old_bind_wound_rule.sql' script file.
-
-== 08/27/2016 ==
-Kinglykrab: Added optional IP-based account exemptions.
-	- To use this system simply set World:EnableIPExemptions to true and create an entry in the ip_exemptions table.
-	- Example: exemption_ip of IP 192.168.1.4 in ip_exemptions with exemption_amount of 1 will allow only 1 account to login from IP 192.168.1.4.
-	- Note: If there is no exemption, the amount of accounts logged in from a singular IP will default to World:MaxClientsPerIP
-
-== 08/23/2016 ==
-noudess: Force mobs on a depop @ end pathgrid to still do this on idle zones.
-This makes them be more random after a zone is idle, rather than always showing
-up at start point when 1st person logs into an idle zone.  Much more like live.
-I dion't think this will be much of a performance problem.  Once they path and
-depop, no mkore cpu usage.
-
-== 08/14/2016 ==
-mackal: Implement Linked Spell Reuse Timers
-	- For whatever reason this is a bit unfriendly, but that's how it is on live.
-	- Titanium is especially unfriendly with large differences in reuse times (ex higher canni and the first 4)
-	- Unsure when this went live for spells, but canni was at least linked at OoW launch
-
-== 08/13/2016 ==
-Kinglykrab: Implemented optional avoidance cap rules.
-	- Serves to eliminate God-like characters on custom servers with high item stats
-	- Rule Names:
-		- Character:EnableAvoidanceCap (default is false)
-		- Character:AvoidanceCap (default is 750, beyond 1,000 seems to make characters dodge all attacks)
-	
-== 08/02/2016 ==
-Uleat: Changed 'SendZoneSpawnsBulk' behavior to use near/far criteria (live-like) when sending packets.
-	- Zone-to-Zone client loading will see a small decrease in time (less than 10~15%)
-	- World-to-Zone client loading appears to greatly benefit from this (tested 'devastation' - pre-change: ~22 seconds, post-change: 12~15 seconds)
-	- This change does not affect the final spawning of mobs in the client
-
-== 07/31/2016 ==
-mackal: Implement more spell gems!
-	- There are a few things still left to due like make dealing with losing gems nice (reset AAs, going to an older client etc)
-	- Sadly SoF disc release doesn't support gem 10 like one might expect :(
-	- So changed clients:
-		- SoD = 10
-		- UF = 12
-		- RoF/RoF2 = 12. I know the UI supports 16, but the client does not and can cause client crashes
-	- The quest APIs assume you pass a valid spell gem ...
-
-== 07/28/2016 ==
-Uleat: Implemented zone memory-mapped file usage
-	- Zone map files are converted to pre-loaded binary files, bypassing the (sometimes) time-consuming raw data transform process
-	- There are three ways to convert files:
-			-- Do nothing! The zone bootup process will check for a mmf file and load it, if found, or create it after the 'normal' transform process is complete
-			-- Use the command line option: zone convert_map <zone_name>.map (for singular conversions)
-			-- Drop the 'convert_maps_to_mmfs.pl' into your server directory and execute it for a batch conversion
-			-- Note: Any zone maps not pre-converted will be processed once a zone is booted up that does not have one
-	- To enable this feature, you must have the 'USE_MAP_MMFS' option checked in cmake and have built binaries on that
-	- To disable this feature, or if you encouter problems, disable the 'USE_MAP_MMFS' option and rebuild your binaries
-	- This feature will test the validity of your zlib library. If you get errors/crashes upon conversion, then your zlib1.dll is most likely suspect (check our forum for solutions)
-
-== 07/25/2016 ==
-mackal: Fix up the SpellBuff struct
-	- THERE MAYBE BUGS
-	- there shouldn't though, most of the hackery was from badly named fields causing confusion
-
-== 07/09/2016 ==
-Uleat: Important fix for mob pathing
-	- This should fix failed pathing issues (and high cpu usage for zone.exe) for mobs in affect zones
-	- Changed variable 'gridno' type from int16 to int32 to reflect actual return value of fetch (values do exceed 32767 aka int16.max)
-	- Precision loss from int32 to int16 conversion was causing grid id to be changed to quest controlled movement in cases where (gridno & 0x8000 == true) 
-
-== 06/28/2016 ==
-Noudess: Resurrection effects now block certain buffs like on live.
-Noudess: Added message about why spells are blocked (rule based)
-Noudess: Added new rule:  Client:UseLiveBlockedMessage
-Uleat: Fix for bot inventory save failure involving items with unlimited charges
-
-== 06/13/2016 ==
-Noudess: Changes personal faction earned min/max to -2000/2000 from -3000/1200
-
-== 06/06/2016 ==
-Uleat: Reworked EQEmuDictionary to use class LookupEntry
-
-== 06/01/2016 ==
-Uleat: Implemented EQEmu::TintProfile
-Uleat: Implemented EQEmu::TextureProfile
-
-== 05/31/2016 ==
-Uleat: Converted enumeration MaterialSlots to EQEmu::textures::TextureSlot
-
-== 05/28/2016 ==
-Uleat: Merged client_version and inventory_version into emu_versions files
-
-== 05/27/2016 ==
-Uleat: Renamed EQEmu::Item_Struct to EQEmu::ItemBase (and appropriate files) to coincide with new inventory naming conventions
-
-== 05/25/2016 ==
-Uleat: Renamed and moved enumeration SkillUseTypes to EQEmu::skill::SkillType - added class EQEmu::SkillProfile, though not implemented at this time
-Uleat: Some more work on eq_dictionary
-
-== 05/21/2016 ==
-Uleat: Moved struct Item_Struct into namespace EQEmu along with associated enumerations - enumerations into namespace EQEmu::item (run shared_memory)
-Uleat: Fixed a few possible crash points in linux builds associated with augments/ornamentations
-
-== 05/18/2016 ==
-Uleat: Changed client 'constants' files to 'limits'
-
-== 05/10/2016 ==
-Uleat: Converted client translators' 'SerializeItem()' to recursive, single buffer methodology. Titanium SerializeItem() now adds a null term between parent items instead of the invoking function
-Uleat: Converted server 'BulkSendInventoryItems()' to use single buffer methodology
-Uleat: Added 'ItemInst::Serialize()' overload to make use of the above single buffer methodology
-
-== 05/08/2016 ==
-Uleat: Re-coded Titanium client translator 'SerializeItem()' to use coded property assignments over file enumerated ones
-
-== 04/22/2016 ==
-Uleat: Reworked ClientVersion into namespace EQEmu; Added InventoryVersion
-Uleat: Delinked current inventory slot enumeration and constants from EQEmu::constants and global definition (inv2 pre-work)
-
-== 04/19/2016 ==
-Uleat: Changed the recent EQEmu rework to eliminate the nested class design (possible cause of VS2015 update crashes - unverified)
-Uleat: Some more inv2 convergence work
-
-== 04/15/2016 ==
-Uleat: Reworked EQDictionary into namespace EQEmu
-
-== 04/08/2016 ==
-Uleat: Added Heal Rotation HOTs (Heal Override Targets) that can be set for proactive healing (default HR behavior is reactive)
-Uleat: Added the ability to save/load/delete Heal Rotations based on targeted member - load is automatic when ^hrcreate is used on a bot that has a saved HR entry
-
-== 04/07/2016 ==
-Uleat: Rework of eq_dictionary to facilitate inventory work
-
-== 04/05/2016 ==
-Uleat: Moved database query code out of bot.cpp and into the new BotDatabase class
-
-== 03/25/2016 ==
-Uleat: Fix for heal rotation 'Stack Overflow' error
-Kayen: Defensive procs will now only proc once per attack round (instead of every attack chance). 
-       Live like modifier added that decreases defensive proc chance if you are higher level then your attacker.
-
-== 03/24/2016 ==
-Kayen: Fix for AE taunt to use correct range and hate modifier.
-       Fix for spell effect version of taunt to use correct range.
-Uleat: Activation of new 'Bots' command system
-	- You will need to re-run cmake to capture the file additions and then re-compile your server binaries
-	- You will also need to manually run eqemu_update.pl and select the bots update option - you should have 2 pending updates: 9001 & 9002
-	- The new command system is accessed with the '^' character - start with '^help' and see where that takes you
-	- More information can be found on the eqemu forums
-
-== 03/05/2016 ==
-mackal: Implement extra bind points (secondary recall)
-	For SE_Gate, base2 is which bind to use (starting at 1)
-	For SE_BindAffinity, base1 is which bind to set (starting at 1)
-	For SE_GateCastersBindpoint, base1 is which bind to use (starting at 1)
-		There was actually no spells that don't send to the main bind, but it uses a base1 of 1 which matches with SE_Gate
-		This also doesn't break anything
-
-== 03/01/2016 ==
-Uleat: Fix for LDoN treasure 'npcs' not leaving a corpse (please report any issues..)
-
-== 02/29/2016 ==
-Uleat: Change in AddItemBonuses - now includes ammo slot for skill mods only. Defined SoD- client SkillModMax packet property (client does not show..but, does enforce.)
-
-== 02/11/2016 ==
-Hateborne: Added IgnoreSpellDmgLvlRestriction rule (boolean) to ignore the 5 level spread when checking to add SpellDmg
-
-== 02/10/2016 ==
-Hateborne: Added FlatItemExtraSpellAmt rule (boolean) to allow SpellDmg on items to be added as raw damage versus scaled.
-
-== 01/26/2016 ==
-Uleat: Fix for Berserker 'Piercing' skill issues. Server Admins: If you run custom skill sets, this patch touches the code segments that you will need to modify if you have changed the default berserker 1H-/2H-piercing skill values.
-Uleat (Daerath): Fix for precision-loss item weight conversions in older clients.
-	- WARNING: YOU MUST RE-RUN SHARED_MEMORY.EXE BEFORE STARTING SERVER OR ITEM LOSS WILL OCCUR!
-	- Note: Cmake must be re-run to include/exclude the required files
-
 == 01/13/2016 ==
 Kinglykrab: Modified #flag so you can refresh your target's account status (GM status level) without them having to relog.
 	- Just target the person whose flag you want to refresh and type #flag.
@@ -489,10 +238,10 @@ mackal: Reworked the activated avoidace skills (riposte, dodge, etc) based on de
 	Also riposte immunity from the increase riposte chance spell effect.

 == 7/2/2015 ==
-KLS/mackal: AA system has been rewritten fixing a ton of bugs and extending functionality while making it easier to create new AA points.
-KLS/mackal: New tables are needed and so older data will need to be migrated to the new system.
-KLS/mackal: The SQL saves the old aa points spent/avail/character_alt_abilities data if any server ops want to do something different than PEQ did with it.
-KLS/mackal: Will try to get a wiki entry written up next week some time explaining the system but it's really not hard to follow the db tables in the meantime.
+KLS/Demonstar55: AA system has been rewritten fixing a ton of bugs and extending functionality while making it easier to create new AA points.
+KLS/Demonstar55: New tables are needed and so older data will need to be migrated to the new system.
+KLS/Demonstar55: The SQL saves the old aa points spent/avail/character_alt_abilities data if any server ops want to do something different than PEQ did with it.
+KLS/Demonstar55: Will try to get a wiki entry written up next week some time explaining the system but it's really not hard to follow the db tables in the meantime.

 == 7/1/2015 ==
 Akkadius: Fix an issue where emote messages would overflow the buffer of 256 by increasing the size and changing some of the initialization
@@ -522,7 +271,7 @@ Akkadius: Added DB ver 9082 with update to add npc_types texture columns if tabl
 Uleat: Added null-term declaration for character names in ENCODE(OP_CharInfo) - where appropriate

 == 05/20/2015 ==
-mackal: Bard instrument mods should be more consistent with live. Zoning will keep instrument mod for long duration buffs (selo's)
+demonstar55: Bard instrument mods should be more consistent with live. Zoning will keep instrument mod for long duration buffs (selo's)
 	Still need to have procs/doom effects to inherit the instrument mods from their source buff/whatever

 == 05/18/2015 ==
@@ -532,7 +281,7 @@ KLS: Changed how fishing locates water to hopefully be a bit more accurate at th
 Uleat: Added check to EntityList::CheckSpawnQueue() to bypass dereference if returned iterator is npc_list.end() - should fix the debug assertion failure crash

 == 04/30/2015 ==
-mackal: Implement mob and client melee push
+demonstar55: Implement mob and client melee push
       You can set Combat:MeleePush to false to turn off or change Combat:MeleePushChance to increase the chance an NPC can be pushed
       PCs are always pushed, need to do more testing to verify.

@@ -586,7 +335,7 @@ Uleat: Fix for RoF+ clients showing active 'Return Home' button when action is n
 Noudess: Starting erudites that were supposed to start in paineel were landing in erudin on Titanium. Fixed to be paineel.

 == 02/20/2015 ==
-mackal: Implement claims for RoF/RoF2 (should no longer crash the client!)
+demonstar55: Implement claims for RoF/RoF2 (should no longer crash the client!)
 	- fixed bugs related to claims for the rest of the clients (woo infinite loops)

 == 02/18/2015 ==
@@ -605,7 +354,7 @@ Notes:

 == 02/16/2015 ==
 Trevius: (RoF2) Bazaar Trading (Buying/Selling) is now fully functional.  Bazaar (/bazaar) search is not yet functional.
-mackal: (RoF2) Send the bard focus effects, note custom servers will need to fix their items, server side we still use the old system, but RoF2 wasn't showing anything with not sending focus, so send them
+demonstar55: (RoF2) Send the bard focus effects, note custom servers will need to fix their items, server side we still use the old system, but RoF2 wasn't showing anything with not sending focus, so send them

 == 02/14/2015 ==
 Trevius: (RoF2) Bazaar is now partially functional.  RoF2 clients can start/end trader mode and other clients can purchase from them.  No other functionality yet.
@@ -655,7 +404,7 @@ Akkadius: Implement Packet logs with dumps
 	See: http://wiki.eqemulator.org/p?Logging_System_Overhaul#packet-logging-levels

 == 02/01/2015 ==
-mackal: Add quest debugging to lua
+demonstar55: Add quest debugging to lua
 	eq.debug("Test debug level implicit 1")
 	eq.debug("Test debug level explicit 1", 1)
 	eq.debug("Test debug level explicit 2", 2)
@@ -848,7 +597,7 @@ Trevius: Finished lining up the RoF2 Player Profile Struct.  Zone times are now
 Trevius: Fixed zoning after death for RoF2.

 == 12/17/2014 ==
-mackal: Use vectors for route stuff, should be more CPU cache friendly so faster
+demonstar55: Use vectors for route stuff, should be more CPU cache friendly so faster
 Secrets: EQStream changes as recommended by a community member in private.

 == 12/15/2014 ==
@@ -858,7 +607,7 @@ Trevius: Player Corpses now saved attuned settings for Items.
 Required SQL: utils/sql/git/required/2014_12_15_multiple_table_updates.sql

 == 12/13/2014 ==
-mackal: Fix guild rank spam on zone (needed to be in OP_PP).
+demonstar55: Fix guild rank spam on zone (needed to be in OP_PP).
 Trevius: (RoF+) Implemented Armor Ornamentation using Hero's Forge Armor Models.  To use, create an ornamentation augment and set the herosforgemodel field in the items table.
 Trevius: (RoF+) Added command #heromodel (#hm for short) - Usage: #heromodel [hero forge model] [ [slot] ] (example: #heromodel 63)

@@ -866,11 +615,11 @@ Be sure to run this or there will be item loss:
 Required SQL: utils/sql/git/required/2014_12_13_inventory_table_update.sql

 == 12/12/2014 ==
-mackal: Add special attack 42, Ignore Root Aggro Rules. This allows you to root a mob and have them still use the normal aggro rules (so they will attack the one with most hate, not closest)
+demonstar55: Add special attack 42, Ignore Root Aggro Rules. This allows you to root a mob and have them still use the normal aggro rules (so they will attack the one with most hate, not closest)

 == 12/09/2014 ==
 Trevius: (RoF+) Implemented Hero's Forge Armor Models for Items.  To use, set herosforgemodel field in the item table to a model number such as 63 (for example).
-mackal: SoF+ swarm pets will no longer be F8able (without a hack!)
+demonstar55: SoF+ swarm pets will no longer be F8able (without a hack!)

 == 12/08/2014 ==
 Secrets: Added a feature that allows an EQ client to log in directly to World without having to enter the LoginServer, provided the 'password' field is set in WorldServer.
@@ -916,10 +665,10 @@ Trevius: Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly.
 Trevius: Mercenaries can now zone once again.

 == 11/17/2014 ==
-mackal: Correct OP_AugmentInfo reply. This fixes RoF display issue with Adventurer's Stone. Still issues with UF/SoF/SoD though.
+demonstar55: Correct OP_AugmentInfo reply. This fixes RoF display issue with Adventurer's Stone. Still issues with UF/SoF/SoD though.

 == 11/16/2014 ==
-mackal: fix size issue with ControlBoat_Struct and exploit fix in OP_BoardBoat
+demonstar55: fix size issue with ControlBoat_Struct and exploit fix in OP_BoardBoat

 Akkadius: Implemented Automatic Database update and versioning system
 Akkadius: Created database revision define, this is located in version.h in common #define CURRENT_BINARY_DATABASE_VERSION 9057
@@ -996,12 +745,12 @@ Optional SQL: utils/sql/git/optional/2014_11_15_SwarmPetTargetLock.sql

 == 11/14/2014 ==
 Secrets: Identified object size and solidtype as flags. Exported them as functions to Perl.
-mackal: Don't use the hack for charms that doesn't work on RoF
-mackal: UF too
-mackal: Tit
-mackal: SoF
-mackal: SoD
-mackal: 62 (untested)
+demonstar55: Don't use the hack for charms that doesn't work on RoF
+demonstar55: UF too
+demonstar55: Tit
+demonstar55: SoF
+demonstar55: SoD
+demonstar55: 62 (untested)

 == 11/13/2014 ==
 Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width).
@@ -1027,7 +776,7 @@ JJ: Implement new Live-like faction adjustment message using rule Client:UseLive
 Optional SQL: utils/sql/git/optional/2014_11_09_LiveFactionMessages.sql

 == 11/06/2014 ==
-mackal: Tracking default sort will now be correct order
+demonstar55: Tracking default sort will now be correct order
 Trevius: Fixed dynamic merchant list loading.  Allows any merchant to be used in any zone.

 == 11/03/2014 ==
@@ -1051,17 +800,17 @@ Uleat: Added Client::InterrogateInventory(). Can be invoked by #interrogateinv a
 Uleat: Fix for stacking items in a world object..added a new command option: #peekinv world - will show world container contents, if one is in use by target.

 == 10/20/2014 ==
-mackal: Inspect Buffs rank 1 will now show NPC buffs in target window (SoD+)
+demonstar55: Inspect Buffs rank 1 will now show NPC buffs in target window (SoD+)

 == 10/19/2014 ==
 Uleat: Updated command #peekinv to display item links properly in RoF clients
-mackal: Group Mentoring in raids
-mackal: Inspect Buffs (text only version) works in raid groups
-mackal: Make use of the Inspect Buffs op/packet. 62 SOL until someone finds its op
+demonstar55: Group Mentoring in raids
+demonstar55: Inspect Buffs (text only version) works in raid groups
+demonstar55: Make use of the Inspect Buffs op/packet. 62 SOL until someone finds its op

 == 10/18/2014==
-mackal: Implement group mentor, sharing leadership exp (SoF+ only)
-mackal: Add gaining of group leadership while in raids
+demonstar55: Implement group mentor, sharing leadership exp (SoF+ only)
+demonstar55: Add gaining of group leadership while in raids

 == 10/16/2014 ==
 Uleat: Fixed the auto-conversion view naming error and renamed the views in the script files. Added a fix sql for databases that auto-converted.
@@ -1074,7 +823,7 @@ Notes: I modifed the behavior of both load and drop bots to fail on the first op
 	   a few altered tables back to their original state - as of the date in the file.

 == 10/13/2014 ==
-mackal: Partially implement leadership and raids
+demonstar55: Partially implement leadership and raids
 	Currently working: client side only effects and stat bonuses.
 	Not working: Mark NPC, and other stuff that need extra server side support
 	Currently only UF tested (Tit and 62 may just work, others need packet work)
@@ -1083,7 +832,7 @@ mackal: Partially implement leadership and raids
 Akkadius: Fix for LDON Character Stat load

 == 10/11/2014 ==
-mackal: Implement Raid MOTD for UF
+demonstar55: Implement Raid MOTD for UF
 	Don't forget 2014_10_11_RaidMOTD.sql!

 == 10/09/2014 ==
@@ -1096,7 +845,7 @@ previously and/or manually changed code, or just have a need for it to re-run, c
 ** This will only work if you haven't deleted your `character_old` table **

 == 10/07/2014 ==
-mackal: Identified tutorial flag in all charcreate packets, reworked logic to correctly set homes binds
+demonstar55: Identified tutorial flag in all charcreate packets, reworked logic to correctly set homes binds

 == 10/05/2014 ==
 Uleat: Added Server<->Corpse slot translators needed for re-enumeration (inactive until phased in)
@@ -1114,13 +863,13 @@ Uleat: First round of Ti/6.2 translators added - needed for re-enumeration

 == 10/01/2014 ==
 Kayen: Exported to PERL $client->SendColoredText(color, msg)
-mackal: Exported SendColoredText to lua
+demonstar55: Exported SendColoredText to lua

 == 09/30/2014 ==
 Uleat: Implemented click-casting from bag slots for clients that natively support it (RoF)

 == 09/28/2014 ==
-mackal: Add support for post June 18, 2014 Hundred Hands Effect spells (they changed the formula and stuff)
+demonstar55: Add support for post June 18, 2014 Hundred Hands Effect spells (they changed the formula and stuff)
 set Spells:Jun182014HundredHandsRevamp to true if you're using a spell file from June 18, 2014+

 == 09/27/2014 ==
@@ -1129,15 +878,15 @@ Note: identifier is the stat field in spells_new, slot is used for certain effec
 Example $mob->GetSpellStat(121, "range"); //Returns spell range
 Example $mob->GetSpellStat(121, "effectid", 1); //Returns the the value of effectid1
 This will allow you to pull almost all the data for any spell in quest files.
-mackal: Move the client's SetAttackTimer to the end of Client::CalcBonuses to keep the haste in sync
-mackal: Correct haste/slow "stacking" rules
-mackal: Correct SE_AttackSpeed4 to respect unslowable
-mackal: Make the haste be between 1-225 like the client (<100 = slow, >100 = haste) to ...
-mackal: Correct Hundred Hands effect and use formula provided by devs
+demonstar55: Move the client's SetAttackTimer to the end of Client::CalcBonuses to keep the haste in sync
+demonstar55: Correct haste/slow "stacking" rules
+demonstar55: Correct SE_AttackSpeed4 to respect unslowable
+demonstar55: Make the haste be between 1-225 like the client (<100 = slow, >100 = haste) to ...
+demonstar55: Correct Hundred Hands effect and use formula provided by devs

 == 09/24/2014 ==
 Uleat: Re-ordered server opcodes and handlers to give them some predictability of location (I need this for the inventory re-enumeration.)
-mackal: Added helper function bool EQEmu::IsTradeskill(uint32 skill)
+demonstar55: Added helper function bool EQEmu::IsTradeskill(uint32 skill)

 == 09/23/2014 ==
 Kayen: Spell recourse effects will now be applied AFTER the base spells effects have been applied (consistent with live).
@@ -1246,46 +995,46 @@ Akkadius: Player Profile Blob to Database Conversion
 	ORDER  BY DATA DESC;

 == 09/20/2014 ==
-mackal: Fix crash in SendEnterWorld on illegally long names
-mackal: The client only lets you enter 15 characters for your name (UF at least)
-mackal: Add rule Spells:SHDProcIDOffByOne for pre-UF spell file, set to true, UF+ set to false
+demonstar55: Fix crash in SendEnterWorld on illegally long names
+demonstar55: The client only lets you enter 15 characters for your name (UF at least)
+demonstar55: Add rule Spells:SHDProcIDOffByOne for pre-UF spell file, set to true, UF+ set to false
 KLS: #suspend and #ban now have required messages to record the reason for the ban/suspension.

 == 09/19/2014 ==
-mackal: Added Client::Tell_StringID (used in tell queue messages)
-mackal: Tell queues (and offline) messages now show correctly
-mackal: Fix starting with capital check
+demonstar55: Added Client::Tell_StringID (used in tell queue messages)
+demonstar55: Tell queues (and offline) messages now show correctly
+demonstar55: Fix starting with capital check

 == 09/18/2014==
-mackal: Implement tell queues
+demonstar55: Implement tell queues
 	Currently set to a limit of 20 by default (World:TellQueueSize) I was unable to hit the limit on live though (100+)
 	The required SQL nukes the old tell queue table, which may or may not be in your DB
 	Optional SQL adds the rule to the DB to allow easy of change
 	Note: this does not play well with multiple sessions with the same name on (crash and relog and have multiple sessions) but normal tells don't play well either

 == 09/16/2014 ==
-mackal: Implement spell formula 137 (BER AA Desperation)
+demonstar55: Implement spell formula 137 (BER AA Desperation)
 Uleat (NateDog): Fix for LoadBuffs() crash when a spell with a non-persistent Illusion effect was loaded.
-mackal: Fix some effect calcs + implement more (derived from the client)
+demonstar55: Fix some effect calcs + implement more (derived from the client)

 == 09/15/2014 ==
 Kayen: Nimbus effects will now be reapplied after zoning and will be removed when associated buff fades.

 == 09/13/2014 ==
-mackal: Fix rogues not having Thieves' Cant
+demonstar55: Fix rogues not having Thieves' Cant

 == 09/09/2014 ==
-mackal: Incrase Mob kick/bash timer by 3
+demonstar55: Incrase Mob kick/bash timer by 3
 	see: http://www.eqemulator.org/forums/showthread.php?t=38734
-mackal: Fix slow effect on NPC special attack reuse timers
+demonstar55: Fix slow effect on NPC special attack reuse timers
 	see: http://www.eqemulator.org/forums/showthread.php?t=38734
-mackal: Slow fixes to bots!
-mackal: Revamped how NPC attack rate is set
+demonstar55: Slow fixes to bots!
+demonstar55: Revamped how NPC attack rate is set
 	SQL: 2014_09_09_attack_delay.sql
-mackal: Added attackdelay to #npcedit
+demonstar55: Added attackdelay to #npcedit

 == 09/08/2014 ==
-mackal: Fix slow calc
+demonstar55: Fix slow calc
 	see: http://www.eqemulator.org/forums/showthread.php?t=38734

 == 09/07/2014 ==
@@ -1296,18 +1045,18 @@ Uleat: Tweaked 'Smart' trading code to return main slots before sub slots in sta

 == 09/05/2014 ==
 Uleat: Fix for cursor item loss when zoning. (Thanks to the other devs who traced and fixed the 'macro' issue!)
-mackal: Fix size getting nuked with lua's SendIllusionPacket
+demonstar55: Fix size getting nuked with lua's SendIllusionPacket

 == 09/03/2014 ==
 Secrets: Identified the routines needed to augment items in RoF. Currently, only Insert and Remove are supported. Swap and Destroy do not work due to missing functions related to the cursor.
-mackal: Added work around command to show numhits on your buffs (#shownumhits)
+demonstar55: Added work around command to show numhits on your buffs (#shownumhits)
 Uleat: Fix for timer issue introduced by Zone::ShutDown() fix.

 == 09/02/2014 ==
 Secrets: Identified OP_GuildPromote for RoF clients.
 Secrets: Fixed promotion, demotion, transferring a leader and displaying of client ranks in the Rain of Fear client. The rain of fear client, as such, will only have 3 ranks like the other clients, but supports a theoretical 8 ranks later.
 Secrets/Akkadius: Fixed an issue involving character name lookup in the new DB code.
-mackal: crash fix checking DivineAura in hate_list.cpp
+demonstar55: crash fix checking DivineAura in hate_list.cpp
 Secrets: Reverted some code that got in the main branch that shouldn't have gotten there.
 Uleat: Changed #loc to report the same precision as /loc for Cartesians

@@ -1318,7 +1067,7 @@ KLS: Fixed a few quest related inconsistencies.
 KLS: Added Lua EntityList::ChannelMessage(from, type, msg, language)

 == 08/30/2014 ==
-mackal: (noudess) Merchants should be more descriptive of why they don't sell to you
+demonstar55: (noudess) Merchants should be more descriptive of why they don't sell to you

 == 08/26/2014 ==
 Uleat: Implemented 'Smart' Player Trade transfers. Trades are processed by containers, stackables and then all remaining. QueryServ logs have been updated to match these transactions.
@@ -1696,7 +1445,7 @@ Optional SQL: utils/sql/git/optional/2014_04_03_SpellProjectileRules.sql
 Note: The rules in this SQL are for setting the item id for the graphic used by the projectile on different clients.

 == 04/01/2014 ==
-mackal: Implemented ability for a merchant to open and close shop.
+demonstar55: Implemented ability for a merchant to open and close shop.
 	Lua quest functions: e.self:MerchantOpenShop() and e.self:MerchantCloseShop()
 	GM Commands: #merchant_open_shop (short: #open_shop) and #merchant_close_shop (short: #close_shop)
 		default to status 100, just in case you need to force the merchants status
@@ -1762,7 +1511,7 @@ Kayen: Revision to lull/harmony/pacification code to be consistent with live bas
 which if 'resisted' will cause the caster to gain aggro.

 == 03/05/2014 ==
-mackal: Corrected rogue's evade to be single target
+demonstar55: Corrected rogue's evade to be single target
 sorvani: fixed crash issue 119

 == 03/04/2014 ==
@@ -1777,7 +1526,7 @@ Kayen: Revision to root code to be consistent with live based on extensive perso
 Optional SQL: utils/sql/git/optional/2014_03_04_RootRule.sql

 == 03/03/2014 ==
-mackal: Implemented deadly strikes and gave rogues higher innate throwing crit chance
+demonstar55: Implemented deadly strikes and gave rogues higher innate throwing crit chance

 New rules: Combat:RogueCritThrowingChance, Combat:RogueDeadlyStrikeChance, Combat:RogueDeadlyStrikeMod
 	Defaults should give fairly close to live results
@@ -1789,7 +1538,7 @@ Kayen: Revision to charm code to be consistent with live based on extensive pers

 Optional SQL: utils/sql/git/optional/2014_03_02_CharmRules.sql

-mackal: Melee Crits, HoTs, DoTs messages should now be filtered correctly on all clients.
+demonstar55: Melee Crits, HoTs, DoTs messages should now be filtered correctly on all clients.
 	Clients that also support seeing others DoTs will now see them if they don't filter them
 	note: some newer clients have a 'mine only' option for HoTs but it functions the same as show

@@ -1841,7 +1590,7 @@ Sorvani: Renamed the instance_lockout and instance_lockout_player tables to inst
 Required SQL: utils/sql/git/2014_02_13_Rename_instance_lockout_tables.sql

 == 02/10/2014 ==
-mackal (Secrets): Re-wrote the entity list to be a std::map. This should be used for direct entityID lookups and is noticably faster performance-wise. Also should result in less nil pointers potentially.
+demonstar55 (Secrets): Re-wrote the entity list to be a std::map. This should be used for direct entityID lookups and is noticably faster performance-wise. Also should result in less nil pointers potentially.
 Secrets: Fixed a crash issue that could occur on #repop related to quest timers.
 Kayen: Divine Arbiration and other similar spell effects will now utilize a spell range check.
 Kayen: Revised how heal amount is calculated to properly incorporate all current focus effects/bonuses.
@@ -1872,14 +1621,14 @@ Kayen: Implemented SE_FfLimitUseType (focus limit to numhits type)

 == 01/20/2014 ==
 cavedude: Live-Like weather system (Thanks to robregen for figuring it out!)
-mackal: Implemented not_extendable spell flag
-mackal: Moved Spell Casting Reinforcement to DB
-mackal: Moved Mez Mastery to DB
+demonstar55: Implemented not_extendable spell flag
+demonstar55: Moved Spell Casting Reinforcement to DB
+demonstar55: Moved Mez Mastery to DB
 Kayen: Complete revision of the numhits systems to utilize 'numhits type' field in spell file.

 == 01/18/2014 ==
 sorvani: Implemented for Lua eq.get_characters_in_instance(uint16 instance_id), return a Lua HashTable
-mackal: NPCs will now cast their charms.
+demonstar55: NPCs will now cast their charms.

 == 01/13/2014 ==
 Kayen: Numerous minor fixes to spell effects.
@@ -1899,19 +1648,19 @@ Kayen: Implemented SE_LimitRace	(Limits to spells cast by a certain race)
 Kayen: Implemented SE_FcMute  (silences casting of spells that contain specific spell effects) ie silence only heals

 == 01/09/2014 ==
-mackal: Add pet size preservation like live (zone, camp, etc)
+demonstar55: Add pet size preservation like live (zone, camp, etc)

 == 01/07/2014 ==
-mackal: Moved pet can attack check to before it tries to attack, which is more live like.
+demonstar55: Moved pet can attack check to before it tries to attack, which is more live like.

 == 01/03/2014 ==
-mackal: Crash prevention for emote.
+demonstar55: Crash prevention for emote.

 == 01/02/2014 ==
-mackal: Stuns from beneficial spells (Harvest) ignore immunity
+demonstar55: Stuns from beneficial spells (Harvest) ignore immunity

 == 12/26/2013 ==
-mackal: Added classes_required to merchantlist (same bitmask as items)
+demonstar55: Added classes_required to merchantlist (same bitmask as items)

 == 12/24/2013 ==
 Secrets (Akkadius): Perl $client->SilentMessage("Message"); addition, this is a pre-req for a Perl plugin I've shared with EQEmu. This function essentially mimics a player speaking with an NPC - which is used in popup window responses
@@ -1932,14 +1681,14 @@ Kayen: Implemented SE_TriggerOnAmountValue (Trigger spell if HP/Mana/End bellow
 Kayen: Fix to SE_BlockNextSpellFocus to make it functional again.

 == 12/15/2013 ==
-mackal: Moved the blocked buff check down so we get spell effects like on live
+demonstar55: Moved the blocked buff check down so we get spell effects like on live
 Kayen: Implemented SE_ReduceHealing (Reduces amount of healing on target by X amount)
 Kayen: Implemented SE_CastonFocusEffect (Triggers spell as part of a focus, when that focus effect is used)
 Kayen: Implemented SE_IncreaseHitDmgTaken (Effect is triggered when X amount of damage is taken)
 Kayen: More fixes for various spell triggers/procs to now properly use their resist modifier.

 == 12/14/2013 ==
-mackal: Blocked buffs shouldn't fail, they should just not be applied.
+demonstar55: Blocked buffs shouldn't fail, they should just not be applied.
 JJ: Changed enable/disable recipe to confirm change made.

 == 12/13/2013 ==
@@ -1950,52 +1699,52 @@ Kayen: Fix for various spell triggers/procs to now properly use their resist mod
 Kayen: Fix to mob->ModSkillDmgTaken(skill_num, value), setting value to -1 will now properly effect all skills.

 == 12/11/2013 ==
-mackal: Fixed issue with crippling blow from berserker frenzy not actually doing anything
-mackal: Fix haste caps
+demonstar55: Fixed issue with crippling blow from berserker frenzy not actually doing anything
+demonstar55: Fix haste caps

 == 12/04/2013 ==
-mackal: Fixed SpellType_Charm case in AICastSpell
+demonstar55: Fixed SpellType_Charm case in AICastSpell

 == 12/03/2013 ==
-mackal: Added #showspellslist to view a mobs spell list
-mackal: Fix procing off of unattackable things
+demonstar55: Added #showspellslist to view a mobs spell list
+demonstar55: Fix procing off of unattackable things

 == 12/02/2013 ==
 JJ: Bandaid fix to CopyCharacter function.

 == 11/29/2013 ==
-mackal: Stacking issues should be resolved now, probably could be optimized more, but went from 3 loops that do stuff to 3 where only 2 really does stuff and one breaks early in most cases, so slightly better
+demonstar55: Stacking issues should be resolved now, probably could be optimized more, but went from 3 loops that do stuff to 3 where only 2 really does stuff and one breaks early in most cases, so slightly better

 == 11/23/2013 ==
 Secrets: Fixed an issue related to a zone crash where the count of the abilities in an AA was 0, leading to a size 0 buffer issue.

 == 11/19/2013 ==
 Secrets: Fixed an issue with two zone crashes reported on PEQ related to the buff restrictions code and AAs.
-mackal: Partially make use of dot_stacking_exempt (case when it's 1 is implemented, -1 case isn't)
+demonstar55: Partially make use of dot_stacking_exempt (case when it's 1 is implemented, -1 case isn't)

 == 11/18/2013 ==
-mackal: Added assistradius to npc_types, defaults to aggroradius if set to 0 (old behaviour)
+demonstar55: Added assistradius to npc_types, defaults to aggroradius if set to 0 (old behaviour)

 == 11/17/2013 ==
 Sorvani: fixed leash and tether special abilities to use the specified range correctly.
-mackal: Rewrote the Mob::_GetMovementSpeed fix an issue that arose from the change on 11/11
+demonstar55: Rewrote the Mob::_GetMovementSpeed fix an issue that arose from the change on 11/11
 	- Added the rule Character:BaseRunSpeedCap (default 158) so people can customize what their runspeed cap is. Hardcapped to 225 so stuff doesn't get too crazy.

 == 11/16/2013 ==
 Leere: Fixed the drinking message for auto-consume, it will again correctly show up for forced consumption instead.
-mackal: Added Mob::DoCastingChecks() which will check for various fail conditions while the casting bar is up. This is called after Mob::DoCastSpell() starts the casting and before it returns.
+demonstar55: Added Mob::DoCastingChecks() which will check for various fail conditions while the casting bar is up. This is called after Mob::DoCastSpell() starts the casting and before it returns.

 == 11/15/2013 ==
-mackal: Fixed Mob::CalcFocusEffect()'s SE_LimitEffect
+demonstar55: Fixed Mob::CalcFocusEffect()'s SE_LimitEffect
 Leere: Fixed a stacking issue for SE_StackingCommand_Block

 == 11/13/2013 ==
-mackal: Implemented bard song effect cap. You can set the base cap with the rule Character:BaseInstrumentSoftCap, defaults to 36 or "3.6" as it is sometimes referred to.
-mackal: Fix Echo of Taelosia and Ayonae's Tutelage to increase the mod cap instead of further improving the instrument mod
-mackal: Implemented Singing/Instrument Mastery as an AA bonus.
+demonstar55: Implemented bard song effect cap. You can set the base cap with the rule Character:BaseInstrumentSoftCap, defaults to 36 or "3.6" as it is sometimes referred to.
+demonstar55: Fix Echo of Taelosia and Ayonae's Tutelage to increase the mod cap instead of further improving the instrument mod
+demonstar55: Implemented Singing/Instrument Mastery as an AA bonus.

 == 11/11/2013 ==
-mackal: Changed the way walk speed is calculated to allow mobs to have their walk speed equal a 100% movement reduction
+demonstar55: Changed the way walk speed is calculated to allow mobs to have their walk speed equal a 100% movement reduction

 == 11/09/2013 ==
 Leere: Fixed Bard mana regen, they now only are affected by items and AA.
@@ -2045,50 +1794,50 @@ Uleat: Converted SkillType typedef enumeration to SkillUseTypes enumeration - So
 Uleat: Prepped the client patch files for larger skill buffer size (not active)

 == 10/24/2013 ==
-mackal: Fix some memory leaks in Mob::SpellOnTarget
+demonstar55: Fix some memory leaks in Mob::SpellOnTarget

 == 10/21/2013 ==
-mackal: Changed GetMinLevel return 0 for more cases that EQ uses for some reason ...
-mackal: Added buff level restrictions, set the Spells:BuffLevelRestrictions to false to have the old behavior.
+demonstar55: Changed GetMinLevel return 0 for more cases that EQ uses for some reason ...
+demonstar55: Added buff level restrictions, set the Spells:BuffLevelRestrictions to false to have the old behavior.

 == 10/18/2013 ==
 Uleat: Expanded the 'Bag Type' enumeration to include all known values. Also, set in place additional 'Bag Type' to 'Skill Type' conversions. Some of these will need to be verified before activation.
 Uleat: Cleaned up some unused enumerations to show a move towards standardization. More to come...

 == 10/12/2013 ==
-mackal: Allow Titanium and lower clients to enter Tutorial zone from character select
+demonstar55: Allow Titanium and lower clients to enter Tutorial zone from character select
 Bad_Captain: Fixed merc crash issue by updating special_abilities & vwMercNpcTypes (Sorvani).
 Bad_Captain: Bots- added out of combat bard songs & #bot bardoutofcombat on|off command to turn them on/off.

 == 10/11/2013 ==
-JJ: (mackal) Allow use of Go Home button when Tutorial still selected in RoF.
+JJ: (demonstar55) Allow use of Go Home button when Tutorial still selected in RoF.

 == 10/10/2013 ==
 Secrets: Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system.
-mackal: Beneficial single target buffs shouldn't have their mana/timers set if they fail to cast after the Mob::SpellOnTarget call in Mob::SpellFinished
+demonstar55: Beneficial single target buffs shouldn't have their mana/timers set if they fail to cast after the Mob::SpellOnTarget call in Mob::SpellFinished
 JJ: Revert change to EnterWorldPacket introduced on 22 April 2013 to fix inability to enter Tutorial or Go Home from character select screen.

 == 10/09/2013 ==
-mackal: Fixed some more instances of the AA timer being eaten
+demonstar55: Fixed some more instances of the AA timer being eaten

 == 10/08/2013 ==
-mackal: Added IsBuffSpell(spell_id) that will return true if the spell has a duration, so would end up in effects/song/discs etc windows on the client
-mackal: Replaced instances of using CalcBuffDuration to determine if a spell was a buff with IsBuffSpell
-mackal: Removed Mob::HasBuffIcon since it was doing what IsBuffSpell does in a more convoluted way with a rather misleading name
-mackal: Fixed issues that arose from the 10/03/2013 change
+demonstar55: Added IsBuffSpell(spell_id) that will return true if the spell has a duration, so would end up in effects/song/discs etc windows on the client
+demonstar55: Replaced instances of using CalcBuffDuration to determine if a spell was a buff with IsBuffSpell
+demonstar55: Removed Mob::HasBuffIcon since it was doing what IsBuffSpell does in a more convoluted way with a rather misleading name
+demonstar55: Fixed issues that arose from the 10/03/2013 change

 == 10/05/2013 ==
 Sorvani: fixed issue with stackable items being created with 0 charges cause by fix to SummonItems

 == 10/03/2013 ==
-mackal: Fix when the random +1 tick is added to nerf extension focus effects to where they should be
+demonstar55: Fix when the random +1 tick is added to nerf extension focus effects to where they should be

 == 09/30/2013 ==
 Sorvani: Changed SummonItem to only summon an item with max charges when said default value is present and not on zero charges
-mackal: Fixed issue with #showstats showing your level for a bunch of values
+demonstar55: Fixed issue with #showstats showing your level for a bunch of values

 == 09/13/2013 ==
-mackal: Add support for /pet hold on and /pet hold off (UF and RoF)
+demonstar55: Add support for /pet hold on and /pet hold off (UF and RoF)

 == 08/29/2013 ==
 KLS: Removed Common Profiler and Zone Profiler.  They're well past outdated status and are just code bloat.
@@ -2234,8 +1983,8 @@ KLS: Perl now will (like lua) keep track of the values you return from EVENT_*.
 KLS: Exported eq.follow(entity_id, [distance]) and eq.stop_follow() to lua.

 == 07/01/2013 ==
-mackal: Fix Monster Summoning related to giants/cyclops
-mackal: Prevent Monster Summoning from summoning a portal in bothunder
+demonstar55: Fix Monster Summoning related to giants/cyclops
+demonstar55: Prevent Monster Summoning from summoning a portal in bothunder
 KLS: Merge of lua branch to master
 See: http://www.eqemulator.org/forums/showthread.php?t=37008 for more detailed information on what is added.
 Upgrade notes:
@@ -2303,35 +2052,35 @@ JJ: Fixed rare case where heals from buffs could go negative.
 Derision: Moved entity_list.Clear() prior to destruction of Perl objects in zone shutdown as I was seeing a segfault due to attempts to call EVENT_HATE_LIST as mobs were being destroyed.

 == 04/09/2013 ==
-mackal: Realized I was an idiot, changed salvage script to be better
+demonstar55: Realized I was an idiot, changed salvage script to be better
 optional SQL: 2013_04_09_SalvageCleanOld.sql - run if ran old script

 == 04/08/2013 ==
-mackal: Implemented Salvage AA
+demonstar55: Implemented Salvage AA
 required SQL: 2013_04_08_Salvage.sql
 script: generate_salvage.py - will generate the entries for some exceptions for salvage returns.

 == 04/04/2013 ==
-mackal: Implemented SE_ForageAdditionalItems as a bonus
+demonstar55: Implemented SE_ForageAdditionalItems as a bonus
 required SQL: 2013_04_04_NaturesBounty.sql

 == 04/03/2013 ==
-mackal: Overloaded Mob::Say_StringID with the option to provide a message type
-mackal: Switched rest of the Pet Messages to MT_PetResponse (Leader commands intentionally left the old way)
+demonstar55: Overloaded Mob::Say_StringID with the option to provide a message type
+demonstar55: Switched rest of the Pet Messages to MT_PetResponse (Leader commands intentionally left the old way)

 == 04/2/2013 ==
 Bad_Captain: Fixed Merc lack of use of heal over time spells (causing excessive healing).
 Bad_Captain: Fixed pet mitigation/AC issues.

 == 04/01/2013 ==
-mackal: AA reuse timers now start when you hit the button and are reset upon failure
-mackal: Instant Cast bard AAs can now be used while singing a song
+demonstar55: AA reuse timers now start when you hit the button and are reset upon failure
+demonstar55: Instant Cast bard AAs can now be used while singing a song

 == 03/30/2013 ==
-mackal: Fixed most of the pet talking, all use StringIDs now. Pet now informs you when it taunts.
+demonstar55: Fixed most of the pet talking, all use StringIDs now. Pet now informs you when it taunts.

 == 03/23/2013 ==
-mackal: Fix issues with escape not always working and fixed SE_FadingMemories to have the message since the message isn't part of the spell data.
+demonstar55: Fix issues with escape not always working and fixed SE_FadingMemories to have the message since the message isn't part of the spell data.
    Escape now uses just the spell and not the AA Actoin
    Fading Memories now only uses the AA Action to eat mana

@@ -2341,7 +2090,7 @@ Bad_Captain: Added checks before dismissing merc to prevent possible bugged merc
 Bad_Captain: Merged in Secret's merc memory leak fixes.

 == 03/20/2013 ==
-mackal: Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)
+demonstar55: Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)

 == 03/18/2013 ==
 Bad_Captain: Fixed zone crash due to merc focus effects & tribute.
@@ -2404,7 +2153,7 @@ KLS: Changed how shared memory works:
 af4t: Add Touch of the Wicked AA redux to SK Improved Harm Touch and Leech Touch.

 == 02/22/2013 ==
-mackal: Mobs will now be removed from XTargets when they get back to their way point, should be last instance of XTarget mobs not clearing when they are not aggroed anymore
+demonstar55: Mobs will now be removed from XTargets when they get back to their way point, should be last instance of XTarget mobs not clearing when they are not aggroed anymore

 == 02/19/2013 ==
 Derision: World should no longer crash if the start_zone query fails at character creation.
@@ -2413,7 +2162,7 @@ Derision: World should no longer crash if the start_zone query fails at characte
 Bad_Captain: Moved merc save to merc table, save merc buffs, added cure and rez spells to healer merc.
 JJ: Chat garbled for drunk characters.
 Derision: Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet.
-mackal: Added potionbelt tool tip
+demonstar55: Added potionbelt tool tip
 KLS: Added EVENT_DEATH to Player Quests

 REQUIRED SQL: 2013_02_18_Merc_Rules_and_Tables.sql
@@ -2425,8 +2174,8 @@ Derision: Client version is now returned by the stream proxy as a number.
 Derision: Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar.

 == 02/16/2013 ==
-mackal: Fix AA reuse timer calc
-mackal: Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define)
+demonstar55: Fix AA reuse timer calc
+demonstar55: Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define)

 == 02/12/2013 ==
 Kayen: AA fix
@@ -2437,7 +2186,7 @@ REQUIRED SQL: utils/sql/svn/2504_required_aa_updates.sql
 Derision: RoF: Added ENCODE for OP_BeginCast (fixes no sound during spell casting). Corrected OP_DeleteSpell.

 == 02/10/2013 ==
-JJ: (mackal) Language skill up should use proper function.
+JJ: (demonstar55) Language skill up should use proper function.
 JJ: SetLanguageSkill now updates client immediately. Both functions do proper limit checks.
    Added two missing languages. Skill level 0 in a spoken language now shows 'in an unknown tongue'.
 JJ: Initial implementation of a GarbleMessage function and implemented for languages. Can be shared with drunk speaking.
@@ -2473,7 +2222,7 @@ Trevius: RoF: Turning on Trader mode in bazaar now works, but no further trader
 Akkadius: Fixed an issue where global_npc.pl was not initializing (initially)

 == 01/31/2013 ==
-cavedude00: (mackal) Rune aggro fix
+cavedude00: (demonstar55) Rune aggro fix
 cavedude00: (Drajor) Tradeskill skillneeded fix.

 == 01/30/2013 ==
@@ -2507,7 +2256,7 @@ Bad_Captain: Mercs - Initial spell casting AI committed.
 KLS: Added crash logging for Windows builds.
 Trevius: Mercenaries now despawn when a player camps out or disconnects in any way.
 Trevius: Players with a Mercenary spawned can now be invited to and join another group with their mercenary.
-Sorvani: (mackal): Moved stunproc rule implmentation to catch all cases
+Sorvani: (Demonstar55): Moved stunproc rule implmentation to catch all cases

 OPTIONAL SQL: utils/sql/svn/mercs.sql		-- rerun for updated merc stats & merc spell lists

@@ -2958,9 +2707,9 @@ references:
 	http://www.eqemulator.org/forums/showthread.php?t=35629 - CSD Bugged Corpse Patch
 	http://www.eqemulator.org/forums/showthread.php?t=35699 - CSD Bandolier Patch

-cavedude: (mackal) Damage shields by default will no longer count towards EXP gain. (Rule also added to change this behaviour.)
-cavedude: (mackal) Extended targets should now clear when aggro is lost using skills.
-cavedude: (mackal) AAs with shorter reuse timers should now reset if the cast failed (interrupted.)
+cavedude: (demonstar55) Damage shields by default will no longer count towards EXP gain. (Rule also added to change this behaviour.)
+cavedude: (demonstar55) Extended targets should now clear when aggro is lost using skills.
+cavedude: (demonstar55) AAs with shorter reuse timers should now reset if the cast failed (interrupted.)
 KLS: Fixed a cause of raids disbanding on zoning.

 OPTIONAL SQL: INSERT INTO `rule_values` VALUES (1, 'Combat:EXPFromDmgShield', 'false', 'Determine if damage from a damage shield counts for EXP gain.');
@@ -3337,7 +3086,7 @@ Kayen: Implemented Perl Mob Quest Object GetModVulnerability(resist type) - Retu
 Optional SQL: utils/sql/svn/2154_optional_rule_spell_procs_resists_falloff.sql

 ==06/22/2012==
-Secrets: (mackal) Spells now display to all clients and can be filtered as such.
+Secrets: (demonstar55) Spells now display to all clients and can be filtered as such.
 Secrets: Damage Shields now go to the proper filter, and do not show the non-melee damage to everyone.

 ==06/03/2012==
@@ -5492,10 +5241,10 @@ WildcardX: *BOTS* Bots can now be invited and disbanded from your group by simpl
 WildcardX: *BOTS* Tweak to the bots total play time calculation to make it more accurate.
 KLS: Added #path meshtest simple to do a faster search on errant path nodes.
 KLS: Modified the accurate hazard code to make automatic path maps with more accurate info that requires less manual editing afterward.
-cavedude: (mackal) Pets will now be amiable to their owners, indifferent to all else.
-cavedude: (mackal) Added $client->KeyRingCheck() and $client->KeyRingAdd() to allow Perl to manipulate the keyring.
-cavedude: (mackal) Casting an invis spell on a player that already has a similar type invis spell will no longer drop the existing buff.
-cavedude: (mackal) Corrected message string for heal spells.
+cavedude: (demonstar55) Pets will now be amiable to their owners, indifferent to all else.
+cavedude: (demonstar55) Added $client->KeyRingCheck() and $client->KeyRingAdd() to allow Perl to manipulate the keyring.
+cavedude: (demonstar55) Casting an invis spell on a player that already has a similar type invis spell will no longer drop the existing buff.
+cavedude: (demonstar55) Corrected message string for heal spells.
 cavedude: Added rule to determine at what HP a fleeing NPC will halt due to being snared.

 ==08/07/2009==
@@ -6131,7 +5880,7 @@ KLS: Fixed the /bug structure and updated the table to be more useful.
 Required SQL: .\utils\sql\svn\503_bugs.sql

 ==05/11/2009==
-mackal: Added a function to allow Perl to check augments within items.
+demonstar55: Added a function to allow Perl to check augments within items.
 cavedude: Increased bind wound skill up speed some.
 KLS: Fix for potentially dangerous typo in spawn conditions code.
 KLS: Removed some non-functioning but still taking up database resources database code.
@@ -6432,7 +6181,7 @@ cavedude: Removed the USE_RACE_CLASS_XP_MODS define as it was outdated and horri
 cavedude: Added group XP bonus. The larger the group, the higher the XP gain.
 cavedude: Added XP bonus for Warrior, Rogue, and Halfling.
 cavedude: Corrected ZEM for AAs.
-cavedude: (Thanks to mackal) Pet Affinity will no longer effect charmed pets.
+cavedude: (Thanks to demonstar55) Pet Affinity will no longer effect charmed pets.
 cavedude: (realityincarnate) Bard songs that require instruments will now require them.

 Please note: XP gain has pretty much been overhauled. You may need tweak the multiplier rules for your server.
@@ -6566,7 +6315,7 @@ AndMetal: Augments are now visible when linking items.
 Trevius: SoF - Adjusted the new Item Structure to align more fields
 Trevius: SoF - Added OP_Consume and OP_LootRequest opcodes
 cavedude00: (AndMetal) AAs now use skill_id instead of index for prereqs.
-cavedude00: (mackal) Implemented Improved Instrument Mastery, Improved Singing Mastery, and Echo of Taelosia AAs.
+cavedude00: (demonstar55) Implemented Improved Instrument Mastery, Improved Singing Mastery, and Echo of Taelosia AAs.
 cavedude00: Created Combat:ChanceToHitDivideBy rule and increased default value to 1250.
 	Required and Optional SQL: utils/sql/svn/326_aas.sql
 KLS: SoF - Fix for item slots in bags.
@@ -45,12 +45,12 @@ int main(int argc, char **argv) {
 		return 1;
 	}

-	auto Config = EQEmuConfig::get();
+	const EQEmuConfig *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;
 	}

-	auto Config = EQEmuConfig::get();
+	const EQEmuConfig *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,20 +11,15 @@ 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
-	emu_versions.cpp
+	eq_dictionary.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
@@ -37,10 +32,7 @@ SET(common_sources
 	guilds.cpp
 	ipc_mutex.cpp
 	item.cpp
-	item_base.cpp
-	light_source.cpp
 	md5.cpp
-	memory_buffer.cpp
 	memory_mapped_file.cpp
 	misc.cpp
 	misc_functions.cpp
@@ -59,7 +51,6 @@ SET(common_sources
 	races.cpp
 	rdtsc.cpp
 	rulesys.cpp
-	say_link.cpp
 	serverinfo.cpp
 	shareddb.cpp
 	skills.cpp
@@ -68,26 +59,20 @@ 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
@@ -120,15 +105,12 @@ 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
@@ -136,7 +118,6 @@ 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
@@ -157,15 +138,13 @@ SET(common_headers
 	guilds.h
 	ipc_mutex.h
 	item.h
-	item_base.h
 	item_fieldlist.h
+	item_struct.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
@@ -178,6 +157,7 @@ SET(common_headers
 	packet_dump.h
 	packet_dump_file.h
 	packet_functions.h
+	pathfind.h
 	platform.h
 	proc_launcher.h
 	profiler.h
@@ -188,7 +168,6 @@ SET(common_headers
 	rdtsc.h
 	rulesys.h
 	ruletypes.h
-	say_link.h
 	seperator.h
 	serverinfo.h
 	servertalk.h
@@ -200,7 +179,6 @@ SET(common_headers
 	tcp_basic_server.h
 	tcp_connection.h
 	tcp_server.h
-	textures.h
 	timeoutmgr.h
 	timer.h
 	types.h
@@ -212,38 +190,37 @@ SET(common_headers
 	zone_numbers.h
 	patches/patches.h
 	patches/sod.h
-#	patches/sod_itemfields.h
-	patches/sod_limits.h
+	patches/sod_constants.h
+	patches/sod_itemfields.h
 	patches/sod_ops.h
 	patches/sod_structs.h
 	patches/sof.h
-#	patches/sof_itemfields.h
-	patches/sof_limits.h
-#	patches/sof_opcode_list.h
+	patches/sof_constants.h
+	patches/sof_itemfields.h
+	patches/sof_opcode_list.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_itemfields.h
-	patches/rof_limits.h
+	patches/rof_constants.h
+	patches/rof_itemfields.h
 	patches/rof_ops.h
 	patches/rof_structs.h
 	patches/rof2.h
-#	patches/rof2_itemfields.h
-	patches/rof2_limits.h
+	patches/rof2_constants.h
+	patches/rof2_itemfields.h
 	patches/rof2_ops.h
 	patches/rof2_structs.h
 	patches/titanium.h
-#	patches/titanium_itemfields_a.h
-#	patches/titanium_itemfields_b.h
-	patches/titanium_limits.h
+	patches/titanium_constants.h
+	patches/titanium_itemfields.h
 	patches/titanium_ops.h
 	patches/titanium_structs.h
 	patches/uf.h
-#	patches/uf_itemfields.h
-	patches/uf_limits.h
+	patches/uf_constants.h
+	patches/uf_itemfields.h
 	patches/uf_ops.h
 	patches/uf_structs.h
 	SocketLib/Base64.h
@@ -266,53 +243,46 @@ SET(common_headers
 SOURCE_GROUP(Patches FILES
 	patches/patches.h
 	patches/sod.h
-#	patches/sod_itemfields.h
-	patches/sod_limits.h
+	patches/sod_itemfields.h
 	patches/sod_ops.h
+	patches/sod_constants.h
 	patches/sod_structs.h
 	patches/sof.h
-#	patches/sof_itemfields.h
-	patches/sof_limits.h
-#	patches/sof_opcode_list.h
+	patches/sof_itemfields.h
+	patches/sof_opcode_list.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_itemfields.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_itemfields.h
 	patches/rof2_ops.h
+	patches/rof2_constants.h
 	patches/rof2_structs.h
 	patches/titanium.h
-#	patches/titanium_itemfields_a.h
-#	patches/titanium_itemfields_b.h
-	patches/titanium_limits.h
+	patches/titanium_itemfields.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_itemfields.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 _WINDOWS
+#ifdef WIN32
 	#include <time.h>
-	#include <winsock2.h>
 	#include <windows.h>
+	#include <winsock2.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 += n; }
+	void WriteData(const void *ptr, size_t n) { memcpy(pBuffer + _wpos, ptr, n); _wpos += (uint32)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-2016 EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2002 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,576 +18,275 @@
 #include "../common/global_define.h"
 #include "../common/classes.h"

-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* 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* 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-2016 EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2002 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,25 +17,26 @@
 */
 #ifndef CLASSES_CH
 #define CLASSES_CH
-
 #include "../common/types.h"

-#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 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 WARRIORGM 20
 #define CLERICGM 21
 #define PALADINGM 22
@@ -57,92 +58,33 @@
 #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

-
-// 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);
-
+const char* GetEQClassName(uint8 class_, uint8 level = 0);
 #endif
+
@@ -0,0 +1,182 @@
+/*
+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,6 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+	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
@@ -14,42 +13,36 @@

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

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

-} /*EQEmu*/
+}

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

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

 /*
@@ -57,6 +57,7 @@ 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);
 }

@@ -73,12 +74,25 @@ 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);
+	}
 }

 /*
@@ -299,10 +313,7 @@ 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){ 
-		Log.Out(Logs::General, Logs::Error, "Database::DeleteCharacter :: Character (%s) not found, stopping delete...", name);
-		return false; 
-	}
+	if (charid <= 0){ std::cerr << "Database::DeleteCharacter :: Character not found, stopping delete...\n"; 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);
@@ -625,18 +636,12 @@ 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, slot)"
+	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
 		" 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[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);
+		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); 

 	/* Save Skills */
 	int firstquery = 0;
@@ -700,7 +705,7 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven

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

-		if (i == EQEmu::legacy::SlotCursor) {
-			i = EQEmu::legacy::GENERAL_BAGS_BEGIN; 
+		if (i == MainCursor) { 
+			i = EmuConstants::GENERAL_BAGS_BEGIN; 
 			continue;
 		}
-		else if (i == EQEmu::legacy::CURSOR_BAG_END) { 
-			i = EQEmu::legacy::BANK_BEGIN; 
+		else if (i == EmuConstants::CURSOR_BAG_END) { 
+			i = EmuConstants::BANK_BEGIN; 
 			continue; 
 		}
-		else if (i == EQEmu::legacy::BANK_END) { 
-			i = EQEmu::legacy::BANK_BAGS_BEGIN; 
+		else if (i == EmuConstants::BANK_END) { 
+			i = EmuConstants::BANK_BAGS_BEGIN; 
 			continue; 
 		} 
 		i++;
@@ -831,7 +836,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);

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

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

 	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;

-	LockMutex lock(&Mvarcache);
-
-	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);
+	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;
+	}
+
+	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;
+			}
+		}
+	}
+
+	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(std::string varname, std::string &varvalue)
-{
-	varvalue.clear();
+bool Database::GetVariable(const char* varname, char* varvalue, uint16 varvalue_len) {
+	varvalue[0] = '\0';

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

-	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;
+		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;
 	}
 	return false;
 }

-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());
+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);
 	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')", escaped_name.c_str(), escaped_value.c_str());
+	query = StringFormat("Insert Into variables (varname, value) values ('%s', '%s')", varname, varvalue);
 	results = QueryDatabase(query);
+	free(varname);
+	free(varvalue);

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

-void Database::AddReport(std::string who, std::string against, std::string lines)
-{
-	auto escape_str = new char[lines.size() * 2 + 1];
+void Database::AddReport(std::string who, std::string against, std::string lines) { 
+	char *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);
@@ -2136,27 +2216,3 @@ 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-2016 EQEMu Development Team (http://eqemulator.net)
+	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
@@ -67,14 +67,8 @@ struct npcDecayTimes_Struct {


 struct VarCache_Struct {
-	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);
-	}
+	char varname[26];	
+	char value[0];
 };

 class PTimerList;
@@ -94,7 +88,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 */
@@ -186,10 +180,6 @@ 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 */
@@ -225,9 +215,11 @@ public:

 	/* Database Variables */

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

 	/* General Queries */

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

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

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

 	/* 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[EQEmu::textures::TextureCount];
+		/*510*/	uint32 Items[_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[EQEmu::textures::TextureCount];	// Item texture/material of worn/held items
+		/*0312*/	uint32							item_material[_MaterialCount];	// Item texture/material of worn/held items
 		/*0348*/	uint8							unknown0348[44];
-		/*0392*/	Convert::Color_Struct			item_tint[EQEmu::textures::TextureCount];
+		/*0392*/	Convert::Color_Struct			item_tint[_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[EQEmu::legacy::TRIBUTE_SIZE];
+		/*7224*/	Convert::Tribute_Struct			tributes[EmuConstants::TRIBUTE_SIZE];
 		/*7264*/	Convert::Disciplines_Struct		disciplines;
 		/*7664*/	uint32							recastTimers[MAX_RECAST_TYPES];	// Timers (GMT of last use)
 		/*7744*/	char							unknown7780[160];
@@ -472,18 +472,31 @@ bool Database::CheckDatabaseConversions() {
 	CheckDatabaseConvertPPDeblob();
 	CheckDatabaseConvertCorpseDeblob();

-	/* Fetch EQEmu Server script */
-	if (!std::ifstream("eqemu_server.pl")){
+	/* Fetch Automatic Upgrade Script */
+	if (!std::ifstream("eqemu_update.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_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.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_update.pl'); if ($response->is_success){ open(FILE, '> eqemu_update.pl'); print FILE $response->decoded_content; close(FILE); }\"");
 #else
-		system("wget --no-check-certificate -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
+		system("wget --no-check-certificate -O eqemu_update.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_update.pl");
 #endif
 	}

-	/* Run EQEmu Server script (Checks for database updates) */
-	system("perl eqemu_server.pl ran_from_world");
+	/*
+		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");

 	return true;
 }
@@ -1403,7 +1416,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				if (rquery != ""){ results = QueryDatabase(rquery); }
 				/* Run Material Color Convert */
 				first_entry = 0; rquery = "";
-				for (i = 0; i < EQEmu::textures::TextureCount; i++){
+				for (i = 0; i < _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);
@@ -1415,7 +1428,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				if (rquery != ""){ results = QueryDatabase(rquery); }
 				/* Run Tribute Convert */
 				first_entry = 0; rquery = "";
-				for (i = 0; i < EQEmu::legacy::TRIBUTE_SIZE; i++){
+				for (i = 0; i < EmuConstants::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;

-			auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
+			char *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);
 		}

-		auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
+		char *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 <winsock2.h>
+	#include <winsock.h>
 	#include <windows.h>
 #endif

@@ -1,149 +0,0 @@
-/*	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,6 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)
+	Copyright (C) 2001-2002 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
@@ -14,67 +13,154 @@

 	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_DEITY_H
-#define COMMON_DEITY_H
+#ifndef DEITY_H
+#define DEITY_H

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

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

-namespace EQEmu
+/*
+**	Diety types
+**
+**	(ref: eqstr_us.txt)
+**
+**	(Another orphaned enumeration...)
+*/
+enum DeityTypes
 {
-	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
-		};
+/*----*/	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
+};

-		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
-		};
+/*
+**	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
+};

-		extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
-		extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
-		extern const char* DeityName(DeityType deity_type);
+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; }
+	};

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

-} /*EQEmu*/
+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; }
+	};

-#endif /* COMMON_DEITY_H */
+	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
@@ -1,20 +0,0 @@
-/*	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"
@@ -1,70 +0,0 @@
-/*	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;
-
-	} /*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;
-
-	} /*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*/
@@ -1,20 +0,0 @@
-/*	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"
@@ -1,256 +0,0 @@
-/*	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_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
-		};
-
-		enum InventoryTypes : int16 {
-			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
-		};
-
-		enum PossessionsSlots : int16 {
-			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, // temp
-			SlotAmmo = 21, // temp
-			SlotGeneral1,
-			SlotGeneral2,
-			SlotGeneral3,
-			SlotGeneral4, // 25
-			SlotGeneral5,
-			SlotGeneral6,
-			SlotGeneral7,
-			SlotGeneral8,
-			//SlotGeneral9,
-			//SlotGeneral10,
-			SlotCursor, // 30
-			SlotCount
-		};
-
-		// 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 = SlotCount;
-		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 = SlotCount; // 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;//NOT_USED;
-		static const uint16 TYPE_VIEW_MOD_BANK_SIZE = 0;//NOT_USED;
-		static const uint16 TYPE_VIEW_MOD_SHARED_BANK_SIZE = 0;//NOT_USED;
-		static const uint16 TYPE_VIEW_MOD_LIMBO_SIZE = 0;//NOT_USED;
-		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 = SlotCharm;
-		static const int16 EQUIPMENT_END = SlotAmmo;
-		static const uint16 EQUIPMENT_SIZE = 22; // does not account for 'Power Source' - used mainly for npc equipment arrays
-
-		static const int16 GENERAL_BEGIN = SlotGeneral1;
-		static const int16 GENERAL_END = SlotGeneral8;
-		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;
-		//static const int16 CORPSE_END = RoF::consts::CORPSE_END; // not ready for use
-
-		// items
-		// common and container sizes will not increase until the new 'location' struct is implemented
-		static const uint16 ITEM_COMMON_SIZE = 6;//RoF::consts::ITEM_COMMON_SIZE;
-		static const uint16 ITEM_CONTAINER_SIZE = 10;//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 = 20;//RoF2::consts::BANDOLIERS_SIZE;			// number of bandolier instances
-		static const size_t BANDOLIER_ITEM_COUNT = 4;//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 = 5;//RoF2::consts::POTION_BELT_ITEM_COUNT;
-
-		static const size_t TEXT_LINK_BODY_LENGTH = 56;//RoF2::consts::TEXT_LINK_BODY_LENGTH;
-	}
-}
-
-#endif /* COMMON_EMU_LEGACY_H */
@@ -1,18 +0,0 @@
-/*	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
-*/
@@ -1,104 +0,0 @@
-/*	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*/
@@ -64,7 +64,6 @@ N(OP_BuffRemoveRequest),
 N(OP_Bug),
 N(OP_CameraEffect),
 N(OP_Camp),
-N(OP_CancelSneakHide),
 N(OP_CancelTask),
 N(OP_CancelTrade),
 N(OP_CastSpell),
@@ -165,7 +164,6 @@ N(OP_FinishTrade),
 N(OP_FinishWindow),
 N(OP_FinishWindow2),
 N(OP_Fishing),
-N(OP_Fling),
 N(OP_FloatListThing),
 N(OP_Forage),
 N(OP_ForceFindPerson),
@@ -289,7 +287,6 @@ 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
-		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);
+	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);
 }

 void EmuTCPConnection::RemoveRelay(EmuTCPConnection* relay, bool iSendRelayDisconnect) {
 	if (iSendRelayDisconnect) {
-		auto pack = new ServerPacket(0, 5);
+		ServerPacket* 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 {
-			auto tmpbuf = new uchar[recvbuf_size - base];
+			uchar* 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 {
-			auto tmpbuf = new uchar[recvbuf_size - base];
+			uchar* tmpbuf = new uchar[recvbuf_size - base];
 			memcpy(tmpbuf, &recvbuf[base], recvbuf_used - base);
 			safe_delete_array(recvbuf);
 			recvbuf = tmpbuf;
@@ -739,8 +739,7 @@ void EmuTCPConnection::ProcessNetworkLayerPacket(ServerPacket* pack) {
 				SendNetErrorPacket("New RelayClient: illegal on outgoing connection");
 				break;
 			}
-			auto con = new EmuTCPConnection(Server->GetNextID(), Server, this, *((uint32 *)data),
-							*((uint32 *)&data[4]), *((uint16 *)&data[8]));
+			EmuTCPConnection* con = new EmuTCPConnection(Server->GetNextID(), Server, this, *((uint32*) data), *((uint32*) &data[4]), *((uint16*) &data[8]));
 			Server->AddConnection(con);
 			RelayCount++;
 			break;
@@ -788,7 +787,7 @@ bool EmuTCPConnection::SendData(bool &sent_something, char* errbuf) {
 	if(sent_something)
 		keepalive_timer.Start();
 	else if (TCPMode == modePacket && keepalive_timer.Check()) {
-		auto pack = new ServerPacket(0, 0);
+		ServerPacket* 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)
 {
-	auto conn = new EmuTCPConnection(ID, this, in_socket, irIP, irPort, pOldFormat);
+	EmuTCPConnection *conn = new EmuTCPConnection(ID, this, in_socket, irIP, irPort, pOldFormat);
 	AddConnection(conn);
 }

@@ -1,370 +0,0 @@
-/*	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::IsValidInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= InventoryVersion::Unknown || inventory_version > LastInventoryVersion)
-		return false;
-
-	return true;
-}
-
-bool EQEmu::versions::IsValidPCInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= InventoryVersion::Unknown || inventory_version > LastPCInventoryVersion)
-		return false;
-
-	return true;
-}
-
-bool EQEmu::versions::IsValidNonPCInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= LastPCInventoryVersion || inventory_version > LastNonPCInventoryVersion)
-		return false;
-
-	return true;
-}
-
-bool EQEmu::versions::IsValidOfflinePCInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= LastNonPCInventoryVersion || inventory_version > LastOfflinePCInventoryVersion)
-		return false;
-
-	return true;
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ValidateInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= InventoryVersion::Unknown || inventory_version > LastInventoryVersion)
-		return InventoryVersion::Unknown;
-
-	return inventory_version;
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ValidatePCInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= InventoryVersion::Unknown || inventory_version > LastPCInventoryVersion)
-		return InventoryVersion::Unknown;
-
-	return inventory_version;
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ValidateNonPCInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= LastPCInventoryVersion || inventory_version > LastNonPCInventoryVersion)
-		return InventoryVersion::Unknown;
-
-	return inventory_version;
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ValidateOfflinePCInventoryVersion(InventoryVersion inventory_version)
-{
-	if (inventory_version <= LastNonPCInventoryVersion || inventory_version > LastOfflinePCInventoryVersion)
-		return InventoryVersion::Unknown;
-
-	return inventory_version;
-}
-
-const char* EQEmu::versions::InventoryVersionName(InventoryVersion inventory_version)
-{
-	switch (inventory_version) {
-	case InventoryVersion::Unknown:
-		return "Unknown Version";
-	case InventoryVersion::Client62:
-		return "Client 6.2";
-	case InventoryVersion::Titanium:
-		return "Titanium";
-	case InventoryVersion::SoF:
-		return "SoF";
-	case InventoryVersion::SoD:
-		return "SoD";
-	case InventoryVersion::UF:
-		return "UF";
-	case InventoryVersion::RoF:
-		return "RoF";
-	case InventoryVersion::RoF2:
-		return "RoF2";
-	case InventoryVersion::NPC:
-		return "NPC";
-	case InventoryVersion::NPCMerchant:
-		return "NPC Merchant";
-	case InventoryVersion::Merc:
-		return "Merc";
-	case InventoryVersion::Bot:
-		return "Bot";
-	case InventoryVersion::ClientPet:
-		return "Client Pet";
-	case InventoryVersion::NPCPet:
-		return "NPC Pet";
-	case InventoryVersion::MercPet:
-		return "Merc Pet";
-	case InventoryVersion::BotPet:
-		return "Bot Pet";
-	case InventoryVersion::OfflineTitanium:
-		return "Offline Titanium";
-	case InventoryVersion::OfflineSoF:
-		return "Offline SoF";
-	case InventoryVersion::OfflineSoD:
-		return "Offline SoD";
-	case InventoryVersion::OfflineUF:
-		return "Offline UF";
-	case InventoryVersion::OfflineRoF:
-		return "Offline RoF";
-	case InventoryVersion::OfflineRoF2:
-		return "Offline RoF2";
-	default:
-		return "Invalid Version";
-	};
-}
-
-EQEmu::versions::ClientVersion EQEmu::versions::ConvertInventoryVersionToClientVersion(InventoryVersion inventory_version)
-{
-	switch (inventory_version) {
-	case InventoryVersion::Unknown:
-	case InventoryVersion::Client62:
-		return ClientVersion::Unknown;
-	case InventoryVersion::Titanium:
-		return ClientVersion::Titanium;
-	case InventoryVersion::SoF:
-		return ClientVersion::SoF;
-	case InventoryVersion::SoD:
-		return ClientVersion::SoD;
-	case InventoryVersion::UF:
-		return ClientVersion::UF;
-	case InventoryVersion::RoF:
-		return ClientVersion::RoF;
-	case InventoryVersion::RoF2:
-		return ClientVersion::RoF2;
-	default:
-		return ClientVersion::Unknown;
-	}
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ConvertClientVersionToInventoryVersion(ClientVersion client_version)
-{
-	switch (client_version) {
-	case ClientVersion::Unknown:
-	case ClientVersion::Client62:
-		return InventoryVersion::Unknown;
-	case ClientVersion::Titanium:
-		return InventoryVersion::Titanium;
-	case ClientVersion::SoF:
-		return InventoryVersion::SoF;
-	case ClientVersion::SoD:
-		return InventoryVersion::SoD;
-	case ClientVersion::UF:
-		return InventoryVersion::UF;
-	case ClientVersion::RoF:
-		return InventoryVersion::RoF;
-	case ClientVersion::RoF2:
-		return InventoryVersion::RoF2;
-	default:
-		return InventoryVersion::Unknown;
-	}
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ConvertPCInventoryVersionToOfflinePCInventoryVersion(InventoryVersion inventory_version)
-{
-	switch (inventory_version) {
-	case InventoryVersion::Titanium:
-		return InventoryVersion::OfflineTitanium;
-	case InventoryVersion::SoF:
-		return InventoryVersion::OfflineSoF;
-	case InventoryVersion::SoD:
-		return InventoryVersion::OfflineSoD;
-	case InventoryVersion::UF:
-		return InventoryVersion::OfflineUF;
-	case InventoryVersion::RoF:
-		return InventoryVersion::OfflineRoF;
-	case InventoryVersion::RoF2:
-		return InventoryVersion::OfflineRoF2;
-	default:
-		return InventoryVersion::Unknown;
-	}
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ConvertOfflinePCInventoryVersionToPCInventoryVersion(InventoryVersion inventory_version)
-{
-	switch (inventory_version) {
-	case InventoryVersion::OfflineTitanium:
-		return InventoryVersion::Titanium;
-	case InventoryVersion::OfflineSoF:
-		return InventoryVersion::SoF;
-	case InventoryVersion::OfflineSoD:
-		return InventoryVersion::SoD;
-	case InventoryVersion::OfflineUF:
-		return InventoryVersion::UF;
-	case InventoryVersion::OfflineRoF:
-		return InventoryVersion::RoF;
-	case InventoryVersion::OfflineRoF2:
-		return InventoryVersion::RoF2;
-	default:
-		return InventoryVersion::Unknown;
-	}
-}
-
-EQEmu::versions::ClientVersion EQEmu::versions::ConvertOfflinePCInventoryVersionToClientVersion(InventoryVersion inventory_version)
-{
-	switch (inventory_version) {
-	case InventoryVersion::OfflineTitanium:
-		return ClientVersion::Titanium;
-	case InventoryVersion::OfflineSoF:
-		return ClientVersion::SoF;
-	case InventoryVersion::OfflineSoD:
-		return ClientVersion::SoD;
-	case InventoryVersion::OfflineUF:
-		return ClientVersion::UF;
-	case InventoryVersion::OfflineRoF:
-		return ClientVersion::RoF;
-	case InventoryVersion::OfflineRoF2:
-		return ClientVersion::RoF2;
-	default:
-		return ClientVersion::Unknown;
-	}
-}
-
-EQEmu::versions::InventoryVersion EQEmu::versions::ConvertClientVersionToOfflinePCInventoryVersion(ClientVersion client_version)
-{
-	switch (client_version) {
-	case ClientVersion::Titanium:
-		return InventoryVersion::OfflineTitanium;
-	case ClientVersion::SoF:
-		return InventoryVersion::OfflineSoF;
-	case ClientVersion::SoD:
-		return InventoryVersion::OfflineSoD;
-	case ClientVersion::UF:
-		return InventoryVersion::OfflineUF;
-	case ClientVersion::RoF:
-		return InventoryVersion::OfflineRoF;
-	case ClientVersion::RoF2:
-		return InventoryVersion::OfflineRoF2;
-	default:
-		return InventoryVersion::Unknown;
-	}
-}
@@ -1,130 +0,0 @@
-/*	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);
-
-		extern bool IsValidClientVersion(ClientVersion client_version);
-		extern ClientVersion ValidateClientVersion(ClientVersion client_version);
-		extern const char* ClientVersionName(ClientVersion client_version);
-		extern uint32 ConvertClientVersionToClientVersionBit(ClientVersion client_version);
-		extern ClientVersion ConvertClientVersionBitToClientVersion(uint32 client_version_bit);
-		extern uint32 ConvertClientVersionToExpansion(ClientVersion client_version);
-
-	} /*versions*/
-
-	namespace versions {
-		enum class InventoryVersion {
-			Unknown = 0,
-			Client62,
-			Titanium,
-			SoF,
-			SoD,
-			UF,
-			RoF,
-			RoF2,
-			NPC,
-			NPCMerchant,
-			Merc,
-			Bot,
-			ClientPet,
-			NPCPet,
-			MercPet,
-			BotPet,
-			OfflineTitanium,
-			OfflineSoF,
-			OfflineSoD,
-			OfflineUF,
-			OfflineRoF,
-			OfflineRoF2
-		};
-
-		const InventoryVersion LastInventoryVersion = InventoryVersion::OfflineRoF2;
-		const InventoryVersion LastPCInventoryVersion = InventoryVersion::RoF2;
-		const InventoryVersion LastNonPCInventoryVersion = InventoryVersion::BotPet;
-		const InventoryVersion LastOfflinePCInventoryVersion = InventoryVersion::OfflineRoF2;
-		const size_t InventoryVersionCount = (static_cast<size_t>(LastInventoryVersion) + 1);
-
-		extern bool IsValidInventoryVersion(InventoryVersion inventory_version);
-		extern bool IsValidPCInventoryVersion(InventoryVersion inventory_version);
-		extern bool IsValidNonPCInventoryVersion(InventoryVersion inventory_version);
-		extern bool IsValidOfflinePCInventoryVersion(InventoryVersion inventory_version);
-
-		extern InventoryVersion ValidateInventoryVersion(InventoryVersion inventory_version);
-		extern InventoryVersion ValidatePCInventoryVersion(InventoryVersion inventory_version);
-		extern InventoryVersion ValidateNonPCInventoryVersion(InventoryVersion inventory_version);
-		extern InventoryVersion ValidateOfflinePCInventoryVersion(InventoryVersion inventory_version);
-
-		extern const char* InventoryVersionName(InventoryVersion inventory_version);
-		extern ClientVersion ConvertInventoryVersionToClientVersion(InventoryVersion inventory_version);
-		extern InventoryVersion ConvertClientVersionToInventoryVersion(ClientVersion client_version);
-		extern InventoryVersion ConvertPCInventoryVersionToOfflinePCInventoryVersion(InventoryVersion inventory_version);
-		extern InventoryVersion ConvertOfflinePCInventoryVersionToPCInventoryVersion(InventoryVersion inventory_version);
-		extern ClientVersion ConvertOfflinePCInventoryVersionToClientVersion(InventoryVersion inventory_version);
-		extern InventoryVersion ConvertClientVersionToOfflinePCInventoryVersion(ClientVersion client_version);
-
-	} /*versions*/
-
-} /*EQEmu*/
-
-#endif /*COMMON_EMU_VERSIONS_H*/
@@ -1,6 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+	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
@@ -14,57 +13,407 @@

 	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_EQ_CONSTANTS_H
-#define COMMON_EQ_CONSTANTS_H
+#ifndef EQ_CONSTANTS_H
+#define 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
+};

-//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)
+#define LIGHT_TYPES_COUNT 16

-//#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)
+/*
+** 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

 // animations for AT_Anim
 #define ANIM_FREEZE	102
@@ -170,40 +519,15 @@ 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,
@@ -399,7 +723,7 @@ static const uint8 DamageTypeUnknown	= 0xFF;
 **
 **	(indexed by 'Skill' of SkillUseTypes)
 */
-static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated
+static const uint8 SkillDamageTypes[HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated
 {
 /*1HBlunt*/					0,
 /*1HSlashing*/				1,
@@ -475,10 +799,29 @@ static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // chang
 /*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)
+/*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
 };

 /*
@@ -515,16 +858,164 @@ static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // chang
 **
 */

+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 TYPE_BEGIN	0
-#define SLOT_BEGIN	0
-#define SUB_INDEX_BEGIN	0
-#define AUG_INDEX_BEGIN	0
+#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 /*COMMON_EQ_CONSTANTS_H*/
+#endif
@@ -0,0 +1,943 @@
+/*
+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))];
+}
@@ -0,0 +1,205 @@
+/*
+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
+
+
+*/
@@ -1,381 +0,0 @@
-/*	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] =
-{
-	{ // Unknown
-		ClientUnknown::Null
-	},
-	{ // Client62
-		Client62::Null
-	},
-	{ // Titanium
-		Titanium::constants::CharacterCreationLimit
-	},
-	{ // SoF
-		SoF::constants::CharacterCreationLimit
-	},
-	{ // SoD
-		SoD::constants::CharacterCreationLimit
-	},
-	{ // UF
-		UF::constants::CharacterCreationLimit
-	},
-	{ // RoF
-		RoF::constants::CharacterCreationLimit
-	},
-	{ // RoF2
-		RoF2::constants::CharacterCreationLimit
-	}
-};
-
-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::InventoryVersionCount] =
-{
-	{ // Unknown
-		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
-		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
-	},
-	{ // Titanium
-		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::legacy::ITEM_CONTAINER_SIZE, /*Titanium::invbag::ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*Titanium::invaug::ItemAugSize,*/
-
-		Titanium::inventory::AllowEmptyBagInBag, Titanium::inventory::AllowClickCastFromBag, Titanium::inventory::ConcatenateInvTypeLimbo, Titanium::inventory::AllowOverLevelEquipment
-	},
-	{ // SoF
-		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::legacy::ITEM_CONTAINER_SIZE, /*SoF::invbag::ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*SoF::invaug::ItemAugSize,*/
-
-		SoF::inventory::AllowEmptyBagInBag, SoF::inventory::AllowClickCastFromBag, SoF::inventory::ConcatenateInvTypeLimbo, SoF::inventory::AllowOverLevelEquipment
-	},
-	{ // SoD
-		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::legacy::ITEM_CONTAINER_SIZE, /*SoD::invbag::ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*SoD::invaug::ItemAugSize,*/
-
-		SoD::inventory::AllowEmptyBagInBag, SoD::inventory::AllowClickCastFromBag, SoD::inventory::ConcatenateInvTypeLimbo, SoD::inventory::AllowOverLevelEquipment
-	},
-	{ // UF
-		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::legacy::ITEM_CONTAINER_SIZE, /*UF::invbag::ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*UF::invaug::ItemAugSize,*/
-
-		UF::inventory::AllowEmptyBagInBag, UF::inventory::AllowClickCastFromBag, UF::inventory::ConcatenateInvTypeLimbo, UF::inventory::AllowOverLevelEquipment
-	},
-	{ // RoF
-		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::legacy::ITEM_CONTAINER_SIZE, /*RoF::invbag::ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*RoF::invaug::ItemAugSize,*/
-
-		RoF::False, /*RoF::inventory::AllowEmptyBagInBag,*/ RoF::inventory::AllowClickCastFromBag, RoF::inventory::ConcatenateInvTypeLimbo, RoF::inventory::AllowOverLevelEquipment
-	},
-	{ // RoF2
-		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::legacy::ITEM_CONTAINER_SIZE, /*RoF2::invbag::ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*RoF2::invaug::ItemAugSize,*/
-
-		RoF2::False, /*RoF2::inventory::AllowEmptyBagInBag,*/ RoF2::inventory::AllowClickCastFromBag, RoF2::inventory::ConcatenateInvTypeLimbo, RoF2::inventory::AllowOverLevelEquipment
-	},
-	{ // NPC
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::NPC::False, EntityLimits::NPC::False, EntityLimits::NPC::False, EntityLimits::NPC::False
-	},
-	{ // NPCMerchant
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::NPCMerchant::False, EntityLimits::NPCMerchant::False, EntityLimits::NPCMerchant::False, EntityLimits::NPCMerchant::False
-	},
-	{ // Merc
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::Merc::False, EntityLimits::Merc::False, EntityLimits::Merc::False, EntityLimits::Merc::False
-	},
-	{ // Bot
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::Bot::False, EntityLimits::Bot::False, EntityLimits::Bot::False, EntityLimits::Bot::False
-	},
-	{ // ClientPet
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::ClientPet::False, EntityLimits::ClientPet::False, EntityLimits::ClientPet::False, EntityLimits::ClientPet::False
-	},
-	{ // NPCPet
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::NPCPet::False, EntityLimits::NPCPet::False, EntityLimits::NPCPet::False, EntityLimits::NPCPet::False
-	},
-	{ // MercPet
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*ItemAugSize,*/
-
-		EntityLimits::MercPet::False, EntityLimits::MercPet::False, EntityLimits::MercPet::False, EntityLimits::MercPet::False
-	},
-	{ // BotPet
-		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::legacy::ITEM_CONTAINER_SIZE, /*ItemBagSize,*/ EQEmu::legacy::ITEM_COMMON_SIZE, /*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::legacy::ITEM_CONTAINER_SIZE, /*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::legacy::ITEM_CONTAINER_SIZE, /*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::legacy::ITEM_CONTAINER_SIZE, /*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::legacy::ITEM_CONTAINER_SIZE, /*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::legacy::ITEM_CONTAINER_SIZE, /*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::legacy::ITEM_CONTAINER_SIZE, /*RoF2::Null,*/ RoF2::Null,
-
-		RoF2::False, RoF2::False, RoF2::False, RoF2::False
-	}
-};
-
-const EQEmu::inventory::LookupEntry* EQEmu::inventory::Lookup(versions::InventoryVersion inventory_version)
-{
-	return &inventory_lookup_entries[static_cast<int>(versions::ValidateInventoryVersion(inventory_version))];
-}
-
-static const EQEmu::behavior::LookupEntry behavior_lookup_entries[EQEmu::versions::InventoryVersionCount] =
-{
-	{ // 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::InventoryVersion inventory_version)
-{
-	return &behavior_lookup_entries[static_cast<int>(versions::ValidateInventoryVersion(inventory_version))];
-}
@@ -1,94 +0,0 @@
-/*	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;
-		};
-
-		const LookupEntry* Lookup(versions::ClientVersion client_version);
-
-	} /*constants*/
-	
-	namespace inventory {
-		class LookupEntry {
-		public:
-			size_t InventoryTypeSize[legacy::TypeCount];
-
-			uint64 PossessionsBitmask;
-			size_t ItemBagSize;
-			size_t ItemAugSize;
-
-			bool AllowEmptyBagInBag;
-			bool AllowClickCastFromBag;
-			bool ConcatenateInvTypeLimbo;
-			bool AllowOverLevelEquipment;
-		};
-
-		const LookupEntry* Lookup(versions::InventoryVersion inventory_version);
-
-	} /*inventory*/
-	
-	namespace behavior {
-		class LookupEntry {
-		public:
-			bool CoinHasWeight;
-		};
-
-		const LookupEntry* Lookup(versions::InventoryVersion inventory_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) {
-		auto tmpbuffer = new unsigned char[size + rhs->size + 3];
+		unsigned char *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) {
-		auto tmpbuffer = new unsigned char[size + rhs->size + 6];
+		unsigned char *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 {
-	auto res = new EQRawApplicationPacket(opcode, pBuffer, size);
+	EQRawApplicationPacket *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; sent_time = 0; }
+	EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len) : BasePacket(buf,len), opcode(op) { acked = false; }
 //	EQProtocolPacket(const unsigned char *buf, uint32 len);
 	bool combine(const EQProtocolPacket *rhs);
 	uint32 serialize (unsigned char *dest) const;
@@ -70,7 +70,6 @@ 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-2016 EQEMu Development Team (http://eqemulator.net)
+	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
@@ -25,17 +25,16 @@
 #include <list>
 #include <time.h>
 #include "../common/version.h"
-#include "emu_constants.h"
-#include "textures.h"
-
+//#include "../common/item_struct.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
@@ -127,7 +126,37 @@ struct LDoNTrapTemplate

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

-struct CharSelectEquip : EQEmu::Texture_Struct, EQEmu::Tint_Struct {};
+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;
+};

 // RoF2-based hybrid struct
 struct CharacterSelectEntry_Struct
@@ -142,7 +171,7 @@ struct CharacterSelectEntry_Struct
 	uint16 Instance;
 	uint8 Gender;
 	uint8 Face;
-	CharSelectEquip	Equip[EQEmu::textures::TextureCount];
+	CharSelectEquip	Equip[9];
 	uint8 Unknown15;			// Seen FF
 	uint8 Unknown19;			// Seen FF
 	uint32 DrakkinTattoo;
@@ -251,7 +280,22 @@ 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*/ EQEmu::TextureProfile equipment;
+/*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];
+};
 /*0233*/ float	runspeed;		// Speed when running
 /*0036*/ uint8	afk;			// 0=no, 1=afk
 /*0238*/ uint32	guildID;		// Current guild
@@ -282,7 +326,22 @@ union
 /*0340*/ uint32 spawnId;		// Spawn Id
 /*0344*/ uint8 unknown0344[3];
 /*0347*/ uint8 IsMercenary;
-/*0348*/ EQEmu::TintProfile equipment_tint;
+/*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
+		 };
 /*0384*/ uint8	lfg;			// 0=off, 1=lfg on
 /*0385*/

@@ -387,19 +446,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 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
+uint32 unknown12;
 };

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

 struct ManaChange_Struct
 {
-/*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
+	uint32	new_mana; // New Mana AMount
+	uint32	stamina;
+	uint32	spell_id;
+	uint32	unknown12;
 };

 struct SwapSpell_Struct
@@ -502,28 +548,30 @@ struct SpawnAppearance_Struct
 // this is used inside profile
 struct SpellBuff_Struct
 {
-/*000*/	uint8	effect_type;	// 0 = no buff, 2 = buff, 4 = inverse affects of buff
-/*001*/	uint8	level;
+/*000*/	uint8	slotid;		//badly named... seems to be 2 for a real buff, 0 otherwise
+/*001*/ uint8	level;
 /*002*/	uint8	bard_modifier;
-/*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"
+/*003*/	uint8	effect;			//not real
 /*004*/	uint32	spellid;
-/*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*/
+/*008*/ int32	duration;
+/*012*/	uint32	counters;
+/*016*/	uint32	player_id;	//'global' ID of the caster, for wearoff messages
+/*020*/
 };

-struct SpellBuffPacket_Struct {
+struct SpellBuffFade_Struct {
 /*000*/	uint32 entityid;
-/*004*/	SpellBuff_Struct buff;
-/*040*/	uint32 slotid;
-/*044*/	uint32 bufffade;
-/*048*/
+/*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*/
 };

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

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

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

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

 struct MovePotionToBelt_Struct
@@ -834,7 +882,7 @@ struct SuspendedMinion_Struct
 	/*002*/	uint32 HP;
 	/*006*/	uint32 Mana;
 	/*010*/	SpellBuff_Struct Buffs[BUFF_COUNT];
-	/*510*/	EQEmu::TextureShortProfile Items;
+	/*510*/	uint32 Items[_MaterialCount];
 	/*546*/	char Name[64];
 	/*610*/
 };
@@ -848,7 +896,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 = static_cast<uint32>(EQEmu::CastingSlot::MaxGems); // Set to latest client so functions can work right -- 12
+static const uint32 MAX_PP_MEMSPELL = 9; // Set to latest client so functions can work right
 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

@@ -929,7 +977,7 @@ struct PlayerProfile_Struct
 /*0245*/	uint8				guildbanker;
 /*0246*/	uint8				unknown0246[6];		//
 /*0252*/	uint32				intoxication;
-/*0256*/	uint32				spellSlotRefresh[MAX_PP_MEMSPELL];	//in ms
+/*0256*/	uint32				spellSlotRefresh[MAX_PP_REF_MEMSPELL];	//in ms
 /*0292*/	uint32				abilitySlotRefresh;
 /*0296*/	uint8				haircolor;			// Player hair color
 /*0297*/	uint8				beardcolor;			// Player beard color
@@ -942,9 +990,9 @@ struct PlayerProfile_Struct
 /*0304*/	uint8				ability_time_minutes;
 /*0305*/	uint8				ability_time_hours;	//place holder
 /*0306*/	uint8				unknown0306[6];		// @bp Spacer/Flag?
-/*0312*/	EQEmu::TextureShortProfile	item_material;	// Item texture/material of worn/held items
+/*0312*/	uint32				item_material[_MaterialCount];	// Item texture/material of worn/held items
 /*0348*/	uint8				unknown0348[44];
-/*0392*/	EQEmu::TintProfile	item_tint;
+/*0392*/	Color_Struct		item_tint[_MaterialCount];
 /*0428*/	AA_Array			aa_array[MAX_PP_AA_ARRAY];
 /*2348*/	float				unknown2384;		//seen ~128, ~47
 /*2352*/	char				servername[32];		// length probably not right
@@ -970,7 +1018,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_MEMSPELL];
+/*4632*/	uint32				mem_spells[MAX_PP_REF_MEMSPELL];
 /*4668*/	uint8				unknown4704[32];	//
 /*4700*/	float				y;					// Player y position
 /*4704*/	float				x;					// Player x position
@@ -1045,7 +1093,7 @@ struct PlayerProfile_Struct
 /*7212*/	uint32				tribute_points;
 /*7216*/	uint32				unknown7252;
 /*7220*/	uint32				tribute_active;		//1=active
-/*7224*/	Tribute_Struct		tributes[EQEmu::legacy::TRIBUTE_SIZE];
+/*7224*/	Tribute_Struct		tributes[EmuConstants::TRIBUTE_SIZE];
 /*7264*/	Disciplines_Struct	disciplines;
 /*7664*/	uint32				recastTimers[MAX_RECAST_TYPES];	// Timers (GMT of last use)
 /*7744*/	char				unknown7780[160];
@@ -1072,7 +1120,7 @@ struct PlayerProfile_Struct
 /*12800*/	uint32				expAA;
 /*12804*/	uint32				aapoints;			//avaliable, unspent
 /*12808*/	uint8				unknown12844[36];
-/*12844*/	Bandolier_Struct	bandoliers[EQEmu::legacy::BANDOLIERS_SIZE];
+/*12844*/	Bandolier_Struct	bandoliers[EmuConstants::BANDOLIERS_SIZE];
 /*14124*/	uint8				unknown14160[4506];
 /*18630*/	SuspendedMinion_Struct	SuspendedMinion; // No longer in use
 /*19240*/	uint32				timeentitledonaccount;
@@ -1179,7 +1227,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*/ EQEmu::Tint_Struct color;
+/*022*/ Color_Struct color;
 /*026*/ uint8 wear_slot_id;
 /*027*/
 };
@@ -1470,38 +1518,17 @@ struct ExpUpdate_Struct
 enum ItemPacketType
 {
 	ItemPacketViewLink			= 0x00,
-	ItemPacketMerchant			= 0x64,
 	ItemPacketTradeView			= 0x65,
 	ItemPacketLoot				= 0x66,
 	ItemPacketTrade				= 0x67,
 	ItemPacketCharInventory		= 0x69,
-	ItemPacketLimbo				= 0x6A,
-	ItemPacketWorldContainer	= 0x6B,
+	ItemPacketSummonItem		= 0x6A,
 	ItemPacketTributeItem		= 0x6C,
-	ItemPacketGuildTribute		= 0x6D,
-	ItemPacketCharmUpdate		= 0x6E, // noted as incorrect
+	ItemPacketMerchant			= 0x64,
+	ItemPacketWorldContainer	= 0x6B,
+	ItemPacketCharmUpdate		= 0x6E,
 	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;
@@ -1934,7 +1961,8 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 		uint32	unknown12;
-/*016*/	uint32	quantity;
+/*016*/	uint8	quantity;		// Already sold
+/*017*/ uint8	Unknown016[3];
 /*020*/ uint32	price;
 };
 struct Merchant_Purchase_Struct {
@@ -2071,7 +2099,7 @@ struct AdventureLeaderboard_Struct
 /*struct Item_Shop_Struct {
 	uint16 merchantid;
 	uint8 itemtype;
-	EQEmu::ItemBase item;
+	Item_Struct item;
 	uint8 iss_unknown001[6];
 };*/

@@ -2097,7 +2125,7 @@ struct Illusion_Struct { //size: 256 - SoF
 /*092*/	uint32	drakkin_heritage;	//
 /*096*/	uint32	drakkin_tattoo;		//
 /*100*/	uint32	drakkin_details;	//
-/*104*/	EQEmu::TintProfile	armor_tint;	//
+/*104*/	uint32	armor_tint[_MaterialCount];	//
 /*140*/	uint8	eyecolor1;		// Field Not Identified in any Illusion Struct
 /*141*/	uint8	eyecolor2;		// Field Not Identified in any Illusion Struct
 /*142*/	uint8	unknown138[114];	//
@@ -2508,25 +2536,23 @@ struct BookRequest_Struct {
 */
 struct Object_Struct {
 /*00*/	uint32	linked_list_addr[2];// They are, get this, prev and next, ala linked list
-/*08*/	float	size;				//
+/*08*/	uint16	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	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
-
+/*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*/
 };
 // 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
@@ -3369,6 +3395,27 @@ 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;
@@ -3426,8 +3473,8 @@ struct SelectTributeReply_Struct {

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

@@ -5296,18 +5343,21 @@ struct ClientMarqueeMessage_Struct {

 typedef std::list<ServerLootItem_Struct*> ItemList;

-
-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 */
+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 */
 };

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

 	if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
 		retransmittimer = Timer::GetCurrentTime();
@@ -86,6 +86,10 @@ 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)
@@ -288,8 +292,10 @@ 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: {
@@ -298,12 +304,14 @@ 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: {
@@ -312,6 +320,7 @@ 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);

@@ -324,6 +333,7 @@ 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);
@@ -333,8 +343,10 @@ 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: {
@@ -400,6 +412,7 @@ 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();

@@ -407,30 +420,36 @@ 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+SequencedQueue.size());
+					seq, SequencedBase, SequencedBase+NextSequencedSend);

-				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);
-						}
+				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;
 					}
 				}

 				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);
 			}
@@ -439,7 +458,11 @@ 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: {
@@ -448,6 +471,7 @@ 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),
@@ -465,7 +489,6 @@ 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);
@@ -482,6 +505,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			ServerStats->packets_received = htonll(GetPacketsReceived());

 			NonSequencedPush(new EQProtocolPacket(OP_SessionStatResponse, p->pBuffer, p->size));
+#endif
 		}
 		break;
 		case OP_SessionStatResponse: {
@@ -561,12 +585,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());

-		auto tmpbuff = new unsigned char[p->size + 3];
+		unsigned char *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);

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

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

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

 		delete[] tmpbuff;
 		SequencedPush(out);
@@ -600,32 +624,42 @@ 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(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());
+}

-	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(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());
+}
 	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)
@@ -669,15 +703,21 @@ 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();
-
-	uint16 count = 0;
-	// get to start of packets
-	while (sitr != SequencedQueue.end() && (*sitr)->sent_time > 0) {
-		++sitr;
-		++count;
-	}
+	if (sitr!=SequencedQueue.end())
+	sitr += NextSequencedSend;

 	// Loop until both are empty or MaxSends is reached
 	while(!SeqEmpty || !NonSeqEmpty) {
@@ -691,7 +731,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())) {
-				// Trying to combine this packet with the base didn't work (too big maybe)
+				// Tryint 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);
@@ -714,9 +754,16 @@ void EQStream::Write(int eq_fd)
 			NonSeqEmpty=true;
 		}

-		if (sitr != SequencedQueue.end()) {
-			uint16 seq_send = SequencedBase + count;	//just for logging...
+		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(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;
@@ -724,61 +771,17 @@ void EQStream::Write(int eq_fd)
 			}

 			if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
-				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;
-					}
+				if (!RETRANSMIT_ACKED_PACKETS && (*sitr)->acked) {
 					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;
-					++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 + 1, (*sitr)->size);
-					ReadyToSend.push(p);
-					BytesWritten+=p->size;
-					p=nullptr;
-					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;
-					}
-				} 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;
-					++count;
-				}
-			} else {
-				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;
-					++count;
+					NextSequencedSend++;
 				} 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)
@@ -794,16 +797,45 @@ void EQStream::Write(int eq_fd)
 					}
 				} else {
 					// Combine worked
-					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();
+					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;
-					++count;
+					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;
+					NextSequencedSend++;
+				} 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);
+					ReadyToSend.push(p);
+					BytesWritten+=p->size;
+					p=nullptr;
+
+					if (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;
+					}
+				} 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;
+					NextSequencedSend++;
 				}
 			}

 			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;
@@ -862,11 +894,9 @@ 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);
@@ -882,7 +912,7 @@ sockaddr_in address;

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

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

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

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

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

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

 	MInboundQueue.lock();
-	if (!InboundQueue.empty()) {
-		auto itr = InboundQueue.begin();
+	if (InboundQueue.size()) {
+		std::vector<EQRawApplicationPacket *>::iterator itr=InboundQueue.begin();
 		p=*itr;
 	}
 	MInboundQueue.unlock();
@@ -1128,6 +1158,13 @@ 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) {
@@ -1143,21 +1180,28 @@ std::deque<EQProtocolPacket *>::iterator itr, tmp;
 		//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, SequencedQueue.size());
-				SequencedBase = NextOutSeq;
-				break;
-			}
-			Log.Out(Logs::Detail, Logs::Netcode, _L "Removing acked packet with sequence %lu." __L, (unsigned long)SequencedBase);
+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);
 			//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(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());
+}
 	}

 	MOutboundQueue.unlock();
@@ -1335,18 +1379,6 @@ 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)
@@ -1354,24 +1386,18 @@ 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,6 +153,7 @@ 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
@@ -173,7 +174,7 @@ class EQStream : public EQStreamInterface {
 		Mutex MRate;
 		int32 RateThreshold;
 		int32 DecayRate;
-		uint32 AverageDelta;
+

 		OpcodeManager **OpMgr;

@@ -241,7 +242,7 @@ class EQStream : public EQStreamInterface {
 		virtual bool CheckState(EQStreamState state) { return GetState() == state; }
 		virtual std::string Describe() const { return("Direct EQStream"); }

-		virtual void SetOpcodeManager(OpcodeManager **opm) { OpMgr = opm; }
+		void SetOpcodeManager(OpcodeManager **opm) { OpMgr = opm; }

 		void CheckTimeout(uint32 now, uint32 timeout=30);
 		bool HasOutgoingData();
@@ -250,13 +251,13 @@ class EQStream : public EQStreamInterface {
 		void Write(int eq_fd);

 		// whether or not the stream has been assigned (we passed our stream match)
-		virtual void SetActive(bool val) { streamactive = val; }
+		void SetActive(bool val) { streamactive = val; }

 		//
 		inline bool IsInUse() { bool flag; MInUse.lock(); flag=(active_users>0); MInUse.unlock(); return flag; }
 		inline void PutInUse() { MInUse.lock(); active_users++; MInUse.unlock(); }

-		virtual EQStreamState GetState() { EQStreamState s; MState.lock(); s=State; MState.unlock(); return s; }
+		inline EQStreamState GetState() { EQStreamState s; MState.lock(); s=State; MState.unlock(); return s; }

 		static SeqOrder CompareSequence(uint16 expected_seq , uint16 seq);

@@ -306,7 +307,19 @@ class EQStream : public EQStreamInterface {
 		const uint64 GetPacketsReceived() { return received_packet_count; }

 		//used for dynamic stream identification
-		virtual MatchState CheckSignature(const Signature *sig);
+		class Signature {
+		public:
+			//this object could get more complicated if needed...
+			uint16 ignore_eq_opcode;		//0=dont ignore
+			uint16 first_eq_opcode;
+			uint32 first_length;			//0=dont check length
+		};
+		typedef enum {
+			MatchNotReady,
+			MatchSuccessful,
+			MatchFailed
+		} MatchState;
+		MatchState CheckSignature(const Signature *sig);

 };

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

 #ifdef _WINDOWS
-	#include <winsock2.h>
+	#include <winsock.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.empty()) {
+	if (NewStreams.size()) {
 		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
-				auto temp = stream_itr;
+				std::map<std::pair<uint32, uint16>, std::shared_ptr<EQStream>>::iterator temp = stream_itr;
 				++stream_itr;
 				temp->second = nullptr;
 				Streams.erase(temp);
@@ -250,7 +250,8 @@ void EQStreamFactory::CheckTimeout()

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

-	while (sock != -1) {
+	while(sock!=-1) {
 		MWriterRunning.lock();
 		if (!WriterRunning)
 			break;
@@ -268,36 +269,34 @@ 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 (auto stream_itr = Streams.begin(); stream_itr != Streams.end(); ++stream_itr) {
+		for(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,5 +1,3 @@
-#include <utility>
-
 #include "global_define.h"
 #include "eqemu_logsys.h"
 #include "eq_stream_ident.h"
@@ -26,8 +24,8 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }

-void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
-	auto p = new Patch;
+void EQStreamIdentifier::RegisterPatch(const EQStream::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+	Patch *p = new Patch;
 	p->signature = sig;
 	p->name = name;
 	p->opcodes = opcodes;
@@ -144,7 +142,7 @@ void EQStreamIdentifier::Process() {
 	}	//end foreach stream
 }

-void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> &eqs) {
+void EQStreamIdentifier::AddStream(std::shared_ptr<EQStream> &eqs) {
 	m_streams.push_back(Record(eqs));
 	eqs = nullptr;
 }
@@ -157,8 +155,8 @@ EQStreamInterface *EQStreamIdentifier::PopIdentified() {
 	return(res);
 }

-EQStreamIdentifier::Record::Record(std::shared_ptr<EQStreamInterface> s)
-:	stream(std::move(s)),
+EQStreamIdentifier::Record::Record(std::shared_ptr<EQStream> s)
+:	stream(s),
 	expire(STREAM_IDENT_WAIT_MS)
 {
 }
@@ -18,11 +18,11 @@ public:
 	~EQStreamIdentifier();

 	//registration interface.
-	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(const EQStream::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);

 	//main processing interface
 	void Process();
-	void AddStream(std::shared_ptr<EQStreamInterface> &eqs);
+	void AddStream(std::shared_ptr<EQStream> &eqs);
 	EQStreamInterface *PopIdentified();

 protected:
@@ -31,7 +31,7 @@ protected:
 	class Patch {
 	public:
 		std::string				name;
-		EQStreamInterface::Signature		signature;
+		EQStream::Signature		signature;
 		OpcodeManager **		opcodes;
 		const StructStrategy *structs;
 	};
@@ -40,8 +40,8 @@ protected:
 	//pending streams..
 	class Record {
 	public:
-		Record(std::shared_ptr<EQStreamInterface> s);
-		std::shared_ptr<EQStreamInterface> stream;		//we own this
+		Record(std::shared_ptr<EQStream> s);
+		std::shared_ptr<EQStream> stream;		//we own this
 		Timer expire;
 	};
 	std::vector<Record> m_streams;	//we own these objects, and the streams contained in them.
@@ -4,7 +4,7 @@
 //this is the only part of an EQStream that is seen by the application.

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

 typedef enum {
 	ESTABLISHED,
@@ -15,25 +15,11 @@ typedef enum {
 } EQStreamState;

 class EQApplicationPacket;
-class OpcodeManager;

 class EQStreamInterface {
 public:
 	virtual ~EQStreamInterface() {}

-	class Signature {
-	public:
-		//this object could get more complicated if needed...
-		uint16 ignore_eq_opcode;		//0=dont ignore
-		uint16 first_eq_opcode;
-		uint32 first_length;			//0=dont check length
-	};
-	typedef enum {
-		MatchNotReady,
-		MatchSuccessful,
-		MatchFailed
-	} MatchState;
-
 	virtual void QueuePacket(const EQApplicationPacket *p, bool ack_req=true) = 0;
 	virtual void FastQueuePacket(EQApplicationPacket **p, bool ack_req=true) = 0;
 	virtual EQApplicationPacket *PopPacket() = 0;
@@ -44,16 +30,12 @@ public:
 	virtual uint16 GetRemotePort() const = 0;
 	virtual bool CheckState(EQStreamState state) = 0;
 	virtual std::string Describe() const = 0;
-	virtual void SetActive(bool val) { }
-	virtual MatchState CheckSignature(const Signature *sig) { return MatchFailed; }
-	virtual EQStreamState GetState() = 0;
-	virtual void SetOpcodeManager(OpcodeManager **opm) = 0;

 	virtual const uint32 GetBytesSent() const { return 0; }
 	virtual const uint32 GetBytesRecieved() const { return 0; }
 	virtual const uint32 GetBytesSentPerSecond() const { return 0; }
 	virtual const uint32 GetBytesRecvPerSecond() const { return 0; }
-	virtual const EQEmu::versions::ClientVersion ClientVersion() const { return EQEmu::versions::ClientVersion::Unknown; }
+	virtual const ClientVersion GetClientVersion() const { return ClientVersion::Unknown; }
 };

 #endif /*EQSTREAMINTF_H_*/
@@ -5,7 +5,7 @@
 #include "struct_strategy.h"


-EQStreamProxy::EQStreamProxy(std::shared_ptr<EQStreamInterface> &stream, const StructStrategy *structs, OpcodeManager **opcodes)
+EQStreamProxy::EQStreamProxy(std::shared_ptr<EQStream> &stream, const StructStrategy *structs, OpcodeManager **opcodes)
 :	m_stream(stream),
 	m_structs(structs),
 	m_opcodes(opcodes)
@@ -21,19 +21,9 @@ std::string EQStreamProxy::Describe() const {
 	return(m_structs->Describe());
 }

-const EQEmu::versions::ClientVersion EQStreamProxy::ClientVersion() const
+const ClientVersion EQStreamProxy::GetClientVersion() const
 {
-	return m_structs->ClientVersion();
-}
-
-EQStreamState EQStreamProxy::GetState()
-{
-	return m_stream->GetState();
-}
-
-void EQStreamProxy::SetOpcodeManager(OpcodeManager **opm)
-{
-	return m_stream->SetOpcodeManager(opm);
+	return m_structs->GetClientVersion();
 }

 void EQStreamProxy::QueuePacket(const EQApplicationPacket *p, bool ack_req) {
@@ -14,7 +14,7 @@ class EQApplicationPacket;
 class EQStreamProxy : public EQStreamInterface {
 public:
 	//takes ownership of the stream.
-	EQStreamProxy(std::shared_ptr<EQStreamInterface> &stream, const StructStrategy *structs, OpcodeManager **opcodes);
+	EQStreamProxy(std::shared_ptr<EQStream> &stream, const StructStrategy *structs, OpcodeManager **opcodes);
 	virtual ~EQStreamProxy();

 	//EQStreamInterface:
@@ -28,9 +28,7 @@ public:
 	virtual void RemoveData();
 	virtual bool CheckState(EQStreamState state);
 	virtual std::string Describe() const;
-	virtual const EQEmu::versions::ClientVersion ClientVersion() const;
-	virtual EQStreamState GetState();
-	virtual void SetOpcodeManager(OpcodeManager **opm);
+	virtual const ClientVersion GetClientVersion() const;

 	virtual const uint32 GetBytesSent() const;
 	virtual const uint32 GetBytesRecieved() const;
@@ -38,8 +36,8 @@ public:
 	virtual const uint32 GetBytesRecvPerSecond() const;

 protected:
-	std::shared_ptr<EQStreamInterface> const m_stream;	//we own this stream object.
-	const StructStrategy *const	m_structs;	//we do not own this object.
+	std::shared_ptr<EQStream> const					m_stream;	//we own this stream object.
+	const StructStrategy *const		m_structs;	//we do not own this object.
 	//this is a pointer to a pointer to make it less likely that a packet will
 	//reference an invalid opcode manager when they are being reloaded.
 	OpcodeManager **const			m_opcodes;	//we do not own this object.
@@ -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);
-	auto res = new char[len * 2 + 1];
+	char *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) {
-				auto loginconfig = new LoginConfig;
+				LoginConfig* loginconfig = new LoginConfig;
 				text = ParseTextBlock(sub_ele, "host", true);
 				if (text) {
 					loginconfig->LoginHost = text;
@@ -254,10 +254,6 @@ 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)
@@ -266,45 +262,14 @@ 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 += '/';
 	}
 }

@@ -439,9 +404,6 @@ 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);
 	}
@@ -451,18 +413,6 @@ 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);
 	}
@@ -518,14 +468,9 @@ 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,16 +79,11 @@ 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;
@@ -158,16 +153,10 @@ class EQEmuConfig : public XMLParser
 			// Files
 			SpellsFile = "spells_us.txt";
 			OpCodesFile = "opcodes.conf";
-			PluginPlFile = "plugin.pl";
 			// Dirs
-			MapDir = "Maps/";
-			QuestDir = "quests/";
-			PluginDir = "plugins/";
-			LuaModuleDir = "lua_modules/";
-			PatchDir = "./";
-			SharedMemDir = "shared/";
-			LogDir = "logs/";
-
+			MapDir = "Maps";
+			QuestDir = "quests";
+			PluginDir = "plugins";
 			// Launcher
 			LogPrefix = "logs/zone-";
 			LogSuffix = ".log";
@@ -123,26 +123,21 @@ void EQEmuLogSys::LoadLogSettingsDefaults()

 std::string EQEmuLogSys::FormatOutMessageString(uint16 log_category, const std::string &in_message)
 {
-	std::string category_string;
-	if (log_category > 0 && Logs::LogCategoryName[log_category])
-		category_string = StringFormat("[%s] ", Logs::LogCategoryName[log_category]);
-	return StringFormat("%s%s", category_string.c_str(), in_message.c_str());
+	std::string ret;
+	ret.push_back('[');
+	ret.append(Logs::LogCategoryName[log_category]);
+	ret.push_back(']');
+	ret.push_back(' ');
+	ret.append(in_message);
+	return ret;
 }

 void EQEmuLogSys::ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message)
 {
-	/* Check if category enabled for process */
-	if (log_settings[log_category].log_to_gmsay == 0)
-		return;
-
 	/* Enabling Netcode based GMSay output creates a feedback loop that ultimately ends in a crash */
 	if (log_category == Logs::LogCategory::Netcode)
 		return;

-	/* Make sure the message inbound is at a debug level we're set at */
-	if (log_settings[log_category].log_to_gmsay < debug_level)
-		return;
-
 	/* Check to see if the process that actually ran this is zone */
 	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone)
 		on_log_gmsay_hook(log_category, message);
@@ -160,14 +155,6 @@ void EQEmuLogSys::ProcessLogWrite(uint16 debug_level, uint16 log_category, const
 		crash_log.close();
 	}

-	/* Check if category enabled for process */
-	if (log_settings[log_category].log_to_file == 0)
-		return;
-
-	/* Make sure the message inbound is at a debug level we're set at */
-	if (log_settings[log_category].log_to_file < debug_level)
-		return;
-
 	char time_stamp[80];
 	EQEmuLogSys::SetCurrentTimeStamp(time_stamp);

@@ -246,13 +233,6 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category) {

 void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message)
 {
-	/* Check if category enabled for process */
-	if (log_settings[log_category].log_to_console == 0)
-		return;
-
-	/* Make sure the message inbound is at a debug level we're set at */
-	if (log_settings[log_category].log_to_console < debug_level)
-		return;

 	#ifdef _WINDOWS
 		HANDLE  console_handle;
@@ -273,20 +253,32 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category,

 void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...)
 {
-	const bool log_to_console = log_settings[log_category].log_to_console > 0;
-	const bool log_to_file = log_settings[log_category].log_to_file > 0;
-	const bool log_to_gmsay = log_settings[log_category].log_to_gmsay > 0;
-	const bool nothing_to_log = !log_to_console && !log_to_file && !log_to_gmsay;
+	bool log_to_console = true;
+	if (log_settings[log_category].log_to_console < debug_level) {
+		log_to_console = false;
+	}

-	if (nothing_to_log) return;
+	bool log_to_file = true;
+	if (log_settings[log_category].log_to_file < debug_level) {
+		log_to_file = false;
+	}
+
+	bool log_to_gmsay = true;
+	if (log_settings[log_category].log_to_gmsay < debug_level) {
+		log_to_gmsay = false;
+	}
+
+	const bool nothing_to_log = !log_to_console && !log_to_file && !log_to_gmsay;
+	if (nothing_to_log)
+		return;

 	va_list args;
 	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,7 +83,6 @@ namespace Logs {
 		Server_Client_Packet_With_Dump,
 		Client_Server_Packet_With_Dump,
 		Login_Server,
-		Client_Login,
 		MaxCategoryID	/* Don't Remove this*/
 	};

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

@@ -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 */
-	EQEmu::TextureShortProfile	pet_items; /* Not Used */
+	uint32				pet_items[_MaterialCount]; /* 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 2000
-#define MIN_PERSONAL_FACTION -2000
+#define MAX_PERSONAL_FACTION 1200
+#define MIN_PERSONAL_FACTION -3000

 //The Level Cap:
 //#define LEVEL_CAP RuleI(Character, MaxLevel)	//hard cap is 127
@@ -16,7 +16,6 @@
 	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>
@@ -27,9 +26,16 @@
 #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 <winsock2.h>
 	#include <windows.h>
+	#include <winsock2.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.
-	auto info = new GuildInfo;
+	GuildInfo *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.
-	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];
+	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];
 	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];

-		auto title_esc = new char[rankInfo.name.length() * 2 + 1];
+		char *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);
-	auto esc = new char[len * 2 + 1];
+	char *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);
-	auto esc = new char[len * 2 + 1];
-	auto esc_set = new char[len2 * 2 + 1];
+	char *esc = new char[len*2+1];
+	char *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);
-	auto esc = new char[len * 2 + 1];
+	char *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);
-	auto esc = new char[len * 2 + 1];
+	char *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);
-	auto esc = new char[len * 2 + 1];
+	char *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) {
-		auto ci = new CharGuildInfo;
+    for (auto row = results.begin(); row != results.end(); ++row) {
+		CharGuildInfo *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);
-	auto esc = new char[nl * 2 + 1];
+	char *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);
-	auto buffer = new uint8[length];
+	uint8 *buffer = new uint8[length];

 	//a bit little better than memsetting the whole thing...
 	uint32 r,pos;
@@ -18,9 +18,7 @@

 #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>
@@ -29,7 +27,7 @@
 #endif
 #include "types.h"
 #include "eqemu_exception.h"
-#include "eqemu_config.h"
+

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

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

 #ifdef __DARWIN
@@ -1,6 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+	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
@@ -14,26 +13,23 @@

 	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
+	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 COMMON_ITEM_H
-#define COMMON_ITEM_H
-
+#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_base.h"
+#include "../common/item_struct.h"
 #include "../common/timer.h"
 #include "../common/bodytypes.h"
-#include "../common/deity.h"
-#include "../common/memory_buffer.h"

 #include <list>
 #include <map>
@@ -76,7 +72,6 @@ enum {
 	invWhereCursor		= 0x20
 };

-class ItemInst;

 // ########################################
 // Class: Queue
@@ -119,23 +114,22 @@ public:
 	///////////////////////////////
 	// Public Methods
 	///////////////////////////////
-	
-	Inventory() { m_inventory_version = EQEmu::versions::InventoryVersion::Unknown; m_inventory_version_set = false; }
+
+	Inventory() { m_version = ClientVersion::Unknown; m_versionset = false; }
 	~Inventory();

-	// inv2 creep
-	bool SetInventoryVersion(EQEmu::versions::InventoryVersion inventory_version) {
-		if (!m_inventory_version_set) {
-			m_inventory_version = EQEmu::versions::ValidateInventoryVersion(inventory_version);
-			return (m_inventory_version_set = true);
+	// Inventory v2 creep
+	bool SetInventoryVersion(ClientVersion version) {
+		if (!m_versionset) {
+			m_version = version;
+			return (m_versionset = true);
 		}
 		else {
 			return false;
 		}
 	}
-	bool SetInventoryVersion(EQEmu::versions::ClientVersion client_version) { return SetInventoryVersion(EQEmu::versions::ConvertClientVersionToInventoryVersion(client_version)); }

-	EQEmu::versions::InventoryVersion InventoryVersion() { return m_inventory_version; }
+	ClientVersion GetInventoryVersion() { return m_version; }

 	static void CleanDirty();
 	static void MarkDirty(ItemInst *inst);
@@ -175,7 +169,7 @@ public:
 	ItemInst* PopItem(int16 slot_id);

 	// Check whether there is space for the specified number of the specified item.
-	bool HasSpaceForItem(const EQEmu::ItemBase *ItemToTry, int16 Quantity);
+	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
@@ -200,7 +194,7 @@ public:
 	static int16 CalcSlotFromMaterial(uint8 material);
 	static uint8 CalcMaterialFromSlot(int16 equipslot);

-	static bool CanItemFitInContainer(const EQEmu::ItemBase *ItemToTry, const EQEmu::ItemBase *Container);
+	static bool CanItemFitInContainer(const Item_Struct *ItemToTry, const Item_Struct *Container);

 	//  Test for valid inventory casting slot
 	bool SupportsClickCasting(int16 slot_id);
@@ -258,8 +252,8 @@ protected:

 private:
 	// Active inventory version
-	EQEmu::versions::InventoryVersion m_inventory_version;
-	bool m_inventory_version_set;
+	ClientVersion m_version;
+	bool m_versionset;
 };

 class SharedDatabase;
@@ -277,7 +271,7 @@ public:
 	/////////////////////////

 	// Constructors/Destructor
-	ItemInst(const EQEmu::ItemBase* item = nullptr, int16 charges = 0);
+	ItemInst(const Item_Struct* item = nullptr, int16 charges = 0);

 	ItemInst(SharedDatabase *db, uint32 item_id, int16 charges = 0);

@@ -288,15 +282,7 @@ public:
 	~ItemInst();

 	// Query item type
-	bool IsType(EQEmu::item::ItemClass item_class) const;
-
-	bool IsClassCommon();
-	bool IsClassBag();
-	bool IsClassBook();
-
-	bool IsClassCommon() const { return const_cast<ItemInst*>(this)->IsClassCommon(); }
-	bool IsClassBag() const { return const_cast<ItemInst*>(this)->IsClassBag(); }
-	bool IsClassBook() const { return const_cast<ItemInst*>(this)->IsClassBook(); }
+	bool IsType(ItemClassTypes item_class) const;

 	// Can item be stacked?
 	bool IsStackable() const;
@@ -315,7 +301,7 @@ public:
 	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 == EQEmu::item::ItemEffectExpendable) || (m_item->ItemType == EQEmu::item::ItemTypePotion)) : false); }
+	inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == ET_Expendable ) || (m_item->ItemType == ItemTypePotion)) : false); }

 	//
 	// Contents
@@ -346,7 +332,7 @@ public:
 	bool IsAugmented();
 	ItemInst* GetOrnamentationAug(int32 ornamentationAugtype) const;
 	bool UpdateOrnamentationInfo();
-	static bool CanTransform(const EQEmu::ItemBase *ItemToTry, const EQEmu::ItemBase *Container, bool AllowAll = false);
+	static bool CanTransform(const Item_Struct *ItemToTry, const Item_Struct *Container, bool AllowAll = false);
 	
 	// Has attack/delay?
 	bool IsWeapon() const;
@@ -355,8 +341,8 @@ public:
 	// 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 EQEmu::ItemBase* GetItem() const;
-	const EQEmu::ItemBase* GetUnscaledItem() const;
+	const Item_Struct* GetItem() const;
+	const Item_Struct* GetUnscaledItem() const;

 	int16 GetCharges() const				{ return m_charges; }
 	void SetCharges(int16 charges)			{ m_charges = charges; }
@@ -424,9 +410,7 @@ public:
 	int8 GetMaxEvolveLvl() const;
 	uint32 GetKillsNeeded(uint8 currentlevel);

-	std::string Serialize(int16 slot_id) const { EQEmu::InternalSerializedItem_Struct s; s.slot_id = slot_id; s.inst = (const void*)this; std::string ser; ser.assign((char*)&s, sizeof(EQEmu::InternalSerializedItem_Struct)); return ser; }
-	void Serialize(EQEmu::OutBuffer& ob, int16 slot_id) const { EQEmu::InternalSerializedItem_Struct isi; isi.slot_id = slot_id; isi.inst = (const void*)this; ob.write((const char*)&isi, sizeof(isi)); }
-	
+	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; }

@@ -500,7 +484,7 @@ protected:
 	void _PutItem(uint8 index, ItemInst* inst) { m_contents[index] = inst; }

 	ItemInstTypes		m_use_type;	// Usage type for item
-	const EQEmu::ItemBase*	m_item;		// Ptr to item data
+	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;
@@ -512,7 +496,7 @@ protected:
 	uint32				m_exp;
 	int8				m_evolveLvl;
 	bool				m_activated;
-	EQEmu::ItemBase*		m_scaledItem;
+	Item_Struct*		m_scaledItem;
 	EvolveInfo*			m_evolveInfo;
 	bool				m_scaling;
 	uint32				m_ornamenticon;
@@ -541,4 +525,43 @@ public:
 	~EvolveInfo();
 };

-#endif /*COMMON_ITEM_H*/
+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
@@ -1,209 +0,0 @@
-/*	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_base.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::ItemBase::IsEquipable(uint16 race_id, uint16 class_id)
-{
-	if (!(Races & GetPlayerRaceBit(race_id)))
-		return false;
-
-	if (!(Classes & GetPlayerClassBit(GetPlayerClassValue(class_id))))
-		return false;
-
-	return true;
-}
-
-bool EQEmu::ItemBase::IsClassCommon()
-{
-	return (ItemClass == item::ItemClassCommon);
-}
-
-bool EQEmu::ItemBase::IsClassBag()
-{
-	return (ItemClass == item::ItemClassBag);
-}
-
-bool EQEmu::ItemBase::IsClassBook()
-{
-	return (ItemClass == item::ItemClassBook);
-}
-
-bool EQEmu::ItemBase::IsType1HWeapon()
-{
-	return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing));
-}
-
-bool EQEmu::ItemBase::IsType2HWeapon()
-{
-	return ((ItemType == item::ItemType2HBlunt) || (ItemType == item::ItemType2HSlash) || (ItemType == item::ItemType2HPiercing));
-}
-
-bool EQEmu::ItemBase::IsTypeShield()
-{
-	return (ItemType == item::ItemTypeShield);
-}
@@ -1,565 +0,0 @@
-/*	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_BASE_H
-#define COMMON_ITEM_BASE_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 ItemAttributeBit : uint32 {
-			bit_ItemAttributeNone = 0x00000000,
-			bit_ItemAttributeLore = 0x00000001,
-			bit_ItemAttributeArtifact = 0x00000002,
-			bit_ItemAttributeSummoned = 0x00000004,
-			bit_ItemAttributeMagic = 0x00000008,
-			bit_ItemAttributeAugment = 0x00000010,
-			bit_ItemAttributePendingLore = 0x00000020,
-			bit_ItemAttributeUnknown = 0xFFFFFFFF
-		};
-
-		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
-		};
-
-		extern uint32 ConvertAugTypeToAugTypeBit(uint8 aug_type);
-		extern uint8 ConvertAugTypeBitToAugType(uint32 aug_type_bit);
-
-	} /*item*/
-
-	struct InternalSerializedItem_Struct {
-		int16 slot_id;
-		const void * inst;
-	};
-
-	struct ItemBase {
-		// Non packet based fields
-		uint8	MinStatus;
-		uint8	ItemDataType; // memset to item::ItemDataBase ('0') during mmf load
-
-		// 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[EQEmu::legacy::ITEM_COMMON_SIZE];	// RoF: Augment Slot 1-6 Type
-		uint8	AugSlotVisible[EQEmu::legacy::ITEM_COMMON_SIZE];	// RoF: Augment Slot 1-6 Visible
-		uint8	AugSlotUnk2[EQEmu::legacy::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;
-		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);
-		bool IsClassCommon();
-		bool IsClassBag();
-		bool IsClassBook();
-		bool IsType1HWeapon();
-		bool IsType2HWeapon();
-		bool IsTypeShield();
-
-		bool IsEquipable(uint16 Race, uint16 Class) const { return const_cast<ItemBase*>(this)->IsEquipable(Race, Class); }
-		bool IsClassCommon() const { return const_cast<ItemBase*>(this)->IsClassCommon(); }
-		bool IsClassBag() const { return const_cast<ItemBase*>(this)->IsClassBag(); }
-		bool IsClassBook() const { return const_cast<ItemBase*>(this)->IsClassBook(); }
-		bool IsType1HWeapon() const { return const_cast<ItemBase*>(this)->IsType1HWeapon(); }
-		bool IsType2HWeapon() const { return const_cast<ItemBase*>(this)->IsType2HWeapon(); }
-		bool IsTypeShield() const { return const_cast<ItemBase*>(this)->IsTypeShield(); }
-	};
-
-} /*EQEmu*/
-
-#endif /*COMMON_ITEM_BASE_H*/
@@ -0,0 +1,255 @@
+/*	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
@@ -1,99 +0,0 @@
-/*	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();
-}
@@ -1,115 +0,0 @@
-/*	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*/
@@ -1,277 +0,0 @@
-/*	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;
-}
@@ -1,134 +0,0 @@
-/*	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 <winsock2.h>
+	#include <winsock.h>
 	#include <windows.h>
 #else
 	#include <pthread.h>
@@ -2,7 +2,7 @@
 #define MYSQL_REQUEST_RESULT_H

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

@@ -10,12 +10,6 @@
 #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 <winsock2.h>
+	#include <winsock.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, SpellBuffPacket_Struct);
+IN(OP_Buff, SpellBuffFade_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, SpellBuffPacket_Struct);
+OUT(OP_Buff, SpellBuffFade_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;
-	auto ascii = new char[cols + 1];
+	char* 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;
-	auto ascii = new char[cols + 1];
+	char* ascii = new char[cols + 1];
 	memset(ascii, 0, cols + 1);
 	uint32 i;
 	for (i = skip; i < size; i++)
@@ -94,9 +94,7 @@ 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;
-	auto ascii = new char[cols + 1];
-	memset(ascii, 0, cols + 1);
+	int j = 0; char* ascii = new char[cols+1]; memset(ascii, 0, cols+1);
 	uint32 i;
 	for(i=skip; i<size; i++)
 	{
@@ -1,19 +0,0 @@
-/*
-
-
-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
@@ -5,7 +5,7 @@ if [ -z "$1" ]; then
 	exit 1
 fi

-for ext in .cpp _limits.cpp .h _ops.h _limits.h _structs.h
+for ext in .cpp .h _ops.h _constants.h _structs.h
 do
 	cp template$ext $1$ext
 	perl -pi -e "s/TEMPLATE/$1/g" $1$ext
@@ -1,21 +1,3 @@
-/*	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"
@@ -27,9 +9,7 @@
 #include "rof.h"
 #include "rof2.h"

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

-void ReloadAllPatches()
-{
+void ReloadAllPatches() {
 	Titanium::Reload();
 	SoF::Reload();
 	SoD::Reload();
@@ -1,25 +1,5 @@
-/*	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
-
+#ifndef PATCHES_H_
+#define PATCHES_H_

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

-#endif /*COMMON_PATCHES_H*/
+#endif /*PATCHES_H_*/
@@ -1,31 +1,11 @@
-/*	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
+#ifndef ROF_H_
+#define 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);
@@ -43,31 +23,13 @@ namespace RoF
 	protected:

 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const ClientVersion GetClientVersion() 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
-	};
+};

-}; /*RoF*/
-
-#endif /*COMMON_ROF_H*/
+#endif /*ROF_H_*/
@@ -1,31 +1,11 @@
-/*	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
+#ifndef ROF2_H_
+#define 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);
@@ -43,31 +23,13 @@ namespace RoF2
 	protected:

 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const ClientVersion GetClientVersion() 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
-	};
+};

-}; /*RoF2*/
-
-#endif /*COMMON_ROF2_H*/
+#endif /*ROF2_H_*/
@@ -0,0 +1,222 @@
+/*
+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 )
+
+*/
@@ -1,284 +0,0 @@
-/*	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();
-}
@@ -1,294 +0,0 @@
-/*	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;
-
-	} /*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,23 +1,3 @@
-/*	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

@@ -141,7 +121,6 @@ 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,28 +1,7 @@
-/*	EQEMu: Everquest Server Emulator
-	
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+#ifndef ROF2_STRUCTS_H_
+#define ROF2_STRUCTS_H_

-	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 RoF2 {
 	namespace structs {

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

 // New for RoF2 - Size: 12
-struct InventorySlot_Struct
-{
-/*000*/	int16	Type;		// Worn and Normal inventory = 0, Bank = 1, Shared Bank = 2, Delete Item = -1
+struct ItemSlotStruct {
+/*000*/	int16	SlotType;	// Worn and Normal inventory = 0, Bank = 1, Shared Bank = 2, Delete Item = -1
 /*002*/	int16	Unknown02;
-/*004*/	int16	Slot;
-/*006*/	int16	SubIndex;
-/*008*/	int16	AugIndex;	// Guessing - Seen 0xffff
+/*004*/	int16	MainSlot;
+/*006*/	int16	SubSlot;
+/*008*/	int16	AugSlot;	// 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 TypelessInventorySlot_Struct
-{
-/*000*/	int16	Slot;
-/*002*/	int16	SubIndex;
-/*004*/	int16	AugIndex;
+struct MainInvItemSlotStruct {
+/*000*/	int16	MainSlot;
+/*002*/	int16	SubSlot;
+/*004*/	int16	AugSlot;
 /*006*/	int16	Unknown01;
 /*008*/
 };
@@ -163,7 +140,7 @@ struct AdventureInfo {
 ** Merth: Gave struct a name so gcc 2.96 would compile
 **
 */
-struct Tint_Struct
+struct Color_Struct
 {
 	union {
 		struct {
@@ -171,65 +148,21 @@ struct Tint_Struct
 			uint8 Green;
 			uint8 Red;
 			uint8 UseTint;	// if there's a tint this is FF
-		};
+		} RGB;
 		uint32 Color;
 	};
 };

-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::TextureCount];
-	};
-};
-
-/*
-* Visible equiptment.
-* Size: 20 Octets
-*/
-struct Texture_Struct
+struct CharSelectEquip
 {
 	uint32 Material;
 	uint32 Unknown1;
 	uint32 EliteMaterial;
 	uint32 HeroForgeModel;
-	uint32 Material2;	// Same as material?
+	uint32 Material2;
+	Color_Struct Color;
 };

-// 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
@@ -275,6 +208,21 @@ 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
@@ -476,24 +424,39 @@ struct Spawn_Struct
 /*0000*/ uint32 unknown18;
 /*0000*/ uint32 unknown19;
 	 Spawn_Struct_Position Position;
-/*0000*/ TintProfile equipment_tint;
+/*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
+         };

 // skip these bytes if not a valid player race
 /*0000*/ union
         {
           struct
           {
-			   /*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
+               /*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
           } equip;
-		   /*0000*/ Texture_Struct equipment[9];
+           /*0000*/ EquipStruct equipment[9];
         };

 /*0000*/ //char title[0];  // only read if(hasTitleOrSuffix & 4)
@@ -635,7 +598,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 reduction; // lowers reuse
+uint32 unknown12;
 };

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

 struct ManaChange_Struct
 {
-/*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
+	uint32	new_mana;                  // New Mana AMount
+	uint32	stamina;
+	uint32	spell_id;
+	uint32	unknown12;
+	uint32	unknown16;
 };

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

 struct SpellBuff_Struct
 {
-/*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)
+/*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];
 /*088*/
 };

-struct SpellBuffPacket_Struct {
-/*000*/	uint32 entityid;		// Player id who cast the buff
-/*004*/	SpellBuff_Struct buff;
+// 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];
 /*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[profile::BandolierItemCount];
+	BandolierItem_Struct Items[consts::BANDOLIER_ITEM_COUNT];
 };

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

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

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

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

 struct GroupLeadershipAA_Struct {
@@ -1055,38 +1055,38 @@ union
 {
 	struct
 	{
-		/*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
+		/*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
 		// Below slots are just guesses, but all 0s anyway...
-		/*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
+		/*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
 	} equip;
-	/*00184*/ Texture_Struct equipment[22];		// Total Slots
+	/*00184*/ EquipStruct equipment[22];		// Total Slots
 };
 /*00624*/ uint32 equip2_count;			// Seen 9
-/*00628*/ Texture_Struct equipment2[EQEmu::textures::TextureCount];	// Appears to be Visible slots, but all 0s
+/*00628*/ EquipStruct equipment2[_MaterialCount];	// Appears to be Visible slots, but all 0s
 /*00808*/ uint32 tint_count;			// Seen 9
-/*00812*/ TintProfile item_tint;		// RR GG BB 00
+/*00812*/ Color_Struct item_tint[_MaterialCount];	// RR GG BB 00
 /*00848*/ uint32 tint_count2;			// Seen 9
-/*00852*/ TintProfile item_tint2;		// RR GG BB 00
+/*00852*/ Color_Struct item_tint2[_MaterialCount];	// 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[profile::BandoliersSize]; // [20] 740 bytes (Variable Name Sizes) - bandolier contents
+/*12959*/ Bandolier_Struct bandoliers[consts::BANDOLIERS_SIZE]; // [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*/ Tint_Struct color;
+/*022*/ Color_Struct color;
 /*026*/ uint8 wear_slot_id;
 /*027*/
 };
@@ -1747,7 +1747,7 @@ struct BulkItemPacket_Struct

 struct Consume_Struct
 {
-/*000*/ InventorySlot_Struct	inventory_slot;
+/*000*/ ItemSlotStruct	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,18 +1779,16 @@ struct ItemProperties_Struct {
 /*008*/
 };

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

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

 struct Merchant_Purchase_Struct {
 /*000*/	uint32	npcid;			// Merchant NPC's entity id
-/*004*/	TypelessInventorySlot_Struct	inventory_slot;
+/*004*/	MainInvItemSlotStruct	itemslot;
 /*012*/	uint32	quantity;
 /*016*/	uint32	price;
 /*020*/
@@ -2282,10 +2280,9 @@ 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*/ TypelessInventorySlot_Struct inventory_slot;
+/*004*/ MainInvItemSlotStruct slot_id;
 /*004*/ //uint32 slot_id;
 /*008*/ uint32 unknown008;
 /*012*/ uint32 unknown012;
@@ -2341,10 +2338,9 @@ struct AltCurrencyReclaim_Struct {
 /*012*/ uint32 reclaim_flag; //1 = this is reclaim
 };

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

@@ -2706,9 +2702,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*/	InventorySlot_Struct container_slot;	// Slot of the item being augmented
+/*08*/	ItemSlotStruct container_slot;	// Slot of the item being augmented
 /*20*/	uint32	augment_index;				// Seen 0
-/*24*/	InventorySlot_Struct augment_slot;	// Slot of the distiller to use (if one applies)
+/*24*/	ItemSlotStruct 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*/
@@ -2849,8 +2845,7 @@ 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	x_tilt;				//Tilt entire object on X axis
-/*00*/	float	y_tilt;				//Tilt entire object on Y axis
+/*00*/	float	unknown032[2];		// 00 00 00 00 00 00 00 00
 /*00*/	float	size;				// Size - default 1
 /*00*/	float	z;					// z coord
 /*00*/	float	x;					// x coord
@@ -3611,6 +3606,27 @@ 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;
@@ -3674,7 +3690,7 @@ struct TributeInfo_Struct {

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

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

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

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

-struct ItemVerifyReply_Struct
-{
-/*000*/	InventorySlot_Struct inventory_slot;
+struct ItemVerifyReply_Struct {
+/*000*/	ItemSlotStruct slot;
 /*012*/	uint32	spell;		// Spell ID to cast if different than item effect
 /*016*/	uint32	target;		// Target Entity ID
 /*020*/
@@ -4772,7 +4784,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;
@@ -4810,6 +4822,7 @@ struct ItemQuaternaryBodyStruct
 	uint8 unknown37a;	// New to RoF2 - Probably variable length string
 	uint8 unknown38;	// 0
 	uint8 unknown39;	// 1
+	uint32 subitem_count;
 };

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

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

-	}; /*structs*/
-
-}; /*RoF2*/
-
-#endif /*COMMON_ROF2_STRUCTS_H*/
+#endif /*ROF2_STRUCTS_H_*/
@@ -0,0 +1,221 @@
+/*
+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 )
+
+*/
@@ -1,280 +0,0 @@
-/*	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();
-}
@@ -1,285 +0,0 @@
-/*	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;
-
-	} /*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,23 +1,3 @@
-/*	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)
@@ -1,28 +1,7 @@
-/*	EQEMu: Everquest Server Emulator
-	
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+#ifndef ROF_STRUCTS_H_
+#define ROF_STRUCTS_H_

-	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_STRUCTS_H
-#define COMMON_ROF_STRUCTS_H
-
-
-namespace RoF
-{
+namespace RoF {
 	namespace structs {

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

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

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

-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::TextureCount];
-	};
-};
-
-/*
-* Visible equiptment.
-* Size: 20 Octets
-*/
-struct Texture_Struct
+struct CharSelectEquip
 {
 	uint32 Material;
 	uint32 Unknown1;
 	uint32 EliteMaterial;
 	uint32 HeroForgeModel;
-	uint32 Material2;	// Same as material?
+	uint32 Material2;
+	Color_Struct Color;
 };

-// 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
@@ -275,6 +208,21 @@ 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
@@ -470,24 +418,39 @@ struct Spawn_Struct
 /*0000*/ uint32 unknown18;
 /*0000*/ uint32 unknown19;
 	 Spawn_Struct_Position Position;
-/*0000*/ TintProfile equipment_tint;
+/*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
+         };

 // skip these bytes if not a valid player race
 /*0000*/ union
         {
           struct
           {
-			   /*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
+               /*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
           } equip;
-		   /*0000*/ Texture_Struct equipment[9];
+           /*0000*/ EquipStruct equipment[9];
         };

 /*0000*/ //char title[0];  // only read if(hasTitleOrSuffix & 4)
@@ -624,7 +587,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 reduction; // lowers reuse
+uint32 unknown12;
 };

 /*
@@ -657,12 +620,11 @@ struct DeleteSpell_Struct

 struct ManaChange_Struct
 {
-/*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
+	uint32	new_mana;                  // New Mana AMount
+	uint32	stamina;
+	uint32	spell_id;
+	uint32	unknown12;
+	uint32	unknown16;
 };

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

 struct SpellBuff_Struct
 {
-/*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)
+/*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];
 /*088*/
 };

-struct SpellBuffPacket_Struct {
-/*000*/	uint32 entityid;		// Player id who cast the buff
-/*004*/	SpellBuff_Struct buff;
+// 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];
 /*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;
@@ -908,13 +908,13 @@ struct BandolierItem_Struct_Old
 struct Bandolier_Struct
 {
 	char Name[1];	// Variable Length
-	BandolierItem_Struct Items[profile::BandolierItemCount];
+	BandolierItem_Struct Items[consts::BANDOLIER_ITEM_COUNT];
 };

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

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

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

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

 struct GroupLeadershipAA_Struct {
@@ -1038,38 +1038,38 @@ union
 {
 	struct
 	{
-		/*00184*/ Texture_Struct equip_helmet; // Equiptment: Helmet visual
-		/*00204*/ Texture_Struct equip_chest; // Equiptment: Chest visual
-		/*00224*/ Texture_Struct equip_arms; // Equiptment: Arms visual
-		/*00244*/ Texture_Struct equip_bracers; // Equiptment: Wrist visual
-		/*00264*/ Texture_Struct equip_hands; // Equiptment: Hands visual
-		/*00284*/ Texture_Struct equip_legs; // Equiptment: Legs visual
-		/*00304*/ Texture_Struct equip_feet; // Equiptment: Boots visual
-		/*00324*/ Texture_Struct equip_primary; // Equiptment: Main visual
-		/*00344*/ Texture_Struct equip_secondary; // Equiptment: Off visual
+		/*00184*/ EquipStruct equip_helmet; // Equiptment: Helmet visual
+		/*00204*/ EquipStruct equip_chest; // Equiptment: Chest visual
+		/*00224*/ EquipStruct equip_arms; // Equiptment: Arms visual
+		/*00244*/ EquipStruct equip_bracers; // Equiptment: Wrist visual
+		/*00264*/ EquipStruct equip_hands; // Equiptment: Hands visual
+		/*00284*/ EquipStruct equip_legs; // Equiptment: Legs visual
+		/*00304*/ EquipStruct equip_feet; // Equiptment: Boots visual
+		/*00324*/ EquipStruct equip_primary; // Equiptment: Main visual
+		/*00344*/ EquipStruct equip_secondary; // Equiptment: Off visual
 		// Below slots are just guesses, but all 0s anyway...
-		/*00364*/ Texture_Struct equip_charm; // Equiptment: Non-visual
-		/*00384*/ Texture_Struct equip_ear1; // Equiptment: Non-visual
-		/*00404*/ Texture_Struct equip_ear2; // Equiptment: Non-visual
-		/*00424*/ Texture_Struct equip_face; // Equiptment: Non-visual
-		/*00444*/ Texture_Struct equip_neck; // Equiptment: Non-visual
-		/*00464*/ Texture_Struct equip_shoulder; // Equiptment: Non-visual
-		/*00484*/ Texture_Struct equip_bracer2; // Equiptment: Non-visual
-		/*00504*/ Texture_Struct equip_range; // Equiptment: Non-visual
-		/*00524*/ Texture_Struct equip_ring1; // Equiptment: Non-visual
-		/*00544*/ Texture_Struct equip_ring2; // Equiptment: Non-visual
-		/*00564*/ Texture_Struct equip_waist; // Equiptment: Non-visual
-		/*00584*/ Texture_Struct equip_powersource; // Equiptment: Non-visual
-		/*00604*/ Texture_Struct equip_ammo; // Equiptment: Non-visual
+		/*00364*/ EquipStruct equip_charm; // Equiptment: Non-visual
+		/*00384*/ EquipStruct equip_ear1; // Equiptment: Non-visual
+		/*00404*/ EquipStruct equip_ear2; // Equiptment: Non-visual
+		/*00424*/ EquipStruct equip_face; // Equiptment: Non-visual
+		/*00444*/ EquipStruct equip_neck; // Equiptment: Non-visual
+		/*00464*/ EquipStruct equip_shoulder; // Equiptment: Non-visual
+		/*00484*/ EquipStruct equip_bracer2; // Equiptment: Non-visual
+		/*00504*/ EquipStruct equip_range; // Equiptment: Non-visual
+		/*00524*/ EquipStruct equip_ring1; // Equiptment: Non-visual
+		/*00544*/ EquipStruct equip_ring2; // Equiptment: Non-visual
+		/*00564*/ EquipStruct equip_waist; // Equiptment: Non-visual
+		/*00584*/ EquipStruct equip_powersource; // Equiptment: Non-visual
+		/*00604*/ EquipStruct equip_ammo; // Equiptment: Non-visual
 	} equip;
-	/*00184*/ Texture_Struct equipment[22];
+	/*00184*/ EquipStruct equipment[22];
 };
 /*00624*/ uint32 equip2_count;			// Seen 9
-/*00628*/ Texture_Struct equipment2[9];	// Appears to be Visible slots, but all 0s
+/*00628*/ EquipStruct equipment2[9];	// Appears to be Visible slots, but all 0s
 /*00808*/ uint32 tint_count;			// Seen 9
-/*00812*/ TintProfile item_tint;		// RR GG BB 00
+/*00812*/ Color_Struct item_tint[9];	// RR GG BB 00
 /*00848*/ uint32 tint_count2;			// Seen 9
-/*00852*/ TintProfile item_tint2;		// RR GG BB 00
+/*00852*/ Color_Struct item_tint2[9];	// RR GG BB 00
 /*00888*/ uint8   haircolor;			// Player hair color
 /*00889*/ uint8   beardcolor;			// Player beard color
 /*00890*/ uint32 unknown_rof5;			//
@@ -1149,7 +1149,7 @@ union
 /*12949*/ uint32 aapoints;				// Unspent AA points - Seen 1
 /*12953*/ uint16 unknown_rof20;			//
 /*12955*/ uint32 bandolier_count;		// Seen 20
-/*12959*/ Bandolier_Struct bandoliers[profile::BandoliersSize]; // [20] 740 bytes (Variable Name Sizes) - bandolier contents
+/*12959*/ Bandolier_Struct bandoliers[consts::BANDOLIERS_SIZE]; // [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
@@ -1392,7 +1392,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*/ Tint_Struct color;
+/*022*/ Color_Struct color;
 /*026*/ uint8 wear_slot_id;
 /*027*/
 };
@@ -1777,7 +1777,7 @@ struct BulkItemPacket_Struct

 struct Consume_Struct
 {
-/*000*/ InventorySlot_Struct	inventory_slot;
+/*000*/ ItemSlotStruct	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
@@ -1809,19 +1809,17 @@ struct ItemProperties_Struct {
 /*008*/
 };

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

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

@@ -2254,7 +2252,7 @@ struct Merchant_Sell_Struct {

 struct Merchant_Purchase_Struct {
 /*000*/	uint32	npcid;			// Merchant NPC's entity id
-/*004*/	TypelessInventorySlot_Struct	inventory_slot;
+/*004*/	MainInvItemSlotStruct	itemslot;
 /*012*/	uint32	quantity;
 /*016*/	uint32	price;
 /*020*/
@@ -2312,10 +2310,9 @@ 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*/ TypelessInventorySlot_Struct inventory_slot;
+/*004*/ MainInvItemSlotStruct slot_id;
 /*008*/ uint32 unknown008;
 /*012*/ uint32 unknown012;
 /*016*/ uint32 unknown016;
@@ -2372,7 +2369,7 @@ struct AltCurrencyReclaim_Struct {

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

@@ -2733,9 +2730,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*/	InventorySlot_Struct container_slot;	// Slot of the item being augmented
+/*08*/	ItemSlotStruct container_slot;	// Slot of the item being augmented
 /*20*/	uint32	augment_index;				// Seen 0
-/*24*/	InventorySlot_Struct augment_slot;	// Slot of the distiller to use (if one applies)
+/*24*/	ItemSlotStruct 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*/
@@ -2876,8 +2873,7 @@ 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	x_tilt;				//Tilt entire object on X axis
-/*00*/	float	y_tilt;				//Tilt entire object on Y axis
+/*00*/	float	unknown032[2];		// 00 00 00 00 00 00 00 00
 /*00*/	float	size;				// Size - default 1
 /*00*/	float	z;					// z coord
 /*00*/	float	x;					// x coord
@@ -3611,6 +3607,27 @@ 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;
@@ -3674,7 +3691,7 @@ struct TributeInfo_Struct {

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

@@ -3750,12 +3766,11 @@ struct RecipeReply_Struct {
 };

 //received and sent back as an ACK with different reply_code
-struct RecipeAutoCombine_Struct
-{
+struct RecipeAutoCombine_Struct {
 /*00*/	uint32 object_type;
 /*04*/	uint32 some_id;
-/*08*/	InventorySlot_Struct container_slot;		//echoed in reply - Was uint32 unknown1
-/*20*/	InventorySlot_Struct unknown_slot;		//echoed in reply
+/*08*/	ItemSlotStruct container_slot;		//echoed in reply - Was uint32 unknown1
+/*20*/	ItemSlotStruct unknown_slot;		//echoed in reply
 /*32*/	uint32 recipe_id;
 /*36*/	uint32 reply_code;
 /*40*/
@@ -4470,22 +4485,19 @@ struct ExpansionInfo_Struct {
 /*064*/	uint32	Expansions;
 };

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

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

-struct ItemVerifyReply_Struct
-{
-/*000*/	InventorySlot_Struct inventory_slot;
+struct ItemVerifyReply_Struct {
+/*000*/	ItemSlotStruct slot;
 /*012*/	uint32	spell;		// Spell ID to cast if different than item effect
 /*016*/	uint32	target;		// Target Entity ID
 /*020*/
@@ -4507,7 +4519,7 @@ struct ItemSerializationHeader
 /*025*/	uint8  slot_type;	// 0 = normal, 1 = bank, 2 = shared bank, 9 = merchant, 20 = ?
 /*026*/	uint16 main_slot;
 /*028*/ uint16 sub_slot;
-/*030*/ uint16 aug_slot;	// 0xffff
+/*030*/ uint16 unknown013;	// 0xffff
 /*032*/	uint32 price;
 /*036*/	uint32 merchant_slot; //1 if not a merchant item
 /*040*/	uint32 scaled_value; //0
@@ -4771,7 +4783,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;
@@ -4798,6 +4810,7 @@ struct ItemQuaternaryBodyStruct
 	uint32 unknown_RoF8;
 	uint8 unknown38;	// 0
 	uint8 unknown39;	// 1
+	uint32 subitem_count;
 };

 struct AugmentInfo_Struct
@@ -5032,8 +5045,7 @@ struct MercenaryMerchantResponse_Struct {
 /*0004*/
 };

-	}; /*structs*/
+	};	//end namespace structs
+};	//end namespace RoF

-}; /*RoF*/
-
-#endif /*COMMON_ROF_STRUCTS_H*/
+#endif /*ROF_STRUCTS_H_*/
@@ -1,31 +1,11 @@
-/*	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_SOD_H
-#define COMMON_SOD_H
+#ifndef SOD_H_
+#define SOD_H_

 #include "../struct_strategy.h"

 class EQStreamIdentifier;

-namespace SoD
-{
+namespace SoD {

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

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

 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"
 		#include "sod_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,
-		Item       = 10,
-		Discipline = 11,
-		AltAbility = 0xFF
-	};
+};

-}; /*SoD*/
-
-#endif /*COMMON_SOD_H*/
+#endif /*SOD_H_*/
@@ -0,0 +1,218 @@
+/*
+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 SOD_CONSTANTS_H_
+#define SOD_CONSTANTS_H_
+
+#include "../types.h"
+
+namespace SoD {
+	namespace maps {
+		typedef enum : int16 {
+			// this needs work to match actual client equivilents
+			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,
+			MainCursor,
+			_MainCount,
+			_MainEquipmentBegin = MainCharm,
+			_MainEquipmentEnd = MainAmmo,
+			_MainEquipmentCount = (_MainEquipmentEnd - _MainEquipmentBegin + 1),
+			_MainGeneralBegin = MainGeneral1,
+			_MainGeneralEnd = MainGeneral8,
+			_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 = 80;
+		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;
+
+		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::MainGeneral8;
+		static const uint16 GENERAL_SIZE = slots::_MainGeneralCount;
+		static const int16 GENERAL_BAGS_BEGIN = 262;
+		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 = slots::MainCursor;
+		static const int16 CURSOR_BAG_BEGIN = 342;
+		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 = 2032;
+		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 = 2532;
+		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 = 5;
+		static const uint16 ITEM_CONTAINER_SIZE = 10;
+
+		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 = 50;
+	}
+
+	namespace limits {
+		static const bool ALLOWS_EMPTY_BAG_IN_BAG = false;
+		static const bool ALLOWS_CLICK_CAST_FROM_BAG = false;
+		static const bool COIN_HAS_WEIGHT = false;
+	}
+
+};	//end namespace SoD
+
+#endif /*SOD_CONSTANTS_H_*/
+
+/*
+SoD Notes:
+	** Integer-based inventory **
+ok	Possessions: 0 - 31 (Corpse: 23 - 54 [Offset 23])
+ok		[Equipment: 0 - 22]
+ok		[General: 23 - 30]
+ok		[Cursor: 31]
+ok	General Bags: 262 - 341
+ok	Cursor Bags: 342 - 351
+
+ok	Bank: 2000 - 2023
+ok	Bank Bags: 2032 - 2271
+
+ok	Shared Bank: 2500 - 2501
+ok	Shared Bank Bags: 2532 - 2551
+
+	Trade: 3000 - 3007
+	(Trade Bags: 3031 - 3110 -- server values)
+
+	World: 4000 - 4009
+
+*/
@@ -1,272 +0,0 @@
-/*	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 "sod_limits.h"
-
-#include "../string_util.h"
-
-
-size_t SoD::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::InvTypeGuildTribute:
-		return invtype::InvTypeGuildTributeSize;
-	case invtype::InvTypeMerchant:
-		return invtype::InvTypeMerchantSize;
-	case invtype::InvTypeCorpse:
-		return invtype::InvTypeCorpseSize;
-	case invtype::InvTypeBazaar:
-		return invtype::InvTypeBazaarSize;
-	case invtype::InvTypeInspect:
-		return invtype::InvTypeInspectSize;
-	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::InvTypeOther:
-		return invtype::InvTypeOtherSize;
-	default:
-		return 0;
-	}
-}
-
-const char* SoD::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::InvTypeGuildTribute:
-		return "Guild Tribute";
-	case invtype::InvTypeMerchant:
-		return "Merchant";
-	case invtype::InvTypeCorpse:
-		return "Corpse";
-	case invtype::InvTypeBazaar:
-		return "Bazaar";
-	case invtype::InvTypeInspect:
-		return "Inspect";
-	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::InvTypeOther:
-		return "Other";
-	default:
-		return "Unknown Type";
-	}
-}
-
-bool SoD::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::InvTypeGuildTribute:
-		return true;
-	default:
-		return false;
-	}
-}
-
-const char* SoD::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::PossessionsCursor:
-		return "Cursor";
-	default:
-		return "Unknown Slot";
-	}
-}
-
-const char* SoD::invslot::GetInvCorpseSlotName(int inv_slot)
-{
-	if (!invtype::GetInvTypeSize(invtype::InvTypeCorpse) || inv_slot == invslot::InvSlotInvalid)
-		return "Invalid Slot";
-
-	// needs work
-	if ((size_t)(inv_slot + 1) < invslot::CorpseBegin || (size_t)(inv_slot + 1) >= invslot::CorpseEnd)
-		return "Unknown Slot";
-
-	static std::string ret_str;
-	ret_str = StringFormat("Slot %i", (inv_slot + 1));
-
-	return ret_str.c_str();
-}
-
-const char* SoD::invslot::GetInvSlotName(int inv_type, int inv_slot)
-{
-	if (inv_type == invtype::InvTypePossessions)
-		return invslot::GetInvPossessionsSlotName(inv_slot);
-	else if (inv_type == invtype::InvTypeCorpse)
-		return invslot::GetInvCorpseSlotName(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* SoD::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* SoD::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();
-}
@@ -1,312 +0,0 @@
-/*	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_SOD_LIMITS_H
-#define COMMON_SOD_LIMITS_H
-
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
-
-
-namespace SoD
-{
-	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::SoD; }
-
-	} /*inventory*/
-
-	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-		enum : int { InvTypeInvalid = -1, InvTypeBegin };
-
-		enum InventoryType : int {
-			InvTypePossessions = InvTypeBegin,
-			InvTypeBank,
-			InvTypeSharedBank,
-			InvTypeTrade,
-			InvTypeWorld,
-			InvTypeLimbo,
-			InvTypeTribute,
-			InvTypeGuildTribute,
-			InvTypeMerchant,
-			InvTypeCorpse,
-			InvTypeBazaar,
-			InvTypeInspect,
-			InvTypeViewMODPC,
-			InvTypeViewMODBank,
-			InvTypeViewMODSharedBank,
-			InvTypeViewMODLimbo,
-			InvTypeAltStorage,
-			InvTypeArchived,
-			InvTypeOther,
-			InvTypeCount
-		};
-
-	} /*invtype*/
-
-	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-		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,
-			PossessionsCursor,
-			PossessionsCount
-		};
-
-		const int EquipmentBegin = PossessionsCharm;
-		const int EquipmentEnd = PossessionsAmmo;
-		const int EquipmentCount = (EquipmentEnd - EquipmentBegin + 1);
-
-		const int GeneralBegin = PossessionsGeneral1;
-		const int GeneralEnd = PossessionsGeneral8;
-		const int GeneralCount = (GeneralEnd - GeneralBegin + 1);
-
-	} /*invslot*/
-
-	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-		enum : int { InvBagInvalid = -1, InvBagBegin };
-
-	} /*invbag*/
-
-	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-		enum : int { InvAugInvalid = -1, InvAugBegin };
-
-	} /*invaug*/
-
-	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-		enum ItemPacketType : int {
-			ItemPacketMerchant = 100,
-			ItemPacketTradeView = 101,
-			ItemPacketLoot = 102,
-			ItemPacketTrade = 103,
-			ItemPacketCharInventory = 105,
-			ItemPacketLimbo = 106,
-			ItemPacketWorldContainer = 107,
-			ItemPacketTributeItem = 108,
-			ItemPacketGuildTribute = 109,
-			ItemPacketCharmUpdate = 110
-		};
-
-	} /*item*/
-
-	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-	} /*profile*/
-
-	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-	} /*constants*/
-
-	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-	} /*behavior*/
-
-	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoD; }
-
-	} /*skills*/
-
-
-	// declarations
-	namespace inventory {
-		const bool ConcatenateInvTypeLimbo = true;
-
-		const bool AllowOverLevelEquipment = false;
-
-		const bool AllowEmptyBagInBag = false;
-		const bool AllowClickCastFromBag = false;
-
-	} /*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 InvTypeGuildTributeSize = 2;
-		const size_t InvTypeMerchantSize = 80;
-		const size_t InvTypeCorpseSize = InvTypePossessionsSize;
-		const size_t InvTypeBazaarSize = 80;
-		const size_t InvTypeInspectSize = invslot::EquipmentCount;
-		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 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 {
-		const int BankBegin = 2000;
-		const int BankEnd = (BankBegin + invtype::InvTypeBankSize) - 1;
-
-		const int SharedBankBegin = 2500;
-		const int SharedBankEnd = (SharedBankBegin + invtype::InvTypeSharedBankSize) - 1;
-
-		const int TradeBegin = 3000;
-		const int TradeEnd = (TradeBegin + invtype::InvTypeTradeSize) - 1;
-		const int TradeNPCEnd = 3003;
-
-		const int WorldBegin = 4000;
-		const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1;
-
-		const int TributeBegin = 400;
-		const int TributeEnd = (TributeBegin + invtype::InvTypeTributeSize) - 1;
-
-		const int GuildTributeBegin = 450;
-		const int GuildTributeEnd = (GuildTributeBegin + invtype::InvTypeGuildTributeSize) - 1;
-
-		const int CorpseBegin = invslot::PossessionsGeneral1;
-		const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor;
-
-		extern const char* GetInvPossessionsSlotName(int inv_slot);
-		extern const char* GetInvCorpseSlotName(int inv_slot);
-		extern const char* GetInvSlotName(int inv_type, int inv_slot);
-
-	} /*invslot*/
-
-	namespace invbag {
-		const size_t ItemBagSize = 10;
-
-		const int GeneralBagsBegin = 262;
-		const int GeneralBagsSize = invslot::GeneralCount * ItemBagSize;
-		const int GeneralBagsEnd = (GeneralBagsBegin + GeneralBagsSize) - 1;
-
-		const int CursorBagBegin = 342;
-		const int CursorBagSize = ItemBagSize;
-		const int CursorBagEnd = (CursorBagBegin + CursorBagSize) - 1;
-
-		const int BankBagsBegin = 2032;
-		const int BankBagsSize = (invtype::InvTypeBankSize * ItemBagSize);
-		const int BankBagsEnd = (BankBagsBegin + BankBagsSize) - 1;
-
-		const int SharedBankBagsBegin = 2532;
-		const int SharedBankBagsSize = invtype::InvTypeSharedBankSize * ItemBagSize;
-		const int SharedBankBagsEnd = (SharedBankBagsBegin + SharedBankBagsSize) - 1;
-
-		const int TradeBagsBegin = 3031;
-		const int TradeBagsSize = invtype::InvTypeTradeSize * ItemBagSize;
-		const int TradeBagsEnd = (TradeBagsBegin + TradeBagsSize) - 1;
-
-		extern const char* GetInvBagIndexName(int bag_index);
-
-	} /*invbag*/
-
-	namespace invaug {
-		const size_t ItemAugSize = 5;
-
-		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 = 50;
-
-	} /*constants*/
-
-	namespace behavior {
-		const bool CoinHasWeight = false;
-
-	} /*behavior*/
-
-	namespace skills {
-		const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack;
-
-	} /*skills*/
-
-}; /*SoD*/
-
-#endif /*COMMON_SOD_LIMITS_H*/
@@ -1,23 +1,3 @@
-/*	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)
@@ -1,28 +1,7 @@
-/*	EQEMu: Everquest Server Emulator
-	
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+#ifndef SOD_STRUCTS_H_
+#define SOD_STRUCTS_H_

-	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_SOD_STRUCTS_H
-#define COMMON_SOD_STRUCTS_H
-
-
-namespace SoD
-{
+namespace SoD {
 	namespace structs {


@@ -122,7 +101,7 @@ struct AdventureInfo {
 ** Merth: Gave struct a name so gcc 2.96 would compile
 **
 */
-struct Tint_Struct
+struct Color_Struct
 {
 	union {
 		struct {
@@ -130,62 +109,19 @@ struct Tint_Struct
 			uint8 Green;
 			uint8 Red;
 			uint8 UseTint;	// if there's a tint this is FF
-		};
+		} RGB;
 		uint32 Color;
 	};
 };

-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::TextureCount];
-	};
-};
-
-/*
-* Visible equiptment.
-* Size: 12 Octets
-*/
-struct Texture_Struct
+struct CharSelectEquip
 {
 	uint32 Material;
 	uint32 Unknown1;
 	uint32 EliteMaterial;
+	Color_Struct Color;
 };

-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*/	uint8 Level;				//
@@ -195,7 +131,7 @@ struct CharacterSelectEntry_Struct
 /*0000*/	uint8 Beard;				//
 /*0001*/	uint8 HairColor;			//
 /*0000*/	uint8 Face;					//
-/*0000*/	CharSelectEquip	Equip[EQEmu::textures::TextureCount];
+/*0000*/	CharSelectEquip	Equip[9];
 /*0000*/	uint32 PrimaryIDFile;		//
 /*0000*/	uint32 SecondaryIDFile;		//
 /*0000*/	uint8 Unknown15;			// 0xff
@@ -228,6 +164,19 @@ struct CharacterSelect_Struct
 /*0008*/	CharacterSelectEntry_Struct Entries[0];
 };

+/*
+* Visible equiptment.
+* Size: 12 Octets
+*/
+struct EquipStruct
+{
+/*00*/ uint32 Material;
+/*04*/ uint32 Unknown1;
+/*08*/ uint32 EliteMaterial;
+/*12*/
+};
+
+
 /*
 ** Generic Spawn Struct
 ** Length: 897 Octets
@@ -344,10 +293,40 @@ struct Spawn_Struct
 /*0000*/ uint32 unknown18;
 /*0000*/ uint32 unknown19;
 	 Spawn_Struct_Position Position;
-/*0000*/ TintProfile equipment_tint;
+/*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
+         };

 // skip these bytes if not a valid player race
-/*0000*/ TextureProfile equipment;
+/*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
+           } equip;
+           /*0000*/ EquipStruct equipment[9];
+         };

 /*0000*/ //char title[0];  // only read if(hasTitleOrSuffix & 4)
 /*0000*/ //char suffix[0]; // only read if(hasTitleOrSuffix & 8)
@@ -479,7 +458,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 reduction; // lowers reuse
+//uint32 unknown12;
 };

 /*
@@ -512,12 +491,11 @@ struct DeleteSpell_Struct

 struct ManaChange_Struct
 {
-/*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
+	uint32	new_mana;                  // New Mana AMount
+	uint32	stamina;
+	uint32	spell_id;
+	uint32	unknown12;
+	uint32	unknown16;
 };

 struct SwapSpell_Struct
@@ -564,22 +542,32 @@ struct SpawnAppearance_Struct
 // this is used inside profile
 struct SpellBuff_Struct
 {
-/*000*/	uint8 effect_type;		// 0 = no buff, 2 = buff, 4 = inverse affects of buff
-/*001*/	uint8 level;			// Seen 1 for no buff
-/*002*/	uint8 bard_modifier;
-/*003*/	uint8 unknown003;   	// MQ2 used to call this "damage shield" -- don't see client referencing it, so maybe server side DS type tracking?
-/*004*/	uint32 spellid;
-/*008*/	uint32 duration;
-/*012*/	uint32 counters;
-/*016*/	uint32 unknown016;
-/*020*/	uint32 player_id;		// caster ID, pretty sure just zone ID
+/*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*/	uint32	spellid;
+/*008*/ int32	duration;
+/*012*/	uint32   counters;
+/*016*/ uint32  unknown004;    //Might need to be swapped with player_id
+/*020*/ uint32	player_id;	//'global' ID of the caster, for wearoff messages
 /*024*/
+
+
 };


-struct SpellBuffPacket_Struct {
+struct SpellBuffFade_Struct {
 /*000*/	uint32 entityid;
-/*004*/	SpellBuff_Struct buff;
+/*004*/	uint8 slot;
+/*005*/	uint8 level;
+/*006*/	uint8 effect;
+/*007*/	uint8 unknown7;
+/*008*/	uint32 spellid;
+/*012*/	int32 duration;
+/*016*/	uint32 unknown016;
+/*020*/	uint32 unknown020;	//prolly global player ID
+/*024*/ uint32 playerId;       // Player id who cast the buff
 /*028*/	uint32 slotid;
 /*032*/	uint32 bufffade;
 /*036*/
@@ -717,7 +705,7 @@ struct BandolierItem_Struct
 struct Bandolier_Struct
 {
 	char Name[32];
-	BandolierItem_Struct Items[profile::BandolierItemCount];
+	BandolierItem_Struct Items[consts::BANDOLIER_ITEM_COUNT];
 };

 //len = 72
@@ -731,7 +719,7 @@ struct PotionBeltItem_Struct
 //len = 288
 struct PotionBelt_Struct
 {
-	PotionBeltItem_Struct Items[profile::PotionBeltSize];
+	PotionBeltItem_Struct Items[consts::POTION_BELT_ITEM_COUNT];
 };

 static const uint32 MAX_GROUP_LEADERSHIP_AA_ARRAY = 16;
@@ -894,9 +882,24 @@ struct PlayerProfile_Struct
 /*00216*/ uint8   hairstyle;			// Player hair style
 /*00217*/ uint8   beard;				// Player beard type
 /*00218*/ uint8 unknown00178[14];		//[10]14 on Live? was 10
-/*00232*/ TextureProfile equipment;
+/*00232*/ union
+	 {
+		struct
+		{
+		/*00228*/ EquipStruct equip_helmet; // Equiptment: Helmet visual
+		/*00240*/ EquipStruct equip_chest; // Equiptment: Chest visual
+		/*00252*/ EquipStruct equip_arms; // Equiptment: Arms visual
+		/*00264*/ EquipStruct equip_bracers; // Equiptment: Wrist visual
+		/*00276*/ EquipStruct equip_hands; // Equiptment: Hands visual
+		/*00288*/ EquipStruct equip_legs; // Equiptment: Legs visual
+		/*00300*/ EquipStruct equip_feet; // Equiptment: Boots visual
+		/*00312*/ EquipStruct equip_primary; // Equiptment: Main visual
+		/*00324*/ EquipStruct equip_secondary; // Equiptment: Off visual
+		} equip;
+		/*00228*/ EquipStruct equipment[9]; //Live Shows [108] for this part
+	 };
 /*00340*/ uint8 unknown00224[156];		// Live Shows [160]
-/*00496*/ TintProfile item_tint;		// RR GG BB 00
+/*00496*/ Color_Struct item_tint[9];	// RR GG BB 00
 /*00532*/ AA_Array  aa_array[MAX_PP_AA_ARRAY];	// [3600] AAs 12 bytes each
 /*04132*/ uint32  points;				// Unspent Practice points - RELOCATED???
 /*04136*/ uint32  mana;					// Current mana
@@ -936,7 +939,7 @@ struct PlayerProfile_Struct
 /*08288*/ uint32  aapoints_spent;		// Number of spent AA points
 /*08292*/ uint32  aapoints;				// Unspent AA points
 /*08296*/ uint8 unknown06160[4];
-/*08300*/ Bandolier_Struct bandoliers[profile::BandoliersSize]; // [6400] bandolier contents
+/*08300*/ Bandolier_Struct bandoliers[consts::BANDOLIERS_SIZE]; // [6400] bandolier contents
 /*14700*/ PotionBelt_Struct  potionbelt;	// [360] potion belt 72 extra octets by adding 1 more belt slot
 /*15060*/ uint8 unknown12852[8];
 /*15068*/ uint32 available_slots;
@@ -1153,7 +1156,7 @@ struct WearChange_Struct{
 /*002*/ uint32 material;
 /*006*/ uint32 unknown06;
 /*010*/ uint32 elite_material;	// 1 for Drakkin Elite Material
-/*014*/ Tint_Struct color;
+/*014*/ Color_Struct color;
 /*018*/ uint8 wear_slot_id;
 /*019*/
 };
@@ -1880,7 +1883,8 @@ struct Merchant_Sell_Struct {
 /*004*/	uint32	playerid;		// Player's entity id
 /*008*/	uint32	itemslot;
 /*012*/	uint32	unknown12;
-/*016*/	uint32	quantity;
+/*016*/	uint8	quantity;		// Already sold
+/*017*/ uint8	Unknown017[3];
 /*020*/	uint32	Unknown020;
 /*024*/	uint32	price;
 /*028*/	uint32	pricehighorderbits;	// It appears the price is 64 bits in SoD+
@@ -1970,7 +1974,7 @@ struct AdventureLeaderboard_Struct
 /*struct Item_Shop_Struct {
 	uint16 merchantid;
 	uint8 itemtype;
-	ItemBase item;
+	Item_Struct item;
 	uint8 iss_unknown001[6];
 };*/

@@ -3066,6 +3070,27 @@ 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;
@@ -3981,7 +4006,7 @@ struct ItemBodyStruct
 	uint32 Races;
 	uint32 Deity;
 	int32 SkillModValue;
-	uint32 SkillModMax;
+	uint32 unknown6;
 	uint32 SkillModType;
 	uint32 BaneDmgRace;
 	uint32 BaneDmgBody;
@@ -4159,9 +4184,10 @@ 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
+	uint32 subitem_count;
 };

 struct AugmentInfo_Struct
@@ -4403,8 +4429,7 @@ struct MercenaryAssign_Struct {
 /*0012*/
 };

-	}; /*structs*/
+	};	//end namespace structs
+};	//end namespace SoD

-}; /*SoD*/
-
-#endif /*COMMON_SOD_STRUCTS_H*/
+#endif /*SOD_STRUCTS_H_*/
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
KimLS	c1bcf4dfeb	Merge branch 'master' into lets_move	2016-01-25 14:34:16 -08:00
KimLS	ec58d92e42	Update recast	2016-01-25 14:33:40 -08:00
KimLS	913fb6c22e	Merge branch 'master' into lets_move	2016-01-22 19:17:38 -08:00
KimLS	76f3bb1ce6	Changed how i calc partial and broken paths	2016-01-22 19:16:14 -08:00
KimLS	66c952eff0	Merge branch 'master' into lets_move	2016-01-18 20:15:36 -08:00
KimLS	946cee01fc	Minor tweak to autoporting code	2016-01-18 20:14:57 -08:00
KimLS	978650eb1f	Pathing underwater works a lot better now.	2016-01-18 15:22:17 -08:00
KimLS	a6a06de994	Changes to UF and above clients on how spell buff tics are synced.	2016-01-17 17:40:29 -08:00
KimLS	10952932d3	Change how tics happen, support for v2 .nav files	2016-01-17 14:05:34 -08:00
KimLS	14b9b22ca3	Will no longer use bestz snapping every frame if a navmesh is available. Fix for inliquid	2016-01-16 20:35:18 -08:00
KimLS	a2136e5ee4	Some work on movement.	2016-01-16 19:37:15 -08:00
KimLS	84dec889da	Merge branch 'master' into lets_move	2016-01-15 14:32:27 -08:00
KimLS	1d055b5364	Tweaks to log.out to filter messages at detail level not just cat level before formatting the message, tweaks to pathing, nearly where i want it but not entirely there.	2016-01-15 14:32:00 -08:00
KimLS	14d8683227	Fix for swapped x and y returns on failure case for FindRoute	2016-01-14 21:55:08 -08:00
KimLS	9c3e957d4e	Fix for pathfind.h	2016-01-13 13:57:35 -08:00
KimLS	b94b59cf9b	Missing string.h	2016-01-13 13:50:17 -08:00
KimLS	ca817051e7	removed branch restriction in travis	2016-01-13 13:43:28 -08:00
KimLS	1cb07d055e	Pathing is essentially fully functional now, still could use improvements here and there	2016-01-13 13:39:42 -08:00
KimLS	e61e2e7f02	find command uses new pathing system now which loads .nav files saved by map_edit, still in initial stages of testing. Fixed a bug where find might cause a desync in some cases as well.	2016-01-12 18:33:00 -08:00
KimLS	c6e9fbc878	Merge branch 'master' into lets_move	2016-01-12 00:38:43 -08:00
KimLS	909cbd8b97	Merge branch 'master' into lets_move	2016-01-09 01:40:54 -08:00
KimLS	2ed348f23d	Adding crazy behavior interface.	2016-01-09 01:39:23 -08:00