Merge branch 'master' into Bot_Raid_work

common/CMakeLists.txt

@@ -16,6 +16,7 @@ SET(common_sources
 	database_instances.cpp
 	dbcore.cpp
 	deity.cpp
+	dynamic_zone_base.cpp
 	emu_constants.cpp
 	emu_limits.cpp
 	emu_opcodes.cpp
@@ -68,7 +69,9 @@ SET(common_sources
 	rulesys.cpp
 	say_link.cpp
 	serialize_buffer.cpp
+	server_event_scheduler.cpp
 	serverinfo.cpp
+	shared_tasks.cpp
 	shareddb.cpp
 	skills.cpp
 	spdat.cpp
@@ -151,6 +154,7 @@ SET(repositories
 	repositories/base/base_character_disciplines_repository.h
 	repositories/base/base_character_expedition_lockouts_repository.h
 	repositories/base/base_character_inspect_messages_repository.h
+	repositories/base/base_character_instance_safereturns_repository.h
 	repositories/base/base_character_item_recast_repository.h
 	repositories/base/base_character_languages_repository.h
 	repositories/base/base_character_leadership_abilities_repository.h
@@ -162,11 +166,15 @@ SET(repositories
 	repositories/base/base_character_potionbelt_repository.h
 	repositories/base/base_character_skills_repository.h
 	repositories/base/base_character_spells_repository.h
+	repositories/base/base_character_task_timers_repository.h
 	repositories/base/base_character_tasks_repository.h
 	repositories/base/base_char_create_combinations_repository.h
 	repositories/base/base_char_create_point_allocations_repository.h
 	repositories/base/base_char_recipe_list_repository.h
 	repositories/base/base_completed_tasks_repository.h
+	repositories/base/base_completed_shared_tasks_repository.h
+	repositories/base/base_completed_shared_task_members_repository.h
+	repositories/base/base_completed_shared_task_activity_state_repository.h
 	repositories/base/base_content_flags_repository.h
 	repositories/base/base_damageshieldtypes_repository.h
 	repositories/base/base_data_buckets_repository.h
@@ -174,10 +182,10 @@ SET(repositories
 	repositories/base/base_discovered_items_repository.h
 	repositories/base/base_doors_repository.h
 	repositories/base/base_dynamic_zones_repository.h
+	repositories/base/base_dynamic_zone_members_repository.h
 	repositories/base/base_eventlog_repository.h
 	repositories/base/base_expeditions_repository.h
 	repositories/base/base_expedition_lockouts_repository.h
-	repositories/base/base_expedition_members_repository.h
 	repositories/base/base_faction_base_data_repository.h
 	repositories/base/base_faction_list_repository.h
 	repositories/base/base_faction_list_mod_repository.h
@@ -251,6 +259,11 @@ SET(repositories
 	repositories/base/base_rule_sets_repository.h
 	repositories/base/base_rule_values_repository.h
 	repositories/base/base_saylink_repository.h
+	repositories/base/base_server_scheduled_events_repository.h
+	repositories/base/base_shared_tasks_repository.h
+	repositories/base/base_shared_task_activity_state_repository.h
+	repositories/base/base_shared_task_dynamic_zones_repository.h
+	repositories/base/base_shared_task_members_repository.h
 	repositories/base/base_skill_caps_repository.h
 	repositories/base/base_spawn2_repository.h
 	repositories/base/base_spawnentry_repository.h
@@ -314,6 +327,7 @@ SET(repositories
 	repositories/character_disciplines_repository.h
 	repositories/character_expedition_lockouts_repository.h
 	repositories/character_inspect_messages_repository.h
+	repositories/character_instance_safereturns_repository.h
 	repositories/character_item_recast_repository.h
 	repositories/character_languages_repository.h
 	repositories/character_leadership_abilities_repository.h
@@ -325,11 +339,15 @@ SET(repositories
 	repositories/character_potionbelt_repository.h
 	repositories/character_skills_repository.h
 	repositories/character_spells_repository.h
+	repositories/character_task_timers_repository.h
 	repositories/character_tasks_repository.h
 	repositories/char_create_combinations_repository.h
 	repositories/char_create_point_allocations_repository.h
 	repositories/char_recipe_list_repository.h
 	repositories/completed_tasks_repository.h
+	repositories/completed_shared_tasks_repository.h
+	repositories/completed_shared_task_members_repository.h
+	repositories/completed_shared_task_activity_state_repository.h
 	repositories/content_flags_repository.h
 	repositories/damageshieldtypes_repository.h
 	repositories/data_buckets_repository.h
@@ -337,10 +355,10 @@ SET(repositories
 	repositories/discovered_items_repository.h
 	repositories/doors_repository.h
 	repositories/dynamic_zones_repository.h
+	repositories/dynamic_zone_members_repository.h
 	repositories/eventlog_repository.h
 	repositories/expeditions_repository.h
 	repositories/expedition_lockouts_repository.h
-	repositories/expedition_members_repository.h
 	repositories/faction_base_data_repository.h
 	repositories/faction_list_repository.h
 	repositories/faction_list_mod_repository.h
@@ -414,6 +432,11 @@ SET(repositories
 	repositories/rule_sets_repository.h
 	repositories/rule_values_repository.h
 	repositories/saylink_repository.h
+	repositories/server_scheduled_events_repository.h
+	repositories/shared_tasks_repository.h
+	repositories/shared_task_activity_state_repository.h
+	repositories/shared_task_dynamic_zones_repository.h
+	repositories/shared_task_members_repository.h
 	repositories/skill_caps_repository.h
 	repositories/spawn2_repository.h
 	repositories/spawnentry_repository.h
@@ -446,6 +469,7 @@ SET(repositories
 )
 
 SET(common_headers
+	additive_lagged_fibonacci_engine.h
 	any.h
 	base_packet.h
 	base_data.h
@@ -460,12 +484,14 @@ SET(common_headers
 	cli/argh.h
 	cli/eqemu_command_handler.h
 	cli/terminal_color.hpp
+	cron/croncpp.h
 	database/database_dump_service.h
 	data_verification.h
 	database.h
 	database_schema.h
 	dbcore.h
 	deity.h
+	dynamic_zone_base.h
 	emu_constants.h
 	emu_limits.h
 	emu_opcodes.h
@@ -500,6 +526,7 @@ SET(common_headers
 	guild_base.h
 	guilds.h
 	http/httplib.h
+	http/uri.h
 	inventory_profile.h
 	inventory_slot.h
 	ipc_mutex.h
@@ -541,13 +568,16 @@ SET(common_headers
 	say_link.h
 	seperator.h
 	serialize_buffer.h
+	server_event_scheduler.h
 	serverinfo.h
 	servertalk.h
+	shared_tasks.h
 	shareddb.h
 	skills.h
 	spdat.h
     string_util.h
 	struct_strategy.h
+	tasks.h
 	textures.h
 	timer.h
 	types.h
@@ -609,7 +639,8 @@ SET(common_headers
 	StackWalker/StackWalker.h
 	util/memory_stream.h
 	util/directory.h
-	util/uuid.h)
+	util/uuid.h
+)
 
 SOURCE_GROUP(Event FILES
 	event/event_loop.h

common/additive_lagged_fibonacci_engine.h

@@ -0,0 +1,147 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2021 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
+*/
+
+#pragma once
+
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+#include <algorithm>
+#include <iostream>
+
+/*
+ * This is an additive lagged fibonacci generator as seen in The Art of Computer Programming, Vol. 2
+ * This should roughly match the implementation that EQ's client uses and be compatible with our Random class
+ *
+ * EQ's rand looks like it was from an example implementation that as posted on pscode.com
+ *
+ * You might also want to consider defining BIASED_INT_DIST as well to more closely match EQ
+ */
+
+namespace EQ {
+	template<typename UIntType, size_t w, size_t j, size_t k>
+	class additive_lagged_fibonacci_engine {
+		static_assert(std::is_unsigned<UIntType>::value, "result_type must be an unsigned integral type");
+		static_assert(0u < j && j < k, "0 < j < k");
+		static_assert(0u < w && w <= std::numeric_limits<UIntType>::digits,
+			      "template argument substituting w out of bounds");
+
+	public:
+		using result_type = UIntType;
+		static constexpr size_t word_size = w;
+		static constexpr size_t short_lag = j;
+		static constexpr size_t long_lag = k;
+		static constexpr result_type default_seed = 19780503u; // default for subtract_with_carry_engine
+
+		additive_lagged_fibonacci_engine() : additive_lagged_fibonacci_engine(default_seed) {}
+
+		explicit additive_lagged_fibonacci_engine(result_type sd) { seed(sd); }
+
+		void seed(result_type seed = default_seed)
+		{
+			state1 = long_lag - long_lag;
+			state2 = long_lag - short_lag;
+			state[0] = static_cast<int>(seed) & ((1u << word_size) - 1);
+			state[1] = 1;
+			for (int i = 2; i < long_lag; ++i)
+				state[i] = (state[i - 1] + state[i - 2]) & ((1u << word_size) - 1);
+			return;
+			}
+			// TODO: seed via seed_seq
+
+			static constexpr result_type min() { return 0; }
+			static constexpr result_type max() { return ((1u << word_size) - 1) >> 6; }
+
+			void discard(unsigned long long z) {
+				for (; z != 0ULL; --z)
+					(*this)();
+			}
+
+			result_type operator()() {
+				result_type rand = (state[state1] + state[state2]) & ((1u << word_size) - 1);
+				state[state1] = rand;
+				if (++state1 == long_lag)
+					state1 = 0;
+				if (++state2 == long_lag)
+					state2 = 0;
+
+				return rand >> 6;
+			}
+
+		private:
+			result_type state1;
+			result_type state2;
+			result_type state[long_lag];
+
+		public:
+			template<typename UInt, size_t W, size_t J, size_t K>
+			friend bool operator==(const additive_lagged_fibonacci_engine<UInt, W, J, K> &x,
+					const additive_lagged_fibonacci_engine<UInt, W, J, K> &y)
+			{
+				return std::equal(x.state, x.state + long_lag, y.state) && x.state1 == y.state1 &&
+				       x.state2 == y.state2;
+			}
+
+			template<typename UInt, size_t W, size_t J, size_t K>
+			friend bool operator!=(const additive_lagged_fibonacci_engine<UInt, W, J, K> &x,
+					const additive_lagged_fibonacci_engine<UInt, W, J, K> &y)
+			{ return !(x == y); }
+
+			template<typename UInt, size_t W, size_t J, size_t K, typename CharT, typename Traits>
+			friend std::basic_ostream<CharT, Traits> &
+			operator<<(std::basic_istream<CharT, Traits> &os, additive_lagged_fibonacci_engine<UInt, W, J, K> &x)
+			{
+				using ios_base = typename std::basic_istream<CharT, Traits>::ios_base;
+
+				const typename ios_base::fmtflags flags = os.flags();
+				const CharT fill = os.fill();
+				const CharT space = os.widen(' ');
+				os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
+				os.fill(space);
+
+				for (size_t i = 0; i < long_lag; ++i)
+					os << x.state[i] << space;
+				os << x.state1 << space << x.state2;
+
+				os.flags(flags);
+				os.fill(fill);
+				return os;
+			}
+
+			template<typename UInt, size_t W, size_t J, size_t K, typename CharT, typename Traits>
+			friend std::basic_istream<CharT, Traits> &
+			operator>>(std::basic_istream<CharT, Traits> &is, additive_lagged_fibonacci_engine<UInt, W, J, K> &x)
+			{
+				using ios_base = typename std::basic_istream<CharT, Traits>::ios_base;
+
+				const typename ios_base::fmtflags flags = is.flags();
+				is.flags(ios_base::dec | ios_base::skipws);
+
+				for (size_t i = 0; i < long_lag; ++i)
+					is >> x.state[i];
+				is >> x.state1;
+				is >> x.state2;
+
+				is.flags(flags);
+				return is;
+			}
+	};
+
+	using EQRand = additive_lagged_fibonacci_engine<uint32_t, 30, 24, 55>;
+};
+

common/bodytypes.h

@@ -27,16 +27,17 @@ typedef enum {
 	BT_Extraplanar		= 6,
 	BT_Magical			= 7,	//this name might be a bit off,
 	BT_SummonedUndead	= 8,
-	BT_RaidGiant		= 9,
-	//					...
+	BT_RaidGiant		= 9,    //Velious era Raid Giant
+	BT_RaidColdain      = 10,   //Velious era Raid Coldain
 	BT_NoTarget			= 11,	//no name, can't target this bodytype
 	BT_Vampire			= 12,
 	BT_Atenha_Ra		= 13,
 	BT_Greater_Akheva	= 14,
 	BT_Khati_Sha		= 15,
-	BT_Seru				= 16,	//not confirmed....
+	BT_Seru				= 16,	
+	BT_Grieg_Veneficus  = 17,
 	BT_Draz_Nurakk      = 18,
-	BT_Zek				= 19,
+	BT_Zek				= 19,	//"creatures from the Plane of War."
 	BT_Luggald			= 20,
 	BT_Animal			= 21,
 	BT_Insect			= 22,
@@ -46,17 +47,18 @@ typedef enum {
 	BT_Dragon			= 26,
 	BT_Summoned2		= 27,
 	BT_Summoned3		= 28,
-						//29
+	BT_Dragon2          = 29,   //database data indicates this is a dragon type (kunark and DoN?)
 	BT_VeliousDragon	= 30,	//might not be a tight set
-	//					...
+	BT_Familiar			= 31,
 	BT_Dragon3			= 32,
 	BT_Boxes			= 33,
 	BT_Muramite			= 34,	//tribal dudes
 	//					...
 	BT_NoTarget2		= 60,
 	//					...
-	BT_SwarmPet			= 63,	//is this valid, or made up?
-	//					...
+	BT_SwarmPet			= 63,	//Looks like weapon proc related temp pets and few misc pets, should not be used for checking swarm pets in general.
+	BT_MonsterSummon	= 64,
+	                   // 65,   trap or effect related?
 	BT_InvisMan			= 66,	//no name, seen on 'InvisMan', can be /targeted
 	BT_Special			= 67
 } bodyType;

common/content/world_content_service.cpp

@@ -22,6 +22,7 @@
 #include "../database.h"
 #include "../rulesys.h"
 #include "../eqemu_logsys.h"
+#include "../repositories/content_flags_repository.h"
 
 
 WorldContentService::WorldContentService()
@@ -34,8 +35,12 @@ int WorldContentService::GetCurrentExpansion() const
 	return current_expansion;
 }
 
-void WorldContentService::SetExpansionContext()
+WorldContentService *WorldContentService::SetExpansionContext()
 {
+	// do a rule manager reload until where we store expansion is changed to somewhere else
+	RuleManager::Instance()->LoadRules(GetDatabase(), "default", true);
+
+	// pull expansion from rules
 	int expansion = RuleI(Expansion, CurrentExpansion);
 	if (expansion >= Expansion::Classic && expansion <= Expansion::MaxId) {
 		content_service.SetCurrentExpansion(expansion);
@@ -46,6 +51,8 @@ void WorldContentService::SetExpansionContext()
 		GetCurrentExpansion(),
 		GetCurrentExpansionName()
 	);
+
+	return this;
 }
 
 std::string WorldContentService::GetCurrentExpansionName()
@@ -72,15 +79,47 @@ void WorldContentService::SetCurrentExpansion(int current_expansion)
 /**
  * @return
  */
-const std::vector<std::string> &WorldContentService::GetContentFlags() const
+const std::vector<ContentFlagsRepository::ContentFlags> &WorldContentService::GetContentFlags() const
 {
 	return content_flags;
 }
 
+/**
+ * @return
+ */
+std::vector<std::string> WorldContentService::GetContentFlagsEnabled()
+{
+	std::vector<std::string> enabled_flags;
+
+	for (auto &f: GetContentFlags()) {
+		if (f.enabled) {
+			enabled_flags.emplace_back(f.flag_name);
+		}
+	}
+
+	return enabled_flags;
+}
+
+/**
+ * @return
+ */
+std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
+{
+	std::vector<std::string> disabled_flags;
+
+	for (auto &f: GetContentFlags()) {
+		if (!f.enabled) {
+			disabled_flags.emplace_back(f.flag_name);
+		}
+	}
+
+	return disabled_flags;
+}
+
 /**
  * @param content_flags
  */
-void WorldContentService::SetContentFlags(std::vector<std::string> content_flags)
+void WorldContentService::SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
@@ -89,13 +128,69 @@ void WorldContentService::SetContentFlags(std::vector<std::string> content_flags
  * @param content_flag
  * @return
  */
-bool WorldContentService::IsContentFlagEnabled(const std::string& content_flag)
+bool WorldContentService::IsContentFlagEnabled(const std::string &content_flag)
 {
-	for (auto &flag : GetContentFlags()) {
-		if (flag == content_flag) {
+	for (auto &f: GetContentFlags()) {
+		if (f.flag_name == content_flag && f.enabled == true) {
 			return true;
 		}
 	}
 
 	return false;
 }
+
+void WorldContentService::ReloadContentFlags()
+{
+	std::vector<ContentFlagsRepository::ContentFlags> set_content_flags;
+	auto                                              flags = ContentFlagsRepository::All(*GetDatabase());
+
+	set_content_flags.reserve(flags.size());
+	for (auto &f: flags) {
+		set_content_flags.push_back(f);
+
+		LogInfo(
+			"Loaded content flag [{}] [{}]",
+			f.flag_name,
+			(f.enabled ? "Enabled" : "Disabled")
+		);
+	}
+
+	SetContentFlags(set_content_flags);
+}
+
+Database *WorldContentService::GetDatabase() const
+{
+	return m_database;
+}
+
+WorldContentService *WorldContentService::SetDatabase(Database *database)
+{
+	WorldContentService::m_database = database;
+
+	return this;
+}
+
+void WorldContentService::SetContentFlag(const std::string &content_flag_name, bool enabled)
+{
+	auto flags = ContentFlagsRepository::GetWhere(
+		*GetDatabase(),
+		fmt::format("flag_name = '{}'", content_flag_name)
+	);
+
+	auto f = ContentFlagsRepository::NewEntity();
+	if (!flags.empty()) {
+		f = flags.front();
+	}
+
+	f.enabled   = enabled ? 1 : 0;
+	f.flag_name = content_flag_name;
+
+	if (!flags.empty()) {
+		ContentFlagsRepository::UpdateOne(*GetDatabase(), f);
+	}
+	else {
+		ContentFlagsRepository::InsertOne(*GetDatabase(), f);
+	}
+
+	ReloadContentFlags();
+}

common/content/world_content_service.h

@@ -23,6 +23,9 @@
 
 #include <string>
 #include <vector>
+#include "../repositories/content_flags_repository.h"
+
+class Database;
 
 namespace Expansion {
 	static const int EXPANSION_ALL        = -1;
@@ -158,14 +161,25 @@ public:
 	bool IsCurrentExpansionTheBurningLands() { return current_expansion == Expansion::ExpansionNumber::TheBurningLands; }
 	bool IsCurrentExpansionTormentOfVelious() { return current_expansion == Expansion::ExpansionNumber::TormentOfVelious; }
 
+	const std::vector<ContentFlagsRepository::ContentFlags> &GetContentFlags() const;
+	std::vector<std::string> GetContentFlagsEnabled();
+	std::vector<std::string> GetContentFlagsDisabled();
+	bool IsContentFlagEnabled(const std::string& content_flag);
+	void SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags);
+	void ReloadContentFlags();
+	WorldContentService * SetExpansionContext();
+
+	WorldContentService * SetDatabase(Database *database);
+	Database *GetDatabase() const;
+
+	void SetContentFlag(const std::string &content_flag_name, bool enabled);
+
 private:
 	int current_expansion{};
-	std::vector<std::string> content_flags;
-public:
-	const std::vector<std::string> &GetContentFlags() const;
-	bool IsContentFlagEnabled(const std::string& content_flag);
-	void SetContentFlags(std::vector<std::string> content_flags);
-	void SetExpansionContext();
+	std::vector<ContentFlagsRepository::ContentFlags> content_flags;
+
+	// reference to database
+	Database *m_database;
 };
 
 extern WorldContentService content_service;

common/cron/croncpp.h

@@ -0,0 +1,876 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <sstream>
+#include <bitset>
+#include <cctype>
+#include <ctime>
+#include <iomanip>
+#include <algorithm>
+
+#if __cplusplus > 201402L
+#include <string_view>
+#define CRONCPP_IS_CPP17
+#endif
+
+namespace cron
+{
+#ifdef CRONCPP_IS_CPP17
+	#define  HAS_STRING_VIEW
+   #define  STRING_VIEW       std::string_view
+   #define  STRING_VIEW_NPOS  std::string_view::npos
+   #define  CONSTEXPTR        constexpr
+#else
+#define  STRING_VIEW       std::string const &
+#define  STRING_VIEW_NPOS  std::string::npos
+#define  CONSTEXPTR
+#endif
+
+	using cron_int  = uint8_t;
+
+	constexpr std::time_t INVALID_TIME = static_cast<std::time_t>(-1);
+
+	constexpr size_t INVALID_CRON_INDEX = static_cast<size_t>(-1);
+
+	class cronexpr;
+
+	namespace detail
+	{
+		enum class cron_field
+		{
+			second,
+			minute,
+			hour_of_day,
+			day_of_week,
+			day_of_month,
+			month,
+			year
+		};
+
+		template <typename Traits>
+		static bool find_next(cronexpr const & cex,
+							  std::tm& date,
+							  size_t const dot);
+	}
+
+	struct bad_cronexpr : public std::runtime_error
+	{
+	public:
+		explicit bad_cronexpr(STRING_VIEW message) :
+			std::runtime_error(message.data())
+		{}
+	};
+
+
+	struct cron_standard_traits
+	{
+		static const cron_int CRON_MIN_SECONDS = 0;
+		static const cron_int CRON_MAX_SECONDS = 59;
+
+		static const cron_int CRON_MIN_MINUTES = 0;
+		static const cron_int CRON_MAX_MINUTES = 59;
+
+		static const cron_int CRON_MIN_HOURS = 0;
+		static const cron_int CRON_MAX_HOURS = 23;
+
+		static const cron_int CRON_MIN_DAYS_OF_WEEK = 0;
+		static const cron_int CRON_MAX_DAYS_OF_WEEK = 6;
+
+		static const cron_int CRON_MIN_DAYS_OF_MONTH = 1;
+		static const cron_int CRON_MAX_DAYS_OF_MONTH = 31;
+
+		static const cron_int CRON_MIN_MONTHS = 1;
+		static const cron_int CRON_MAX_MONTHS = 12;
+
+		static const cron_int CRON_MAX_YEARS_DIFF = 4;
+
+#ifdef CRONCPP_IS_CPP17
+		static const inline std::vector<std::string> DAYS = { "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
+      static const inline std::vector<std::string> MONTHS = { "NIL", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+#else
+		static std::vector<std::string>& DAYS()
+		{
+			static std::vector<std::string> days = { "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
+			return days;
+		}
+
+		static std::vector<std::string>& MONTHS()
+		{
+			static std::vector<std::string> months = { "NIL", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+			return months;
+		}
+#endif
+	};
+
+	struct cron_oracle_traits
+	{
+		static const cron_int CRON_MIN_SECONDS = 0;
+		static const cron_int CRON_MAX_SECONDS = 59;
+
+		static const cron_int CRON_MIN_MINUTES = 0;
+		static const cron_int CRON_MAX_MINUTES = 59;
+
+		static const cron_int CRON_MIN_HOURS = 0;
+		static const cron_int CRON_MAX_HOURS = 23;
+
+		static const cron_int CRON_MIN_DAYS_OF_WEEK = 1;
+		static const cron_int CRON_MAX_DAYS_OF_WEEK = 7;
+
+		static const cron_int CRON_MIN_DAYS_OF_MONTH = 1;
+		static const cron_int CRON_MAX_DAYS_OF_MONTH = 31;
+
+		static const cron_int CRON_MIN_MONTHS = 0;
+		static const cron_int CRON_MAX_MONTHS = 11;
+
+		static const cron_int CRON_MAX_YEARS_DIFF = 4;
+
+#ifdef CRONCPP_IS_CPP17
+		static const inline std::vector<std::string> DAYS = { "NIL", "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
+      static const inline std::vector<std::string> MONTHS = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+#else
+
+		static std::vector<std::string>& DAYS()
+		{
+			static std::vector<std::string> days = { "NIL", "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
+			return days;
+		}
+
+		static std::vector<std::string>& MONTHS()
+		{
+			static std::vector<std::string> months = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+			return months;
+		}
+#endif
+	};
+
+	struct cron_quartz_traits
+	{
+		static const cron_int CRON_MIN_SECONDS = 0;
+		static const cron_int CRON_MAX_SECONDS = 59;
+
+		static const cron_int CRON_MIN_MINUTES = 0;
+		static const cron_int CRON_MAX_MINUTES = 59;
+
+		static const cron_int CRON_MIN_HOURS = 0;
+		static const cron_int CRON_MAX_HOURS = 23;
+
+		static const cron_int CRON_MIN_DAYS_OF_WEEK = 1;
+		static const cron_int CRON_MAX_DAYS_OF_WEEK = 7;
+
+		static const cron_int CRON_MIN_DAYS_OF_MONTH = 1;
+		static const cron_int CRON_MAX_DAYS_OF_MONTH = 31;
+
+		static const cron_int CRON_MIN_MONTHS = 1;
+		static const cron_int CRON_MAX_MONTHS = 12;
+
+		static const cron_int CRON_MAX_YEARS_DIFF = 4;
+
+#ifdef CRONCPP_IS_CPP17
+		static const inline std::vector<std::string> DAYS = { "NIL", "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
+      static const inline std::vector<std::string> MONTHS = { "NIL", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+#else
+		static std::vector<std::string>& DAYS()
+		{
+			static std::vector<std::string> days = { "NIL", "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
+			return days;
+		}
+
+		static std::vector<std::string>& MONTHS()
+		{
+			static std::vector<std::string> months = { "NIL", "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
+			return months;
+		}
+#endif
+	};
+
+	class cronexpr;
+
+	template <typename Traits = cron_standard_traits>
+	static cronexpr make_cron(STRING_VIEW expr);
+
+	class cronexpr
+	{
+		std::bitset<60> seconds;
+		std::bitset<60> minutes;
+		std::bitset<24> hours;
+		std::bitset<7>  days_of_week;
+		std::bitset<31> days_of_month;
+		std::bitset<12> months;
+
+		friend bool operator==(cronexpr const & e1, cronexpr const & e2);
+		friend bool operator!=(cronexpr const & e1, cronexpr const & e2);
+
+		template <typename Traits>
+		friend bool detail::find_next(cronexpr const & cex,
+									  std::tm& date,
+									  size_t const dot);
+
+		friend std::string to_string(cronexpr const & cex);
+
+		template <typename Traits>
+		friend cronexpr make_cron(STRING_VIEW expr);
+	};
+
+	inline bool operator==(cronexpr const & e1, cronexpr const & e2)
+	{
+		return
+			e1.seconds == e2.seconds &&
+			e1.minutes == e2.minutes &&
+			e1.hours == e2.hours &&
+			e1.days_of_week == e2.days_of_week &&
+			e1.days_of_month == e2.days_of_month &&
+			e1.months == e2.months;
+	}
+
+	inline bool operator!=(cronexpr const & e1, cronexpr const & e2)
+	{
+		return !(e1 == e2);
+	}
+
+	inline std::string to_string(cronexpr const & cex)
+	{
+		return
+			cex.seconds.to_string() + " " +
+			cex.minutes.to_string() + " " +
+			cex.hours.to_string() + " " +
+			cex.days_of_month.to_string() + " " +
+			cex.months.to_string() + " " +
+			cex.days_of_week.to_string();
+	}
+
+	namespace utils
+	{
+		inline std::time_t tm_to_time(std::tm& date)
+		{
+			return std::mktime(&date);
+		}
+
+		inline std::tm* time_to_tm(std::time_t const * date, std::tm* const out)
+		{
+#ifdef _WIN32
+			errno_t err = localtime_s(out, date);
+         return 0 == err ? out : nullptr;
+#else
+			return localtime_r(date, out);
+#endif
+		}
+
+		inline std::tm to_tm(STRING_VIEW time)
+		{
+			std::istringstream str(time.data());
+			str.imbue(std::locale(setlocale(LC_ALL, nullptr)));
+
+			std::tm result;
+			str >> std::get_time(&result, "%Y-%m-%d %H:%M:%S");
+			if (str.fail()) throw std::runtime_error("Parsing date failed!");
+
+			result.tm_isdst = -1; // DST info not available
+
+			return result;
+		}
+
+		inline std::string to_string(std::tm const & tm)
+		{
+			std::ostringstream str;
+			str.imbue(std::locale(setlocale(LC_ALL, nullptr)));
+			str << std::put_time(&tm, "%Y-%m-%d %H:%M:%S");
+			if (str.fail()) throw std::runtime_error("Writing date failed!");
+
+			return str.str();
+		}
+
+		inline std::string to_upper(std::string text)
+		{
+			std::transform(std::begin(text), std::end(text),
+						   std::begin(text), static_cast<int(*)(int)>(std::toupper));
+
+			return text;
+		}
+
+		static std::vector<std::string> split(STRING_VIEW text, char const delimiter)
+		{
+			std::vector<std::string> tokens;
+			std::string token;
+			std::istringstream tokenStream(text.data());
+			while (std::getline(tokenStream, token, delimiter))
+			{
+				tokens.push_back(token);
+			}
+			return tokens;
+		}
+
+		CONSTEXPTR inline bool contains(STRING_VIEW text, char const ch) noexcept
+		{
+			return STRING_VIEW_NPOS != text.find_first_of(ch);
+		}
+	}
+
+	namespace detail
+	{
+
+		inline cron_int to_cron_int(STRING_VIEW text)
+		{
+			try
+			{
+				return static_cast<cron_int>(std::stoul(text.data()));
+			}
+			catch (std::exception const & ex)
+			{
+				throw bad_cronexpr(ex.what());
+			}
+		}
+
+		static std::string replace_ordinals(
+			std::string text,
+			std::vector<std::string> const & replacement)
+		{
+			for (size_t i = 0; i < replacement.size(); ++i)
+			{
+				auto pos = text.find(replacement[i]);
+				if (std::string::npos != pos)
+					text.replace(pos, 3 ,std::to_string(i));
+			}
+
+			return text;
+		}
+
+		static std::pair<cron_int, cron_int> make_range(
+			STRING_VIEW field,
+			cron_int const minval,
+			cron_int const maxval)
+		{
+			cron_int first = 0;
+			cron_int last = 0;
+			if (field.size() == 1 && field[0] == '*')
+			{
+				first = minval;
+				last = maxval;
+			}
+			else if (!utils::contains(field, '-'))
+			{
+				first = to_cron_int(field);
+				last = first;
+			}
+			else
+			{
+				auto parts = utils::split(field, '-');
+				if (parts.size() != 2)
+					throw bad_cronexpr("Specified range requires two fields");
+
+				first = to_cron_int(parts[0]);
+				last = to_cron_int(parts[1]);
+			}
+
+			if (first > maxval || last > maxval)
+			{
+				throw bad_cronexpr("Specified range exceeds maximum");
+			}
+			if (first < minval || last < minval)
+			{
+				throw bad_cronexpr("Specified range is less than minimum");
+			}
+			if (first > last)
+			{
+				throw bad_cronexpr("Specified range start exceeds range end");
+			}
+
+			return { first, last };
+		}
+
+		template <size_t N>
+		static void set_cron_field(
+			STRING_VIEW value,
+			std::bitset<N>& target,
+			cron_int const minval,
+			cron_int const maxval)
+		{
+			if(value.length() > 0 && value[value.length()-1] == ',')
+				throw bad_cronexpr("Value cannot end with comma");
+
+			auto fields = utils::split(value, ',');
+			if (fields.empty())
+				throw bad_cronexpr("Expression parsing error");
+
+			for (auto const & field : fields)
+			{
+				if (!utils::contains(field, '/'))
+				{
+#ifdef CRONCPP_IS_CPP17
+					auto[first, last] = detail::make_range(field, minval, maxval);
+#else
+					auto range = detail::make_range(field, minval, maxval);
+					auto first = range.first;
+					auto last = range.second;
+#endif
+					for (cron_int i = first - minval; i <= last - minval; ++i)
+					{
+						target.set(i);
+					}
+				}
+				else
+				{
+					auto parts = utils::split(field, '/');
+					if (parts.size() != 2)
+						throw bad_cronexpr("Incrementer must have two fields");
+
+#ifdef CRONCPP_IS_CPP17
+					auto[first, last] = detail::make_range(parts[0], minval, maxval);
+#else
+					auto range = detail::make_range(parts[0], minval, maxval);
+					auto first = range.first;
+					auto last = range.second;
+#endif
+
+					if (!utils::contains(parts[0], '-'))
+					{
+						last = maxval;
+					}
+
+					auto delta = detail::to_cron_int(parts[1]);
+					if(delta <= 0)
+						throw bad_cronexpr("Incrementer must be a positive value");
+
+					for (cron_int i = first - minval; i <= last - minval; i += delta)
+					{
+						target.set(i);
+					}
+				}
+			}
+		}
+
+		template <typename Traits>
+		static void set_cron_days_of_week(
+			std::string value,
+			std::bitset<7>& target)
+		{
+			auto days = utils::to_upper(value);
+			auto days_replaced = detail::replace_ordinals(
+				days,
+#ifdef CRONCPP_IS_CPP17
+				Traits::DAYS
+#else
+				Traits::DAYS()
+#endif
+			);
+
+			if (days_replaced.size() == 1 && days_replaced[0] == '?')
+				days_replaced[0] = '*';
+
+			set_cron_field(
+				days_replaced,
+				target,
+				Traits::CRON_MIN_DAYS_OF_WEEK,
+				Traits::CRON_MAX_DAYS_OF_WEEK);
+		}
+
+		template <typename Traits>
+		static void set_cron_days_of_month(
+			std::string value,
+			std::bitset<31>& target)
+		{
+			if (value.size() == 1 && value[0] == '?')
+				value[0] = '*';
+
+			set_cron_field(
+				value,
+				target,
+				Traits::CRON_MIN_DAYS_OF_MONTH,
+				Traits::CRON_MAX_DAYS_OF_MONTH);
+		}
+
+		template <typename Traits>
+		static void set_cron_month(
+			std::string value,
+			std::bitset<12>& target)
+		{
+			auto month = utils::to_upper(value);
+			auto month_replaced = replace_ordinals(
+				month,
+#ifdef CRONCPP_IS_CPP17
+				Traits::MONTHS
+#else
+				Traits::MONTHS()
+#endif
+			);
+
+			set_cron_field(
+				month_replaced,
+				target,
+				Traits::CRON_MIN_MONTHS,
+				Traits::CRON_MAX_MONTHS);
+		}
+
+		template <size_t N>
+		inline size_t next_set_bit(
+			std::bitset<N> const & target,
+			size_t /*minimum*/,
+			size_t /*maximum*/,
+			size_t offset)
+		{
+			for (auto i = offset; i < N; ++i)
+			{
+				if (target.test(i)) return i;
+			}
+
+			return INVALID_CRON_INDEX;
+		}
+
+		inline void add_to_field(
+			std::tm& date,
+			cron_field const field,
+			int const val)
+		{
+			switch (field)
+			{
+				case cron_field::second:
+					date.tm_sec += val;
+					break;
+				case cron_field::minute:
+					date.tm_min += val;
+					break;
+				case cron_field::hour_of_day:
+					date.tm_hour += val;
+					break;
+				case cron_field::day_of_week:
+				case cron_field::day_of_month:
+					date.tm_mday += val;
+					break;
+				case cron_field::month:
+					date.tm_mon += val;
+					break;
+				case cron_field::year:
+					date.tm_year += val;
+					break;
+			}
+
+			if (INVALID_TIME == utils::tm_to_time(date))
+				throw bad_cronexpr("Invalid time expression");
+		}
+
+		inline void set_field(
+			std::tm& date,
+			cron_field const field,
+			int const val)
+		{
+			switch (field)
+			{
+				case cron_field::second:
+					date.tm_sec = val;
+					break;
+				case cron_field::minute:
+					date.tm_min = val;
+					break;
+				case cron_field::hour_of_day:
+					date.tm_hour = val;
+					break;
+				case cron_field::day_of_week:
+					date.tm_wday = val;
+					break;
+				case cron_field::day_of_month:
+					date.tm_mday = val;
+					break;
+				case cron_field::month:
+					date.tm_mon = val;
+					break;
+				case cron_field::year:
+					date.tm_year = val;
+					break;
+			}
+
+			if (INVALID_TIME == utils::tm_to_time(date))
+				throw bad_cronexpr("Invalid time expression");
+		}
+
+		inline void reset_field(
+			std::tm& date,
+			cron_field const field)
+		{
+			switch (field)
+			{
+				case cron_field::second:
+					date.tm_sec = 0;
+					break;
+				case cron_field::minute:
+					date.tm_min = 0;
+					break;
+				case cron_field::hour_of_day:
+					date.tm_hour = 0;
+					break;
+				case cron_field::day_of_week:
+					date.tm_wday = 0;
+					break;
+				case cron_field::day_of_month:
+					date.tm_mday = 1;
+					break;
+				case cron_field::month:
+					date.tm_mon = 0;
+					break;
+				case cron_field::year:
+					date.tm_year = 0;
+					break;
+			}
+
+			if (INVALID_TIME == utils::tm_to_time(date))
+				throw bad_cronexpr("Invalid time expression");
+		}
+
+		inline void reset_all_fields(
+			std::tm& date,
+			std::bitset<7> const & marked_fields)
+		{
+			for (size_t i = 0; i < marked_fields.size(); ++i)
+			{
+				if (marked_fields.test(i))
+					reset_field(date, static_cast<cron_field>(i));
+			}
+		}
+
+		inline void mark_field(
+			std::bitset<7> & orders,
+			cron_field const field)
+		{
+			if (!orders.test(static_cast<size_t>(field)))
+				orders.set(static_cast<size_t>(field));
+		}
+
+		template <size_t N>
+		static size_t find_next(
+			std::bitset<N> const & target,
+			std::tm& date,
+			unsigned int const minimum,
+			unsigned int const maximum,
+			unsigned int const value,
+			cron_field const field,
+			cron_field const next_field,
+			std::bitset<7> const & marked_fields)
+		{
+			auto next_value = next_set_bit(target, minimum, maximum, value);
+			if (INVALID_CRON_INDEX == next_value)
+			{
+				add_to_field(date, next_field, 1);
+				reset_field(date, field);
+				next_value = next_set_bit(target, minimum, maximum, 0);
+			}
+
+			if (INVALID_CRON_INDEX == next_value || next_value != value)
+			{
+				set_field(date, field, static_cast<int>(next_value));
+				reset_all_fields(date, marked_fields);
+			}
+
+			return next_value;
+		}
+
+		template <typename Traits>
+		static size_t find_next_day(
+			std::tm& date,
+			std::bitset<31> const & days_of_month,
+			size_t day_of_month,
+			std::bitset<7> const & days_of_week,
+			size_t day_of_week,
+			std::bitset<7> const & marked_fields)
+		{
+			unsigned int count = 0;
+			unsigned int maximum = 366;
+			while (
+				(!days_of_month.test(day_of_month - Traits::CRON_MIN_DAYS_OF_MONTH) ||
+				 !days_of_week.test(day_of_week - Traits::CRON_MIN_DAYS_OF_WEEK))
+				&& count++ < maximum)
+			{
+				add_to_field(date, cron_field::day_of_month, 1);
+
+				day_of_month = date.tm_mday;
+				day_of_week = date.tm_wday;
+
+				reset_all_fields(date, marked_fields);
+			}
+
+			return day_of_month;
+		}
+
+		template <typename Traits>
+		static bool find_next(cronexpr const & cex,
+							  std::tm& date,
+							  size_t const dot)
+		{
+			bool res = true;
+
+			std::bitset<7> marked_fields{ 0 };
+			std::bitset<7> empty_list{ 0 };
+
+			unsigned int second = date.tm_sec;
+			auto updated_second = find_next(
+				cex.seconds,
+				date,
+				Traits::CRON_MIN_SECONDS,
+				Traits::CRON_MAX_SECONDS,
+				second,
+				cron_field::second,
+				cron_field::minute,
+				empty_list);
+
+			if (second == updated_second)
+			{
+				mark_field(marked_fields, cron_field::second);
+			}
+
+			unsigned int minute = date.tm_min;
+			auto update_minute = find_next(
+				cex.minutes,
+				date,
+				Traits::CRON_MIN_MINUTES,
+				Traits::CRON_MAX_MINUTES,
+				minute,
+				cron_field::minute,
+				cron_field::hour_of_day,
+				marked_fields);
+			if (minute == update_minute)
+			{
+				mark_field(marked_fields, cron_field::minute);
+			}
+			else
+			{
+				res = find_next<Traits>(cex, date, dot);
+				if (!res) return res;
+			}
+
+			unsigned int hour = date.tm_hour;
+			auto updated_hour = find_next(
+				cex.hours,
+				date,
+				Traits::CRON_MIN_HOURS,
+				Traits::CRON_MAX_HOURS,
+				hour,
+				cron_field::hour_of_day,
+				cron_field::day_of_week,
+				marked_fields);
+			if (hour == updated_hour)
+			{
+				mark_field(marked_fields, cron_field::hour_of_day);
+			}
+			else
+			{
+				res = find_next<Traits>(cex, date, dot);
+				if (!res) return res;
+			}
+
+			unsigned int day_of_week = date.tm_wday;
+			unsigned int day_of_month = date.tm_mday;
+			auto updated_day_of_month = find_next_day<Traits>(
+				date,
+				cex.days_of_month,
+				day_of_month,
+				cex.days_of_week,
+				day_of_week,
+				marked_fields);
+			if (day_of_month == updated_day_of_month)
+			{
+				mark_field(marked_fields, cron_field::day_of_month);
+			}
+			else
+			{
+				res = find_next<Traits>(cex, date, dot);
+				if (!res) return res;
+			}
+
+			unsigned int month = date.tm_mon;
+			auto updated_month = find_next(
+				cex.months,
+				date,
+				Traits::CRON_MIN_MONTHS,
+				Traits::CRON_MAX_MONTHS,
+				month,
+				cron_field::month,
+				cron_field::year,
+				marked_fields);
+			if (month != updated_month)
+			{
+				if (date.tm_year - dot > Traits::CRON_MAX_YEARS_DIFF)
+					return false;
+
+				res = find_next<Traits>(cex, date, dot);
+				if (!res) return res;
+			}
+
+			return res;
+		}
+	}
+
+	template <typename Traits>
+	static cronexpr make_cron(STRING_VIEW expr)
+	{
+		cronexpr cex;
+
+		if (expr.empty())
+			throw bad_cronexpr("Invalid empty cron expression");
+
+		auto fields = utils::split(expr, ' ');
+		fields.erase(
+			std::remove_if(std::begin(fields), std::end(fields),
+						   [](STRING_VIEW s) {return s.empty(); }),
+			std::end(fields));
+		if (fields.size() != 6)
+			throw bad_cronexpr("cron expression must have six fields");
+
+		detail::set_cron_field(fields[0], cex.seconds, Traits::CRON_MIN_SECONDS, Traits::CRON_MAX_SECONDS);
+		detail::set_cron_field(fields[1], cex.minutes, Traits::CRON_MIN_MINUTES, Traits::CRON_MAX_MINUTES);
+		detail::set_cron_field(fields[2], cex.hours, Traits::CRON_MIN_HOURS, Traits::CRON_MAX_HOURS);
+
+		detail::set_cron_days_of_week<Traits>(fields[5], cex.days_of_week);
+
+		detail::set_cron_days_of_month<Traits>(fields[3], cex.days_of_month);
+
+		detail::set_cron_month<Traits>(fields[4], cex.months);
+
+		return cex;
+	}
+
+	template <typename Traits = cron_standard_traits>
+	static std::tm cron_next(cronexpr const & cex, std::tm date)
+	{
+		time_t original = utils::tm_to_time(date);
+		if (INVALID_TIME == original) return {};
+
+		if (!detail::find_next<Traits>(cex, date, date.tm_year))
+			return {};
+
+		time_t calculated = utils::tm_to_time(date);
+		if (INVALID_TIME == calculated) return {};
+
+		if (calculated == original)
+		{
+			add_to_field(date, detail::cron_field::second, 1);
+			if (!detail::find_next<Traits>(cex, date, date.tm_year))
+				return {};
+		}
+
+		return date;
+	}
+
+	template <typename Traits = cron_standard_traits>
+	static std::time_t cron_next(cronexpr const & cex, std::time_t const & date)
+	{
+		std::tm val;
+		std::tm* dt = utils::time_to_tm(&date, &val);
+		if (dt == nullptr) return INVALID_TIME;
+
+		time_t original = utils::tm_to_time(*dt);
+		if (INVALID_TIME == original) return INVALID_TIME;
+
+		if(!detail::find_next<Traits>(cex, *dt, dt->tm_year))
+			return INVALID_TIME;
+
+		time_t calculated = utils::tm_to_time(*dt);
+		if (INVALID_TIME == calculated) return calculated;
+
+		if (calculated == original)
+		{
+			add_to_field(*dt, detail::cron_field::second, 1);
+			if(!detail::find_next<Traits>(cex, *dt, dt->tm_year))
+				return INVALID_TIME;
+		}
+
+		return utils::tm_to_time(*dt);
+	}
+}

common/database.cpp

@@ -39,6 +39,7 @@
 #include "unix.h"
 #include <netinet/in.h>
 #include <sys/time.h>
+
 #endif
 
 #include "database.h"
@@ -46,6 +47,8 @@
 #include "extprofile.h"
 #include "string_util.h"
 #include "database_schema.h"
+#include "http/httplib.h"
+#include "http/uri.h"
 
 extern Client client;
 
@@ -703,17 +706,17 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		"(%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
+		character_id, pp->binds[0].zone_id, 0, pp->binds[0].x, pp->binds[0].y, pp->binds[0].z, pp->binds[0].heading, 0,
+		character_id, pp->binds[1].zone_id, 0, pp->binds[1].x, pp->binds[1].y, pp->binds[1].z, pp->binds[1].heading, 1,
+		character_id, pp->binds[2].zone_id, 0, pp->binds[2].x, pp->binds[2].y, pp->binds[2].z, pp->binds[2].heading, 2,
+		character_id, pp->binds[3].zone_id, 0, pp->binds[3].x, pp->binds[3].y, pp->binds[3].z, pp->binds[3].heading, 3,
+		character_id, pp->binds[4].zone_id, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading, 4
 	); results = QueryDatabase(query);
 
         /* HoTT Ability */
         if(RuleB(Character, GrantHoTTOnCreate))
         {
-                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, rank) VALUES (%u, %i, %i)", character_id, 14, 1);
+                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)", character_id, 14, 1);
                 results = QueryDatabase(query);
         }
 
@@ -870,36 +873,60 @@ void Database::GetCharName(uint32 char_id, char* name) {
 	}
 }
 
-const char* Database::GetCharNameByID(uint32 char_id) {
+std::string Database::GetCharNameByID(uint32 char_id) {
 	std::string query = fmt::format("SELECT `name` FROM `character_data` WHERE id = {}", char_id);
 	auto results = QueryDatabase(query);
+	std::string res;
 
 	if (!results.Success()) {
-		return "";
+		return res;
 	}
 
 	if (results.RowCount() == 0) {
-		return "";
+		return res;
 	}
 
 	auto row = results.begin();
-	return row[0];
+	res = row[0];
+	return res;
 }
 
-const char* Database::GetNPCNameByID(uint32 npc_id) {
+std::string Database::GetNPCNameByID(uint32 npc_id) {
 	std::string query = fmt::format("SELECT `name` FROM `npc_types` WHERE id = {}", npc_id);
 	auto results = QueryDatabase(query);
+	std::string res;
 
 	if (!results.Success()) {
-		return "";
+		return res;
 	}
 
 	if (results.RowCount() == 0) {
-		return "";
+		return res;
 	}
 
 	auto row = results.begin();
-	return row[0];
+	res = row[0];
+	return res;
+}
+
+std::string Database::GetCleanNPCNameByID(uint32 npc_id) {
+	std::string query = fmt::format("SELECT `name` FROM `npc_types` WHERE id = {}", npc_id);
+	auto results = QueryDatabase(query);
+	std::string res;
+	std::string mob_name;
+
+	if (!results.Success()) {
+		return res;
+	}
+
+	if (results.RowCount() == 0) {
+		return res;
+	}
+
+	auto row = results.begin();
+	mob_name = row[0];
+	CleanMobName(mob_name.begin(), mob_name.end(), std::back_inserter(res));
+	return res;
 }
 
 bool Database::LoadVariables() {
@@ -971,10 +998,24 @@ bool Database::SetVariable(const std::string varname, const std::string &varvalu
 }
 
 // Get zone starting points from DB
-bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe_x, float* safe_y, float* safe_z, int16* minstatus, uint8* minlevel, char *flag_needed) {
+bool Database::GetSafePoints(const char* zone_short_name, uint32 instance_version, float* safe_x, float* safe_y, float* safe_z, float* safe_heading, int16* min_status, uint8* min_level, char *flag_needed) {
 
-	std::string query = StringFormat("SELECT safe_x, safe_y, safe_z, min_status, min_level, flag_needed FROM zone "
-		" WHERE short_name='%s' AND (version=%i OR version=0) ORDER BY version DESC", short_name, version);
+	if (zone_short_name == nullptr)
+		return false;
+
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			`safe_x`, `safe_y`, `safe_z`, `safe_heading`, `min_status`, `min_level`, `flag_needed`
+			FROM
+			zone
+			WHERE
+			`short_name` = '{}'
+			AND
+			(`version` = {} OR `version` = 0)
+			ORDER BY `version` DESC
+		), zone_short_name, instance_version
+	);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success())
@@ -987,16 +1028,24 @@ bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe
 
 	if (safe_x != nullptr)
 		*safe_x = atof(row[0]);
+
 	if (safe_y != nullptr)
 		*safe_y = atof(row[1]);
+
 	if (safe_z != nullptr)
 		*safe_z = atof(row[2]);
-	if (minstatus != nullptr)
-		*minstatus = atoi(row[3]);
-	if (minlevel != nullptr)
-		*minlevel = atoi(row[4]);
+
+	if (safe_heading != nullptr)
+		*safe_heading = atof(row[3]);
+
+	if (min_status != nullptr)
+		*min_status = atoi(row[4]);
+
+	if (min_level != nullptr)
+		*min_level = atoi(row[5]);
+
 	if (flag_needed != nullptr)
-		strcpy(flag_needed, row[5]);
+		strcpy(flag_needed, row[6]);
 
 	return true;
 }
@@ -1993,62 +2042,64 @@ void Database::ClearRaidLeader(uint32 gid, uint32 rid)
 	QueryDatabase(query);
 }
 
-void Database::UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win)
+void Database::UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win, bool remove)
 {
-
 	std::string field;
-
-	switch(theme)
-	{
-		case 1:
-		{
+	switch(theme) {
+		case LDoNThemes::GUK: {
 			field = "guk_";
 			break;
 		}
-		case 2:
-		{
+		case LDoNThemes::MIR: {
 			field = "mir_";
 			break;
 		}
-		case 3:
-		{
+		case LDoNThemes::MMC: {
 			field = "mmc_";
 			break;
 		}
-		case 4:
-		{
+		case LDoNThemes::RUJ: {
 			field = "ruj_";
 			break;
 		}
-		case 5:
-		{
+		case LDoNThemes::TAK: {
 			field = "tak_";
 			break;
 		}
-		default:
-		{
+		default: {
 			return;
 		}
 	}
 
-	if (win)
-		field += "wins";
-	else
-		field += "losses";
+	field += win ? "wins" : "losses";
+	std::string field_operation = remove ? "-" : "+";
 
-	std::string query = StringFormat("UPDATE `adventure_stats` SET %s=%s+1 WHERE player_id=%u",field.c_str(), field.c_str(), char_id);
+	std::string query = fmt::format(
+		"UPDATE `adventure_stats` SET {} = {} {} 1 WHERE player_id = {}",
+		field,
+		field,
+		field_operation,
+		char_id
+	);
 	auto results = QueryDatabase(query);
 
-	if (results.RowsAffected() != 0)
+	if (results.RowsAffected() != 0) {
 		return;
+	}
 
-	query = StringFormat("INSERT INTO `adventure_stats` SET %s=1, player_id=%u", field.c_str(), char_id);
-	QueryDatabase(query);
+	if (!remove) {
+		query = fmt::format(
+			"INSERT INTO `adventure_stats` SET {} = 1, player_id = {}",
+			field,
+			char_id
+		);
+		QueryDatabase(query);
+	}
 }
 
 bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)
 {
-	std::string query = StringFormat(
+	std::string query = fmt::format(
 		"SELECT "
 		"`guk_wins`, "
 		"`mir_wins`, "
@@ -2063,7 +2114,7 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)
 		"FROM "
 		"`adventure_stats` "
 		"WHERE "
-		"player_id = %u ",
+		"player_id = {}",
 		char_id
 	);
 	auto results = QueryDatabase(query);
@@ -2145,95 +2196,6 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
 	return 0;
 }
 
-/**
- * @param log_settings
- */
-void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
-{
-	std::string query =
-					"SELECT "
-					"log_category_id, "
-					"log_category_description, "
-					"log_to_console, "
-					"log_to_file, "
-					"log_to_gmsay "
-					"FROM "
-					"logsys_categories "
-					"ORDER BY log_category_id";
-
-	auto results         = QueryDatabase(query);
-	int  log_category_id = 0;
-
-	int *categories_in_database = new int[1000];
-
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		log_category_id = atoi(row[0]);
-		if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
-			continue;
-		}
-
-		log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
-		log_settings[log_category_id].log_to_file    = static_cast<uint8>(atoi(row[3]));
-		log_settings[log_category_id].log_to_gmsay   = static_cast<uint8>(atoi(row[4]));
-
-		/**
-		 * Determine if any output method is enabled for the category
-		 * and set it to 1 so it can used to check if category is enabled
-		 */
-		const bool log_to_console      = log_settings[log_category_id].log_to_console > 0;
-		const bool log_to_file         = log_settings[log_category_id].log_to_file > 0;
-		const bool log_to_gmsay        = log_settings[log_category_id].log_to_gmsay > 0;
-		const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
-
-		if (is_category_enabled) {
-			log_settings[log_category_id].is_category_enabled = 1;
-		}
-
-		/**
-		 * This determines whether or not the process needs to actually file log anything.
-		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
-		 */
-		if (log_settings[log_category_id].log_to_file > 0) {
-			LogSys.file_logs_enabled = true;
-		}
-
-		categories_in_database[log_category_id] = 1;
-	}
-
-	/**
-	 * Auto inject categories that don't exist in the database...
-	 */
-	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
-		if (categories_in_database[log_index] != 1) {
-
-			LogInfo(
-				"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
-				Logs::LogCategoryName[log_index]
-			);
-
-			auto inject_query = fmt::format(
-				"INSERT INTO logsys_categories "
-				"(log_category_id, "
-				"log_category_description, "
-				"log_to_console, "
-				"log_to_file, "
-				"log_to_gmsay) "
-				"VALUES "
-				"({0}, '{1}', {2}, {3}, {4})",
-				log_index,
-				EscapeString(Logs::LogCategoryName[log_index]),
-				std::to_string(log_settings[log_index].log_to_console),
-				std::to_string(log_settings[log_index].log_to_file),
-				std::to_string(log_settings[log_index].log_to_gmsay)
-			);
-
-			QueryDatabase(inject_query);
-		}
-	}
-
-	delete[] categories_in_database;
-}
-
 int Database::CountInvSnapshots() {
 	std::string query = StringFormat("SELECT COUNT(*) FROM (SELECT * FROM `inventory_snapshots` a GROUP BY `charid`, `time_index`) b");
 	auto results = QueryDatabase(query);
@@ -2311,6 +2273,35 @@ int Database::GetIPExemption(std::string account_ip) {
 	return RuleI(World, MaxClientsPerIP);
 }
 
+void Database::SetIPExemption(std::string account_ip, int exemption_amount) {
+	std::string query = fmt::format(
+		"SELECT `exemption_id` FROM `ip_exemptions` WHERE `exemption_ip` = '{}'",
+		account_ip
+	);
+
+	auto results = QueryDatabase(query);
+	uint32 exemption_id = 0;
+	if (results.Success() && results.RowCount() > 0) {
+		auto row = results.begin();
+		exemption_id = atoi(row[0]);
+	}
+	
+	query = fmt::format(
+		"INSERT INTO `ip_exemptions` (`exemption_ip`, `exemption_amount`) VALUES ('{}', {})",
+		account_ip,
+		exemption_amount
+	);
+
+	if (exemption_id != 0) {
+		query = fmt::format(
+			"UPDATE `ip_exemptions` SET `exemption_amount` = {} WHERE `exemption_ip` = '{}'",
+			exemption_amount,
+			account_ip
+		);
+	}
+	QueryDatabase(query);
+}
+
 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);
@@ -2461,3 +2452,67 @@ bool Database::CopyCharacter(
 	return true;
 }
 
+void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string url)
+{
+	try {
+		uri request_uri(url);
+
+		LogHTTP(
+			"[SourceDatabaseTableFromUrl] parsing url [{}] path [{}] host [{}] query_string [{}] protocol [{}] port [{}]",
+			url,
+			request_uri.get_path(),
+			request_uri.get_host(),
+			request_uri.get_query(),
+			request_uri.get_scheme(),
+			request_uri.get_port()
+		);
+
+		if (!DoesTableExist(table_name)) {
+			LogMySQLQuery("Table [{}] does not exist. Downloading from Github and installing...", table_name);
+
+			// http get request
+			httplib::Client cli(
+				fmt::format(
+					"{}://{}",
+					request_uri.get_scheme(),
+					request_uri.get_host()
+				).c_str()
+			);
+
+			cli.set_connection_timeout(0, 60000000); // 60 sec
+			cli.set_read_timeout(60, 0); // 60 seconds
+			cli.set_write_timeout(60, 0); // 60 seconds
+
+			int sourced_queries = 0;
+
+			if (auto res = cli.Get(request_uri.get_path().c_str())) {
+				if (res->status == 200) {
+					for (auto &s: SplitString(res->body, ';')) {
+						if (!trim(s).empty()) {
+							auto results = QueryDatabase(s);
+							if (!results.ErrorMessage().empty()) {
+								LogError("Error sourcing SQL [{}]", results.ErrorMessage());
+								return;
+							}
+							sourced_queries++;
+						}
+					}
+				}
+			}
+			else {
+				LogError("Error retrieving URL [{}]", url);
+			}
+
+			LogMySQLQuery(
+				"Table [{}] installed. Sourced [{}] queries",
+				table_name,
+				sourced_queries
+			);
+		}
+
+	}
+	catch (std::invalid_argument iae) {
+		LogError("[SourceDatabaseTableFromUrl] URI parser error [{}]", iae.what());
+	}
+}
+

common/database.h

@@ -78,6 +78,7 @@ class PTimerList;
 
 #define SQL(...) #__VA_ARGS__
 
+class LogSettings;
 class Database : public DBcore {
 public:
 	Database();
@@ -138,8 +139,9 @@ public:
 
 	void	GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID = 0);
 	void	GetCharName(uint32 char_id, char* name);
-	const char *GetCharNameByID(uint32 char_id);
-	const char *GetNPCNameByID(uint32 npc_id);
+	std::string GetCharNameByID(uint32 char_id);
+	std::string GetNPCNameByID(uint32 npc_id);
+	std::string GetCleanNPCNameByID(uint32 npc_id);
 	void	LoginIP(uint32 AccountID, const char* LoginIP);
 
 	/* Instancing */
@@ -174,7 +176,7 @@ public:
 
 	/* Adventure related. */
 
-	void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win);
+	void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win = false, bool remove = false);
 	bool GetAdventureStats(uint32 char_id, AdventureStats_Struct *as);
 
 	/* Account Related */
@@ -196,7 +198,8 @@ public:
 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
 	void	SetAgreementFlag(uint32 acctid);
 
-	int		GetIPExemption(std::string account_ip);
+	int  GetIPExemption(std::string account_ip);
+	void SetIPExemption(std::string account_ip, int exemption_amount);
 
 	int		GetInstanceID(uint32 char_id, uint32 zone_id);
 
@@ -242,7 +245,7 @@ public:
 
 	/* General Queries */
 
-	bool	GetSafePoints(const char* short_name, uint32 version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr);
+	bool	GetSafePoints(const char* zone_short_name, uint32 instance_version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, float* safe_heading = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr);
 	bool	GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid = 0, float* graveyard_x = 0, float* graveyard_y = 0, float* graveyard_z = 0, float* graveyard_heading = 0);
 	bool	GetZoneLongName(const char* short_name, char** long_name, char* file_name = 0, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, uint32* graveyard_id = 0, uint32* maxclients = 0);
 	bool	LoadPTimers(uint32 charid, PTimerList &into);
@@ -267,8 +270,8 @@ public:
 	int		CountInvSnapshots();
 	void	ClearInvSnapshots(bool from_now = false);
 
-	/* EQEmuLogSys */
-	void	LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
+	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
+
 
 private:
 

common/database_conversions.cpp

@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 namespace Convert {
 	struct BindStruct {
-		/*000*/ uint32 zoneId;
+		/*000*/ uint32 zone_id;
 		/*004*/ float x;
 		/*008*/ float y;
 		/*012*/ float z;
@@ -1320,18 +1320,18 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				if (rquery != ""){ results = QueryDatabase(rquery); }
 
 				/* Run Bind Home Convert */
-				if (pp->binds[4].zoneId < 999 && !_ISNAN_(pp->binds[4].x) && !_ISNAN_(pp->binds[4].y) && !_ISNAN_(pp->binds[4].z) && !_ISNAN_(pp->binds[4].heading)) {
+				if (pp->binds[4].zone_id < 999 && !_ISNAN_(pp->binds[4].x) && !_ISNAN_(pp->binds[4].y) && !_ISNAN_(pp->binds[4].z) && !_ISNAN_(pp->binds[4].heading)) {
 					rquery = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
 						" VALUES (%u, %u, %u, %f, %f, %f, %f, 1)",
-						character_id, pp->binds[4].zoneId, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading);
+						character_id, pp->binds[4].zone_id, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading);
 					if (rquery != ""){ results = QueryDatabase(rquery); }
 				}
 
 				/* Run Bind Convert */
-				if (pp->binds[0].zoneId < 999 && !_ISNAN_(pp->binds[0].x) && !_ISNAN_(pp->binds[0].y) && !_ISNAN_(pp->binds[0].z) && !_ISNAN_(pp->binds[0].heading)) {
+				if (pp->binds[0].zone_id < 999 && !_ISNAN_(pp->binds[0].x) && !_ISNAN_(pp->binds[0].y) && !_ISNAN_(pp->binds[0].z) && !_ISNAN_(pp->binds[0].heading)) {
 					rquery = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
 						" VALUES (%u, %u, %u, %f, %f, %f, %f, 0)",
-						character_id, pp->binds[0].zoneId, 0, pp->binds[0].x, pp->binds[0].y, pp->binds[0].z, pp->binds[0].heading);
+						character_id, pp->binds[0].zone_id, 0, pp->binds[0].x, pp->binds[0].y, pp->binds[0].z, pp->binds[0].heading);
 					if (rquery != ""){ results = QueryDatabase(rquery); }
 				}
 				/* Run Language Convert */
@@ -1452,7 +1452,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				for (i = 0; i < MAX_LEADERSHIP_AA_ARRAY; i++){
 					if (pp->leader_abilities.ranks[i] > 0 && pp->leader_abilities.ranks[i] < 6){
 						if (first_entry != 1){
-							rquery = StringFormat("REPLACE INTO `character_leadership_abilities` (id, slot, rank) VALUES (%i, %u, %u)", character_id, i, pp->leader_abilities.ranks[i]);
+							rquery = StringFormat("REPLACE INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%i, %u, %u)", character_id, i, pp->leader_abilities.ranks[i]);
 							first_entry = 1;
 						}
 						rquery = rquery + StringFormat(", (%i, %u, %u)", character_id, i, pp->leader_abilities.ranks[i]);

common/database_instances.cpp

@@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/rulesys.h"
 #include "../common/string_util.h"
 #include "../common/timer.h"
+#include "../common/repositories/dynamic_zone_members_repository.h"
+#include "../common/repositories/dynamic_zones_repository.h"
 
 #include "database.h"
 
@@ -493,8 +495,8 @@ void Database::DeleteInstance(uint16 instance_id)
 	query = StringFormat("DELETE FROM spawn_condition_values WHERE instance_id=%u", instance_id);
 	QueryDatabase(query);
 
-	query = fmt::format("DELETE FROM dynamic_zones WHERE instance_id={}", instance_id);
-	QueryDatabase(query);
+	DynamicZoneMembersRepository::DeleteByInstance(*this, instance_id);
+	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
 
 	BuryCorpsesInInstance(instance_id);
 }
@@ -585,7 +587,8 @@ void Database::PurgeExpiredInstances()
 	QueryDatabase(fmt::format("DELETE FROM respawn_times WHERE instance_id IN ({})", imploded_instance_ids));
 	QueryDatabase(fmt::format("DELETE FROM spawn_condition_values WHERE instance_id IN ({})", imploded_instance_ids));
 	QueryDatabase(fmt::format("UPDATE character_corpses SET is_buried = 1, instance_id = 0 WHERE instance_id IN ({})", imploded_instance_ids));
-	QueryDatabase(fmt::format("DELETE FROM dynamic_zones WHERE instance_id IN ({})", imploded_instance_ids));
+	DynamicZoneMembersRepository::DeleteByManyInstances(*this, imploded_instance_ids);
+	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
 }
 
 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)

common/database_schema.h

@@ -51,7 +51,9 @@ namespace DatabaseSchema {
 			{"character_disciplines",          "id"},
 			{"character_enabledtasks",         "charid"},
 			{"character_expedition_lockouts",  "character_id"},
+			{"character_exp_modifiers",        "character_id"},
 			{"character_inspect_messages",     "id"},
+			{"character_instance_safereturns", "character_id"},
 			{"character_item_recast",          "id"},
 			{"character_languages",            "id"},
 			{"character_leadership_abilities", "id"},
@@ -63,6 +65,7 @@ namespace DatabaseSchema {
 			{"character_potionbelt",           "id"},
 			{"character_skills",               "id"},
 			{"character_spells",               "id"},
+			{"character_task_timers",          "character_id"},
 			{"character_tasks",                "charid"},
 			{"character_tribute",              "id"},
 			{"completed_tasks",                "charid"},
@@ -79,7 +82,6 @@ namespace DatabaseSchema {
 			{"player_titlesets",               "char_id"},
 			{"quest_globals",                  "charid"},
 			{"timers",                         "char_id"},
-			{"titles",                         "char_id"},
 			{"trader",                         "char_id"},
 			{"zone_flags",                     "charID"}
 		};
@@ -116,7 +118,9 @@ namespace DatabaseSchema {
 			"character_disciplines",
 			"character_enabledtasks",
 			"character_expedition_lockouts",
+			"character_exp_modifiers",
 			"character_inspect_messages",
+			"character_instance_safereturns",
 			"character_item_recast",
 			"character_languages",
 			"character_leadership_abilities",
@@ -128,6 +132,7 @@ namespace DatabaseSchema {
 			"character_potionbelt",
 			"character_skills",
 			"character_spells",
+			"character_task_timers",
 			"character_tasks",
 			"character_tribute",
 			"completed_tasks",
@@ -152,7 +157,6 @@ namespace DatabaseSchema {
 			"spell_buckets",
 			"spell_globals",
 			"timers",
-			"titles",
 			"trader",
 			"trader_audit",
 			"zone_flags"
@@ -215,6 +219,7 @@ namespace DatabaseSchema {
 			"npc_types_tint",
 			"object",
 			"pets",
+			"pets_beastlord_data",
 			"pets_equipmentset",
 			"pets_equipmentset_entries",
 			"proximities",
@@ -263,6 +268,7 @@ namespace DatabaseSchema {
 			"perl_event_export_settings",
 			"profanity_list",
 			"rule_sets",
+			"titles",
 			"rule_values",
 			"variables",
 		};
@@ -307,17 +313,20 @@ namespace DatabaseSchema {
 			"banned_ips",
 			"bug_reports",
 			"bugs",
+			"completed_shared_task_activity_state",
+			"completed_shared_task_members",
+			"completed_shared_tasks",
+			"dynamic_zone_members",
 			"dynamic_zones",
 			"eventlog",
 			"expedition_lockouts",
-			"expedition_members",
 			"expeditions",
 			"gm_ips",
 			"group_id",
 			"group_leaders",
 			"hackers",
-			"ip_exemptions",
 			"instance_list",
+			"ip_exemptions",
 			"item_tick",
 			"lfguild",
 			"merchantlist_temp",
@@ -328,7 +337,11 @@ namespace DatabaseSchema {
 			"reports",
 			"respawn_times",
 			"saylink",
-
+			"server_scheduled_events",
+			"shared_task_activity_state",
+			"shared_task_dynamic_zones",
+			"shared_task_members",
+			"shared_tasks",
 		};
 	}
 

common/dynamic_zone_base.cpp

@@ -0,0 +1,599 @@
+#include "dynamic_zone_base.h"
+#include "database.h"
+#include "eqemu_logsys.h"
+#include "repositories/instance_list_repository.h"
+#include "repositories/instance_list_player_repository.h"
+#include "rulesys.h"
+#include "servertalk.h"
+#include "util/uuid.h"
+
+DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry)
+{
+	LoadRepositoryResult(std::move(entry));
+}
+
+uint32_t DynamicZoneBase::Create()
+{
+	if (GetInstanceID() == 0)
+	{
+		CreateInstance();
+	}
+
+	m_uuid = EQ::Util::UUID::Generate().ToString();
+	m_id = SaveToDatabase();
+
+	return m_id;
+}
+
+uint32_t DynamicZoneBase::CreateInstance()
+{
+	if (m_instance_id)
+	{
+		LogDynamicZones("CreateInstance failed, instance id [{}] already created", m_instance_id);
+		return 0;
+	}
+
+	if (!m_zone_id)
+	{
+		LogDynamicZones("CreateInstance failed, invalid zone id [{}]", m_zone_id);
+		return 0;
+	}
+
+	uint16_t unused_instance_id = 0;
+	if (!GetDatabase().GetUnusedInstanceID(unused_instance_id)) // todo: doesn't this race with insert?
+	{
+		LogDynamicZones("Failed to find unused instance id");
+		return 0;
+	}
+
+	m_start_time = std::chrono::system_clock::now();
+	m_expire_time = m_start_time + m_duration;
+
+	auto insert_instance = InstanceListRepository::NewEntity();
+	insert_instance.id = unused_instance_id;
+	insert_instance.zone = m_zone_id;
+	insert_instance.version = m_zone_version;
+	insert_instance.start_time = static_cast<int>(std::chrono::system_clock::to_time_t(m_start_time));
+	insert_instance.duration = static_cast<int>(m_duration.count());
+	insert_instance.never_expires = m_never_expires;
+
+	auto instance = InstanceListRepository::InsertOne(GetDatabase(), insert_instance);
+	if (instance.id == 0)
+	{
+		LogDynamicZones("Failed to create instance [{}] for zone [{}]", unused_instance_id, m_zone_id);
+		return 0;
+	}
+
+	m_instance_id = instance.id;
+
+	return m_instance_id;
+}
+
+void DynamicZoneBase::LoadRepositoryResult(DynamicZonesRepository::DynamicZoneInstance&& dz_entry)
+{
+	m_id                 = dz_entry.id;
+	m_uuid               = std::move(dz_entry.uuid);
+	m_name               = std::move(dz_entry.name);
+	m_leader.id          = dz_entry.leader_id;
+	m_min_players        = dz_entry.min_players;
+	m_max_players        = dz_entry.max_players;
+	m_instance_id        = dz_entry.instance_id;
+	m_type               = static_cast<DynamicZoneType>(dz_entry.type);
+	m_compass.zone_id    = dz_entry.compass_zone_id;
+	m_compass.x          = dz_entry.compass_x;
+	m_compass.y          = dz_entry.compass_y;
+	m_compass.z          = dz_entry.compass_z;
+	m_safereturn.zone_id = dz_entry.safe_return_zone_id;
+	m_safereturn.x       = dz_entry.safe_return_x;
+	m_safereturn.y       = dz_entry.safe_return_y;
+	m_safereturn.z       = dz_entry.safe_return_z;
+	m_safereturn.heading = dz_entry.safe_return_heading;
+	m_zonein.x           = dz_entry.zone_in_x;
+	m_zonein.y           = dz_entry.zone_in_y;
+	m_zonein.z           = dz_entry.zone_in_z;
+	m_zonein.heading     = dz_entry.zone_in_heading;
+	m_has_zonein         = (dz_entry.has_zone_in != 0);
+	// instance_list portion
+	m_zone_id            = dz_entry.zone;
+	m_zone_version       = dz_entry.version;
+	m_start_time         = std::chrono::system_clock::from_time_t(dz_entry.start_time);
+	m_duration           = std::chrono::seconds(dz_entry.duration);
+	m_never_expires      = (dz_entry.never_expires != 0);
+	m_expire_time        = m_start_time + m_duration;
+}
+
+void DynamicZoneBase::AddMemberFromRepositoryResult(
+	DynamicZoneMembersRepository::MemberWithName&& entry)
+{
+	auto status = DynamicZoneMemberStatus::Unknown;
+
+	if (m_leader.id == entry.character_id)
+	{
+		m_leader.name = entry.character_name;
+	}
+
+	AddInternalMember({ entry.character_id, std::move(entry.character_name), status });
+}
+
+uint32_t DynamicZoneBase::SaveToDatabase()
+{
+	LogDynamicZonesDetail("Saving dz instance [{}] to database", m_instance_id);
+
+	if (m_instance_id != 0)
+	{
+		auto insert_dz = DynamicZonesRepository::NewEntity();
+		insert_dz.uuid                = m_uuid;
+		insert_dz.name                = m_name;
+		insert_dz.leader_id           = m_leader.id;
+		insert_dz.min_players         = m_min_players;
+		insert_dz.max_players         = m_max_players;
+		insert_dz.instance_id         = m_instance_id,
+		insert_dz.type                = static_cast<int>(m_type);
+		insert_dz.compass_zone_id     = m_compass.zone_id;
+		insert_dz.compass_x           = m_compass.x;
+		insert_dz.compass_y           = m_compass.y;
+		insert_dz.compass_z           = m_compass.z;
+		insert_dz.safe_return_zone_id = m_safereturn.zone_id;
+		insert_dz.safe_return_x       = m_safereturn.x;
+		insert_dz.safe_return_y       = m_safereturn.y;
+		insert_dz.safe_return_z       = m_safereturn.z;
+		insert_dz.safe_return_heading = m_safereturn.heading;
+		insert_dz.zone_in_x           = m_zonein.x;
+		insert_dz.zone_in_y           = m_zonein.y;
+		insert_dz.zone_in_z           = m_zonein.z;
+		insert_dz.zone_in_heading     = m_zonein.heading;
+		insert_dz.has_zone_in         = m_has_zonein;
+
+		auto inserted_dz = DynamicZonesRepository::InsertOne(GetDatabase(), insert_dz);
+		return inserted_dz.id;
+	}
+	return 0;
+}
+
+bool DynamicZoneBase::AddMember(const DynamicZoneMember& add_member)
+{
+	if (HasMember(add_member.id))
+	{
+		return false;
+	}
+
+	DynamicZoneMembersRepository::AddMember(GetDatabase(), m_id, add_member.id);
+	GetDatabase().AddClientToInstance(m_instance_id, add_member.id);
+
+	ProcessMemberAddRemove(add_member, false);
+	SendServerPacket(CreateServerMemberAddRemovePacket(add_member, false).get());
+
+	return true;
+}
+
+bool DynamicZoneBase::RemoveMember(uint32_t character_id)
+{
+	auto remove_member = GetMemberData(character_id);
+	return RemoveMember(remove_member);
+}
+
+bool DynamicZoneBase::RemoveMember(const std::string& character_name)
+{
+	auto remove_member = GetMemberData(character_name);
+	return RemoveMember(remove_member);
+}
+
+bool DynamicZoneBase::RemoveMember(const DynamicZoneMember& remove_member)
+{
+	if (remove_member.id == 0)
+	{
+		return false;
+	}
+
+	DynamicZoneMembersRepository::RemoveMember(GetDatabase(), m_id, remove_member.id);
+	GetDatabase().RemoveClientFromInstance(m_instance_id, remove_member.id);
+
+	ProcessMemberAddRemove(remove_member, true);
+	SendServerPacket(CreateServerMemberAddRemovePacket(remove_member, true).get());
+
+	return true;
+}
+
+bool DynamicZoneBase::SwapMember(
+	const DynamicZoneMember& add_member, const std::string& remove_char_name)
+{
+	auto remove_member = GetMemberData(remove_char_name);
+	if (!add_member.IsValid() || !remove_member.IsValid())
+	{
+		return false;
+	}
+
+	// make remove and add atomic to avoid racing with separate world messages
+	DynamicZoneMembersRepository::RemoveMember(GetDatabase(), m_id, remove_member.id);
+	GetDatabase().RemoveClientFromInstance(m_instance_id, remove_member.id);
+
+	DynamicZoneMembersRepository::AddMember(GetDatabase(), m_id, add_member.id);
+	GetDatabase().AddClientToInstance(m_instance_id, add_member.id);
+
+	ProcessMemberAddRemove(remove_member, true);
+	ProcessMemberAddRemove(add_member, false);
+	SendServerPacket(CreateServerMemberSwapPacket(remove_member, add_member).get());
+
+	return true;
+}
+
+void DynamicZoneBase::RemoveAllMembers()
+{
+	DynamicZoneMembersRepository::RemoveAllMembers(GetDatabase(), m_id);
+	GetDatabase().RemoveClientsFromInstance(GetInstanceID());
+
+	ProcessRemoveAllMembers();
+	SendServerPacket(CreateServerRemoveAllMembersPacket().get());
+}
+
+void DynamicZoneBase::SaveMembers(const std::vector<DynamicZoneMember>& members)
+{
+	LogDynamicZonesDetail("Saving [{}] member(s) for dz [{}]", members.size(), m_id);
+
+	m_members = members;
+
+	// the lower level instance_list_players needs to be kept updated as well
+	std::vector<DynamicZoneMembersRepository::DynamicZoneMembers> insert_members;
+	std::vector<InstanceListPlayerRepository::InstanceListPlayer> insert_players;
+	for (const auto& member : m_members)
+	{
+		DynamicZoneMembersRepository::DynamicZoneMembers member_entry{};
+		member_entry.dynamic_zone_id = m_id;
+		member_entry.character_id = member.id;
+		insert_members.emplace_back(member_entry);
+
+		InstanceListPlayerRepository::InstanceListPlayer player_entry;
+		player_entry.id = static_cast<int>(m_instance_id);
+		player_entry.charid = static_cast<int>(member.id);
+		insert_players.emplace_back(player_entry);
+	}
+
+	DynamicZoneMembersRepository::InsertOrUpdateMany(GetDatabase(), insert_members);
+	InstanceListPlayerRepository::InsertOrUpdateMany(GetDatabase(), insert_players);
+}
+
+void DynamicZoneBase::SetCompass(const DynamicZoneLocation& location, bool update_db)
+{
+	ProcessCompassChange(location);
+
+	if (update_db)
+	{
+		LogDynamicZonesDetail("Saving [{}] compass zone: [{}] xyz: ([{}], [{}], [{}])",
+			m_id, m_compass.zone_id, m_compass.x, m_compass.y, m_compass.z);
+
+		DynamicZonesRepository::UpdateCompass(GetDatabase(),
+			m_id, m_compass.zone_id, m_compass.x, m_compass.y, m_compass.z);
+
+		SendServerPacket(CreateServerDzLocationPacket(ServerOP_DzSetCompass, location).get());
+	}
+}
+
+void DynamicZoneBase::SetCompass(uint32_t zone_id, float x, float y, float z, bool update_db)
+{
+	SetCompass({ zone_id, x, y, z, 0.0f }, update_db);
+}
+
+void DynamicZoneBase::SetSafeReturn(const DynamicZoneLocation& location, bool update_db)
+{
+	m_safereturn = location;
+
+	if (update_db)
+	{
+		LogDynamicZonesDetail("Saving [{}] safereturn zone: [{}] xyzh: ([{}], [{}], [{}], [{}])",
+			m_id, m_safereturn.zone_id, m_safereturn.x, m_safereturn.y, m_safereturn.z, m_safereturn.heading);
+
+		DynamicZonesRepository::UpdateSafeReturn(GetDatabase(), m_id, m_safereturn.zone_id,
+			m_safereturn.x, m_safereturn.y, m_safereturn.z, m_safereturn.heading);
+
+		SendServerPacket(CreateServerDzLocationPacket(ServerOP_DzSetSafeReturn, location).get());
+	}
+}
+
+void DynamicZoneBase::SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading, bool update_db)
+{
+	SetSafeReturn({ zone_id, x, y, z, heading }, update_db);
+}
+
+void DynamicZoneBase::SetZoneInLocation(const DynamicZoneLocation& location, bool update_db)
+{
+	m_zonein = location;
+	m_has_zonein = true;
+
+	if (update_db)
+	{
+		LogDynamicZonesDetail("Saving [{}] zonein zone: [{}] xyzh: ([{}], [{}], [{}], [{}])",
+			m_id, m_zone_id, m_zonein.x, m_zonein.y, m_zonein.z, m_zonein.heading);
+
+		DynamicZonesRepository::UpdateZoneIn(GetDatabase(), m_id, m_zone_id,
+			m_zonein.x, m_zonein.y, m_zonein.z, m_zonein.heading, m_has_zonein);
+
+		SendServerPacket(CreateServerDzLocationPacket(ServerOP_DzSetZoneIn, location).get());
+	}
+}
+
+void DynamicZoneBase::SetZoneInLocation(float x, float y, float z, float heading, bool update_db)
+{
+	SetZoneInLocation({ 0, x, y, z, heading }, update_db);
+}
+
+void DynamicZoneBase::SetLeader(const DynamicZoneMember& new_leader, bool update_db)
+{
+	m_leader = new_leader;
+
+	if (update_db)
+	{
+		DynamicZonesRepository::UpdateLeaderID(GetDatabase(), m_id, new_leader.id);
+	}
+}
+
+uint32_t DynamicZoneBase::GetSecondsRemaining() const
+{
+	auto remaining = std::chrono::duration_cast<std::chrono::seconds>(GetDurationRemaining()).count();
+	return std::max(0, static_cast<int>(remaining));
+}
+
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberAddRemovePacket(
+	const DynamicZoneMember& member, bool removed)
+{
+	constexpr uint32_t pack_size = sizeof(ServerDzMember_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzAddRemoveMember, pack_size);
+	auto buf = reinterpret_cast<ServerDzMember_Struct*>(pack->pBuffer);
+	buf->dz_id = GetID();
+	buf->dz_zone_id = GetZoneID();
+	buf->dz_instance_id = GetInstanceID();
+	buf->sender_zone_id = GetCurrentZoneID();
+	buf->sender_instance_id = GetCurrentInstanceID();
+	buf->removed = removed;
+	buf->character_id = member.id;
+	buf->character_status = static_cast<uint8_t>(member.status);
+	strn0cpy(buf->character_name, member.name.c_str(), sizeof(buf->character_name));
+
+	return pack;
+}
+
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberSwapPacket(
+	const DynamicZoneMember& remove_member, const DynamicZoneMember& add_member)
+{
+	constexpr uint32_t pack_size = sizeof(ServerDzMemberSwap_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzSwapMembers, pack_size);
+	auto buf = reinterpret_cast<ServerDzMemberSwap_Struct*>(pack->pBuffer);
+	buf->dz_id = GetID();
+	buf->dz_zone_id = GetZoneID();
+	buf->dz_instance_id = GetInstanceID();
+	buf->sender_zone_id = GetCurrentZoneID();
+	buf->sender_instance_id = GetCurrentInstanceID();
+	buf->add_character_status = static_cast<uint8_t>(add_member.status);
+	buf->add_character_id = add_member.id;
+	buf->remove_character_id = remove_member.id;
+	strn0cpy(buf->add_character_name, add_member.name.c_str(), sizeof(buf->add_character_name));
+	strn0cpy(buf->remove_character_name, remove_member.name.c_str(), sizeof(buf->remove_character_name));
+
+	return pack;
+}
+
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerRemoveAllMembersPacket()
+{
+	constexpr uint32_t pack_size = sizeof(ServerDzID_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzRemoveAllMembers, pack_size);
+	auto buf = reinterpret_cast<ServerDzID_Struct*>(pack->pBuffer);
+	buf->dz_id = GetID();
+	buf->dz_zone_id = GetZoneID();
+	buf->dz_instance_id = GetInstanceID();
+	buf->sender_zone_id = GetCurrentZoneID();
+	buf->sender_instance_id = GetCurrentInstanceID();
+
+	return pack;
+}
+
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzLocationPacket(
+	uint16_t server_opcode, const DynamicZoneLocation& location)
+{
+	constexpr uint32_t pack_size = sizeof(ServerDzLocation_Struct);
+	auto pack = std::make_unique<ServerPacket>(server_opcode, pack_size);
+	auto buf = reinterpret_cast<ServerDzLocation_Struct*>(pack->pBuffer);
+	buf->dz_id = GetID();
+	buf->sender_zone_id = GetCurrentZoneID();
+	buf->sender_instance_id = GetCurrentInstanceID();
+	buf->zone_id = location.zone_id;
+	buf->x = location.x;
+	buf->y = location.y;
+	buf->z = location.z;
+	buf->heading = location.heading;
+
+	return pack;
+}
+
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberStatusPacket(
+	uint32_t character_id, DynamicZoneMemberStatus status)
+{
+	constexpr uint32_t pack_size = sizeof(ServerDzMemberStatus_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzUpdateMemberStatus, pack_size);
+	auto buf = reinterpret_cast<ServerDzMemberStatus_Struct*>(pack->pBuffer);
+	buf->dz_id = GetID();
+	buf->sender_zone_id = GetCurrentZoneID();
+	buf->sender_instance_id = GetCurrentInstanceID();
+	buf->status = static_cast<uint8_t>(status);
+	buf->character_id = character_id;
+
+	return pack;
+}
+
+uint32_t DynamicZoneBase::GetDatabaseMemberCount()
+{
+	return DynamicZoneMembersRepository::GetCountWhere(GetDatabase(),
+		fmt::format("dynamic_zone_id = {}", m_id));
+}
+
+bool DynamicZoneBase::HasDatabaseMember(uint32_t character_id)
+{
+	if (character_id == 0)
+	{
+		return false;
+	}
+
+	auto entries = DynamicZoneMembersRepository::GetWhere(GetDatabase(), fmt::format(
+		"dynamic_zone_id = {} AND character_id = {}",
+		m_id, character_id
+	));
+
+	return entries.size() != 0;
+}
+
+void DynamicZoneBase::AddInternalMember(const DynamicZoneMember& member)
+{
+	if (!HasMember(member.id))
+	{
+		m_members.emplace_back(member);
+	}
+}
+
+void DynamicZoneBase::RemoveInternalMember(uint32_t character_id)
+{
+	m_members.erase(std::remove_if(m_members.begin(), m_members.end(),
+		[&](const DynamicZoneMember& member) { return member.id == character_id; }
+	), m_members.end());
+}
+
+bool DynamicZoneBase::HasMember(uint32_t character_id)
+{
+	return std::any_of(m_members.begin(), m_members.end(),
+		[&](const DynamicZoneMember& member) { return member.id == character_id; });
+}
+
+bool DynamicZoneBase::HasMember(const std::string& character_name)
+{
+	return std::any_of(m_members.begin(), m_members.end(),
+		[&](const DynamicZoneMember& member) {
+			return strcasecmp(member.name.c_str(), character_name.c_str()) == 0;
+		});
+}
+
+DynamicZoneMember DynamicZoneBase::GetMemberData(uint32_t character_id)
+{
+	auto it = std::find_if(m_members.begin(), m_members.end(),
+		[&](const DynamicZoneMember& member) { return member.id == character_id; });
+
+	DynamicZoneMember member_data;
+	if (it != m_members.end())
+	{
+		member_data = *it;
+	}
+	return member_data;
+}
+
+DynamicZoneMember DynamicZoneBase::GetMemberData(const std::string& character_name)
+{
+	auto it = std::find_if(m_members.begin(), m_members.end(),
+		[&](const DynamicZoneMember& member) {
+			return strcasecmp(member.name.c_str(), character_name.c_str()) == 0;
+		});
+
+	DynamicZoneMember member_data;
+	if (it != m_members.end())
+	{
+		member_data = *it;
+	}
+	return member_data;
+}
+
+bool DynamicZoneBase::SetInternalMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status)
+{
+	if (status == DynamicZoneMemberStatus::InDynamicZone && !RuleB(DynamicZone, EnableInDynamicZoneStatus))
+	{
+		status = DynamicZoneMemberStatus::Online;
+	}
+
+	if (character_id == m_leader.id)
+	{
+		m_leader.status = status;
+	}
+
+	auto it = std::find_if(m_members.begin(), m_members.end(),
+		[&](const DynamicZoneMember& member) { return member.id == character_id; });
+
+	if (it != m_members.end() && it->status != status)
+	{
+		it->status = status;
+		return true;
+	}
+
+	return false;
+}
+
+void DynamicZoneBase::SetMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status)
+{
+	auto update_member = GetMemberData(character_id);
+	if (update_member.IsValid())
+	{
+		ProcessMemberStatusChange(character_id, status);
+		SendServerPacket(CreateServerMemberStatusPacket(character_id, status).get());
+	}
+}
+
+void DynamicZoneBase::ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed)
+{
+	if (!removed)
+	{
+		AddInternalMember(member);
+	}
+	else
+	{
+		RemoveInternalMember(member.id);
+	}
+}
+
+bool DynamicZoneBase::ProcessMemberStatusChange(uint32_t character_id, DynamicZoneMemberStatus status)
+{
+	return SetInternalMemberStatus(character_id, status);
+}
+
+std::string DynamicZoneBase::GetDynamicZoneTypeName(DynamicZoneType dz_type)
+{
+	switch (dz_type)
+	{
+		case DynamicZoneType::Expedition:
+			return "Expedition";
+		case DynamicZoneType::Tutorial:
+			return "Tutorial";
+		case DynamicZoneType::Task:
+			return "Task";
+		case DynamicZoneType::Mission:
+			return "Mission";
+		case DynamicZoneType::Quest:
+			return "Quest";
+	}
+	return "Unknown";
+}
+
+EQ::Net::DynamicPacket DynamicZoneBase::GetSerializedDzPacket()
+{
+	EQ::Net::DynamicPacket dyn_pack;
+	dyn_pack.PutSerialize(0, *this);
+
+	LogDynamicZonesDetail("Serialized server dz size [{}]", dyn_pack.Length());
+	return dyn_pack;
+}
+
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzCreatePacket(
+	uint16_t origin_zone_id, uint16_t origin_instance_id)
+{
+	EQ::Net::DynamicPacket dyn_pack = GetSerializedDzPacket();
+
+	auto pack_size = sizeof(ServerDzCreateSerialized_Struct) + dyn_pack.Length();
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzCreated, static_cast<uint32_t>(pack_size));
+	auto buf = reinterpret_cast<ServerDzCreateSerialized_Struct*>(pack->pBuffer);
+	buf->origin_zone_id = origin_zone_id;
+	buf->origin_instance_id = origin_instance_id;
+	buf->cereal_size = static_cast<uint32_t>(dyn_pack.Length());
+	memcpy(buf->cereal_data, dyn_pack.Data(), dyn_pack.Length());
+
+	return pack;
+}
+
+void DynamicZoneBase::LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size)
+{
+	LogDynamicZonesDetail("Deserializing server dz size [{}]", cereal_size);
+	EQ::Util::MemoryStreamReader ss(cereal_data, cereal_size);
+	cereal::BinaryInputArchive archive(ss);
+	archive(*this);
+}

common/dynamic_zone_base.h

@@ -0,0 +1,211 @@
+#ifndef COMMON_DYNAMIC_ZONE_BASE_H
+#define COMMON_DYNAMIC_ZONE_BASE_H
+
+#include "eq_constants.h"
+#include "net/packet.h"
+#include "repositories/dynamic_zones_repository.h"
+#include "repositories/dynamic_zone_members_repository.h"
+#include <algorithm>
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
+class Database;
+class ServerPacket;
+
+struct DynamicZoneMember
+{
+	uint32_t id = 0;
+	std::string name;
+	DynamicZoneMemberStatus status = DynamicZoneMemberStatus::Unknown;
+
+	DynamicZoneMember() = default;
+	DynamicZoneMember(uint32_t id, std::string name_)
+		: id(id), name{std::move(name_)} {}
+	DynamicZoneMember(uint32_t id, std::string name_, DynamicZoneMemberStatus status_)
+		: id(id), name{std::move(name_)}, status(status_) {}
+
+	bool IsOnline() const { return status == DynamicZoneMemberStatus::Online ||
+	                               status == DynamicZoneMemberStatus::InDynamicZone; }
+	bool IsValid() const { return id != 0 && !name.empty(); }
+
+	template<class Archive>
+	void serialize(Archive& archive)
+	{
+		archive(id, name, status);
+	}
+};
+
+struct DynamicZoneLocation
+{
+	uint32_t zone_id = 0;
+	float x = 0.0f;
+	float y = 0.0f;
+	float z = 0.0f;
+	float heading = 0.0f;
+
+	DynamicZoneLocation() = default;
+	DynamicZoneLocation(uint32_t zone_id_, float x_, float y_, float z_, float heading_)
+		: zone_id(zone_id_), x(x_), y(y_), z(z_), heading(heading_) {}
+
+	template<class Archive>
+	void serialize(Archive& archive)
+	{
+		archive(zone_id, x, y, z, heading);
+	}
+};
+
+class DynamicZoneBase
+{
+public:
+	virtual ~DynamicZoneBase() = default;
+	DynamicZoneBase(const DynamicZoneBase&) = default;
+	DynamicZoneBase(DynamicZoneBase&&) = default;
+	DynamicZoneBase& operator=(const DynamicZoneBase&) = default;
+	DynamicZoneBase& operator=(DynamicZoneBase&&) = default;
+	DynamicZoneBase() = default;
+	DynamicZoneBase(uint32_t dz_id) : m_id(dz_id) {}
+	DynamicZoneBase(DynamicZoneType type) : m_type(type) {}
+	DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry);
+
+	static std::string GetDynamicZoneTypeName(DynamicZoneType dz_type);
+
+	virtual void SetSecondsRemaining(uint32_t seconds_remaining) = 0;
+
+	uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
+	uint32_t GetID() const { return m_id; }
+	uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_instance_id); }
+	uint32_t GetLeaderID() const { return m_leader.id; }
+	uint32_t GetMaxPlayers() const { return m_max_players; }
+	uint32_t GetMemberCount() const { return static_cast<uint32_t>(m_members.size()); }
+	uint32_t GetMinPlayers() const { return m_min_players; }
+	uint32_t GetSecondsRemaining() const;
+	uint16_t GetZoneID() const { return static_cast<uint16_t>(m_zone_id); }
+	uint32_t GetZoneIndex() const { return (m_instance_id << 16) | (m_zone_id & 0xffff); }
+	uint32_t GetZoneVersion() const { return m_zone_version; }
+	DynamicZoneType GetType() const { return m_type; }
+	const std::string& GetLeaderName() const { return m_leader.name; }
+	const std::string& GetName() const { return m_name; }
+	const std::string& GetUUID() const { return m_uuid; }
+	const DynamicZoneMember& GetLeader() const { return m_leader; }
+	const std::vector<DynamicZoneMember>& GetMembers() const { return m_members; }
+	const DynamicZoneLocation& GetCompassLocation() const { return m_compass; }
+	const DynamicZoneLocation& GetSafeReturnLocation() const { return m_safereturn; }
+	const DynamicZoneLocation& GetZoneInLocation() const { return m_zonein; }
+	std::chrono::system_clock::duration GetDurationRemaining() const { return m_expire_time - std::chrono::system_clock::now(); }
+
+	bool AddMember(const DynamicZoneMember& add_member);
+	void AddMemberFromRepositoryResult(DynamicZoneMembersRepository::MemberWithName&& entry);
+	uint32_t GetDatabaseMemberCount();
+	DynamicZoneMember GetMemberData(uint32_t character_id);
+	DynamicZoneMember GetMemberData(const std::string& character_name);
+	EQ::Net::DynamicPacket GetSerializedDzPacket();
+	bool HasDatabaseMember(uint32_t character_id);
+	bool HasMember(uint32_t character_id);
+	bool HasMember(const std::string& character_name);
+	bool HasMembers() const { return !m_members.empty(); }
+	bool HasZoneInLocation() const { return m_has_zonein; }
+	bool IsExpired() const { return m_expire_time < std::chrono::system_clock::now(); }
+	bool IsInstanceID(uint32_t instance_id) const { return (m_instance_id != 0 && m_instance_id == instance_id); }
+	bool IsValid() const { return m_instance_id != 0; }
+	bool IsSameDz(uint32_t zone_id, uint32_t instance_id) const { return zone_id == m_zone_id && instance_id == m_instance_id; }
+	void LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size);
+	void RemoveAllMembers();
+	bool RemoveMember(uint32_t character_id);
+	bool RemoveMember(const std::string& character_name);
+	bool RemoveMember(const DynamicZoneMember& remove_member);
+	void SaveMembers(const std::vector<DynamicZoneMember>& members);
+	void SetCompass(const DynamicZoneLocation& location, bool update_db = false);
+	void SetCompass(uint32_t zone_id, float x, float y, float z, bool update_db = false);
+	void SetDuration(uint32_t seconds) { m_duration = std::chrono::seconds(seconds); }
+	void SetLeader(const DynamicZoneMember& leader, bool update_db = false);
+	void SetMaxPlayers(uint32_t max_players) { m_max_players = max_players; }
+	void SetMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
+	void SetMinPlayers(uint32_t min_players) { m_min_players = min_players; }
+	void SetName(const std::string& name) { m_name = name; }
+	void SetSafeReturn(const DynamicZoneLocation& location, bool update_db = false);
+	void SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading, bool update_db = false);
+	void SetType(DynamicZoneType type) { m_type = type; }
+	void SetUUID(std::string uuid) { m_uuid = std::move(uuid); }
+	void SetZoneInLocation(const DynamicZoneLocation& location, bool update_db = false);
+	void SetZoneInLocation(float x, float y, float z, float heading, bool update_db = false);
+	bool SwapMember(const DynamicZoneMember& add_member, const std::string& remove_char_name);
+
+protected:
+	virtual uint16_t GetCurrentInstanceID() { return 0; }
+	virtual uint16_t GetCurrentZoneID() { return 0; }
+	virtual Database& GetDatabase() = 0;
+	virtual void ProcessCompassChange(const DynamicZoneLocation& location) { m_compass = location; }
+	virtual void ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed);
+	virtual bool ProcessMemberStatusChange(uint32_t member_id, DynamicZoneMemberStatus status);
+	virtual void ProcessRemoveAllMembers(bool silent = false) { m_members.clear(); }
+	virtual bool SendServerPacket(ServerPacket* packet) = 0;
+
+	void AddInternalMember(const DynamicZoneMember& member);
+	uint32_t Create();
+	uint32_t CreateInstance();
+	void LoadRepositoryResult(DynamicZonesRepository::DynamicZoneInstance&& dz_entry);
+	void RemoveInternalMember(uint32_t character_id);
+	uint32_t SaveToDatabase();
+	bool SetInternalMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
+
+	std::unique_ptr<ServerPacket> CreateServerDzCreatePacket(uint16_t origin_zone_id, uint16_t origin_instance_id);
+	std::unique_ptr<ServerPacket> CreateServerDzLocationPacket(uint16_t server_opcode, const DynamicZoneLocation& location);
+	std::unique_ptr<ServerPacket> CreateServerMemberAddRemovePacket(const DynamicZoneMember& member, bool removed);
+	std::unique_ptr<ServerPacket> CreateServerMemberStatusPacket(uint32_t character_id, DynamicZoneMemberStatus status);
+	std::unique_ptr<ServerPacket> CreateServerMemberSwapPacket(const DynamicZoneMember& remove_member, const DynamicZoneMember& add_member);
+	std::unique_ptr<ServerPacket> CreateServerRemoveAllMembersPacket();
+
+	uint32_t m_id = 0;
+	uint32_t m_zone_id = 0;
+	uint32_t m_instance_id = 0;
+	uint32_t m_zone_version = 0;
+	uint32_t m_min_players = 0;
+	uint32_t m_max_players = 0;
+	bool m_never_expires = false;
+	bool m_has_zonein = false;
+	bool m_has_member_statuses = false;
+	std::string m_name;
+	std::string m_uuid;
+	DynamicZoneMember m_leader;
+	DynamicZoneType m_type{ DynamicZoneType::None };
+	DynamicZoneLocation m_compass;
+	DynamicZoneLocation m_safereturn;
+	DynamicZoneLocation m_zonein;
+	std::chrono::seconds m_duration;
+	std::chrono::time_point<std::chrono::system_clock> m_start_time;
+	std::chrono::time_point<std::chrono::system_clock> m_expire_time;
+	std::vector<DynamicZoneMember> m_members;
+
+public:
+	template<class Archive>
+	void serialize(Archive& archive)
+	{
+		archive(
+			m_id,
+			m_zone_id,
+			m_instance_id,
+			m_zone_version,
+			m_min_players,
+			m_max_players,
+			m_never_expires,
+			m_has_zonein,
+			m_has_member_statuses,
+			m_name,
+			m_uuid,
+			m_leader,
+			m_type,
+			m_compass,
+			m_safereturn,
+			m_zonein,
+			m_duration,
+			m_start_time,
+			m_expire_time,
+			m_members
+		);
+	}
+};
+
+#endif

common/emu_constants.cpp

@@ -18,6 +18,9 @@
 */
 
 #include "emu_constants.h"
+#include "languages.h"
+#include "data_verification.h"
+#include "bodytypes.h"
 
 
 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
@@ -147,8 +150,235 @@ const char *EQ::constants::GetStanceName(StanceType stance_type) {
 }
 
 int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
-	if (stance_type >= EQ::constants::stancePassive && stance_type <= EQ::constants::stanceBurnAE)
+	if (EQ::ValueWithin(stance_type, EQ::constants::stancePassive, EQ::constants::stanceBurnAE)) {
 		return (stance_type - EQ::constants::stancePassive);
+	}
 
 	return 0;
 }
+
+const std::map<int, std::string>& EQ::constants::GetLanguageMap()
+{
+	static const std::map<int, std::string> language_map = {
+		{ LANG_COMMON_TONGUE, "Common Tongue" },
+		{ LANG_BARBARIAN, "Barbarian" },
+		{ LANG_ERUDIAN, "Erudian" },
+		{ LANG_ELVISH, "Elvish" },
+		{ LANG_DARK_ELVISH, "Dark Elvish" },
+		{ LANG_DWARVISH, "Dwarvish" },
+		{ LANG_TROLL, "Troll" },
+		{ LANG_OGRE, "Ogre" },
+		{ LANG_GNOMISH, "Gnomish" },
+		{ LANG_HALFLING, "Halfling" },
+		{ LANG_THIEVES_CANT, "Thieves Cant" },
+		{ LANG_OLD_ERUDIAN, "Old Erudian" },
+		{ LANG_ELDER_ELVISH, "Elder Elvish" },
+		{ LANG_FROGLOK, "Froglok" },
+		{ LANG_GOBLIN, "Goblin" },
+		{ LANG_GNOLL, "Gnoll" },
+		{ LANG_COMBINE_TONGUE, "Combine Tongue" },
+		{ LANG_ELDER_TEIRDAL, "Elder Teirdal" },
+		{ LANG_LIZARDMAN, "Lizardman" },
+		{ LANG_ORCISH, "Orcish" },
+		{ LANG_FAERIE, "Faerie" },
+		{ LANG_DRAGON, "Dragon" },
+		{ LANG_ELDER_DRAGON, "Elder Dragon" },
+		{ LANG_DARK_SPEECH, "Dark Speech" },
+		{ LANG_VAH_SHIR, "Vah Shir" },
+		{ LANG_ALARAN, "Alaran" },
+		{ LANG_HADAL, "Hadal" },
+		{ LANG_UNKNOWN, "Unknown" }
+	};
+	return language_map;
+}
+
+std::string EQ::constants::GetLanguageName(int language_id)
+{
+	if (EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+		auto languages = EQ::constants::GetLanguageMap();
+		return languages[language_id];
+	}
+	return std::string();
+}
+
+const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
+{
+	static const std::map<uint32, std::string> ldon_theme_map = {
+		{ LDoNThemes::Unused, "Unused" },
+		{ LDoNThemes::GUK, "Deepest Guk" },
+		{ LDoNThemes::MIR, "Miragul's Menagerie" },
+		{ LDoNThemes::MMC, "Mistmoore Catacombs" },
+		{ LDoNThemes::RUJ, "Rujarkian Hills" },
+		{ LDoNThemes::TAK, "Takish-Hiz" },
+	};
+	return ldon_theme_map;
+}
+
+std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
+{
+	if (EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		auto ldon_themes = EQ::constants::GetLDoNThemeMap();
+		return ldon_themes[theme_id];
+	}
+	return std::string();	
+}
+
+const std::map<uint8, std::string>& EQ::constants::GetFlyModeMap()
+{
+	static const std::map<uint8, std::string> flymode_map = {
+		{ GravityBehavior::Ground, "Ground" },
+		{ GravityBehavior::Flying, "Flying" },
+		{ GravityBehavior::Levitating, "Levitating" },
+		{ GravityBehavior::Water, "Water" },
+		{ GravityBehavior::Floating, "Floating" },
+		{ GravityBehavior::LevitateWhileRunning, "Levitating While Running" },
+	};
+	return flymode_map;
+}
+
+std::string EQ::constants::GetFlyModeName(uint8 flymode_id)
+{
+	if (EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
+		auto flymodes = EQ::constants::GetFlyModeMap();
+		return flymodes[flymode_id];
+	}
+	return std::string();
+}
+
+const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
+{
+	static const std::map<bodyType, std::string> bodytype_map = {
+		{ BT_Humanoid, "Humanoid" },
+		{ BT_Lycanthrope, "Lycanthrope" },
+		{ BT_Undead, "Undead" },
+		{ BT_Giant, "Giant" },
+		{ BT_Construct, "Construct" },
+		{ BT_Extraplanar, "Extraplanar" },
+		{ BT_Magical, "Magical" },
+		{ BT_SummonedUndead, "Summoned Undead" },
+		{ BT_RaidGiant, "Raid Giant" },
+		{ BT_RaidColdain, "Raid Coldain" },
+		{ BT_NoTarget, "Untargetable" },
+		{ BT_Vampire, "Vampire" },
+		{ BT_Atenha_Ra, "Aten Ha Ra" },
+		{ BT_Greater_Akheva, "Greater Akheva" },
+		{ BT_Khati_Sha, "Khati Sha" },
+		{ BT_Seru, "Seru" },
+		{ BT_Grieg_Veneficus, "Grieg Veneficus" },
+		{ BT_Draz_Nurakk, "Draz Nurakk" },
+		{ BT_Zek, "Zek" },
+		{ BT_Luggald, "Luggald" },
+		{ BT_Animal, "Animal" },
+		{ BT_Insect, "Insect" },
+		{ BT_Monster, "Monster" },
+		{ BT_Summoned, "Summoned" },
+		{ BT_Plant, "Plant" },
+		{ BT_Dragon, "Dragon" },
+		{ BT_Summoned2, "Summoned 2" },
+		{ BT_Summoned3, "Summoned 3" },
+		{ BT_Dragon2, "Dragon 2" },
+		{ BT_VeliousDragon, "Velious Dragon" },
+		{ BT_Familiar, "Familiar" },
+		{ BT_Dragon3, "Dragon 3" },
+		{ BT_Boxes, "Boxes" },
+		{ BT_Muramite, "Muramite" },
+		{ BT_NoTarget2, "Untargetable 2" },
+		{ BT_SwarmPet, "Swarm Pet" },
+		{ BT_MonsterSummon, "Monster Summon" },
+		{ BT_InvisMan, "Invisible Man" },
+		{ BT_Special, "Special" },
+	};
+	return bodytype_map;
+}
+
+std::string EQ::constants::GetBodyTypeName(bodyType bodytype_id)
+{
+	auto bodytypes = EQ::constants::GetBodyTypeMap();
+	if (!bodytypes[bodytype_id].empty()) {
+		return bodytypes[bodytype_id];
+	}
+	return std::string();
+}
+
+const std::map<uint8, std::string>& EQ::constants::GetAccountStatusMap()
+{
+	static const std::map<uint8, std::string> account_status_map = {
+		{ AccountStatus::Player, "Player" },
+		{ AccountStatus::Steward, "Steward" },
+		{ AccountStatus::ApprenticeGuide, "Apprentice Guide" },
+		{ AccountStatus::Guide, "Guide" },
+		{ AccountStatus::QuestTroupe, "Quest Troupe" },
+		{ AccountStatus::SeniorGuide, "Senior Guide" },
+		{ AccountStatus::GMTester, "GM Tester" },
+		{ AccountStatus::EQSupport, "EQ Support" },
+		{ AccountStatus::GMStaff, "GM Staff" },
+		{ AccountStatus::GMAdmin, "GM Admin" },
+		{ AccountStatus::GMLeadAdmin, "GM Lead Admin" },
+		{ AccountStatus::QuestMaster, "Quest Master" },
+		{ AccountStatus::GMAreas, "GM Areas" },
+		{ AccountStatus::GMCoder, "GM Coder" },
+		{ AccountStatus::GMMgmt, "GM Mgmt" },
+		{ AccountStatus::GMImpossible, "GM Impossible" },	
+		{ AccountStatus::Max, "GM Max" }
+	};
+	return account_status_map;
+}
+
+std::string EQ::constants::GetAccountStatusName(uint8 account_status)
+{
+	auto account_statuses = EQ::constants::GetAccountStatusMap();
+	std::string status_name;
+	for (auto status_level = account_statuses.rbegin(); status_level != account_statuses.rend(); ++status_level) {
+		if (account_status >= status_level->first) {
+			status_name = status_level->second;
+			break;
+		}
+	}
+
+	return status_name;
+}
+
+const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()
+{
+	static const std::map<uint8, std::string> consider_level_map = {
+		{ ConsiderLevel::Ally, "Ally" },
+		{ ConsiderLevel::Warmly, "Warmly" },
+		{ ConsiderLevel::Kindly, "Kindly" },
+		{ ConsiderLevel::Amiably, "Amiably" },
+		{ ConsiderLevel::Indifferently, "Indifferently" },
+		{ ConsiderLevel::Apprehensively, "Apprehensively" },
+		{ ConsiderLevel::Dubiously, "Dubiously" },
+		{ ConsiderLevel::Threateningly, "Threateningly" },
+		{ ConsiderLevel::Scowls, "Scowls" }
+	};
+	return consider_level_map;
+}
+
+std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
+{
+	auto consider_levels = EQ::constants::GetConsiderLevelMap();
+	if (!consider_levels[faction_consider_level].empty()) {
+		return consider_levels[faction_consider_level];
+	}
+	return std::string();
+}
+
+const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
+{
+	static const std::map<uint8, std::string> damage_type_map = {
+		{ EnvironmentalDamage::Lava, "Lava" },
+		{ EnvironmentalDamage::Drowning, "Drowning" },
+		{ EnvironmentalDamage::Falling, "Falling" },
+		{ EnvironmentalDamage::Trap, "Trap" }
+	};
+	return damage_type_map;
+}
+
+std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
+{
+	if (EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
+		auto damage_types = EQ::constants::GetEnvironmentalDamageMap();
+		return damage_types[damage_type];
+	}
+	return std::string();
+}

common/emu_constants.h

@@ -22,6 +22,7 @@
 
 #include "eq_limits.h"
 #include "emu_versions.h"
+#include "bodytypes.h"
 
 #include <string.h>
 
@@ -220,9 +221,46 @@ namespace EQ
 			stanceBurnAE
 		};
 
+		enum GravityBehavior : uint8 {
+			Ground,
+			Flying,
+			Levitating,
+			Water,
+			Floating,
+			LevitateWhileRunning
+		};
+
+		enum EnvironmentalDamage : uint8 {
+			Lava = 250,
+			Drowning,
+			Falling,
+			Trap
+		};
+
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);
 
+		extern const std::map<int, std::string>& GetLanguageMap();
+		std::string GetLanguageName(int language_id);
+
+		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
+		std::string GetLDoNThemeName(uint32 theme_id);
+    
+		extern const std::map<uint8, std::string>& GetFlyModeMap();
+		std::string GetFlyModeName(uint8 flymode_id);
+
+		extern const std::map<bodyType, std::string>& GetBodyTypeMap();
+		std::string GetBodyTypeName(bodyType bodytype_id);
+
+		extern const std::map<uint8, std::string>& GetAccountStatusMap();
+		std::string GetAccountStatusName(uint8 account_status);
+
+		extern const std::map<uint8, std::string>& GetConsiderLevelMap();
+		std::string GetConsiderLevelName(uint8 consider_level);
+
+		extern const std::map<uint8, std::string>& GetEnvironmentalDamageMap();
+		std::string GetEnvironmentalDamageName(uint8 damage_type);
+
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;
@@ -325,13 +363,57 @@ namespace EQ
 			Guild
 		};
 	}; // namespace consent
-
 } /*EQEmu*/
 
+enum ServerLockType : int {
+	List,
+	Lock,
+	Unlock
+};
+
+enum AccountStatus : uint8 {
+	Player = 0,
+	Steward = 10,
+	ApprenticeGuide = 20,
+	Guide = 50,
+	QuestTroupe = 80,
+	SeniorGuide = 81,
+	GMTester = 85,
+	EQSupport = 90,
+	GMStaff = 95,
+	GMAdmin = 100,
+	GMLeadAdmin = 150,
+	QuestMaster = 160,
+	GMAreas = 170,
+	GMCoder = 180,
+	GMMgmt = 200,
+	GMImpossible = 250,
+	Max = 255
+};
+
+enum Invisibility : uint8 {
+	Visible,
+	Invisible,
+	Special = 255
+};
+
+enum AugmentActions : int {
+	Insert,
+	Remove,
+	Swap,
+	Destroy
+};
+
+enum ConsiderLevel : uint8 {
+	Ally = 1,
+	Warmly,
+	Kindly,
+	Amiably,
+	Indifferently,
+	Apprehensively,
+	Dubiously,
+	Threateningly,
+	Scowls
+};
+
 #endif /*COMMON_EMU_CONSTANTS_H*/
-
-/*	hack list to prevent circular references
-	
-	eq_limits.h:EQ::inventory::LookupEntry::InventoryTypeSize[n];
-
-*/

common/emu_oplist.h

@@ -129,8 +129,8 @@ N(OP_DisciplineTimer),
 N(OP_DisciplineUpdate),
 N(OP_DiscordMerchantInventory),
 N(OP_DoGroupLeadershipAbility),
-N(OP_DuelResponse),
-N(OP_DuelResponse2),
+N(OP_DuelDecline),
+N(OP_DuelAccept),
 N(OP_DumpName),
 N(OP_Dye),
 N(OP_DynamicWall),
@@ -355,7 +355,6 @@ N(OP_OpenContainer),
 N(OP_OpenDiscordMerchant),
 N(OP_OpenGuildTributeMaster),
 N(OP_OpenInventory),
-N(OP_OpenNewTasksWindow),
 N(OP_OpenTributeMaster),
 N(OP_PDeletePetition),
 N(OP_PetBuffWindow),
@@ -464,6 +463,19 @@ N(OP_SetServerFilter),
 N(OP_SetStartCity),
 N(OP_SetTitle),
 N(OP_SetTitleReply),
+N(OP_SharedTaskMemberList),
+N(OP_SharedTaskAddPlayer),
+N(OP_SharedTaskRemovePlayer),
+N(OP_SharedTaskMakeLeader),
+N(OP_SharedTaskMemberInvite),
+N(OP_SharedTaskInvite),
+N(OP_SharedTaskInviteResponse),
+N(OP_SharedTaskAcceptNew),
+N(OP_SharedTaskMemberChange),
+N(OP_SharedTaskPlayerList),
+N(OP_SharedTaskSelectWindow),
+N(OP_SharedTaskQuit),
+N(OP_TaskTimers),
 N(OP_Shielding),
 N(OP_ShopDelItem),
 N(OP_ShopEnd),
@@ -499,7 +511,8 @@ N(OP_TaskActivityComplete),
 N(OP_TaskDescription),
 N(OP_TaskHistoryReply),
 N(OP_TaskHistoryRequest),
-N(OP_TaskMemberList),
+N(OP_TaskRequestTimer),
+N(OP_TaskSelectWindow),
 N(OP_Taunt),
 N(OP_TestBuff),
 N(OP_TGB),
@@ -567,4 +580,5 @@ N(OP_ZoneServerReady),
 N(OP_ZoneSpawns),
 N(OP_ZoneUnavail),
 N(OP_ResetAA),
+N(OP_UnderWorld),
 // mail and chat opcodes located in ../mail_oplist.h

common/eq_constants.h

@@ -65,6 +65,7 @@
 #define AT_FindBits 46		// set FindBits, whatever those are!
 #define AT_TextureType 48	// TextureType
 #define AT_FacePick 49		// Turns off face pick window? maybe ...
+#define AT_AntiCheat 51		// sent by the client randomly telling the server how long since last action has occured
 #define AT_GuildShow 52		// this is what MQ2 call sit, not sure
 #define AT_Offline 53		// Offline mode
 
@@ -197,6 +198,492 @@ namespace Chat {
 	const uint16 Stun             = 340;
 };
 
+// generation SQL:
+// SELECT CONCAT('    constexpr uint16 ', UPPER(short_name), ' = ' , zoneidnumber, '; // ', long_name) from zone group by zoneidnumber ORDER BY zoneidnumber;
+namespace Zones {
+	constexpr uint16 QEYNOS = 1; // South Qeynos
+	constexpr uint16 QEYNOS2 = 2; // North Qeynos
+	constexpr uint16 QRG = 3; // The Surefall Glade
+	constexpr uint16 QEYTOQRG = 4; // The Qeynos Hills
+	constexpr uint16 HIGHPASS = 5; // Highpass Hold
+	constexpr uint16 HIGHKEEP = 6; // High Keep
+	constexpr uint16 FREPORTN = 8; // North Freeport
+	constexpr uint16 FREPORTW = 9; // West Freeport
+	constexpr uint16 FREPORTE = 10; // East Freeport
+	constexpr uint16 RUNNYEYE = 11; // The Liberated Citadel of Runnyeye
+	constexpr uint16 QEY2HH1 = 12; // The Western Plains of Karana
+	constexpr uint16 NORTHKARANA = 13; // The Northern Plains of Karana
+	constexpr uint16 SOUTHKARANA = 14; // The Southern Plains of Karana
+	constexpr uint16 EASTKARANA = 15; // Eastern Plains of Karana
+	constexpr uint16 BEHOLDER = 16; // Gorge of King Xorbb
+	constexpr uint16 BLACKBURROW = 17; // Blackburrow
+	constexpr uint16 PAW = 18; // The Lair of the Splitpaw
+	constexpr uint16 RIVERVALE = 19; // Rivervale
+	constexpr uint16 KITHICOR = 20; // Kithicor Forest
+	constexpr uint16 COMMONS = 21; // West Commonlands
+	constexpr uint16 ECOMMONS = 22; // East Commonlands
+	constexpr uint16 ERUDNINT = 23; // The Erudin Palace
+	constexpr uint16 ERUDNEXT = 24; // Erudin
+	constexpr uint16 NEKTULOS = 25; // The Nektulos Forest
+	constexpr uint16 CSHOME = 26; // Sunset Home
+	constexpr uint16 LAVASTORM = 27; // The Lavastorm Mountains
+	constexpr uint16 NEKTROPOS = 28; // Nektropos
+	constexpr uint16 HALAS = 29; // Halas
+	constexpr uint16 EVERFROST = 30; // Everfrost Peaks
+	constexpr uint16 SOLDUNGA = 31; // Solusek's Eye
+	constexpr uint16 SOLDUNGB = 32; // Nagafen's Lair
+	constexpr uint16 MISTY = 33; // Misty Thicket
+	constexpr uint16 NRO = 34; // Northern Desert of Ro
+	constexpr uint16 SRO = 35; // Southern Desert of Ro
+	constexpr uint16 BEFALLEN = 36; // Befallen
+	constexpr uint16 OASIS = 37; // Oasis of Marr
+	constexpr uint16 TOX = 38; // Toxxulia Forest
+	constexpr uint16 HOLE = 39; // The Hole
+	constexpr uint16 NERIAKA = 40; // Neriak - Foreign Quarter
+	constexpr uint16 NERIAKB = 41; // Neriak - Commons
+	constexpr uint16 NERIAKC = 42; // Neriak - 3rd Gate
+	constexpr uint16 NERIAKD = 43; // Neriak Palace
+	constexpr uint16 NAJENA = 44; // Najena
+	constexpr uint16 QCAT = 45; // The Qeynos Aqueduct System
+	constexpr uint16 INNOTHULE = 46; // Innothule Swamp
+	constexpr uint16 FEERROTT = 47; // The Feerrott
+	constexpr uint16 CAZICTHULE = 48; // Accursed Temple of CazicThule
+	constexpr uint16 OGGOK = 49; // Oggok
+	constexpr uint16 RATHEMTN = 50; // The Rathe Mountains
+	constexpr uint16 LAKERATHE = 51; // Lake Rathetear
+	constexpr uint16 GROBB = 52; // Grobb
+	constexpr uint16 AVIAK = 53; // Aviak Village
+	constexpr uint16 GFAYDARK = 54; // The Greater Faydark
+	constexpr uint16 AKANON = 55; // Ak'Anon
+	constexpr uint16 STEAMFONT = 56; // Steamfont Mountains
+	constexpr uint16 LFAYDARK = 57; // The Lesser Faydark
+	constexpr uint16 CRUSHBONE = 58; // Crushbone
+	constexpr uint16 MISTMOORE = 59; // The Castle of Mistmoore
+	constexpr uint16 KALADIMA = 60; // South Kaladim
+	constexpr uint16 FELWITHEA = 61; // Northern Felwithe
+	constexpr uint16 FELWITHEB = 62; // Southern Felwithe
+	constexpr uint16 UNREST = 63; // The Estate of Unrest
+	constexpr uint16 KEDGE = 64; // Kedge Keep
+	constexpr uint16 GUKTOP = 65; // The City of Guk
+	constexpr uint16 GUKBOTTOM = 66; // The Ruins of Old Guk
+	constexpr uint16 KALADIMB = 67; // North Kaladim
+	constexpr uint16 BUTCHER = 68; // Butcherblock Mountains
+	constexpr uint16 OOT = 69; // Ocean of Tears
+	constexpr uint16 CAULDRON = 70; // Dagnor's Cauldron
+	constexpr uint16 AIRPLANE = 71; // The Plane of Sky
+	constexpr uint16 FEARPLANE = 72; // The Plane of Fear
+	constexpr uint16 PERMAFROST = 73; // The Permafrost Caverns
+	constexpr uint16 KERRARIDGE = 74; // Kerra Isle
+	constexpr uint16 PAINEEL = 75; // Paineel
+	constexpr uint16 HATEPLANE = 76; // Plane of Hate
+	constexpr uint16 ARENA = 77; // The Arena
+	constexpr uint16 FIELDOFBONE = 78; // The Field of Bone
+	constexpr uint16 WARSLIKSWOOD = 79; // The Warsliks Woods
+	constexpr uint16 SOLTEMPLE = 80; // The Temple of Solusek Ro
+	constexpr uint16 DROGA = 81; // The Temple of Droga
+	constexpr uint16 CABWEST = 82; // Cabilis West
+	constexpr uint16 SWAMPOFNOHOPE = 83; // The Swamp of No Hope
+	constexpr uint16 FIRIONA = 84; // Firiona Vie
+	constexpr uint16 LAKEOFILLOMEN = 85; // Lake of Ill Omen
+	constexpr uint16 DREADLANDS = 86; // The Dreadlands
+	constexpr uint16 BURNINGWOOD = 87; // The Burning Wood
+	constexpr uint16 KAESORA = 88; // Kaesora
+	constexpr uint16 SEBILIS = 89; // The Ruins of Sebilis
+	constexpr uint16 CITYMIST = 90; // The City of Mist
+	constexpr uint16 SKYFIRE = 91; // The Skyfire Mountains
+	constexpr uint16 FRONTIERMTNS = 92; // Frontier Mountains
+	constexpr uint16 OVERTHERE = 93; // The Overthere
+	constexpr uint16 EMERALDJUNGLE = 94; // The Emerald Jungle
+	constexpr uint16 TRAKANON = 95; // Trakanon's Teeth
+	constexpr uint16 TIMOROUS = 96; // Timorous Deep
+	constexpr uint16 KURN = 97; // Kurn's Tower
+	constexpr uint16 ERUDSXING = 98; // Erud's Crossing
+	constexpr uint16 STONEBRUNT = 100; // The Stonebrunt Mountains
+	constexpr uint16 WARRENS = 101; // The Warrens
+	constexpr uint16 KARNOR = 102; // Karnor's Castle
+	constexpr uint16 CHARDOK = 103; // Chardok
+	constexpr uint16 DALNIR = 104; // The Crypt of Dalnir
+	constexpr uint16 CHARASIS = 105; // The Howling Stones
+	constexpr uint16 CABEAST = 106; // Cabilis East
+	constexpr uint16 NURGA = 107; // The Mines of Nurga
+	constexpr uint16 VEESHAN = 108; // Veeshan's Peak
+	constexpr uint16 VEKSAR = 109; // Veksar
+	constexpr uint16 ICECLAD = 110; // The Iceclad Ocean
+	constexpr uint16 FROZENSHADOW = 111; // The Tower of Frozen Shadow
+	constexpr uint16 VELKETOR = 112; // Velketor's Labyrinth
+	constexpr uint16 KAEL = 113; // Kael Drakkel
+	constexpr uint16 SKYSHRINE = 114; // Skyshrine
+	constexpr uint16 THURGADINA = 115; // The City of Thurgadin
+	constexpr uint16 EASTWASTES = 116; // Eastern Wastes
+	constexpr uint16 COBALTSCAR = 117; // Cobaltscar
+	constexpr uint16 GREATDIVIDE = 118; // The Great Divide
+	constexpr uint16 WAKENING = 119; // The Wakening Land
+	constexpr uint16 WESTWASTES = 120; // The Western Wastes
+	constexpr uint16 CRYSTAL = 121; // The Crystal Caverns
+	constexpr uint16 NECROPOLIS = 123; // Dragon Necropolis
+	constexpr uint16 TEMPLEVEESHAN = 124; // The Temple of Veeshan
+	constexpr uint16 SIRENS = 125; // Siren's Grotto
+	constexpr uint16 MISCHIEFPLANE = 126; // The Plane of Mischief
+	constexpr uint16 GROWTHPLANE = 127; // The Plane of Growth
+	constexpr uint16 SLEEPER = 128; // The Sleeper's Tomb
+	constexpr uint16 THURGADINB = 129; // Icewell Keep
+	constexpr uint16 ERUDSXING2 = 130; // Marauders Mire
+	constexpr uint16 SHADOWHAVEN = 150; // Shadow Haven
+	constexpr uint16 BAZAAR = 151; // The Bazaar
+	constexpr uint16 NEXUS = 152; // Nexus
+	constexpr uint16 ECHO_ = 153; // The Echo Caverns
+	constexpr uint16 ACRYLIA = 154; // The Acrylia Caverns
+	constexpr uint16 SHARVAHL = 155; // The City of Shar Vahl
+	constexpr uint16 PALUDAL = 156; // The Paludal Caverns
+	constexpr uint16 FUNGUSGROVE = 157; // The Fungus Grove
+	constexpr uint16 VEXTHAL = 158; // Vex Thal
+	constexpr uint16 SSERU = 159; // Sanctus Seru
+	constexpr uint16 KATTA = 160; // Katta Castellum
+	constexpr uint16 NETHERBIAN = 161; // Netherbian Lair
+	constexpr uint16 SSRATEMPLE = 162; // Ssraeshza Temple
+	constexpr uint16 GRIEGSEND = 163; // Grieg's End
+	constexpr uint16 THEDEEP = 164; // The Deep
+	constexpr uint16 SHADEWEAVER = 165; // Shadeweaver's Thicket
+	constexpr uint16 HOLLOWSHADE = 166; // Hollowshade Moor
+	constexpr uint16 GRIMLING = 167; // Grimling Forest
+	constexpr uint16 MSERU = 168; // Marus Seru
+	constexpr uint16 LETALIS = 169; // Mons Letalis
+	constexpr uint16 TWILIGHT = 170; // The Twilight Sea
+	constexpr uint16 THEGREY = 171; // The Grey
+	constexpr uint16 TENEBROUS = 172; // The Tenebrous Mountains
+	constexpr uint16 MAIDEN = 173; // The Maiden's Eye
+	constexpr uint16 DAWNSHROUD = 174; // The Dawnshroud Peaks
+	constexpr uint16 SCARLET = 175; // The Scarlet Desert
+	constexpr uint16 UMBRAL = 176; // The Umbral Plains
+	constexpr uint16 AKHEVA = 179; // The Akheva Ruins
+	constexpr uint16 ARENA2 = 180; // The Arena Two
+	constexpr uint16 JAGGEDPINE = 181; // The Jaggedpine Forest
+	constexpr uint16 NEDARIA = 182; // Nedaria's Landing
+	constexpr uint16 TUTORIAL = 183; // EverQuest Tutorial
+	constexpr uint16 LOAD = 184; // Loading Zone
+	constexpr uint16 LOAD2 = 185; // New Loading Zone
+	constexpr uint16 HATEPLANEB = 186; // The Plane of Hate
+	constexpr uint16 SHADOWREST = 187; // Shadowrest
+	constexpr uint16 TUTORIALA = 188; // The Mines of Gloomingdeep
+	constexpr uint16 TUTORIALB = 189; // The Mines of Gloomingdeep
+	constexpr uint16 CLZ = 190; // Loading
+	constexpr uint16 CODECAY = 200; // The Crypt of Decay
+	constexpr uint16 POJUSTICE = 201; // The Plane of Justice
+	constexpr uint16 POKNOWLEDGE = 202; // The Plane of Knowledge
+	constexpr uint16 POTRANQUILITY = 203; // The Plane of Tranquility
+	constexpr uint16 PONIGHTMARE = 204; // The Plane of Nightmares
+	constexpr uint16 PODISEASE = 205; // The Plane of Disease
+	constexpr uint16 POINNOVATION = 206; // The Plane of Innovation
+	constexpr uint16 POTORMENT = 207; // Torment, the Plane of Pain
+	constexpr uint16 POVALOR = 208; // The Plane of Valor
+	constexpr uint16 BOTHUNDER = 209; // Bastion of Thunder
+	constexpr uint16 POSTORMS = 210; // The Plane of Storms
+	constexpr uint16 HOHONORA = 211; // The Halls of Honor
+	constexpr uint16 SOLROTOWER = 212; // The Tower of Solusek Ro
+	constexpr uint16 POWAR = 213; // Plane of War
+	constexpr uint16 POTACTICS = 214; // Drunder, the Fortress of Zek
+	constexpr uint16 POAIR = 215; // The Plane of Air
+	constexpr uint16 POWATER = 216; // The Plane of Water
+	constexpr uint16 POFIRE = 217; // The Plane of Fire
+	constexpr uint16 POEARTHA = 218; // The Plane of Earth
+	constexpr uint16 POTIMEA = 219; // The Plane of Time
+	constexpr uint16 HOHONORB = 220; // The Temple of Marr
+	constexpr uint16 NIGHTMAREB = 221; // The Lair of Terris Thule
+	constexpr uint16 POEARTHB = 222; // The Plane of Earth
+	constexpr uint16 POTIMEB = 223; // The Plane of Time
+	constexpr uint16 GUNTHAK = 224; // The Gulf of Gunthak
+	constexpr uint16 DULAK = 225; // Dulak's Harbor
+	constexpr uint16 TORGIRAN = 226; // The Torgiran Mines
+	constexpr uint16 NADOX = 227; // The Crypt of Nadox
+	constexpr uint16 HATESFURY = 228; // Hate's Fury
+	constexpr uint16 GUKA = 229; // Deepest Guk: Cauldron of Lost Souls
+	constexpr uint16 RUJA = 230; // The Rujarkian Hills: Bloodied Quarries
+	constexpr uint16 TAKA = 231; // Takish-Hiz: Sunken Library
+	constexpr uint16 MIRA = 232; // Miragul's Menagerie: Silent Gallery
+	constexpr uint16 MMCA = 233; // Mistmoore's Catacombs: Forlorn Caverns
+	constexpr uint16 GUKB = 234; // The Drowning Crypt
+	constexpr uint16 RUJB = 235; // The Rujarkian Hills: Halls of War
+	constexpr uint16 TAKB = 236; // Takish-Hiz: Shifting Tower
+	constexpr uint16 MIRB = 237; // Miragul's Menagerie: Frozen Nightmare
+	constexpr uint16 MMCB = 238; // Mistmoore's Catacombs: Dreary Grotto
+	constexpr uint16 GUKC = 239; // Deepest Guk: Ancient Aqueducts
+	constexpr uint16 RUJC = 240; // The Rujarkian Hills: Wind Bridges
+	constexpr uint16 TAKC = 241; // Takish-Hiz: Within the Compact
+	constexpr uint16 MIRC = 242; // The Spider Den
+	constexpr uint16 MMCC = 243; // Mistmoore's Catacombs: Struggles within the Progeny
+	constexpr uint16 GUKD = 244; // The Mushroom Grove
+	constexpr uint16 RUJD = 245; // The Rujarkian Hills: Prison Break
+	constexpr uint16 TAKD = 246; // Takish-Hiz: Royal Observatory
+	constexpr uint16 MIRD = 247; // Miragul's Menagerie: Hushed Banquet
+	constexpr uint16 MMCD = 248; // Mistmoore's Catacombs: Chambers of Eternal Affliction
+	constexpr uint16 GUKE = 249; // Deepest Guk: The Curse Reborn
+	constexpr uint16 RUJE = 250; // The Rujarkian Hills: Drudge Hollows
+	constexpr uint16 TAKE = 251; // Takish-Hiz: River of Recollection
+	constexpr uint16 MIRE = 252; // The Frosted Halls
+	constexpr uint16 MMCE = 253; // Mistmoore's Catacombs: Sepulcher of the Damned
+	constexpr uint16 GUKF = 254; // Deepest Guk: Chapel of the Witnesses
+	constexpr uint16 RUJF = 255; // The Rujarkian Hills: Fortified Lair of the Taskmasters
+	constexpr uint16 TAKF = 256; // Takish-Hiz: Sandfall Corridors
+	constexpr uint16 MIRF = 257; // The Forgotten Wastes
+	constexpr uint16 MMCF = 258; // Mistmoore's Catacombs: Scion Lair of Fury
+	constexpr uint16 GUKG = 259; // The Root Garden
+	constexpr uint16 RUJG = 260; // The Rujarkian Hills: Hidden Vale of Deceit
+	constexpr uint16 TAKG = 261; // Takish-Hiz: Balancing Chamber
+	constexpr uint16 MIRG = 262; // Miragul's Menagerie: Heart of the Menagerie
+	constexpr uint16 MMCG = 263; // Mistmoore's Catacombs: Cesspits of Putrescence
+	constexpr uint16 GUKH = 264; // Deepest Guk: Accursed Sanctuary
+	constexpr uint16 RUJH = 265; // The Rujarkian Hills: Blazing Forge
+	constexpr uint16 TAKH = 266; // Takish-Hiz: Sweeping Tides
+	constexpr uint16 MIRH = 267; // The Morbid Laboratory
+	constexpr uint16 MMCH = 268; // Mistmoore's Catacombs: Aisles of Blood
+	constexpr uint16 RUJI = 269; // The Rujarkian Hills: Arena of Chance
+	constexpr uint16 TAKI = 270; // Takish-Hiz: Antiquated Palace
+	constexpr uint16 MIRI = 271; // The Theater of Imprisoned Horror
+	constexpr uint16 MMCI = 272; // Mistmoore's Catacombs: Halls of Sanguinary Rites
+	constexpr uint16 RUJJ = 273; // The Rujarkian Hills: Barracks of War
+	constexpr uint16 TAKJ = 274; // Takish-Hiz: Prismatic Corridors
+	constexpr uint16 MIRJ = 275; // Miragul's Menagerie: Grand Library
+	constexpr uint16 MMCJ = 276; // Mistmoore's Catacombs: Infernal Sanctuary
+	constexpr uint16 CHARDOKB = 277; // Chardok: The Halls of Betrayal
+	constexpr uint16 SOLDUNGC = 278; // The Caverns of Exile
+	constexpr uint16 ABYSMAL = 279; // The Abysmal Sea
+	constexpr uint16 NATIMBI = 280; // Natimbi, the Broken Shores
+	constexpr uint16 QINIMI = 281; // Qinimi, Court of Nihilia
+	constexpr uint16 RIWWI = 282; // Riwwi, Coliseum of Games
+	constexpr uint16 BARINDU = 283; // Barindu, Hanging Gardens
+	constexpr uint16 FERUBI = 284; // Ferubi, Forgotten Temple of Taelosia
+	constexpr uint16 SNPOOL = 285; // Sewers of Nihilia, Pool of Sludg
+	constexpr uint16 SNLAIR = 286; // Sewers of Nihilia, Lair of Trapp
+	constexpr uint16 SNPLANT = 287; // Sewers of Nihilia, Purifying Pla
+	constexpr uint16 SNCREMATORY = 288; // Sewers of Nihilia, Emanating Cre
+	constexpr uint16 TIPT = 289; // Tipt, Treacherous Crags
+	constexpr uint16 VXED = 290; // Vxed, the Crumbling Caverns
+	constexpr uint16 YXTTA = 291; // Yxtta, Pulpit of Exiles
+	constexpr uint16 UQUA = 292; // Uqua, the Ocean God Chantry
+	constexpr uint16 KODTAZ = 293; // Kod'Taz, Broken Trial Grounds
+	constexpr uint16 IKKINZ = 294; // Ikkinz, Chambers of Transcendence
+	constexpr uint16 QVIC = 295; // Qvic, Prayer Grounds of Calling
+	constexpr uint16 INKTUTA = 296; // Inktu'Ta, the Unmasked Chapel
+	constexpr uint16 TXEVU = 297; // Txevu, Lair of the Elite
+	constexpr uint16 TACVI = 298; // Tacvi, The Broken Temple
+	constexpr uint16 QVICB = 299; // Qvic, the Hidden Vault
+	constexpr uint16 WALLOFSLAUGHTER = 300; // Wall of Slaughter
+	constexpr uint16 BLOODFIELDS = 301; // The Bloodfields
+	constexpr uint16 DRANIKSSCAR = 302; // Dranik's Scar
+	constexpr uint16 CAUSEWAY = 303; // Nobles' Causeway
+	constexpr uint16 CHAMBERSA = 304; // Muramite Proving Grounds
+	constexpr uint16 CHAMBERSB = 305; // Muramite Proving Grounds
+	constexpr uint16 CHAMBERSC = 306; // Muramite Proving Grounds
+	constexpr uint16 CHAMBERSD = 307; // Muramite Proving Grounds
+	constexpr uint16 CHAMBERSE = 308; // Muramite Proving Grounds
+	constexpr uint16 CHAMBERSF = 309; // Muramite Proving Grounds
+	constexpr uint16 PROVINGGROUNDS = 316; // Muramite Proving Grounds
+	constexpr uint16 ANGUISH = 317; // Anguish, the Fallen Palace
+	constexpr uint16 DRANIKHOLLOWSA = 318; // Dranik's Hollows
+	constexpr uint16 DRANIKHOLLOWSB = 319; // Dranik's Hollows
+	constexpr uint16 DRANIKHOLLOWSC = 320; // Dranik's Hollows
+	constexpr uint16 DRANIKCATACOMBSA = 328; // Catacombs of Dranik
+	constexpr uint16 DRANIKCATACOMBSB = 329; // Catacombs of Dranik
+	constexpr uint16 DRANIKCATACOMBSC = 330; // Catacombs of Dranik
+	constexpr uint16 DRANIKSEWERSA = 331; // Sewers of Dranik
+	constexpr uint16 DRANIKSEWERSB = 332; // Sewers of Dranik
+	constexpr uint16 DRANIKSEWERSC = 333; // Sewers of Dranik
+	constexpr uint16 RIFTSEEKERS = 334; // Riftseekers' Sanctum
+	constexpr uint16 HARBINGERS = 335; // Harbinger's Spire
+	constexpr uint16 DRANIK = 336; // The Ruined City of Dranik
+	constexpr uint16 BROODLANDS = 337; // The Broodlands
+	constexpr uint16 STILLMOONA = 338; // Stillmoon Temple
+	constexpr uint16 STILLMOONB = 339; // The Ascent
+	constexpr uint16 THUNDERCREST = 340; // Thundercrest Isles
+	constexpr uint16 DELVEA = 341; // Lavaspinner's Lair
+	constexpr uint16 DELVEB = 342; // Tirranun's Delve
+	constexpr uint16 THENEST = 343; // The Nest
+	constexpr uint16 GUILDLOBBY = 344; // Guild Lobby
+	constexpr uint16 GUILDHALL = 345; // Guild Hall
+	constexpr uint16 BARTER = 346; // The Barter Hall
+	constexpr uint16 ILLSALIN = 347; // Ruins of Illsalin
+	constexpr uint16 ILLSALINA = 348; // Illsalin Marketplace
+	constexpr uint16 ILLSALINB = 349; // Temple of Korlach
+	constexpr uint16 ILLSALINC = 350; // The Nargil Pits
+	constexpr uint16 DREADSPIRE = 351; // Dreadspire Keep
+	constexpr uint16 DRACHNIDHIVE = 354; // The Hive
+	constexpr uint16 DRACHNIDHIVEA = 355; // The Hatchery
+	constexpr uint16 DRACHNIDHIVEB = 356; // The Cocoons
+	constexpr uint16 DRACHNIDHIVEC = 357; // Queen Sendaii`s Lair
+	constexpr uint16 WESTKORLACH = 358; // Stoneroot Falls
+	constexpr uint16 WESTKORLACHA = 359; // Prince's Manor
+	constexpr uint16 WESTKORLACHB = 360; // Caverns of the Lost
+	constexpr uint16 WESTKORLACHC = 361; // Lair of the Korlach
+	constexpr uint16 EASTKORLACH = 362; // The Undershore
+	constexpr uint16 EASTKORLACHA = 363; // Snarlstone Dens
+	constexpr uint16 SHADOWSPINE = 364; // Shadow Spine
+	constexpr uint16 CORATHUS = 365; // Corathus Creep
+	constexpr uint16 CORATHUSA = 366; // Sporali Caverns
+	constexpr uint16 CORATHUSB = 367; // The Corathus Mines
+	constexpr uint16 NEKTULOSA = 368; // Shadowed Grove
+	constexpr uint16 ARCSTONE = 369; // Arcstone, Isle of Spirits
+	constexpr uint16 RELIC = 370; // Relic, the Artifact City
+	constexpr uint16 SKYLANCE = 371; // Skylance
+	constexpr uint16 DEVASTATION = 372; // The Devastation
+	constexpr uint16 DEVASTATIONA = 373; // The Seething Wall
+	constexpr uint16 RAGE = 374; // Sverag, Stronghold of Rage
+	constexpr uint16 RAGEA = 375; // Razorthorn, Tower of Sullon Zek
+	constexpr uint16 TAKISHRUINS = 376; // Ruins of Takish-Hiz
+	constexpr uint16 TAKISHRUINSA = 377; // The Root of Ro
+	constexpr uint16 ELDDAR = 378; // The Elddar Forest
+	constexpr uint16 ELDDARA = 379; // Tunare's Shrine
+	constexpr uint16 THEATER = 380; // Theater of Blood
+	constexpr uint16 THEATERA = 381; // Deathknell, Tower of Dissonance
+	constexpr uint16 FREEPORTEAST = 382; // East Freeport
+	constexpr uint16 FREEPORTWEST = 383; // West Freeport
+	constexpr uint16 FREEPORTSEWERS = 384; // Freeport Sewers
+	constexpr uint16 FREEPORTACADEMY = 385; // Academy of Arcane Sciences
+	constexpr uint16 FREEPORTTEMPLE = 386; // Temple of Marr
+	constexpr uint16 FREEPORTMILITIA = 387; // Freeport Militia House: My Precious
+	constexpr uint16 FREEPORTARENA = 388; // Arena
+	constexpr uint16 FREEPORTCITYHALL = 389; // City Hall
+	constexpr uint16 FREEPORTTHEATER = 390; // Theater of the Tranquil
+	constexpr uint16 FREEPORTHALL = 391; // Hall of Truth: Bounty
+	constexpr uint16 NORTHRO = 392; // North Desert of Ro
+	constexpr uint16 SOUTHRO = 393; // South Desert of Ro
+	constexpr uint16 CRESCENT = 394; // Crescent Reach
+	constexpr uint16 MOORS = 395; // Blightfire Moors
+	constexpr uint16 STONEHIVE = 396; // Stone Hive
+	constexpr uint16 MESA = 397; // Goru`kar Mesa
+	constexpr uint16 ROOST = 398; // Blackfeather Roost
+	constexpr uint16 STEPPES = 399; // The Steppes
+	constexpr uint16 ICEFALL = 400; // Icefall Glacier
+	constexpr uint16 VALDEHOLM = 401; // Valdeholm
+	constexpr uint16 FROSTCRYPT = 402; // Frostcrypt, Throne of the Shade King
+	constexpr uint16 SUNDEROCK = 403; // Sunderock Springs
+	constexpr uint16 VERGALID = 404; // Vergalid Mines
+	constexpr uint16 DIREWIND = 405; // Direwind Cliffs
+	constexpr uint16 ASHENGATE = 406; // Ashengate, Reliquary of the Scale
+	constexpr uint16 HIGHPASSHOLD = 407; // Highpass Hold
+	constexpr uint16 COMMONLANDS = 408; // The Commonlands
+	constexpr uint16 OCEANOFTEARS = 409; // The Ocean of Tears
+	constexpr uint16 KITHFOREST = 410; // Kithicor Forest
+	constexpr uint16 BEFALLENB = 411; // Befallen
+	constexpr uint16 HIGHPASSKEEP = 412; // HighKeep
+	constexpr uint16 INNOTHULEB = 413; // The Innothule Swamp
+	constexpr uint16 TOXXULIA = 414; // Toxxulia Forest
+	constexpr uint16 MISTYTHICKET = 415; // The Misty Thicket
+	constexpr uint16 KATTACASTRUM = 416; // Katta Castrum
+	constexpr uint16 THALASSIUS = 417; // Thalassius, the Coral Keep
+	constexpr uint16 ATIIKI = 418; // Jewel of Atiiki
+	constexpr uint16 ZHISZA = 419; // Zhisza, the Shissar Sanctuary
+	constexpr uint16 SILYSSAR = 420; // Silyssar, New Chelsith
+	constexpr uint16 SOLTERIS = 421; // Solteris, the Throne of Ro
+	constexpr uint16 BARREN = 422; // Barren Coast
+	constexpr uint16 BURIEDSEA = 423; // The Buried Sea
+	constexpr uint16 JARDELSHOOK = 424; // Jardel's Hook
+	constexpr uint16 MONKEYROCK = 425; // Monkey Rock
+	constexpr uint16 SUNCREST = 426; // Suncrest Isle
+	constexpr uint16 DEADBONE = 427; // Deadbone Reef
+	constexpr uint16 BLACKSAIL = 428; // Blacksail Folly
+	constexpr uint16 MAIDENSGRAVE = 429; // Maiden's Grave
+	constexpr uint16 REDFEATHER = 430; // Redfeather Isle
+	constexpr uint16 SHIPMVP = 431; // The Open Sea
+	constexpr uint16 SHIPMVU = 432; // The Open Sea
+	constexpr uint16 SHIPPVU = 433; // The Open Sea
+	constexpr uint16 SHIPUVU = 434; // The Open Sea
+	constexpr uint16 SHIPMVM = 435; // The Open Sea
+	constexpr uint16 MECHANOTUS = 436; // Fortress Mechanotus
+	constexpr uint16 MANSION = 437; // Meldrath's Majestic Mansion
+	constexpr uint16 STEAMFACTORY = 438; // The Steam Factory
+	constexpr uint16 SHIPWORKSHOP = 439; // S.H.I.P. Workshop
+	constexpr uint16 GYROSPIREB = 440; // Gyrospire Beza
+	constexpr uint16 GYROSPIREZ = 441; // Gyrospire Zeka
+	constexpr uint16 DRAGONSCALE = 442; // Dragonscale Hills
+	constexpr uint16 LOPINGPLAINS = 443; // Loping Plains
+	constexpr uint16 HILLSOFSHADE = 444; // Hills of Shade
+	constexpr uint16 BLOODMOON = 445; // Bloodmoon Keep
+	constexpr uint16 CRYSTALLOS = 446; // Crystallos, Lair of the Awakened
+	constexpr uint16 GUARDIAN = 447; // The Mechamatic Guardian
+	constexpr uint16 STEAMFONTMTS = 448; // The Steamfont Mountains
+	constexpr uint16 CRYPTOFSHADE = 449; // Crypt of Shade
+	constexpr uint16 DRAGONSCALEB = 451; // Deepscar's Den
+	constexpr uint16 OLDFIELDOFBONE = 452; // Field of Scale
+	constexpr uint16 OLDKAESORAA = 453; // Kaesora Library
+	constexpr uint16 OLDKAESORAB = 454; // Kaesora Hatchery
+	constexpr uint16 OLDKURN = 455; // Kurn's Tower
+	constexpr uint16 OLDKITHICOR = 456; // Bloody Kithicor
+	constexpr uint16 OLDCOMMONS = 457; // Old Commonlands
+	constexpr uint16 OLDHIGHPASS = 458; // Highpass Hold
+	constexpr uint16 THEVOIDA = 459; // The Void
+	constexpr uint16 THEVOIDB = 460; // The Void
+	constexpr uint16 THEVOIDC = 461; // The Void
+	constexpr uint16 THEVOIDD = 462; // The Void
+	constexpr uint16 THEVOIDE = 463; // The Void
+	constexpr uint16 THEVOIDF = 464; // The Void
+	constexpr uint16 THEVOIDG = 465; // The Void
+	constexpr uint16 OCEANGREENHILLS = 466; // Oceangreen Hills
+	constexpr uint16 OCEANGREENVILLAGE = 467; // Oceangreen Village
+	constexpr uint16 OLDBLACKBURROW = 468; // BlackBurrow
+	constexpr uint16 BERTOXTEMPLE = 469; // Temple of Bertoxxulous
+	constexpr uint16 DISCORD = 470; // Korafax, Home of the Riders
+	constexpr uint16 DISCORDTOWER = 471; // Citadel of the Worldslayer
+	constexpr uint16 OLDBLOODFIELD = 472; // Old Bloodfields
+	constexpr uint16 PRECIPICEOFWAR = 473; // The Precipice of War
+	constexpr uint16 OLDDRANIK = 474; // City of Dranik
+	constexpr uint16 TOSKIRAKK = 475; // Toskirakk
+	constexpr uint16 KORASCIAN = 476; // Korascian Warrens
+	constexpr uint16 RATHECHAMBER = 477; // Rathe Council Chamber
+	constexpr uint16 BRELLSREST = 480; // Brell's Rest
+	constexpr uint16 FUNGALFOREST = 481; // Fungal Forest
+	constexpr uint16 UNDERQUARRY = 482; // The Underquarry
+	constexpr uint16 COOLINGCHAMBER = 483; // The Cooling Chamber
+	constexpr uint16 SHININGCITY = 484; // Kernagir, the Shining City
+	constexpr uint16 ARTHICREX = 485; // Arthicrex
+	constexpr uint16 FOUNDATION = 486; // The Foundation
+	constexpr uint16 LICHENCREEP = 487; // Lichen Creep
+	constexpr uint16 PELLUCID = 488; // Pellucid Grotto
+	constexpr uint16 STONESNAKE = 489; // Volska's Husk
+	constexpr uint16 BRELLSTEMPLE = 490; // Brell's Temple
+	constexpr uint16 CONVORTEUM = 491; // The Convorteum
+	constexpr uint16 BRELLSARENA = 492; // Brell's Arena
+	constexpr uint16 WEDDINGCHAPEL = 493; // Wedding Chapel
+	constexpr uint16 WEDDINGCHAPELDARK = 494; // Wedding Chapel
+	constexpr uint16 DRAGONCRYPT = 495; // Lair of the Risen
+	constexpr uint16 FEERROTT2 = 700; // The Feerrott
+	constexpr uint16 THULEHOUSE1 = 701; // House of Thule
+	constexpr uint16 THULEHOUSE2 = 702; // House of Thule, Upper Floors
+	constexpr uint16 HOUSEGARDEN = 703; // The Grounds
+	constexpr uint16 THULELIBRARY = 704; // The Library
+	constexpr uint16 WELL = 705; // The Well
+	constexpr uint16 FALLEN = 706; // Erudin Burning
+	constexpr uint16 MORELLCASTLE = 707; // Morell's Castle
+	constexpr uint16 SOMNIUM = 708; // Sanctum Somnium
+	constexpr uint16 ALKABORMARE = 709; // Al'Kabor's Nightmare
+	constexpr uint16 MIRAGULMARE = 710; // Miragul's Nightmare
+	constexpr uint16 THULEDREAM = 711; // Fear Itself
+	constexpr uint16 NEIGHBORHOOD = 712; // Sunrise Hills
+	constexpr uint16 ARGATH = 724; // Argath, Bastion of Illdaera
+	constexpr uint16 ARELIS = 725; // Valley of Lunanyn
+	constexpr uint16 SARITHCITY = 726; // Sarith, City of Tides
+	constexpr uint16 RUBAK = 727; // Rubak Oseka, Temple of the Sea
+	constexpr uint16 BEASTDOMAIN = 728; // Beasts' Domain
+	constexpr uint16 RESPLENDENT = 729; // The Resplendent Temple
+	constexpr uint16 PILLARSALRA = 730; // Pillars of Alra
+	constexpr uint16 WINDSONG = 731; // Windsong Sanctuary
+	constexpr uint16 CITYOFBRONZE = 732; // Erillion, City of Bronze
+	constexpr uint16 SEPULCHER = 733; // Sepulcher of Order
+	constexpr uint16 EASTSEPULCHER = 734; // Sepulcher East
+	constexpr uint16 WESTSEPULCHER = 735; // Sepulcher West
+	constexpr uint16 SHARDSLANDING = 752; // Shard's Landing
+	constexpr uint16 XORBB = 753; // Valley of King Xorbb
+	constexpr uint16 KAELSHARD = 754; // Kael Drakkel: The King's Madness
+	constexpr uint16 EASTWASTESSHARD = 755; // East Wastes: Zeixshi-Kar's Awakening
+	constexpr uint16 CRYSTALSHARD = 756; // The Crystal Caverns: Fragment of Fear
+	constexpr uint16 BREEDINGGROUNDS = 757; // The Breeding Grounds
+	constexpr uint16 EVILTREE = 758; // Evantil, the Vile Oak
+	constexpr uint16 GRELLETH = 759; // Grelleth's Palace, the Chateau of Filth
+	constexpr uint16 CHAPTERHOUSE = 760; // Chapterhouse of the Fallen
+	constexpr uint16 ARTTEST = 996; // Art Testing Domain
+	constexpr uint16 FHALLS = 998; // The Forgotten Halls
+	constexpr uint16 APPRENTICE = 999; // Designer Apprentice
+}
+
 //ZoneChange_Struct->success values
 #define ZONE_ERROR_NOMSG 0
 #define ZONE_ERROR_NOTREADY -1
@@ -438,6 +925,10 @@ static const uint8 SkillDamageTypes[EQ::skills::HIGHEST_SKILL + 1] = // change t
 
 static const uint32 MAX_SPELL_DB_ID_VAL = 65535;
 
+static const uint32 DB_FACTION_GEM_CHOPPERS = 255;
+static const uint32 DB_FACTION_HERETICS = 265;
+static const uint32 DB_FACTION_KING_AKANON = 333;
+
 enum ChatChannelNames : uint16
 {
 	ChatChannel_Guild = 0,
@@ -464,4 +955,58 @@ namespace ZoneBlockedSpellTypes {
 	const uint8 Region   = 2;
 };
 
+enum class DynamicZoneType
+{
+	None = 0,
+	Expedition,
+	Tutorial,
+	Task,
+	Mission, // Shared Task
+	Quest
+};
+
+enum class DynamicZoneMemberStatus : uint8_t
+{
+	Unknown = 0,
+	Online,
+	Offline,
+	InDynamicZone,
+	LinkDead
+};
+
+enum LDoNThemes {
+	Unused = 0,
+	GUK,
+	MIR,
+	MMC,
+	RUJ,
+	TAK
+};
+
+enum LDoNThemeBits {
+	UnusedBit = 0,
+	GUKBit = 1,
+	MIRBit = 2,
+	MMCBit = 4,
+	RUJBit = 8,
+	TAKBit = 16
+};
+
+enum StartZoneIndex {
+    Odus = 0,
+    Qeynos,
+    Halas,
+    Rivervale,
+    Freeport,
+    Neriak,
+    Grobb,
+    Oggok,
+    Kaladim,
+    GreaterFaydark,
+    Felwithe,
+    Akanon,
+    Cabilis,
+    SharVahl
+};
+
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/eq_packet_structs.h

@@ -384,7 +384,9 @@ struct NewZone_Struct {
 /*0716*/	uint32	FastRegenEndurance;
 /*0720*/	uint32	NPCAggroMaxDist;
 /*0724*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, if this value is 0, it prevents you from running off edges that would end up underworld
-/*0728*/
+/*0728*/	uint32	LavaDamage; // Seen 50
+/*0732*/	uint32	MinLavaDamage; // Seen 10
+/*0736*/
 };
 
 /*
@@ -446,6 +448,7 @@ struct ManaChange_Struct
 /*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 normal, otherwise clear ETA and GCD
 };
 
 struct SwapSpell_Struct
@@ -829,7 +832,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-	/*000*/ uint32 zoneId;
+	/*000*/ uint32 zone_id;
 	/*004*/ float x;
 	/*008*/ float y;
 	/*012*/ float z;
@@ -1772,7 +1775,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -2131,31 +2134,31 @@ struct AdventureLeaderboard_Struct
 };*/
 
 struct Illusion_Struct { //size: 256 - SoF
-/*000*/	uint32	spawnid;
-/*004*/	char charname[64];		//
-/*068*/	uint16	race;			//
-/*070*/	char	unknown006[2];
-/*072*/	uint8	gender;
-/*073*/	uint8	texture;
-/*074*/	uint8	unknown008;		//
-/*075*/	uint8	unknown009;		//
-/*076*/	uint8	helmtexture;	//
-/*077*/	uint8	unknown010;		//
-/*078*/	uint8	unknown011;		//
-/*079*/	uint8	unknown012;		//
-/*080*/	uint32	face;			//
-/*084*/	uint8	hairstyle;		//
-/*085*/	uint8	haircolor;		//
-/*086*/	uint8	beard;			//
-/*087*/	uint8	beardcolor;		//
-/*088*/	float	size;			//
-/*092*/	uint32	drakkin_heritage;	//
-/*096*/	uint32	drakkin_tattoo;		//
-/*100*/	uint32	drakkin_details;	//
-/*104*/	EQ::TintProfile	armor_tint;	//
-/*140*/	uint8	eyecolor1;		// Field Not Identified in any Illusion Struct
-/*141*/	uint8	eyecolor2;		// Field Not Identified in any Illusion Struct
-/*142*/	uint8	unknown138[114];	//
+/*000*/    uint32          spawnid;
+/*004*/    char            charname[64];        //
+/*068*/    uint16          race;            //
+/*070*/    char            unknown006[2];
+/*072*/    uint8           gender;
+/*073*/    uint8           texture;
+/*074*/    uint8           unknown008;        //
+/*075*/    uint8           unknown009;        //
+/*076*/    uint8           helmtexture;    //
+/*077*/    uint8           unknown010;        //
+/*078*/    uint8           unknown011;        //
+/*079*/    uint8           unknown012;        //
+/*080*/    uint32          face;            //
+/*084*/    uint8           hairstyle;        //
+/*085*/    uint8           haircolor;        //
+/*086*/    uint8           beard;            //
+/*087*/    uint8           beardcolor;        //
+/*088*/    float           size;            //
+/*092*/    uint32          drakkin_heritage;    //
+/*096*/    uint32          drakkin_tattoo;        //
+/*100*/    uint32          drakkin_details;    //
+/*104*/    EQ::TintProfile armor_tint;    //
+/*140*/    uint8           eyecolor1;        // Field Not Identified in any Illusion Struct
+/*141*/    uint8           eyecolor2;        // Field Not Identified in any Illusion Struct
+/*142*/    uint8           unknown138[114];    //
 /*256*/
 };
 
@@ -2759,7 +2762,7 @@ struct EnvDamage2_Struct {
 /*0004*/	uint16 unknown4;
 /*0006*/	uint32 damage;
 /*0010*/	uint8 unknown10[12];
-/*0022*/	uint8 dmgtype; //FA = Lava; FC = Falling
+/*0022*/	uint8 dmgtype; // FA = Lava, FB = Drowning, FC = Falling, FD = Trap
 /*0023*/	uint8 unknown2[4];
 /*0027*/	uint16 constant; //Always FFFF
 /*0029*/	uint16 unknown29;
@@ -3247,7 +3250,7 @@ struct TraderClick_Struct{
 };
 
 struct FormattedMessage_Struct{
-	uint32	unknown0;
+	uint32	unknown0; // 1 means from world server
 	uint32	string_id;
 	uint32	type;
 	char	message[0];
@@ -3255,7 +3258,7 @@ struct FormattedMessage_Struct{
 struct SimpleMessage_Struct{
 	uint32	string_id;
 	uint32	color;
-	uint32	unknown8;
+	uint32	unknown8; // 1 means from world server
 };
 
 struct GuildMemberUpdate_Struct {
@@ -3714,17 +3717,66 @@ struct SetTitleReply_Struct {
 	uint32	entity_id;
 };
 
-struct TaskMemberList_Struct {
-/*00*/ uint32	gopher_id;
-/*04*/ uint32	unknown04;
-/*08*/ uint32	member_count;	//1 less than the number of members
-/*12*/ char	list_pointer[0];
+struct SharedTaskMemberList_Struct {
+/*00*/ uint32 gopher_id;
+/*04*/ uint32 unknown04;
+/*08*/ uint32 member_count;    //1 less than the number of members
+///*12*/ char   list_pointer[0];
+	char      member_name[1];    //null terminated string
+	uint32    monster_mission; // class chosen
+	uint8     task_leader;    //boolean flag
+
 /*	list is of the form:
-	char member_name[1]	//null terminated string
 	uint8	task_leader	//boolean flag
 */
 };
 
+struct SharedTaskQuit_Struct {
+	int32 field1;
+	int32 field2;
+	int32 field3;
+};
+
+struct SharedTaskAddPlayer_Struct {
+	int32 field1;
+	int32 field2;
+	char  player_name[64];
+};
+
+struct SharedTaskMakeLeader_Struct {
+	int32 field1;
+	int32 field2;
+	char  player_name[64];
+};
+
+struct SharedTaskRemovePlayer_Struct {
+	int32 field1;
+	int32 field2;
+	char  player_name[64];
+};
+
+struct SharedTaskInvite_Struct {
+	int32_t unknown00;      // probably the unique character id sent in some packets
+	int32_t invite_id;      // invite id sent back in response
+	char    task_name[64];
+	char    inviter_name[64];
+};
+
+struct SharedTaskInviteResponse_Struct {
+	int32_t unknown00;  // 0
+	int32_t invite_id;  // same id sent in the invite, probably for server verification
+	int8_t  accepted;   // 0: declined 1: accepted
+	int8_t  padding[3]; // padding garbage probably
+};
+
+struct SharedTaskAccept_Struct {
+	int32_t  unknown00;
+	int32_t  unknown04;
+	uint32_t npc_entity_id;  // npc task giver entity id (sent in selection window)
+	uint32_t task_id;
+	float    reward_multiplier; // added after titanium (sent in selection window)
+};
+
 #if 0
 
 // Old struct not used by Task System implementation but left for reference
@@ -3817,7 +3869,7 @@ struct TaskHistory_Struct {
 #endif
 
 struct AcceptNewTask_Struct {
-	uint32	unknown00;
+	uint32	task_type; // type sent in selection window
 	uint32	task_id;		//set to 0 for 'decline'
 	uint32	task_master_id;	//entity ID
 };
@@ -4291,8 +4343,8 @@ struct AARankPrereq_Struct
 struct AARankEffect_Struct
 {
 	int32 effect_id;
-	int32 base1;
-	int32 base2;
+	int32 base_value;
+	int32 limit_value;
 	int32 slot;
 };
 
@@ -4300,8 +4352,8 @@ struct AARankEffect_Struct
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 };
 
@@ -4861,30 +4913,31 @@ struct ExpeditionInviteResponse_Struct
 /*079*/ uint8  unknown079;     // padding garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004; // added after titanium
-/*008*/ uint32 assigned;   // padded bool, 0: not in expedition (clear data), 1: in expedition
+/*008*/ uint32 assigned;   // padded bool, 0: clear info, 1: fill window info
 /*012*/ uint32 max_players;
-/*016*/ char   expedition_name[128];
+/*016*/ char   dz_name[128];
 /*144*/ char   leader_name[64];
+//*208*/ uint32 dz_type; // only in newer clients, if not 1 (expedition type) window does not auto show when dz info assigned
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char  name[64];          // variable length, null terminated, max 0x40 (64)
-/*064*/ uint8 expedition_status; // 0: unknown, 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char  name[64];      // variable length, null terminated, max 0x40 (64)
+/*064*/ uint8 online_status; // 0: unknown, 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count;
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
@@ -4907,7 +4960,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
@@ -5529,6 +5582,23 @@ struct SayLinkBodyFrame_Struct {
 /*056*/
 };
 
+struct UpdateMovementEntry {
+	/* 00 */	float Y;
+	/* 04 */	float X;
+	/* 08 */	float Z;
+	/* 12 */	uint8 type;
+	/* 13 */	unsigned int timestamp;
+	/* 17 */
+};
+
+struct UnderWorld {
+	/* 00 */	int spawn_id;
+	/* 04 */	float y;
+	/* 08 */	float x;
+	/* 12 */	float z;
+	/* 16 */
+};
+
 // Restore structure packing to default
 #pragma pack()
 

common/eqemu_config.cpp

@@ -44,6 +44,12 @@ void EQEmuConfig::parse_config()
 		if (_root["server"]["world"]["loginserver"].get("legacy", "0").asString() == "1") { LoginLegacy = true; }
 		LoginAccount  = _root["server"]["world"]["loginserver"].get("account", "").asString();
 		LoginPassword = _root["server"]["world"]["loginserver"].get("password", "").asString();
+
+		// at least today, this is wrong a majority of the time
+		// remove this if eqemulator ever upgrades its loginserver
+		if (LoginHost.find("login.eqemulator.net") != std::string::npos) {
+			LoginLegacy = true;
+		}
 	}
 	else {
 		char str[32];
@@ -62,12 +68,19 @@ void EQEmuConfig::parse_config()
 
 			loginconfig->LoginLegacy = false;
 			if (_root["server"]["world"][str].get("legacy", "0").asString() == "1") { loginconfig->LoginLegacy = true; }
+
+			// at least today, this is wrong a majority of the time
+			// remove this if eqemulator ever upgrades its loginserver
+			if (loginconfig->LoginHost.find("login.eqemulator.net") != std::string::npos) {
+				loginconfig->LoginLegacy = true;
+			}
+
 			loginlist.Insert(loginconfig);
 		} while (LoginCount < 100);
 	}
 
 
-	//<locked> from xml converts to json as locked: "", so i default to "false". 
+	//<locked> from xml converts to json as locked: "", so i default to "false".
 	//The only way to enable locked is by switching to true, meaning this value is always false until manually set true
 	Locked = false;
 	if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = true; }

common/eqemu_logsys.cpp

@@ -22,8 +22,8 @@
 #include "rulesys.h"
 #include "platform.h"
 #include "string_util.h"
-#include "database.h"
 #include "misc.h"
+#include "repositories/logsys_categories_repository.h"
 
 #include <iostream>
 #include <fstream>
@@ -31,6 +31,7 @@
 #include <iomanip>
 #include <time.h>
 #include <sys/stat.h>
+#include <algorithm>
 
 std::ofstream process_log;
 
@@ -96,7 +97,7 @@ EQEmuLogSys::EQEmuLogSys()
  */
 EQEmuLogSys::~EQEmuLogSys() = default;
 
-void EQEmuLogSys::LoadLogSettingsDefaults()
+EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 {
 	/**
 	 * Get Executable platform currently running this code (Zone/World/etc)
@@ -127,6 +128,10 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	log_settings[Logs::HotReload].log_to_gmsay        = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_console      = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Loot].log_to_gmsay             = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Scheduler].log_to_console      = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Cheat].log_to_console          = static_cast<uint8>(Logs::General);
+	log_settings[Logs::HTTP].log_to_console           = static_cast<uint8>(Logs::General);
+	log_settings[Logs::HTTP].log_to_gmsay             = static_cast<uint8>(Logs::General);
 
 	/**
 	 * RFC 5424
@@ -176,6 +181,8 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformHC) {
 		platform_file_name = "hc";
 	}
+
+	return this;
 }
 
 /**
@@ -206,11 +213,7 @@ std::string EQEmuLogSys::FormatOutMessageString(
 	const std::string &in_message
 )
 {
-	std::string return_string;
-
-	if (IsRfc5424LogCategory(log_category)) {
-		return_string = "[" + GetPlatformName() + "] ";
-	}
+	std::string return_string = "[" + GetPlatformName() + "] ";
 
 	return return_string + "[" + Logs::LogCategoryName[log_category] + "] " + in_message;
 }
@@ -234,9 +237,11 @@ void EQEmuLogSys::ProcessGMSay(
 	}
 
 	/**
-	 * Check to see if the process that actually ran this is zone
+	 * Processes that actually support hooks
 	 */
-	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone) {
+	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone ||
+		EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformWorld
+	) {
 		on_log_gmsay_hook(log_category, message);
 	}
 }
@@ -604,3 +609,76 @@ void EQEmuLogSys::EnableConsoleLogging()
 		log_settings[log_index].is_category_enabled = 1;
 	}
 }
+
+EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
+{
+	auto categories = LogsysCategoriesRepository::GetWhere(
+		*m_database,
+		"TRUE ORDER BY log_category_id"
+	);
+
+	// keep track of categories
+	std::vector<int> db_categories{};
+	db_categories.reserve(categories.size());
+
+	// loop through database categories
+	for (auto &c: categories) {
+		if (c.log_category_id <= Logs::None || c.log_category_id >= Logs::MaxCategoryID) {
+			continue;
+		}
+
+		log_settings[c.log_category_id].log_to_console = static_cast<uint8>(c.log_to_console);
+		log_settings[c.log_category_id].log_to_file    = static_cast<uint8>(c.log_to_file);
+		log_settings[c.log_category_id].log_to_gmsay   = static_cast<uint8>(c.log_to_gmsay);
+
+		// Determine if any output method is enabled for the category
+		// and set it to 1 so it can used to check if category is enabled
+		const bool log_to_console      = log_settings[c.log_category_id].log_to_console > 0;
+		const bool log_to_file         = log_settings[c.log_category_id].log_to_file > 0;
+		const bool log_to_gmsay        = log_settings[c.log_category_id].log_to_gmsay > 0;
+		const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
+
+		if (is_category_enabled) {
+			log_settings[c.log_category_id].is_category_enabled = 1;
+		}
+
+		// This determines whether or not the process needs to actually file log anything.
+		// If we go through this whole loop and nothing is set to any debug level, there
+		// is no point to create a file or keep anything open
+		if (log_settings[c.log_category_id].log_to_file > 0) {
+			LogSys.file_logs_enabled = true;
+		}
+
+		db_categories.emplace_back(c.log_category_id);
+	}
+
+	// Auto inject categories that don't exist in the database...
+	for (int i = Logs::AA; i != Logs::MaxCategoryID; i++) {
+		if (std::find(db_categories.begin(), db_categories.end(), i) == db_categories.end()) {
+			LogInfo(
+				"Automatically adding new log category [{0}]",
+				Logs::LogCategoryName[i]
+			);
+
+			auto new_category = LogsysCategoriesRepository::NewEntity();
+			new_category.log_category_id          = i;
+			new_category.log_category_description = EscapeString(Logs::LogCategoryName[i]);
+			new_category.log_to_console           = log_settings[i].log_to_console;
+			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
+			new_category.log_to_file              = log_settings[i].log_to_file;
+
+			LogsysCategoriesRepository::InsertOne(*m_database, new_category);
+		}
+	}
+
+	LogInfo("Loaded [{}] log categories", categories.size());
+
+	return this;
+}
+
+EQEmuLogSys *EQEmuLogSys::SetDatabase(Database *db)
+{
+	m_database = db;
+
+	return this;
+}

common/eqemu_logsys.h

@@ -23,8 +23,9 @@
 
 #include <iostream>
 #include <fstream>
-#include <stdio.h>
+#include <cstdio>
 #include <functional>
+#include <algorithm>
 
 #ifdef _WIN32
 #ifdef utf16_to_utf8
@@ -37,9 +38,9 @@
 
 namespace Logs {
 	enum DebugLevel {
-		General = 1,	/* 1 - Low-Level general debugging, useful info on single line */
-		Moderate,		/* 2 - Informational based, used in functions, when particular things load */
-		Detail			/* 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication */
+		General = 1,    // 1 - Low-Level general debugging, useful info on single line
+		Moderate,       // 2 - Informational based, used in functions, when particular things load
+		Detail          // 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication
 	};
 
 	/**
@@ -120,13 +121,19 @@ namespace Logs {
 		Loot,
 		Expeditions,
 		DynamicZones,
+		Scheduler,
+		Cheat,
+		ClientList,
+		DiaWind,
+		HTTP,
+		Saylink,
 		MaxCategoryID /* Don't Remove this */
 	};
 
 	/**
 	 * If you add to this, make sure you update LogCategory
 	 */
-	static const char* LogCategoryName[LogCategory::MaxCategoryID] = {
+	static const char *LogCategoryName[LogCategory::MaxCategoryID] = {
 		"",
 		"AA",
 		"AI",
@@ -199,11 +206,19 @@ namespace Logs {
 		"Loot",
 		"Expeditions",
 		"DynamicZones",
+		"Scheduler",
+		"Cheat",
+		"ClientList",
+		"DialogueWindow",
+		"HTTP",
+		"Saylink",
 	};
 }
 
 #include "eqemu_logsys_log_aliases.h"
 
+class Database;
+
 class EQEmuLogSys {
 public:
 	EQEmuLogSys();
@@ -214,7 +229,8 @@ public:
 	 * This should be handled on deconstructor but to be safe we use it anyways.
 	 */
 	void CloseFileLogs();
-	void LoadLogSettingsDefaults();
+	EQEmuLogSys *LoadLogSettingsDefaults();
+	EQEmuLogSys *LoadLogDatabaseSettings();
 
 	/**
 	 * @param directory_name
@@ -244,7 +260,7 @@ public:
 	 * Used in file logs to prepend a timestamp entry for logs
 	 * @param time_stamp
 	 */
-	void SetCurrentTimeStamp(char* time_stamp);
+	void SetCurrentTimeStamp(char *time_stamp);
 
 	/**
 	 * @param log_name
@@ -271,101 +287,53 @@ public:
 	/**
 	 * Internally used memory reference for all log settings per category
 	 * These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults
-	 * Database loaded via Database::LoadLogSettings(log_settings)
+	 * Database loaded via LogSys.SetDatabase(&database)->LoadLogDatabaseSettings();
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
 
 	bool file_logs_enabled = false;
 
-	/**
-	 * Sets Executable platform (Zone/World/UCS) etc.
-	 */
-	int log_platform = 0;
+	int                                                                               log_platform = 0;
+	std::string                                                                       platform_file_name;
 
-	/**
-	 * File name used in writing logs
-	 */
-	std::string platform_file_name;
 
-	/**
-	 * GMSay Client Message colors mapped by category
-	 *
-	 * @param log_category
-	 * @return
-	 */
+	// gmsay
 	uint16 GetGMSayColorFromCategory(uint16 log_category);
 
-	/**
-	 * @param f
-	 */
-	void SetGMSayHandler(std::function<void(uint16 log_type, const std::string&)> f) { on_log_gmsay_hook = f; }
+	EQEmuLogSys * SetGMSayHandler(std::function<void(uint16 log_type, const std::string &)> f) {
+		on_log_gmsay_hook = f;
+		return this;
+	}
 
-	/**
-	 * @param f
-	 */
-	void SetConsoleHandler(std::function<void(uint16 debug_level, uint16 log_type, const std::string&)> f) { on_log_console_hook = f; }
-
-	/**
-	 * Silence console logging
-	 */
+	// console
+	void SetConsoleHandler(
+		std::function<void(
+			uint16 debug_level,
+			uint16 log_type,
+			const std::string &
+		)> f
+	) { on_log_console_hook = f; }
 	void SilenceConsoleLogging();
-
-	/**
-	 * Turn on all console logging
-	 */
 	void EnableConsoleLogging();
 
+	// database
+	EQEmuLogSys *SetDatabase(Database *db);
+
 private:
 
-	/**
-	 * Callback pointer to zone process for hooking logs to zone using GMSay
-	 */
-	std::function<void(uint16 log_category, const std::string&)> on_log_gmsay_hook;
-	std::function<void(uint16 debug_level, uint16 log_category, const std::string&)> on_log_console_hook;
+	// reference to database
+	Database *m_database;
+
+	std::function<void(uint16 log_category, const std::string &)>                     on_log_gmsay_hook;
+	std::function<void(uint16 debug_level, uint16 log_category, const std::string &)> on_log_console_hook;
 
-	/**
-	 * Formats log messages like '[Category] This is a log message'
-	 */
 	std::string FormatOutMessageString(uint16 log_category, const std::string &in_message);
-
-	/**
-	 * Linux console color messages mapped by category
-	 *
-	 * @param log_category
-	 * @return
-	 */
 	std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
-
-	/**
-	 * Windows console color messages mapped by category
-	 */
 	uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
 
-	/**
-	 * @param debug_level
-	 * @param log_category
-	 * @param message
-	 */
 	void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message);
-
-	/**
-	 * @param debug_level
-	 * @param log_category
-	 * @param message
-	 */
 	void ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message);
-
-	/**
-	 * @param debug_level
-	 * @param log_category
-	 * @param message
-	 */
 	void ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message);
-
-	/**
-	 * @param log_category
-	 * @return
-	 */
 	bool IsRfc5424LogCategory(uint16 log_category);
 };
 

common/eqemu_logsys_log_aliases.h

@@ -636,6 +636,66 @@
         OutF(LogSys, Logs::Detail, Logs::DynamicZones, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogScheduler(message, ...) do {\
+    if (LogSys.log_settings[Logs::Scheduler].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Scheduler, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSchedulerDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Scheduler].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Scheduler, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCheat(message, ...) do {\
+    if (LogSys.log_settings[Logs::Cheat].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Cheat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCheatDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Cheat].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Cheat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogClientList(message, ...) do {\
+    if (LogSys.log_settings[Logs::ClientList].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::ClientList, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogClientListDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::ClientList].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::ClientList, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDiaWind(message, ...) do {\
+    if (LogSys.log_settings[Logs::DiaWind].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::DiaWind, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDiaWindDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::DiaWind].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::DiaWind, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHTTP(message, ...) do {\
+    if (LogSys.log_settings[Logs::HTTP].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::HTTP, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHTTPDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::HTTP].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::HTTP, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSaylink(message, ...) do {\
+    if (LogSys.log_settings[Logs::Saylink].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Saylink, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSaylinkDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Saylink].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Saylink, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.log_settings[log_category].is_category_enabled == 1)\
         LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -1008,6 +1068,30 @@
 #define LogDynamicZonesDetail(message, ...) do {\
 } while (0)
 
+#define LogCheatList(message, ...) do {\
+} while (0)
+
+#define LogCheatDetail(message, ...) do {\
+} while (0)
+
+#define LogClientList(message, ...) do {\
+} while (0)
+
+#define LogClientListDetail(message, ...) do {\
+} while (0)
+
+#define LogDiaWind(message, ...) do {\
+} while (0)
+
+#define LogDiaWindDetail(message, ...) do {\
+} while (0)
+
+#define LogHTTP(message, ...) do {\
+} while (0)
+
+#define LogHTTPDetail(message, ...) do {\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
 } while (0)
 

common/faction.cpp

@@ -20,31 +20,31 @@
 #include "races.h"
 #include "rulesys.h"
 
-const char *FactionValueToString(FACTION_VALUE fv)
+const char *FactionValueToString(FACTION_VALUE faction_value)
 {
-	switch (fv) {
+	switch (faction_value) {
 		case FACTION_ALLY:
-			return ("Ally");
+			return "Ally";
 		case FACTION_WARMLY:
-			return ("Warmly");
+			return "Warmly";
 		case FACTION_KINDLY:
-			return ("Kindly");
-		case FACTION_AMIABLE:
-			return ("Amiable");
-		case FACTION_INDIFFERENT:
-			return ("Indifferent");
-		case FACTION_APPREHENSIVE:
-			return ("Apprehensive");
-		case FACTION_DUBIOUS:
-			return ("Dubious");
-		case FACTION_THREATENLY:
-			return ("Threatenly");
+			return "Kindly";
+		case FACTION_AMIABLY:
+			return "Amiably";
+		case FACTION_INDIFFERENTLY:
+			return "Indifferently";
+		case FACTION_APPREHENSIVELY:
+			return "Apprehensively";
+		case FACTION_DUBIOUSLY:
+			return "Dubiously";
+		case FACTION_THREATENINGLY:
+			return "Threateningly";
 		case FACTION_SCOWLS:
-			return ("Scowls, ready to attack.");
+			return "Scowls";
 		default:
 			break;
 	}
-	return ("Unknown Faction Con");
+	return "Unknown";
 }
 
 
@@ -70,19 +70,19 @@ FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value)
 		return FACTION_KINDLY;
 	}
 	if (character_value >= RuleI(Faction, AmiablyFactionMinimum)) {
-		return FACTION_AMIABLE;
+		return FACTION_AMIABLY;
 	}
 	if (character_value >= RuleI(Faction, IndifferentlyFactionMinimum)) {
-		return FACTION_INDIFFERENT;
+		return FACTION_INDIFFERENTLY;
 	}
 	if (character_value >= RuleI(Faction, ApprehensivelyFactionMinimum)) {
-		return FACTION_APPREHENSIVE;
+		return FACTION_APPREHENSIVELY;
 	}
 	if (character_value >= RuleI(Faction, DubiouslyFactionMinimum)) {
-		return FACTION_DUBIOUS;
+		return FACTION_DUBIOUSLY;
 	}
 	if (character_value >= RuleI(Faction, ThreateninglyFactionMinimum)) {
-		return FACTION_THREATENLY;
+		return FACTION_THREATENINGLY;
 	}
 	return FACTION_SCOWLS;
 }

common/faction.h

@@ -27,13 +27,13 @@ enum FACTION_VALUE {
 	FACTION_ALLY = 1,
 	FACTION_WARMLY = 2,
 	FACTION_KINDLY = 3,
-	FACTION_AMIABLE = 4,
+	FACTION_AMIABLY = 4,
 
-	FACTION_INDIFFERENT = 5,
+	FACTION_INDIFFERENTLY = 5,
 
-	FACTION_APPREHENSIVE = 6,
-	FACTION_DUBIOUS = 7,
-	FACTION_THREATENLY = 8,
+	FACTION_APPREHENSIVELY = 6,
+	FACTION_DUBIOUSLY = 7,
+	FACTION_THREATENINGLY = 8,
 	FACTION_SCOWLS = 9
 };
 
@@ -50,8 +50,8 @@ struct NPCFactionList {
 struct FactionMods
 {
 	int32 base;
-	int16	min; 	// The lowest your personal earned faction can go - before race/class/diety adjustments.
-	int16	max; 	// The highest your personal earned faction can go - before race/class/diety adjustments.
+	int16	min; 	// The lowest your personal earned faction can go - before race/class/deity adjustments.
+	int16	max; 	// The highest your personal earned faction can go - before race/class/deity adjustments.
 	int32 class_mod;
 	int32 race_mod;
 	int32 deity_mod;
@@ -61,8 +61,8 @@ struct Faction {
 	int32	id;
 	std::map<std::string, int16> mods;
 	int16	base;
-	int16	min; // The lowest your personal earned faction can go - before race/class/diety adjustments.
-	int16	max; // The highest your personal earned faction can go - before race/class/diety adjustments.
+	int16	min; // The lowest your personal earned faction can go - before race/class/deity adjustments.
+	int16	max; // The highest your personal earned faction can go - before race/class/deity adjustments.
 	char	name[50];
 };
 
@@ -75,6 +75,6 @@ struct NPCFaction
 	uint8 temp;
 };
 
-const char *FactionValueToString(FACTION_VALUE fv);
+const char *FactionValueToString(FACTION_VALUE faction_value);
 FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value);
 #endif

common/features.h

@@ -204,7 +204,7 @@ enum {	//some random constants
 #define MIN_LEVEL_ALCHEMY 25
 
 //chance ratio that a
-#define THREATENLY_ARRGO_CHANCE 32 // 32/128 (25%) chance that a mob will arrgo on con Threatenly
+#define THREATENINGLY_AGGRO_CHANCE 32 // 32/128 (25%) chance that a mob will arrgo on con Threatenly
 
 //max factions per npc faction list
 #define MAX_NPC_FACTIONS 20

common/file_util.cpp

@@ -64,4 +64,9 @@ void FileUtil::mkdir(const std::string& directory_name)
 	}
 	::mkdir(directory_name.c_str(), 0755);
 #endif
-}
+}
+
+bool file_exists(const std::string& name) {
+	std::ifstream f(name.c_str());
+	return f.good();
+}

common/file_util.h

@@ -28,5 +28,6 @@ public:
 	static void mkdir(const std::string& directory_name);
 };
 
+bool file_exists(const std::string& name);
 
 #endif //EQEMU_FILE_UTIL_H

common/guild_base.cpp

@@ -63,7 +63,7 @@ bool BaseGuildManager::LoadGuilds() {
 	for (auto row=results.begin();row!=results.end();++row)
 		_CreateGuild(atoi(row[0]), row[1], atoi(row[2]), atoi(row[3]), row[4], row[5], row[6], row[7]);
 
-    query = "SELECT guild_id,rank,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks";
+    query = "SELECT guild_id,`rank`,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks";
 	results = m_db->QueryDatabase(query);
 
 	if (!results.Success())
@@ -131,7 +131,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 
 	info = _CreateGuild(guild_id, row[0], atoi(row[1]), atoi(row[2]), row[3], row[4], row[5], row[6]);
 
-    query = StringFormat("SELECT guild_id, rank, title, can_hear, can_speak, can_invite, can_remove, can_promote, can_demote, can_motd, can_warpeace "
+    query = StringFormat("SELECT guild_id, `rank`, title, can_hear, can_speak, can_invite, can_remove, can_promote, can_demote, can_motd, can_warpeace "
                         "FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id);
 	results = m_db->QueryDatabase(query);
 
@@ -268,7 +268,7 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) {
 		m_db->DoEscapeString(title_esc, rankInfo.name.c_str(), rankInfo.name.length());
 
         query = StringFormat("INSERT INTO guild_ranks "
-        "(guild_id,rank,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace)"
+        "(guild_id,`rank`,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace)"
 		" VALUES(%d,%d,'%s',%d,%d,%d,%d,%d,%d,%d,%d)",
 			guild_id, rank, title_esc,
 			rankInfo.permissions[GUILD_HEAR],
@@ -738,7 +738,7 @@ bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) {
 	std::string query;
 
 	if(guild_id != GUILD_NONE) {
-        query = StringFormat("REPLACE INTO guild_members (char_id,guild_id,rank,public_note) VALUES(%d,%d,%d,'')", charid, guild_id, rank);
+        query = StringFormat("REPLACE INTO guild_members (char_id,guild_id,`rank`,public_note) VALUES(%d,%d,%d,'')", charid, guild_id, rank);
         auto results = m_db->QueryDatabase(query);
 
 		if (!results.Success()) {
@@ -758,7 +758,7 @@ bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) {
 }
 
 bool BaseGuildManager::DBSetGuildRank(uint32 charid, uint8 rank) {
-	std::string query = StringFormat("UPDATE guild_members SET rank=%d WHERE char_id=%d", rank, charid);
+	std::string query = StringFormat("UPDATE guild_members SET `rank`=%d WHERE char_id=%d", rank, charid);
 	return(QueryWithLogging(query, "setting a guild member's rank"));
 }
 
@@ -1208,7 +1208,7 @@ BaseGuildManager::RankInfo::RankInfo() {
 
 BaseGuildManager::GuildInfo::GuildInfo() {
 	leader_char_id = 0;
-	minstatus = 0;
+	minstatus = AccountStatus::Player;
 }
 
 uint32 BaseGuildManager::DoesAccountContainAGuildLeader(uint32 AccountID)
@@ -1225,6 +1225,66 @@ uint32 BaseGuildManager::DoesAccountContainAGuildLeader(uint32 AccountID)
 	return results.RowCount();
 }
 
+std::string BaseGuildManager::GetGuildNameByID(uint32 guild_id) const {
+	if(guild_id == GUILD_NONE) {
+		return std::string();
+	}
 
+	std::map<uint32, GuildInfo *>::const_iterator res;
+	res = m_guilds.find(guild_id);
+	if(res == m_guilds.end()) {
+		return "Invalid Guild";
+	}
 
+	return res->second->name;
+}
 
+std::string BaseGuildManager::GetGuildRankName(uint32 guild_id, uint8 rank) const
+{
+	if(rank > GUILD_MAX_RANK) {
+		return "Invalid Rank";
+	}
+
+	std::map<uint32, GuildInfo *>::const_iterator res;
+	res = m_guilds.find(guild_id);
+	if(res == m_guilds.end()) {
+		return "Invalid Guild Rank";
+	}
+
+	return res->second->ranks[rank].name;
+}
+
+uint32 BaseGuildManager::GetGuildIDByCharacterID(uint32 character_id)
+{
+    if(!m_db) {
+		return GUILD_NONE;
+	}
+
+    std::string query = fmt::format(
+		"SELECT `guild_id` FROM `guild_members` WHERE char_id = {} LIMIT 1",
+		character_id
+	);
+    auto results = m_db->QueryDatabase(query);
+	if(!results.Success() || !results.RowCount()) {
+		return GUILD_NONE;
+	}
+
+	auto row = results.begin();
+	auto guild_id = std::stoul(row[0]);
+	return guild_id;
+}
+
+bool BaseGuildManager::IsCharacterInGuild(uint32 character_id, uint32 guild_id)
+{
+	auto current_guild_id = GetGuildIDByCharacterID(character_id);
+
+	if (current_guild_id == GUILD_NONE) {
+		return false;
+	}
+	
+	if (guild_id && current_guild_id != guild_id) {
+		return false;
+	}
+
+	return true;
+}

common/guild_base.h

@@ -76,8 +76,12 @@ class BaseGuildManager
 		bool	GetGuildChannel(uint32 GuildID, char *ChannelBuffer) const;
 		const char *GetRankName(uint32 guild_id, uint8 rank) const;
 		const char *GetGuildName(uint32 guild_id) const;
+		std::string GetGuildNameByID(uint32 guild_id) const;
+		std::string GetGuildRankName(uint32 guild_id, uint8 rank) const;
+		bool IsCharacterInGuild(uint32 character_id, uint32 guild_id = 0);
 		bool	GetGuildNameByID(uint32 guild_id, std::string &into) const;
 		uint32	GetGuildIDByName(const char *GuildName);
+		uint32 GetGuildIDByCharacterID(uint32 character_id);
 		bool	IsGuildLeader(uint32 guild_id, uint32 char_id) const;
 		uint8	GetDisplayedRank(uint32 guild_id, uint8 rank, uint32 char_id) const;
 		bool	CheckGMStatus(uint32 guild_id, uint8 status) const;

common/http/uri.h

@@ -0,0 +1,633 @@
+// Copyright (C) 2015 Ben Lewis <benjf5+github@gmail.com>
+// Licensed under the MIT license.
+// https://github.com/ben-zen/uri-library
+
+#pragma once
+
+#include <cctype>
+#include <map>
+#include <string>
+#include <stdexcept>
+#include <utility>
+
+class uri {
+	/* URIs are broadly divided into two categories: hierarchical and
+	 * non-hierarchical. Both hierarchical URIs and non-hierarchical URIs have a
+	 * few elements in common; all URIs have a scheme of one or more alphanumeric
+	 * characters followed by a colon, and they all may optionally have a query
+	 * component preceded by a question mark, and a fragment component preceded by
+	 * an octothorpe (hash mark: '#'). The query consists of stanzas separated by
+	 * either ampersands ('&') or semicolons (';') (but only one or the other),
+	 * and each stanza consists of a key and an optional value; if the value
+	 * exists, the key and value must be divided by an equals sign.
+	 *
+	 * The following is an example from Wikipedia of a hierarchical URI:
+	 * scheme:[//[user:password@]domain[:port]][/]path[?query][#fragment]
+	 */
+
+public:
+
+	enum class scheme_category {
+		Hierarchical,
+		NonHierarchical
+	};
+
+	enum class component {
+		Scheme,
+		Content,
+		Username,
+		Password,
+		Host,
+		Port,
+		Path,
+		Query,
+		Fragment
+	};
+
+	enum class query_argument_separator {
+		ampersand,
+		semicolon
+	};
+
+	uri(
+		char const *uri_text, scheme_category category = scheme_category::Hierarchical,
+		query_argument_separator separator = query_argument_separator::ampersand
+	) :
+		m_category(category),
+		m_path_is_rooted(false),
+		m_port(0),
+		m_separator(separator)
+	{
+		setup(std::string(uri_text), category);
+	};
+
+	uri(
+		std::string const &uri_text, scheme_category category = scheme_category::Hierarchical,
+		query_argument_separator separator = query_argument_separator::ampersand
+	) :
+		m_category(category),
+		m_path_is_rooted(false),
+		m_port(0),
+		m_separator(separator)
+	{
+		setup(uri_text, category);
+	};
+
+	uri(
+		std::map<component, std::string> const &components,
+		scheme_category category,
+		bool rooted_path,
+		query_argument_separator separator = query_argument_separator::ampersand
+	) :
+		m_category(category),
+		m_path_is_rooted(rooted_path),
+		m_separator(separator)
+	{
+		if (components.count(component::Scheme)) {
+			if (components.at(component::Scheme).length() == 0) {
+				throw std::invalid_argument("Scheme cannot be empty.");
+			}
+			m_scheme = components.at(component::Scheme);
+		}
+		else {
+			throw std::invalid_argument("A URI must have a scheme.");
+		}
+
+		if (category == scheme_category::Hierarchical) {
+			if (components.count(component::Content)) {
+				throw std::invalid_argument("The content component is only for use in non-hierarchical URIs.");
+			}
+
+			bool has_username = components.count(component::Username);
+			bool has_password = components.count(component::Password);
+			if (has_username && has_password) {
+				m_username = components.at(component::Username);
+				m_password = components.at(component::Password);
+			}
+			else if ((has_username && !has_password) || (!has_username && has_password)) {
+				throw std::invalid_argument("If a username or password is supplied, both must be provided.");
+			}
+
+			if (components.count(component::Host)) {
+				m_host = components.at(component::Host);
+			}
+
+			if (components.count(component::Port)) {
+				m_port = std::stoul(components.at(component::Port));
+			}
+
+			if (components.count(component::Path)) {
+				m_path = components.at(component::Path);
+			}
+			else {
+				throw std::invalid_argument("A path is required on a hierarchical URI, even an empty path.");
+			}
+		}
+		else {
+			if (components.count(component::Username)
+				|| components.count(component::Password)
+				|| components.count(component::Host)
+				|| components.count(component::Port)
+				|| components.count(component::Path)) {
+				throw std::invalid_argument("None of the hierarchical components are allowed in a non-hierarchical URI.");
+			}
+
+			if (components.count(component::Content)) {
+				m_content = components.at(component::Content);
+			}
+			else {
+				throw std::invalid_argument(
+					"Content is a required component for a non-hierarchical URI, even an empty string."
+				);
+			}
+		}
+
+		if (components.count(component::Query)) {
+			m_query = components.at(component::Query);
+		}
+
+		if (components.count(component::Fragment)) {
+			m_fragment = components.at(component::Fragment);
+		}
+	}
+
+	uri(uri const &other, std::map<component, std::string> const &replacements) :
+		m_category(other.m_category),
+		m_path_is_rooted(other.m_path_is_rooted),
+		m_separator(other.m_separator)
+	{
+		m_scheme = (replacements.count(component::Scheme))
+			? replacements.at(component::Scheme) : other.m_scheme;
+
+		if (m_category == scheme_category::Hierarchical) {
+			m_username = (replacements.count(component::Username))
+				? replacements.at(component::Username) : other.m_username;
+
+			m_password = (replacements.count(component::Password))
+				? replacements.at(component::Password) : other.m_password;
+
+			m_host = (replacements.count(component::Host))
+				? replacements.at(component::Host) : other.m_host;
+
+			m_port = (replacements.count(component::Port))
+				? std::stoul(replacements.at(component::Port)) : other.m_port;
+
+			m_path = (replacements.count(component::Path))
+				? replacements.at(component::Path) : other.m_path;
+		}
+		else {
+			m_content = (replacements.count(component::Content))
+				? replacements.at(component::Content) : other.m_content;
+		}
+
+		m_query = (replacements.count(component::Query))
+			? replacements.at(component::Query) : other.m_query;
+
+		m_fragment = (replacements.count(component::Fragment))
+			? replacements.at(component::Fragment) : other.m_fragment;
+	}
+
+	// Copy constructor; just use the copy assignment operator internally.
+	uri(uri const &other)
+	{
+		*this = other;
+	};
+
+	// Copy assignment operator
+	uri &operator=(uri const &other)
+	{
+		if (this != &other) {
+			m_scheme         = other.m_scheme;
+			m_content        = other.m_content;
+			m_username       = other.m_username;
+			m_password       = other.m_password;
+			m_host           = other.m_host;
+			m_path           = other.m_path;
+			m_query          = other.m_query;
+			m_fragment       = other.m_fragment;
+			m_query_dict     = other.m_query_dict;
+			m_category       = other.m_category;
+			m_port           = other.m_port;
+			m_path_is_rooted = other.m_path_is_rooted;
+			m_separator      = other.m_separator;
+		}
+		return *this;
+	}
+
+	~uri() {};
+
+	std::string const &get_scheme() const
+	{
+		return m_scheme;
+	};
+
+	scheme_category get_scheme_category() const
+	{
+		return m_category;
+	};
+
+	std::string const &get_content() const
+	{
+		if (m_category != scheme_category::NonHierarchical) {
+			throw std::domain_error("The content component is only valid for non-hierarchical URIs.");
+		}
+		return m_content;
+	};
+
+	std::string const &get_username() const
+	{
+		if (m_category != scheme_category::Hierarchical) {
+			throw std::domain_error("The username component is only valid for hierarchical URIs.");
+		}
+		return m_username;
+	};
+
+	std::string const &get_password() const
+	{
+		if (m_category != scheme_category::Hierarchical) {
+			throw std::domain_error("The password component is only valid for hierarchical URIs.");
+		}
+		return m_password;
+	};
+
+	std::string const &get_host() const
+	{
+		if (m_category != scheme_category::Hierarchical) {
+			throw std::domain_error("The host component is only valid for hierarchical URIs.");
+		}
+		return m_host;
+	};
+
+	unsigned long get_port() const
+	{
+		if (m_category != scheme_category::Hierarchical) {
+			throw std::domain_error("The port component is only valid for hierarchical URIs.");
+		}
+		return m_port;
+	};
+
+	std::string const &get_path() const
+	{
+		if (m_category != scheme_category::Hierarchical) {
+			throw std::domain_error("The path component is only valid for hierarchical URIs.");
+		}
+		return m_path;
+	};
+
+	std::string const &get_query() const
+	{
+		return m_query;
+	};
+
+	std::map<std::string, std::string> const &get_query_dictionary() const
+	{
+		return m_query_dict;
+	};
+
+	std::string const &get_fragment() const
+	{
+		return m_fragment;
+	};
+
+	std::string to_string() const
+	{
+		std::string full_uri;
+		full_uri.append(m_scheme);
+		full_uri.append(":");
+
+		if (m_content.length() > m_path.length()) {
+			full_uri.append("//");
+			if (!(m_username.empty() || m_password.empty())) {
+				full_uri.append(m_username);
+				full_uri.append(":");
+				full_uri.append(m_password);
+				full_uri.append("@");
+			}
+
+			full_uri.append(m_host);
+
+			if (m_port != 0) {
+				full_uri.append(":");
+				full_uri.append(std::to_string(m_port));
+			}
+		}
+
+		if (m_path_is_rooted) {
+			full_uri.append("/");
+		}
+		full_uri.append(m_path);
+
+		if (!m_query.empty()) {
+			full_uri.append("?");
+			full_uri.append(m_query);
+		}
+
+		if (!m_fragment.empty()) {
+			full_uri.append("#");
+			full_uri.append(m_fragment);
+		}
+
+		return full_uri;
+	};
+
+private:
+
+	void setup(std::string const &uri_text, scheme_category category)
+	{
+		size_t const uri_length = uri_text.length();
+
+		if (uri_length == 0) {
+			throw std::invalid_argument("URIs cannot be of zero length.");
+		}
+
+		std::string::const_iterator cursor = parse_scheme(
+			uri_text,
+			uri_text.begin());
+		// After calling parse_scheme, *cursor == ':'; none of the following parsers
+		// expect a separator character, so we advance the cursor upon calling them.
+		cursor = parse_content(uri_text, (cursor + 1));
+
+		if ((cursor != uri_text.end()) && (*cursor == '?')) {
+			cursor = parse_query(uri_text, (cursor + 1));
+		}
+
+		if ((cursor != uri_text.end()) && (*cursor == '#')) {
+			cursor = parse_fragment(uri_text, (cursor + 1));
+		}
+
+		init_query_dictionary(); // If the query string is empty, this will be empty too.
+
+	};
+
+	std::string::const_iterator parse_scheme(
+		std::string const &uri_text,
+		std::string::const_iterator scheme_start
+	)
+	{
+		std::string::const_iterator scheme_end = scheme_start;
+		while ((scheme_end != uri_text.end()) && (*scheme_end != ':')) {
+			if (!(std::isalnum(*scheme_end) || (*scheme_end == '-')
+				  || (*scheme_end == '+') || (*scheme_end == '.'))) {
+				throw std::invalid_argument(
+					"Invalid character found in the scheme component. Supplied URI was: \""
+					+ uri_text + "\"."
+				);
+			}
+			++scheme_end;
+		}
+
+		if (scheme_end == uri_text.end()) {
+			throw std::invalid_argument(
+				"End of URI found while parsing the scheme. Supplied URI was: \""
+				+ uri_text + "\"."
+			);
+		}
+
+		if (scheme_start == scheme_end) {
+			throw std::invalid_argument(
+				"Scheme component cannot be zero-length. Supplied URI was: \""
+				+ uri_text + "\"."
+			);
+		}
+
+		m_scheme = std::move(std::string(scheme_start, scheme_end));
+		return scheme_end;
+	};
+
+	std::string::const_iterator parse_content(
+		std::string const &uri_text,
+		std::string::const_iterator content_start
+	)
+	{
+		std::string::const_iterator content_end = content_start;
+		while ((content_end != uri_text.end()) && (*content_end != '?') && (*content_end != '#')) {
+			++content_end;
+		}
+
+		m_content = std::move(std::string(content_start, content_end));
+
+		if ((m_category == scheme_category::Hierarchical) && (m_content.length() > 0)) {
+			// If it's a hierarchical URI, the content should be parsed for the hierarchical components.
+			std::string::const_iterator path_start = m_content.begin();
+			std::string::const_iterator path_end   = m_content.end();
+			if (!m_content.compare(0, 2, "//")) {
+				// In this case an authority component is present.
+				std::string::const_iterator authority_cursor = (m_content.begin() + 2);
+				if (m_content.find_first_of('@') != std::string::npos) {
+					std::string::const_iterator userpass_divider = parse_username(
+						uri_text,
+						m_content,
+						authority_cursor
+					);
+					authority_cursor = parse_password(uri_text, m_content, (userpass_divider + 1));
+					// After this call, *authority_cursor == '@', so we skip over it.
+					++authority_cursor;
+				}
+
+				authority_cursor = parse_host(uri_text, m_content, authority_cursor);
+
+				if ((authority_cursor != m_content.end()) && (*authority_cursor == ':')) {
+					authority_cursor = parse_port(uri_text, m_content, (authority_cursor + 1));
+				}
+
+				if ((authority_cursor != m_content.end()) && (*authority_cursor == '/')) {
+					// Then the path is rooted, and we should note this.
+					m_path_is_rooted = true;
+					path_start       = authority_cursor + 1;
+				}
+
+				// If we've reached the end and no path is present then set path_start
+				// to the end.
+				if (authority_cursor == m_content.end()) {
+					path_start = m_content.end();
+				}
+			}
+			else if (!m_content.compare(0, 1, "/")) {
+				m_path_is_rooted = true;
+				++path_start;
+			}
+
+			// We can now build the path based on what remains in the content string,
+			// since that's all that exists after the host and optional port component.
+			m_path = std::move(std::string(path_start, path_end));
+		}
+		return content_end;
+	};
+
+	std::string::const_iterator parse_username(
+		std::string const &uri_text,
+		std::string const &content,
+		std::string::const_iterator username_start
+	)
+	{
+		std::string::const_iterator username_end = username_start;
+		// Since this is only reachable when '@' was in the content string, we can
+		// ignore the end-of-string case.
+		while (*username_end != ':') {
+			if (*username_end == '@') {
+				throw std::invalid_argument(
+					"Username must be followed by a password. Supplied URI was: \""
+					+ uri_text + "\"."
+				);
+			}
+			++username_end;
+		}
+		m_username = std::move(std::string(username_start, username_end));
+		return username_end;
+	};
+
+	std::string::const_iterator parse_password(
+		std::string const &uri_text,
+		std::string const &content,
+		std::string::const_iterator password_start
+	)
+	{
+		std::string::const_iterator password_end = password_start;
+		while (*password_end != '@') {
+			++password_end;
+		}
+
+		m_password = std::move(std::string(password_start, password_end));
+		return password_end;
+	};
+
+	std::string::const_iterator parse_host(
+		std::string const &uri_text,
+		std::string const &content,
+		std::string::const_iterator host_start
+	)
+	{
+		std::string::const_iterator host_end = host_start;
+		// So, the host can contain a few things. It can be a domain, it can be an
+		// IPv4 address, it can be an IPv6 address, or an IPvFuture literal. In the
+		// case of those last two, it's of the form [...] where what's between the
+		// brackets is a matter of which IPv?? version it is.
+		while (host_end != content.end()) {
+			if (*host_end == '[') {
+				// We're parsing an IPv6 or IPvFuture address, so we should handle that
+				// instead of the normal procedure.
+				while ((host_end != content.end()) && (*host_end != ']')) {
+					++host_end;
+				}
+
+				if (host_end == content.end()) {
+					throw std::invalid_argument(
+						"End of content component encountered "
+						"while parsing the host component. "
+						"Supplied URI was: \""
+						+ uri_text + "\"."
+					);
+				}
+
+				++host_end;
+				break;
+				// We can stop looping, we found the end of the IP literal, which is the
+				// whole of the host component when one's in use.
+			}
+			else if ((*host_end == ':') || (*host_end == '/')) {
+				break;
+			}
+			else {
+				++host_end;
+			}
+		}
+
+		m_host = std::move(std::string(host_start, host_end));
+		return host_end;
+	};
+
+	std::string::const_iterator parse_port(
+		std::string const &uri_text,
+		std::string const &content,
+		std::string::const_iterator port_start
+	)
+	{
+		std::string::const_iterator port_end = port_start;
+		while ((port_end != content.end()) && (*port_end != '/')) {
+			if (!std::isdigit(*port_end)) {
+				throw std::invalid_argument(
+					"Invalid character while parsing the port. "
+					"Supplied URI was: \"" + uri_text + "\"."
+				);
+			}
+
+			++port_end;
+		}
+
+		m_port = std::stoul(std::string(port_start, port_end));
+		return port_end;
+	};
+
+	std::string::const_iterator parse_query(
+		std::string const &uri_text,
+		std::string::const_iterator query_start
+	)
+	{
+		std::string::const_iterator query_end = query_start;
+		while ((query_end != uri_text.end()) && (*query_end != '#')) {
+			// Queries can contain almost any character except hash, which is reserved
+			// for the start of the fragment.
+			++query_end;
+		}
+		m_query = std::move(std::string(query_start, query_end));
+		return query_end;
+	};
+
+	std::string::const_iterator parse_fragment(
+		std::string const &uri_text,
+		std::string::const_iterator fragment_start
+	)
+	{
+		m_fragment = std::move(std::string(fragment_start, uri_text.end()));
+		return uri_text.end();
+	};
+
+	void init_query_dictionary()
+	{
+		if (!m_query.empty()) {
+			// Loop over the query string looking for '&'s, then check each one for
+			// an '=' to find keys and values; if there's not an '=' then the key
+			// will have an empty value in the map.
+			char   separator  = (m_separator == query_argument_separator::ampersand) ? '&' : ';';
+			size_t carat      = 0;
+			size_t stanza_end = m_query.find_first_of(separator);
+			do {
+				std::string stanza            = m_query.substr(
+					carat,
+					((stanza_end != std::string::npos) ? (stanza_end - carat) : std::string::npos));
+				size_t      key_value_divider = stanza.find_first_of('=');
+				std::string key               = stanza.substr(0, key_value_divider);
+				std::string value;
+				if (key_value_divider != std::string::npos) {
+					value = stanza.substr((key_value_divider + 1));
+				}
+
+				if (m_query_dict.count(key) != 0) {
+					throw std::invalid_argument("Bad key in the query string!");
+				}
+
+				m_query_dict.emplace(key, value);
+				carat      = ((stanza_end != std::string::npos) ? (stanza_end + 1)
+					: std::string::npos);
+				stanza_end = m_query.find_first_of(separator, carat);
+			} while ((stanza_end != std::string::npos)
+					 || (carat != std::string::npos));
+		}
+	}
+
+	std::string m_scheme;
+	std::string m_content;
+	std::string m_username;
+	std::string m_password;
+	std::string m_host;
+	std::string m_path;
+	std::string m_query;
+	std::string m_fragment;
+
+	std::map<std::string, std::string> m_query_dict;
+
+	scheme_category          m_category;
+	unsigned long            m_port;
+	bool                     m_path_is_rooted;
+	query_argument_separator m_separator;
+};

common/inventory_profile.cpp

@@ -224,7 +224,7 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) con
 	return GetItem(InventoryProfile::CalcSlotId(slot_id, bagidx));
 }
 
-// Put an item snto specified slot
+// Put an item into specified slot
 int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
 {
 	if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) {
@@ -399,7 +399,7 @@ bool EQ::InventoryProfile::SwapItem(
 }
 
 // Remove item from inventory (with memory delete)
-bool EQ::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) {
+bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
 	// Pop item out of inventory map (or queue)
 	ItemInstance *item_to_delete = PopItem(slot_id);
 
@@ -590,6 +590,68 @@ bool EQ::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Quan
 // Checks that user has at least 'quantity' number of items in a given inventory slot
 // Returns first slot it was found in, or SLOT_INVALID if not found
 
+bool EQ::InventoryProfile::HasAugmentEquippedByID(uint32 item_id)
+{
+	bool has_equipped = false;
+	ItemInstance* item = nullptr;
+
+	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
+		item = GetItem(slot_id);
+		if (item && item->ContainsAugmentByID(item_id)) {
+			has_equipped = true;
+			break;
+		}
+	}
+
+	return has_equipped;
+}
+
+int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
+{
+	int quantity = 0;
+	ItemInstance* item = nullptr;
+
+	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
+		item = GetItem(slot_id);
+		if (item && item->ContainsAugmentByID(item_id)) {
+			quantity += item->CountAugmentByID(item_id);
+		}
+	}
+	
+	return quantity;
+}
+
+bool EQ::InventoryProfile::HasItemEquippedByID(uint32 item_id)
+{
+	bool has_equipped = false;
+	ItemInstance* item = nullptr;
+
+	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
+		item = GetItem(slot_id);
+		if (item && item->GetID() == item_id) {
+			has_equipped = true;
+			break;
+		}
+	}
+
+	return has_equipped;
+}
+
+int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
+{
+	int quantity = 0;
+	ItemInstance* item = nullptr;
+
+	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
+		item = GetItem(slot_id);
+		if (item && item->GetID() == item_id) {
+			quantity += item->IsStackable() ? item->GetCharges() : 1;
+		}
+	}
+	
+	return quantity;
+}
+
 //This function has a flaw in that it only returns the last stack that it looked at
 //when quantity is greater than 1 and not all of quantity can be found in 1 stack.
 int16 EQ::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 where)

common/inventory_profile.h

@@ -132,7 +132,7 @@ namespace EQ
 		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = 0, uint8 class_id = 0, uint16 deity_id = 0, uint8 level = 0);
 
 		// Remove item from inventory
-		bool DeleteItem(int16 slot_id, uint8 quantity = 0);
+		bool DeleteItem(int16 slot_id, int16 quantity = 0);
 
 		// Checks All items in a bag for No Drop
 		bool CheckNoDrop(int16 slot_id, bool recurse = true);
@@ -140,6 +140,18 @@ namespace EQ
 		// Remove item from inventory (and take control of memory)
 		ItemInstance* PopItem(int16 slot_id);
 
+		// Check if player has a specific item equipped by Item ID
+		bool HasItemEquippedByID(uint32 item_id);
+
+		// Check how many of a specific item the player has equipped by Item ID
+		int CountItemEquippedByID(uint32 item_id);
+
+		// Check if player has a specific augment equipped by Item ID
+		bool HasAugmentEquippedByID(uint32 item_id);
+
+		// Check how many of a specific augment the player has equipped by Item ID
+		int CountAugmentEquippedByID(uint32 item_id);
+
 		// Check whether there is space for the specified number of the specified item.
 		bool HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity);
 
@@ -190,6 +202,7 @@ namespace EQ
 		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
 		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
 		std::string GetCustomItemData(int16 slot_id, std::string identifier);
+		static int GetItemStatValue(uint32 item_id, const char* identifier);
 	protected:
 		///////////////////////////////
 		// Protected Methods

common/item_data.h

@@ -482,7 +482,7 @@ namespace EQ
 		uint32	Haste;
 		uint32	DamageShield;
 		uint32	RecastDelay;
-		uint32	RecastType;
+		int	RecastType;
 		uint32	AugDistiller;
 		bool	Attuneable;
 		bool	NoPet;

common/item_instance.cpp

@@ -689,6 +689,45 @@ bool EQ::ItemInstance::IsAugmented()
 	return false;
 }
 
+bool EQ::ItemInstance::ContainsAugmentByID(uint32 item_id)
+{
+	if (!m_item || !m_item->IsClassCommon()) {
+		return false;
+	}
+
+	if (!item_id) {
+		return false;
+	}
+	
+	for (uint8 augment_slot = invaug::SOCKET_BEGIN; augment_slot <= invaug::SOCKET_END; ++augment_slot) {
+		if (GetAugmentItemID(augment_slot) == item_id) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+int EQ::ItemInstance::CountAugmentByID(uint32 item_id)
+{
+	int quantity = 0;
+	if (!m_item || !m_item->IsClassCommon()) {
+		return quantity;
+	}
+
+	if (!item_id) {
+		return quantity;
+	}
+	
+	for (uint8 augment_slot = invaug::SOCKET_BEGIN; augment_slot <= invaug::SOCKET_END; ++augment_slot) {
+		if (GetAugmentItemID(augment_slot) == item_id) {
+			quantity++;
+		}
+	}
+
+	return quantity;
+}
+
 // Has attack/delay?
 bool EQ::ItemInstance::IsWeapon() const
 {
@@ -1706,4 +1745,4 @@ EvolveInfo::EvolveInfo(uint32 first, uint8 max, bool allkills, uint32 L2, uint32
 
 EvolveInfo::~EvolveInfo() {
 
-}
+}

common/item_instance.h

@@ -132,6 +132,8 @@ namespace EQ
 		void DeleteAugment(uint8 slot);
 		ItemInstance* RemoveAugment(uint8 index);
 		bool IsAugmented();
+		bool ContainsAugmentByID(uint32 item_id);
+		int CountAugmentByID(uint32 item_id);
 		ItemInstance* GetOrnamentationAug(int32 ornamentationAugtype) const;
 		bool UpdateOrnamentationInfo();
 		static bool CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll = false);

common/net/console_server_connection.cpp

@@ -15,7 +15,7 @@ EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent,
 	memset(m_line, 0, MaxConsoleLineLength);
 	m_accept_messages = false;
 	m_user_id = 0;
-	m_admin = 0;
+	m_admin = AccountStatus::Player;
 
 	m_connection->OnRead(std::bind(&ConsoleServerConnection::OnRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 	m_connection->OnDisconnect(std::bind(&ConsoleServerConnection::OnDisconnect, this, std::placeholders::_1));
@@ -29,7 +29,7 @@ EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent,
 	if (addr.find("127.0.0.1") != std::string::npos || addr.find("::0") != std::string::npos) {
 		SendLine("Connection established from localhost, assuming admin");
 		m_status = ConsoleStatusLoggedIn;
-		m_admin = 255;
+		m_admin = AccountStatus::Max;
 		SendPrompt();
 	}
 	else {

common/net/servertalk_client_connection.cpp

@@ -21,32 +21,16 @@ EQ::Net::ServertalkClient::~ServertalkClient()
 
 void EQ::Net::ServertalkClient::Send(uint16_t opcode, EQ::Net::Packet &p)
 {
+	// pad zero size packets
+	if (p.Length() == 0) {
+		p.PutUInt8(0, 0);
+	}
+
 	EQ::Net::DynamicPacket out;
-#ifdef ENABLE_SECURITY
-	if (m_encrypted) {
-		if (p.Length() == 0) {
-			p.PutUInt8(0, 0);
-		}
-
-		out.PutUInt32(0, p.Length() + crypto_secretbox_MACBYTES);
-		out.PutUInt16(4, opcode);
-
-		std::unique_ptr<unsigned char[]> cipher(new unsigned char[p.Length() + crypto_secretbox_MACBYTES]);
-
-		crypto_box_easy_afternm(&cipher[0], (unsigned char*)p.Data(), p.Length(), m_nonce_ours, m_shared_key);
-		(*(uint64_t*)&m_nonce_ours[0])++;
-		out.PutData(6, &cipher[0], p.Length() + crypto_secretbox_MACBYTES);
-	}
-	else {
-		out.PutUInt32(0, p.Length());
-		out.PutUInt16(4, opcode);
-		out.PutPacket(6, p);
-	}
-#else
 	out.PutUInt32(0, p.Length());
 	out.PutUInt16(4, opcode);
 	out.PutPacket(6, p);
-#endif
+
 	InternalSend(ServertalkMessage, out);
 }
 
@@ -87,14 +71,18 @@ void EQ::Net::ServertalkClient::Connect()
 		m_connection = connection;
 		m_connection->OnDisconnect([this](EQ::Net::TCPConnection *c) {
 			LogF(Logs::General, Logs::TCPConnection, "Connection lost to {0}:{1}, attempting to reconnect...", m_addr, m_port);
-			m_encrypted = false;
 			m_connection.reset();
 		});
 
 		m_connection->OnRead(std::bind(&EQ::Net::ServertalkClient::ProcessData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 		m_connection->Start();
 
-		SendHello();
+		SendHandshake();
+
+		if (m_on_connect_cb) {
+			m_on_connect_cb(this);
+		}
+
 		m_connecting = false;
 	});
 }
@@ -188,67 +176,11 @@ void EQ::Net::ServertalkClient::ProcessReadBuffer()
 
 void EQ::Net::ServertalkClient::ProcessHello(EQ::Net::Packet &p)
 {
-#ifdef ENABLE_SECURITY
-	memset(m_public_key_ours, 0, crypto_box_PUBLICKEYBYTES);
-	memset(m_public_key_theirs, 0, crypto_box_PUBLICKEYBYTES);
-	memset(m_private_key_ours, 0, crypto_box_SECRETKEYBYTES);
-	memset(m_nonce_ours, 0, crypto_box_NONCEBYTES);
-	memset(m_nonce_theirs, 0, crypto_box_NONCEBYTES);
-	memset(m_shared_key, 0, crypto_box_BEFORENMBYTES);
-	m_encrypted = false;
-
 	try {
-		bool enc = p.GetInt8(0) == 1 ? true : false;
-
-		if (enc) {
-			if (p.Length() == (1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES)) {
-				memcpy(m_public_key_theirs, (char*)p.Data() + 1, crypto_box_PUBLICKEYBYTES);
-				memcpy(m_nonce_theirs, (char*)p.Data() + 1 + crypto_box_PUBLICKEYBYTES, crypto_box_NONCEBYTES);
-				m_encrypted = true;
-
-				SendHandshake();
-
-				if (m_on_connect_cb) {
-					m_on_connect_cb(this);
-				}
-			}
-			else {
-				LogError("Could not process hello, size != {0}", 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES);
-			}
-		}
-		else {
-			SendHandshake();
-
-			if (m_on_connect_cb) {
-				m_on_connect_cb(this);
-			}
-		}
-	}
-	catch (std::exception &ex) {
-		LogError("Error parsing hello from server: {0}", ex.what());
-		m_connection->Disconnect();
+		SendHandshake();
 
 		if (m_on_connect_cb) {
-			m_on_connect_cb(nullptr);
-		}
-	}
-#else
-	try {
-		bool enc = p.GetInt8(0) == 1 ? true : false;
-
-		if (enc) {
-			SendHandshake(true);
-
-			if (m_on_connect_cb) {
-				m_on_connect_cb(this);
-			}
-		}
-		else {
-			SendHandshake();
-
-			if (m_on_connect_cb) {
-				m_on_connect_cb(this);
-			}
+			m_on_connect_cb(this);
 		}
 }
 	catch (std::exception &ex) {
@@ -259,7 +191,6 @@ void EQ::Net::ServertalkClient::ProcessHello(EQ::Net::Packet &p)
 			m_on_connect_cb(nullptr);
 		}
 	}
-#endif
 }
 
 void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p)
@@ -269,45 +200,7 @@ void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p)
 		auto opcode = p.GetUInt16(4);
 		if (length > 0) {
 			auto data = p.GetString(6, length);
-#ifdef ENABLE_SECURITY
-			if (m_encrypted) {
-				size_t message_len = length - crypto_secretbox_MACBYTES;
-				std::unique_ptr<unsigned char[]> decrypted_text(new unsigned char[message_len]);
-				if (crypto_box_open_easy_afternm(&decrypted_text[0], (unsigned char*)&data[0], length, m_nonce_theirs, m_shared_key))
-				{
-					LogError("Error decrypting message from server");
-					(*(uint64_t*)&m_nonce_theirs[0])++;
-					return;
-				}
 
-				EQ::Net::StaticPacket decrypted_packet(&decrypted_text[0], message_len);
-
-				(*(uint64_t*)&m_nonce_theirs[0])++;
-
-				auto cb = m_message_callbacks.find(opcode);
-				if (cb != m_message_callbacks.end()) {
-					cb->second(opcode, decrypted_packet);
-				}
-
-				if (m_message_callback) {
-					m_message_callback(opcode, decrypted_packet);
-				}
-			}
-			else {
-				size_t message_len = length;
-				EQ::Net::StaticPacket packet(&data[0], message_len);
-
-				auto cb = m_message_callbacks.find(opcode);
-				if (cb != m_message_callbacks.end()) {
-					cb->second(opcode, packet);
-				}
-
-				if (m_message_callback) {
-					m_message_callback(opcode, packet);
-				}
-			}
-
-#else
 			size_t message_len = length;
 			EQ::Net::StaticPacket packet(&data[0], message_len);
 
@@ -319,7 +212,6 @@ void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p)
 			if (m_message_callback) {
 				m_message_callback(opcode, packet);
 			}
-#endif
 		}
 	}
 	catch (std::exception &ex) {
@@ -327,54 +219,11 @@ void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p)
 	}
 }
 
-void EQ::Net::ServertalkClient::SendHandshake(bool downgrade)
+void EQ::Net::ServertalkClient::SendHandshake()
 {
 	EQ::Net::DynamicPacket handshake;
-#ifdef ENABLE_SECURITY
-	if (m_encrypted) {
-		crypto_box_keypair(m_public_key_ours, m_private_key_ours);
-		randombytes_buf(m_nonce_ours, crypto_box_NONCEBYTES);
-
-		crypto_box_beforenm(m_shared_key, m_public_key_theirs, m_private_key_ours);
-
-		handshake.PutData(0, m_public_key_ours, crypto_box_PUBLICKEYBYTES);
-		handshake.PutData(crypto_box_PUBLICKEYBYTES, m_nonce_ours, crypto_box_NONCEBYTES);
-
-		memset(m_public_key_ours, 0, crypto_box_PUBLICKEYBYTES);
-		memset(m_public_key_theirs, 0, crypto_box_PUBLICKEYBYTES);
-		memset(m_private_key_ours, 0, crypto_box_SECRETKEYBYTES);
-
-		size_t cipher_length = m_identifier.length() + 1 + m_credentials.length() + 1 + crypto_secretbox_MACBYTES;
-		size_t data_length = m_identifier.length() + 1 + m_credentials.length() + 1;
-		
-		std::unique_ptr<unsigned char[]> signed_buffer(new unsigned char[cipher_length]);
-		std::unique_ptr<unsigned char[]> data_buffer(new unsigned char[data_length]);
-
-		memset(&data_buffer[0], 0, data_length);
-		memcpy(&data_buffer[0], m_identifier.c_str(), m_identifier.length());
-		memcpy(&data_buffer[1 + m_identifier.length()], m_credentials.c_str(), m_credentials.length());
-		
-		crypto_box_easy_afternm(&signed_buffer[0], &data_buffer[0], data_length, m_nonce_ours, m_shared_key);
-
-		(*(uint64_t*)&m_nonce_ours[0])++;
-
-		handshake.PutData(crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES, &signed_buffer[0], cipher_length);
-	}
-	else {
-		handshake.PutString(0, m_identifier);
-		handshake.PutString(m_identifier.length() + 1, m_credentials);
-		handshake.PutUInt8(m_identifier.length() + 1 + m_credentials.length(), 0);
-	}
-#else
 	handshake.PutString(0, m_identifier);
 	handshake.PutString(m_identifier.length() + 1, m_credentials);
 	handshake.PutUInt8(m_identifier.length() + 1 + m_credentials.length(), 0);
-#endif
-
-	if (downgrade) {
-		InternalSend(ServertalkClientDowngradeSecurityHandshake, handshake);
-	}
-	else {
-		InternalSend(ServertalkClientHandshake, handshake);
-	}
+	InternalSend(ServertalkClientDowngradeSecurityHandshake, handshake);
 }

common/net/servertalk_client_connection.h

@@ -4,9 +4,6 @@
 #include "../event/timer.h"
 #include "servertalk_common.h"
 #include "packet.h"
-#ifdef ENABLE_SECURITY
-#include <sodium.h>
-#endif
 
 namespace EQ
 {
@@ -34,8 +31,7 @@ namespace EQ
 			void ProcessReadBuffer();
 			void ProcessHello(EQ::Net::Packet &p);
 			void ProcessMessage(EQ::Net::Packet &p);
-			void SendHandshake() { SendHandshake(false); }
-			void SendHandshake(bool downgrade);
+			void SendHandshake();
 
 			std::unique_ptr<EQ::Timer> m_timer;
 
@@ -45,23 +41,11 @@ namespace EQ
 			bool m_connecting;
 			int m_port;
 			bool m_ipv6;
-			bool m_encrypted;
 			std::shared_ptr<EQ::Net::TCPConnection> m_connection;
 			std::vector<char> m_buffer;
 			std::unordered_map<uint16_t, std::function<void(uint16_t, EQ::Net::Packet&)>> m_message_callbacks;
 			std::function<void(uint16_t, EQ::Net::Packet&)> m_message_callback;
 			std::function<void(ServertalkClient*)> m_on_connect_cb;
-
-#ifdef ENABLE_SECURITY
-			unsigned char m_public_key_ours[crypto_box_PUBLICKEYBYTES];
-			unsigned char m_private_key_ours[crypto_box_SECRETKEYBYTES];
-			unsigned char m_nonce_ours[crypto_box_NONCEBYTES];
-
-			unsigned char m_public_key_theirs[crypto_box_PUBLICKEYBYTES];
-			unsigned char m_nonce_theirs[crypto_box_NONCEBYTES];
-
-			unsigned char m_shared_key[crypto_box_BEFORENMBYTES];
-#endif
 		};
 	}
 }

common/net/servertalk_common.h

@@ -15,4 +15,4 @@ namespace EQ
 			ServertalkMessage,
 		};
 	}
-}
+}

common/net/servertalk_server.cpp

@@ -10,12 +10,10 @@ EQ::Net::ServertalkServer::~ServertalkServer()
 
 void EQ::Net::ServertalkServer::Listen(const ServertalkServerOptions& opts)
 {
-	m_encrypted = opts.encrypted;
 	m_credentials = opts.credentials;
-	m_allow_downgrade = opts.allow_downgrade;
 	m_server = std::make_unique<EQ::Net::TCPServer>();
 	m_server->Listen(opts.port, opts.ipv6, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
-		m_unident_connections.push_back(std::make_shared<ServertalkServerConnection>(connection, this, m_encrypted, m_allow_downgrade));
+		m_unident_connections.push_back(std::make_shared<ServertalkServerConnection>(connection, this));
 	});
 }
 

common/net/servertalk_server.h

@@ -5,10 +5,6 @@
 #include <vector>
 #include <map>
 
-#ifdef ENABLE_SECURITY
-#include <sodium.h>
-#endif
-
 namespace EQ
 {
 	namespace Net
@@ -17,18 +13,9 @@ namespace EQ
 		{
 			int port;
 			bool ipv6;
-			bool encrypted;
-			bool allow_downgrade;
 			std::string credentials;
 
 			ServertalkServerOptions() {
-#ifdef ENABLE_SECURITY
-				encrypted = true;
-				allow_downgrade = true;
-#else
-				encrypted = false;
-				allow_downgrade = true;
-#endif
 				ipv6 = false;
 			}
 		};

common/net/servertalk_server_connection.cpp

@@ -3,16 +3,15 @@
 #include "../eqemu_logsys.h"
 #include "../util/uuid.h"
 
-EQ::Net::ServertalkServerConnection::ServertalkServerConnection(std::shared_ptr<EQ::Net::TCPConnection> c, EQ::Net::ServertalkServer *parent, bool encrypted, bool allow_downgrade)
+EQ::Net::ServertalkServerConnection::ServertalkServerConnection(std::shared_ptr<EQ::Net::TCPConnection> c, EQ::Net::ServertalkServer *parent)
 {
 	m_connection = c;
 	m_parent = parent;
-	m_encrypted = encrypted;
-	m_allow_downgrade = allow_downgrade;
 	m_uuid = EQ::Util::UUID::Generate().ToString();
 	m_connection->OnRead(std::bind(&ServertalkServerConnection::OnRead, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 	m_connection->OnDisconnect(std::bind(&ServertalkServerConnection::OnDisconnect, this, std::placeholders::_1));
 	m_connection->Start();
+	m_legacy_mode = false;
 }
 
 EQ::Net::ServertalkServerConnection::~ServertalkServerConnection()
@@ -21,32 +20,73 @@ EQ::Net::ServertalkServerConnection::~ServertalkServerConnection()
 
 void EQ::Net::ServertalkServerConnection::Send(uint16_t opcode, EQ::Net::Packet & p)
 {
-	EQ::Net::DynamicPacket out;
-#ifdef ENABLE_SECURITY
-	if (m_encrypted) {
-		if (p.Length() == 0) {
+	if (m_legacy_mode) {
+		if (!m_connection)
+			return;
+
+		if (opcode == ServerOP_UsertoWorldReq) {
+			auto req_in = (UsertoWorldRequest_Struct*)p.Data();
+
+			EQ::Net::DynamicPacket req;
+			size_t i = 0;
+			req.PutUInt32(i, req_in->lsaccountid); i += 4;
+			req.PutUInt32(i, req_in->worldid); i += 4;
+			req.PutUInt32(i, req_in->FromID); i += 4;
+			req.PutUInt32(i, req_in->ToID); i += 4;
+			req.PutData(i, req_in->IPAddr, 64); i += 64;
+
+			EQ::Net::DynamicPacket out;
+			out.PutUInt16(0, ServerOP_UsertoWorldReqLeg);
+			out.PutUInt16(2, req.Length() + 4);
+			out.PutPacket(4, req);
+
+			m_connection->Write((const char*)out.Data(), out.Length());
+			return;
+		}
+
+		if (opcode == ServerOP_LSClientAuth) {
+			auto req_in = (ClientAuth_Struct*)p.Data();
+
+			EQ::Net::DynamicPacket req;
+			size_t i = 0;
+			req.PutUInt32(i, req_in->loginserver_account_id); i += 4;
+			req.PutData(i, req_in->account_name, 30); i += 30;
+			req.PutData(i, req_in->key, 30); i += 30;
+			req.PutUInt8(i, req_in->lsadmin); i += 1;
+			req.PutUInt16(i, req_in->is_world_admin); i += 2;
+			req.PutUInt32(i, req_in->ip); i += 4;
+			req.PutUInt8(i, req_in->is_client_from_local_network); i += 1;
+
+			EQ::Net::DynamicPacket out;
+			out.PutUInt16(0, ServerOP_LSClientAuthLeg);
+			out.PutUInt16(2, req.Length() + 4);
+			out.PutPacket(4, req);
+
+			m_connection->Write((const char*)out.Data(), out.Length());
+			return;
+		}
+
+		EQ::Net::DynamicPacket out;
+		out.PutUInt16(0, opcode);
+		out.PutUInt16(2, p.Length() + 4);
+		out.PutPacket(4, p);
+
+		m_connection->Write((const char*)out.Data(), out.Length());
+	} else {
+		// pad zero size packets
+		// pad packets that would cause a collision with legacy identification code
+		// It's unlikely we'd send a 4MB msg for any reason but just incase.
+		if (p.Length() == 0 || p.Length() == 43061256) {
 			p.PutUInt8(0, 0);
 		}
 
-		out.PutUInt32(0, p.Length() + crypto_secretbox_MACBYTES);
-		out.PutUInt16(4, opcode);
-
-		std::unique_ptr<unsigned char[]> cipher(new unsigned char[p.Length() + crypto_secretbox_MACBYTES]);
-		crypto_box_easy_afternm(&cipher[0], (unsigned char*)p.Data(), p.Length(), m_nonce_ours, m_shared_key);
-		(*(uint64_t*)&m_nonce_ours[0])++;
-		out.PutData(6, &cipher[0], p.Length() + crypto_secretbox_MACBYTES);
-	}
-	else {
+		EQ::Net::DynamicPacket out;
 		out.PutUInt32(0, p.Length());
 		out.PutUInt16(4, opcode);
 		out.PutPacket(6, p);
+
+		InternalSend(ServertalkMessage, out);
 	}
-#else
-	out.PutUInt32(0, p.Length());
-	out.PutUInt16(4, opcode);
-	out.PutPacket(6, p);
-#endif
-	InternalSend(ServertalkMessage, out);
 }
 
 void EQ::Net::ServertalkServerConnection::SendPacket(ServerPacket *p)
@@ -71,17 +111,41 @@ void EQ::Net::ServertalkServerConnection::OnMessage(std::function<void(uint16_t,
 void EQ::Net::ServertalkServerConnection::OnRead(TCPConnection *c, const unsigned char *data, size_t sz)
 {
 	m_buffer.insert(m_buffer.end(), (const char*)data, (const char*)data + sz);
-	ProcessReadBuffer();
+
+	if (m_legacy_mode) {
+		ProcessOldReadBuffer();
+	} else {
+		ProcessReadBuffer();
+	}
 }
 
 void EQ::Net::ServertalkServerConnection::ProcessReadBuffer()
 {
 	size_t current = 0;
 	size_t total = m_buffer.size();
+	constexpr size_t ls_info_size = sizeof(ServerNewLSInfo_Struct);
 
 	while (current < total) {
 		auto left = total - current;
 
+		if (left < 4) {
+			break;
+		}
+
+		auto leg_opcode = *(uint16_t*)&m_buffer[current];
+		auto leg_size = *(uint16_t*)&m_buffer[current + 2] - 4;
+
+		//this creates a small edge case where the exact size of a 
+		//packet from the modern protocol can't be "43061256"
+		//so in send we pad it one byte if that's the case
+		if (leg_opcode == ServerOP_NewLSInfo && leg_size == sizeof(ServerNewLSInfo_Struct)) {
+			m_legacy_mode = true;
+			m_identifier = "World";
+			m_parent->ConnectionIdentified(this);
+			ProcessOldReadBuffer();
+			return;
+		}
+
 		/*
 		//header:
 		//uint32 length;
@@ -109,6 +173,7 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer()
 			}
 			break;
 			case ServertalkClientHandshake:
+			case ServertalkClientDowngradeSecurityHandshake:
 				ProcessHandshake(p);
 				break;
 			case ServertalkMessage:
@@ -125,10 +190,8 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer()
 			}
 			break;
 			case ServertalkClientHandshake:
-				ProcessHandshake(p);
-				break;
 			case ServertalkClientDowngradeSecurityHandshake:
-				ProcessHandshake(p, true);
+				ProcessHandshake(p);
 				break;
 			case ServertalkMessage:
 				ProcessMessage(p);
@@ -147,6 +210,57 @@ void EQ::Net::ServertalkServerConnection::ProcessReadBuffer()
 	}
 }
 
+void EQ::Net::ServertalkServerConnection::ProcessOldReadBuffer()
+{
+	size_t current = 0;
+	size_t total = m_buffer.size();
+
+	while (current < total) {
+		auto left = total - current;
+
+		/*
+		//header:
+		//uint32 length;
+		//uint8 type;
+		*/
+		uint16_t length = 0;
+		uint16_t opcode = 0;
+		if (left < 4) {
+			break;
+		}
+
+		opcode = *(uint16_t*)&m_buffer[current];
+		length = *(uint16_t*)&m_buffer[current + 2];
+		if (length < 4) {
+			break;
+		}
+
+		length -= 4;
+
+		if (current + 4 + length > total) {
+			break;
+		}
+
+		if (length == 0) {
+			EQ::Net::DynamicPacket p;
+			ProcessMessageOld(opcode, p);
+		}
+		else {
+			EQ::Net::StaticPacket p(&m_buffer[current + 4], length);
+			ProcessMessageOld(opcode, p);
+		}
+
+		current += length + 4;
+	}
+
+	if (current == total) {
+		m_buffer.clear();
+	}
+	else {
+		m_buffer.erase(m_buffer.begin(), m_buffer.begin() + current);
+	}
+}
+
 void EQ::Net::ServertalkServerConnection::OnDisconnect(TCPConnection *c)
 {
 	m_parent->ConnectionDisconnected(this);
@@ -155,36 +269,14 @@ void EQ::Net::ServertalkServerConnection::OnDisconnect(TCPConnection *c)
 void EQ::Net::ServertalkServerConnection::SendHello()
 {
 	EQ::Net::DynamicPacket hello;
-
-#ifdef ENABLE_SECURITY
-	memset(m_public_key_ours, 0, crypto_box_PUBLICKEYBYTES);
-	memset(m_public_key_theirs, 0, crypto_box_PUBLICKEYBYTES);
-	memset(m_private_key_ours, 0, crypto_box_SECRETKEYBYTES);
-	memset(m_nonce_ours, 0, crypto_box_NONCEBYTES);
-	memset(m_nonce_theirs, 0, crypto_box_NONCEBYTES);
-
-	if (m_encrypted) {
-		hello.PutInt8(0, 1);
-
-		crypto_box_keypair(m_public_key_ours, m_private_key_ours);
-		randombytes_buf(m_nonce_ours, crypto_box_NONCEBYTES);
-
-		hello.PutData(1, m_public_key_ours, crypto_box_PUBLICKEYBYTES);
-		hello.PutData(1 + crypto_box_PUBLICKEYBYTES, m_nonce_ours, crypto_box_NONCEBYTES);
-	}
-	else {
-		hello.PutInt8(0, 0);
-	}
-#else
 	hello.PutInt8(0, 0);
-#endif
 
 	InternalSend(ServertalkServerHello, hello);
 }
 
 void EQ::Net::ServertalkServerConnection::InternalSend(ServertalkPacketType type, EQ::Net::Packet &p)
 {
-	if (!m_connection)
+	if (!m_connection || m_legacy_mode)
 		return;
 
 	EQ::Net::DynamicPacket out;
@@ -197,71 +289,8 @@ void EQ::Net::ServertalkServerConnection::InternalSend(ServertalkPacketType type
 	m_connection->Write((const char*)out.Data(), out.Length());
 }
 
-void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, bool downgrade_security)
+void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p)
 {
-#ifdef ENABLE_SECURITY
-	if (downgrade_security && m_allow_downgrade && m_encrypted) {
-		LogF(Logs::General, Logs::TCPConnection, "Downgraded encrypted connection to plaintext because otherside didn't support encryption {0}:{1}",
-			 m_connection->RemoteIP(), m_connection->RemotePort());
-		m_encrypted = false;
-	}
-
-	if (m_encrypted) {
-		try {
-			if (p.Length() > (crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES)) {
-				memcpy(m_public_key_theirs, (char*)p.Data(), crypto_box_PUBLICKEYBYTES);
-				memcpy(m_nonce_theirs, (char*)p.Data() + crypto_box_PUBLICKEYBYTES, crypto_box_NONCEBYTES);
-			
-				crypto_box_beforenm(m_shared_key, m_public_key_theirs, m_private_key_ours);
-
-				size_t cipher_len = p.Length() - crypto_box_PUBLICKEYBYTES - crypto_box_NONCEBYTES;
-				size_t message_len = cipher_len - crypto_secretbox_MACBYTES;
-				std::unique_ptr<unsigned char[]> decrypted_text(new unsigned char[message_len]);
-
-				if (crypto_box_open_easy_afternm(&decrypted_text[0], (unsigned char*)p.Data() + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES, cipher_len, m_nonce_theirs, m_shared_key))
-				{
-					LogError("Error decrypting handshake from client, dropping connection.");
-					m_connection->Disconnect();
-					return;
-				}
-				
-				m_identifier = (const char*)&decrypted_text[0];
-				std::string credentials = (const char*)&decrypted_text[0] + (m_identifier.length() + 1);
-
-				if (!m_parent->CheckCredentials(credentials)) {
-					LogError("Got incoming connection with invalid credentials during handshake, dropping connection.");
-					m_connection->Disconnect();
-					return;
-				}
-
-				m_parent->ConnectionIdentified(this);
-				(*(uint64_t*)&m_nonce_theirs[0])++;
-			}
-		}
-		catch (std::exception &ex) {
-			LogError("Error parsing handshake from client: {0}", ex.what());
-			m_connection->Disconnect();
-		}
-	}
-	else {
-		try {
-			m_identifier = p.GetCString(0);
-			auto credentials = p.GetCString(m_identifier.length() + 1);
-
-			if (!m_parent->CheckCredentials(credentials)) {
-				LogError("Got incoming connection with invalid credentials during handshake, dropping connection.");
-				m_connection->Disconnect();
-				return;
-			}
-
-			m_parent->ConnectionIdentified(this);
-		}
-		catch (std::exception &ex) {
-			LogError("Error parsing handshake from client: {0}", ex.what());
-			m_connection->Disconnect();
-		}
-	}
-#else
 	try {
 		m_identifier = p.GetCString(0);
 		auto credentials = p.GetCString(m_identifier.length() + 1);
@@ -278,7 +307,6 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 		LogError("Error parsing handshake from client: {0}", ex.what());
 		m_connection->Disconnect();
 	}
-#endif
 }
 
 void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
@@ -288,46 +316,6 @@ void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
 		auto opcode = p.GetUInt16(4);
 		if (length > 0) {
 			auto data = p.GetString(6, length);
-#ifdef ENABLE_SECURITY
-			if (m_encrypted) {
-				size_t message_len = length - crypto_secretbox_MACBYTES;
-				std::unique_ptr<unsigned char[]> decrypted_text(new unsigned char[message_len]);
-
-				if (crypto_box_open_easy_afternm(&decrypted_text[0], (unsigned char*)&data[0], length, m_nonce_theirs, m_shared_key))
-				{
-					LogError("Error decrypting message from client");
-					(*(uint64_t*)&m_nonce_theirs[0])++;
-					return;
-				}
-
-				EQ::Net::StaticPacket decrypted_packet(&decrypted_text[0], message_len);
-
-				(*(uint64_t*)&m_nonce_theirs[0])++;
-
-				auto cb = m_message_callbacks.find(opcode);
-				if (cb != m_message_callbacks.end()) {
-					cb->second(opcode, decrypted_packet);
-				}
-
-				if (m_message_callback) {
-					m_message_callback(opcode, decrypted_packet);
-				}
-			}
-			else {
-				size_t message_len = length;
-				EQ::Net::StaticPacket packet(&data[0], message_len);
-
-				auto cb = m_message_callbacks.find(opcode);
-				if (cb != m_message_callbacks.end()) {
-					cb->second(opcode, packet);
-				}
-
-				if (m_message_callback) {
-					m_message_callback(opcode, packet);
-				}
-			}
-
-#else
 			size_t message_len = length;
 			EQ::Net::StaticPacket packet(&data[0], message_len);
 
@@ -339,10 +327,26 @@ void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
 			if (m_message_callback) {
 				m_message_callback(opcode, packet);
 			}
-#endif
 		}
 	}
 	catch (std::exception &ex) {
 		LogError("Error parsing message from client: {0}", ex.what());
 	}
 }
+
+void EQ::Net::ServertalkServerConnection::ProcessMessageOld(uint16_t opcode, EQ::Net::Packet &p)
+{
+	try {
+		auto cb = m_message_callbacks.find(opcode);
+		if (cb != m_message_callbacks.end()) {
+			cb->second(opcode, p);
+		}
+
+		if (m_message_callback) {
+			m_message_callback(opcode, p);
+		}
+	}
+	catch (std::exception &ex) {
+		LogError("Error parsing legacy message from client: {0}", ex.what());
+	}
+}

common/net/servertalk_server_connection.h

@@ -4,9 +4,6 @@
 #include "servertalk_common.h"
 #include "packet.h"
 #include <vector>
-#ifdef ENABLE_SECURITY
-#include <sodium.h>
-#endif
 
 namespace EQ
 {
@@ -16,7 +13,7 @@ namespace EQ
 		class ServertalkServerConnection
 		{
 		public:
-			ServertalkServerConnection(std::shared_ptr<EQ::Net::TCPConnection> c, ServertalkServer *parent, bool encrypted, bool allow_downgrade);
+			ServertalkServerConnection(std::shared_ptr<EQ::Net::TCPConnection> c, ServertalkServer *parent);
 			~ServertalkServerConnection();
 
 			void Send(uint16_t opcode, EQ::Net::Packet &p);
@@ -30,12 +27,13 @@ namespace EQ
 		private:
 			void OnRead(TCPConnection* c, const unsigned char* data, size_t sz);
 			void ProcessReadBuffer();
+			void ProcessOldReadBuffer();
 			void OnDisconnect(TCPConnection* c);
 			void SendHello();
 			void InternalSend(ServertalkPacketType type, EQ::Net::Packet &p);
-			void ProcessHandshake(EQ::Net::Packet &p) { ProcessHandshake(p, false); }
-			void ProcessHandshake(EQ::Net::Packet &p, bool security_downgrade);
+			void ProcessHandshake(EQ::Net::Packet &p);
 			void ProcessMessage(EQ::Net::Packet &p);
+			void ProcessMessageOld(uint16_t opcode, EQ::Net::Packet &p);
 
 			std::shared_ptr<EQ::Net::TCPConnection> m_connection;
 			ServertalkServer *m_parent;
@@ -45,19 +43,7 @@ namespace EQ
 			std::function<void(uint16_t, EQ::Net::Packet&)> m_message_callback;
 			std::string m_identifier;
 			std::string m_uuid;
-
-			bool m_encrypted;
-			bool m_allow_downgrade;
-#ifdef ENABLE_SECURITY
-			unsigned char m_public_key_ours[crypto_box_PUBLICKEYBYTES];
-			unsigned char m_private_key_ours[crypto_box_SECRETKEYBYTES];
-			unsigned char m_nonce_ours[crypto_box_NONCEBYTES];
-
-			unsigned char m_public_key_theirs[crypto_box_PUBLICKEYBYTES];
-			unsigned char m_nonce_theirs[crypto_box_NONCEBYTES];
-
-			unsigned char m_shared_key[crypto_box_BEFORENMBYTES];
-#endif
+			bool m_legacy_mode;
 		};
 	}
 }

common/net/websocket_server.cpp

@@ -5,6 +5,7 @@
 #include <map>
 #include <unordered_set>
 #include <array>
+#include "../emu_constants.h"
 
 struct MethodHandlerEntry
 {
@@ -174,13 +175,13 @@ Json::Value EQ::Net::WebsocketServer::Login(WebsocketServerConnection *connectio
 		auto r = _impl->login_handler(connection, user, pass);
 
 		if (r.logged_in) {
-			connection->SetAuthorized(true, r.account_name, r.account_id, 255);
+			connection->SetAuthorized(true, r.account_name, r.account_id, AccountStatus::Max);
 			ret["status"] = "Ok";
 		}
 		else if (user == "admin" && (connection->RemoteIP() == "127.0.0.1" || connection->RemoteIP() == "::")) {
 			r.logged_in = true;
 			r.account_id = 0;
-			connection->SetAuthorized(true, r.account_name, r.account_id, 255);
+			connection->SetAuthorized(true, r.account_name, r.account_id, AccountStatus::Max);
 			ret["status"] = "Ok";
 		}
 		else {

common/opcode_dispatch.h

@@ -115,8 +115,8 @@ IN(OP_GMTraining, GMTrainee_Struct);
 IN(OP_GMEndTraining, GMTrainEnd_Struct);
 IN(OP_GMTrainSkill, GMSkillChange_Struct);
 IN(OP_RequestDuel, Duel_Struct);
-IN(OP_DuelResponse, DuelResponse_Struct);
-IN(OP_DuelResponse2, Duel_Struct);
+IN(OP_DuelDecline, DuelResponse_Struct);
+IN(OP_DuelAccept, Duel_Struct);
 IN(OP_SpawnAppearance, SpawnAppearance_Struct);
 IN(OP_BazaarInspect, BazaarInspect_Struct);
 IN(OP_Death, Death_Struct);

common/opcode_map.cpp

@@ -240,8 +240,8 @@ void load_opcode_names()
 	opcode_map[0x00a1] = "LiveOP_SaveOnZoneReq";
 	opcode_map[0x0185] = "LiveOP_Logout";
 	opcode_map[0x0298] = "LiveOP_RequestDuel";
-	opcode_map[0x0a5d] = "LiveOP_DuelResponse";
-	opcode_map[0x016e] = "LiveOP_DuelResponse2";
+	opcode_map[0x0a5d] = "LiveOP_DuelDecline";
+	opcode_map[0x016e] = "LiveOP_DuelAccept";
 	opcode_map[0x007c] = "LiveOP_InstillDoubt";
 	opcode_map[0x00ac] = "LiveOP_SafeFallSuccess";
 	opcode_map[0x02fb] = "LiveOP_DisciplineUpdate";

common/patches/rof.cpp

@@ -772,13 +772,13 @@ namespace RoF
 
 	ENCODE(OP_DzExpeditionInfo)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneInfo_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneInfo_Struct, structs::DynamicZoneInfo_Struct);
 
 		OUT(client_id);
 		OUT(assigned);
 		OUT(max_players);
-		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->dz_name, emu->dz_name, sizeof(eq->dz_name));
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
@@ -824,8 +824,8 @@ namespace RoF
 
 	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneLeaderName_Struct, structs::DynamicZoneLeaderName_Struct);
 
 		OUT(client_id);
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
@@ -835,7 +835,7 @@ namespace RoF
 
 	ENCODE(OP_DzMemberList)
 	{
-		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
+		SETUP_VAR_ENCODE(DynamicZoneMemberList_Struct);
 
 		SerializeBuffer buf;
 		buf.WriteUInt32(emu->client_id);
@@ -843,7 +843,7 @@ namespace RoF
 		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
 			buf.WriteString(emu->members[i].name);
-			buf.WriteUInt8(emu->members[i].expedition_status);
+			buf.WriteUInt8(emu->members[i].online_status);
 		}
 
 		__packet->size = buf.size();
@@ -855,8 +855,8 @@ namespace RoF
 
 	ENCODE(OP_DzMemberListName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneMemberListName_Struct, structs::DynamicZoneMemberListName_Struct);
 
 		OUT(client_id);
 		OUT(add_name);
@@ -867,7 +867,7 @@ namespace RoF
 
 	ENCODE(OP_DzMemberListStatus)
 	{
-		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		auto emu = reinterpret_cast<DynamicZoneMemberList_Struct*>((*p)->pBuffer);
 		if (emu->member_count == 1)
 		{
 			ENCODE_FORWARD(OP_DzMemberList);
@@ -1634,20 +1634,6 @@ namespace RoF
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ManaChange)
-	{
-		ENCODE_LENGTH_EXACT(ManaChange_Struct);
-		SETUP_DIRECT_ENCODE(ManaChange_Struct, structs::ManaChange_Struct);
-
-		OUT(new_mana);
-		OUT(stamina);
-		OUT(spell_id);
-		OUT(keepcasting);
-		eq->slot = -1; // this is spell gem slot. It's -1 in normal operation
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_MercenaryDataResponse)
 	{
 		//consume the packet
@@ -1863,8 +1849,8 @@ namespace RoF
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
 		eq->unknown844 = 600;
-		eq->unknown880 = 50;
-		eq->unknown884 = 10;
+		OUT(LavaDamage);
+		OUT(MinLavaDamage);
 		eq->unknown888 = 1;
 		eq->unknown889 = 0;
 		eq->unknown890 = 1;
@@ -1968,7 +1954,7 @@ namespace RoF
 
 		for (int r = 0; r < 5; r++)
 		{
-			outapp->WriteUInt32(emu->binds[r].zoneId);
+			outapp->WriteUInt32(emu->binds[r].zone_id);
 			outapp->WriteFloat(emu->binds[r].x);
 			outapp->WriteFloat(emu->binds[r].y);
 			outapp->WriteFloat(emu->binds[r].z);

common/patches/rof2.cpp

@@ -821,13 +821,13 @@ namespace RoF2
 
 	ENCODE(OP_DzExpeditionInfo)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneInfo_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneInfo_Struct, structs::DynamicZoneInfo_Struct);
 
 		OUT(client_id);
 		OUT(assigned);
 		OUT(max_players);
-		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->dz_name, emu->dz_name, sizeof(eq->dz_name));
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
@@ -873,8 +873,8 @@ namespace RoF2
 
 	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneLeaderName_Struct, structs::DynamicZoneLeaderName_Struct);
 
 		OUT(client_id);
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
@@ -884,7 +884,7 @@ namespace RoF2
 
 	ENCODE(OP_DzMemberList)
 	{
-		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
+		SETUP_VAR_ENCODE(DynamicZoneMemberList_Struct);
 
 		SerializeBuffer buf;
 		buf.WriteUInt32(emu->client_id);
@@ -892,7 +892,7 @@ namespace RoF2
 		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
 			buf.WriteString(emu->members[i].name);
-			buf.WriteUInt8(emu->members[i].expedition_status);
+			buf.WriteUInt8(emu->members[i].online_status);
 		}
 
 		__packet->size = buf.size();
@@ -904,8 +904,8 @@ namespace RoF2
 
 	ENCODE(OP_DzMemberListName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneMemberListName_Struct, structs::DynamicZoneMemberListName_Struct);
 
 		OUT(client_id);
 		OUT(add_name);
@@ -916,7 +916,7 @@ namespace RoF2
 
 	ENCODE(OP_DzMemberListStatus)
 	{
-		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		auto emu = reinterpret_cast<DynamicZoneMemberList_Struct*>((*p)->pBuffer);
 		if (emu->member_count == 1)
 		{
 			ENCODE_FORWARD(OP_DzMemberList);
@@ -1683,20 +1683,6 @@ namespace RoF2
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ManaChange)
-	{
-		ENCODE_LENGTH_EXACT(ManaChange_Struct);
-		SETUP_DIRECT_ENCODE(ManaChange_Struct, structs::ManaChange_Struct);
-
-		OUT(new_mana);
-		OUT(stamina);
-		OUT(spell_id);
-		OUT(keepcasting);
-		eq->slot = -1; // this is spell gem slot. It's -1 in normal operation
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_MercenaryDataResponse)
 	{
 		//consume the packet
@@ -1919,8 +1905,8 @@ namespace RoF2
 		eq->SkyRelated2 = -1;
 		eq->NPCAggroMaxDist = 600;
 		eq->FilterID = 2008; // Guild Lobby observed value
-		eq->LavaDamage = 50;
-		eq->MinLavaDamage = 10;
+		OUT(LavaDamage);
+		OUT(MinLavaDamage);
 		eq->bDisallowManaStone = 1;
 		eq->bNoBind = 0;
 		eq->bNoAttack = 0;
@@ -2025,7 +2011,7 @@ namespace RoF2
 
 		for (int r = 0; r < 5; r++)
 		{
-			outapp->WriteUInt32(emu->binds[r].zoneId);
+			outapp->WriteUInt32(emu->binds[r].zone_id);
 			outapp->WriteFloat(emu->binds[r].x);
 			outapp->WriteFloat(emu->binds[r].y);
 			outapp->WriteFloat(emu->binds[r].z);

common/patches/rof2_ops.h

@@ -93,7 +93,6 @@ E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)
 E(OP_LootItem)
-E(OP_ManaChange)
 E(OP_MercenaryDataResponse)
 E(OP_MercenaryDataUpdate)
 E(OP_MoveItem)

common/patches/rof2_structs.h

@@ -1053,7 +1053,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-   /*000*/ uint32 zoneId;
+   /*000*/ uint32 zone_id;
    /*004*/ float x;
    /*008*/ float y;
    /*012*/ float z;
@@ -2084,7 +2084,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -3061,7 +3061,7 @@ struct EnvDamage2_Struct {
 /*0006*/	uint32 damage;
 /*0010*/	float unknown10;	// New to Underfoot - Seen 1
 /*0014*/	uint8 unknown14[12];
-/*0026*/	uint8 dmgtype;		// FA = Lava; FC = Falling
+/*0026*/	uint8 dmgtype; // FA = Lava, FB = Drowning, FC = Falling, FD = Trap
 /*0027*/	uint8 unknown27[4];
 /*0031*/	uint16 unknown31;	// New to Underfoot - Seen 66
 /*0033*/	uint16 constant;		// Always FFFF
@@ -4361,8 +4361,8 @@ struct UseAA_Struct {
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 /*16*/
 };
@@ -4908,31 +4908,31 @@ struct ExpeditionInviteResponse_Struct
 /*079*/ uint8  unknown079;     // padding garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
-/*008*/ uint32 assigned; // padded bool, 0: not in expedition (clear data), 1: in expedition
+/*008*/ uint32 assigned; // padded bool, 0: clear info, 1: fill window info
 /*012*/ uint32 max_players;
-/*016*/ char   expedition_name[128];
+/*016*/ char   dz_name[128];
 /*144*/ char   leader_name[64];
-//*208*/ uint32 unknown208; // live sends 01 00 00 00 here but client doesn't read it
+//*208*/ uint32 dz_type; // only in newer clients, if not 1 (expedition type) window does not auto show when dz info assigned
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
-/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char name[1];        // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 online_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count; // number of players in window
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
@@ -4955,7 +4955,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;

common/patches/rof_ops.h

@@ -79,7 +79,6 @@ E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)
 E(OP_LootItem)
-E(OP_ManaChange)
 E(OP_MercenaryDataResponse)
 E(OP_MercenaryDataUpdate)
 E(OP_MoveItem)

common/patches/rof_structs.h

@@ -581,8 +581,8 @@ struct NewZone_Struct {
 /*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
 /*0872*/	uint32	scriptIDSomething3;
 /*0876*/	uint32	SuspendBuffs;
-/*0880*/	uint32	unknown880;		// Seen 50
-/*0884*/	uint32	unknown884;		// Seen 10
+/*0880*/	uint32	LavaDamage;		// Seen 50
+/*0884*/	uint32	MinLavaDamage;		// Seen 10
 /*0888*/	uint8	unknown888;		// Seen 1
 /*0889*/	uint8	unknown889;		// Seen 0 (POK) or 1 (rujj)
 /*0890*/	uint8	unknown890;		// Seen 1
@@ -998,7 +998,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-   /*000*/ uint32 zoneId;
+   /*000*/ uint32 zone_id;
    /*004*/ float x;
    /*008*/ float y;
    /*012*/ float z;
@@ -2062,7 +2062,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -3032,7 +3032,7 @@ struct EnvDamage2_Struct {
 /*0006*/	uint32 damage;
 /*0010*/	float unknown10;	// New to Underfoot - Seen 1
 /*0014*/	uint8 unknown14[12];
-/*0026*/	uint8 dmgtype;		// FA = Lava; FC = Falling
+/*0026*/	uint8 dmgtype; // FA = Lava, FB = Drowning, FC = Falling, FD = Trap
 /*0027*/	uint8 unknown27[4];
 /*0031*/	uint16 unknown31;	// New to Underfoot - Seen 66
 /*0033*/	uint16 constant;		// Always FFFF
@@ -4305,8 +4305,8 @@ struct UseAA_Struct {
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 /*16*/
 };
@@ -4841,30 +4841,30 @@ struct ExpeditionInviteResponse_Struct
 /*079*/ uint8  unknown079;     // padding garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
 /*008*/ uint32 assigned; // padded bool
 /*012*/ uint32 max_players;
-/*016*/ char   expedition_name[128];
+/*016*/ char   dz_name[128];
 /*144*/ char   leader_name[64];
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
-/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char name[1];        // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 online_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count; // number of players in window
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
@@ -4887,7 +4887,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;

common/patches/sod.cpp

@@ -545,13 +545,13 @@ namespace SoD
 
 	ENCODE(OP_DzExpeditionInfo)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneInfo_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneInfo_Struct, structs::DynamicZoneInfo_Struct);
 
 		OUT(client_id);
 		OUT(assigned);
 		OUT(max_players);
-		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->dz_name, emu->dz_name, sizeof(eq->dz_name));
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
@@ -597,8 +597,8 @@ namespace SoD
 
 	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneLeaderName_Struct, structs::DynamicZoneLeaderName_Struct);
 
 		OUT(client_id);
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
@@ -608,7 +608,7 @@ namespace SoD
 
 	ENCODE(OP_DzMemberList)
 	{
-		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
+		SETUP_VAR_ENCODE(DynamicZoneMemberList_Struct);
 
 		SerializeBuffer buf;
 		buf.WriteUInt32(emu->client_id);
@@ -616,7 +616,7 @@ namespace SoD
 		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
 			buf.WriteString(emu->members[i].name);
-			buf.WriteUInt8(emu->members[i].expedition_status);
+			buf.WriteUInt8(emu->members[i].online_status);
 		}
 
 		__packet->size = buf.size();
@@ -628,8 +628,8 @@ namespace SoD
 
 	ENCODE(OP_DzMemberListName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneMemberListName_Struct, structs::DynamicZoneMemberListName_Struct);
 
 		OUT(client_id);
 		OUT(add_name);
@@ -640,7 +640,7 @@ namespace SoD
 
 	ENCODE(OP_DzMemberListStatus)
 	{
-		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		auto emu = reinterpret_cast<DynamicZoneMemberList_Struct*>((*p)->pBuffer);
 		if (emu->member_count == 1)
 		{
 			ENCODE_FORWARD(OP_DzMemberList);
@@ -1170,20 +1170,6 @@ namespace SoD
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ManaChange)
-	{
-		ENCODE_LENGTH_EXACT(ManaChange_Struct);
-		SETUP_DIRECT_ENCODE(ManaChange_Struct, structs::ManaChange_Struct);
-
-		OUT(new_mana);
-		OUT(stamina);
-		OUT(spell_id);
-		OUT(keepcasting);
-		eq->slot = -1; // this is spell gem slot. It's -1 in normal operation
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_MercenaryDataResponse)
 	{
 		//consume the packet
@@ -1388,8 +1374,8 @@ namespace SoD
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
 		eq->unknown844 = 600;
-		eq->unknown880 = 50;
-		eq->unknown884 = 10;
+		OUT(LavaDamage);
+		OUT(MinLavaDamage);
 		eq->unknown888 = 1;
 		eq->unknown889 = 0;
 		eq->unknown890 = 1;
@@ -1475,7 +1461,7 @@ namespace SoD
 		eq->level1 = emu->level;
 		//	OUT(unknown00022[2]);
 		for (r = 0; r < 5; r++) {
-			OUT(binds[r].zoneId);
+			OUT(binds[r].zone_id);
 			OUT(binds[r].x);
 			OUT(binds[r].y);
 			OUT(binds[r].z);
@@ -1874,8 +1860,8 @@ namespace SoD
 
 		for(auto i = 0; i < eq->total_abilities; ++i) {
 			eq->abilities[i].skill_id = inapp->ReadUInt32();
-			eq->abilities[i].base1 = inapp->ReadUInt32();
-			eq->abilities[i].base2 = inapp->ReadUInt32();
+			eq->abilities[i].base_value = inapp->ReadUInt32();
+			eq->abilities[i].limit_value = inapp->ReadUInt32();
 			eq->abilities[i].slot = inapp->ReadUInt32();
 		}
 

common/patches/sod_ops.h

@@ -63,7 +63,6 @@ E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)
 E(OP_LootItem)
-E(OP_ManaChange)
 E(OP_MercenaryDataResponse)
 E(OP_MercenaryDataUpdate)
 E(OP_MoveItem)

common/patches/sod_structs.h

@@ -450,8 +450,8 @@ struct NewZone_Struct {
 /*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
 /*0872*/	uint32	scriptIDSomething3;
 /*0876*/	uint32	SuspendBuffs;
-/*0880*/	uint32	unknown880;	//seen 50
-/*0884*/	uint32	unknown884;	//seen 10
+/*0880*/	uint32	LavaDamage;	//seen 50
+/*0884*/	uint32	MinLavaDamage;	//seen 10
 /*0888*/	uint8	unknown888;	//seen 1
 /*0889*/	uint8	unknown889;	//seen 0 (POK) or 1 (rujj)
 /*0890*/	uint8	unknown890;	//seen 1
@@ -803,7 +803,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-   /*000*/ uint32 zoneId;
+   /*000*/ uint32 zone_id;
    /*004*/ float x;
    /*008*/ float y;
    /*012*/ float z;
@@ -1714,7 +1714,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -2539,7 +2539,7 @@ struct EnvDamage2_Struct {
 /*0004*/	uint16 unknown4;
 /*0006*/	uint32 damage;
 /*0010*/	uint8 unknown10[12];
-/*0022*/	uint8 dmgtype; //FA = Lava; FC = Falling
+/*0022*/	uint8 dmgtype; // FA = Lava, FB = Drowning, FC = Falling, FD = Trap
 /*0023*/	uint8 unknown2[4];
 /*0027*/	uint16 constant; //Always FFFF
 /*0029*/	uint16 unknown29;
@@ -3748,8 +3748,8 @@ struct UseAA_Struct {
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 /*16*/
 };
@@ -4196,30 +4196,30 @@ struct ExpeditionInviteResponse_Struct
 /*079*/ uint8  unknown079;     // padding garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
 /*008*/ uint32 assigned; // padded bool
 /*012*/ uint32 max_players;
-/*016*/ char   expedition_name[128];
+/*016*/ char   dz_name[128];
 /*144*/ char   leader_name[64];
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
-/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char name[1];        // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 online_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count; // number of players in window
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
@@ -4242,7 +4242,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;

common/patches/sof.cpp

@@ -533,13 +533,13 @@ namespace SoF
 
 	ENCODE(OP_DzExpeditionInfo)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneInfo_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneInfo_Struct, structs::DynamicZoneInfo_Struct);
 
 		OUT(client_id);
 		OUT(assigned);
 		OUT(max_players);
-		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->dz_name, emu->dz_name, sizeof(eq->dz_name));
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
@@ -585,8 +585,8 @@ namespace SoF
 
 	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneLeaderName_Struct, structs::DynamicZoneLeaderName_Struct);
 
 		OUT(client_id);
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
@@ -596,7 +596,7 @@ namespace SoF
 
 	ENCODE(OP_DzMemberList)
 	{
-		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
+		SETUP_VAR_ENCODE(DynamicZoneMemberList_Struct);
 
 		SerializeBuffer buf;
 		buf.WriteUInt32(emu->client_id);
@@ -604,7 +604,7 @@ namespace SoF
 		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
 			buf.WriteString(emu->members[i].name);
-			buf.WriteUInt8(emu->members[i].expedition_status);
+			buf.WriteUInt8(emu->members[i].online_status);
 		}
 
 		__packet->size = buf.size();
@@ -616,8 +616,8 @@ namespace SoF
 
 	ENCODE(OP_DzMemberListName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneMemberListName_Struct, structs::DynamicZoneMemberListName_Struct);
 
 		OUT(client_id);
 		OUT(add_name);
@@ -628,7 +628,7 @@ namespace SoF
 
 	ENCODE(OP_DzMemberListStatus)
 	{
-		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		auto emu = reinterpret_cast<DynamicZoneMemberList_Struct*>((*p)->pBuffer);
 		if (emu->member_count == 1)
 		{
 			ENCODE_FORWARD(OP_DzMemberList);
@@ -966,20 +966,6 @@ namespace SoF
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ManaChange)
-	{
-		ENCODE_LENGTH_EXACT(ManaChange_Struct);
-		SETUP_DIRECT_ENCODE(ManaChange_Struct, structs::ManaChange_Struct);
-
-		OUT(new_mana);
-		OUT(stamina);
-		OUT(spell_id);
-		OUT(keepcasting);
-		eq->slot = -1; // this is spell gem slot. It's -1 in normal operation
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_MemorizeSpell)
 	{
 		ENCODE_LENGTH_EXACT(MemorizeSpell_Struct);
@@ -1066,8 +1052,8 @@ namespace SoF
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown796 = -1;
 		eq->unknown840 = 600;
-		eq->unknown876 = 50;
-		eq->unknown880 = 10;
+		OUT(LavaDamage);
+		OUT(MinLavaDamage);
 		eq->unknown884 = 1;
 		eq->unknown885 = 0;
 		eq->unknown886 = 1;
@@ -1140,7 +1126,7 @@ namespace SoF
 		eq->level1 = emu->level;
 		//	OUT(unknown00022[2]);
 		for (r = 0; r < 5; r++) {
-			OUT(binds[r].zoneId);
+			OUT(binds[r].zone_id);
 			OUT(binds[r].x);
 			OUT(binds[r].y);
 			OUT(binds[r].z);
@@ -1545,8 +1531,8 @@ namespace SoF
 
 		for(auto i = 0; i < eq->total_abilities; ++i) {
 			eq->abilities[i].skill_id = inapp->ReadUInt32();
-			eq->abilities[i].base1 = inapp->ReadUInt32();
-			eq->abilities[i].base2 = inapp->ReadUInt32();
+			eq->abilities[i].base_value = inapp->ReadUInt32();
+			eq->abilities[i].limit_value = inapp->ReadUInt32();
 			eq->abilities[i].slot = inapp->ReadUInt32();
 		}
 

common/patches/sof_ops.h

@@ -59,7 +59,6 @@ E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)
 E(OP_LootItem)
-E(OP_ManaChange)
 E(OP_MemorizeSpell)
 E(OP_MoveItem)
 E(OP_NewSpawn)

common/patches/sof_structs.h

@@ -454,8 +454,8 @@ struct NewZone_Struct {
 /*0864*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
 /*0868*/	uint32	scriptIDSomething3;
 /*0872*/	uint32	SuspendBuffs;
-/*0876*/	uint32	unknown876;	//seen 50
-/*0880*/	uint32	unknown880;	//seen 10
+/*0876*/	uint32	LavaDamage;	//seen 50
+/*0880*/	uint32	MinLavaDamage;	//seen 10
 /*0884*/	uint8	unknown884;	//seen 1
 /*0885*/	uint8	unknown885;	//seen 0 (POK) or 1 (rujj)
 /*0886*/	uint8	unknown886;	//seen 1
@@ -804,7 +804,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-   /*000*/ uint32 zoneId;
+   /*000*/ uint32 zone_id;
    /*004*/ float x;
    /*008*/ float y;
    /*012*/ float z;
@@ -1742,7 +1742,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -2509,7 +2509,7 @@ struct EnvDamage2_Struct {
 /*0004*/	uint16 unknown4;
 /*0006*/	uint32 damage;
 /*0010*/	uint8 unknown10[12];
-/*0022*/	uint8 dmgtype; //FA = Lava; FC = Falling
+/*0022*/	uint8 dmgtype; // FA = Lava, FB = Drowning, FC = Falling, FD = Trap
 /*0023*/	uint8 unknown2[4];
 /*0027*/	uint16 constant; //Always FFFF
 /*0029*/	uint16 unknown29;
@@ -3673,8 +3673,8 @@ struct UseAA_Struct {
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 /*16*/
 };
@@ -4112,29 +4112,29 @@ struct ExpeditionInviteResponse_Struct
 /*075*/ uint8  unknown079;     // padding/garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 assigned; // padded bool
 /*008*/ uint32 max_players;
-/*012*/ char   expedition_name[128];
+/*012*/ char   dz_name[128];
 /*140*/ char   leader_name[64];
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
-/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char name[1];        // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 online_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count;
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
@@ -4156,7 +4156,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ char   leader_name[64];

common/patches/titanium.cpp

@@ -476,13 +476,13 @@ namespace Titanium
 
 	ENCODE(OP_DzExpeditionInfo)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneInfo_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneInfo_Struct, structs::DynamicZoneInfo_Struct);
 
 		OUT(client_id);
 		OUT(assigned);
 		OUT(max_players);
-		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->dz_name, emu->dz_name, sizeof(eq->dz_name));
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
@@ -528,8 +528,8 @@ namespace Titanium
 
 	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneLeaderName_Struct, structs::DynamicZoneLeaderName_Struct);
 
 		OUT(client_id);
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
@@ -539,7 +539,7 @@ namespace Titanium
 
 	ENCODE(OP_DzMemberList)
 	{
-		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
+		SETUP_VAR_ENCODE(DynamicZoneMemberList_Struct);
 
 		SerializeBuffer buf;
 		buf.WriteUInt32(emu->client_id);
@@ -547,7 +547,7 @@ namespace Titanium
 		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
 			buf.WriteString(emu->members[i].name);
-			buf.WriteUInt8(emu->members[i].expedition_status);
+			buf.WriteUInt8(emu->members[i].online_status);
 		}
 
 		__packet->size = buf.size();
@@ -559,8 +559,8 @@ namespace Titanium
 
 	ENCODE(OP_DzMemberListName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneMemberListName_Struct, structs::DynamicZoneMemberListName_Struct);
 
 		OUT(client_id);
 		OUT(add_name);
@@ -571,7 +571,7 @@ namespace Titanium
 
 	ENCODE(OP_DzMemberListStatus)
 	{
-		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		auto emu = reinterpret_cast<DynamicZoneMemberList_Struct*>((*p)->pBuffer);
 		if (emu->member_count == 1)
 		{
 			ENCODE_FORWARD(OP_DzMemberList);
@@ -932,6 +932,19 @@ namespace Titanium
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_ManaChange)
+	{
+		ENCODE_LENGTH_EXACT(ManaChange_Struct);
+		SETUP_DIRECT_ENCODE(ManaChange_Struct, structs::ManaChange_Struct);
+
+		OUT(new_mana);
+		OUT(stamina);
+		OUT(spell_id);
+		OUT(keepcasting);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_MemorizeSpell)
 	{
 		ENCODE_LENGTH_EXACT(MemorizeSpell_Struct);
@@ -1022,7 +1035,7 @@ namespace Titanium
 		eq->level1 = emu->level;
 		//	OUT(unknown00022[2]);
 		for (r = 0; r < 5; r++) {
-			OUT(binds[r].zoneId);
+			OUT(binds[r].zone_id);
 			OUT(binds[r].x);
 			OUT(binds[r].y);
 			OUT(binds[r].z);
@@ -1338,8 +1351,8 @@ namespace Titanium
 
 		for(auto i = 0; i < eq->total_abilities; ++i) {
 			eq->abilities[i].skill_id = inapp->ReadUInt32();
-			eq->abilities[i].base1 = inapp->ReadUInt32();
-			eq->abilities[i].base2 = inapp->ReadUInt32();
+			eq->abilities[i].base_value = inapp->ReadUInt32();
+			eq->abilities[i].limit_value = inapp->ReadUInt32();
 			eq->abilities[i].slot = inapp->ReadUInt32();
 		}
 

common/patches/titanium_ops.h

@@ -55,6 +55,7 @@ E(OP_ItemPacket)
 E(OP_LeadershipExpUpdate)
 E(OP_LFGuild)
 E(OP_LootItem)
+E(OP_ManaChange)
 E(OP_MemorizeSpell)
 E(OP_MoveItem)
 E(OP_OnLevelMessage)

common/patches/titanium_structs.h

@@ -738,7 +738,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-   /*000*/ uint32 zoneId;
+   /*000*/ uint32 zone_id;
    /*004*/ float x;
    /*008*/ float y;
    /*012*/ float z;
@@ -1509,7 +1509,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -3180,8 +3180,8 @@ struct UseAA_Struct {
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 };
 
@@ -3323,29 +3323,29 @@ struct ExpeditionInviteResponse_Struct
 /*075*/ uint8  unknown079;     // padding/garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 assigned; // padded bool
 /*008*/ uint32 max_players;
-/*012*/ char   expedition_name[128];
+/*012*/ char   dz_name[128];
 /*140*/ char   leader_name[64];
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
-/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char name[1];        // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 online_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count;
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
@@ -3367,7 +3367,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ char   leader_name[64];

common/patches/uf.cpp

@@ -675,13 +675,13 @@ namespace UF
 
 	ENCODE(OP_DzExpeditionInfo)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneInfo_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneInfo_Struct, structs::DynamicZoneInfo_Struct);
 
 		OUT(client_id);
 		OUT(assigned);
 		OUT(max_players);
-		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->dz_name, emu->dz_name, sizeof(eq->dz_name));
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
@@ -727,8 +727,8 @@ namespace UF
 
 	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneLeaderName_Struct, structs::DynamicZoneLeaderName_Struct);
 
 		OUT(client_id);
 		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
@@ -738,7 +738,7 @@ namespace UF
 
 	ENCODE(OP_DzMemberList)
 	{
-		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
+		SETUP_VAR_ENCODE(DynamicZoneMemberList_Struct);
 
 		SerializeBuffer buf;
 		buf.WriteUInt32(emu->client_id);
@@ -746,7 +746,7 @@ namespace UF
 		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
 			buf.WriteString(emu->members[i].name);
-			buf.WriteUInt8(emu->members[i].expedition_status);
+			buf.WriteUInt8(emu->members[i].online_status);
 		}
 
 		__packet->size = buf.size();
@@ -758,8 +758,8 @@ namespace UF
 
 	ENCODE(OP_DzMemberListName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+		ENCODE_LENGTH_EXACT(DynamicZoneMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(DynamicZoneMemberListName_Struct, structs::DynamicZoneMemberListName_Struct);
 
 		OUT(client_id);
 		OUT(add_name);
@@ -770,7 +770,7 @@ namespace UF
 
 	ENCODE(OP_DzMemberListStatus)
 	{
-		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		auto emu = reinterpret_cast<DynamicZoneMemberList_Struct*>((*p)->pBuffer);
 		if (emu->member_count == 1)
 		{
 			ENCODE_FORWARD(OP_DzMemberList);
@@ -1390,20 +1390,6 @@ namespace UF
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ManaChange)
-	{
-		ENCODE_LENGTH_EXACT(ManaChange_Struct);
-		SETUP_DIRECT_ENCODE(ManaChange_Struct, structs::ManaChange_Struct);
-
-		OUT(new_mana);
-		OUT(stamina);
-		OUT(spell_id);
-		OUT(keepcasting);
-		eq->slot = -1; // this is spell gem slot. It's -1 in normal operation
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_MercenaryDataResponse)
 	{
 		//consume the packet
@@ -1614,8 +1600,8 @@ namespace UF
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
 		eq->unknown844 = 600;
-		eq->unknown880 = 50;
-		eq->unknown884 = 10;
+		OUT(LavaDamage);
+		OUT(MinLavaDamage);
 		eq->unknown888 = 1;
 		eq->unknown889 = 0;
 		eq->unknown890 = 1;
@@ -1705,7 +1691,7 @@ namespace UF
 		eq->level1 = emu->level;
 		//	OUT(unknown00022[2]);
 		for (r = 0; r < 5; r++) {
-			OUT(binds[r].zoneId);
+			OUT(binds[r].zone_id);
 			OUT(binds[r].x);
 			OUT(binds[r].y);
 			OUT(binds[r].z);
@@ -2139,8 +2125,8 @@ namespace UF
 		
 		for(auto i = 0; i < eq->total_abilities; ++i) {
 			eq->abilities[i].skill_id = inapp->ReadUInt32();
-			eq->abilities[i].base1 = inapp->ReadUInt32();
-			eq->abilities[i].base2 = inapp->ReadUInt32();
+			eq->abilities[i].base_value = inapp->ReadUInt32();
+			eq->abilities[i].limit_value = inapp->ReadUInt32();
 			eq->abilities[i].slot = inapp->ReadUInt32();
 		}
 

common/patches/uf_ops.h

@@ -68,7 +68,6 @@ E(OP_ItemVerifyReply)
 E(OP_LeadershipExpUpdate)
 E(OP_LogServer)
 E(OP_LootItem)
-E(OP_ManaChange)
 E(OP_MercenaryDataResponse)
 E(OP_MercenaryDataUpdate)
 E(OP_MoveItem)

common/patches/uf_structs.h

@@ -450,8 +450,8 @@ struct NewZone_Struct {
 /*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
 /*0872*/	uint32	scriptIDSomething3;
 /*0876*/	uint32	SuspendBuffs;
-/*0880*/	uint32	unknown880;	//seen 50
-/*0884*/	uint32	unknown884;	//seen 10
+/*0880*/	uint32	LavaDamage;	//seen 50
+/*0884*/	uint32	MinLavaDamage;	//seen 10
 /*0888*/	uint8	unknown888;	//seen 1
 /*0889*/	uint8	unknown889;	//seen 0 (POK) or 1 (rujj)
 /*0890*/	uint8	unknown890;	//seen 1
@@ -833,7 +833,7 @@ struct LeadershipAA_Struct {
 * Size: 20 Octets
 */
 struct BindStruct {
-   /*000*/ uint32 zoneId;
+   /*000*/ uint32 zone_id;
    /*004*/ float x;
    /*008*/ float y;
    /*012*/ float z;
@@ -1755,7 +1755,7 @@ struct GMZoneRequest_Struct {
 /*0068*/	float	x;
 /*0072*/	float	y;
 /*0076*/	float	z;
-/*0080*/	char	unknown0080[4];
+/*0080*/	float	heading;
 /*0084*/	uint32	success;		// 0 if command failed, 1 if succeeded?
 /*0088*/
 //	/*072*/	int8	success;		// =0 client->server, =1 server->client, -X=specific error
@@ -3803,8 +3803,8 @@ struct UseAA_Struct {
 
 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base1;
-/*08*/	uint32 base2;
+/*04*/	uint32 base_value;
+/*08*/	uint32 limit_value;
 /*12*/	uint32 slot;
 /*16*/
 };
@@ -4277,30 +4277,30 @@ struct ExpeditionInviteResponse_Struct
 /*079*/ uint8  unknown079;     // padding garbage?
 };
 
-struct ExpeditionInfo_Struct
+struct DynamicZoneInfo_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
 /*008*/ uint32 assigned; // padded bool
 /*012*/ uint32 max_players;
-/*016*/ char   expedition_name[128];
+/*016*/ char   dz_name[128];
 /*144*/ char   leader_name[64];
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneMemberEntry_Struct
 {
-/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
-/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+/*000*/ char name[1];        // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 online_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneMemberList_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 member_count; // number of players in window
-/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+/*008*/ DynamicZoneMemberEntry_Struct members[0]; // variable length
 };
 
-struct ExpeditionMemberListName_Struct
+struct DynamicZoneMemberListName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
@@ -4323,7 +4323,7 @@ struct ExpeditionLockoutTimers_Struct
 /*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
 };
 
-struct ExpeditionSetLeaderName_Struct
+struct DynamicZoneLeaderName_Struct
 {
 /*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;

common/platform.cpp

@@ -46,15 +46,15 @@ std::string GetPlatformName()
 {
 	switch (GetExecutablePlatformInt()) {
 		case EQEmuExePlatform::ExePlatformWorld:
-			return "WorldServer";
+			return "World";
 		case EQEmuExePlatform::ExePlatformQueryServ:
-			return "QueryServer";
+			return "QS";
 		case EQEmuExePlatform::ExePlatformZone:
-			return "ZoneServer";
+			return "Zone";
 		case EQEmuExePlatform::ExePlatformUCS:
 			return "UCS";
 		case EQEmuExePlatform::ExePlatformLogin:
-			return "LoginServer";
+			return "Login";
 		case EQEmuExePlatform::ExePlatformSocket_Server:
 			return "SocketServer";
 		case EQEmuExePlatform::ExePlatformSharedMemory:
@@ -70,4 +70,4 @@ std::string GetPlatformName()
 		default:
 			return "";
 	}
-}
+}

common/ptimer.h

@@ -45,6 +45,8 @@ enum : int {	//values for pTimerType
 	pTimerLinkedSpellReuseStart = 28,
 	pTimerLinkedSpellReuseEnd = 48,
 
+	pTimerShieldAbility = 86,	
+	
 	pTimerLayHands = 87,		//these IDs are used by client too
 	pTimerHarmTouch = 89,		//so dont change them
 

common/races.cpp

@@ -2232,3 +2232,15 @@ bool PlayerAppearance::IsValidWoad(uint16 race_id, uint8 gender_id, uint8 woad_v
 	}
 	return false;
 }
+
+const char* GetGenderName(uint32 gender_id) {
+	const char* gender_name = "Unknown";
+	if (gender_id == MALE) {
+		gender_name = "Male";
+	} else if (gender_id == FEMALE) {
+		gender_name = "Female";
+	} else if (gender_id == NEUTER) {
+		gender_name = "Neuter";
+	}
+	return gender_name;
+}

common/races.h

@@ -851,6 +851,7 @@
 
 const char* GetRaceIDName(uint16 race_id);
 const char* GetPlayerRaceName(uint32 player_race_value);
+const char* GetGenderName(uint32 gender_id);
 
 uint32 GetPlayerRaceValue(uint16 race_id);
 uint32 GetPlayerRaceBit(uint16 race_id);
@@ -860,7 +861,6 @@ uint16 GetRaceIDFromPlayerRaceBit(uint32 player_race_bit);
 
 float GetRaceGenderDefaultHeight(int race, int gender);
 
-
 // player race-/gender-based model feature validators
 namespace PlayerAppearance
 {
@@ -1603,6 +1603,14 @@ namespace PlayerAppearance
 #define RACE_FALLEN_KNIGHT_722 722
 #define RACE_SERVANT_OF_SHADOW_723 723
 #define RACE_LUCLIN_724 724
+#define RACE_XARIC_725 725
+#define RACE_DERVISH_726 726
+#define RACE_DERVISH_727 727
+#define RACE_LUCLIN_728 728
+#define RACE_LUCLIN_729 729
+#define RACE_ORB_730 730
+#define RACE_LUCLIN_731 731
+#define RACE_PEGASUS_732 732
 #define RACE_INTERACTIVE_OBJECT_2250 2250
 
 #endif

common/random.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
+	Copyright (C) 2001-2021 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,10 +25,24 @@
 #include <iterator>
 #include <type_traits>
 
-/* This uses mt19937 seeded with the std::random_device
- * The idea is to have this be included as a member of another class
- * so mocking out for testing is easier
- * If you need to reseed random.Reseed()
+#ifdef USE_SFMT19937
+// only GCC supports, so lets turn it off
+#ifndef __GNUC__
+#undef USE_SFMT19937
+#endif
+#ifdef __clang__
+#undef USE_SFMT19937
+#endif
+#endif
+
+#ifdef USE_ADDITIVE_LFIB_PRNG
+#include "additive_lagged_fibonacci_engine.h"
+#elif defined(USE_SFMT19937)
+#include <ext/random>
+#endif
+
+/* This uses mt19937 (or other compatible engine) seeded with the std::random_device. The idea is to have this be
+ * included as a member of another class so mocking out for testing is easier If you need to reseed random.Reseed()
  * Eventually this should be derived from an abstract base class
  */
 
@@ -40,7 +54,12 @@ namespace EQ {
 		{
 			if (low > high)
 				std::swap(low, high);
+// EQ uses biased int distribution, so I guess we can support it :P
+#ifdef BIASED_INT_DIST
+			return low + m_gen() % (high - low + 1);
+#else
 			return int_dist(m_gen, int_param_t(low, high)); // [low, high]
+#endif
 		}
 
 		// AKA old MakeRandomFloat
@@ -98,11 +117,24 @@ namespace EQ {
 		}
 
 	private:
+#ifndef BIASED_INT_DIST
 		typedef std::uniform_int_distribution<int>::param_type int_param_t;
-		typedef std::uniform_real_distribution<double>::param_type real_param_t;
-		std::mt19937 m_gen;
 		std::uniform_int_distribution<int> int_dist;
+#endif
+		typedef std::uniform_real_distribution<double>::param_type real_param_t;
 		std::uniform_real_distribution<double> real_dist;
+// define USE_CUSTOM_PRNG_ENGINE to any supported random engine like:
+// #define USE_CUSTOM_PRNG_ENGINE std::default_random_engine
+#ifdef USE_ADDITIVE_LFIB_PRNG
+		EQRand
+#elif defined(USE_SFMT19937)
+		__gnu_cxx::sfmt19937
+#elif defined(USE_CUSTOM_PRNG_ENGINE)
+		USE_CUSTOM_PRNG_ENGINE
+#else
+		std::mt19937
+#endif
+		m_gen;
 	};
 }
 

common/repositories/base/base_aa_ability_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_aa_rank_effects_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_aa_rank_prereqs_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_aa_ranks_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_account_flags_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_account_ip_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -74,7 +74,7 @@ public:
 		entry.accid    = 0;
 		entry.ip       = "";
 		entry.count    = 1;
-		entry.lastused = current_timestamp();
+		entry.lastused = "";
 
 		return entry;
 	}

common/repositories/base/base_account_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_account_rewards_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_adventure_details_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_adventure_members_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_adventure_stats_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_adventure_template_entry_flavor_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_adventure_template_entry_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_adventure_template_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -148,7 +148,7 @@ public:
 		entry.zone_in_time      = 1800;
 		entry.win_points        = 0;
 		entry.lose_points       = 0;
-		entry.theme             = 1;
+		entry.theme             = LDoNThemes::GUK;
 		entry.zone_in_zone_id   = 0;
 		entry.zone_in_x         = 0;
 		entry.zone_in_y         = 0;

common/repositories/base/base_alternate_currency_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_auras_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_base_data_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -19,7 +19,7 @@ class BaseBaseDataRepository {
 public:
 	struct BaseData {
 		int   level;
-		int   class;
+		int   class_;
 		float hp;
 		float mana;
 		float end;
@@ -39,7 +39,7 @@ public:
 	{
 		return {
 			"level",
-			"class",
+			"`class`",
 			"hp",
 			"mana",
 			"end",
@@ -84,7 +84,7 @@ public:
 		BaseData entry{};
 
 		entry.level    = 0;
-		entry.class    = 0;
+		entry.class_   = 0;
 		entry.hp       = 0;
 		entry.mana     = 0;
 		entry.end      = 0;
@@ -129,7 +129,7 @@ public:
 			BaseData entry{};
 
 			entry.level    = atoi(row[0]);
-			entry.class    = atoi(row[1]);
+			entry.class_   = atoi(row[1]);
 			entry.hp       = static_cast<float>(atof(row[2]));
 			entry.mana     = static_cast<float>(atof(row[3]));
 			entry.end      = static_cast<float>(atof(row[4]));
@@ -172,7 +172,7 @@ public:
 		auto columns = Columns();
 
 		update_values.push_back(columns[0] + " = " + std::to_string(base_data_entry.level));
-		update_values.push_back(columns[1] + " = " + std::to_string(base_data_entry.class));
+		update_values.push_back(columns[1] + " = " + std::to_string(base_data_entry.class_));
 		update_values.push_back(columns[2] + " = " + std::to_string(base_data_entry.hp));
 		update_values.push_back(columns[3] + " = " + std::to_string(base_data_entry.mana));
 		update_values.push_back(columns[4] + " = " + std::to_string(base_data_entry.end));
@@ -203,7 +203,7 @@ public:
 		std::vector<std::string> insert_values;
 
 		insert_values.push_back(std::to_string(base_data_entry.level));
-		insert_values.push_back(std::to_string(base_data_entry.class));
+		insert_values.push_back(std::to_string(base_data_entry.class_));
 		insert_values.push_back(std::to_string(base_data_entry.hp));
 		insert_values.push_back(std::to_string(base_data_entry.mana));
 		insert_values.push_back(std::to_string(base_data_entry.end));
@@ -242,7 +242,7 @@ public:
 			std::vector<std::string> insert_values;
 
 			insert_values.push_back(std::to_string(base_data_entry.level));
-			insert_values.push_back(std::to_string(base_data_entry.class));
+			insert_values.push_back(std::to_string(base_data_entry.class_));
 			insert_values.push_back(std::to_string(base_data_entry.hp));
 			insert_values.push_back(std::to_string(base_data_entry.mana));
 			insert_values.push_back(std::to_string(base_data_entry.end));
@@ -285,7 +285,7 @@ public:
 			BaseData entry{};
 
 			entry.level    = atoi(row[0]);
-			entry.class    = atoi(row[1]);
+			entry.class_   = atoi(row[1]);
 			entry.hp       = static_cast<float>(atof(row[2]));
 			entry.mana     = static_cast<float>(atof(row[3]));
 			entry.end      = static_cast<float>(atof(row[4]));
@@ -319,7 +319,7 @@ public:
 			BaseData entry{};
 
 			entry.level    = atoi(row[0]);
-			entry.class    = atoi(row[1]);
+			entry.class_   = atoi(row[1]);
 			entry.hp       = static_cast<float>(atof(row[2]));
 			entry.mana     = static_cast<float>(atof(row[3]));
 			entry.end      = static_cast<float>(atof(row[4]));

common/repositories/base/base_blocked_spells_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_bug_reports_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -154,9 +154,9 @@ public:
 		entry._unknown_value      = 0;
 		entry.bug_report          = "";
 		entry.system_info         = "";
-		entry.report_datetime     = current_timestamp();
+		entry.report_datetime     = "";
 		entry.bug_status          = 0;
-		entry.last_review         = current_timestamp();
+		entry.last_review         = "";
 		entry.last_reviewer       = "None";
 		entry.reviewer_notes      = "";
 

common/repositories/base/base_bugs_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_buyer_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_char_create_combinations_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
@@ -20,7 +20,7 @@ public:
 	struct CharCreateCombinations {
 		int allocation_id;
 		int race;
-		int class;
+		int class_;
 		int deity;
 		int start_zone;
 		int expansions_req;
@@ -36,7 +36,7 @@ public:
 		return {
 			"allocation_id",
 			"race",
-			"class",
+			"`class`",
 			"deity",
 			"start_zone",
 			"expansions_req",
@@ -77,7 +77,7 @@ public:
 
 		entry.allocation_id  = 0;
 		entry.race           = 0;
-		entry.class          = 0;
+		entry.class_         = 0;
 		entry.deity          = 0;
 		entry.start_zone     = 0;
 		entry.expansions_req = 0;
@@ -118,7 +118,7 @@ public:
 
 			entry.allocation_id  = atoi(row[0]);
 			entry.race           = atoi(row[1]);
-			entry.class          = atoi(row[2]);
+			entry.class_         = atoi(row[2]);
 			entry.deity          = atoi(row[3]);
 			entry.start_zone     = atoi(row[4]);
 			entry.expansions_req = atoi(row[5]);
@@ -157,7 +157,7 @@ public:
 
 		update_values.push_back(columns[0] + " = " + std::to_string(char_create_combinations_entry.allocation_id));
 		update_values.push_back(columns[1] + " = " + std::to_string(char_create_combinations_entry.race));
-		update_values.push_back(columns[2] + " = " + std::to_string(char_create_combinations_entry.class));
+		update_values.push_back(columns[2] + " = " + std::to_string(char_create_combinations_entry.class_));
 		update_values.push_back(columns[3] + " = " + std::to_string(char_create_combinations_entry.deity));
 		update_values.push_back(columns[4] + " = " + std::to_string(char_create_combinations_entry.start_zone));
 		update_values.push_back(columns[5] + " = " + std::to_string(char_create_combinations_entry.expansions_req));
@@ -184,7 +184,7 @@ public:
 
 		insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.race));
-		insert_values.push_back(std::to_string(char_create_combinations_entry.class));
+		insert_values.push_back(std::to_string(char_create_combinations_entry.class_));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.deity));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone));
 		insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req));
@@ -219,7 +219,7 @@ public:
 
 			insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.race));
-			insert_values.push_back(std::to_string(char_create_combinations_entry.class));
+			insert_values.push_back(std::to_string(char_create_combinations_entry.class_));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.deity));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone));
 			insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req));
@@ -258,7 +258,7 @@ public:
 
 			entry.allocation_id  = atoi(row[0]);
 			entry.race           = atoi(row[1]);
-			entry.class          = atoi(row[2]);
+			entry.class_         = atoi(row[2]);
 			entry.deity          = atoi(row[3]);
 			entry.start_zone     = atoi(row[4]);
 			entry.expansions_req = atoi(row[5]);
@@ -288,7 +288,7 @@ public:
 
 			entry.allocation_id  = atoi(row[0]);
 			entry.race           = atoi(row[1]);
-			entry.class          = atoi(row[2]);
+			entry.class_         = atoi(row[2]);
 			entry.deity          = atoi(row[3]);
 			entry.start_zone     = atoi(row[4]);
 			entry.expansions_req = atoi(row[5]);

common/repositories/base/base_char_create_point_allocations_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_char_recipe_list_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_character_activities_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_character_alt_currency_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_character_alternate_abilities_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_character_auras_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_character_bandolier_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */

common/repositories/base/base_character_bind_repository.h

@@ -4,7 +4,7 @@
  * This repository was automatically generated and is NOT to be modified directly.
  * Any repository modifications are meant to be made to the repository extending the base.
  * Any modifications to base repositories are to be made by the generator only
- * 
+ *
  * @generator ./utils/scripts/generators/repository-generator.pl
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */