Saving and loading of guids for items, still needs a lot of work, esp with corpses. No auditing yet

.drone.yml

@@ -15,7 +15,7 @@ volumes:
 
 steps:
   - name: Build Linux X64
-    image: akkadius/eqemu-server:v14
+    image: akkadius/eqemu-server:v11
     environment:
       GITHUB_TOKEN:
         from_secret: GH_RELEASE_GITHUB_API_TOKEN

CMakeLists.txt

@@ -16,21 +16,6 @@ SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
-OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
-OPTION(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
-
-IF (EQEMU_BUILD_STATIC)
-	SET(BUILD_SHARED_LIBS OFF)
-	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
-	MESSAGE(STATUS "Building with static linking")
-	SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
-	IF (UNIX)
-		SET(PERL_LIBRARY "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/libperl.so")
-		SET(PERL_INCLUDE_PATH "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/")
-		SET(PERL_EXECUTABLE "/opt/eqemu-perl/bin/perl")
-	ENDIF ()
-ENDIF (EQEMU_BUILD_STATIC)
-
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
@@ -38,11 +23,7 @@ IF(MSVC)
 	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17
 
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-
-	OPTION(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." ON)
-	IF(EQEMU_DISABLE_MSVC_WARNINGS)
-		ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
-	ENDIF(EQEMU_DISABLE_MSVC_WARNINGS)
+	ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
 ELSE(MSVC)
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
@@ -139,13 +120,6 @@ ELSE()
 	MESSAGE(STATUS "* mbedTLS:                               MISSING *")
 ENDIF()
 
-MESSAGE(STATUS "PERL_INCLUDE_PATH: ${PERL_INCLUDE_PATH}")
-MESSAGE(STATUS "PERL_LIBRARY: ${PERL_LIBRARY}")
-MESSAGE(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}")
-MESSAGE(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}")
-MESSAGE(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}")
-MESSAGE(STATUS "PERL_VERSION: ${PERL_VERSION}")
-
 MESSAGE(STATUS "**************************************************")
 
 #options
@@ -333,10 +307,6 @@ ELSE()
 	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
 ENDIF()
 
-IF (EQEMU_BUILD_STATIC)
-	SET(ZLIB_LIBRARY_LIBS libz.a)
-ENDIF(EQEMU_BUILD_STATIC)
-
 MESSAGE(STATUS "")
 MESSAGE(STATUS "**************************************************")
 MESSAGE(STATUS "* Library Usage                                  *")
@@ -401,10 +371,6 @@ IF(PERL_LIBRARY_ENABLED)
 		INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
 		ADD_DEFINITIONS(-DEMBPERL)
 		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
-		ADD_DEFINITIONS(-DPERLBIND_NO_STRICT_SCALAR_TYPES)
-		IF (UNIX AND EQEMU_BUILD_STATIC)
-			SET(SERVER_LIBS ${SERVER_LIBS} libcrypt.a)
-		ENDIF ()
 	ENDIF()
 ENDIF()
 

client_files/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 add_subdirectory(import)
 add_subdirectory(export)

client_files/import/main.cpp

@@ -27,8 +27,6 @@
 #include "../../common/content/world_content_service.h"
 #include "../../common/zone_store.h"
 #include "../../common/path_manager.h"
-#include "../../common/repositories/base_data_repository.h"
-#include "../../common/file.h"
 
 EQEmuLogSys LogSys;
 WorldContentService content_service;
@@ -257,45 +255,50 @@ void ImportSkillCaps(SharedDatabase *db) {
 	fclose(f);
 }
 
-void ImportBaseData(SharedDatabase *db)
-{
+void ImportBaseData(SharedDatabase *db) {
 	LogInfo("Importing Base Data");
 
-	const std::string& file_name = fmt::format("{}/import/BaseData.txt", path.GetServerPath());
-
-	const auto& file_contents = File::GetContents(file_name);
-	if (!file_contents.error.empty()) {
-		LogError("{}", file_contents.error);
+	std::string file = fmt::format("{}/import/BaseData.txt", path.GetServerPath());
+	FILE *f = fopen(file.c_str(), "r");
+	if(!f) {
+		LogError("Unable to open {} to read, skipping.", file);
+		return;
 	}
 
-	db->QueryDatabase("DELETE FROM base_data");
+	std::string delete_sql = "DELETE FROM base_data";
+	db->QueryDatabase(delete_sql);
 
-	std::vector<BaseDataRepository::BaseData> v;
+	char buffer[2048];
+	while(fgets(buffer, 2048, f)) {
+		auto split = Strings::Split(buffer, '^');
 
-	auto e = BaseDataRepository::NewEntity();
-
-	for (const auto& line: Strings::Split(file_contents.contents, "\n")) {
-		const auto& line_data = Strings::Split(line, '^');
-
-		if (line_data.size() < 10) {
+		if(split.size() < 10) {
 			continue;
 		}
 
-		e.level     = static_cast<uint8_t>(Strings::ToUnsignedInt(line_data[0]));
-		e.class_    = static_cast<uint8_t>(Strings::ToUnsignedInt(line_data[1]));
-		e.hp        = Strings::ToFloat(line_data[2]);
-		e.mana      = Strings::ToFloat(line_data[3]);
-		e.end       = Strings::ToFloat(line_data[4]);
-		e.hp_regen  = Strings::ToFloat(line_data[5]);
-		e.end_regen = Strings::ToFloat(line_data[6]);
-		e.hp_fac    = Strings::ToFloat(line_data[7]);
-		e.mana_fac  = Strings::ToFloat(line_data[8]);
-		e.end_fac   = Strings::ToFloat(line_data[9]);
+		std::string sql;
+		int level, class_id;
+		double hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac;
 
-		v.emplace_back(e);
+		level = Strings::ToInt(split[0].c_str());
+		class_id = Strings::ToInt(split[1].c_str());
+		hp = Strings::ToFloat(split[2].c_str());
+		mana = Strings::ToFloat(split[3].c_str());
+		end = Strings::ToFloat(split[4].c_str());
+		unk1 = Strings::ToFloat(split[5].c_str());
+		unk2 = Strings::ToFloat(split[6].c_str());
+		hp_fac = Strings::ToFloat(split[7].c_str());
+		mana_fac = Strings::ToFloat(split[8].c_str());
+		end_fac = Strings::ToFloat(split[9].c_str());
+
+		sql = StringFormat("INSERT INTO base_data(level, class, hp, mana, end, unk1, unk2, hp_fac, "
+			"mana_fac, end_fac) VALUES(%d, %d, %f, %f, %f, %f, %f, %f, %f, %f)",
+			level, class_id, hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac);
+
+		db->QueryDatabase(sql);
 	}
 
-	BaseDataRepository::InsertMany(*db, v);
+	fclose(f);
 }
 
 void ImportDBStrings(SharedDatabase *db) {

common/CMakeLists.txt

@@ -13,10 +13,8 @@ SET(common_sources
     crc32.cpp
     database/database_dump_service.cpp
     database.cpp
+    database_conversions.cpp
     database_instances.cpp
-    database/database_update_manifest.cpp
-    database/database_update_manifest_bots.cpp
-    database/database_update.cpp
     dbcore.cpp
     deity.cpp
     dynamic_zone_base.cpp
@@ -69,7 +67,6 @@ SET(common_sources
     perl_eqdb.cpp
     perl_eqdb_res.cpp
     process/process.cpp
-    process.cpp
     proc_launcher.cpp
     profanity_manager.cpp
     ptimer.cpp
@@ -90,7 +87,6 @@ SET(common_sources
     timer.cpp
     unix.cpp
     platform.cpp
-    json/json.hpp
     json/jsoncpp.cpp
     zone_store.cpp
     net/console_server.cpp
@@ -222,9 +218,6 @@ SET(repositories
     repositories/base/base_group_leaders_repository.h
     repositories/base/base_guilds_repository.h
     repositories/base/base_guild_ranks_repository.h
-    repositories/base/base_guild_permissions_repository.h
-    repositories/base/base_guild_members_repository.h
-    repositories/base/base_guild_bank_repository.h
     repositories/base/base_guild_relations_repository.h
     repositories/base/base_horses_repository.h
     repositories/base/base_instance_list_repository.h
@@ -233,6 +226,7 @@ SET(repositories
     repositories/base/base_inventory_snapshots_repository.h
     repositories/base/base_ip_exemptions_repository.h
     repositories/base/base_items_repository.h
+    repositories/base/base_item_tick_repository.h
     repositories/base/base_ldon_trap_entries_repository.h
     repositories/base/base_ldon_trap_templates_repository.h
     repositories/base/base_level_exp_mods_repository.h
@@ -402,9 +396,6 @@ SET(repositories
     repositories/group_leaders_repository.h
     repositories/guilds_repository.h
     repositories/guild_ranks_repository.h
-    repositories/guild_permissions_repository.h
-    repositories/guild_members_repository.h
-    repositories/guild_bank_repository.h
     repositories/guild_relations_repository.h
     repositories/horses_repository.h
     repositories/instance_list_repository.h
@@ -413,6 +404,7 @@ SET(repositories
     repositories/inventory_snapshots_repository.h
     repositories/ip_exemptions_repository.h
     repositories/items_repository.h
+    repositories/item_tick_repository.h
     repositories/ldon_trap_entries_repository.h
     repositories/ldon_trap_templates_repository.h
     repositories/level_exp_mods_repository.h
@@ -497,6 +489,7 @@ SET(repositories
 SET(common_headers
     additive_lagged_fibonacci_engine.h
     base_packet.h
+    base_data.h
     bodytypes.h
     classes.h
     compression.h
@@ -513,7 +506,6 @@ SET(common_headers
     data_verification.h
     database.h
     database_schema.h
-    database/database_update.h
     dbcore.h
     deity.h
     discord/discord.h
@@ -543,6 +535,7 @@ SET(common_headers
     events/player_event_logs.h
     events/player_event_discord_formatter.h
     events/player_events.h
+    errmsg.h
     event_sub.h
     expedition_lockout_timer.h
     extprofile.h
@@ -564,9 +557,10 @@ SET(common_headers
     item_fieldlist.h
     item_instance.h
     json_config.h
+    languages.h
     light_source.h
     linked_list.h
-    loot.h
+    loottable.h
     mail_oplist.h
     md5.h
     memory_buffer.h
@@ -585,14 +579,12 @@ SET(common_headers
     path_manager.cpp
     platform.h
     process/process.h
-    process.h
     proc_launcher.h
     profanity_manager.h
     profiler.h
     ptimer.h
     queue.h
     races.h
-	raid.h
     random.h
     rdtsc.h
     rulesys.h
@@ -616,6 +608,7 @@ SET(common_headers
     unix.h
     useperl.h
     version.h
+    zone_numbers.h
     zone_store.h
     event/event_loop.h
     event/task.h
@@ -674,8 +667,7 @@ 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
@@ -792,8 +784,5 @@ IF (UNIX)
     SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
 ENDIF (UNIX)
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
-ENDIF()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

common/base_data.h

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

common/classes.h

@@ -19,106 +19,98 @@
 #define CLASSES_CH
 
 #include "../common/types.h"
-#include "../common/rulesys.h"
-#include <string>
-#include <map>
 
-namespace Class {
-	constexpr uint8 None                      = 0;
-	constexpr uint8 Warrior                   = 1;
-	constexpr uint8 Cleric                    = 2;
-	constexpr uint8 Paladin                   = 3;
-	constexpr uint8 Ranger                    = 4;
-	constexpr uint8 ShadowKnight              = 5;
-	constexpr uint8 Druid                     = 6;
-	constexpr uint8 Monk                      = 7;
-	constexpr uint8 Bard                      = 8;
-	constexpr uint8 Rogue                     = 9;
-	constexpr uint8 Shaman                    = 10;
-	constexpr uint8 Necromancer               = 11;
-	constexpr uint8 Wizard                    = 12;
-	constexpr uint8 Magician                  = 13;
-	constexpr uint8 Enchanter                 = 14;
-	constexpr uint8 Beastlord                 = 15;
-	constexpr uint8 Berserker                 = 16;
-	constexpr uint8 WarriorGM                 = 20;
-	constexpr uint8 ClericGM                  = 21;
-	constexpr uint8 PaladinGM                 = 22;
-	constexpr uint8 RangerGM                  = 23;
-	constexpr uint8 ShadowKnightGM            = 24;
-	constexpr uint8 DruidGM                   = 25;
-	constexpr uint8 MonkGM                    = 26;
-	constexpr uint8 BardGM                    = 27;
-	constexpr uint8 RogueGM                   = 28;
-	constexpr uint8 ShamanGM                  = 29;
-	constexpr uint8 NecromancerGM             = 30;
-	constexpr uint8 WizardGM                  = 31;
-	constexpr uint8 MagicianGM                = 32;
-	constexpr uint8 EnchanterGM               = 33;
-	constexpr uint8 BeastlordGM               = 34;
-	constexpr uint8 BerserkerGM               = 35;
-	constexpr uint8 Banker                    = 40;
-	constexpr uint8 Merchant                  = 41;
-	constexpr uint8 DiscordMerchant           = 59;
-	constexpr uint8 AdventureRecruiter        = 60;
-	constexpr uint8 AdventureMerchant         = 61;
-	constexpr uint8 LDoNTreasure              = 62;
-	constexpr uint8 TributeMaster             = 63;
-	constexpr uint8 GuildTributeMaster        = 64;
-	constexpr uint8 GuildBanker               = 66;
-	constexpr uint8 NorrathsKeepersMerchant   = 67;
-	constexpr uint8 DarkReignMerchant         = 68;
-	constexpr uint8 FellowshipMaster          = 69;
-	constexpr uint8 AlternateCurrencyMerchant = 70;
-	constexpr uint8 MercenaryLiaison          = 71;
+#define NO_CLASS 0
+#define WARRIOR 1
+#define CLERIC 2
+#define PALADIN 3
+#define RANGER 4
+#define SHADOWKNIGHT 5
+#define DRUID 6
+#define MONK 7
+#define BARD 8
+#define ROGUE 9
+#define SHAMAN 10
+#define NECROMANCER 11
+#define WIZARD 12
+#define MAGICIAN 13
+#define ENCHANTER 14
+#define BEASTLORD 15
+#define BERSERKER 16
+#define WARRIORGM 20
+#define CLERICGM 21
+#define PALADINGM 22
+#define RANGERGM 23
+#define SHADOWKNIGHTGM 24
+#define DRUIDGM 25
+#define MONKGM 26
+#define BARDGM 27
+#define ROGUEGM 28
+#define SHAMANGM 29
+#define NECROMANCERGM 30
+#define WIZARDGM 31
+#define MAGICIANGM 32
+#define ENCHANTERGM 33
+#define BEASTLORDGM 34
+#define BERSERKERGM 35
+#define BANKER 40
+#define MERCHANT 41
+#define DISCORD_MERCHANT 59
+#define ADVENTURE_RECRUITER 60
+#define ADVENTURE_MERCHANT 61
+#define LDON_TREASURE 62	// objects you can use /open on first seen in LDONs, seen on Danvi's Corpse in Akheva
+#define TRIBUTE_MASTER 63
+#define GUILD_TRIBUTE_MASTER 64	// not sure
+#define GUILD_BANKER 66
+#define NORRATHS_KEEPERS_MERCHANT 67
+#define DARK_REIGN_MERCHANT 68
+#define FELLOWSHIP_MASTER 69
+#define ALT_CURRENCY_MERCHANT 70
+#define MERCENARY_MASTER 71
 
-	constexpr uint8  PLAYER_CLASS_COUNT  = 16;
-	constexpr uint16 ALL_CLASSES_BITMASK = 65535;
-};
 
-static std::map<uint8, uint16> player_class_bitmasks = {
-	{Class::Warrior,      1},
-	{Class::Cleric,       2},
-	{Class::Paladin,      4},
-	{Class::Ranger,       8},
-	{Class::ShadowKnight, 16},
-	{Class::Druid,        32},
-	{Class::Monk,         64},
-	{Class::Bard,         128},
-	{Class::Rogue,        256},
-	{Class::Shaman,       512},
-	{Class::Necromancer,  1024},
-	{Class::Wizard,       2048},
-	{Class::Magician,     4096},
-	{Class::Enchanter,    8192},
-	{Class::Beastlord,    16384},
-	{Class::Berserker,    32768},
-};
+// player class values
+#define PLAYER_CLASS_UNKNOWN 0
+#define PLAYER_CLASS_WARRIOR 1
+#define PLAYER_CLASS_CLERIC 2
+#define PLAYER_CLASS_PALADIN 3
+#define PLAYER_CLASS_RANGER 4
+#define PLAYER_CLASS_SHADOWKNIGHT 5
+#define PLAYER_CLASS_DRUID 6
+#define PLAYER_CLASS_MONK 7
+#define PLAYER_CLASS_BARD 8
+#define PLAYER_CLASS_ROGUE 9
+#define PLAYER_CLASS_SHAMAN 10
+#define PLAYER_CLASS_NECROMANCER 11
+#define PLAYER_CLASS_WIZARD 12
+#define PLAYER_CLASS_MAGICIAN 13
+#define PLAYER_CLASS_ENCHANTER 14
+#define PLAYER_CLASS_BEASTLORD 15
+#define PLAYER_CLASS_BERSERKER 16
 
-static std::string shadow_knight_class_name = (
-	RuleB(World, UseOldShadowKnightClassExport) ?
-	"Shadowknight" :
-	"Shadow Knight"
-);
+#define PLAYER_CLASS_COUNT 16
 
-static std::map<uint8, std::string> class_names = {
-	{Class::Warrior,      "Warrior"},
-	{Class::Cleric,       "Cleric"},
-	{Class::Paladin,      "Paladin"},
-	{Class::Ranger,       "Ranger"},
-	{Class::ShadowKnight, shadow_knight_class_name},
-	{Class::Druid,        "Druid"},
-	{Class::Monk,         "Monk"},
-	{Class::Bard,         "Bard"},
-	{Class::Rogue,        "Rogue"},
-	{Class::Shaman,       "Shaman"},
-	{Class::Necromancer,  "Necromancer"},
-	{Class::Wizard,       "Wizard"},
-	{Class::Magician,     "Magician"},
-	{Class::Enchanter,    "Enchanter"},
-	{Class::Beastlord,    "Beastlord"},
-	{Class::Berserker,    "Berserker"},
-};
+
+// player class bits
+#define PLAYER_CLASS_UNKNOWN_BIT 0
+#define PLAYER_CLASS_WARRIOR_BIT 1
+#define PLAYER_CLASS_CLERIC_BIT 2
+#define PLAYER_CLASS_PALADIN_BIT 4
+#define PLAYER_CLASS_RANGER_BIT 8
+#define PLAYER_CLASS_SHADOWKNIGHT_BIT 16
+#define PLAYER_CLASS_DRUID_BIT 32
+#define PLAYER_CLASS_MONK_BIT 64
+#define PLAYER_CLASS_BARD_BIT 128
+#define PLAYER_CLASS_ROGUE_BIT 256
+#define PLAYER_CLASS_SHAMAN_BIT 512
+#define PLAYER_CLASS_NECROMANCER_BIT 1024
+#define PLAYER_CLASS_WIZARD_BIT 2048
+#define PLAYER_CLASS_MAGICIAN_BIT 4096
+#define PLAYER_CLASS_ENCHANTER_BIT 8192
+#define PLAYER_CLASS_BEASTLORD_BIT 16384
+#define PLAYER_CLASS_BERSERKER_BIT 32768
+
+#define PLAYER_CLASS_ALL_MASK 65535	// was 65536
 
 
 #define ARMOR_TYPE_UNKNOWN 0
@@ -133,12 +125,13 @@ static std::map<uint8, std::string> class_names = {
 
 
 const char* GetClassIDName(uint8 class_id, uint8 level = 0);
+const char* GetPlayerClassName(uint32 player_class_value, uint8 level = 0);
 
-bool IsPlayerClass(uint8 class_id);
-const std::string GetPlayerClassAbbreviation(uint8 class_id);
+uint32 GetPlayerClassValue(uint8 class_id);
+uint32 GetPlayerClassBit(uint8 class_id);
 
-uint8 GetPlayerClassValue(uint8 class_id);
-uint16 GetPlayerClassBit(uint8 class_id);
+uint8 GetClassIDFromPlayerClassValue(uint32 player_class_value);
+uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit);
 
 bool IsFighterClass(uint8 class_id);
 bool IsSpellFighterClass(uint8 class_id);
@@ -147,8 +140,7 @@ bool IsHybridClass(uint8 class_id);
 bool IsCasterClass(uint8 class_id);
 bool IsINTCasterClass(uint8 class_id);
 bool IsWISCasterClass(uint8 class_id);
-bool IsHeroicINTCasterClass(uint8 class_id);
-bool IsHeroicWISCasterClass(uint8 class_id);
+
 bool IsPlateClass(uint8 class_id);
 bool IsChainClass(uint8 class_id);
 bool IsLeatherClass(uint8 class_id);

common/cli/eqemu_command_handler.cpp

@@ -39,15 +39,15 @@ namespace EQEmuCommand {
 	{
 		if (cmd[{"-d", "--debug"}]) {
 			std::cout << "Positional args:\n";
-			for (auto &pos_arg: cmd.pos_args())
+			for (auto &pos_arg : cmd.pos_args())
 				std::cout << '\t' << pos_arg << std::endl;
 
 			std::cout << "\nFlags:\n";
-			for (auto &flag: cmd.flags())
+			for (auto &flag : cmd.flags())
 				std::cout << '\t' << flag << std::endl;
 
 			std::cout << "\nParameters:\n";
-			for (auto &param: cmd.params())
+			for (auto &param : cmd.params())
 				std::cout << '\t' << param.first << " : " << param.second << std::endl;
 		}
 	}
@@ -69,22 +69,22 @@ namespace EQEmuCommand {
 	{
 		bool arguments_filled = true;
 
-		int       index = 2;
-		for (auto &arg: arguments) {
+		int index = 2;
+		for (auto &arg : arguments) {
 			if (cmd(arg).str().empty() && cmd(index).str().empty()) {
 				arguments_filled = false;
 			}
 			index++;
 		}
 
-		if (!arguments_filled || (argc == 2 && !cmd[{"-h", "--help"}]) || (argc == 3 && cmd[{"-h", "--help"}])) {
+		if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
 			std::string arguments_string;
-			for (auto   &arg: arguments) {
+			for (auto &arg : arguments) {
 				arguments_string += " " + arg;
 			}
 
 			std::string options_string;
-			for (auto   &opt: options) {
+			for (auto   &opt : options) {
 				options_string += "  " + opt + "\n";
 			}
 
@@ -124,6 +124,14 @@ namespace EQEmuCommand {
 	)
 	{
 		std::string description;
+		bool        ran_command = false;
+		for (auto   &it: in_function_map) {
+			if (it.first == argv[1]) {
+				(it.second)(argc, argv, cmd, description);
+				ran_command = true;
+			}
+		}
+
 		if (cmd[{"-h", "--help"}]) {
 			std::cout << std::endl;
 			std::cout <<
@@ -134,7 +142,9 @@ namespace EQEmuCommand {
 					  << std::endl
 					  << std::endl;
 
-			// Get max command length for padding length
+			/**
+			 * Get max command length for padding length
+			 */
 			int max_command_length = 0;
 
 			for (auto &it: in_function_map) {
@@ -145,14 +155,18 @@ namespace EQEmuCommand {
 				}
 			}
 
-			// Display command menu
+			/**
+			 * Display command menu
+			 */
 			std::string command_section;
 			for (auto   &it: in_function_map) {
-				description.clear();
+				description = "";
 
 				(it.second)(argc, argv, cmd, description);
 
-				// Print section header
+				/**
+				 * Print section header
+				 */
 				std::string command_prefix = it.first.substr(0, it.first.find(":"));
 
 				if (command_prefix.find("test") != std::string::npos) {
@@ -164,7 +178,9 @@ namespace EQEmuCommand {
 					std::cout << termcolor::reset << command_prefix << std::endl;
 				}
 
-				// Print commands
+				/**
+				 * Print commands
+				 */
 				std::stringstream command;
 				command << termcolor::colorize << termcolor::yellow << it.first << termcolor::reset;
 				printf("  %-*s %s\n", max_command_length, command.str().c_str(), description.c_str());
@@ -175,15 +191,6 @@ namespace EQEmuCommand {
 			std::exit(0);
 		}
 
-		bool ran_command = false;
-
-		for (auto &it: in_function_map) {
-			if (it.first == argv[1]) {
-				(it.second)(argc, argv, cmd, description);
-				ran_command = true;
-			}
-		}
-
 		if (ran_command) {
 			std::exit(0);
 		}

common/content/world_content_service.cpp

@@ -22,6 +22,7 @@
 #include "../database.h"
 #include "../rulesys.h"
 #include "../eqemu_logsys.h"
+#include "../loottable.h"
 #include "../repositories/content_flags_repository.h"
 
 
@@ -119,7 +120,7 @@ std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
 /**
  * @param content_flags
  */
-void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags)
+void WorldContentService::SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }

common/content/world_content_service.h

@@ -23,17 +23,11 @@
 
 #include <string>
 #include <vector>
+#include "../loottable.h"
 #include "../repositories/content_flags_repository.h"
 
 class Database;
 
-struct ContentFlags {
-	int16       min_expansion;
-	int16       max_expansion;
-	std::string content_flags;
-	std::string content_flags_disabled;
-};
-
 namespace Expansion {
 	static const int EXPANSION_ALL        = -1;
 	static const int EXPANSION_FILTER_MAX = 99;
@@ -173,7 +167,7 @@ public:
 	std::vector<std::string> GetContentFlagsDisabled();
 	bool IsContentFlagEnabled(const std::string& content_flag);
 	bool IsContentFlagDisabled(const std::string& content_flag);
-	void SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags);
+	void SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags);
 	void ReloadContentFlags();
 	WorldContentService * SetExpansionContext();
 

common/crash.cpp

@@ -23,7 +23,7 @@ void SendCrashReport(const std::string &crash_report)
 {
 	// can configure multiple endpoints if need be
 	std::vector<std::string> endpoints = {
-		"https://spire.akkadius.com/api/v1/analytics/server-crash-report",
+		"http://spire.akkadius.com/api/v1/analytics/server-crash-report",
 //		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
 	};
 
@@ -41,6 +41,9 @@ void SendCrashReport(const std::string &crash_report)
 		r.set_connection_timeout(1, 0);
 		r.set_read_timeout(1, 0);
 		r.set_write_timeout(1, 0);
+		httplib::Headers headers = {
+			{"Content-Type", "application/json"}
+		};
 
 		// os info
 		auto os         = EQ::GetOS();
@@ -122,7 +125,7 @@ public:
 		StackWalker::OnOutput(szText);
 	}
 
-	const std::vector<std::string>& GetLines() { return _lines; }
+	const std::vector<std::string>& const GetLines() { return _lines; }
 private:
 	std::vector<std::string> _lines;
 };

common/database.cpp

@@ -29,8 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/repositories/account_repository.h"
-
 // Disgrace: for windows compile
 #ifdef _WINDOWS
 #include <windows.h>
@@ -54,7 +52,6 @@
 
 #include "repositories/zone_repository.h"
 #include "zone_store.h"
-#include "repositories/merchantlist_temp_repository.h"
 
 extern Client client;
 
@@ -356,7 +353,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 
 	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name);
 	results = QueryDatabase(query);
-	if (!results.Success() || !results.ErrorMessage().empty()){ return false; }
+	if (!results.Success() || results.ErrorMessage() != ""){ return false; }
 
 	// Put character into the default guild if rule is being used.
 	int guild_id = RuleI(Character, DefaultGuild);
@@ -366,7 +363,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 		if (character_id > -1) {
 			query = StringFormat("INSERT INTO `guild_members` SET `char_id` = %i, `guild_id` = '%i'", character_id, guild_id);
 			results = QueryDatabase(query);
-			if (!results.Success() || !results.ErrorMessage().empty()){
+			if (!results.Success() || results.ErrorMessage() != ""){
 				LogInfo("Could not put character [{}] into default Guild", name);
 			}
 		}
@@ -390,7 +387,7 @@ bool Database::DeleteCharacter(char *character_name)
 	std::string query   = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", character_name);
 	auto        results = QueryDatabase(query);
 	for (auto   row     = results.begin(); row != results.end(); ++row) {
-		character_id = Strings::ToUnsignedInt(row[0]);
+		character_id = Strings::ToInt(row[0]);
 	}
 
 	if (character_id <= 0) {
@@ -452,8 +449,7 @@ bool Database::DeleteCharacter(char *character_name)
 	return true;
 }
 
-bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp)
-{
+bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp){
 	std::string query = StringFormat(
 		"REPLACE INTO `character_data` ("
 		"id,"
@@ -638,102 +634,101 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		"%u,"  // guild_auto_consent
 		"%u"  // RestTimer
 		")",
-		character_id,                      // " id,                        "
-		account_id,                          // " account_id,                "
-		Strings::Escape(pp->name).c_str(),      // " `name`,                    "
+		character_id,					  // " id,                        "
+		account_id,						  // " account_id,                "
+		Strings::Escape(pp->name).c_str(),	  // " `name`,                    "
 		Strings::Escape(pp->last_name).c_str(), // " last_name,              "
-		pp->gender,                          // " gender,                    "
-		pp->race,                          // " race,                      "
-		pp->class_,                          // " class,                     "
-		pp->level,                          // " `level`,                   "
-		pp->deity,                          // " deity,                     "
-		pp->birthday,                      // " birthday,                  "
-		pp->lastlogin,                      // " last_login,                "
-		pp->timePlayedMin,                  // " time_played,               "
-		pp->pvp,                          // " pvp_status,                "
-		pp->level2,                          // " level2,                    "
-		pp->anon,                          // " anon,                      "
-		pp->gm,                              // " gm,                        "
-		pp->intoxication,                  // " intoxication,              "
-		pp->haircolor,                      // " hair_color,                "
-		pp->beardcolor,                      // " beard_color,               "
-		pp->eyecolor1,                      // " eye_color_1,               "
-		pp->eyecolor2,                      // " eye_color_2,               "
-		pp->hairstyle,                      // " hair_style,                "
-		pp->beard,                          // " beard,                     "
-		pp->ability_time_seconds,          // " ability_time_seconds,      "
-		pp->ability_number,                  // " ability_number,            "
-		pp->ability_time_minutes,          // " ability_time_minutes,      "
-		pp->ability_time_hours,              // " ability_time_hours,        "
+		pp->gender,						  // " gender,                    "
+		pp->race,						  // " race,                      "
+		pp->class_,						  // " class,                     "
+		pp->level,						  // " `level`,                   "
+		pp->deity,						  // " deity,                     "
+		pp->birthday,					  // " birthday,                  "
+		pp->lastlogin,					  // " last_login,                "
+		pp->timePlayedMin,				  // " time_played,               "
+		pp->pvp,						  // " pvp_status,                "
+		pp->level2,						  // " level2,                    "
+		pp->anon,						  // " anon,                      "
+		pp->gm,							  // " gm,                        "
+		pp->intoxication,				  // " intoxication,              "
+		pp->haircolor,					  // " hair_color,                "
+		pp->beardcolor,					  // " beard_color,               "
+		pp->eyecolor1,					  // " eye_color_1,               "
+		pp->eyecolor2,					  // " eye_color_2,               "
+		pp->hairstyle,					  // " hair_style,                "
+		pp->beard,						  // " beard,                     "
+		pp->ability_time_seconds,		  // " ability_time_seconds,      "
+		pp->ability_number,				  // " ability_number,            "
+		pp->ability_time_minutes,		  // " ability_time_minutes,      "
+		pp->ability_time_hours,			  // " ability_time_hours,        "
 		Strings::Escape(pp->title).c_str(),  // " title,                     "
 		Strings::Escape(pp->suffix).c_str(), // " suffix,                    "
-		pp->exp,                          // " exp,                       "
-		pp->points,                          // " points,                    "
-		pp->mana,                          // " mana,                      "
-		pp->cur_hp,                          // " cur_hp,                    "
-		pp->STR,                          // " str,                       "
-		pp->STA,                          // " sta,                       "
-		pp->CHA,                          // " cha,                       "
-		pp->DEX,                          // " dex,                       "
-		pp->INT,                          // " `int`,                     "
-		pp->AGI,                          // " agi,                       "
-		pp->WIS,                          // " wis,                       "
-		pp->face,                          // " face,                      "
-		pp->y,                              // " y,                         "
-		pp->x,                              // " x,                         "
-		pp->z,                              // " z,                         "
-		pp->heading,                      // " heading,                   "
-		pp->pvp2,                          // " pvp2,                      "
-		pp->pvptype,                      // " pvp_type,                  "
-		pp->autosplit,                      // " autosplit_enabled,         "
-		pp->zone_change_count,              // " zone_change_count,         "
-		pp->drakkin_heritage,              // " drakkin_heritage,          "
-		pp->drakkin_tattoo,                  // " drakkin_tattoo,            "
-		pp->drakkin_details,              // " drakkin_details,           "
-		pp->toxicity,                      // " toxicity,                  "
-		pp->hunger_level,                  // " hunger_level,              "
-		pp->thirst_level,                  // " thirst_level,              "
-		pp->ability_up,                      // " ability_up,                "
-		pp->zone_id,                      // " zone_id,                   "
-		pp->zoneInstance,                  // " zone_instance,             "
-		pp->leadAAActive,                  // " leadership_exp_on,         "
-		pp->ldon_points_guk,              // " ldon_points_guk,           "
-		pp->ldon_points_mir,              // " ldon_points_mir,           "
-		pp->ldon_points_mmc,              // " ldon_points_mmc,           "
-		pp->ldon_points_ruj,              // " ldon_points_ruj,           "
-		pp->ldon_points_tak,              // " ldon_points_tak,           "
-		pp->ldon_points_available,          // " ldon_points_available,     "
-		pp->tribute_time_remaining,          // " tribute_time_remaining,    "
-		pp->showhelm,                      // " show_helm,                 "
-		pp->career_tribute_points,          // " career_tribute_points,     "
-		pp->tribute_points,                  // " tribute_points,            "
-		pp->tribute_active,                  // " tribute_active,            "
-		pp->endurance,                      // " endurance,                 "
-		pp->group_leadership_exp,          // " group_leadership_exp,      "
-		pp->raid_leadership_exp,          // " raid_leadership_exp,       "
-		pp->group_leadership_points,      // " group_leadership_points,   "
-		pp->raid_leadership_points,          // " raid_leadership_points,    "
-		pp->air_remaining,                  // " air_remaining,             "
-		pp->PVPKills,                      // " pvp_kills,                 "
-		pp->PVPDeaths,                      // " pvp_deaths,                "
-		pp->PVPCurrentPoints,              // " pvp_current_points,        "
-		pp->PVPCareerPoints,              // " pvp_career_points,         "
-		pp->PVPBestKillStreak,              // " pvp_best_kill_streak,      "
-		pp->PVPWorstDeathStreak,          // " pvp_worst_death_streak,    "
-		pp->PVPCurrentKillStreak,          // " pvp_current_kill_streak,   "
-		pp->aapoints_spent,                  // " aa_points_spent,           "
-		pp->expAA,                          // " aa_exp,                    "
-		pp->aapoints,                      // " aa_points,                 "
-		pp->groupAutoconsent,              // " group_auto_consent,        "
-		pp->raidAutoconsent,              // " raid_auto_consent,         "
-		pp->guildAutoconsent,              // " guild_auto_consent,        "
-		pp->RestTimer                      // " RestTimer)                 "
+		pp->exp,						  // " exp,                       "
+		pp->points,						  // " points,                    "
+		pp->mana,						  // " mana,                      "
+		pp->cur_hp,						  // " cur_hp,                    "
+		pp->STR,						  // " str,                       "
+		pp->STA,						  // " sta,                       "
+		pp->CHA,						  // " cha,                       "
+		pp->DEX,						  // " dex,                       "
+		pp->INT,						  // " `int`,                     "
+		pp->AGI,						  // " agi,                       "
+		pp->WIS,						  // " wis,                       "
+		pp->face,						  // " face,                      "
+		pp->y,							  // " y,                         "
+		pp->x,							  // " x,                         "
+		pp->z,							  // " z,                         "
+		pp->heading,					  // " heading,                   "
+		pp->pvp2,						  // " pvp2,                      "
+		pp->pvptype,					  // " pvp_type,                  "
+		pp->autosplit,					  // " autosplit_enabled,         "
+		pp->zone_change_count,			  // " zone_change_count,         "
+		pp->drakkin_heritage,			  // " drakkin_heritage,          "
+		pp->drakkin_tattoo,				  // " drakkin_tattoo,            "
+		pp->drakkin_details,			  // " drakkin_details,           "
+		pp->toxicity,					  // " toxicity,                  "
+		pp->hunger_level,				  // " hunger_level,              "
+		pp->thirst_level,				  // " thirst_level,              "
+		pp->ability_up,					  // " ability_up,                "
+		pp->zone_id,					  // " zone_id,                   "
+		pp->zoneInstance,				  // " zone_instance,             "
+		pp->leadAAActive,				  // " leadership_exp_on,         "
+		pp->ldon_points_guk,			  // " ldon_points_guk,           "
+		pp->ldon_points_mir,			  // " ldon_points_mir,           "
+		pp->ldon_points_mmc,			  // " ldon_points_mmc,           "
+		pp->ldon_points_ruj,			  // " ldon_points_ruj,           "
+		pp->ldon_points_tak,			  // " ldon_points_tak,           "
+		pp->ldon_points_available,		  // " ldon_points_available,     "
+		pp->tribute_time_remaining,		  // " tribute_time_remaining,    "
+		pp->showhelm,					  // " show_helm,                 "
+		pp->career_tribute_points,		  // " career_tribute_points,     "
+		pp->tribute_points,				  // " tribute_points,            "
+		pp->tribute_active,				  // " tribute_active,            "
+		pp->endurance,					  // " endurance,                 "
+		pp->group_leadership_exp,		  // " group_leadership_exp,      "
+		pp->raid_leadership_exp,		  // " raid_leadership_exp,       "
+		pp->group_leadership_points,	  // " group_leadership_points,   "
+		pp->raid_leadership_points,		  // " raid_leadership_points,    "
+		pp->air_remaining,				  // " air_remaining,             "
+		pp->PVPKills,					  // " pvp_kills,                 "
+		pp->PVPDeaths,					  // " pvp_deaths,                "
+		pp->PVPCurrentPoints,			  // " pvp_current_points,        "
+		pp->PVPCareerPoints,			  // " pvp_career_points,         "
+		pp->PVPBestKillStreak,			  // " pvp_best_kill_streak,      "
+		pp->PVPWorstDeathStreak,		  // " pvp_worst_death_streak,    "
+		pp->PVPCurrentKillStreak,		  // " pvp_current_kill_streak,   "
+		pp->aapoints_spent,				  // " aa_points_spent,           "
+		pp->expAA,						  // " aa_exp,                    "
+		pp->aapoints,					  // " aa_points,                 "
+		pp->groupAutoconsent,			  // " group_auto_consent,        "
+		pp->raidAutoconsent,			  // " raid_auto_consent,         "
+		pp->guildAutoconsent,			  // " guild_auto_consent,        "
+		pp->RestTimer					  // " RestTimer)                 "
 	);
-	QueryDatabase(query);
+	auto results = QueryDatabase(query);
 
 	/* Save Bind Points */
-	query = StringFormat(
-		"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
@@ -744,73 +739,57 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		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
-	);
-	QueryDatabase(query);
+	); 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
-		);
-		QueryDatabase(query);
-	}
+        /* HoTT Ability */
+        if(RuleB(Character, GrantHoTTOnCreate))
+        {
+                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)", character_id, 14, 1);
+                results = QueryDatabase(query);
+        }
 
 	/* Save Skills */
-	int      firstquery = 0;
-	for (int i          = 0; i < MAX_PP_SKILL; i++) {
-		if (pp->skills[i] > 0) {
-			if (firstquery != 1) {
+	int firstquery = 0;
+	for (int i = 0; i < MAX_PP_SKILL; i++){
+		if (pp->skills[i] > 0){
+			if (firstquery != 1){
 				firstquery = 1;
-				query      = StringFormat(
-					"REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)",
-					character_id,
-					i,
-					pp->skills[i]
-				);
-			} else {
+				query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, i, pp->skills[i]);
+			}
+			else{
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->skills[i]);
 			}
 		}
 	}
-	QueryDatabase(query);
+	results = QueryDatabase(query);
 
 	/* Save Language */
 	firstquery = 0;
-	for (int i = 0; i < MAX_PP_LANGUAGE; i++) {
-		if (pp->languages[i] > 0) {
-			if (firstquery != 1) {
+	for (int i = 0; i < MAX_PP_LANGUAGE; i++){
+		if (pp->languages[i] > 0){
+			if (firstquery != 1){
 				firstquery = 1;
-				query      = StringFormat(
-					"REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)",
-					character_id,
-					i,
-					pp->languages[i]
-				);
-			} else {
+				query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, i, pp->languages[i]);
+			}
+			else{
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->languages[i]);
 			}
 		}
 	}
-	QueryDatabase(query);
+	results = QueryDatabase(query);
 
 	return true;
 }
 
 uint32 Database::GetCharacterID(const char *name) {
-	const auto query = fmt::format(
-		"SELECT `id` FROM `character_data` WHERE `name` = '{}'",
-		Strings::Escape(name)
-	);
+	std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name` = '%s'", name);
 	auto results = QueryDatabase(query);
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
-	}
-
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	if (results.RowCount() == 1)
+	{
+		return Strings::ToInt(row[0]);
+	}
+	return 0;
 }
 
 /*
@@ -833,10 +812,10 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
 
 	auto row = results.begin();
 
-	uint32 accountId = Strings::ToUnsignedInt(row[0]);
+	uint32 accountId = Strings::ToInt(row[0]);
 
 	if (oCharID)
-		*oCharID = Strings::ToUnsignedInt(row[1]);
+		*oCharID = Strings::ToInt(row[1]);
 
 	return accountId;
 }
@@ -853,7 +832,7 @@ uint32 Database::GetAccountIDByChar(uint32 char_id) {
 		return 0;
 
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 uint32 Database::GetAccountIDByName(std::string account_name, std::string loginserver, int16* status, uint32* lsid) {
@@ -901,7 +880,7 @@ void Database::GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID
 
 	strcpy(name, row[0]);
 	if (row[1] && oLSAccountID) {
-		*oLSAccountID = Strings::ToUnsignedInt(row[1]);
+		*oLSAccountID = Strings::ToInt(row[1]);
 	}
 
 }
@@ -989,7 +968,7 @@ bool Database::LoadVariables() {
 
 	std::string key, value;
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		varcache.last_update = Strings::ToUnsignedInt(row[2]); // ahh should we be comparing if this is newer?
+		varcache.last_update = Strings::ToInt(row[2]); // ahh should we be comparing if this is newer?
 		key = row[0];
 		value = row[1];
 		std::transform(std::begin(key), std::end(key), std::begin(key), ::tolower); // keys are lower case, DB doesn't have to be
@@ -1020,7 +999,7 @@ bool Database::GetVariable(std::string varname, std::string &varvalue)
 	return false;
 }
 
-bool Database::SetVariable(const std::string& varname, const std::string &varvalue)
+bool Database::SetVariable(const std::string varname, const std::string &varvalue)
 {
 	std::string escaped_name = Strings::Escape(varname);
 	std::string escaped_value = Strings::Escape(varvalue);
@@ -1073,7 +1052,7 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
 	auto row = results.begin();
 
 	if(graveyard_zoneid != nullptr)
-		*graveyard_zoneid = Strings::ToUnsignedInt(row[0]);
+		*graveyard_zoneid = Strings::ToInt(row[0]);
 	if(graveyard_x != nullptr)
 		*graveyard_x = Strings::ToFloat(row[1]);
 	if(graveyard_y != nullptr)
@@ -1189,7 +1168,7 @@ uint32 Database::GetAccountIDFromLSID(
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		account_id = Strings::ToUnsignedInt(row[0]);
+		account_id = Strings::ToInt(row[0]);
 
 		if (in_account_name) {
 			strcpy(in_account_name, row[1]);
@@ -1222,9 +1201,8 @@ void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) {
 		*oStatus = Strings::ToInt(row[1]);
 }
 
-void Database::ClearMerchantTemp()
-{
-	MerchantlistTempRepository::ClearTemporaryMerchantLists(*this);
+void Database::ClearMerchantTemp(){
+	QueryDatabase("DELETE FROM merchantlist_temp");
 }
 
 bool Database::UpdateName(const char* oldname, const char* newname) {
@@ -1266,7 +1244,7 @@ uint8 Database::GetServerType() {
 		return 0;
 
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 bool Database::MoveCharacterToZone(uint32 character_id, uint32 zone_id)
@@ -1318,7 +1296,7 @@ uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 		return 0;
 
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 in_level)
@@ -1334,12 +1312,12 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16
 	if (results.Success() && results.RowsAffected() != 0)
 	{
 		auto row = results.begin();
-		skill_level = Strings::ToUnsignedInt(row[0]);
-		skill_formula = Strings::ToUnsignedInt(row[1]);
-		skill_cap = Strings::ToUnsignedInt(row[2]);
-		if (Strings::ToUnsignedInt(row[3]) > skill_cap)
-			skill_cap2 = (Strings::ToUnsignedInt(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
-		skill_cap3 = Strings::ToUnsignedInt(row[4]);
+		skill_level = Strings::ToInt(row[0]);
+		skill_formula = Strings::ToInt(row[1]);
+		skill_cap = Strings::ToInt(row[2]);
+		if (Strings::ToInt(row[3]) > skill_cap)
+			skill_cap2 = (Strings::ToInt(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
+		skill_cap3 = Strings::ToInt(row[4]);
 	}
 
 	int race_skill = GetRaceSkill(skillid,in_race);
@@ -1510,7 +1488,7 @@ uint32 Database::GetGroupID(const char* name){
 
 	auto row = results.begin();
 
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 std::string Database::GetGroupLeaderForLogin(std::string character_name) {
@@ -1647,20 +1625,25 @@ void Database::ClearGroupLeader(uint32 gid) {
 		std::cout << "Unable to clear group leader: " << results.ErrorMessage() << std::endl;
 }
 
-uint8 Database::GetAgreementFlag(uint32 account_id)
-{
-	const auto& e = AccountRepository::FindOne(*this, account_id);
-	if (!e.id) {
-		return 0;
-	}
+uint8 Database::GetAgreementFlag(uint32 acctid) {
 
-	return e.rulesflag;
+	std::string query = StringFormat("SELECT rulesflag FROM account WHERE id=%i",acctid);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return 0;
+
+	if (results.RowCount() != 1)
+		return 0;
+
+	auto row = results.begin();
+
+	return Strings::ToInt(row[0]);
 }
 
-void Database::SetAgreementFlag(uint32 account_id) {
-	auto e = AccountRepository::FindOne(*this, account_id);
-	e.rulesflag = 1;
-	AccountRepository::UpdateOne(*this, e);
+void Database::SetAgreementFlag(uint32 acctid) {
+	std::string query = StringFormat("UPDATE account SET rulesflag=1 where id=%i", acctid);
+	QueryDatabase(query);
 }
 
 void Database::ClearRaid(uint32 rid) {
@@ -1741,7 +1724,7 @@ uint32 Database::GetRaidID(const char* name)
 	}
 
 	if (row[0]) // would it ever be possible to have a null here?
-		return Strings::ToUnsignedInt(row[0]);
+		return Strings::ToInt(row[0]);
 
 	return 0;
 }
@@ -1997,16 +1980,16 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)
 
 	auto row = results.begin();
 
-	as->success.guk = Strings::ToUnsignedInt(row[0]);
-	as->success.mir = Strings::ToUnsignedInt(row[1]);
-	as->success.mmc = Strings::ToUnsignedInt(row[2]);
-	as->success.ruj = Strings::ToUnsignedInt(row[3]);
-	as->success.tak = Strings::ToUnsignedInt(row[4]);
-	as->failure.guk = Strings::ToUnsignedInt(row[5]);
-	as->failure.mir = Strings::ToUnsignedInt(row[6]);
-	as->failure.mmc = Strings::ToUnsignedInt(row[7]);
-	as->failure.ruj = Strings::ToUnsignedInt(row[8]);
-	as->failure.tak = Strings::ToUnsignedInt(row[9]);
+	as->success.guk = Strings::ToInt(row[0]);
+	as->success.mir = Strings::ToInt(row[1]);
+	as->success.mmc = Strings::ToInt(row[2]);
+	as->success.ruj = Strings::ToInt(row[3]);
+	as->success.tak = Strings::ToInt(row[4]);
+	as->failure.guk = Strings::ToInt(row[5]);
+	as->failure.mir = Strings::ToInt(row[6]);
+	as->failure.mmc = Strings::ToInt(row[7]);
+	as->failure.ruj = Strings::ToInt(row[8]);
+	as->failure.tak = Strings::ToInt(row[9]);
 	as->failure.total = as->failure.guk + as->failure.mir + as->failure.mmc + as->failure.ruj + as->failure.tak;
 	as->success.total = as->success.guk + as->success.mir + as->success.mmc + as->success.ruj + as->success.tak;
 
@@ -2025,7 +2008,7 @@ uint32 Database::GetGuildIDByCharID(uint32 character_id)
 		return 0;
 
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 uint32 Database::GetGroupIDByCharID(uint32 character_id)
@@ -2047,7 +2030,7 @@ uint32 Database::GetGroupIDByCharID(uint32 character_id)
 		return 0;
 
 	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 uint32 Database::GetRaidIDByCharID(uint32 character_id) {
@@ -2060,12 +2043,10 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
 		character_id
 	);
 	auto results = QueryDatabase(query);
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		return Strings::ToInt(row[0]);
 	}
-
-	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return 0;
 }
 
 int Database::CountInvSnapshots() {
@@ -2096,45 +2077,37 @@ void Database::ClearInvSnapshots(bool from_now) {
 
 struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 {
-	TimeOfDay_Struct t{};
-	std::string      query = StringFormat("SELECT minute,hour,day,month,year,realtime FROM eqtime limit 1");
+
+	TimeOfDay_Struct eqTime;
+	std::string query = StringFormat("SELECT minute,hour,day,month,year,realtime FROM eqtime limit 1");
 	auto results = QueryDatabase(query);
 
-	if (!results.Success() || results.RowCount() == 0) {
+	if (!results.Success() || results.RowCount() == 0){
 		LogInfo("Loading EQ time of day failed. Using defaults");
-		t.minute = 0;
-		t.hour   = 9;
-		t.day    = 1;
-		t.month  = 1;
-		t.year   = 3100;
-		realtime = time(nullptr);
-		return t;
+		eqTime.minute = 0;
+		eqTime.hour = 9;
+		eqTime.day = 1;
+		eqTime.month = 1;
+		eqTime.year = 3100;
+		realtime = time(0);
+	}
+	else{
+		auto row = results.begin();
+
+		eqTime.minute = Strings::ToInt(row[0]);
+		eqTime.hour = Strings::ToInt(row[1]);
+		eqTime.day = Strings::ToInt(row[2]);
+		eqTime.month = Strings::ToInt(row[3]);
+		eqTime.year = Strings::ToInt(row[4]);
+		realtime = Strings::ToInt(row[5]);
 	}
 
-	auto row = results.begin();
-
-	uint8  hour      = Strings::ToUnsignedInt(row[1]);
-	time_t realtime_ = Strings::ToBigInt(row[5]);
-	if (RuleI(World, BootHour) > 0 && RuleI(World, BootHour) <= 24) {
-		hour      = RuleI(World, BootHour);
-		realtime_ = time(nullptr);
-	}
-
-	t.minute = Strings::ToUnsignedInt(row[0]);
-	t.hour   = hour;
-	t.day    = Strings::ToUnsignedInt(row[2]);
-	t.month  = Strings::ToUnsignedInt(row[3]);
-	t.year   = Strings::ToUnsignedInt(row[4]);
-	realtime = realtime_;
-
-	LogEqTime("Setting hour to [{}]", hour);
-
-	return t;
+	return eqTime;
 }
 
 bool Database::SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year)
 {
-	std::string query = StringFormat("UPDATE eqtime set minute = %d, hour = %d, day = %d, month = %d, year = %d, realtime = %d limit 1", minute, hour, day, month, year, time(nullptr));
+	std::string query = StringFormat("UPDATE eqtime set minute = %d, hour = %d, day = %d, month = %d, year = %d, realtime = %d limit 1", minute, hour, day, month, year, time(0));
 	auto results = QueryDatabase(query);
 
 	return results.Success();
@@ -2248,11 +2221,6 @@ bool Database::CopyCharacter(
 	row     = results.begin();
 	std::string new_character_id = row[0];
 
-	std::vector<std::string> tables_to_zero_id = {
-		"keyring",
-		"data_buckets",
-	};
-
 	TransactionBegin();
 	for (const auto &iter : DatabaseSchema::GetCharacterTables()) {
 		std::string table_name               = iter.first;
@@ -2286,10 +2254,6 @@ bool Database::CopyCharacter(
 				std::string column = columns[column_index];
 				std::string value  = row[column_index] ? row[column_index] : "null";
 
-				if (column == "id" && Strings::Contains(tables_to_zero_id, table_name)) {
-					value = "0";
-				}
-
 				if (column == character_id_column_name) {
 					value = new_character_id;
 				}
@@ -2308,6 +2272,7 @@ bool Database::CopyCharacter(
 			new_rows.emplace_back(new_values);
 		}
 
+		std::string              insert_values;
 		std::vector<std::string> insert_rows;
 
 		for (auto &r: new_rows) {
@@ -2337,6 +2302,7 @@ bool Database::CopyCharacter(
 			if (!insert.ErrorMessage().empty()) {
 				TransactionRollback();
 				return false;
+				break;
 			}
 		}
 	}
@@ -2362,7 +2328,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 		);
 
 		if (!DoesTableExist(table_name)) {
-			LogMySQLQuery("Table [{}] does not exist. Downloading and installing...", table_name);
+			LogMySQLQuery("Table [{}] does not exist. Downloading from Github and installing...", table_name);
 
 			// http get request
 			httplib::Client cli(
@@ -2370,7 +2336,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 					"{}://{}",
 					request_uri.get_scheme(),
 					request_uri.get_host()
-				)
+				).c_str()
 			);
 
 			cli.set_connection_timeout(0, 60000000); // 60 sec
@@ -2379,7 +2345,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 
 			int sourced_queries = 0;
 
-			if (auto res = cli.Get(request_uri.get_path())) {
+			if (auto res = cli.Get(request_uri.get_path().c_str())) {
 				if (res->status == 200) {
 					for (auto &s: Strings::Split(res->body, ';')) {
 						if (!Strings::Trim(s).empty()) {
@@ -2423,55 +2389,3 @@ uint8 Database::GetMinStatus(uint32 zone_id, uint32 instance_version)
 
 	return !zones.empty() ? zones[0].min_status : 0;
 }
-
-void Database::SourceSqlFromUrl(std::string url)
-{
-	try {
-		uri request_uri(url);
-
-		LogHTTPDetail(
-			"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()
-		);
-
-		LogInfo("Downloading and installing from [{}]", url);
-
-		// http get request
-		httplib::Client cli(
-			fmt::format(
-				"{}://{}",
-				request_uri.get_scheme(),
-				request_uri.get_host()
-			)
-		);
-
-		cli.set_connection_timeout(0, 60000000); // 60 sec
-		cli.set_read_timeout(60, 0); // 60 seconds
-		cli.set_write_timeout(60, 0); // 60 seconds
-
-		if (auto res = cli.Get(request_uri.get_path())) {
-			if (res->status == 200) {
-				auto results = QueryDatabaseMulti(res->body);
-				if (!results.ErrorMessage().empty()) {
-					LogError("Error sourcing SQL [{}]", results.ErrorMessage());
-					return;
-				}
-			}
-			if (res->status == 404) {
-				LogError("Error retrieving URL [{}]", url);
-			}
-		}
-		else {
-			LogError("Error retrieving URL [{}]", url);
-		}
-
-	}
-	catch (std::invalid_argument iae) {
-		LogError("URI parser error [{}]", iae.what());
-	}
-}

common/database.h

@@ -166,7 +166,6 @@ public:
 	void GetCharactersInInstance(uint16 instance_id, std::list<uint32> &character_ids);
 	void PurgeExpiredInstances();
 	void SetInstanceDuration(uint16 instance_id, uint32 new_duration);
-	void CleanupInstanceCorpses();
 
 	/* Adventure related. */
 
@@ -189,10 +188,10 @@ public:
 	uint32	CheckLogin(const char* name, const char* password, const char *loginserver, int16* oStatus = 0);
 	uint32	CreateAccount(const char* name, const char* password, int16 status, const char* loginserver, uint32 lsaccount_id);
 	uint32	GetAccountIDFromLSID(const std::string& in_loginserver_id, uint32 in_loginserver_account_id, char* in_account_name = 0, int16* in_status = 0);
-	uint8	GetAgreementFlag(uint32 account_id);
+	uint8	GetAgreementFlag(uint32 acctid);
 
 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
-	void	SetAgreementFlag(uint32 account_id);
+	void	SetAgreementFlag(uint32 acctid);
 
 	int  GetIPExemption(std::string account_ip);
 	void SetIPExemption(std::string account_ip, int exemption_amount);
@@ -227,11 +226,16 @@ public:
 
 	void    PurgeAllDeletedDataBuckets();
 
+	/* Database Conversions 'database_conversions.cpp' */
+
+	bool	CheckDatabaseConversions();
+	bool	CheckDatabaseConvertCorpseDeblob();
+	bool	CheckDatabaseConvertPPDeblob();
 
 	/* Database Variables */
 
 	bool	GetVariable(std::string varname, std::string &varvalue);
-	bool	SetVariable(const std::string& varname, const std::string &varvalue);
+	bool	SetVariable(const std::string varname, const std::string &varvalue);
 	bool	LoadVariables();
 
 	/* General Queries */
@@ -259,7 +263,7 @@ public:
 	void	ClearInvSnapshots(bool from_now = false);
 
 	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
-	void SourceSqlFromUrl(std::string url);
+
 
 private:
 

common/database/database_dump_service.cpp

@@ -28,7 +28,6 @@
 #include "../database_schema.h"
 #include "../file.h"
 #include "../process/process.h"
-#include "../termcolor/rang.hpp"
 
 #include <ctime>
 
@@ -37,7 +36,6 @@
 #else
 
 #include <sys/time.h>
-#include <thread>
 
 #endif
 
@@ -93,8 +91,6 @@ std::string DatabaseDumpService::GetMySQLVersion()
 	return Strings::Trim(version_output);
 }
 
-const std::string CREDENTIALS_FILE = "login.my.cnf";
-
 /**
  * @return
  */
@@ -103,15 +99,21 @@ std::string DatabaseDumpService::GetBaseMySQLDumpCommand()
 	auto config = EQEmuConfig::get();
 	if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
 		return fmt::format(
-			"mysqldump --defaults-extra-file={} {}",
-			CREDENTIALS_FILE,
+			"mysqldump -u {} -p{} -h {} --port={} {}",
+			config->ContentDbUsername,
+			config->ContentDbPassword,
+			config->ContentDbHost,
+			config->ContentDbPort,
 			config->ContentDbName
 		);
 	};
 
 	return fmt::format(
-		"mysqldump --defaults-extra-file={} {}",
-		CREDENTIALS_FILE,
+		"mysqldump -u {} -p{} -h {} --port={} {}",
+		config->DatabaseUsername,
+		config->DatabasePassword,
+		config->DatabaseHost,
+		config->DatabasePort,
 		config->DatabaseDB
 	);
 }
@@ -143,7 +145,7 @@ std::string DatabaseDumpService::GetQueryServTables()
 
 std::string DatabaseDumpService::GetSystemTablesList()
 {
-	auto system_tables  = DatabaseSchema::GetServerTables();
+	auto system_tables = DatabaseSchema::GetServerTables();
 	auto version_tables = DatabaseSchema::GetVersionTables();
 
 	system_tables.insert(
@@ -197,7 +199,7 @@ std::string DatabaseDumpService::GetDumpFileNameWithPath()
 	return GetSetDumpPath() + GetDumpFileName();
 }
 
-void DatabaseDumpService::DatabaseDump()
+void DatabaseDumpService::Dump()
 {
 	if (!IsMySQLInstalled()) {
 		LogError("MySQL is not installed; Please check your PATH for a valid MySQL installation");
@@ -279,11 +281,6 @@ void DatabaseDumpService::DatabaseDump()
 		}
 	}
 
-	if (IsDumpStaticInstanceData()) {
-		tables_to_dump += "instance_list";
-		options += " --no-create-info --where=\"instance_list.is_global > 0 and instance_list.never_expires > 0\"";
-	}
-
 	if (!dump_descriptor.empty()) {
 		SetDumpFileName(GetDumpFileName() + dump_descriptor);
 	}
@@ -296,6 +293,14 @@ void DatabaseDumpService::DatabaseDump()
 		pipe_file = fmt::format(" > {}.sql", GetDumpFileNameWithPath());
 	}
 
+	std::string execute_command = fmt::format(
+		"{} {} {} {}",
+		GetBaseMySQLDumpCommand(),
+		options,
+		tables_to_dump,
+		pipe_file
+	);
+
 	if (!File::Exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
 		File::Makedir(GetSetDumpPath());
 	}
@@ -303,66 +308,30 @@ void DatabaseDumpService::DatabaseDump()
 	if (IsDumpDropTableSyntaxOnly()) {
 		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');
 
-		for (auto &table: tables) {
+		for (auto &table : tables) {
 			std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl;
 		}
 
 		if (tables_to_dump.empty()) {
 			std::cerr << "No tables were specified" << std::endl;
 		}
-
-		return;
 	}
 	else {
-		const auto execute_command = fmt::format(
-			"{} {} {} {}",
-			GetBaseMySQLDumpCommand(),
-			options,
-			tables_to_dump,
-			pipe_file
-		);
-
-		LogInfo("Backing up database [{}]", execute_command);
-		LogInfo("This can take a few minutes depending on the size of your database");
-		LogInfo("LOADING... PLEASE WAIT...");
-
-		BuildCredentialsFile();
 		std::string execution_result = Process::execute(execute_command);
 		if (!execution_result.empty() && IsDumpOutputToConsole()) {
 			std::cout << execution_result;
 		}
 	}
 
-	if (!IsDumpOutputToConsole()) {
-		LogSys.LoadLogSettingsDefaults();
-	}
-
-	if (!pipe_file.empty()) {
-		std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
-		auto        r    = File::GetContents(file);
-		if (!r.error.empty()) {
-			LogError("{}", r.error);
-		}
-
-		for (auto &line: Strings::Split(r.contents, "\n")) {
-			if (Strings::Contains(line, "mysqldump:")) {
-				LogError("{}", line);
-				LogError("Database dump failed. Correct the error before continuing or trying again");
-				LogError("This is to prevent data loss on behalf of the server operator");
-				RemoveSqlBackup();
-				std::exit(1);
-			}
-		}
-	}
-
 	if (!tables_to_dump.empty()) {
 		LogInfo("Dumping Tables [{}]", Strings::Trim(tables_to_dump));
 	}
 
 	LogInfo("Database dump created at [{}.sql]", GetDumpFileNameWithPath());
+
 	if (IsDumpWithCompression() && !IsDumpOutputToConsole()) {
 		if (HasCompressionBinary()) {
-			LogInfo("Compression requested. Compressing dump [{}.sql]", GetDumpFileNameWithPath());
+			LogInfo("Compression requested... Compressing dump [{}.sql]", GetDumpFileNameWithPath());
 
 			if (IsTarAvailable()) {
 				Process::execute(
@@ -374,7 +343,6 @@ void DatabaseDumpService::DatabaseDump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.tar.gz]", GetDumpFileNameWithPath());
-				RemoveSqlBackup();
 			}
 			else if (Is7ZipAvailable()) {
 				Process::execute(
@@ -385,7 +353,6 @@ void DatabaseDumpService::DatabaseDump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.zip]", GetDumpFileNameWithPath());
-				RemoveSqlBackup();
 			}
 			else {
 				LogInfo("Compression requested, but no available compression binary was found");
@@ -396,8 +363,6 @@ void DatabaseDumpService::DatabaseDump()
 		}
 	}
 
-	RemoveCredentialsFile();
-
 //	LogDebug("[{}] dump-to-console", IsDumpOutputToConsole());
 //	LogDebug("[{}] dump-path", GetSetDumpPath());
 //	LogDebug("[{}] compression", (IsDumpWithCompression() ? "true" : "false"));
@@ -570,58 +535,3 @@ void DatabaseDumpService::SetDumpMercTables(bool dump_merc_tables)
 {
 	DatabaseDumpService::dump_merc_tables = dump_merc_tables;
 }
-
-void DatabaseDumpService::RemoveSqlBackup()
-{
-	std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
-	if (File::Exists(file)) {
-		std::filesystem::remove(file);
-	}
-
-	RemoveCredentialsFile();
-}
-
-void DatabaseDumpService::BuildCredentialsFile()
-{
-	auto          config = EQEmuConfig::get();
-	std::ofstream out(CREDENTIALS_FILE);
-	if (out.is_open()) {
-		if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
-			out << "[mysqldump]" << std::endl;
-			out << "user=" << config->ContentDbUsername << std::endl;
-			out << "password=" << config->ContentDbPassword << std::endl;
-			out << "host=" << config->ContentDbHost << std::endl;
-			out << "port=" << config->ContentDbPort << std::endl;
-			out << "default-character-set=utf8" << std::endl;
-		}
-		else {
-			out << "[mysqldump]" << std::endl;
-			out << "user=" << config->DatabaseUsername << std::endl;
-			out << "password=" << config->DatabasePassword << std::endl;
-			out << "host=" << config->DatabaseHost << std::endl;
-			out << "port=" << config->DatabasePort << std::endl;
-			out << "default-character-set=utf8" << std::endl;
-		}
-		out.close();
-	}
-	else {
-		LogError("Failed to open credentials file for writing");
-	}
-}
-
-void DatabaseDumpService::RemoveCredentialsFile()
-{
-	if (File::Exists(CREDENTIALS_FILE)) {
-		std::filesystem::remove(CREDENTIALS_FILE);
-	}
-}
-
-bool DatabaseDumpService::IsDumpStaticInstanceData()
-{
-	return dump_static_instance_data;
-}
-
-void DatabaseDumpService::SetDumpStaticInstanceData(bool b)
-{
-	dump_static_instance_data = b;
-}

common/database/database_dump_service.h

@@ -24,7 +24,7 @@
 
 class DatabaseDumpService {
 public:
-	void DatabaseDump();
+	void Dump();
 	bool IsDumpAllTables() const;
 	void SetDumpAllTables(bool dump_all_tables);
 	bool IsDumpWithNoData() const;
@@ -58,9 +58,6 @@ public:
 	bool IsDumpMercTables() const;
 	void SetDumpMercTables(bool dump_bot_tables);
 
-	void SetDumpStaticInstanceData(bool b);
-	bool IsDumpStaticInstanceData();
-
 private:
 	bool        dump_all_tables             = false;
 	bool        dump_state_tables           = false;
@@ -76,8 +73,6 @@ private:
 	bool        dump_drop_table_syntax_only = false;
 	bool        dump_bot_tables             = false;
 	bool        dump_merc_tables            = false;
-	bool        dump_static_instance_data   = false;
-
 	std::string dump_path;
 	std::string dump_file_name;
 
@@ -97,9 +92,6 @@ private:
 	std::string GetDumpFileNameWithPath();
 	std::string GetSetDumpPath();
 	std::string GetQueryServTables();
-	void RemoveSqlBackup();
-	void BuildCredentialsFile();
-	void RemoveCredentialsFile();
 };
 
 

common/database/database_update.cpp

@@ -1,324 +0,0 @@
-#include <filesystem>
-#include "database_update.h"
-#include "../eqemu_logsys.h"
-#include "../database.h"
-#include "../strings.h"
-#include "../rulesys.h"
-#include "../http/httplib.h"
-
-#include "database_update_manifest.cpp"
-#include "database_update_manifest_bots.cpp"
-#include "database_dump_service.h"
-
-constexpr int BREAK_LENGTH = 70;
-
-DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
-{
-	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
-	if (!results.Success() || !results.RowCount()) {
-		LogError("Failed to read from [db_version] table!");
-		return DatabaseVersion{};
-	}
-
-	auto r = results.begin();
-
-	return DatabaseVersion{
-		.server_database_version = Strings::ToInt(r[0]),
-		.bots_database_version = Strings::ToInt(r[1]),
-	};
-}
-
-DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
-{
-	return DatabaseVersion{
-		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
-		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
-	};
-}
-
-// the amount of versions we look-back to ensure we have all migrations
-// we may not want to force these, but just warn about the look-backs
-constexpr int LOOK_BACK_AMOUNT = 10;
-
-// this check will take action
-void DatabaseUpdate::CheckDbUpdates()
-{
-	InjectBotsVersionColumn();
-	auto v = GetDatabaseVersions();
-	auto b = GetBinaryDatabaseVersions();
-	if (CheckVersionsUpToDate(v, b)) {
-		return;
-	}
-
-	if (UpdateManifest(manifest_entries, v.server_database_version, b.server_database_version)) {
-		LogInfo(
-			"Updates ran successfully, setting database version to [{}] from [{}]",
-			b.server_database_version,
-			v.server_database_version
-		);
-		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
-	}
-
-	if (b.bots_database_version > 0) {
-		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
-			LogInfo(
-				"Updates ran successfully, setting database version to [{}] from [{}]",
-				b.bots_database_version,
-				v.bots_database_version
-			);
-			m_database->QueryDatabase(
-				fmt::format(
-					"UPDATE `db_version` SET `bots_version` = {}",
-					b.bots_database_version
-				)
-			);
-		}
-	}
-}
-
-std::string DatabaseUpdate::GetQueryResult(const ManifestEntry& e)
-{
-	auto results = (e.content_schema_update ? m_content_database : m_database)->QueryDatabase(e.check);
-
-	std::vector<std::string> result_lines = {};
-
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		std::vector<std::string> cols;
-
-		int field_count = results.ColumnCount();
-		cols.reserve(field_count);
-		for (int i = 0; i < field_count; ++i) {
-			if (row[i] != nullptr) {
-				cols.emplace_back(row[i]);
-			}
-		}
-
-		result_lines.emplace_back(Strings::Join(cols, " "));
-	}
-
-	return Strings::Join(result_lines, "\n");
-}
-
-bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_result)
-{
-	std::string r = Strings::Trim(query_result);
-	if (e.condition == "contains") {
-		return Strings::Contains(r, e.match);
-	}
-	else if (e.condition == "match") {
-		return r == e.match;
-	}
-	else if (e.condition == "missing") {
-		return !Strings::Contains(r, e.match);
-	}
-	else if (e.condition == "empty") {
-		return r.empty();
-	}
-	else if (e.condition == "not_empty") {
-		return !r.empty();
-	}
-
-	return false;
-}
-
-// check if we are running in a terminal
-bool is_atty()
-{
-#ifdef _WINDOWS
-	return ::_isatty(_fileno(stdin));
-#else
-	return isatty(fileno(stdin));
-#endif
-}
-
-// return true if we ran updates
-bool DatabaseUpdate::UpdateManifest(
-	std::vector<ManifestEntry> entries,
-	int version_low,
-	int version_high
-)
-{
-	std::vector<int> missing_migrations = {};
-	if (version_low != version_high) {
-
-		LogSys.DisableMySQLErrorLogs();
-		for (int version = version_low + 1; version <= version_high; ++version) {
-			for (auto &e: entries) {
-				if (e.version == version) {
-					bool        has_migration = true;
-					std::string r             = GetQueryResult(e);
-					if (ShouldRunMigration(e, r)) {
-						has_migration = false;
-						missing_migrations.emplace_back(e.version);
-					}
-
-					std::string prefix = fmt::format(
-						"[{}]",
-						has_migration ? "ok" : "missing"
-					);
-
-					LogInfo(
-						"[{}] {:>10} | [{}]",
-						e.version,
-						prefix,
-						e.description
-					);
-				}
-			}
-		}
-		LogSys.EnableMySQLErrorLogs();
-		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-		if (!missing_migrations.empty()) {
-			LogInfo("Automatically backing up database before applying updates");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-			auto s = DatabaseDumpService();
-			s.SetDumpAllTables(true);
-			s.SetDumpWithCompression(true);
-			s.DatabaseDump();
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-		}
-
-		if (!missing_migrations.empty()) {
-			LogInfo("Running database migrations. Please wait...");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-		}
-
-		for (auto &m: missing_migrations) {
-			for (auto &e: entries) {
-				if (e.version == m) {
-					bool errored_migration = false;
-
-					auto r = (e.content_schema_update ? m_content_database : m_database)->QueryDatabaseMulti(e.sql);
-
-					// ignore empty query result "errors"
-					if (r.ErrorNumber() != 1065 && !r.ErrorMessage().empty()) {
-						LogError("(#{}) [{}]", r.ErrorNumber(), r.ErrorMessage());
-						errored_migration = true;
-
-						LogInfo("Required database update failed. This could be a problem");
-
-						// if terminal attached then prompt for skip
-						if (is_atty()) {
-							LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");
-
-							// user input
-							std::string input;
-							bool        gave_input        = false;
-							time_t      start_time        = time(nullptr);
-							time_t      wait_time_seconds = 60;
-
-							// spawn a concurrent thread that waits for input from std::cin
-							std::thread t1(
-								[&]() {
-									std::cin >> input;
-									gave_input = true;
-								}
-							);
-							t1.detach();
-
-							// check the inputReceived flag once every 50ms for 10 seconds
-							while (time(nullptr) < start_time + wait_time_seconds && !gave_input) {
-								std::this_thread::sleep_for(std::chrono::milliseconds(50));
-							}
-
-							// prompt for user skip
-							if (Strings::Trim(input) == "y") {
-								errored_migration = false;
-								LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-							}
-						} else {
-							errored_migration = true;
-							LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-						}
-					}
-
-					LogInfo(
-						"[{}] [{}] [{}]",
-						e.version,
-						e.description,
-						(errored_migration ? "error" : "ok")
-					);
-
-					if (errored_migration) {
-						LogError("Fatal | Database migration [{}] failed to run", e.description);
-						LogError("Fatal | Shutting down");
-						std::exit(1);
-					}
-				}
-			}
-		}
-
-		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-		return true;
-	}
-
-	return false;
-}
-
-DatabaseUpdate *DatabaseUpdate::SetDatabase(Database *db)
-{
-	m_database = db;
-
-	return this;
-}
-
-DatabaseUpdate *DatabaseUpdate::SetContentDatabase(Database *db)
-{
-	m_content_database = db;
-
-	return this;
-}
-
-bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
-{
-	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-	LogInfo(
-		"{:>8} | database [{}] binary [{}] {}",
-		"Server",
-		v.server_database_version,
-		b.server_database_version,
-		(v.server_database_version == b.server_database_version) ? "up to date" : "checking updates"
-	);
-
-	if (RuleB(Bots, Enabled) && b.bots_database_version > 0) {
-		LogInfo(
-			"{:>8} | database [{}] binary [{}] {}",
-			"Bots",
-			v.bots_database_version,
-			b.bots_database_version,
-			(v.bots_database_version == b.bots_database_version) ? "up to date" : "checking updates"
-		);
-	}
-
-	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
-
-	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-	// server database version is required
-	bool server_up_to_date = v.server_database_version >= b.server_database_version;
-	// bots database version is optional, if not enabled then it is always up-to-date
-	bool bots_up_to_date   = RuleB(Bots, Enabled) ? v.bots_database_version >= b.bots_database_version : true;
-
-	return server_up_to_date && bots_up_to_date;
-}
-
-// checks to see if there are pending updates
-// used by zone to prevent launch or boot loop until updates are applied
-bool DatabaseUpdate::HasPendingUpdates()
-{
-	auto v = GetDatabaseVersions();
-	auto b = GetBinaryDatabaseVersions();
-
-	return !CheckVersionsUpToDate(v, b);
-}
-
-void DatabaseUpdate::InjectBotsVersionColumn()
-{
-	auto r = m_database->QueryDatabase("show columns from db_version where Field like '%bots_version%'");
-	if (r.RowCount() == 0) {
-		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
-	}
-}

common/database/database_update.h

@@ -1,40 +0,0 @@
-#ifndef EQEMU_DATABASE_UPDATE_H
-#define EQEMU_DATABASE_UPDATE_H
-
-#include "../database.h"
-
-struct ManifestEntry {
-	int         version{};     // database version of the migration
-	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-	std::string check{};       // query that checks against the condition
-	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-	bool        content_schema_update{}; // if true, this migration is a content schema update and should be ran against the content database
-};
-
-struct DatabaseVersion {
-	int server_database_version;
-	int bots_database_version;
-};
-
-class DatabaseUpdate {
-public:
-	DatabaseVersion GetDatabaseVersions();
-	DatabaseVersion GetBinaryDatabaseVersions();
-	void CheckDbUpdates();
-	std::string GetQueryResult(const ManifestEntry& e);
-	static bool ShouldRunMigration(ManifestEntry &e, std::string query_result);
-	bool UpdateManifest(std::vector<ManifestEntry> entries, int version_low, int version_high);
-
-	DatabaseUpdate *SetDatabase(Database *db);
-	DatabaseUpdate *SetContentDatabase(Database *db);
-	bool HasPendingUpdates();
-private:
-	Database *m_database;
-	Database *m_content_database;
-	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
-	void InjectBotsVersionColumn();
-};
-
-#endif //EQEMU_DATABASE_UPDATE_H

common/database/database_update_manifest_bots.cpp

@@ -1,148 +0,0 @@
-#include "database_update.h"
-
-std::vector<ManifestEntry> bot_manifest_entries = {
-	ManifestEntry{
-		.version = 9035,
-		.description = "2022_12_04_bot_archery.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'archery_setting'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `archery_setting` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0' AFTER `enforce_spell_settings`;
-)",
-	},
-	ManifestEntry{
-		.version = 9036,
-		.description = "2023_01_19_drop_bot_views.sql",
-		.check = "SHOW TABLES LIKE 'vw_groups'",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-DROP VIEW vw_bot_groups;
-DROP VIEW vw_bot_character_mobs;
-DROP VIEW vw_groups;
-DROP VIEW vw_guild_members;
-DROP TABLE bot_guild_members;
-
-)",
-	},
-	ManifestEntry{
-		.version = 9037,
-		.description = "2023_01_22_add_name_index.sql",
-		.check = "show index from bot_data WHERE key_name = 'name`",
-		.condition = "",
-		.match = "empty",
-		.sql = R"(
-create index `name` on bot_data(`name`);
-)",
-	},
-	ManifestEntry{
-		.version = 9038,
-		.description = "2023_02_16_add_caster_range.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'caster_range'",
-		.condition = "",
-		.match = "empty",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `caster_range` INT(11) UNSIGNED NOT NULL DEFAULT '300' AFTER `archery_setting`;
-)",
-	},
-	ManifestEntry{
-		.version = 9039,
-		.description = "2023_03_31_remove_bot_groups.sql",
-		.check = "SHOW TABLES LIKE 'bot_groups'",
-		.condition = "",
-		.match = "not_empty",
-		.sql = R"(
-SET FOREIGN_KEY_CHECKS = 0;
-DROP TABLE IF EXISTS `bot_groups`;
-DROP TABLE IF EXISTS `bot_group_members`;
-SET FOREIGN_KEY_CHECKS = 1;
-)",
-	},
-	ManifestEntry{
-		.version = 9040,
-		.description = "2023_11_16_bot_starting_items.sql",
-		.check = "SHOW TABLES LIKE 'bot_starting_items'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-CREATE TABLE `bot_starting_items`  (
-`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`races` int(11) UNSIGNED NOT NULL DEFAULT 0,
-`classes` int(11) UNSIGNED NOT NULL DEFAULT 0,
-`item_id` int(11) UNSIGNED NOT NULL DEFAULT 0,
-`item_charges` tinyint(3) UNSIGNED NOT NULL DEFAULT 1,
-`min_status` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
-`slot_id` mediumint(9) NOT NULL DEFAULT -1,
-`min_expansion` tinyint(4) NOT NULL DEFAULT -1,
-`max_expansion` tinyint(4) NOT NULL DEFAULT -1,
-`content_flags` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
-`content_flags_disabled` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
-PRIMARY KEY (`id`)
-) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci;
-)",
-	},
-	ManifestEntry{
-		.version = 9041,
-		.description = "2023_12_04_bot_timers.sql",
-		.check = "SHOW COLUMNS FROM `bot_timers` LIKE 'recast_time'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_timers`
-	ADD COLUMN `recast_time` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `timer_value`,
-	ADD COLUMN `is_spell` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `recast_time`,
-	ADD COLUMN `is_disc` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `is_spell`,
-	ADD COLUMN `spell_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_disc`,
-	ADD COLUMN `is_item` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `spell_id`,
-	ADD COLUMN `item_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_item`;
-ALTER TABLE `bot_timers`
-	DROP FOREIGN KEY `FK_bot_timers_1`;
-ALTER TABLE `bot_timers`
-	DROP PRIMARY KEY;
-ALTER TABLE `bot_timers`
-	ADD PRIMARY KEY (`bot_id`, `timer_id`, `spell_id`, `item_id`);
-)"
-	},
-	ManifestEntry{
-		.version = 9042,
-		.description = "2024_01_27_delete_bot_foreign_keys.sql",
-		.check = "SHOW CREATE TABLE `bot_stances`",
-		.condition = "contains",
-		.match = "FOREIGN",
-		.sql = R"(
-ALTER TABLE `bot_buffs` DROP FOREIGN KEY `FK_bot_buffs_1`;
-ALTER TABLE `bot_heal_rotations` DROP FOREIGN KEY `FK_bot_heal_rotations`;
-ALTER TABLE `bot_heal_rotation_members` DROP FOREIGN KEY `FK_bot_heal_rotation_members_1`;
-ALTER TABLE `bot_heal_rotation_members` DROP FOREIGN KEY `FK_bot_heal_rotation_members_2`;
-ALTER TABLE `bot_heal_rotation_targets` DROP FOREIGN KEY `FK_bot_heal_rotation_targets`;
-ALTER TABLE `bot_inventories` DROP FOREIGN KEY `FK_bot_inventories_1`;
-ALTER TABLE `bot_pets` DROP FOREIGN KEY `FK_bot_pets_1`;
-ALTER TABLE `bot_pet_buffs` DROP FOREIGN KEY `FK_bot_pet_buffs_1`;
-ALTER TABLE `bot_pet_inventories` DROP FOREIGN KEY `FK_bot_pet_inventories_1`;
-ALTER TABLE `bot_stances` DROP FOREIGN KEY `FK_bot_stances_1`;
-)"
-	}
-// -- template; copy/paste this when you need to create a new entry
-//	ManifestEntry{
-//		.version = 9228,
-//		.description = "some_new_migration.sql",
-//		.check = "SHOW COLUMNS FROM `table_name` LIKE 'column_name'",
-//		.condition = "empty",
-//		.match = "",
-//		.sql = R"(
-//
-//)"
-};
-
-// see struct definitions for what each field does
-// struct ManifestEntry {
-// 	int         version{};     // database version of the migration
-// 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-// 	std::string check{};       // query that checks against the condition
-// 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-// 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-// 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-// };

common/database_instances.cpp

@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/repositories/raid_members_repository.h"
 #include "../common/repositories/respawn_times_repository.h"
 #include "../common/repositories/spawn_condition_values_repository.h"
-#include "repositories/spawn2_disabled_repository.h"
 
 
 #include "database.h"
@@ -50,7 +49,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <sys/time.h>
 #endif
 
-
 bool Database::AddClientToInstance(uint16 instance_id, uint32 character_id)
 {
 	auto e = InstanceListPlayerRepository::NewEntity();
@@ -133,118 +131,85 @@ bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version
 bool Database::GetUnusedInstanceID(uint16 &instance_id)
 {
 	uint32 max_reserved_instance_id = RuleI(Instances, ReservedInstances);
-	uint32 max_instance_id          = 32000;
+	uint32 max                      = 32000;
 
-	// sanity check reserved
-	if (max_reserved_instance_id >= max_instance_id) {
-		instance_id = 0;
-		return false;
-	}
-
-	// recycle instances
-	if (RuleB(Instances, RecycleInstanceIds)) {
-
-		//query to get first unused id above reserved
-		auto query = fmt::format(
-			SQL(
-				SELECT id
-				FROM instance_list
-				WHERE id = {};
-			),
-			max_reserved_instance_id + 1
-		);
-
-		auto results = QueryDatabase(query);
-
-		// could not successfully query - bail out
-		if (!results.Success()) {
-			instance_id = 0;
-			return false;
-		}
-
-		// first id is available
-		if (results.RowCount() == 0) {
-			instance_id = max_reserved_instance_id + 1;
-			return true;
-		}
-
-		// now look for next available above reserved
-		query = fmt::format(
-			SQL(
-				SELECT MIN(i.id + 1) AS next_available
-				FROM instance_list i
-				LEFT JOIN instance_list i2 ON i.id + 1 = i2.id
-				WHERE i.id >= {}
-				AND i2.id IS NULL;
-			),
-			max_reserved_instance_id
-		);
-
-		results = QueryDatabase(query);
-
-		// could not successfully query - bail out
-		if (!results.Success()) {
-			instance_id = 0;
-			return false;
-		}
-
-		// did not retrieve any rows - bail out
-		if (results.RowCount() == 0) {
-			instance_id = 0;
-			return false;
-		}
-
-		auto row = results.begin();
-
-		// check that id is within limits
-		if (row[0] && Strings::ToInt(row[0]) <= max_instance_id) {
-			instance_id = Strings::ToInt(row[0]);
-			return true;
-		}
-
-		// no available instance ids
-		instance_id = 0;
-		return false;
-	}
-
-	// get max unused id above reserved
 	auto query = fmt::format(
 		"SELECT IFNULL(MAX(id), {}) + 1 FROM instance_list WHERE id > {}",
 		max_reserved_instance_id,
 		max_reserved_instance_id
 	);
 
+	if (RuleB(Instances, RecycleInstanceIds)) {
+		query = (
+			SQL(
+				SELECT i.id + 1 AS next_available
+				FROM instance_list i
+				LEFT JOIN instance_list i2 ON i2.id = i.id + 1
+				WHERE i2.id IS NULL
+				ORDER BY i.id
+				LIMIT 0, 1;
+
+			)
+		);
+	}
+
 	auto results = QueryDatabase(query);
 
-	// could not successfully query - bail out
 	if (!results.Success()) {
 		instance_id = 0;
 		return false;
 	}
 
-	// did not retrieve any rows - bail out
+	if (results.RowCount() == 0) {
+		instance_id = max_reserved_instance_id;
+		return true;
+	}
+
+	auto row = results.begin();
+
+	if (Strings::ToInt(row[0]) <= max) {
+		instance_id = Strings::ToInt(row[0]);
+
+		return true;
+	}
+
+	if (instance_id < max_reserved_instance_id) {
+		instance_id = max_reserved_instance_id;
+		return true;
+	}
+
+	query   = fmt::format("SELECT id FROM instance_list where id > {} ORDER BY id", max_reserved_instance_id);
+	results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		instance_id = 0;
+		return false;
+	}
+
 	if (results.RowCount() == 0) {
 		instance_id = 0;
 		return false;
 	}
 
-	auto row = results.begin();
+	max_reserved_instance_id++;
 
-	// no instances currently used
-	if (!row[0]) {
-		instance_id = max_reserved_instance_id + 1;
-		return true;
+	for (auto row : results) {
+		if (max_reserved_instance_id < Strings::ToUnsignedInt(row[0])) {
+			instance_id = max_reserved_instance_id;
+			return true;
+		}
+
+		if (max_reserved_instance_id > max) {
+			instance_id = 0;
+			return false;
+		}
+
+		max_reserved_instance_id++;
 	}
 
-	// check that id is within limits
-	if (Strings::ToInt(row[0]) <= max_instance_id) {
-		instance_id = Strings::ToInt(row[0]);
-		return true;
-	}
+	instance_id = max_reserved_instance_id;
 
-	// no available instance ids
-	instance_id = 0;
-	return false;
+	return true;
 }
 
 bool Database::IsGlobalInstance(uint16 instance_id)
@@ -464,6 +429,8 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)
 
 void Database::DeleteInstance(uint16 instance_id)
 {
+	std::string query;
+
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
 
 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
@@ -555,7 +522,6 @@ void Database::PurgeExpiredInstances()
 	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
 	DynamicZoneMembersRepository::DeleteByManyInstances(*this, imploded_instance_ids);
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
 }
 
 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
@@ -570,23 +536,3 @@ void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
 
 	InstanceListRepository::UpdateOne(*this, i);
 }
-
-void Database::CleanupInstanceCorpses() {
-	auto l = InstanceListRepository::GetWhere(
-		*this,
-		"never_expires = 0"
-	);
-
-	if (l.empty()) {
-		return;
-	}
-
-	std::vector<std::string> instance_ids;
-	for (const auto& e : l) {
-		instance_ids.emplace_back(std::to_string(e.id));
-	}
-
-	const auto imploded_instance_ids = Strings::Implode(",", instance_ids);
-
-	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
-}

common/database_schema.h

@@ -66,12 +66,11 @@ namespace DatabaseSchema {
 			{"character_potionbelt",           "id"},
 			{"character_skills",               "id"},
 			{"character_spells",               "id"},
-			{"character_stats_record",         "character_id"},
 			{"character_task_timers",          "character_id"},
 			{"character_tasks",                "charid"},
-			{"character_tribute",              "character_id"},
+			{"character_tribute",              "id"},
 			{"completed_tasks",                "charid"},
-			{"data_buckets",                   "character_id"},
+			{"data_buckets",                   "id"},
 			{"faction_values",                 "char_id"},
 			{"friends",                        "charid"},
 			{"guild_members",                  "char_id"},
@@ -135,7 +134,6 @@ namespace DatabaseSchema {
 			"character_potionbelt",
 			"character_skills",
 			"character_spells",
-			"character_stats_record",
 			"character_task_timers",
 			"character_tasks",
 			"character_tribute",
@@ -148,7 +146,6 @@ namespace DatabaseSchema {
 			"guild_members",
 			"guild_ranks",
 			"guild_relations",
-			"guild_tributes",
 			"guilds",
 			"instance_list_player",
 			"inventory",
@@ -259,9 +256,7 @@ namespace DatabaseSchema {
 	{
 		return {
 			"chatchannels",
-			"chatchannel_reserved_names",
 			"command_settings",
-			"command_subsettings",
 			"content_flags",
 			"db_str",
 			"eqtime",
@@ -346,7 +341,6 @@ namespace DatabaseSchema {
 			"respawn_times",
 			"saylink",
 			"server_scheduled_events",
-			"spawn2_disabled",
 			"player_event_log_settings",
 			"player_event_logs",
 			"shared_task_activity_state",
@@ -398,6 +392,9 @@ namespace DatabaseSchema {
 			"bot_command_settings",
 			"bot_create_combinations",
 			"bot_data",
+			"bot_group_members",
+			"bot_groups",
+			"bot_guild_members",
 			"bot_heal_rotation_members",
 			"bot_heal_rotation_targets",
 			"bot_heal_rotations",

common/dbcore.cpp

@@ -8,11 +8,11 @@
 
 #include "dbcore.h"
 
+#include <errmsg.h>
 #include <fstream>
 #include <iostream>
 #include <mysqld_error.h>
 #include <string.h>
-#include "strings.h"
 
 #ifdef _WINDOWS
 #define snprintf	_snprintf
@@ -74,13 +74,13 @@ void DBcore::ping()
 	m_mutex->unlock();
 }
 
-MySQLRequestResult DBcore::QueryDatabase(const std::string& query, bool retryOnFailureOnce)
+MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureOnce)
 {
 	auto r = QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
 	return r;
 }
 
-bool DBcore::DoesTableExist(const std::string& table_name)
+bool DBcore::DoesTableExist(std::string table_name)
 {
 	auto results = QueryDatabase(fmt::format("SHOW TABLES LIKE '{}'", table_name));
 
@@ -136,8 +136,8 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		/**
 		 * Error logging
 		 */
-		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
-			LogMySQLError("MySQL Error ({}) [{}] Query [{}]", mysql_errno(mysql), mysql_error(mysql), query);
+		if (mysql_errno(mysql) > 0 && strlen(query) > 0) {
+			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}
 
 		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(mysql), errorBuffer);
@@ -305,134 +305,3 @@ void DBcore::SetMutex(Mutex *mutex)
 
 	DBcore::m_mutex = mutex;
 }
-
-// executes multiple statements in one query
-// do not use this in application logic
-// this was built and maintained for database migrations only
-MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
-{
-	SetMultiStatementsOn();
-
-	BenchTimer timer;
-	timer.reset();
-
-	LockMutex lock(m_mutex);
-
-	// Reconnect if we are not connected before hand.
-	if (pStatus != Connected) {
-		Open();
-	}
-	auto r = MySQLRequestResult{};
-
-	int status = mysql_real_query(mysql, query.c_str(), query.length());
-
-	// process single result
-	if (status != 0) {
-		unsigned int error_number = mysql_errno(mysql);
-
-		if (error_number == CR_SERVER_GONE_ERROR) {
-			pStatus = Error;
-		}
-
-		// error logging
-		if (mysql_errno(mysql) > 0 && query.length() > 0 && mysql_errno(mysql) != 1065) {
-			std::string error_raw   = fmt::format("{}", mysql_error(mysql));
-			std::string mysql_err   = Strings::Trim(error_raw);
-			std::string clean_query = Strings::Replace(query, "\n", "");
-			LogMySQLError("[{}] ({}) query [{}]", mysql_err, mysql_errno(mysql), clean_query);
-
-			MYSQL_RES *res = mysql_store_result(mysql);
-
-			uint32 row_count = 0;
-			if (res) {
-				row_count = (uint32) mysql_num_rows(res);
-			}
-
-			r = MySQLRequestResult(
-				res,
-				(uint32) mysql_affected_rows(mysql),
-				row_count,
-				(uint32) mysql_field_count(mysql),
-				(uint32) mysql_insert_id(mysql)
-			);
-
-			std::string error_message = mysql_error(mysql);
-			r.SetErrorMessage(error_message);
-			r.SetErrorNumber(mysql_errno(mysql));
-
-			if (res) {
-				mysql_free_result(res);
-			}
-
-			SetMultiStatementsOff();
-
-			return r;
-		}
-	}
-
-
-	int index = 0;
-
-	// there could be a query with a semicolon in the actual data, this is best effort for
-	// logging / display purposes
-	// rare that we see this when this is only used in DDL statements
-	auto pieces = Strings::Split(query, ";");
-
-	// process each statement result
-	do {
-		uint32    row_count = 0;
-		MYSQL_RES *res      = mysql_store_result(mysql);
-
-		r = MySQLRequestResult(
-			res,
-			(uint32) mysql_affected_rows(mysql),
-			row_count,
-			(uint32) mysql_field_count(mysql),
-			(uint32) mysql_insert_id(mysql)
-		);
-
-		if (pieces.size() >= index) {
-			auto piece = pieces[index];
-			LogMySQLQuery(
-				"{} -- ({} row{} affected) ({}s)",
-				piece,
-				r.RowsAffected(),
-				r.RowsAffected() == 1 ? "" : "s",
-				std::to_string(timer.elapsed())
-			);
-		}
-
-		if (res) {
-			row_count = (uint32) mysql_num_rows(res);
-		}
-
-		// more results? -1 = no, >0 = error, 0 = yes (keep looping)
-		if ((status = mysql_next_result(mysql)) > 0) {
-			if (mysql_errno(mysql) > 0) {
-				LogMySQLError("[{}] [{}]", mysql_errno(mysql), mysql_error(mysql));
-			}
-
-			mysql_free_result(res);
-
-			// error logging
-			std::string error_message = mysql_error(mysql);
-			r.SetErrorMessage(error_message);
-			r.SetErrorNumber(mysql_errno(mysql));
-
-			SetMultiStatementsOff();
-
-			// we handle errors elsewhere
-			return r;
-		}
-
-		if (res) {
-			mysql_free_result(res);
-		}
-
-		index++;
-	} while (status == 0);
-
-	SetMultiStatementsOff();
-
-	return r;
-}

common/dbcore.h

@@ -14,9 +14,6 @@
 #include <string.h>
 #include <mutex>
 
-#define CR_SERVER_GONE_ERROR    2006
-#define CR_SERVER_LOST          2013
-
 class DBcore {
 public:
 	enum eStatus {
@@ -27,8 +24,7 @@ public:
 	~DBcore();
 	eStatus GetStatus() { return pStatus; }
 	MySQLRequestResult QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
+	MySQLRequestResult QueryDatabase(std::string query, bool retryOnFailureOnce = true);
 	void TransactionBegin();
 	void TransactionCommit();
 	void TransactionRollback();
@@ -39,7 +35,7 @@ public:
 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);
 
-	bool DoesTableExist(const std::string& table_name);
+	bool DoesTableExist(std::string table_name);
 
 	void SetMySQL(const DBcore &o)
 	{
@@ -81,20 +77,8 @@ private:
 	uint32 pPort;
 	bool   pSSL;
 
-	// allows multiple queries to be executed within the same query
-	// do not use this under normal operation
-	// we use this during database migrations only currently
-	void SetMultiStatementsOn()
-	{
-		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_ON);
-	}
-
-	// disables multiple statements to be executed in one query
-	void SetMultiStatementsOff()
-	{
-		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
-	}
 };
 
 
 #endif
+

common/deity.cpp

@@ -11,7 +11,7 @@
 	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
@@ -19,81 +19,131 @@
 
 #include "deity.h"
 
-EQ::deity::DeityTypeBit EQ::deity::GetDeityBitmask(DeityType deity_type)
+
+EQ::deity::DeityTypeBit EQ::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
 {
 	switch (deity_type) {
-		case DeityBertoxxulous:
-			return bit_DeityBertoxxulous;
-		case DeityBrellSirilis:
-			return bit_DeityBrellSirilis;
-		case DeityCazicThule:
-			return bit_DeityCazicThule;
-		case DeityErollisiMarr:
-			return bit_DeityErollisiMarr;
-		case DeityBristlebane:
-			return bit_DeityBristlebane;
-		case DeityInnoruuk:
-			return bit_DeityInnoruuk;
-		case DeityKarana:
-			return bit_DeityKarana;
-		case DeityMithanielMarr:
-			return bit_DeityMithanielMarr;
-		case DeityPrexus:
-			return bit_DeityPrexus;
-		case DeityQuellious:
-			return bit_DeityQuellious;
-		case DeityRallosZek:
-			return bit_DeityRallosZek;
-		case DeityRodcetNife:
-			return bit_DeityRodcetNife;
-		case DeitySolusekRo:
-			return bit_DeitySolusekRo;
-		case DeityTheTribunal:
-			return bit_DeityTheTribunal;
-		case DeityTunare:
-			return bit_DeityTunare;
-		case DeityVeeshan:
-			return bit_DeityVeeshan;
-		case DeityAgnostic_LB:
-		case DeityAgnostic:
-			return bit_DeityAgnostic;
-		default:
-			return bit_DeityAll;
-	}
-}
-
-const std::map<EQ::deity::DeityType, std::string>& EQ::deity::GetDeityMap()
-{
-	static const std::map<EQ::deity::DeityType, std::string> deity_map = {
-		{ DeityAgnostic, "Agnostic" },
-		{ DeityAgnostic_LB, "Agnostic" },
-		{ DeityBertoxxulous, "Bertoxxulous" },
-		{ DeityBrellSirilis, "Brell Serilis" },
-		{ DeityBristlebane, "Bristlebane" },
-		{ DeityCazicThule, "Cazic-Thule" },
-		{ DeityErollisiMarr, "Erollisi Marr" },
-		{ DeityInnoruuk, "Innoruuk" },
-		{ DeityKarana, "Karana" },
-		{ DeityMithanielMarr, "Mithaniel Marr" },
-		{ DeityPrexus, "Prexus" },
-		{ DeityQuellious, "Quellious" },
-		{ DeityRallosZek, "Rallos Zek" },
-		{ DeityRodcetNife, "Rodcet Nife" },
-		{ DeitySolusekRo, "Solusek Ro" },
-		{ DeityTheTribunal, "The Tribunal" },
-		{ DeityTunare, "Tunare" },
-		{ DeityVeeshan, "Veeshan" }
+	case DeityBertoxxulous:
+		return bit_DeityBertoxxulous;
+	case DeityBrellSirilis:
+		return bit_DeityBrellSirilis;
+	case DeityCazicThule:
+		return bit_DeityCazicThule;
+	case DeityErollisiMarr:
+		return bit_DeityErollisiMarr;
+	case DeityBristlebane:
+		return bit_DeityBristlebane;
+	case DeityInnoruuk:
+		return bit_DeityInnoruuk;
+	case DeityKarana:
+		return bit_DeityKarana;
+	case DeityMithanielMarr:
+		return bit_DeityMithanielMarr;
+	case DeityPrexus:
+		return bit_DeityPrexus;
+	case DeityQuellious:
+		return bit_DeityQuellious;
+	case DeityRallosZek:
+		return bit_DeityRallosZek;
+	case DeityRodcetNife:
+		return bit_DeityRodcetNife;
+	case DeitySolusekRo:
+		return bit_DeitySolusekRo;
+	case DeityTheTribunal:
+		return bit_DeityTheTribunal;
+	case DeityTunare:
+		return bit_DeityTunare;
+	case DeityVeeshan:
+		return bit_DeityVeeshan;
+	case DeityAgnostic_LB:
+	case DeityAgnostic:
+		return bit_DeityAgnostic;
+	default:
+		return bit_DeityAll;
 	};
-
-	return deity_map;
 }
 
-std::string EQ::deity::GetDeityName(DeityType deity_type)
+EQ::deity::DeityType EQ::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
 {
-
-	if (EQ::deity::GetDeityMap().find(deity_type) != EQ::deity::GetDeityMap().end()) {
-		return EQ::deity::GetDeityMap().find(deity_type)->second;
-	}
-
-	return std::string();
+	switch (deity_type_bit) {
+	case bit_DeityAgnostic:
+		return DeityAgnostic;
+	case bit_DeityBertoxxulous:
+		return DeityBertoxxulous;
+	case bit_DeityBrellSirilis:
+		return DeityBrellSirilis;
+	case bit_DeityCazicThule:
+		return DeityCazicThule;
+	case bit_DeityErollisiMarr:
+		return DeityErollisiMarr;
+	case bit_DeityBristlebane:
+		return DeityBristlebane;
+	case bit_DeityInnoruuk:
+		return DeityInnoruuk;
+	case bit_DeityKarana:
+		return DeityKarana;
+	case bit_DeityMithanielMarr:
+		return DeityMithanielMarr;
+	case bit_DeityPrexus:
+		return DeityPrexus;
+	case bit_DeityQuellious:
+		return DeityQuellious;
+	case bit_DeityRallosZek:
+		return DeityRallosZek;
+	case bit_DeityRodcetNife:
+		return DeityRodcetNife;
+	case bit_DeitySolusekRo:
+		return DeitySolusekRo;
+	case bit_DeityTheTribunal:
+		return DeityTheTribunal;
+	case bit_DeityTunare:
+		return DeityTunare;
+	case bit_DeityVeeshan:
+		return DeityVeeshan;
+	default:
+		return DeityUnknown;
+	};
+}
+
+const char* EQ::deity::DeityName(DeityType deity_type)
+{
+	switch (deity_type) {
+	case DeityBertoxxulous:
+		return "Bertoxxulous";
+	case DeityBrellSirilis:
+		return "Brell Serilis";
+	case DeityCazicThule:
+		return "Cazic-Thule";
+	case DeityErollisiMarr:
+		return "Erollisi Marr";
+	case DeityBristlebane:
+		return "Bristlebane";
+	case DeityInnoruuk:
+		return "Innoruuk";
+	case DeityKarana:
+		return "Karana";
+	case DeityMithanielMarr:
+		return "Mithaniel Marr";
+	case DeityPrexus:
+		return "Prexus";
+	case DeityQuellious:
+		return "Quellious";
+	case DeityRallosZek:
+		return "Rallos Zek";
+	case DeityRodcetNife:
+		return "Rodcet Nife";
+	case DeitySolusekRo:
+		return "Solusek Ro";
+	case DeityTheTribunal:
+		return "The Tribunal";
+	case DeityTunare:
+		return "Tunare";
+	case DeityVeeshan:
+		return "Veeshan";
+	case DeityAgnostic_LB:
+	case DeityAgnostic:
+		return "Agnostic";
+	default:
+		return "Unknown";
+	};
 }

common/deity.h

@@ -21,8 +21,6 @@
 #define COMMON_DEITY_H
 
 #include "types.h"
-#include <map>
-#include <string>
 
 
 namespace EQ
@@ -51,29 +49,30 @@ namespace EQ
 		};
 
 		enum DeityTypeBit : uint32 {
-			bit_DeityAgnostic      = 0x00000001,
-			bit_DeityBertoxxulous  = 0x00000002,
-			bit_DeityBrellSirilis  = 0x00000004,
-			bit_DeityCazicThule    = 0x00000008,
-			bit_DeityErollisiMarr  = 0x00000010,
-			bit_DeityBristlebane   = 0x00000020,
-			bit_DeityInnoruuk      = 0x00000040,
-			bit_DeityKarana        = 0x00000080,
+			bit_DeityNone = 0x00000000,
+			bit_DeityAgnostic = 0x00000001,
+			bit_DeityBertoxxulous = 0x00000002,
+			bit_DeityBrellSirilis = 0x00000004,
+			bit_DeityCazicThule = 0x00000008,
+			bit_DeityErollisiMarr = 0x00000010,
+			bit_DeityBristlebane = 0x00000020,
+			bit_DeityInnoruuk = 0x00000040,
+			bit_DeityKarana = 0x00000080,
 			bit_DeityMithanielMarr = 0x00000100,
-			bit_DeityPrexus        = 0x00000200,
-			bit_DeityQuellious     = 0x00000400,
-			bit_DeityRallosZek     = 0x00000800,
-			bit_DeityRodcetNife    = 0x00001000,
-			bit_DeitySolusekRo     = 0x00002000,
-			bit_DeityTheTribunal   = 0x00004000,
-			bit_DeityTunare        = 0x00008000,
-			bit_DeityVeeshan       = 0x00010000,
-			bit_DeityAll           = UINT32_MAX
+			bit_DeityPrexus = 0x00000200,
+			bit_DeityQuellious = 0x00000400,
+			bit_DeityRallosZek = 0x00000800,
+			bit_DeityRodcetNife = 0x00001000,
+			bit_DeitySolusekRo = 0x00002000,
+			bit_DeityTheTribunal = 0x00004000,
+			bit_DeityTunare = 0x00008000,
+			bit_DeityVeeshan = 0x00010000,
+			bit_DeityAll = 0xFFFFFFFF
 		};
 
-		extern DeityTypeBit GetDeityBitmask(DeityType deity_type);
-		extern std::string GetDeityName(DeityType deity_type);
-		extern const std::map<DeityType, std::string>& GetDeityMap();
+		extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
+		extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
+		extern const char* DeityName(DeityType deity_type);
 
 	} /*deity*/
 

common/discord/discord.cpp

@@ -27,6 +27,9 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
+	httplib::Headers headers = {
+		{"Content-Type", "application/json"}
+	};
 
 	// payload
 	Json::Value p;
@@ -93,6 +96,9 @@ void Discord::SendPlayerEventMessage(
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
+	httplib::Headers headers = {
+		{"Content-Type", "application/json"}
+	};
 
 	std::string payload = PlayerEventLogs::GetDiscordPayloadFromEvent(e);
 	if (payload.empty()) {

common/discord/discord_manager.cpp

@@ -37,7 +37,7 @@ void DiscordManager::ProcessMessageQueue()
 					message,
 					webhook.webhook_url
 				);
-				message.clear();
+				message = "";
 			}
 
 			message += m;
@@ -51,7 +51,7 @@ void DiscordManager::ProcessMessageQueue()
 						webhook.webhook_url
 					);
 				}
-				message.clear();
+				message = "";
 			}
 		}
 		// final flush

common/emu_constants.cpp

@@ -22,6 +22,7 @@
 #include "data_verification.h"
 #include "eqemu_logsys.h"
 #include "eqemu_logsys_log_aliases.h"
+#include "languages.h"
 #include "rulesys.h"
 
 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
@@ -158,49 +159,49 @@ int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
 	return 0;
 }
 
-const std::map<uint8, std::string>& EQ::constants::GetLanguageMap()
+const std::map<int, std::string>& EQ::constants::GetLanguageMap()
 {
-	static const std::map<uint8, std::string> language_map = {
-		{ Language::CommonTongue,  "Common Tongue" },
-		{ Language::Barbarian,     "Barbarian" },
-		{ Language::Erudian,       "Erudian" },
-		{ Language::Elvish,        "Elvish" },
-		{ Language::DarkElvish,    "Dark Elvish" },
-		{ Language::Dwarvish,      "Dwarvish" },
-		{ Language::Troll,         "Troll" },
-		{ Language::Ogre,          "Ogre" },
-		{ Language::Gnomish,       "Gnomish" },
-		{ Language::Halfling,      "Halfling" },
-		{ Language::ThievesCant,   "Thieves Cant" },
-		{ Language::OldErudian,    "Old Erudian" },
-		{ Language::ElderElvish,   "Elder Elvish" },
-		{ Language::Froglok,       "Froglok" },
-		{ Language::Goblin,        "Goblin" },
-		{ Language::Gnoll,         "Gnoll" },
-		{ Language::CombineTongue, "Combine Tongue" },
-		{ Language::ElderTeirDal,  "Elder Teir'Dal" },
-		{ Language::Lizardman,     "Lizardman" },
-		{ Language::Orcish,        "Orcish" },
-		{ Language::Faerie,        "Faerie" },
-		{ Language::Dragon,        "Dragon" },
-		{ Language::ElderDragon,   "Elder Dragon" },
-		{ Language::DarkSpeech,    "Dark Speech" },
-		{ Language::VahShir,       "Vah Shir" },
-		{ Language::Alaran,        "Alaran" },
-		{ Language::Hadal,         "Hadal" },
-		{ Language::Unknown27,     "Unknown" }
+	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(uint8 language_id)
+std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (!EQ::ValueWithin(language_id, Language::CommonTongue, Language::Unknown27)) {
-		return std::string();
+	if (EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+		return EQ::constants::GetLanguageMap().find(language_id)->second;
 	}
 
-	return EQ::constants::GetLanguageMap().find(language_id)->second;
+	return std::string();
 }
 
 const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
@@ -219,11 +220,11 @@ const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
 
 std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
 {
-	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
-		return std::string();
+	if (EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
 	}
 
-	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+	return std::string();
 }
 
 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
@@ -242,11 +243,11 @@ const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
 
 std::string EQ::constants::GetFlyModeName(int8 flymode_id)
 {
-	if (!EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
-		return std::string();
+	if (EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
+		return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
 	}
 
-	return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
+	return std::string();
 }
 
 const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
@@ -364,11 +365,11 @@ const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()
 
 std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
 {
-	if (!EQ::ValueWithin(faction_consider_level, ConsiderLevel::Ally, ConsiderLevel::Scowls)) {
-		return std::string();;
+	if (EQ::constants::GetConsiderLevelMap().find(faction_consider_level) != EQ::constants::GetConsiderLevelMap().end()) {
+		return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
 	}
 
-	return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
+	return std::string();
 }
 
 const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
@@ -385,11 +386,11 @@ const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
 
 std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
 {
-	if (!EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
-		return std::string();
+	if (EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
+		return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
 	}
 
-	return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
+	return std::string();
 }
 
 const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
@@ -406,11 +407,11 @@ const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
 
 std::string EQ::constants::GetStuckBehaviorName(uint8 behavior_id)
 {
-	if (!EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
-		return std::string();
+	if (EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
+		return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
 	}
 
-	return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
+	return std::string();
 }
 
 const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
@@ -428,11 +429,11 @@ const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
 
 std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
 {
-	if (!EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
-		return std::string();
+	if (EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
+		return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
 	}
 
-	return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
+	return std::string();
 }
 
 const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
@@ -506,11 +507,11 @@ const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
 
 std::string EQ::constants::GetObjectTypeName(int object_type)
 {
-	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
-		return std::string();
+	if (EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
+		return EQ::constants::GetObjectTypeMap().find(object_type)->second;
 	}
 
-	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
+	return std::string();
 }
 
 const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
@@ -526,11 +527,11 @@ const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
 
 std::string EQ::constants::GetWeatherTypeName(uint8 weather_type)
 {
-	if (!EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
-		return std::string();
+	if (EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
+		return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
 	}
 
-	return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
+	return std::string();
 }
 
 const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
@@ -552,17 +553,16 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
 
 std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 {
-	if (!EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
-		return std::string();
+	if (EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
+		return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
 	}
 
-	return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
+	return std::string();
 }
 
 const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
 {
 	static const std::map<uint8, std::string> emote_type_map = {
-		{ EmoteTypes::Say, "Say" },
 		{ EmoteTypes::Emote, "Emote" },
 		{ EmoteTypes::Shout, "Shout" },
 		{ EmoteTypes::Proximity, "Proximity" }
@@ -573,141 +573,8 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
 
 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (!EQ::ValueWithin(emote_type, EmoteTypes::Say, EmoteTypes::Proximity)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetAppearanceTypeMap()
-{
-	static const std::map<uint32, std::string> appearance_type_map = {
-		{ AppearanceType::Die, "Die" },
-		{ AppearanceType::WhoLevel, "Who Level" },
-		{ AppearanceType::MaxHealth, "Max Health" },
-		{ AppearanceType::Invisibility, "Invisibility" },
-		{ AppearanceType::PVP, "PVP" },
-		{ AppearanceType::Light, "Light" },
-		{ AppearanceType::Animation, "Animation" },
-		{ AppearanceType::Sneak, "Sneak" },
-		{ AppearanceType::SpawnID, "Spawn ID" },
-		{ AppearanceType::Health, "Health" },
-		{ AppearanceType::Linkdead, "Linkdead" },
-		{ AppearanceType::FlyMode, "Fly Mode" },
-		{ AppearanceType::GM, "GM" },
-		{ AppearanceType::Anonymous, "Anonymous" },
-		{ AppearanceType::GuildID, "Guild ID" },
-		{ AppearanceType::GuildRank, "Guild Rank" },
-		{ AppearanceType::AFK, "AFK" },
-		{ AppearanceType::Pet, "Pet" },
-		{ AppearanceType::Summoned, "Summoned" },
-		{ AppearanceType::Split, "Split" },
-		{ AppearanceType::Size, "Size" },
-		{ AppearanceType::SetType, "Set Type" },
-		{ AppearanceType::NPCName, "NPCName" },
-		{ AppearanceType::AARank, "AARank" },
-		{ AppearanceType::CancelSneakHide, "Cancel Sneak Hide" },
-		{ AppearanceType::AreaHealthRegen, "Area Health Regeneration" },
-		{ AppearanceType::AreaManaRegen, "Area Mana Regeneration" },
-		{ AppearanceType::AreaEnduranceRegen, "Area Endurance Regeneration" },
-		{ AppearanceType::FreezeBeneficialBuffs, "Freeze Beneficial Buffs" },
-		{ AppearanceType::NPCTintIndex, "NPC Tint Index" },
-		{ AppearanceType::GroupAutoConsent, "Group Auto Consent" },
-		{ AppearanceType::RaidAutoConsent, "Raid Auto Consent" },
-		{ AppearanceType::GuildAutoConsent, "Guild Auto Consent" },
-		{ AppearanceType::ShowHelm, "Show Helm" },
-		{ AppearanceType::DamageState, "Damage State" },
-		{ AppearanceType::EQPlayers, "EQ Players" },
-		{ AppearanceType::FindBits, "Find Bits" },
-		{ AppearanceType::TextureType, "Texture Type" },
-		{ AppearanceType::FacePick, "Face Pick" },
-		{ AppearanceType::AntiCheat, "Anti Cheat" },
-		{ AppearanceType::GuildShow, "Guild Show" },
-		{ AppearanceType::OfflineMode, "Offline Mode" }
-	};
-
-	return appearance_type_map;
-}
-
-std::string EQ::constants::GetAppearanceTypeName(uint32 appearance_type)
-{
-	const auto& a = EQ::constants::GetAppearanceTypeMap().find(appearance_type);
-	if (a != EQ::constants::GetAppearanceTypeMap().end()) {
-		return a->second;
-	}
-
-	return std::string();
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetSpecialAbilityMap()
-{
-	static const std::map<uint32, std::string> special_ability_map = {
-		{ SPECATK_SUMMON,            "Summon" },
-		{ SPECATK_ENRAGE,            "Enrage" },
-		{ SPECATK_RAMPAGE,           "Rampage" },
-		{ SPECATK_AREA_RAMPAGE,      "Area Rampage" },
-		{ SPECATK_FLURRY,            "Flurry" },
-		{ SPECATK_TRIPLE,            "Triple Attack" },
-		{ SPECATK_QUAD,              "Quadruple Attack" },
-		{ SPECATK_INNATE_DW,         "Dual Wield" },
-		{ SPECATK_BANE,              "Bane Attack" },
-		{ SPECATK_MAGICAL,           "Magical Attack" },
-		{ SPECATK_RANGED_ATK,        "Ranged Attack" },
-		{ UNSLOWABLE,                "Immune to Slow" },
-		{ UNMEZABLE,                 "Immune to Mesmerize" },
-		{ UNCHARMABLE,               "Immune to Charm" },
-		{ UNSTUNABLE,                "Immune to Stun" },
-		{ UNSNAREABLE,               "Immune to Snare" },
-		{ UNFEARABLE,                "Immune to Fear" },
-		{ UNDISPELLABLE,             "Immune to Dispell" },
-		{ IMMUNE_MELEE,              "Immune to Melee" },
-		{ IMMUNE_MAGIC,              "Immune to Magic" },
-		{ IMMUNE_FLEEING,            "Immune to Fleeing" },
-		{ IMMUNE_MELEE_EXCEPT_BANE,  "Immune to Melee except Bane" },
-		{ IMMUNE_MELEE_NONMAGICAL,   "Immune to Non-Magical Melee" },
-		{ IMMUNE_AGGRO,              "Immune to Aggro" },
-		{ IMMUNE_AGGRO_ON,           "Immune to Being Aggro" },
-		{ IMMUNE_CASTING_FROM_RANGE, "Immune to Ranged Spells" },
-		{ IMMUNE_FEIGN_DEATH,        "Immune to Feign Death" },
-		{ IMMUNE_TAUNT,              "Immune to Taunt" },
-		{ NPC_TUNNELVISION,          "Tunnel Vision" },
-		{ NPC_NO_BUFFHEAL_FRIENDS,   "Does Not Heal of Buff Allies" },
-		{ IMMUNE_PACIFY,             "Immune to Pacify" },
-		{ LEASH,                     "Leashed" },
-		{ TETHER,                    "Tethered" },
-		{ DESTRUCTIBLE_OBJECT,       "Destructible Object" },
-		{ NO_HARM_FROM_CLIENT,       "Immune to Harm from Client" },
-		{ ALWAYS_FLEE,               "Always Flees" },
-		{ FLEE_PERCENT,              "Flee Percentage" },
-		{ ALLOW_BENEFICIAL,          "Allows Beneficial Spells" },
-		{ DISABLE_MELEE,             "Melee is Disabled" },
-		{ NPC_CHASE_DISTANCE,        "Chase Distance" },
-		{ ALLOW_TO_TANK,             "Allowed to Tank" },
-		{ IGNORE_ROOT_AGGRO_RULES,   "Ignores Root Aggro" },
-		{ CASTING_RESIST_DIFF,       "Casting Resist Difficulty" },
-		{ COUNTER_AVOID_DAMAGE,      "Counter Damage Avoidance" },
-		{ PROX_AGGRO,                "Proximity Aggro" },
-		{ IMMUNE_RANGED_ATTACKS,     "Immune to Ranged Attacks" },
-		{ IMMUNE_DAMAGE_CLIENT,      "Immune to Client Damage" },
-		{ IMMUNE_DAMAGE_NPC,         "Immune to NPC Damage" },
-		{ IMMUNE_AGGRO_CLIENT,       "Immune to Client Aggro" },
-		{ IMMUNE_AGGRO_NPC,          "Immune to NPC Aggro" },
-		{ MODIFY_AVOID_DAMAGE,       "Modify Damage Avoidance" },
-		{ IMMUNE_FADING_MEMORIES,    "Immune to Memory Fades" },
-		{ IMMUNE_OPEN,               "Immune to Open" },
-		{ IMMUNE_ASSASSINATE,        "Immune to Assassinate" },
-		{ IMMUNE_HEADSHOT,           "Immune to Headshot" },
-	};
-
-	return special_ability_map;
-}
-
-std::string EQ::constants::GetSpecialAbilityName(uint32 ability_id)
-{
-	const auto& a = EQ::constants::GetSpecialAbilityMap().find(ability_id);
-	if (a != EQ::constants::GetSpecialAbilityMap().end()) {
-		return a->second;
+	if (EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
+		return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 	}
 
 	return std::string();

common/emu_constants.h

@@ -350,7 +350,6 @@ namespace EQ
 		};
 
 		enum EmoteTypes : uint8 {
-			Say,
 			Emote,
 			Shout,
 			Proximity
@@ -359,8 +358,8 @@ namespace EQ
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);
 
-		extern const std::map<uint8, std::string>& GetLanguageMap();
-		std::string GetLanguageName(uint8 language_id);
+		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);
@@ -398,12 +397,6 @@ namespace EQ
 		extern const std::map<uint8, std::string>& GetEmoteTypeMap();
 		std::string GetEmoteTypeName(uint8 emote_type);
 
-		extern const std::map<uint32, std::string>& GetAppearanceTypeMap();
-		std::string GetAppearanceTypeName(uint32 animation_type);
-
-		extern const std::map<uint32, std::string>& GetSpecialAbilityMap();
-		std::string GetSpecialAbilityName(uint32 ability_id);
-
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;
@@ -600,88 +593,4 @@ enum class ApplySpellType {
 	Raid
 };
 
-enum {
-	SPECATK_SUMMON            = 1,
-	SPECATK_ENRAGE            = 2,
-	SPECATK_RAMPAGE           = 3,
-	SPECATK_AREA_RAMPAGE      = 4,
-	SPECATK_FLURRY            = 5,
-	SPECATK_TRIPLE            = 6,
-	SPECATK_QUAD              = 7,
-	SPECATK_INNATE_DW         = 8,
-	SPECATK_BANE              = 9,
-	SPECATK_MAGICAL           = 10,
-	SPECATK_RANGED_ATK        = 11,
-	UNSLOWABLE                = 12,
-	UNMEZABLE                 = 13,
-	UNCHARMABLE               = 14,
-	UNSTUNABLE                = 15,
-	UNSNAREABLE               = 16,
-	UNFEARABLE                = 17,
-	UNDISPELLABLE             = 18,
-	IMMUNE_MELEE              = 19,
-	IMMUNE_MAGIC              = 20,
-	IMMUNE_FLEEING            = 21,
-	IMMUNE_MELEE_EXCEPT_BANE  = 22,
-	IMMUNE_MELEE_NONMAGICAL   = 23,
-	IMMUNE_AGGRO              = 24,
-	IMMUNE_AGGRO_ON           = 25,
-	IMMUNE_CASTING_FROM_RANGE = 26,
-	IMMUNE_FEIGN_DEATH        = 27,
-	IMMUNE_TAUNT              = 28,
-	NPC_TUNNELVISION          = 29,
-	NPC_NO_BUFFHEAL_FRIENDS   = 30,
-	IMMUNE_PACIFY             = 31,
-	LEASH                     = 32,
-	TETHER                    = 33,
-	DESTRUCTIBLE_OBJECT       = 34,
-	NO_HARM_FROM_CLIENT       = 35,
-	ALWAYS_FLEE               = 36,
-	FLEE_PERCENT              = 37,
-	ALLOW_BENEFICIAL          = 38,
-	DISABLE_MELEE             = 39,
-	NPC_CHASE_DISTANCE        = 40,
-	ALLOW_TO_TANK             = 41,
-	IGNORE_ROOT_AGGRO_RULES   = 42,
-	CASTING_RESIST_DIFF       = 43,
-	COUNTER_AVOID_DAMAGE      = 44, // Modify by percent NPC's opponents chance to riposte, block, parry or dodge individually, or for all skills
-	PROX_AGGRO                = 45,
-	IMMUNE_RANGED_ATTACKS     = 46,
-	IMMUNE_DAMAGE_CLIENT      = 47,
-	IMMUNE_DAMAGE_NPC         = 48,
-	IMMUNE_AGGRO_CLIENT       = 49,
-	IMMUNE_AGGRO_NPC          = 50,
-	MODIFY_AVOID_DAMAGE       = 51, // Modify by percent the NPCs chance to riposte, block, parry or dodge individually, or for all skills
-	IMMUNE_FADING_MEMORIES    = 52,
-	IMMUNE_OPEN               = 53,
-	IMMUNE_ASSASSINATE        = 54,
-	IMMUNE_HEADSHOT           = 55,
-	MAX_SPECIAL_ATTACK        = 56
-};
-
-
-namespace HeroicBonusBucket
-{
-	const std::string WisMaxMana 			= "HWIS-MaxMana";
-	const std::string WisManaRegen			= "HWIS-ManaRegen";
-	const std::string WisHealAmt			= "HWIS-HealAmt";
-	const std::string IntMaxMana			= "HINT-MaxMana";
-	const std::string IntManaRegen			= "HINT-ManaRegen";
-	const std::string IntSpellDmg			= "HINT-SpellDmg";
-	const std::string StrMeleeDamage		= "HSTR-MeleeDamage";
-	const std::string StrShieldAC			= "HSTR-ShieldAC";
-	const std::string StrMaxEndurance		= "HSTR-MaxEndurance";
-	const std::string StrEnduranceRegen		= "HSTR-EnduranceRegen";
-	const std::string StaMaxHP			= "HSTA-MaxHP";
-	const std::string StaHPRegen			= "HSTA-HPRegen";
-	const std::string StaMaxEndurance		= "HSTA-MaxEndurance";
-	const std::string StaEnduranceRegen		= "HSTA-EnduranceRegen";
-	const std::string AgiAvoidance			= "HAGI-Avoidance";
-	const std::string AgiMaxEndurance		= "HAGI-MaxEndurance";
-	const std::string AgiEnduranceRegen		= "HAGI-EnduranceRegen";
-	const std::string DexRangedDamage		= "HDEX-RangedDamage";
-	const std::string DexMaxEndurance		= "HDEX-MaxEndurance";
-	const std::string DexEnduranceRegen		= "HDEX-EnduranceRegen";
-}
-
 #endif /*COMMON_EMU_CONSTANTS_H*/

common/emu_oplist.h

@@ -62,7 +62,6 @@ N(OP_BeginCast),
 N(OP_Bind_Wound),
 N(OP_BlockedBuffs),
 N(OP_BoardBoat),
-N(OP_BookButton),
 N(OP_Buff),
 N(OP_BuffCreate),
 N(OP_BuffRemoveRequest),
@@ -228,7 +227,6 @@ N(OP_GuildBank),
 N(OP_GuildBankItemList),
 N(OP_GuildCreate),
 N(OP_GuildDelete),
-N(OP_GuildDeleteGuild),
 N(OP_GuildDemote),
 N(OP_GuildInvite),
 N(OP_GuildInviteAccept),
@@ -240,33 +238,15 @@ N(OP_GuildManageStatus),
 N(OP_GuildMemberLevelUpdate),
 N(OP_GuildMemberList),
 N(OP_GuildMemberUpdate),
-N(OP_GuildMemberLevel),
-N(OP_GuildMemberRankAltBanker),
-N(OP_GuildMemberPublicNote),
-N(OP_GuildMemberAdd),
-N(OP_GuildMemberRename),
-N(OP_GuildMemberDelete),
-N(OP_GuildMemberDetails),
-N(OP_GuildRenameGuild),
 N(OP_GuildMOTD),
 N(OP_GuildPeace),
 N(OP_GuildPromote),
 N(OP_GuildPublicNote),
 N(OP_GuildRemove),
-N(OP_GuildSelectTribute),
-N(OP_GuildModifyBenefits),
-N(OP_GuildTributeToggleReq),
-N(OP_GuildTributeToggleReply),
-N(OP_GuildOptInOut),
-N(OP_GuildSaveActiveTributes),
-N(OP_GuildSendActiveTributes),
-N(OP_GuildTributeFavorAndTimer),
 N(OP_GuildsList),
 N(OP_GuildStatus),
 N(OP_GuildTributeInfo),
-N(OP_GuildUpdate),
-N(OP_GuildTributeDonateItem),
-N(OP_GuildTributeDonatePlat),
+N(OP_GuildUpdateURLAndChannel),
 N(OP_GuildWar),
 N(OP_Heartbeat),
 N(OP_Hide),
@@ -336,7 +316,6 @@ N(OP_LootRequest),
 N(OP_ManaChange),
 N(OP_ManaUpdate),
 N(OP_MarkNPC),
-N(OP_MarkRaidNPC),
 N(OP_Marquee),
 N(OP_MemorizeSpell),
 N(OP_Mend),
@@ -419,8 +398,6 @@ N(OP_PVPLeaderBoardRequest),
 N(OP_PVPStats),
 N(OP_QueryResponseThing),
 N(OP_QueryUCSServerStatus),
-N(OP_RaidDelegateAbility),
-N(OP_RaidClearNPCMarks),
 N(OP_RaidInvite),
 N(OP_RaidJoin),
 N(OP_RaidUpdate),
@@ -444,7 +421,6 @@ N(OP_ReqClientSpawn),
 N(OP_ReqNewZone),
 N(OP_RequestClientZoneChange),
 N(OP_RequestDuel),
-N(OP_RequestGuildTributes),
 N(OP_RequestKnowledgeBase),
 N(OP_RequestTitles),
 N(OP_RespawnWindow),

common/eq_constants.h

@@ -23,59 +23,61 @@
 #include "skills.h"
 #include "types.h"
 
-namespace AppearanceType {
-	constexpr uint32 Die                   = 0; // Causes the client to keel over and zone to bind point (default action)
-	constexpr uint32 WhoLevel              = 1; // Level that shows up on /who
-	constexpr uint32 MaxHealth             = 2;
-	constexpr uint32 Invisibility          = 3; // 0 = Visible, 1 = Invisible
-	constexpr uint32 PVP                   = 4; // 0 = Non-PVP, 1 = PVP
-	constexpr uint32 Light                 = 5; // Light type emitted by player (lightstone, shiny shield)
-	constexpr uint32 Animation             = 14; // 100 = Standing, 102 = Freeze, 105 = Looting, 110 = Sitting, 111 = Crouching, 115 = Lying
-	constexpr uint32 Sneak                 = 15; // 0 = Normal, 1 = Sneaking
-	constexpr uint32 SpawnID               = 16; // Server -> Client, sets player spawn ID
-	constexpr uint32 Health                = 17; // Client->Server, my HP has changed (like regen tic)
-	constexpr uint32 Linkdead              = 18; // 0 = Normal, 1 = Linkdead
-	constexpr uint32 FlyMode               = 19; // 0 = Off, 1 = Flying, 2 = Levitating, 3 = Water, 4 = Floating, 5 = Levitating while Running
-	constexpr uint32 GM                    = 20; // 0 = Non-GM, 1 = GM
-	constexpr uint32 Anonymous             = 21; // 0 = Non-Anonymous, 1 = Anonymous, 2 = Roleplaying
-	constexpr uint32 GuildID               = 22;
-	constexpr uint32 GuildRank             = 23;
-	constexpr uint32 AFK                   = 24; // 0 = Non-AFK, 1 = AFK
-	constexpr uint32 Pet                   = 25; // Parameter is Entity ID of owner, or 0 for when charm breaks
-	constexpr uint32 Summoned              = 27;
-	constexpr uint32 Split                 = 28; // 0 = No Split, 1 = Auto Split
-	constexpr uint32 Size                  = 29; // Spawn's Size
-	constexpr uint32 SetType               = 30; // 0 = PC, 1 = NPC, 2 = Corpse
-	constexpr uint32 NPCName               = 31; // Change PC name color to NPC name color
-	constexpr uint32 AARank                = 32; // AA Rank Title ID, title in /who?
-	constexpr uint32 CancelSneakHide       = 33; // Turns off Hide and Sneak
-	constexpr uint32 AreaHealthRegen       = 35; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 AreaManaRegen         = 36; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 AreaEnduranceRegen    = 37; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 FreezeBeneficialBuffs = 38; // Freezes beneficial buff timers for PCs
-	constexpr uint32 NPCTintIndex          = 39;
-	constexpr uint32 GroupAutoConsent      = 40; // Auto Consent Group
-	constexpr uint32 RaidAutoConsent       = 41; // Auto Consent Raid
-	constexpr uint32 GuildAutoConsent      = 42; // Auto Consent Guild
-	constexpr uint32 ShowHelm              = 43; // 0 = Hide, 1 = Show
-	constexpr uint32 DamageState           = 44; // The damage state of a destructible object (0 through 10) plays sound IDs, most only have 2 or 4 states though
-	constexpr uint32 EQPlayers             = 45; // EQ Players Update
-	constexpr uint32 FindBits              = 46; // Set Find Bits?
-	constexpr uint32 TextureType           = 48; // Texture Type?
-	constexpr uint32 FacePick              = 49; // Turns off face pick window?
-	constexpr uint32 AntiCheat             = 51; // Sent by the client randomly telling the server how long since last action has occurred
-	constexpr uint32 GuildShow             = 52;
-	constexpr uint32 OfflineMode           = 53; // Offline Mode
-}
 
-namespace Animation {
-	constexpr uint32 Standing  = 100;
-	constexpr uint32 Freeze    = 102;
-	constexpr uint32 Looting   = 105;
-	constexpr uint32 Sitting   = 110;
-	constexpr uint32 Crouching = 111;
-	constexpr uint32 Lying     = 115;
-}
+//SpawnAppearance types: (compared two clients for server-originating types: SoF & RoF2)
+#define AT_Die 0			// this causes the client to keel over and zone to bind point (default action)
+#define AT_WhoLevel 1		// the level that shows up on /who
+#define AT_HPMax 2			// idk
+#define AT_Invis 3			// 0 = visible, 1 = invisible
+#define AT_PVP 4			// 0 = blue, 1 = pvp (red)
+#define AT_Light 5			// light type emitted by player (lightstone, shiny shield)
+#define AT_Anim 14			// 100=standing, 110=sitting, 111=ducking, 115=feigned, 105=looting
+#define AT_Sneak 15			// 0 = normal, 1 = sneaking
+#define AT_SpawnID 16		// server to client, sets player spawn id
+#define AT_HP 17			// Client->Server, my HP has changed (like regen tic)
+#define AT_Linkdead 18		// 0 = normal, 1 = linkdead
+#define AT_Levitate 19		// 0=off, 1=flymode, 2=levitate max 5, see GravityBehavior enum
+#define AT_GM 20			// 0 = normal, 1 = GM - all odd numbers seem to make it GM
+#define AT_Anon 21			// 0 = normal, 1 = anon, 2 = roleplay
+#define AT_GuildID 22
+#define AT_GuildRank 23		// 0=member, 1=officer, 2=leader
+#define AT_AFK 24			// 0 = normal, 1 = afk
+#define AT_Pet 25			// Param is EntityID of owner, or 0 for when charm breaks
+#define AT_Summoned 27		// Unsure
+#define AT_Split 28			// 0 = normal, 1 = autosplit on (not showing in SoF+) (client-to-server only)
+#define AT_Size 29			// spawn's size (present: SoF, absent: RoF2)
+#define AT_SetType 30		// 0 = PC, 1 = NPC, 2 <= = corpse
+#define AT_NPCName 31		// change PC's name's color to NPC color 0 = normal, 1 = npc name, Trader on RoF2?
+#define AT_AARank 32		// AA Rank Title ID thingy, does is this the title in /who?
+#define AT_CancelSneakHide 33	// Turns off Hide and Sneak
+//#define AT_34 34			// unknown (present: SoF, absent: RoF2)
+#define AT_AreaHPRegen 35	// guild hall regen pool sets to value * 0.001
+#define AT_AreaManaRegen 36	// guild hall regen pool sets to value * 0.001
+#define AT_AreaEndRegen 37	// guild hall regen pool sets to value * 0.001
+#define AT_FreezeBuffs 38	// Freezes beneficial buff timers
+#define AT_NpcTintIndex 39	// not 100% sure
+#define AT_GroupConsent 40	// auto consent group
+#define AT_RaidConsent 41	// auto consent raid
+#define AT_GuildConsent 42	// auto consent guild
+#define AT_ShowHelm 43		// 0 = hide graphic, 1 = show graphic
+#define AT_DamageState 44	// The damage state of a destructible object (0 through 10) plays soundids most only have 2 or 4 states though
+#define AT_EQPlayers 45		// /eqplayersupdate
+#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
+
+//#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)
+
+// animations for AT_Anim
+#define ANIM_FREEZE	    102
+#define	ANIM_STAND		0x64
+#define	ANIM_SIT		0x6e
+#define	ANIM_CROUCH		0x6f
+#define	ANIM_DEATH		0x73
+#define ANIM_LOOT		0x69
 
 constexpr int16 RECAST_TYPE_UNLINKED_ITEM = -1;
 
@@ -684,53 +686,6 @@ namespace Zones {
 	constexpr uint16 APPRENTICE = 999; // Designer Apprentice
 }
 
-namespace Language {
-	constexpr uint8 CommonTongue  = 0;
-	constexpr uint8 Barbarian     = 1;
-	constexpr uint8 Erudian       = 2;
-	constexpr uint8 Elvish        = 3;
-	constexpr uint8 DarkElvish    = 4;
-	constexpr uint8 Dwarvish      = 5;
-	constexpr uint8 Troll         = 6;
-	constexpr uint8 Ogre          = 7;
-	constexpr uint8 Gnomish       = 8;
-	constexpr uint8 Halfling      = 9;
-	constexpr uint8 ThievesCant   = 10;
-	constexpr uint8 OldErudian    = 11;
-	constexpr uint8 ElderElvish   = 12;
-	constexpr uint8 Froglok       = 13;
-	constexpr uint8 Goblin        = 14;
-	constexpr uint8 Gnoll         = 15;
-	constexpr uint8 CombineTongue = 16;
-	constexpr uint8 ElderTeirDal  = 17;
-	constexpr uint8 Lizardman     = 18;
-	constexpr uint8 Orcish        = 19;
-	constexpr uint8 Faerie        = 20;
-	constexpr uint8 Dragon        = 21;
-	constexpr uint8 ElderDragon   = 22;
-	constexpr uint8 DarkSpeech    = 23;
-	constexpr uint8 VahShir       = 24;
-	constexpr uint8 Alaran        = 25;
-	constexpr uint8 Hadal         = 26;
-	constexpr uint8 Unknown27     = 27;
-
-	constexpr uint8 MaxValue = 100;
-}
-namespace PetInfoType {
-	constexpr int Current   = 0;
-	constexpr int Suspended = 1;
-}
-
-namespace BuffEffectType {
-	constexpr uint8 None        = 0;
-	constexpr uint8 Buff        = 2;
-	constexpr uint8 InverseBuff = 4;
-}
-
-namespace AlternateCurrencyMode {
-	constexpr uint32 Update   = 7;
-	constexpr uint32 Populate = 8;
-}
 
 typedef enum {
 	FilterNone = 0,
@@ -1090,41 +1045,4 @@ enum ResurrectionActions
 	Accept
 };
 
-enum ScribeSpellActions
-{
-	Scribe,
-	Memorize,
-	Unmemorize
-};
-
-enum SpellTimeRestrictions
-{
-	NoRestriction,
-	Day,
-	Night
-};
-
-enum MoneyTypes
-{
-	Copper,
-	Silver,
-	Gold,
-	Platinum
-};
-
-enum MoneySubtypes
-{
-	Personal,
-	Bank,
-	Cursor,
-	SharedBank // Platinum Only
-};
-
-namespace RaidLootType {
-	constexpr uint32 LeaderOnly                = 1;
-	constexpr uint32 LeaderAndGroupLeadersOnly = 2;
-	constexpr uint32 LeaderSelected            = 3;
-	constexpr uint32 EntireRaid                = 4;
-}
-
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/eq_limits.h

@@ -129,7 +129,7 @@ namespace EQ
 
 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
-				const InventoryTypeSize_Struct& InventoryTypeSize,
+				InventoryTypeSize_Struct InventoryTypeSize,
 				uint64 EquipmentBitmask,
 				uint64 GeneralBitmask,
 				uint64 CursorBitmask,

common/eq_packet.cpp

@@ -236,6 +236,26 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 	return size+OpCodeBytes;
 }
 
+/*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len)
+:	BasePacket(buf, len),
+	opcode(op)
+{
+
+uint32 offset;
+	opcode=ntohs(*(const uint16 *)buf);
+	offset=2;
+
+	if (len-offset) {
+		pBuffer= new unsigned char[len-offset];
+		memcpy(pBuffer,buf+offset,len-offset);
+		size=len-offset;
+	} else {
+		pBuffer=nullptr;
+		size=0;
+	}
+	OpMgr=&RawOpcodeManager;
+}*/
+
 bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
 bool result=false;
@@ -267,6 +287,74 @@ bool result=false;
 
 }
 
+/*
+this is the code to do app-layer combining, instead of protocol layer.
+this was taken out due to complex interactions with the opcode manager,
+and will require a bit more thinking (likely moving into EQStream) to
+get running again... but might be a good thing some day.
+
+bool EQApplicationPacket::combine(const EQApplicationPacket *rhs)
+{
+uint32 newsize=0, offset=0;
+unsigned char *tmpbuffer=nullptr;
+
+	if (opcode!=OP_AppCombined) {
+		newsize=app_opcode_size+size+(size>254?3:1)+app_opcode_size+rhs->size+(rhs->size>254?3:1);
+		tmpbuffer=new unsigned char [newsize];
+		offset=0;
+		if (size>254) {
+			tmpbuffer[offset++]=0xff;
+			*(uint16 *)(tmpbuffer+offset)=htons(size);
+			offset+=1;
+		} else {
+			tmpbuffer[offset++]=size;
+		}
+		offset+=serialize(tmpbuffer+offset);
+	} else {
+		newsize=size+app_opcode_size+rhs->size+(rhs->size>254?3:1);
+		tmpbuffer=new unsigned char [newsize];
+		memcpy(tmpbuffer,pBuffer,size);
+		offset=size;
+	}
+
+	if (rhs->size>254) {
+		tmpbuffer[offset++]=0xff;
+		*(uint16 *)(tmpbuffer+offset)=htons(rhs->size);
+		offset+=1;
+	} else {
+		tmpbuffer[offset++]=rhs->size;
+	}
+	offset+=rhs->serialize(tmpbuffer+offset);
+
+	size=offset;
+	opcode=OP_AppCombined;
+
+	delete[] pBuffer;
+	pBuffer=tmpbuffer;
+
+	return true;
+}
+*/
+
+bool EQProtocolPacket::ValidateCRC(const unsigned char *buffer, int length, uint32 Key)
+{
+bool valid=false;
+	// OP_SessionRequest, OP_SessionResponse, OP_OutOfSession are not CRC'd
+	if (buffer[0]==0x00 && (buffer[1]==OP_SessionRequest || buffer[1]==OP_SessionResponse || buffer[1]==OP_OutOfSession)) {
+		valid=true;
+	} else {
+		uint16 comp_crc=CRC16(buffer,length-2,Key);
+		uint16 packet_crc=ntohs(*(const uint16 *)(buffer+length-2));
+#ifdef EQN_DEBUG
+		if (packet_crc && comp_crc != packet_crc) {
+			std::cout << "CRC mismatch: comp=" << std::hex << comp_crc << ", packet=" << packet_crc << std::dec << std::endl;
+		}
+#endif
+		valid = (!packet_crc || comp_crc == packet_crc);
+	}
+	return valid;
+}
+
 uint32 EQProtocolPacket::Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize)
 {
 uint32 newlen=0;
@@ -315,6 +403,55 @@ uint32 flag_offset=1,newlength;
 	return newlength;
 }
 
+void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey)
+{
+	if ((size >= 2) && buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
+		int Key=DecodeKey;
+		unsigned char *test=(unsigned char *)malloc(size);
+		buffer+=2;
+		size-=2;
+
+		int i;
+		for (i = 0 ; i+4 <= size ; i+=4)
+		{
+			int pt = (*(int*)&buffer[i])^(Key);
+			Key = (*(int*)&buffer[i]);
+			*(int*)&test[i]=pt;
+		}
+		unsigned char KC=Key&0xFF;
+		for ( ; i < size ; i++)
+		{
+			test[i]=buffer[i]^KC;
+		}
+		memcpy(buffer,test,size);
+		free(test);
+	}
+}
+
+void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey)
+{
+	if (buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
+		int Key=EncodeKey;
+		char *test=(char*)malloc(size);
+		int i;
+		buffer+=2;
+		size-=2;
+		for ( i = 0 ; i+4 <= size ; i+=4)
+		{
+			int pt = (*(int*)&buffer[i])^(Key);
+			Key = pt;
+			*(int*)&test[i]=pt;
+		}
+		unsigned char KC=Key&0xFF;
+		for ( ; i < size ; i++)
+		{
+			test[i]=buffer[i]^KC;
+		}
+		memcpy(buffer,test,size);
+		free(test);
+	}
+}
+
 EQApplicationPacket *EQApplicationPacket::Copy() const {
 	return(new EQApplicationPacket(*this));
 }
@@ -378,4 +515,4 @@ std::string DumpPacketToString(const EQApplicationPacket* app){
 	std::ostringstream out;
 	out << DumpPacketHexToString(app->pBuffer, app->size);
 	return out.str();
-}
+}

common/eq_packet.h

@@ -80,8 +80,11 @@ public:
 
 protected:
 
+	static bool ValidateCRC(const unsigned char *buffer, int length, uint32 Key);
 	static uint32 Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
 	static uint32 Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
+	static void ChatDecode(unsigned char *buffer, int size, int DecodeKey);
+	static void ChatEncode(unsigned char *buffer, int size, int EncodeKey);
 
 	uint16 GetRawOpcode() const { return(opcode); }
 

common/eq_packet_structs.h

@@ -124,12 +124,6 @@ struct LDoNTrapTemplate
 	uint8 locked;
 };
 
-enum CrystalReclaimTypes
-{
-	Ebon = 5,
-	Radiant = 4,
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 
 
@@ -314,7 +308,6 @@ union
 	uint32 DestructibleUnk9;
 	bool targetable_with_hotkey;
 	bool show_name;
-	bool guild_show;
 };
 
 struct PlayerState_Struct {
@@ -393,7 +386,7 @@ struct NewZone_Struct {
 /*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*/	uint32 lava_damage; // Seen 50
 /*0732*/	uint32 min_lava_damage; // Seen 10
-/*0736*/	float safe_heading;
+/*0736*/
 };
 
 /*
@@ -632,12 +625,6 @@ struct ConsentResponse_Struct {
 	char zonename[32];
 };
 
-struct NameApproval_Struct {
-	char name[64];
-	uint32 race_id;
-	uint32 class_id;
-};
-
 /*
 ** Name Generator Struct
 ** Length: 72 bytes
@@ -1678,68 +1665,6 @@ struct GuildUpdate_Struct {
 	GuildsListEntry_Struct entry;
 };
 
-struct GuildMemberAdd_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown04;
-	/*008*/ uint32 unknown08;
-	/*012*/ uint32 unknown12;
-	/*016*/ uint32 level;
-	/*020*/ uint32 class_;
-	/*024*/ uint32 rank_;
-	/*028*/ uint32 guild_show;
-	/*032*/ uint32 zone_id;
-	/*036*/ uint32 last_on;
-	/*040*/ char   player_name[64];
-};
-
-struct GuildMemberLevel_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ uint32 level;
-};
-
-struct GuildMemberRank_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 rank_;
-	/*008*/ char   player_name[64];
-	/*072*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker.  Banker not functional for RoF2+
-	/*076*/ uint32 offline;
-};
-
-struct GuildMemberPublicNote_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ char   public_note[256]; //RoF2 256
-};
-
-struct GuildDelete_Struct {
-	/*000*/ uint32 guild_id;
-};
-
-struct GuildRenameGuild_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   new_guild_name[64];
-};
-
-struct GuildRenameMember_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ char   new_player_name[64];
-};
-
-struct GuildMemberDetails_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ uint32 zone_id;
-	/*072*/ uint32 last_on;
-	/*076*/ uint32 offline_mode; //1 Offline
-};
-
-struct GuildMemberDelete_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -1788,10 +1713,10 @@ struct GuildJoin_Struct{
 /*092*/
 };
 struct GuildInviteAccept_Struct {
-	char   inviter[64];
-	char   new_member[64];
+	char inviter[64];
+	char newmember[64];
 	uint32 response;
-	uint32 guild_id;
+	uint32 guildeqid;
 };
 struct GuildManageRemove_Struct {
 	uint32 guildeqid;
@@ -1823,14 +1748,6 @@ struct PopupResponse_Struct {
 /*0004*/	uint32	popupid;
 };
 
-enum GuildInformationActions
-{
-    GuildUpdateURL          = 0,
-    GuildUpdateChannel      = 1,
-    GuildUpdateRanks        = 4,
-    GuildUpdatePermissions  = 5
-};
-
 struct GuildManageBanker_Struct {
 	uint32 unknown0;
 	char myname[64];
@@ -1844,9 +1761,9 @@ struct GuildSetRank_Struct
 {
 /*00*/	uint32	Unknown00;
 /*04*/	uint32	Unknown04;
-/*08*/	uint32	rank;
-/*12*/	char	member_name[64];
-/*76*/	uint32	banker;
+/*08*/	uint32	Rank;
+/*12*/	char	MemberName[64];
+/*76*/	uint32	Banker;
 /*80*/
 };
 
@@ -1876,17 +1793,6 @@ struct GMSummon_Struct {
 /*104*/	uint32	unknown2; // E0 E0 56 00
 };
 
-struct GMFind_Struct {
-	char	charname[64];
-	char	gmname[64];
-	uint32	success;
-	uint32	zoneID;
-	float	x;
-	float	y;
-	float	z;
-	uint32	unknown2;
-};
-
 struct GMGoto_Struct { // x,y is swapped as compared to summon and makes sense as own packet
 /*  0*/ char	charname[64];
 
@@ -2642,10 +2548,7 @@ struct GMEmoteZone_Struct {
 struct BookText_Struct {
 	uint8 window;	// where to display the text (0xFF means new window)
 	uint8 type;		//type: 0=scroll, 1=book, 2=item info.. prolly others.
-	int16 invslot;  // Only used in SoF and later clients.
-	int32 target_id;
-	int8 can_cast;
-	int8 can_scribe;
+	uint32 invslot;	// Only used in SoF and later clients.
 	char booktext[1]; // Variable Length
 };
 // This is the request to read a book.
@@ -2654,18 +2557,11 @@ struct BookText_Struct {
 struct BookRequest_Struct {
 	uint8 window;	// where to display the text (0xFF means new window)
 	uint8 type;		//type: 0=scroll, 1=book, 2=item info.. prolly others.
-	int16 invslot;  // Only used in Sof and later clients;
-	int32 target_id;
+	uint32 invslot;	// Only used in Sof and later clients;
+	int16 subslot; // The subslot inside of a bag if it is inside one.
 	char txtfile[20];
 };
 
-// used by Scribe and CastSpell book buttons
-struct BookButton_Struct
-{
-	int16 invslot;   // server slot
-	int32 target_id;
-};
-
 /*
 ** Object/Ground Spawn struct
 ** Used for Forges, Ovens, ground spawns, items dropped to ground, etc
@@ -2677,11 +2573,11 @@ struct BookButton_Struct
 struct Object_Struct {
 /*00*/	uint32	linked_list_addr[2];// They are, get this, prev and next, ala linked list
 /*08*/	float	size;				//
-/*10*/	uint16	solid_type;			//
+/*10*/	uint16	solidtype;			//
 /*12*/	uint32	drop_id;			// Unique object id for zone
 /*16*/	uint16	zone_id;			// Redudant, but: Zone the object appears in
 /*18*/	uint16	zone_instance;		//
-/*20*/	uint32	incline;			//
+/*20*/	uint32	unknown020;			//
 /*24*/	uint32	unknown024;			//
 /*28*/	float	tilt_x;
 /*32*/	float	tilt_y;
@@ -3404,7 +3300,6 @@ struct Internal_GuildMemberEntry_Struct {
 //	char	public_note[1];				//variable length.
 	uint16	zoneinstance;				//network byte order
 	uint16	zone_id;					//network byte order
-	uint32  online;
 };
 
 struct Internal_GuildMembers_Struct {	//just for display purposes, this is not actually used in the message encoding.
@@ -3431,42 +3326,7 @@ struct GuildUpdate_PublicNote{
 	uint32	unknown0;
 	char	name[64];
 	char	target[64];
-	char	note[256];
-};
-
-struct GuildUpdateURLAndChannelStruct {
-	char text[512];
-};
-
-struct GuildUpdatePermissionsStruct {
-	uint32	rank;				// the rank that is being changed
-	uint32	function_id;		// the id of the guild function
-	uint32	value;				// 1 is on, 0 is off
-
-};
-
-struct GuildUpdateRankNamesStruct {
-	uint32	rank;				// the rank that is being updated
-	char	rank_name[76];		// the rank name
-};
-
-struct GuildUpdateUCPStruct {
-	uint32	action;				// 0 and 1 use url and channel payload.  5 uses permissions payload
-	char	unknown[76];
-	union {
-		GuildUpdateURLAndChannelStruct  url_channel;
-		GuildUpdatePermissionsStruct    permissions;
-		GuildUpdateRankNamesStruct      rank_name;
-	}payload;
-};
-
-struct GuildPermission_Struct
-{
-	uint32	Action;				// 5 = Update function permission
-	char	Unknown0004[76];	// not used
-	uint32	rank;				// the rank that is being changed
-	uint32	function_id;		// the id of the guild function
-	uint32	value;				// 1 is on, 0 is off
+	char	note[1]; //variable length.
 };
 
 struct GuildUpdateURLAndChannel_Struct
@@ -3485,7 +3345,7 @@ struct GuildUpdateURLAndChannel_Struct
 //The client sends this struct on changing a guild rank. The server sends each rank in 32 or less packets upon zonein if you are in a guild.
 struct GuildUpdateRanks_Struct
 {
-/*0000*/	uint32	Action;	// 0 = Update URL, 1 = Update Channel, 4 = Ranks 5 = Permissions
+/*0000*/	uint32	Action;	// 0 = Update URL, 1 = Update Channel, 5 = RoF Ranks
 /*0004*/	uint32	Unknown0004; //Seen 00 00 00 00
 /*0008*/	uint32	Unknown0008; //Seen 96 29 00 00
 /*0008*/	char	Unknown0012[64]; //Seen "CharacterName"
@@ -3507,7 +3367,6 @@ struct GuildStatus_Struct
 struct GuildDemoteStruct{
 	char	name[64];
 	char	target[64];
-	uint32	rank;
 };
 
 struct GuildRemoveStruct{
@@ -3517,9 +3376,9 @@ struct GuildRemoveStruct{
 	uint32	leaderstatus; //?
 };
 
-struct GuildMakeLeader_Struct{
-	char	requestor[64];
-	char	new_leader[64];
+struct GuildMakeLeader{
+	char	name[64];
+	char	target[64];
 };
 
 struct BugReport_Struct {
@@ -3559,23 +3418,20 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-
-struct GroundSpawn {
-	float       max_x         = 0.0f;
-	float       max_y         = 0.0f;
-	float       min_x         = 0.0f;
-	float       min_y         = 0.0f;
-	float       max_z         = 0.0f;
-	float       heading       = 0.0f;
-	std::string name          = std::string();
-	uint32      item_id       = 0;
-	uint32      max_allowed   = 1;
-	uint32      respawn_timer = 1;
-	bool        fix_z         = true;
+struct Ground_Spawn{
+	float max_x;
+	float max_y;
+	float min_x;
+	float min_y;
+	float max_z;
+	float heading;
+	char name[20];
+	uint32 item;
+	uint32 max_allowed;
+	uint32 respawntimer;
 };
-
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -3613,193 +3469,66 @@ struct ZoneInSendName_Struct2 {
 static const uint32 MAX_TRIBUTE_TIERS = 10;
 
 struct StartTribute_Struct {
-	uint32 client_id;
-	uint32 tribute_master_id;
-	uint32 response;
+	uint32	client_id;
+	uint32	tribute_master_id;
+	uint32	response;
 };
 
 struct TributeLevel_Struct {
-	uint32 level;              //backwards byte order!
-	uint32 tribute_item_id;    //backwards byte order!
-	uint32 cost;               //backwards byte order!
+	uint32	level;	//backwards byte order!
+	uint32	tribute_item_id;	//backwards byte order!
+	uint32	cost;	//backwards byte order!
 };
 
 struct TributeAbility_Struct {
-	uint32              tribute_id;    //backwards byte order!
-	uint32              tier_count;    //backwards byte order!
+	uint32	tribute_id;	//backwards byte order!
+	uint32	tier_count;	//backwards byte order!
 	TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
-	char                name[0];
-};
-
-struct SelectTributeReq_Struct {
-	uint32 client_id;    //? maybe action ID?
-	uint32 tribute_id;
-	uint32 unknown8;    //seen E3 00 00 00
-};
-
-struct GuildTributeAbilityDetail_Struct {
-	uint32              tribute_id;    //backwards byte order!
-	uint32              tier_count;    //backwards byte order!
-	TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
-	uint32              unknown132;
-	char                name[0];
+	char	name[0];
 };
 
 struct GuildTributeAbility_Struct {
-	uint32                           guild_id;
-	GuildTributeAbilityDetail_Struct ability;
+	uint32	guild_id;
+	TributeAbility_Struct ability;
 };
 
-struct GuildTributeSelectReq_Struct {
-	uint32 tribute_id;
-	uint32 tier;
-	uint32 tribute_id2;
-	uint32 unknown12;    //seen A7 01 00 00
-};
-
-struct GuildTributeSelectReply_Struct {
-	uint32 tribute_id;
-	uint32 tier;
-	uint32 tribute_id2;
-	char   description;
-};
-
-struct GuildTributeModifyBenefits_Struct {
-/*000*/uint32 command;
-/*004*/uint32 data;
-/*008*/char   unknown8[12];
-/*020*/uint32 tribute_master_id;
-/*024*/uint32 tribute_id_1;
-/*028*/uint32 tribute_id_2;
-/*032*/uint32 tribute_id_1_tier;
-/*036*/uint32 tribute_id_2_tier;
-/*040*/char   unknown[40];
-};
-
-struct GuildTributeOptInOutReq_Struct {
-/*000*/uint32 guild_id;
-/*004*/uint32 tribute_toggle;
-/*008*/char   player[64];
-/*072*/uint32 command;
-/*076*/uint32 tribute_master_id;
-};
-
-struct GuildTributeOptInOutReply_Struct {
-/*000*/uint32 guild_id;
-/*004*/char   player_name[64];
-/*068*/uint32 tribute_toggle;//			0 off 1 on
-/*072*/uint32 tribute_trophy_toggle;// 	0 off 1 on		not yet implemented
-/*076*/uint32 no_donations;
-/*080*/uint32 time;
-/*084*/uint32 command;
-};
-
-struct GuildTributeSaveActive_Struct {
-/*000*/ uint32    command;
-/*004*/ char      unknown04[16];
-/*020*/ uint32    master_tribute_id;
-/*024*/ uint32    tribute_id_1;
-/*028*/ uint32    tribute_id_2;
-/*032*/ uint32    tribute_1_tier;
-/*036*/ uint32    tribute_2_tier;
-/*040*/ char      unknown40[8];
-};
-
-struct GuildTributeFavorTimer_Struct {
-/*000*/ uint32 guild_id;
-/*004*/ uint32 guild_favor;
-/*008*/ uint32 tribute_timer;
-/*012*/ uint32 trophy_timer;
-};
-
-struct GuildTributeSendActive_Struct {
-/*000*/ uint32 not_used;
-/*004*/ uint32 guild_favor;
-/*008*/ uint32 tribute_timer;
-/*012*/ uint32 tribute_enabled;
-/*016*/ char   unknown16[8];
-/*024*/ uint32 tribute_id_1;
-/*028*/ uint32 tribute_id_2;
-/*032*/ uint32 tribute_id_1_tier;
-/*036*/ uint32 tribute_id_2_tier;
-};
-
-struct GuildTributeToggleReq_Struct {
-/*000*/ uint32 command;
-/*004*/ uint32 unknown4;
-/*008*/ uint32 unknown8;
-};
-
-struct GuildTributeDonateItemRequest_Struct {
-/*000*/ uint32    type;
-/*004*/ uint16    slot;
-/*006*/ uint16    sub_index;
-/*008*/ uint16    aug_index;
-/*010*/ uint16    unknown10;
-/*012*/ uint32    quantity;
-/*016*/ uint32    tribute_master_id;
-/*020*/ uint32    unknown20;
-/*024*/ uint32    guild_id;
-/*028*/ uint32    unknown28;
-/*032*/ uint32    unknown32;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-/*000*/ uint32 type;
-/*004*/ uint16 slot;
-/*006*/ uint16 sub_index;
-/*008*/ uint16 aug_index;
-/*010*/ uint16 unknown10;
-/*012*/ uint32 quantity;
-/*016*/ uint32 unknown20;
-/*020*/ uint32 favor;
-};
-
-struct GuildTributeDonatePlatRequest_Struct {
-/*000*/ uint32 quantity;
-/*004*/ uint32 tribute_master_id;
-/*008*/ uint32 unknown08;
-/*012*/ uint32 guild_id;
-/*016*/ uint32 unknown16;
-};
-
-struct GuildTributeDonatePlatReply_Struct {
-	/*000*/ uint32 quantity;
-	/*004*/ uint32 unknown4;
-	/*008*/ uint32 favor;
+struct SelectTributeReq_Struct {
+	uint32	client_id;	//? maybe action ID?
+	uint32	tribute_id;
+	uint32	unknown8;	//seen E3 00 00 00
 };
 
 struct SelectTributeReply_Struct {
-	uint32 client_id;    //echoed from request.
-	uint32 tribute_id;
-	char   description[0];
+	uint32	client_id;	//echoed from request.
+	uint32	tribute_id;
+	char		desc[0];
 };
 
 struct TributeInfo_Struct {
-	uint32 active;        //0 == inactive, 1 == active
-	uint32 tributes[EQ::invtype::TRIBUTE_SIZE];    //-1 == NONE
-	uint32 tiers[EQ::invtype::TRIBUTE_SIZE];        //all 00's
-	uint32 tribute_master_id;
+	uint32	active;		//0 == inactive, 1 == active
+	uint32	tributes[EQ::invtype::TRIBUTE_SIZE];	//-1 == NONE
+	uint32	tiers[EQ::invtype::TRIBUTE_SIZE];		//all 00's
+	uint32	tribute_master_id;
 };
 
 struct TributeItem_Struct {
-	uint32 slot;
-	uint32 quantity;
-	uint32 tribute_master_id;
-	int32  tribute_points;
+	uint32	slot;
+	uint32	quantity;
+	uint32	tribute_master_id;
+	int32	tribute_points;
 };
 
 struct TributePoint_Struct {
-	int32  tribute_points;
-	uint32 unknown04;
-	int32  career_tribute_points;
-	uint32 unknown12;
+	int32	tribute_points;
+	uint32	unknown04;
+	int32	career_tribute_points;
+	uint32	unknown12;
 };
 
 struct TributeMoney_Struct {
-	uint32 platinum;
-	uint32 tribute_master_id;
-	int32  tribute_points;
+	uint32	platinum;
+	uint32	tribute_master_id;
+	int32	tribute_points;
 };
 
 
@@ -4365,9 +4094,7 @@ struct UpdateLeadershipAA_Struct {
 
 enum
 {
-	GroupLeadershipAbility_MarkNPC = 0,
-	RaidLeadershipAbility_MarkNPC = 16,
-	RaidLeadershipAbility_MainAssist = 19
+	GroupLeadershipAbility_MarkNPC = 0
 };
 
 struct DoGroupLeadershipAbility_Struct
@@ -4411,9 +4138,8 @@ struct InspectBuffs_Struct {
 struct RaidGeneral_Struct {
 /*00*/	uint32		action;	//=10
 /*04*/	char		player_name[64];	//should both be the player's name
-/*68*/	uint32		unknown1;
-/*72*/	char		leader_name[64];
-/*136*/	uint32		parameter;
+/*64*/	char		leader_name[64];
+/*132*/	uint32		parameter;
 };
 
 struct RaidAddMember_Struct {
@@ -4424,14 +4150,9 @@ struct RaidAddMember_Struct {
 /*139*/	uint8 flags[5]; //no idea if these are needed...
 };
 
-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char note[64];
-};
-
 struct RaidMOTD_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char motd[1024];
+/*000*/ RaidGeneral_Struct general; // leader_name and action only used
+/*136*/ char motd[0]; // max size is 1024, but reply is variable
 };
 
 struct RaidLeadershipUpdate_Struct {
@@ -5378,6 +5099,8 @@ struct GroupMakeLeader_Struct
 //ex for a blank crowns window you would send:
 //999999|1|999999|0
 //any items come after in much the same way adventure merchant items do except there is no theme included
+#define ALT_CURRENCY_OP_POPULATE 8
+#define ALT_CURRENCY_OP_UPDATE 7
 
 //Server -> Client
 //Populates the initial Alternate Currency Window
@@ -5788,6 +5511,24 @@ struct MercenaryMerchantResponse_Struct {
 /*0004*/
 };
 
+struct ServerLootItem_Struct {
+	uint32	item_id;	  // uint32	item_id;
+	int16  equip_slot;	  // int16	equip_slot;
+	uint16 charges;	  // uint8	charges;
+	uint16 lootslot;	  // uint16	lootslot;
+	uint32 aug_1;		  // uint32	aug_1;
+	uint32 aug_2;		  // uint32	aug_2;
+	uint32 aug_3;		  // uint32	aug_3;
+	uint32 aug_4;		  // uint32	aug_4;
+	uint32 aug_5;		  // uint32	aug_5;
+	uint32 aug_6;		  // uint32	aug_5;
+	uint8  attuned;
+	uint16 trivial_min_level;
+	uint16 trivial_max_level;
+	uint16 npc_min_level;
+	uint16 npc_max_level;
+};
+
 //Found in client near a ref to the string:
 //"Got a broadcast message for ... %s ...\n"
 struct ClientMarqueeMessage_Struct {
@@ -5806,6 +5547,9 @@ struct ClientMarqueeMessage_Struct {
 
 };
 
+typedef std::list<ServerLootItem_Struct*> ItemList;
+
+
 struct fling_struct {
 /* 00 */ uint32 collision; // 0 collision is off, anything else it's on
 /* 04 */ int32 travel_time; // ms -- UF we need to calc this, RoF+ -1 auto calcs

common/eq_stream_ident.cpp

@@ -26,7 +26,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }
 
-void EQStreamIdentifier::RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
 	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
@@ -145,7 +145,7 @@ void EQStreamIdentifier::Process() {
 }
 
 void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> eqs) {
-	m_streams.emplace_back(Record(eqs));
+	m_streams.push_back(Record(eqs));
 	eqs = nullptr;
 }
 

common/eq_stream_ident.h

@@ -18,7 +18,7 @@ public:
 	~EQStreamIdentifier();
 
 	//registration interface.
-	void RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
 
 	//main processing interface
 	void Process();

common/eqdb.cpp

@@ -23,6 +23,9 @@
 
 EQDB EQDB::s_EQDB;
 
+EQDB::EQDB() {
+}
+
 unsigned int EQDB::field_count() {
 	return mysql_field_count(mysql_ref);
 }

common/eqdb.h

@@ -27,7 +27,7 @@
 
 //this is the main object exported to perl.
 class EQDB {
-	EQDB() = default;
+	EQDB();
 public:
 	static EQDB *Singleton() { return(&s_EQDB); }
 

common/eqemu_config.cpp

@@ -20,12 +20,9 @@
 #include "eqemu_config.h"
 #include "misc_functions.h"
 #include "strings.h"
-#include "eqemu_logsys.h"
-#include "json/json.hpp"
 
 #include <iostream>
 #include <sstream>
-#include <filesystem>
 
 std::string EQEmuConfig::ConfigFile = "eqemu_config.json";
 EQEmuConfig *EQEmuConfig::_config = nullptr;
@@ -37,13 +34,13 @@ void EQEmuConfig::parse_config()
 	LongName     = _root["server"]["world"].get("longname", "").asString();
 	WorldAddress = _root["server"]["world"].get("address", "").asString();
 	LocalAddress = _root["server"]["world"].get("localaddress", "").asString();
-	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString());
+	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString().c_str());
 	SharedKey    = _root["server"]["world"].get("key", "").asString();
 	LoginCount   = 0;
 
 	if (_root["server"]["world"]["loginserver"].isObject()) {
 		LoginHost   = _root["server"]["world"]["loginserver"].get("host", "login.eqemulator.net").asString();
-		LoginPort   = Strings::ToUnsignedInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString());
+		LoginPort   = Strings::ToInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString().c_str());
 		LoginLegacy = false;
 		if (_root["server"]["world"]["loginserver"].get("legacy", "0").asString() == "1") { LoginLegacy = true; }
 		LoginAccount  = _root["server"]["world"]["loginserver"].get("account", "").asString();
@@ -66,7 +63,7 @@ void EQEmuConfig::parse_config()
 
 			auto loginconfig = new LoginConfig;
 			loginconfig->LoginHost     = _root["server"]["world"][str].get("host", "login.eqemulator.net").asString();
-			loginconfig->LoginPort     = Strings::ToUnsignedInt(_root["server"]["world"][str].get("port", "5998").asString());
+			loginconfig->LoginPort     = Strings::ToInt(_root["server"]["world"][str].get("port", "5998").asString().c_str());
 			loginconfig->LoginAccount  = _root["server"]["world"][str].get("account", "").asString();
 			loginconfig->LoginPassword = _root["server"]["world"][str].get("password", "").asString();
 
@@ -88,22 +85,16 @@ void EQEmuConfig::parse_config()
 	//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; }
-
-	auto_database_updates = false;
-	if (_root["server"].get("auto_database_updates", "true").asString() == "true") {
-		auto_database_updates = true;
-	}
-
 	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
-	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());
+	WorldTCPPort = Strings::ToInt(_root["server"]["world"]["tcp"].get("port", "9000").asString().c_str());
 
 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
-	TelnetTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["telnet"].get("port", "9001").asString());
+	TelnetTCPPort = Strings::ToInt(_root["server"]["world"]["telnet"].get("port", "9001").asString().c_str());
 	TelnetEnabled = false;
 	if (_root["server"]["world"]["telnet"].get("enabled", "false").asString() == "true") { TelnetEnabled = true; }
 
 	WorldHTTPMimeFile = _root["server"]["world"]["http"].get("mimefile", "mime.types").asString();
-	WorldHTTPPort     = Strings::ToUnsignedInt(_root["server"]["world"]["http"].get("port", "9080").asString());
+	WorldHTTPPort     = Strings::ToInt(_root["server"]["world"]["http"].get("port", "9080").asString().c_str());
 	WorldHTTPEnabled  = false;
 
 	if (_root["server"]["world"]["http"].get("enabled", "false").asString() == "true") {
@@ -114,12 +105,13 @@ void EQEmuConfig::parse_config()
 		DisableConfigChecks = true;
 	}
 
-
-
-	CheckUcsConfigConversion();
-
-	m_ucs_host = _root["server"]["ucs"].get("host", "eqchat.eqemulator.net").asString();
-	m_ucs_port = Strings::ToUnsignedInt(_root["server"]["ucs"].get("port", "7778").asString());
+	/**
+	 * UCS
+	 */
+	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
+	ChatPort = Strings::ToInt(_root["server"]["chatserver"].get("port", "7778").asString().c_str());
+	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
+	MailPort = Strings::ToInt(_root["server"]["mailserver"].get("port", "7778").asString().c_str());
 
 	/**
 	 * Database
@@ -127,7 +119,7 @@ void EQEmuConfig::parse_config()
 	DatabaseUsername = _root["server"]["database"].get("username", "eq").asString();
 	DatabasePassword = _root["server"]["database"].get("password", "eq").asString();
 	DatabaseHost     = _root["server"]["database"].get("host", "localhost").asString();
-	DatabasePort     = Strings::ToUnsignedInt(_root["server"]["database"].get("port", "3306").asString());
+	DatabasePort     = Strings::ToInt(_root["server"]["database"].get("port", "3306").asString().c_str());
 	DatabaseDB       = _root["server"]["database"].get("db", "eq").asString();
 
 	/**
@@ -136,14 +128,14 @@ void EQEmuConfig::parse_config()
 	ContentDbUsername = _root["server"]["content_database"].get("username", "").asString();
 	ContentDbPassword = _root["server"]["content_database"].get("password", "").asString();
 	ContentDbHost     = _root["server"]["content_database"].get("host", "").asString();
-	ContentDbPort     = Strings::ToUnsignedInt(_root["server"]["content_database"].get("port", 0).asString());
+	ContentDbPort     = Strings::ToInt(_root["server"]["content_database"].get("port", 0).asString().c_str());
 	ContentDbName     = _root["server"]["content_database"].get("db", "").asString();
 
 	/**
 	 * QS
 	 */
 	QSDatabaseHost     = _root["server"]["qsdatabase"].get("host", "localhost").asString();
-	QSDatabasePort     = Strings::ToUnsignedInt(_root["server"]["qsdatabase"].get("port", "3306").asString());
+	QSDatabasePort     = Strings::ToInt(_root["server"]["qsdatabase"].get("port", "3306").asString().c_str());
 	QSDatabaseUsername = _root["server"]["qsdatabase"].get("username", "eq").asString();
 	QSDatabasePassword = _root["server"]["qsdatabase"].get("password", "eq").asString();
 	QSDatabaseDB       = _root["server"]["qsdatabase"].get("db", "eq").asString();
@@ -151,9 +143,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
-	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
-	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());
+	DefaultStatus = Strings::ToInt(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
+	ZonePortLow   = Strings::ToInt(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
+	ZonePortHigh  = Strings::ToInt(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());
 
 	/**
 	 * Files
@@ -183,10 +175,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
-	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
-	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
-	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
+	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
+	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
+	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
+	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
 #ifdef WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else
@@ -248,16 +240,16 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 		return (WorldHTTPEnabled ? "true" : "false");
 	}
 	if (var_name == "ChatHost") {
-		return (m_ucs_host);
+		return (ChatHost);
 	}
 	if (var_name == "ChatPort") {
-		return (itoa(m_ucs_port));
+		return (itoa(ChatPort));
 	}
 	if (var_name == "MailHost") {
-		return (m_ucs_host);
+		return (MailHost);
 	}
 	if (var_name == "MailPort") {
-		return (itoa(m_ucs_port));
+		return (itoa(MailPort));
 	}
 	if (var_name == "DatabaseHost") {
 		return (DatabaseHost);
@@ -364,8 +356,10 @@ void EQEmuConfig::Dump() const
 	std::cout << "WorldHTTPPort = " << WorldHTTPPort << std::endl;
 	std::cout << "WorldHTTPMimeFile = " << WorldHTTPMimeFile << std::endl;
 	std::cout << "WorldHTTPEnabled = " << WorldHTTPEnabled << std::endl;
-	std::cout << "UCSHost = " << m_ucs_host << std::endl;
-	std::cout << "UCSPort = " << m_ucs_port << std::endl;
+	std::cout << "ChatHost = " << ChatHost << std::endl;
+	std::cout << "ChatPort = " << ChatPort << std::endl;
+	std::cout << "MailHost = " << MailHost << std::endl;
+	std::cout << "MailPort = " << MailPort << std::endl;
 	std::cout << "DatabaseHost = " << DatabaseHost << std::endl;
 	std::cout << "DatabaseUsername = " << DatabaseUsername << std::endl;
 	std::cout << "DatabasePassword = " << DatabasePassword << std::endl;
@@ -392,98 +386,3 @@ void EQEmuConfig::Dump() const
 	std::cout << "DefaultStatus = " << (int) DefaultStatus << std::endl;
 //	std::cout << "DynamicCount = " << DynamicCount << std::endl;
 }
-
-const std::string &EQEmuConfig::GetUCSHost() const
-{
-	return m_ucs_host;
-}
-
-uint16 EQEmuConfig::GetUCSPort() const
-{
-	return m_ucs_port;
-}
-
-void EQEmuConfig::CheckUcsConfigConversion()
-{
-	std::string chat_host = _root["server"]["chatserver"].get("host", "").asString();
-	uint32      chat_port = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "0").asString());
-	std::string mail_host = _root["server"]["mailserver"].get("host", "").asString();
-	uint32      mail_port = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "0").asString());
-	std::string ucs_host  = _root["server"]["ucs"].get("host", "").asString();
-
-	// automatic ucs legacy configuration migration
-	// if old configuration values are set, let's backup the existing configuration
-	// and migrate to to use the new fields and write the new config
-	if ((!chat_host.empty() || !mail_host.empty()) && ucs_host.empty()) {
-		LogInfo("Migrating old [eqemu_config] UCS configuration to new configuration");
-
-		std::string config_file_path = std::filesystem::path{
-			path.GetServerPath() + "/eqemu_config.json"
-		}.string();
-
-		std::string config_file_bak_path = std::filesystem::path{
-			path.GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
-		}.string();
-
-		// copy eqemu_config.json to eqemu_config.json.bak
-		std::ifstream src(config_file_path, std::ios::binary);
-		std::ofstream dst(config_file_bak_path, std::ios::binary);
-		dst << src.rdbuf();
-		src.close();
-
-		LogInfo("Old configuration backed up to [{}]", config_file_bak_path);
-
-		// read eqemu_config.json, transplant new fields and write to eqemu_config.json
-		Json::Value   root;
-		Json::Reader  reader;
-		std::ifstream file(config_file_path);
-		if (!reader.parse(file, root)) {
-			LogError("Failed to parse configuration file");
-			return;
-		}
-		file.close();
-
-		// get old fields
-		std::string host = !chat_host.empty() ? chat_host : mail_host;
-		if (host.empty()) {
-			host = "eqchat.eqemulator.net";
-		}
-		std::string port = chat_port > 0 ? std::to_string(chat_port) : std::to_string(mail_port);
-		if (port.empty()) {
-			port = "7778";
-		}
-
-		// set new fields
-		root["server"]["ucs"]["host"] = host;
-		root["server"]["ucs"]["port"] = port;
-
-		// unset old fields
-		root["server"].removeMember("chatserver");
-		root["server"].removeMember("mailserver");
-
-		// get Json::Value raw string
-		std::string config = root.toStyledString();
-
-		// format using more modern json library
-		nlohmann::json data = nlohmann::json::parse(config);
-
-		// write to file
-		std::ofstream o(config_file_path);
-		o << std::setw(1) << data << std::endl;
-		o.close();
-
-		// write new config
-		LogInfo("New configuration written to [{}]", config_file_path);
-		LogInfo("Migration complete, please review the new configuration file");
-
-		// reload config internally
-		try {
-			std::ifstream fconfig(config_file_path, std::ifstream::binary);
-			fconfig >> _config->_root;
-			_config->parse_config();
-		}
-		catch (std::exception &) {
-			return;
-		}
-	}
-}

common/eqemu_config.h

@@ -62,6 +62,14 @@ class EQEmuConfig
 		std::string SharedKey;
 		bool DisableConfigChecks;
 
+		// From <chatserver/>
+		std::string ChatHost;
+		uint16 ChatPort;
+
+		// From <mailserver/>
+		std::string MailHost;
+		uint16 MailPort;
+
 		// From <database/>
 		std::string DatabaseHost;
 		std::string DatabaseUsername;
@@ -112,20 +120,12 @@ class EQEmuConfig
 		uint16 ZonePortHigh;
 		uint8 DefaultStatus;
 
-		bool auto_database_updates;
-
-		const std::string &GetUCSHost() const;
-		uint16 GetUCSPort() const;
-
 //	uint16 DynamicCount;
 
 //	map<string,uint16> StaticZones;
 
 	protected:
 
-		std::string m_ucs_host;
-		uint16      m_ucs_port;
-
 		static EQEmuConfig *_config;
 		Json::Value _root;
 		static std::string ConfigFile;
@@ -147,6 +147,12 @@ class EQEmuConfig
 			return (_config);
 		}
 
+		// Allow the use to set the conf file to be used.
+		static void SetConfigFile(std::string file)
+		{
+			EQEmuConfig::ConfigFile = file;
+		}
+
 		// Load the config
 		static bool LoadConfig(const std::string& path = "")
 		{
@@ -184,7 +190,6 @@ class EQEmuConfig
 		}
 
 		void Dump() const;
-		void CheckUcsConfigConversion();
 };
 
 #endif

common/eqemu_logsys.cpp

@@ -100,15 +100,13 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	log_settings[Logs::Discord].log_to_console              = static_cast<uint8>(Logs::General);
 	log_settings[Logs::QuestErrors].log_to_gmsay            = static_cast<uint8>(Logs::General);
 	log_settings[Logs::QuestErrors].log_to_console          = static_cast<uint8>(Logs::General);
-	log_settings[Logs::EqTime].log_to_console               = static_cast<uint8>(Logs::General);
-	log_settings[Logs::EqTime].log_to_gmsay                 = static_cast<uint8>(Logs::General);
 
 	/**
 	 * RFC 5424
 	 */
-	log_settings[Logs::Error].log_to_console   = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Warning].log_to_console = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_console    = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Error].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Warning].log_to_console   = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Info].log_to_console      = static_cast<uint8>(Logs::General);
 
 	/**
 	 * Set Category enabled status on defaults
@@ -189,10 +187,9 @@ void EQEmuLogSys::ProcessLogWrite(
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 {
 	switch (log_category) {
-		case Logs::Crash:
-		case Logs::Error:
 		case Logs::MySQLError:
 		case Logs::QuestErrors:
+		case Logs::Error:
 			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
@@ -202,6 +199,8 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 		case Logs::Commands:
 		case Logs::Mercenaries:
 			return Chat::Magenta;
+		case Logs::Crash:
+			return Chat::Red;
 		default:
 			return Chat::Yellow;
 	}
@@ -221,7 +220,7 @@ void EQEmuLogSys::ProcessConsoleMessage(
 	int line
 )
 {
-	bool is_error   = (
+	bool is_error = (
 		log_category == Logs::LogCategory::Error ||
 		log_category == Logs::LogCategory::MySQLError ||
 		log_category == Logs::LogCategory::Crash ||
@@ -263,7 +262,7 @@ void EQEmuLogSys::ProcessConsoleMessage(
 	}
 
 	if (log_category == Logs::LogCategory::MySQLQuery) {
-		auto s = Strings::Split(message, "--");
+		auto        s     = Strings::Split(message, "--");
 		if (s.size() > 1) {
 			std::string query = Strings::Trim(s[0]);
 			std::string meta  = Strings::Trim(s[1]);
@@ -299,76 +298,19 @@ void EQEmuLogSys::ProcessConsoleMessage(
 					}
 				}
 
-				// color matching in []
-				// ex: [<red>variable] would produce [variable] with red inside brackets
-				std::map<std::string, rang::fgB> colors = {
-					{"<black>",   rang::fgB::black},
-					{"<green>",   rang::fgB::green},
-					{"<yellow>",  rang::fgB::yellow},
-					{"<blue>",    rang::fgB::blue},
-					{"<magenta>", rang::fgB::magenta},
-					{"<cyan>",    rang::fgB::cyan},
-					{"<gray>",    rang::fgB::gray},
-					{"<red>",     rang::fgB::red},
-				};
-
-				bool      match_color = false;
-				for (auto &c: colors) {
-					if (Strings::Contains(e, c.first)) {
-						e = Strings::Replace(e, c.first, "");
-						(!is_error ? std::cout : std::cerr)
-							<< rang::fgB::gray
-							<< "["
-							<< rang::style::bold
-							<< c.second
-							<< e
-							<< rang::style::reset
-							<< rang::fgB::gray
-							<< "] ";
-						match_color = true;
-					}
+				if (!is_upper) {
+					(!is_error ? std::cout : std::cerr)
+						<< rang::fgB::gray
+						<< "["
+						<< rang::style::bold
+						<< rang::fgB::yellow
+						<< e
+						<< rang::fgB::gray
+						<< "] "
+						;
 				}
-
-				// string match to colors
-				std::map<std::string, rang::fgB> matches = {
-					{"missing", rang::fgB::red},
-					{"error",   rang::fgB::red},
-					{"ok",      rang::fgB::green},
-				};
-
-				for (auto &c: matches) {
-					if (Strings::Contains(e, c.first)) {
-						(!is_error ? std::cout : std::cerr)
-							<< rang::fgB::gray
-							<< "["
-							<< rang::style::bold
-							<< c.second
-							<< e
-							<< rang::style::reset
-							<< rang::fgB::gray
-							<< "] ";
-						match_color = true;
-					}
-				}
-
-				// if we don't match a color in either the string matching or
-				// the color tag matching, we default to yellow inside brackets
-				// if uppercase, does not get colored
-				if (!match_color) {
-					if (!is_upper) {
-						(!is_error ? std::cout : std::cerr)
-							<< rang::fgB::gray
-							<< "["
-							<< rang::style::bold
-							<< rang::fgB::yellow
-							<< e
-							<< rang::style::reset
-							<< rang::fgB::gray
-							<< "] ";
-					}
-					else {
-						(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
-					}
+				else {
+					(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
 				}
 			}
 			else {
@@ -448,8 +390,6 @@ void EQEmuLogSys::Out(
 	// remove this when we remove all legacy logs
 	bool ignore_log_legacy_format = (
 		log_category == Logs::Netcode ||
-		log_category == Logs::MySQLQuery ||
-		log_category == Logs::MySQLError ||
 		log_category == Logs::PacketServerClient ||
 		log_category == Logs::PacketClientServer ||
 		log_category == Logs::PacketServerToServer
@@ -584,8 +524,6 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
  */
 void EQEmuLogSys::SilenceConsoleLogging()
 {
-	std::copy(std::begin(log_settings), std::end(log_settings), std::begin(pre_silence_settings));
-
 	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
 		log_settings[log_index].log_to_console      = 0;
 		log_settings[log_index].is_category_enabled = 0;
@@ -599,7 +537,10 @@ void EQEmuLogSys::SilenceConsoleLogging()
  */
 void EQEmuLogSys::EnableConsoleLogging()
 {
-	std::copy(std::begin(pre_silence_settings), std::end(pre_silence_settings), std::begin(log_settings));
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		log_settings[log_index].log_to_console      = Logs::General;
+		log_settings[log_index].is_category_enabled = 1;
+	}
 }
 
 EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
@@ -651,9 +592,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 	}
 
 	// Auto inject categories that don't exist in the database...
-
-	std::vector<LogsysCategoriesRepository::LogsysCategories> db_categories_to_add{};
-
 	for (int i = Logs::AA; i != Logs::MaxCategoryID; i++) {
 
 		bool is_missing_in_database = std::find(db_categories.begin(), db_categories.end(), i) == db_categories.end();
@@ -668,7 +606,11 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 		}
 
 		if (is_missing_in_database && !is_deprecated_category) {
-			LogInfo("Automatically adding new log category [{}] ({})", Logs::LogCategoryName[i], i);
+			LogInfo(
+				"Automatically adding new log category [{}] ({})",
+				Logs::LogCategoryName[i],
+				i
+			);
 
 			auto new_category = LogsysCategoriesRepository::NewEntity();
 			new_category.log_category_id          = i;
@@ -677,14 +619,9 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
 			new_category.log_to_file              = log_settings[i].log_to_file;
 			new_category.log_to_discord           = log_settings[i].log_to_discord;
-			db_categories_to_add.emplace_back(new_category);
-		}
-	}
 
-	if (!db_categories_to_add.empty()) {
-		LogsysCategoriesRepository::ReplaceMany(*m_database, db_categories_to_add);
-		LoadLogDatabaseSettings();
-		return this;
+			LogsysCategoriesRepository::InsertOne(*m_database, new_category);
+		}
 	}
 
 	LogInfo("Loaded [{}] log categories", categories.size());
@@ -701,8 +638,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 	log_settings[Logs::Crash].log_to_console = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Crash].log_to_gmsay   = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Crash].log_to_file    = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_file     = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_console  = static_cast<uint8>(Logs::General);
 
 	return this;
 }
@@ -807,16 +742,3 @@ EQEmuLogSys *EQEmuLogSys::SetLogPath(const std::string &log_path)
 	return this;
 }
 
-void EQEmuLogSys::DisableMySQLErrorLogs()
-{
-	log_settings[Logs::MySQLError].log_to_file    = 0;
-	log_settings[Logs::MySQLError].log_to_console = 0;
-	log_settings[Logs::MySQLError].log_to_gmsay   = 0;
-}
-
-void EQEmuLogSys::EnableMySQLErrorLogs()
-{
-	log_settings[Logs::MySQLError].log_to_file    = 1;
-	log_settings[Logs::MySQLError].log_to_console = 1;
-	log_settings[Logs::MySQLError].log_to_gmsay   = 1;
-}

common/eqemu_logsys.h

@@ -137,10 +137,6 @@ namespace Logs {
 		Bugs,
 		QuestErrors,
 		PlayerEvents,
-		DataBuckets,
-		Zoning,
-		EqTime,
-		Corpses,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -237,10 +233,6 @@ namespace Logs {
 		"Bugs",
 		"QuestErrors",
 		"PlayerEvents",
-		"DataBuckets",
-		"Zoning",
-		"EqTime",
-		"Corpses",
 	};
 }
 
@@ -332,9 +324,6 @@ public:
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
 
-	// temporary bucket to re-load after silencing
-	LogSettings pre_silence_settings[Logs::LogCategory::MaxCategoryID]{};
-
 	struct LogEnabled {
 		bool log_to_file_enabled;
 		bool log_to_console_enabled;
@@ -385,9 +374,6 @@ public:
 	[[nodiscard]] const std::string &GetLogPath() const;
 	EQEmuLogSys * SetLogPath(const std::string &log_path);
 
-	void DisableMySQLErrorLogs();
-	void EnableMySQLErrorLogs();
-
 private:
 
 	// reference to database

common/eqemu_logsys_log_aliases.h

@@ -794,46 +794,6 @@
         OutF(LogSys, Logs::Detail, Logs::PlayerEvents, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogDataBuckets(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::DataBuckets))\
-        OutF(LogSys, Logs::General, Logs::DataBuckets, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogDataBucketsDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::DataBuckets))\
-        OutF(LogSys, Logs::Detail, Logs::DataBuckets, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogZoning(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::Zoning))\
-        OutF(LogSys, Logs::General, Logs::Zoning, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogZoningDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::Zoning))\
-        OutF(LogSys, Logs::Detail, Logs::Zoning, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogEqTime(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::EqTime))\
-        OutF(LogSys, Logs::General, Logs::EqTime, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogEqTimeDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::EqTime))\
-        OutF(LogSys, Logs::Detail, Logs::EqTime, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogCorpses(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::Corpses))\
-        OutF(LogSys, Logs::General, Logs::Corpses, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogCorpsesDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::Corpses))\
-        OutF(LogSys, Logs::Detail, Logs::Corpses, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.IsLogEnabled(debug_level, log_category))\
         LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\

common/eqtime.cpp

@@ -46,16 +46,20 @@ EQTime::EQTime()
 	timezone = 0;
 	memset(&eqTime, 0, sizeof(eqTime));
 	//Defaults for time
-	TimeOfDay_Struct t{};
-	t.day    = 1;
-	t.hour   = 9;
-	t.minute = 0;
-	t.month  = 1;
-	t.year   = 3100;
+	TimeOfDay_Struct start;
+	start.day = 1;
+	start.hour = 9;
+	start.minute = 0;
+	start.month = 1;
+	start.year = 3100;
 	//Set default time zone
 	timezone = 0;
 	//Start EQTimer
-	SetCurrentEQTimeOfDay(t, time(nullptr));
+	SetCurrentEQTimeOfDay(start, time(0));
+}
+
+EQTime::~EQTime()
+{
 }
 
 //getEQTimeOfDay - Reads timeConvert and writes the result to eqTimeOfDay
@@ -199,48 +203,4 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 		t->month, t->day, t->year, t->hour, t->minute);
 	buf[127] = '\0';
 	str = buf;
-}
-
-bool EQTime::IsDayTime() {
-	TimeOfDay_Struct tod{}; //Day time is 5am to 6:59pm (14 hours in-game)
-	GetCurrentEQTimeOfDay(&tod); //TODO: what if it fails and returns zero?
-
-	if (tod.hour >= 5 || tod.hour < 19) {
-		return true;
-	}
-
-	return false;
-}
-
-bool EQTime::IsNightTime() {
-	TimeOfDay_Struct tod{}; //Night time is 7pm to 4:59am (10 hours in-game)
-	GetCurrentEQTimeOfDay(&tod); //TODO: what if it fails and returns zero?
-
-	if (tod.hour >= 19 || tod.hour < 5) {
-		return true;
-	}
-
-	return false;
-}
-
-bool EQTime::IsInbetweenTime(uint8 min_time, uint8 max_time) {
-	TimeOfDay_Struct tod{};
-	GetCurrentEQTimeOfDay(&tod);
-
-	if (min_time == 0 || max_time == 0 || min_time > 24 || max_time > 24) {
-		return true;
-	}
-
-	if (max_time < min_time) {
-		if ((tod.hour >= min_time && tod.hour > max_time) || (tod.hour < min_time && tod.hour <= max_time)) {
-			return true;
-		}
-	}
-	else {
-		if (tod.hour >= min_time && tod.hour <= max_time) {
-			return true;
-		}
-	}
-
-	return false;
-}
+}

common/eqtime.h

@@ -18,7 +18,7 @@ public:
 	//Constructor/destructor
 	EQTime(TimeOfDay_Struct start_eq, time_t start_real);
 	EQTime();
-	~EQTime() = default;
+	~EQTime();
 
 	//Get functions
 	int GetCurrentEQTimeOfDay( TimeOfDay_Struct *eqTimeOfDay ) { return(GetCurrentEQTimeOfDay(time(nullptr), eqTimeOfDay)); }
@@ -28,9 +28,6 @@ public:
 	uint32 getEQTimeZone() { return timezone; }
 	uint32 getEQTimeZoneHr() { return timezone/60; }
 	uint32 getEQTimeZoneMin() { return timezone%60; }
-	bool IsDayTime();
-	bool IsNightTime();
-	bool IsInbetweenTime(uint8 min_time, uint8 max_time);
 
 	//Set functions
 	int SetCurrentEQTimeOfDay(TimeOfDay_Struct start_eq, time_t start_real);

common/errmsg.h

@@ -0,0 +1,59 @@
+/*	Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+	This library is free software; you can redistribute it and/or
+	modify it under the terms of the GNU Library General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+
+	This library is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+	Library General Public License for more details.
+
+	You should have received a copy of the GNU Library General Public
+	License along with this library; if not, write to the Free
+	Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+	MA 02111-1307, USA */
+
+/*	Error messages for mysql clients */
+/*	error messages for the demon is in share/language/errmsg.sys */
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+void	init_client_errs(void);
+extern const char *client_errors[];	/* Error messages */
+#ifdef	__cplusplus
+}
+#endif
+
+#define CR_MIN_ERROR		2000	/* For easier client code */
+#define CR_MAX_ERROR		2999
+#if defined(OS2) && defined( MYSQL_SERVER)
+#define CER(X) client_errors[(X)-CR_MIN_ERROR]
+#else
+#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#endif
+#define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
+
+#define CR_UNKNOWN_ERROR	2000
+#define CR_SOCKET_CREATE_ERROR	2001
+#define CR_CONNECTION_ERROR	2002
+#define CR_CONN_HOST_ERROR	2003
+#define CR_IPSOCK_ERROR		2004
+#define CR_UNKNOWN_HOST		2005
+#define CR_SERVER_GONE_ERROR	2006
+#define CR_VERSION_ERROR	2007
+#define CR_OUT_OF_MEMORY	2008
+#define CR_WRONG_HOST_INFO	2009
+#define CR_LOCALHOST_CONNECTION 2010
+#define CR_TCP_CONNECTION	2011
+#define CR_SERVER_HANDSHAKE_ERR 2012
+#define CR_SERVER_LOST		2013
+#define CR_COMMANDS_OUT_OF_SYNC 2014
+#define CR_NAMEDPIPE_CONNECTION 2015
+#define CR_NAMEDPIPEWAIT_ERROR 2016
+#define CR_NAMEDPIPEOPEN_ERROR 2017
+#define CR_NAMEDPIPESETSTATE_ERROR 2018
+#define CR_CANT_READ_CHARSET	2019
+#define CR_NET_PACKET_TOO_LARGE 2020

common/event/task_scheduler.h

@@ -38,7 +38,7 @@ namespace EQ
 				_running = true;
 
 				for (size_t i = 0; i < threads; ++i) {
-					_threads.emplace_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
+					_threads.push_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
 				}
 			}
 			

common/events/player_event_logs.cpp

@@ -37,8 +37,6 @@ void PlayerEventLogs::Init()
 		db.emplace_back(e.id);
 	}
 
-	std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> settings_to_insert{};
-
 	// insert entries that don't exist in database
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		bool is_in_database = std::find(db.begin(), db.end(), i) != db.end();
@@ -58,21 +56,21 @@ void PlayerEventLogs::Init()
 
 		bool is_missing_in_database = std::find(db.begin(), db.end(), i) == db.end();
 		if (is_missing_in_database && is_implemented && !is_deprecated) {
-			LogInfo("[New] PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
+			LogInfo(
+				"[New] PlayerEvent [{}] ({})",
+				PlayerEvent::EventName[i],
+				i
+			);
 
 			auto c = PlayerEventLogSettingsRepository::NewEntity();
 			c.id             = i;
 			c.event_name     = PlayerEvent::EventName[i];
 			c.event_enabled  = m_settings[i].event_enabled;
 			c.retention_days = m_settings[i].retention_days;
-			settings_to_insert.emplace_back(c);
+			PlayerEventLogSettingsRepository::InsertOne(*m_database, c);
 		}
 	}
 
-	if (!settings_to_insert.empty()) {
-		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
-	}
-
 	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
 	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();
 
@@ -335,10 +333,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatDroppedItemEvent(e, n);
 			break;
 		}
-		case PlayerEvent::FISH_FAILURE:
-		case PlayerEvent::FORAGE_FAILURE:
-		case PlayerEvent::WENT_ONLINE:
-		case PlayerEvent::WENT_OFFLINE: {
+		case PlayerEvent::FISH_FAILURE: {
 			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
 			break;
 		}
@@ -353,6 +348,10 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatFishSuccessEvent(e, n);
 			break;
 		}
+		case PlayerEvent::FORAGE_FAILURE: {
+			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
+			break;
+		}
 		case PlayerEvent::FORAGE_SUCCESS: {
 			PlayerEvent::ForageSuccessEvent n{};
 			std::stringstream               ss;
@@ -551,6 +550,11 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatResurrectAcceptEvent(e, n);
 			break;
 		}
+		case PlayerEvent::WENT_ONLINE:
+		case PlayerEvent::WENT_OFFLINE: {
+			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
+			break;
+		}
 		case PlayerEvent::MERCHANT_PURCHASE: {
 			PlayerEvent::MerchantPurchaseEvent n{};
 			std::stringstream                  ss;
@@ -613,7 +617,7 @@ void PlayerEventLogs::Process()
 
 void PlayerEventLogs::ProcessRetentionTruncation()
 {
-	LogPlayerEvents("Running truncation");
+	LogInfo("Running truncation");
 
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		if (m_settings[i].retention_days > 0) {
@@ -697,8 +701,6 @@ void PlayerEventLogs::SetSettingsDefaults()
 	m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled   = 1;
 	m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled    = 1;
 	m_settings[PlayerEvent::ITEM_CREATION].event_enabled      = 1;
-	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_ITEM].event_enabled      = 1;
-	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_PLAT].event_enabled      = 1;
 
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;

common/events/player_events.h

@@ -56,8 +56,6 @@ namespace PlayerEvent {
 		KILLED_NAMED_NPC,
 		KILLED_RAID_NPC,
 		ITEM_CREATION,
-		GUILD_TRIBUTE_DONATE_ITEM,
-		GUILD_TRIBUTE_DONATE_PLAT,
 		MAX // dont remove
 	};
 
@@ -114,9 +112,7 @@ namespace PlayerEvent {
 		"Killed NPC",
 		"Killed Named NPC",
 		"Killed Raid NPC",
-		"Item Creation",
-		"Guild Tribute Donate Item",
-		"Guild Tribute Donate Platinum"
+		"Item Creation"
 	};
 
 	// Generic struct used by all events
@@ -388,7 +384,7 @@ namespace PlayerEvent {
 	};
 
 	struct AAPurchasedEvent {
-		uint32 aa_id;
+		int32 aa_id;
 		int32 aa_cost;
 		int32 aa_previous_id;
 		int32 aa_next_id;
@@ -946,36 +942,6 @@ namespace PlayerEvent {
 			);
 		}
 	};
-
-	struct GuildTributeDonateItem {
-		uint32      item_id;
-		uint32 		guild_favor;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(guild_favor)
-			);
-		}
-	};
-
-	struct GuildTributeDonatePlat {
-		uint32      plat;
-		uint32 		guild_favor;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(plat),
-				CEREAL_NVP(guild_favor)
-			);
-		}
-	};
 }
 
 #endif //EQEMU_PLAYER_EVENTS_H

common/faction.cpp

@@ -96,12 +96,12 @@ bool IsOfEqualRace(int r1, int r2)
 	// TODO: add more values
 	switch (r1) {
 		case DARK_ELF:
-			if (r2 == Race::NeriakCitizen) {
+			if (r2 == RACE_NERIAK_CITIZEN_77) {
 				return true;
 			}
 			break;
 		case BARBARIAN:
-			if (r2 == Race::HalasCitizen) {
+			if (r2 == RACE_HALAS_CITIZEN_90) {
 				return true;
 			}
 	}

common/faction.h

@@ -24,15 +24,17 @@
 #include <string>
 
 enum FACTION_VALUE {
-	FACTION_ALLY           = 1,
-	FACTION_WARMLY         = 2,
-	FACTION_KINDLY         = 3,
-	FACTION_AMIABLY        = 4,
-	FACTION_INDIFFERENTLY  = 5,
+	FACTION_ALLY = 1,
+	FACTION_WARMLY = 2,
+	FACTION_KINDLY = 3,
+	FACTION_AMIABLY = 4,
+
+	FACTION_INDIFFERENTLY = 5,
+
 	FACTION_APPREHENSIVELY = 6,
-	FACTION_DUBIOUSLY      = 7,
-	FACTION_THREATENINGLY  = 8,
-	FACTION_SCOWLS         = 9
+	FACTION_DUBIOUSLY = 7,
+	FACTION_THREATENINGLY = 8,
+	FACTION_SCOWLS = 9
 };
 
 struct NPCFactionList {
@@ -73,6 +75,23 @@ struct NPCFaction
 	uint8 temp;
 };
 
+// Faction Associations give a much more live like faction system
+// Basically the primary faction and magnitude of a faction hit will generate the rest of them
+
+// Largest faction I could find quickly was Lord Inquisitor Seru with 9 total hits (8 associations) so 8 + 2 for max for now
+#define MAX_FACTION_ASSOC 10
+
+// this is the ID of a faction association and it's multiplier
+struct FactionAssociationHit {
+	int id;
+	float multiplier;
+};
+
+struct FactionAssociations {
+	// maybe there should be more data here, fine for now
+	FactionAssociationHit hits[MAX_FACTION_ASSOC];
+};
+
 const char *FactionValueToString(FACTION_VALUE faction_value);
 FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value);
 #endif

common/features.h

@@ -35,6 +35,11 @@ Core Zone features
 
 */
 
+
+//Uncomment this to cause a zone to basically idle
+//when there are no players in it, mobs stop wandering, etc..
+#define IDLE_WHEN_EMPTY
+
 #ifdef EMBPERL
 //Enable the new XS based perl parser
 #define EMBPERL_XS
@@ -213,14 +218,14 @@ enum {	//some random constants
 #define HARD_LEVEL_CAP 127
 
 //the square of the maximum range at whihc you could possibly use NPC services (shop, tribute, etc)
-#define USE_NPC_RANGE2 40000		//arbitrary right now
+#define USE_NPC_RANGE2 200*200		//arbitrary right now
 
 // Squared range for rampage 75.0 * 75.0 for now
 #define NPC_RAMPAGE_RANGE2 5625.0f
 
 //the formula for experience for killing a mob.
 //level is the only valid variable to use
-#define EXP_FORMULA (level * level * 75 * 35 / 10)
+#define EXP_FORMULA level*level*75*35/10
 
 #define HIGHEST_AA_VALUE 35
 
@@ -233,6 +238,41 @@ enum {	//some random constants
 // Timer to update aggrometer
 #define AGGRO_METER_UPDATE_MS 1000
 
+//Some hard coded statuses from commands and other places:
+enum {
+	minStatusToBeGM = 40,
+	minStatusToUseGMCommands = 80,
+	minStatusToKick = 150,
+	minStatusToAvoidFalling = 100,
+	minStatusToHaveInvalidSpells = 80,
+	minStatusToHaveInvalidSkills = 80,
+	minStatusToIgnoreZoneFlags = 80,
+	minStatusToSeeOthersZoneFlags = 80,
+	minStatusToEditOtherGuilds = 80,
+	commandMovecharSelfOnly = 80,	//below this == only self move allowed
+	commandMovecharToSpecials = 200,	//ability to send people to cshom/load zones
+	commandZoneToSpecials = 80,		//zone to cshome, out of load zones
+	commandToggleAI = 250,			//can turn NPC AI on and off
+	commandCastSpecials = 100,		//can cast special spells
+	commandInstacast = 100,			//insta-cast all #casted spells
+	commandLevelAboveCap = 100,		//can #level players above level cap
+	commandLevelNPCAboveCap = 100,	//can #level NPCs above level cap
+	commandSetSkillsOther = 100,	//ability to setskills on others
+	commandRaceOthers = 100,	//ability to #race on others
+	commandGenderOthers = 100,	//ability to #gender on others
+	commandTextureOthers = 100,	//ability to #texture on others
+	commandDoAnimOthers = 100,	//can #doanim on others
+	commandLockZones = 101,		//can lock or unlock zones
+	commandEditPlayerCorpses = 150,	//can Edit Player Corpses
+	commandChangeFlags = 200,		//ability to set/refresh flags
+	commandBanPlayers = 100,		//can set bans on players
+	commandChangeDatarate = 201,	//edit client's data rate
+	commandZoneToCoords = 0,		//can #zone with coords
+	commandInterrogateInv = 100,	//below this == only log on error state and self-only target dump
+	commandInvSnapshot = 150		//ability to clear/restore snapshots
+};
+
+
 // This is the item ID we use for say links, we use the max that fits in 5 ASCII chars
 #define SAYLINK_ITEM_ID 0xFFFFF
 
@@ -255,7 +295,7 @@ Developer configuration
 
 #define COMMON_PROFILE
 
-#define PROFILE_DUMP_TIME 180
+#define PROFILE_DUMP_TIME 3*60
 #endif	//EQPROFILE
 
 

common/file.cpp

@@ -37,32 +37,25 @@
 
 #include <fmt/format.h>
 #include <filesystem>
-#include <iostream>
-#include <sys/stat.h>
 
 namespace fs = std::filesystem;
 
-
+/**
+ * @param name
+ * @return
+ */
 bool File::Exists(const std::string &name)
 {
-	struct stat sb{};
-	if (stat(name.c_str(), &sb) == 0) {
-		return true;
-	}
-
-	return false;
+	return fs::exists(fs::path{name});
 }
 
+/**
+ * @param directory_name
+ */
 void File::Makedir(const std::string &directory_name)
 {
-	try {
-		fs::create_directory(directory_name);
-		fs::permissions(directory_name, fs::perms::owner_all);
-	}
-	catch (const fs::filesystem_error &ex) {
-		std::cout << "Failed to create directory: " << directory_name << std::endl;
-		std::cout << ex.what() << std::endl;
-	}
+	fs::create_directory(directory_name);
+	fs::permissions(directory_name, fs::perms::owner_all);
 }
 
 std::string File::FindEqemuConfigPath()
@@ -87,26 +80,3 @@ std::string File::GetCwd()
 {
 	return fs::current_path().string();
 }
-
-FileContentsResult File::GetContents(const std::string &file_name)
-{
-	std::string   error;
-	std::ifstream f;
-	f.open(file_name);
-	std::string line;
-	std::string lines;
-	if (f.is_open()) {
-		while (f) {
-			std::getline(f, line);
-			lines += line + "\n";
-		}
-	}
-	else {
-		error = fmt::format("Couldn't open file [{}]", file_name);
-	}
-
-	return FileContentsResult{
-		.contents = lines,
-		.error = error,
-	};
-}

common/file.h

@@ -25,16 +25,10 @@
 
 namespace fs = std::filesystem;
 
-struct FileContentsResult {
-	std::string contents;
-	std::string error;
-};
-
 class File {
 public:
 	static bool Exists(const std::string &name);
 	static void Makedir(const std::string& directory_name);
-	static FileContentsResult GetContents(const std::string &file_name);
 	static std::string FindEqemuConfigPath();
 	static std::string GetCwd();
 };

common/guild_base.h

@@ -5,42 +5,6 @@
 #include <map>
 #include <string>
 #include <vector>
-#include "timer.h"
-#include "../common/repositories/guild_members_repository.h"
-#include "../common/repositories/guilds_repository.h"
-
-struct DefaultPermissionStruct {
-	GuildAction id;
-	uint32      value;
-};
-
-struct DefaultRankNamesStruct {
-	uint32      id;
-	std::string name;
-};
-
-struct GuildTributeStruct {
-	Timer    timer;
-	uint32   id_1;
-	uint32   id_2;
-	uint32   id_1_tier;
-	uint32   id_2_tier;
-	uint32   favor;
-	uint32   time_remaining;
-	uint32   enabled;
-	bool     send_timer;
-};
-
-class TributeData {
-public:
-	//this level data stored in regular byte order and must be flipped before sending
-	TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
-	uint8       tier_count;
-	uint32      unknown;
-	std::string name;
-	std::string description;
-	bool        is_guild;	//is a guild tribute item
-};
 
 class Database;
 
@@ -48,23 +12,22 @@ class CharGuildInfo
 {
 	public:
 		//fields from `characer_`
-		uint32	    char_id;
+		uint32	char_id;
 		std::string	char_name;
-		uint8	    class_;
-		uint16	    level;
-		uint32	    time_last_on;
-		uint32	    zone_id;
+		uint8	class_;
+		uint16	level;
+		uint32	time_last_on;
+		uint32	zone_id;
 
 		//fields from `guild_members`
-		uint32	    guild_id;
-		uint8	    rank;
-		bool	    tribute_enable;
-		uint32	    total_tribute;
-		uint32	    last_tribute;		//timestamp
-		bool	    banker;
-		bool	    alt;
+		uint32	guild_id;
+		uint8	rank;
+		bool	tribute_enable;
+		uint32	total_tribute;
+		uint32	last_tribute;		//timestamp
+		bool	banker;
+		bool	alt;
 		std::string	public_note;
-		bool	    online;
 };
 
 //this object holds guild functionality shared between world and zone.
@@ -81,16 +44,15 @@ class BaseGuildManager
 		}
 
 		bool LoadGuilds();
-		virtual bool RefreshGuild(uint32 guild_id);
+		bool RefreshGuild(uint32 guild_id);
 
 		//guild edit actions.
-		uint32	CreateGuild(std::string name, uint32 leader_char_id);
-		bool    StoreGuildDB(uint32 guild_id);
+		uint32	CreateGuild(const char* name, uint32 leader_char_id);
 		bool	DeleteGuild(uint32 guild_id);
-		bool	RenameGuild(uint32 guild_id, std::string name);
-		bool	SetGuildMOTD(uint32 guild_id, std::string motd, std::string setter);
-		bool	SetGuildURL(uint32 guild_id, std::string URL);
-		bool	SetGuildChannel(uint32 guild_id, std::string Channel);
+		bool	RenameGuild(uint32 guild_id, const char* name);
+		bool	SetGuildMOTD(uint32 guild_id, const char* motd, const char *setter);
+		bool	SetGuildURL(uint32 GuildID, const char* URL);
+		bool	SetGuildChannel(uint32 GuildID, const char* Channel);
 
 		//character edit actions
 		bool	SetGuildLeader(uint32 guild_id, uint32 leader_char_id);
@@ -100,16 +62,9 @@ class BaseGuildManager
 		bool	ForceRankUpdate(uint32 charid);
 		bool	GetAltFlag(uint32 CharID);
 		bool	SetAltFlag(uint32 charid, bool is_alt);
-		bool	GetBankerFlag(uint32 CharID, bool compat_mode = false);
-		bool    GetGuildBankerStatus(uint32 guild_id, uint32 guild_rank);
+		bool	GetBankerFlag(uint32 CharID);
 		bool	SetTributeFlag(uint32 charid, bool enabled);
-		bool	SetPublicNote(uint32 charid, std::string public_note);
-		uint32  UpdateDbGuildFavor(uint32 guild_id, uint32 enabled);
-		bool    UpdateDbGuildTributeEnabled(uint32 guild_id, uint32 enabled);
-		bool    UpdateDbMemberTributeEnabled(uint32 guild_id, uint32 char_id, uint32 enabled);
-		bool    UpdateDbTributeTimeRemaining(uint32 guild_id, uint32 enabled);
-		uint32	UpdateDbMemberFavor(uint32 guild_id, uint32 char_id, uint32 favor);
-		bool    UpdateDbMemberOnline(uint32 char_id, bool status);
+		bool	SetPublicNote(uint32 charid, const char *note);
 
 		//queries
 		bool	GetCharInfo(const char *char_name, CharGuildInfo &into);
@@ -119,24 +74,29 @@ class BaseGuildManager
 		bool	GetGuildMOTD(uint32 guild_id, char *motd_buffer, char *setter_buffer) const;
 		bool	GetGuildURL(uint32 GuildID, char *URLBuffer) const;
 		bool	GetGuildChannel(uint32 GuildID, char *ChannelBuffer) const;
-        bool    IsCharacterInGuild(uint32 character_id, uint32 guild_id = 0);
-        bool	GetGuildNameByID(uint32 guild_id, std::string& into) const;
-        bool	IsGuildLeader(uint32 guild_id, uint32 char_id) const;
-        bool	CheckGMStatus(uint32 guild_id, uint8 status) const;
-        bool	CheckPermission(uint32 guild_id, uint8 rank, GuildAction act) const;
-        bool	UpdateDbBankerFlag(uint32 charid, bool is_banker);
-        uint8*  MakeGuildList(const char* head_name, uint32& length) const;	//make a guild list packet, returns ownership of the buffer.
-        uint8	GetDisplayedRank(uint32 guild_id, uint8 rank, uint32 char_id) const;
-        uint32	GetGuildIDByName(const char *GuildName);
-		uint32  GetGuildIDByCharacterID(uint32 character_id);
-        uint32	FindGuildByLeader(uint32 leader) const;
-        uint32	NumberInGuild(uint32 guild_id);
-        uint32	DoesAccountContainAGuildLeader(uint32 AccountID);
-        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;
-        std::vector<GuildMembersRepository::GuildMembers> GetGuildMembers(uint32 guild_id);
+		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;
+		bool	CheckPermission(uint32 guild_id, uint8 rank, GuildAction act) const;
+//	uint32	Getguild_id(uint32 eqid);
+		uint32	FindGuildByLeader(uint32 leader) const;
+//	void	GetGuildMembers(uint32 guild_id,GuildMember_Struct* gms);
+		uint32	NumberInGuild(uint32 guild_id);
+//	bool	GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr);
+//	bool	EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* grl);
+
+		uint8 *MakeGuildList(const char *head_name, uint32 &length) const;	//make a guild list packet, returns ownership of the buffer.
+
+		static const char *const GuildActionNames[_MaxGuildAction];
+		uint32	DoesAccountContainAGuildLeader(uint32 AccountID);
 
 	protected:
 		//the methods which must be defined by base classes.
@@ -145,62 +105,58 @@ class BaseGuildManager
 		virtual void SendRankUpdate(uint32 CharID) = 0;
 		virtual void SendGuildDelete(uint32 guild_id) = 0;
 
-		uint32	UpdateDbCreateGuild(std::string name, uint32 leader_char_id);
-		bool    UpdateDbDeleteGuild(uint32 guild_id, bool local_delete = true, bool db_delete = true);
-		bool	UpdateDbRenameGuild(uint32 guild_id, std::string name);
-		bool	UpdateDbGuildLeader(uint32 guild_id, uint32 leader_char_id);
-		bool	UpdateDbGuildMOTD(uint32 guild_id, std::string motd, std::string setter);
-		bool	UpdateDbGuildURL(uint32 GuildID, std::string URL);
-		bool	UpdateDbGuildChannel(uint32 GuildID, std::string Channel);
-		bool	UpdateDbGuild(uint32 charid, uint32 guild_id, uint8 rank);
-		bool	UpdateDbGuildRank(uint32 charid, uint8 rank);
-		bool	UpdateDbAltFlag(uint32 charid, bool is_alt);
-		bool	UpdateDbTributeFlag(uint32 charid, bool enabled);
-		bool	UpdateDbPublicNote(uint32 charid, std::string public_note);
+		uint32	DBCreateGuild(const char* name, uint32 leader_char_id);
+		bool	DBDeleteGuild(uint32 guild_id);
+		bool	DBRenameGuild(uint32 guild_id, const char* name);
+		bool	DBSetGuildLeader(uint32 guild_id, uint32 leader_char_id);
+		bool	DBSetGuildMOTD(uint32 guild_id, const char* motd, const char *setter);
+		bool	DBSetGuildURL(uint32 GuildID, const char* URL);
+		bool	DBSetGuildChannel(uint32 GuildID, const char* Channel);
+		bool	DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank);
+		bool	DBSetGuildRank(uint32 charid, uint8 rank);
+		bool	DBSetBankerFlag(uint32 charid, bool is_banker);
+		bool	DBSetAltFlag(uint32 charid, bool is_alt);
+		bool	DBSetTributeFlag(uint32 charid, bool enabled);
+		bool	DBSetPublicNote(uint32 charid, const char *note);
 		bool	QueryWithLogging(std::string query, const char *errmsg);
+//	void	DBSetPublicNote(uint32 guild_id,char* charname, char* note);
+
 		bool	LocalDeleteGuild(uint32 guild_id);
 
-		struct RankInfo
+		class RankInfo
 		{
-			RankInfo();
-			std::string rank_name;
+			public:
+				RankInfo();
+				std::string name;
+				bool permissions[_MaxGuildAction];
 		};
-		struct Functions
+		class GuildInfo
 		{
-			uint32 id;
-			uint32 perm_id;
-			uint32 guild_id;
-			uint32 perm_value;
-		};
-	public:
-		class GuildInfo {
-		public:
-			GuildInfo();
-			std::string   name;
-			std::string   motd;
-			std::string   motd_setter;
-			std::string   url;
-			std::string   channel;
-			uint32        leader;
-			uint8         minstatus;
-			std::string   rank_names[GUILD_MAX_RANK + 1];
-			Functions     functions[GUILD_MAX_FUNCTIONS + 1];
-			GuildTributeStruct tribute;
-		};
-	virtual BaseGuildManager::GuildInfo* GetGuildByGuildID(uint32 guild_id);
-	uint32 GetGuildTributeTimeRemaining(uint32 guild_id);
+			public:
+				GuildInfo();
+				std::string name;
+				std::string motd;
+				std::string motd_setter;
+				std::string url;
+				std::string channel;
+
+				uint32 leader_char_id;
+				uint8 minstatus;
+				//tribute is not in here on purpose, since it is only valid in world!
+				RankInfo ranks[GUILD_MAX_RANK + 1];
+		};
 
-	protected:
 		std::map<uint32, GuildInfo *> m_guilds;	//we own the pointers in this map
 		void ClearGuilds();	//clears internal structure
 
 		Database *m_db;	//we do not own this
 
 		bool _StoreGuildDB(uint32 guild_id);
-		GuildInfo* _CreateGuild(uint32 guild_id, std::string guild_name, uint32 leader_char_id, uint8 minstatus, std::string guild_motd, std::string motd_setter, std::string Channel, std::string URL, uint32 favour);
+		GuildInfo *_CreateGuild(uint32 guild_id, const char *guild_name, uint32 account_id, uint8 minstatus, const char *guild_motd, const char *motd_setter, const char *Channel, const char *URL);
 		uint32 _GetFreeGuildID();
-        GuildsRepository::Guilds CreateGuildRepoFromGuildInfo(uint32 guild_id, BaseGuildManager::GuildInfo& in);
 };
+
+
 #endif /*GUILD_BASE_H_*/
 
 

common/guilds.h

@@ -16,70 +16,31 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef GUILDS_H
-#define GUILDS_H
+#ifndef GUILD_H
+#define GUILD_H
 
 #include "types.h"
 
 #define GUILD_NONE		0xFFFFFFFF // user has no guild
 
-#define GUILD_MAX_RANK                     8 // 0-2 - some places in the code assume a single digit, dont go above 9
-#define GUILD_MAX_FUNCTIONS                30
-#define GUILD_TRIBUTES_MODIFY              1
-#define GUILD_TRIBUTES_SAVE                0
-#define GUILD_TRIBUTES_OFF                 0
-#define GUILD_TRIBUTES_ON                  1
-#define GUILD_INVITE_DECLINE               9
+#define GUILD_MAX_RANK 8 // 0-2 - some places in the code assume a single digit, dont go above 9
 
 //defines for standard ranks
-#define GUILD_MEMBER_TI	    0
-#define GUILD_OFFICER_TI    1
-#define GUILD_LEADER_TI     2
+#define GUILD_MEMBER	0
+#define GUILD_OFFICER	1
+#define GUILD_LEADER	2
 #define GUILD_RANK_NONE (GUILD_MAX_RANK+1)
 
-//defines for standard ranks base on RoF2 definitions
-#define GUILD_RANK_NONE      0
-#define GUILD_LEADER         1
-#define GUILD_SENIOR_OFFICER 2
-#define GUILD_OFFICER        3
-#define GUILD_SENIOR_MEMBER  4
-#define GUILD_MEMBER         5
-#define GUILD_JUNIOR_MEMBER  6
-#define GUILD_INITIATE       7
-#define GUILD_RECRUIT        8
-
 typedef enum {
-	GUILD_ACTION_BANNER_CHANGE                        = 1,
-	GUILD_ACTION_BANNER_PLANT                         = 2,
-	GUILD_ACTION_BANNER_REMOVE                        = 3,
-	GUILD_ACTION_DISPLAY_GUILD_NAME                   = 4,
-	GUILD_ACTION_RANKS_CHANGE_PERMISSIONS             = 5,
-	GUILD_ACTION_RANKS_CHANGE_RANK_NAMES              = 6,
-	GUILD_ACTION_MEMBERS_INVITE                       = 7,
-	GUILD_ACTION_MEMBERS_PROMOTE                      = 8,
-	GUILD_ACTION_MEMBERS_DEMOTE                       = 9,
-	GUILD_ACTION_MEMBERS_REMOVE                       = 10,
-	GUILD_ACTION_EDIT_RECRUITING_SETTINGS             = 11,
-	GUILD_ACTION_EDIT_PUBLIC_NOTES                    = 12,
-	GUILD_ACTION_BANK_DEPOSIT_ITEMS                   = 13,
-	GUILD_ACTION_BANK_WITHDRAW_ITEMS                  = 14,
-	GUILD_ACTION_BANK_VIEW_ITEMS                      = 15,
-	GUILD_ACTION_BANK_PROMOTE_ITEMS                   = 16,
-	GUILD_ACTION_BANK_CHANGE_ITEM_PERMISSIONS         = 17,
-	GUILD_ACTION_CHANGE_THE_MOTD                      = 18,
-	GUILD_ACTION_GUILD_CHAT_SEE                       = 19,
-	GUILD_ACTION_GUILD_CHAT_SPEAK_IN                  = 20,
-	GUILD_ACTION_SEND_THE_WHOLE_GUILD_E_MAIL          = 21,
-	GUILD_ACTION_TRIBUTE_CHANGE_FOR_OTHERS            = 22,
-	GUILD_ACTION_TRIBUTE_CHANGE_ACTIVE_BENEFIT        = 23,
-	GUILD_ACTION_TROPHY_TRIBUTE_CHANGE_FOR_OTHERS     = 24,
-	GUILD_ACTION_TROPHY_TRIBUTE_CHANGE_ACTIVE_BENEFIT = 25,
-	GUILD_ACTION_MEMBERS_CHANGE_ALT_FLAG_FOR_OTHER    = 26,
-	GUILD_ACTION_REAL_ESTATE_GUILD_PLOT_BUY           = 27,
-	GUILD_ACTION_REAL_ESTATE_GUILD_PLOT_SELL          = 28,
-	GUILD_ACTION_REAL_ESTATE_MODIFY_TROPHIES          = 29,
-	GUILD_ACTION_MEMBERS_DEMOTE_SELF                  = 30,
+	GUILD_HEAR		= 0,
+	GUILD_SPEAK		= 1,
+	GUILD_INVITE	= 2,
+	GUILD_REMOVE	= 3,
+	GUILD_PROMOTE	= 4,
+	GUILD_DEMOTE	= 5,
+	GUILD_MOTD		= 6,
+	GUILD_WARPEACE	= 7,
+	_MaxGuildAction
 } GuildAction;
 
-
 #endif

common/http/httplib.h

@@ -6690,7 +6690,7 @@ static WSInit wsinit_;
 		if (params.empty()) { return Get(path, headers); }
 
 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query, headers, progress);
+		return Get(path_with_query.c_str(), headers, progress);
 	}
 
 	inline Result ClientImpl::Get(const std::string &path, const Params &params,
@@ -6710,7 +6710,7 @@ static WSInit wsinit_;
 		}
 
 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query, headers, response_handler,
+		return Get(path_with_query.c_str(), headers, response_handler,
 				   content_receiver, progress);
 	}
 
@@ -6807,7 +6807,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body = detail::serialize_multipart_formdata(
 			items, detail::make_multipart_data_boundary(), content_type);
-		return Post(path, headers, body, content_type);
+		return Post(path, headers, body, content_type.c_str());
 	}
 
 	inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
@@ -6820,7 +6820,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body =
 						detail::serialize_multipart_formdata(items, boundary, content_type);
-		return Post(path, headers, body, content_type);
+		return Post(path, headers, body, content_type.c_str());
 	}
 
 	inline Result ClientImpl::Put(const std::string &path) {

common/inventory_profile.cpp

@@ -173,8 +173,7 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id) const
 		result = _GetItem(m_inv, slot_id);
 	}
 	else if ((slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) ||
-		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END) ||
-		(slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END)) {
+		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END)) {
 		// Equippable slots (on body)
 		result = _GetItem(m_worn, slot_id);
 	}
@@ -354,7 +353,7 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapRaceClass;
 				return false;
 			}
-			if (deity_id && source_item->Deity && !(deity::GetDeityBitmask((deity::DeityType)deity_id) & source_item->Deity)) {
+			if (deity_id && source_item->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & source_item->Deity)) {
 				fail_state = swapDeity;
 				return false;
 			}
@@ -380,7 +379,7 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapRaceClass;
 				return false;
 			}
-			if (deity_id && destination_item->Deity && !(deity::GetDeityBitmask((deity::DeityType)deity_id) & destination_item->Deity)) {
+			if (deity_id && destination_item->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & destination_item->Deity)) {
 				fail_state = swapDeity;
 				return false;
 			}
@@ -413,12 +412,11 @@ bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
 		// If there are no charges left on the item,
 		if (item_to_delete->GetCharges() <= 0) {
 			// If the item is stackable (e.g arrows), or
-			// the item is not a charged item, or is expendable, delete it
-			if (
-				item_to_delete->IsStackable() ||
-				item_to_delete->GetItem()->MaxCharges == 0 ||
-				item_to_delete->IsExpendable()
-			) {
+			// the item is not stackable, and is not a charged item, or is expendable, delete it
+			if (item_to_delete->IsStackable() ||
+				(!item_to_delete->IsStackable() &&
+				 ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))
+				) {
 				// Item can now be destroyed
 				InventoryProfile::MarkDirty(item_to_delete);
 				return true;
@@ -466,10 +464,6 @@ EQ::ItemInstance* EQ::InventoryProfile::PopItem(int16 slot_id)
 		p = m_worn[slot_id];
 		m_worn.erase(slot_id);
 	}
-	else if (slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END) {
-		p = m_worn[slot_id];
-		m_worn.erase(slot_id);
-	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
 		p = m_bank[slot_id];
 		m_bank.erase(slot_id);
@@ -806,35 +800,34 @@ int16 EQ::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
 // Returns slot_id when there's one available, else SLOT_INVALID
 int16 EQ::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow)
 {
-	const int16 last_bag_slot = (RuleI(World, ExpansionSettings) == -1 || RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) ? EQ::invslot::slotGeneral10 : EQ::invslot::slotGeneral8;
-
-	for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) { // Check basic inventory
-		if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+	// Check basic inventory
+	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
+		if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
 			continue;
-		}
 
-		if (!GetItem(i)) {
-			return i; // Found available slot in personal inventory
-		}
+		if (!GetItem(i))
+			// Found available slot in personal inventory
+			return i;
 	}
 
 	if (!for_bag) {
-		for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) {
-			if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+		for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
+			if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
 				continue;
-			}
 
-			const auto *inst = GetItem(i);
-			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size) {
-				if (inst->GetItem()->BagType == item::BagTypeQuiver &&
-					inst->GetItem()->ItemType != item::ItemTypeArrow) {
+			const ItemInstance* inst = GetItem(i);
+			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size)
+			{
+				if (inst->GetItem()->BagType == item::BagTypeQuiver && inst->GetItem()->ItemType != item::ItemTypeArrow)
+				{
 					continue;
 				}
 
-				const int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
+				int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
 
-				const uint8 slots = inst->GetItem()->BagSlots;
-				for (uint8 j = invbag::SLOT_BEGIN; j < slots; j++) {
+				uint8 slots = inst->GetItem()->BagSlots;
+				uint8 j;
+				for (j = invbag::SLOT_BEGIN; j<slots; j++) {
 					if (!GetItem(base_slot_id + j)) {
 						// Found available slot within bag
 						return (base_slot_id + j);
@@ -1424,10 +1417,6 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 		m_worn[slot_id] = inst;
 		result = slot_id;
 	}
-	else if (slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END) {
-		m_worn[slot_id] = inst;
-		result = slot_id;
-	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
 		if (slot_id - EQ::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) {
 			m_bank[slot_id] = inst;
@@ -1454,7 +1443,7 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 	}
 
 	if (result == INVALID_INDEX) {
-		LogError("Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot);
+		LogError("InventoryProfile::_PutItem: Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot);
 		InventoryProfile::MarkDirty(inst); // Slot not found, clean up
 	}
 

common/inventory_profile.h

@@ -132,7 +132,7 @@ namespace EQ
 
 		// Swap items in inventory
 		enum SwapItemFailState : int8 { swapInvalid = -1, swapPass = 0, swapNotAllowed, swapNullData, swapRaceClass, swapDeity, swapLevel };
-		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = Race::Doug, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);
+		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = RACE_DOUG_0, uint8 class_id = NO_CLASS, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);
 
 		// Remove item from inventory
 		bool DeleteItem(int16 slot_id, int16 quantity = 0);
@@ -203,12 +203,12 @@ namespace EQ
 		void dumpBankItems();
 		void dumpSharedBankItems();
 
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, const std::string& value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, int value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, float value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, bool value);
-		std::string GetCustomItemData(int16 slot_id, const std::string& identifier);
-		static const int GetItemStatValue(uint32 item_id, const std::string& identifier);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
+		std::string GetCustomItemData(int16 slot_id, std::string identifier);
+		static const int GetItemStatValue(uint32 item_id, std::string identifier);
 	protected:
 		///////////////////////////////
 		// Protected Methods

common/item_data.cpp

@@ -230,10 +230,6 @@ bool EQ::ItemData::IsTypeShield() const
 	return (ItemType == item::ItemTypeShield);
 }
 
-bool EQ::ItemData::IsQuestItem() const {
-	return QuestItemFlag;
-}
-
 bool EQ::ItemData::CheckLoreConflict(const ItemData* l_item, const ItemData* r_item)
 {
 	if (!l_item || !r_item)

common/item_data.h

@@ -131,7 +131,7 @@ namespace EQ
 			Mounts?
 			Ornamentations?
 			GuildBanners?
-			Collectible?
+			Collectible? 
 			Placeable?
 			(others?)
 */
@@ -355,187 +355,181 @@ namespace EQ
 
 	struct ItemData {
 		// Non packet based fields
-		uint8	MinStatus {};
-		char	Comment[255] {};
+		uint8	MinStatus;
 
 		// Packet based fields
-		uint8	ItemClass {};		// Item Type: 0=common, 1=container, 2=book
-		char	Name[64] {};		// Name
-		char	Lore[80] {};		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
-		char	IDFile[30] {};		// Visible model
-		uint32	ID {};				// Unique ID (also PK for DB)
-		int32	Weight {};			// Item weight * 10
-		uint8	NoRent{} ;			// No Rent: 0=norent, 255=not norent
-		uint8	NoDrop {};			// No Drop: 0=nodrop, 255=not nodrop
-		uint8	Size {};			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
-		uint32	Slots {};			// Bitfield for which slots this item can be used in
-		uint32	Price {};			// Item cost (?)
-		uint32	Icon {};			// Icon Number
-		int32	LoreGroup {};		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
-		bool	LoreFlag {};		// This will be true if LoreGroup is non-zero
-		bool	PendingLoreFlag {};
-		bool	ArtifactFlag {};
-		bool	SummonedFlag {};
-		uint8	FVNoDrop {};		// Firiona Vie nodrop flag
-		uint32	Favor {};			// Individual favor
-		uint32	GuildFavor {};		// Guild favor
-		uint32	PointType {};
+		uint8	ItemClass;		// Item Type: 0=common, 1=container, 2=book
+		char	Name[64];		// Name
+		char	Lore[80];		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
+		char	IDFile[30];		// Visible model
+		uint32	ID;				// Unique ID (also PK for DB)
+		int32	Weight;			// Item weight * 10
+		uint8	NoRent;			// No Rent: 0=norent, 255=not norent
+		uint8	NoDrop;			// No Drop: 0=nodrop, 255=not nodrop
+		uint8	Size;			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
+		uint32	Slots;			// Bitfield for which slots this item can be used in
+		uint32	Price;			// Item cost (?)
+		uint32	Icon;			// Icon Number
+		int32	LoreGroup;		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
+		bool	LoreFlag;		// This will be true if LoreGroup is non-zero
+		bool	PendingLoreFlag;
+		bool	ArtifactFlag;
+		bool	SummonedFlag;
+		uint8	FVNoDrop;		// Firiona Vie nodrop flag
+		uint32	Favor;			// Individual favor
+		uint32	GuildFavor;		// Guild favor
+		uint32	PointType;
 
 		//uint32	Unk117;
 		//uint32	Unk118;
 		//uint32	Unk121;
 		//uint32	Unk124;
 
-		uint8	BagType {};		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
-		uint8	BagSlots {};		// Number of slots: can only be 2, 4, 6, 8, or 10
-		uint8	BagSize {};		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
-		uint8	BagWR {};			// 0->100
+		uint8	BagType;		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
+		uint8	BagSlots;		// Number of slots: can only be 2, 4, 6, 8, or 10
+		uint8	BagSize;		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
+		uint8	BagWR;			// 0->100
 
-		bool	BenefitFlag {};
-		bool	Tradeskills {};	// Is this a tradeskill item?
-		int8	CR {};				// Save vs Cold
-		int8	DR {};				// Save vs Disease
-		int8	PR {};				// Save vs Poison
-		int8	MR {};				// Save vs Magic
-		int8	FR {};				// Save vs Fire
-		int8	AStr {};			// Strength
-		int8	ASta {};			// Stamina
-		int8	AAgi {};			// Agility
-		int8	ADex {};			// Dexterity
-		int8	ACha {};			// Charisma
-		int8	AInt {};			// Intelligence
-		int8	AWis {};			// Wisdom
-		int32	HP {};				// HP
-		int32	Mana {};			// Mana
-		int32	AC {};				// AC
-		uint32	Deity {};			// Bitmask of Deities that can equip this item
+		bool	BenefitFlag;
+		bool	Tradeskills;	// Is this a tradeskill item?
+		int8	CR;				// Save vs Cold
+		int8	DR;				// Save vs Disease
+		int8	PR;				// Save vs Poison
+		int8	MR;				// Save vs Magic
+		int8	FR;				// Save vs Fire
+		int8	AStr;			// Strength
+		int8	ASta;			// Stamina
+		int8	AAgi;			// Agility
+		int8	ADex;			// Dexterity
+		int8	ACha;			// Charisma
+		int8	AInt;			// Intelligence
+		int8	AWis;			// Wisdom
+		int32	HP;				// HP
+		int32	Mana;			// Mana
+		int32	AC;				// AC
+		uint32	Deity;			// Bitmask of Deities that can equip this item
 		//uint32	Unk033
-		int32	SkillModValue {};	// % Mod to skill specified in SkillModType
-		int32	SkillModMax {};	// Max skill point modification
-		uint32	SkillModType {};	// Type of skill for SkillModValue to apply to
-		uint32	BaneDmgRace {};	// Bane Damage Race
-		int32	BaneDmgAmt {};		// Bane Damage Body Amount
-		uint32	BaneDmgBody {};	// Bane Damage Body
-		bool	Magic {};			// True=Magic Item, False=not
-		int32	CastTime_ {};
-		uint8	ReqLevel {};		// Required Level to use item
-		uint32	BardType {};		// Bard Skill Type
-		int32	BardValue {};		// Bard Skill Amount
-		int8	Light {};			// Light
-		uint8	Delay {};			// Delay * 10
-		uint8	RecLevel {};		// Recommended level to use item
-		uint8	RecSkill {};		// Recommended skill to use item (refers to primary skill of item)
-		uint8	ElemDmgType {};	// Elemental Damage Type (1=magic, 2=fire)
-		uint8	ElemDmgAmt {};		// Elemental Damage
-		uint8	Range {};			// Range of item
-		uint32	Damage {};			// Delay between item usage (in 0.1 sec increments)
-		uint32	Color {};			// RR GG BB 00 <-- as it appears in pc
-		uint32	Classes {};		// Bitfield of classes that can equip item (1 << class#)
-		uint32	Races {};			// Bitfield of races that can equip item (1 << race#)
-		//uint32	Unk054 {};
-		int16	MaxCharges {};		// Maximum charges items can hold: -1 if not a chargeable item
-		uint8	ItemType {};		// Item Type/Skill (itemClass* from above)
-		int32	SubType {};		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
-		uint8	Material {};		// Item material type
-		uint32	HerosForgeModel {};// Hero's Forge Armor Model Type (2-13?)
-		float	SellRate {};		// Sell rate
-		//uint32	Unk059 {};
+		int32	SkillModValue;	// % Mod to skill specified in SkillModType
+		int32	SkillModMax;	// Max skill point modification
+		uint32	SkillModType;	// Type of skill for SkillModValue to apply to
+		uint32	BaneDmgRace;	// Bane Damage Race
+		int32	BaneDmgAmt;		// Bane Damage Body Amount
+		uint32	BaneDmgBody;	// Bane Damage Body
+		bool	Magic;			// True=Magic Item, False=not
+		int32	CastTime_;
+		uint8	ReqLevel;		// Required Level to use item
+		uint32	BardType;		// Bard Skill Type
+		int32	BardValue;		// Bard Skill Amount
+		int8	Light;			// Light
+		uint8	Delay;			// Delay * 10
+		uint8	RecLevel;		// Recommended level to use item
+		uint8	RecSkill;		// Recommended skill to use item (refers to primary skill of item)
+		uint8	ElemDmgType;	// Elemental Damage Type (1=magic, 2=fire)
+		uint8	ElemDmgAmt;		// Elemental Damage
+		uint8	Range;			// Range of item
+		uint32	Damage;			// Delay between item usage (in 0.1 sec increments)
+		uint32	Color;			// RR GG BB 00 <-- as it appears in pc
+		uint32	Classes;		// Bitfield of classes that can equip item (1 << class#)
+		uint32	Races;			// Bitfield of races that can equip item (1 << race#)
+		//uint32	Unk054;
+		int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
+		uint8	ItemType;		// Item Type/Skill (itemClass* from above)
+		int32	SubType;		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
+		uint8	Material;		// Item material type
+		uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
+		float	SellRate;		// Sell rate
+		//uint32	Unk059;
 		union {
 			uint32 Fulfilment;	// Food fulfilment (How long it lasts)
 			uint32 CastTime;		// Cast Time for clicky effects, in milliseconds
 		};
-		uint32 EliteMaterial {};
-		int32	ProcRate {};
-		int8	CombatEffects {};	// PoP: Combat Effects +
-		int8	Shielding {};		// PoP: Shielding %
-		int8	StunResist {};		// PoP: Stun Resist %
-		int8	StrikeThrough {};	// PoP: Strike Through %
-		int32	ExtraDmgSkill {};
-		int32	ExtraDmgAmt {};
-		int8	SpellShield {};	// PoP: Spell Shield %
-		int8	Avoidance {};		// PoP: Avoidance +
-		int8	Accuracy {};		// PoP: Accuracy +
-		uint32	CharmFileID {};
-		int32	FactionMod1 {};	// Faction Mod 1
-		int32	FactionMod2 {};	// Faction Mod 2
-		int32	FactionMod3 {};	// Faction Mod 3
-		int32	FactionMod4 {};	// Faction Mod 4
-		int32	FactionAmt1 {};	// Faction Amt 1
-		int32	FactionAmt2 {};	// Faction Amt 2
-		int32	FactionAmt3 {};	// Faction Amt 3
-		int32	FactionAmt4 {};	// Faction Amt 4
-		char	CharmFile[32] {};	// ?
-		uint32	AugType {};
-		uint8	AugSlotType[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Type
-		uint8	AugSlotVisible[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Visible
-		uint8	AugSlotUnk2[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
-		uint32	LDoNTheme {};
-		uint32	LDoNPrice {};
-		uint32	LDoNSold {};
-		uint32	BaneDmgRaceAmt {};
-		uint32	AugRestrict {};
-		int32	Endur {};
-		int32	DotShielding {};
-		int32	Attack {};
-		int32	Regen {};
-		int32	ManaRegen {};
-		int32	EnduranceRegen {};
-		int32	Haste {};
-		int32	DamageShield {};
-		uint32	RecastDelay {};
-		int	RecastType {};
-		uint32	AugDistiller {};
-		bool	Attuneable {};
-		bool	NoPet {};
-		bool	PotionBelt {};
-		bool	Stackable {};
-		bool	NoTransfer {};
-		bool	QuestItemFlag {};
-		int16	StackSize {};
-		uint8	PotionBeltSlots {};
-		item::ItemEffect_Struct Click {};
-		item::ItemEffect_Struct Proc {};
-		item::ItemEffect_Struct Worn {};
-		item::ItemEffect_Struct Focus {};
-		item::ItemEffect_Struct Scroll {};
-		item::ItemEffect_Struct Bard {};
+		uint32 EliteMaterial;
+		int32	ProcRate;
+		int8	CombatEffects;	// PoP: Combat Effects +
+		int8	Shielding;		// PoP: Shielding %
+		int8	StunResist;		// PoP: Stun Resist %
+		int8	StrikeThrough;	// PoP: Strike Through %
+		uint32	ExtraDmgSkill;
+		uint32	ExtraDmgAmt;
+		int8	SpellShield;	// PoP: Spell Shield %
+		int8	Avoidance;		// PoP: Avoidance +
+		int8	Accuracy;		// PoP: Accuracy +
+		uint32	CharmFileID;
+		int32	FactionMod1;	// Faction Mod 1
+		int32	FactionMod2;	// Faction Mod 2
+		int32	FactionMod3;	// Faction Mod 3
+		int32	FactionMod4;	// Faction Mod 4
+		int32	FactionAmt1;	// Faction Amt 1
+		int32	FactionAmt2;	// Faction Amt 2
+		int32	FactionAmt3;	// Faction Amt 3
+		int32	FactionAmt4;	// Faction Amt 4
+		char	CharmFile[32];	// ?
+		uint32	AugType;
+		uint8	AugSlotType[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Type
+		uint8	AugSlotVisible[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Visible
+		uint8	AugSlotUnk2[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
+		uint32	LDoNTheme;
+		uint32	LDoNPrice;
+		uint32	LDoNSold;
+		uint32	BaneDmgRaceAmt;
+		uint32	AugRestrict;
+		int32	Endur;
+		int32	DotShielding;
+		int32	Attack;
+		int32	Regen;
+		int32	ManaRegen;
+		int32	EnduranceRegen;
+		int32	Haste;
+		int32	DamageShield;
+		uint32	RecastDelay;
+		int	RecastType;
+		uint32	AugDistiller;
+		bool	Attuneable;
+		bool	NoPet;
+		bool	PotionBelt;
+		bool	Stackable;
+		bool	NoTransfer;
+		bool	QuestItemFlag;
+		int16	StackSize;
+		uint8	PotionBeltSlots;
+		item::ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard;
 
-		uint8	Book {};			// 0=Not book, 1=Book
-		uint32	BookType {};
-		char	Filename[33] {};	// Filename for book data
+		uint8	Book;			// 0=Not book, 1=Book
+		uint32	BookType;
+		char	Filename[33];	// Filename for book data
 		// Begin SoF Fields
-		int32 SVCorruption {};
-		uint32 Purity {};
-		uint8 EvolvingItem {};
-		uint32 EvolvingID {};
-		uint8 EvolvingLevel {};
-		uint8 EvolvingMax {};
-		uint32 BackstabDmg {};
-		uint32 DSMitigation {};
-		int32 HeroicStr {};
-		int32 HeroicInt {};
-		int32 HeroicWis {};
-		int32 HeroicAgi {};
-		int32 HeroicDex {};
-		int32 HeroicSta {};
-		int32 HeroicCha {};
-		int32 HeroicMR {};
-		int32 HeroicFR {};
-		int32 HeroicCR {};
-		int32 HeroicDR {};
-		int32 HeroicPR {};
-		int32 HeroicSVCorrup {};
-		int32 HealAmt {};
-		int32 SpellDmg {};
-		uint32 LDoNSellBackRate {};
-		uint32 ScriptFileID {};
-		uint16 ExpendableArrow {};
-		uint32 Clairvoyance {};
-		char	ClickName[65] {};
-		char	ProcName[65] {};
-		char	WornName[65] {};
-		char	FocusName[65] {};
-		char	ScrollName[65] {};
+		int32 SVCorruption;
+		uint32 Purity;
+		uint8 EvolvingItem;
+		uint32 EvolvingID;
+		uint8 EvolvingLevel;
+		uint8 EvolvingMax;
+		uint32 BackstabDmg;
+		uint32 DSMitigation;
+		int32 HeroicStr;
+		int32 HeroicInt;
+		int32 HeroicWis;
+		int32 HeroicAgi;
+		int32 HeroicDex;
+		int32 HeroicSta;
+		int32 HeroicCha;
+		int32 HeroicMR;
+		int32 HeroicFR;
+		int32 HeroicCR;
+		int32 HeroicDR;
+		int32 HeroicPR;
+		int32 HeroicSVCorrup;
+		int32 HealAmt;
+		int32 SpellDmg;
+		uint32 LDoNSellBackRate;
+		uint32 ScriptFileID;
+		uint16 ExpendableArrow;
+		uint32 Clairvoyance;
+		char	ClickName[65];
+		char	ProcName[65];
+		char	WornName[65];
+		char	FocusName[65];
+		char	ScrollName[65];
 		//BardName
 
 		bool IsEquipable(uint16 Race, uint16 Class) const;
@@ -547,7 +541,6 @@ namespace EQ
 		bool IsType1HWeapon() const;
 		bool IsType2HWeapon() const;
 		bool IsTypeShield() const;
-		bool IsQuestItem() const;
 
 		static bool CheckLoreConflict(const ItemData* l_item, const ItemData* r_item);
 		bool CheckLoreConflict(const ItemData* item) const { return CheckLoreConflict(this, item); }

common/item_instance.cpp

@@ -17,7 +17,6 @@
 */
 
 #include "inventory_profile.h"
-#include "../common/data_verification.h"
 //#include "classes.h"
 //#include "global_define.h"
 //#include "item_instance.h"
@@ -25,16 +24,16 @@
 #include "rulesys.h"
 #include "shareddb.h"
 #include "strings.h"
-
+#include "util/uuid.h"
 //#include "../common/light_source.h"
 
 #include <limits.h>
 
 //#include <iostream>
 
-int32 NextItemInstSerialNumber = 1;
+uint32 NextItemInstSerialNumber = 1;
 
-static inline int32 GetNextItemInstSerialNumber() {
+static inline uint32 GetNextItemInstSerialNumber() {
 
 	// The Bazaar relies on each item a client has up for Trade having a unique
 	// identifier. This 'SerialNumber' is sent in Serialized item packets and
@@ -46,7 +45,7 @@ static inline int32 GetNextItemInstSerialNumber() {
 	// NextItemInstSerialNumber is the next one to hand out.
 	//
 	// It is very unlikely to reach 2,147,483,647. Maybe we should call abort(), rather than wrapping back to 1.
-	if(NextItemInstSerialNumber >= INT_MAX)
+	if(NextItemInstSerialNumber >= UINT_MAX)
 		NextItemInstSerialNumber = 1;
 	else
 		NextItemInstSerialNumber++;
@@ -57,63 +56,131 @@ static inline int32 GetNextItemInstSerialNumber() {
 //
 // class EQ::ItemInstance
 //
-EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
-
-	if (item) {
+EQ::ItemInstance::ItemInstance(const ItemData* item, const std::string& guid, int16 charges) {
+	m_use_type = ItemInstNormal;
+	if(item) {
 		m_item = new ItemData(*item);
+	} else {
+		m_item = nullptr;
+	}
+
+	if (guid.empty()) {
+		m_guid = EQ::Util::UUID::Generate().ToString();
+	}
+	else {
+		m_guid = guid;
 	}
 
 	m_charges = charges;
-
-	if (m_item && m_item->IsClassCommon()) {
+	m_price = 0;
+	m_attuned = false;
+	m_merchantslot = 0;
+	if (m_item && m_item->IsClassCommon())
 		m_color = m_item->Color;
-	}
+	else
+		m_color = 0;
+	m_merchantcount = 1;
+	m_serial_number = GetNextItemInstSerialNumber();
 
-	m_SerialNumber  = GetNextItemInstSerialNumber();
+	m_exp = 0;
+	m_evolveLvl = 0;
+	m_activated = false;
+	m_scaledItem = nullptr;
+	m_evolveInfo = nullptr;
+	m_scaling = false;
+	m_ornamenticon = 0;
+	m_ornamentidfile = 0;
+	m_ornament_hero_model = 0;
+	m_recast_timestamp = 0;
+	m_new_id_file = 0;
+	m_currentslot = 0;
 }
 
-EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) {
-
-	m_item     = db->GetItem(item_id);
-
-	if (m_item) {
+EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, const std::string& guid, int16 charges) {
+	m_use_type = ItemInstNormal;
+	m_item = db->GetItem(item_id);
+	if(m_item) {
 		m_item = new ItemData(*m_item);
 	}
+	else {
+		m_item = nullptr;
+	}
+
+	if (guid.empty()) {
+		m_guid = EQ::Util::UUID::Generate().ToString();
+	}
+	else {
+		m_guid = guid;
+	}
 
 	m_charges = charges;
-
-	if (m_item && m_item->IsClassCommon()) {
+	m_price = 0;
+	m_merchantslot = 0;
+	m_attuned=false;
+	if (m_item && m_item->IsClassCommon())
 		m_color = m_item->Color;
-	} else {
+	else
 		m_color = 0;
-	}
+	m_merchantcount = 1;
+	m_serial_number = GetNextItemInstSerialNumber();
 
-	m_SerialNumber  = GetNextItemInstSerialNumber();
+	m_exp = 0;
+	m_evolveLvl = 0;
+	m_activated = false;
+	m_scaledItem = nullptr;
+	m_evolveInfo = nullptr;
+	m_scaling = false;
+	m_ornamenticon = 0;
+	m_ornamentidfile = 0;
+	m_ornament_hero_model = 0;
+	m_recast_timestamp = 0;
+	m_new_id_file = 0;
+	m_currentslot = 0;
 }
 
 EQ::ItemInstance::ItemInstance(ItemInstTypes use_type) {
-	m_use_type     = use_type;
+	m_use_type = use_type;
+
+	m_guid = EQ::Util::UUID::Generate().ToString();
+	m_item = nullptr;
+	m_charges = 0;
+	m_price = 0;
+	m_attuned = false;
+	m_merchantslot = 0;
+	m_color = 0;
+	m_serial_number = 0;
+	m_exp = 0;
+	m_evolveLvl = 0;
+	m_activated = false;
+	m_scaledItem = nullptr;
+	m_evolveInfo = nullptr;
+	m_scaling = false;
+	m_ornamenticon = 0;
+	m_ornamentidfile = 0;
+	m_ornament_hero_model = 0;
+	m_recast_timestamp = 0;
+	m_new_id_file = 0;
+	m_currentslot = 0;
+	m_merchantcount = 0;
 }
 
 // Make a copy of an EQ::ItemInstance object
 EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 {
-	m_use_type = copy.m_use_type;
-
-	if (copy.m_item) {
+	m_use_type=copy.m_use_type;
+	if(copy.m_item)
 		m_item = new ItemData(*copy.m_item);
-	} else {
+	else
 		m_item = nullptr;
-	}
-
-	m_charges       = copy.m_charges;
-	m_price         = copy.m_price;
-	m_color         = copy.m_color;
-	m_merchantslot  = copy.m_merchantslot;
-	m_currentslot   = copy.m_currentslot;
-	m_attuned       = copy.m_attuned;
-	m_merchantcount = copy.m_merchantcount;
 
+	m_guid = copy.m_guid;
+	m_charges=copy.m_charges;
+	m_price=copy.m_price;
+	m_color=copy.m_color;
+	m_merchantslot=copy.m_merchantslot;
+	m_currentslot=copy.m_currentslot;
+	m_attuned=copy.m_attuned;
+	m_merchantcount=copy.m_merchantcount;
 	// Copy container contents
 	for (auto it = copy.m_contents.begin(); it != copy.m_contents.end(); ++it) {
 		ItemInstance* inst_old = it->second;
@@ -123,42 +190,37 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 			inst_new = inst_old->Clone();
 		}
 
-		if (inst_new) {
+		if (inst_new != nullptr) {
 			m_contents[it->first] = inst_new;
 		}
 	}
-
 	std::map<std::string, std::string>::const_iterator iter;
 	for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); ++iter) {
 		m_custom_data[iter->first] = iter->second;
 	}
+	m_serial_number = copy.m_serial_number;
+	m_custom_data = copy.m_custom_data;
+	m_timers = copy.m_timers;
 
-	m_SerialNumber = copy.m_SerialNumber;
-	m_custom_data  = copy.m_custom_data;
-	m_timers       = copy.m_timers;
-
-	m_exp       = copy.m_exp;
+	m_exp = copy.m_exp;
 	m_evolveLvl = copy.m_evolveLvl;
 	m_activated = copy.m_activated;
-
-	if (copy.m_scaledItem) {
+	if (copy.m_scaledItem)
 		m_scaledItem = new ItemData(*copy.m_scaledItem);
-	} else {
+	else
 		m_scaledItem = nullptr;
-	}
 
-	if (copy.m_evolveInfo) {
+	if(copy.m_evolveInfo)
 		m_evolveInfo = new EvolveInfo(*copy.m_evolveInfo);
-	} else {
+	else
 		m_evolveInfo = nullptr;
-	}
 
-	m_scaling             = copy.m_scaling;
-	m_ornamenticon        = copy.m_ornamenticon;
-	m_ornamentidfile      = copy.m_ornamentidfile;
+	m_scaling = copy.m_scaling;
+	m_ornamenticon = copy.m_ornamenticon;
+	m_ornamentidfile = copy.m_ornamentidfile;
 	m_ornament_hero_model = copy.m_ornament_hero_model;
-	m_recast_timestamp    = copy.m_recast_timestamp;
-	m_new_id_file         = copy.m_new_id_file;
+	m_recast_timestamp = copy.m_recast_timestamp;
+	m_new_id_file = copy.m_new_id_file;
 }
 
 // Clean up container contents
@@ -176,13 +238,11 @@ bool EQ::ItemInstance::IsType(item::ItemClass item_class) const
 	// IsType(<ItemClassTypes>) does not protect against 'm_item = nullptr'
 
 	// Check usage type
-	if (m_use_type == ItemInstWorldContainer && item_class == item::ItemClassBag) {
+	if ((m_use_type == ItemInstWorldContainer) && (item_class == item::ItemClassBag))
 		return true;
-	}
 
-	if (!m_item) {
+	if (!m_item)
 		return false;
-	}
 
 	return (m_item->ItemClass == item_class);
 }
@@ -205,20 +265,21 @@ bool EQ::ItemInstance::IsClassBook() const
 // Is item stackable?
 bool EQ::ItemInstance::IsStackable() const
 {
-	return (m_item && m_item->Stackable);
+	if (!m_item)
+		return false;
+
+	return m_item->Stackable;
 }
 
 bool EQ::ItemInstance::IsCharged() const
 {
-	if (!m_item) {
+	if (!m_item)
 		return false;
-	}
 
-	if (m_item->MaxCharges > 1) {
+	if (m_item->MaxCharges > 1)
 		return true;
-	} else {
+	else
 		return false;
-	}
 }
 
 // Can item be equipped?
@@ -267,30 +328,26 @@ bool EQ::ItemInstance::IsEquipable(int16 slot_id) const
 
 bool EQ::ItemInstance::IsAugmentable() const
 {
-	if (!m_item) {
+	if (!m_item)
 		return false;
-	}
 
 	for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
-		if (m_item->AugSlotType[index] != 0) {
+		if (m_item->AugSlotType[index] != 0)
 			return true;
-		}
 	}
 
 	return false;
 }
 
 bool EQ::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
-	if (!m_item || !m_item->IsClassCommon()) {
+	if (!m_item || !m_item->IsClassCommon())
 		return false;
-	}
 
 	int index = invslot::EQUIPMENT_BEGIN;
 	for (; index <= invslot::EQUIPMENT_END; ++index) {
 		if (m_item->Slots & (1 << index)) {
-			if (aug_wear_slots & (1 << index)) {
+			if (aug_wear_slots & (1 << index))
 				break;
-			}
 		}
 	}
 
@@ -359,10 +416,9 @@ EQ::ItemInstance* EQ::ItemInstance::GetItem(uint8 index) const
 
 uint32 EQ::ItemInstance::GetItemID(uint8 slot) const
 {
-	const auto item = GetItem(slot);
-	if (item) {
+	ItemInstance *item = GetItem(slot);
+	if (item)
 		return item->GetID();
-	}
 
 	return 0;
 }
@@ -486,21 +542,14 @@ uint8 EQ::ItemInstance::FirstOpenSlot() const
 
 uint8 EQ::ItemInstance::GetTotalItemCount() const
 {
-	if (!m_item) {
+	if (!m_item)
 		return 0;
-	}
 
 	uint8 item_count = 1;
 
-	if (!m_item->IsClassBag()) {
-		return item_count;
-	}
+	if (m_item && !m_item->IsClassBag()) { return item_count; }
 
-	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) {
-		if (GetItem(index)) {
-			++item_count;
-		}
-	}
+	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) { if (GetItem(index)) { ++item_count; } }
 
 	return item_count;
 }
@@ -528,99 +577,78 @@ EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 augment_index) const
 	return nullptr;
 }
 
-bool EQ::ItemInstance::IsOrnamentationAugment(EQ::ItemInstance* augment) const
+EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const
 {
-	if (!m_item || !m_item->IsClassCommon() || !augment) {
-		return false;
-	}
+	if (!m_item || !m_item->IsClassCommon()) { return nullptr; }
+	if (ornamentationAugtype == 0) { return nullptr; }
 
-	const auto augment_item = augment->GetItem();
-	if (!augment_item) {
-		return false;
-	}
-
-	const std::string& idfile = augment_item->IDFile;
-
-	if (
-		EQ::ValueWithin(
-			augment->GetAugmentType(),
-			OrnamentationAugmentTypes::StandardOrnamentation,
-			OrnamentationAugmentTypes::SpecialOrnamentation
-		) ||
-		(
-			idfile != "IT63" &&
-			idfile != "IT64"
-		) ||
-		augment_item->HerosForgeModel
-	) {
-		return true;
-	}
-
-	return false;
-}
-
-EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAugment() const
-{
-	if (!m_item || !m_item->IsClassCommon()) {
-		return nullptr;
-	}
-
-	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++) {
-		const auto augment = GetAugment(i);
-		if (augment && IsOrnamentationAugment(augment)) {
-			return augment;
+	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++)
+	{
+		if (GetAugment(i) && m_item->AugSlotType[i] == ornamentationAugtype)
+		{
+			const char *item_IDFile = GetAugment(i)->GetItem()->IDFile;
+			if (
+				(strncmp(item_IDFile, "IT64", strlen(item_IDFile)) == 0
+				|| strncmp(item_IDFile, "IT63", strlen(item_IDFile)) == 0)
+				&& GetAugment(i)->GetItem()->HerosForgeModel == 0
+				)
+			{
+				continue;
+			}
+			return GetAugment(i);
 		}
 	}
 
 	return nullptr;
 }
 
-uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const
-{
+uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
 	// Not a Hero Forge item.
-	if (m_ornament_hero_model == 0 || material_slot < 0) {
+	if (m_ornament_hero_model == 0 || material_slot < 0)
 		return 0;
-	}
 
 	// Item is using an explicit Hero Forge ID
-	if (m_ornament_hero_model >= 1000) {
+	if (m_ornament_hero_model >= 1000)
 		return m_ornament_hero_model;
-	}
 
 	// Item is using a shorthand ID
 	return (m_ornament_hero_model * 100) + material_slot;
 }
 
-bool EQ::ItemInstance::UpdateOrnamentationInfo()
-{
-	if (!m_item || !m_item->IsClassCommon()) {
+bool EQ::ItemInstance::UpdateOrnamentationInfo() {
+	if (!m_item || !m_item->IsClassCommon())
 		return false;
-	}
 
-	const auto augment = GetOrnamentationAugment();
+	bool ornamentSet = false;
 
-	if (augment) {
-		const auto augment_item = GetOrnamentationAugment()->GetItem();
-
-		if (augment_item) {
-			SetOrnamentIcon(augment_item->Icon);
-			SetOrnamentHeroModel(augment_item->HerosForgeModel);
-
-			if (strlen(augment_item->IDFile) > 2) {
-				SetOrnamentationIDFile(Strings::ToUnsignedInt(&augment_item->IDFile[2]));
-			} else {
+	int32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
+	if (GetOrnamentationAug(ornamentationAugtype))
+	{
+		const ItemData* ornamentItem;
+		ornamentItem = GetOrnamentationAug(ornamentationAugtype)->GetItem();
+		if (ornamentItem != nullptr)
+		{
+			SetOrnamentIcon(ornamentItem->Icon);
+			SetOrnamentHeroModel(ornamentItem->HerosForgeModel);
+			if (strlen(ornamentItem->IDFile) > 2)
+			{
+				SetOrnamentationIDFile(Strings::ToInt(&ornamentItem->IDFile[2]));
+			}
+			else
+			{
 				SetOrnamentationIDFile(0);
 			}
-
-			return true;
+			ornamentSet = true;
 		}
 	}
+	else
+	{
+		SetOrnamentIcon(0);
+		SetOrnamentHeroModel(0);
+		SetOrnamentationIDFile(0);
+	}
 
-	SetOrnamentIcon(0);
-	SetOrnamentHeroModel(0);
-	SetOrnamentationIDFile(0);
-
-	return false;
+	return ornamentSet;
 }
 
 bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) {
@@ -720,14 +748,12 @@ EQ::ItemInstance* EQ::ItemInstance::RemoveAugment(uint8 index)
 
 bool EQ::ItemInstance::IsAugmented()
 {
-	if (!m_item || !m_item->IsClassCommon()) {
+	if (!m_item || !m_item->IsClassCommon())
 		return false;
-	}
 
-	for (uint8 slot_id = invaug::SOCKET_BEGIN; slot_id <= invaug::SOCKET_END; ++slot_id) {
-		if (GetAugmentItemID(slot_id)) {
+	for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
+		if (GetAugmentItemID(index))
 			return true;
-		}
 	}
 
 	return false;
@@ -836,20 +862,7 @@ std::string EQ::ItemInstance::GetCustomDataString() const {
 	return ret_val;
 }
 
-void EQ::ItemInstance::SetCustomDataString(const std::string& str)
-{
-	auto components = Strings::Split(str, "^");
-	auto value_count = components.size() / 2;
-
-	for (auto i = 0; i < value_count; i++) {
-		auto identifier = components[i * 2];
-		auto value = components[(i * 2) + 1];
-
-		SetCustomData(identifier, value);
-	}
-}
-
-std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
+std::string EQ::ItemInstance::GetCustomData(std::string identifier) {
 	std::map<std::string, std::string>::const_iterator iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		return iter->second;
@@ -858,33 +871,33 @@ std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
 	return "";
 }
 
-void EQ::ItemInstance::SetCustomData(const std::string& identifier, const std::string& value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, std::string value) {
 	DeleteCustomData(identifier);
 	m_custom_data[identifier] = value;
 }
 
-void EQ::ItemInstance::SetCustomData(const std::string& identifier, int value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, int value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQ::ItemInstance::SetCustomData(const std::string& identifier, float value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, float value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQ::ItemInstance::SetCustomData(const std::string& identifier, bool value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, bool value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQ::ItemInstance::DeleteCustomData(const std::string& identifier) {
+void EQ::ItemInstance::DeleteCustomData(std::string identifier) {
 	auto iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		m_custom_data.erase(iter);
@@ -936,9 +949,8 @@ bool EQ::ItemInstance::IsDroppable(bool recurse) const
 
 void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	// if there's no actual item, don't do anything
-	if (!m_item) {
+	if (!m_item)
 		return;
-	}
 
 	// initialize scaling items
 	if (m_item->CharmFileID != 0) {
@@ -947,7 +959,7 @@ void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	}
 
 	// initialize evolving items
-	else if (db && m_item->LoreGroup >= 1000) {
+	else if ((db) && m_item->LoreGroup >= 1000 && m_item->LoreGroup != -1) {
 		// not complete yet
 	}
 }
@@ -1273,7 +1285,7 @@ int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const
 
 int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const
 {
-	int race = Race::Doug;
+	int race = RACE_DOUG_0;
 	const auto item = GetItem();
 	if (item) {
 		race = item->BaneDmgRace;
@@ -1791,16 +1803,6 @@ int EQ::ItemInstance::RemoveTaskDeliveredItems()
 	return count;
 }
 
-uint32 EQ::ItemInstance::GetItemGuildFavor() const
-{
-	uint32 total = 0;
-	const auto item = GetItem();
-	if (item) {
-		return total = item->GuildFavor;
-	}
-	return 0;
-}
-
 //
 // class EvolveInfo
 //

common/item_instance.h

@@ -51,11 +51,6 @@ typedef enum {
 	byFlagNotSet	//apply action if the flag is NOT set
 } byFlagSetting;
 
-enum OrnamentationAugmentTypes {
-	StandardOrnamentation = 20,
-	SpecialOrnamentation = 21
-};
-
 class SharedDatabase;
 
 // ########################################
@@ -74,9 +69,9 @@ namespace EQ
 		/////////////////////////
 
 		// Constructors/Destructor
-		ItemInstance(const ItemData* item = nullptr, int16 charges = 0);
+		ItemInstance(const ItemData* item, const std::string& guid, int16 charges);
 
-		ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges = 0);
+		ItemInstance(SharedDatabase *db, uint32 item_id, const std::string &guid, int16 charges);
 
 		ItemInstance(ItemInstTypes use_type);
 
@@ -84,6 +79,8 @@ namespace EQ
 
 		~ItemInstance();
 
+		inline std::string GetGuid() const { return m_guid; }
+
 		// Query item type
 		bool IsType(item::ItemClass item_class) const;
 
@@ -108,8 +105,7 @@ namespace EQ
 		bool AvailableWearSlot(uint32 aug_wear_slots) const;
 		int8 AvailableAugmentSlot(int32 augment_type) const;
 		bool IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const;
-		inline int GetAugmentType() const { return m_item ? m_item->AugType : 0; }
-		inline uint32 GetAugmentRestriction() const { return m_item ? m_item->AugRestrict : 0; }
+		inline int32 GetAugmentType() const { return ((m_item) ? m_item->AugType : 0); }
 
 		inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == item::ItemEffectExpendable) || (m_item->ItemType == item::ItemTypePotion)) : false); }
 
@@ -142,8 +138,7 @@ namespace EQ
 		bool IsAugmented();
 		bool ContainsAugmentByID(uint32 item_id);
 		int CountAugmentByID(uint32 item_id);
-		bool IsOrnamentationAugment(EQ::ItemInstance* augment) const;
-		ItemInstance* GetOrnamentationAugment() const;
+		ItemInstance* GetOrnamentationAug(int32 ornamentationAugtype) const;
 		bool UpdateOrnamentationInfo();
 		static bool CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll = false);
 
@@ -182,13 +177,12 @@ namespace EQ
 		void SetAttuned(bool flag)				{ m_attuned = flag; }
 
 		std::string GetCustomDataString() const;
-		std::string GetCustomData(const std::string &identifier);
-		void SetCustomDataString(const std::string& str);
-		void SetCustomData(const std::string &identifier, const std::string& value);
-		void SetCustomData(const std::string &identifier, int value);
-		void SetCustomData(const std::string &identifier, float value);
-		void SetCustomData(const std::string &identifier, bool value);
-		void DeleteCustomData(const std::string& identifier);
+		std::string GetCustomData(std::string identifier);
+		void SetCustomData(std::string identifier, std::string value);
+		void SetCustomData(std::string identifier, int value);
+		void SetCustomData(std::string identifier, float value);
+		void SetCustomData(std::string identifier, bool value);
+		void DeleteCustomData(std::string identifier);
 
 		// Allows treatment of this object as though it were a pointer to m_item
 		operator bool() const { return (m_item != nullptr); }
@@ -233,8 +227,8 @@ namespace EQ
 		std::string Serialize(int16 slot_id) const { InternalSerializedItem_Struct s; s.slot_id = slot_id; s.inst = (const void*)this; std::string ser; ser.assign((char*)&s, sizeof(InternalSerializedItem_Struct)); return ser; }
 		void Serialize(OutBuffer& ob, int16 slot_id) const { InternalSerializedItem_Struct isi; isi.slot_id = slot_id; isi.inst = (const void*)this; ob.write((const char*)&isi, sizeof(isi)); }
 
-		inline int32 GetSerialNumber() const { return m_SerialNumber; }
-		inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }
+		inline int32 GetSerialNumber() const { return m_serial_number; }
+		inline void SetSerialNumber(int32 id) { m_serial_number = id; }
 
 		std::map<std::string, ::Timer>& GetTimers() { return m_timers; }
 		void SetTimer(std::string name, uint32 time);
@@ -299,7 +293,6 @@ namespace EQ
 		int GetItemHeroicDR(bool augments = false) const;
 		int GetItemHeroicCorrup(bool augments = false) const;
 		int GetItemHaste(bool augments = false) const;
-		uint32 GetItemGuildFavor() const;
 
 	protected:
 		//////////////////////////
@@ -312,33 +305,35 @@ namespace EQ
 
 		void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }
 
-		ItemInstTypes		m_use_type {ItemInstNormal};	// Usage type for item
-		const ItemData*		m_item {nullptr};		// Ptr to item data
-		int16				m_charges {0};	// # of charges for chargeable items
-		uint32				m_price {0};	// Bazaar /trader price
-		uint32				m_color {0};
-		uint32				m_merchantslot {0};
-		int16				m_currentslot {0};
-		bool				m_attuned {false};
-		int32				m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
-		int32				m_SerialNumber {0};	// Unique identifier for this instance of an item. Needed for Bazaar.
-		uint32				m_exp {0};
-		int8				m_evolveLvl {0};
-		bool				m_activated {false};
-		ItemData*			m_scaledItem {nullptr};
-		::EvolveInfo*		m_evolveInfo {nullptr};
-		bool				m_scaling {false};
-		uint32				m_ornamenticon {0};
-		uint32				m_ornamentidfile {0};
-		uint32				m_new_id_file {0};
-		uint32				m_ornament_hero_model {0};
-		uint32				m_recast_timestamp {0};
-		int                 m_task_delivered_count {0};
+		std::string         m_guid;
+		ItemInstTypes		m_use_type;	// Usage type for item
+		const ItemData*		m_item;		// Ptr to item data
+		int16				m_charges;	// # of charges for chargeable items
+		uint32				m_price;	// Bazaar /trader price
+		uint32				m_color;
+		uint32				m_merchantslot;
+		int16				m_currentslot;
+		bool				m_attuned;
+		int32				m_merchantcount;		//number avaliable on the merchant, -1=unlimited
+		uint32				m_serial_number;	// Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32				m_exp;
+		int8				m_evolveLvl;
+		bool				m_activated;
+		ItemData*			m_scaledItem;
+		::EvolveInfo*		m_evolveInfo;
+		bool				m_scaling;
+		uint32				m_ornamenticon;
+		uint32				m_ornamentidfile;
+		uint32				m_new_id_file;
+		uint32				m_ornament_hero_model;
+		uint32				m_recast_timestamp;
+		int                 m_task_delivered_count = 0;
 
-		// Items inside of this item (augs or contents) {};
-		std::map<uint8, ItemInstance*>		m_contents {}; // Zero-based index: min=0, max=9
-		std::map<std::string, std::string>	m_custom_data {};
-		std::map<std::string, ::Timer>		m_timers {};
+		//
+		// Items inside of this item (augs or contents);
+		std::map<uint8, ItemInstance*>		m_contents; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>	m_custom_data;
+		std::map<std::string, ::Timer>		m_timers;
 	};
 }
 

common/languages.h

@@ -0,0 +1,52 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#ifndef LANGUAGES_H
+#define LANGUAGES_H
+#include "../common/types.h"
+
+#define LANG_COMMON_TONGUE	0
+#define LANG_BARBARIAN		1
+#define LANG_ERUDIAN		2
+#define LANG_ELVISH			3
+#define LANG_DARK_ELVISH	4
+#define LANG_DWARVISH		5
+#define LANG_TROLL			6
+#define LANG_OGRE			7
+#define LANG_GNOMISH		8
+#define LANG_HALFLING		9
+#define LANG_THIEVES_CANT	10
+#define LANG_OLD_ERUDIAN	11
+#define LANG_ELDER_ELVISH	12
+#define LANG_FROGLOK		13
+#define LANG_GOBLIN			14
+#define LANG_GNOLL			15
+#define LANG_COMBINE_TONGUE	16
+#define LANG_ELDER_TEIRDAL	17
+#define LANG_LIZARDMAN		18
+#define LANG_ORCISH			19
+#define LANG_FAERIE			20
+#define LANG_DRAGON			21
+#define LANG_ELDER_DRAGON	22
+#define LANG_DARK_SPEECH	23
+#define LANG_VAH_SHIR		24
+#define LANG_ALARAN			25
+#define LANG_HADAL			26
+#define LANG_UNKNOWN	27
+
+#endif
+

common/loot.h

@@ -1,33 +0,0 @@
-#ifndef CODE_LOOT_H
-#define CODE_LOOT_H
-
-#include <list>
-#include <string>
-#include "../common/types.h"
-
-struct LootItem {
-	uint32      item_id;
-	int16       equip_slot;
-	uint16      charges;
-	uint16      lootslot;
-	uint32      aug_1;
-	uint32      aug_2;
-	uint32      aug_3;
-	uint32      aug_4;
-	uint32      aug_5;
-	uint32      aug_6;
-	bool        attuned;
-	std::string custom_data;
-	uint32      ornamenticon{};
-	uint32      ornamentidfile{};
-	uint32      ornament_hero_model{};
-	uint16      trivial_min_level;
-	uint16      trivial_max_level;
-	uint16      npc_min_level;
-	uint16      npc_max_level;
-};
-
-typedef std::list<LootItem*> LootItems;
-
-
-#endif //CODE_LOOT_H

common/loottable.h

@@ -0,0 +1,68 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2013 EQEMu Development Team (http://eqemu.org)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef _EQEMU_LOOTTABLE_H
+#define _EQEMU_LOOTTABLE_H
+
+#include "types.h"
+
+#pragma pack(1)
+struct LootTableEntries_Struct {
+	uint32	lootdrop_id;
+	uint8	droplimit;
+	uint8	mindrop;
+	uint8	multiplier;
+	float	probability;
+};
+
+struct ContentFlags {
+	int16 min_expansion;
+	int16 max_expansion;
+	char  content_flags[100];
+	char  content_flags_disabled[100];
+};
+
+struct LootTable_Struct {
+	uint32                  mincash;
+	uint32                  maxcash;
+	uint32                  avgcoin;
+	uint32                  NumEntries;
+	ContentFlags            content_flags;
+	LootTableEntries_Struct Entries[0];
+};
+
+struct LootDropEntries_Struct {
+	uint32 item_id;
+	int8   item_charges;
+	uint8  equip_item;
+	float  chance;
+	uint16 trivial_min_level;
+	uint16 trivial_max_level;
+	uint16 npc_min_level;
+	uint16 npc_max_level;
+	uint8  multiplier;
+};
+
+struct LootDrop_Struct {
+	uint32                 NumEntries;
+	ContentFlags           content_flags;
+	LootDropEntries_Struct Entries[0];
+};
+#pragma pack()
+
+#endif

common/misc.cpp

@@ -151,7 +151,7 @@ static char *temp=nullptr;
 		return false;
 	}
 	ptr++;
-	uint32 id = Strings::ToUnsignedInt(field[id_pos]);
+	uint32 id = Strings::ToInt(field[id_pos].c_str());
 	items[id]=field;
 
 	for(i=0;i<10;i++) {
@@ -214,6 +214,123 @@ std::string x;
 	return i;
 }
 
+void LoadItemDBFieldNames() {
+	DBFieldNames[0]="N/A";			// Charges
+	DBFieldNames[1]="unknown002";		// ?
+	DBFieldNames[2]="N/A";			// Current Equip Slot
+	DBFieldNames[3]="unknown004";
+	DBFieldNames[4]="unknown005";		// ?
+	DBFieldNames[5]="itemclass";		// "Item Type (0=common, 1=container, 2=book)"
+	DBFieldNames[6]="name";			// Name
+	DBFieldNames[7]="lore";			// "Lore Name (*=lore, &=summoned, #=artifact)"
+	DBFieldNames[8]="idfile";		// IDFile
+	DBFieldNames[9]="id";			// ItemNumber
+	DBFieldNames[10]="weight";		// Weight
+	DBFieldNames[11]="norent";		// "NoRent (0=norent, 255=not norent)"
+	DBFieldNames[12]="nodrop";		// "NoDrop (0=nodrop, 255=not nodrop)"
+	DBFieldNames[13]="size";		// "Size (0=tiny, 1=small, 2=medium, 3=large, 4=giant)"
+	DBFieldNames[14]="slots";		// EquipSlots
+	DBFieldNames[15]="cost";		// Cost
+	DBFieldNames[16]="icon";		// IconNumber
+	DBFieldNames[17]="unknown018";
+	DBFieldNames[18]="unknown019";
+	DBFieldNames[19]="unknown020";		// ?
+	DBFieldNames[20]="tradeskills";		// "Tradeskill Item (1=is a tradeskill item, 0=not)"
+	DBFieldNames[21]="cr";			// SvCold
+	DBFieldNames[22]="dr";			// SvDisease
+	DBFieldNames[23]="pr";			// SvPoison
+	DBFieldNames[24]="mr";			// SvMagic
+	DBFieldNames[25]="fr";			// SvFire
+	DBFieldNames[26]="astr";		// STR
+	DBFieldNames[27]="asta";		// STA
+	DBFieldNames[28]="aagi";		// AGI
+	DBFieldNames[29]="adex";		// DEX
+	DBFieldNames[30]="acha";		// CHA
+	DBFieldNames[31]="aint";		// INT
+	DBFieldNames[32]="awis";		// WIS
+	DBFieldNames[33]="hp";			// HP
+	DBFieldNames[34]="mana";		// Mana
+	DBFieldNames[35]="ac";			// AC
+	DBFieldNames[36]="deity";		// Deity
+	DBFieldNames[37]="skillmodvalue";	// Skill Mod Value
+	DBFieldNames[38]="skillmodtype";	// Skill Mod Type
+	DBFieldNames[39]="banedmgrace";		// Bane Dmg Race
+	DBFieldNames[40]="banedmgamt";		// Band Dmg
+	DBFieldNames[41]="banedmgbody";		// Band Dmg Body
+	DBFieldNames[42]="magic";		// "Magic (0=not magic, 1=magic)"
+	DBFieldNames[43]="casttime2";		// Casttime appears twice
+	DBFieldNames[44]="hasteproclvl";	// "Level (Haste value, rather)"
+	DBFieldNames[45]="reqlevel";		// Required Level
+	DBFieldNames[46]="bardtype";		// Bard Type
+	DBFieldNames[47]="bardvalue";		// Bard Type Amount
+	DBFieldNames[48]="light";		// Light
+	DBFieldNames[49]="delay";		// Attack Delay
+	DBFieldNames[50]="reclevel";		// Recommended Level
+	DBFieldNames[51]="recskill";		// Recommended Skill
+	DBFieldNames[52]="elemdmgamt";		// "Elemental Dmg Type (1=magic, 2=fire, 3=cold, 4=poison, 5=disease)"
+	DBFieldNames[53]="elemdmgtype";		// Elemental Dmg
+	DBFieldNames[54]="effecttype";		// "Effect Type (0=combat, 1=clicky, 2=Worn, 3=Expendable charges, 4=Must Equip Clicky, 5=clicky)"
+	DBFieldNames[55]="range";		// Range
+	DBFieldNames[56]="damage";		// Damage
+	DBFieldNames[57]="color";		// Color
+	DBFieldNames[58]="classes";		// Classes
+	DBFieldNames[59]="races";		// Races
+	DBFieldNames[60]="unknown061";
+	DBFieldNames[61]="spellid";		// SpellId
+	DBFieldNames[62]="maxcharges";		// MaxCharges
+	DBFieldNames[63]="itemtype";		// "Skill (ItemType: 1hs, etc)"
+	DBFieldNames[64]="material";		// Material
+	DBFieldNames[65]="sellrate";		// ** Sell Rate
+	DBFieldNames[66]="unknown067";
+	DBFieldNames[67]="casttime";		// CastTime (milliseconds)
+	DBFieldNames[68]="unknown069";
+	DBFieldNames[69]="unknown070";		// ?
+	DBFieldNames[70]="focusid";		// Focus Effect Spell Id
+	DBFieldNames[71]="combateffects";	// CombatEffects
+	DBFieldNames[72]="shielding";		// Shielding
+	DBFieldNames[73]="stunresist";		// StunResist
+	DBFieldNames[74]="strikethrough";	// StrikeThrough
+	DBFieldNames[75]="unknown076";
+	DBFieldNames[76]="unknown077";		// ?
+	DBFieldNames[77]="spellshield";		// Spell Shield
+	DBFieldNames[78]="avoidance";		// Avoidance
+	DBFieldNames[79]="accuracy";		// Accuracy
+	DBFieldNames[80]="factionmod1";		// Faction Mod Index 1
+	DBFieldNames[81]="factionmod2";		// Faction Mod Index 2
+	DBFieldNames[82]="factionmod3";		// Faction Mod Index 3
+	DBFieldNames[83]="factionmod4";		// Faction Mod Index 4
+	DBFieldNames[84]="factionamt1";		// Faction Mod Value 1
+	DBFieldNames[85]="factionamt2";		// Faction Mod Value 2
+	DBFieldNames[86]="factionamt3";		// Faction Mod Value 3
+	DBFieldNames[87]="factionamt4";		// Faction Mod Value 4
+	DBFieldNames[88]="unknown089";
+	DBFieldNames[89]="charmfile";		// ** Charm File
+	DBFieldNames[90]="unknown091";
+	DBFieldNames[91]="augslot1type";	// Slot1Type
+	DBFieldNames[92]="augslot2type";	// Slot2Type
+	DBFieldNames[93]="augslot3type";	// Slot3Type
+	DBFieldNames[94]="augslot4type";	// Slot4Type
+	DBFieldNames[95]="augslot5type";	// Slot5Type
+	DBFieldNames[96]="ldonpointtheme";
+	DBFieldNames[97]="ldonpointcost";		// ?
+	DBFieldNames[98]="unknown099";
+	DBFieldNames[99]="bagtype";		// bag type
+	DBFieldNames[100]="bagslots";		// bag slots
+	DBFieldNames[101]="bagsize";		// bag size capacity
+	DBFieldNames[102]="bagwr";		// bag weight reduction
+	DBFieldNames[103]="booktype";		// "book type (0=rolled up note, 1=book)"
+	DBFieldNames[104]="unknown105";
+	DBFieldNames[105]="filename";		// Book Filename
+	DBFieldNames[106]="unknown107";
+	DBFieldNames[107]="unknown108";
+	DBFieldNames[108]="loreflag";
+	DBFieldNames[109]="unknown111";
+	DBFieldNames[110]="unknown112";
+	DBFieldNames[111]="unknown113";
+	DBFieldNames[112]="unknown114";
+	DBFieldNames[113]="unknown115";		// ? (end quote)
+}
+
 void dump_message_column(unsigned char *buffer, unsigned long length, std::string leader, FILE *to)
 {
 unsigned long i,j;

common/misc.h

@@ -15,6 +15,8 @@ bool ItemParse(const char *data, int length, std::map<int,std::map<int,std::stri
 
 int Tokenize(std::string s, std::map<int,std::string> & tokens, char delim='|');
 
+void LoadItemDBFieldNames();
+
 #ifndef WIN32
 int print_stacktrace();
 #endif

common/misc_functions.cpp

@@ -131,7 +131,7 @@ bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf
 		if (*oIP == 0)
 			return false;
 		if (oPort)
-			*oPort = Strings::ToUnsignedInt(sep.arg[1]);
+			*oPort = Strings::ToInt(sep.arg[1]);
 		return true;
 	}
 	return false;

common/mysql_request_result.cpp

@@ -51,7 +51,6 @@ void MySQLRequestResult::ZeroOut()
 	m_RowCount = 0;
 	m_RowsAffected = 0;
 	m_LastInsertedID = 0;
-	m_error_message = "";
 }
 
 MySQLRequestResult::~MySQLRequestResult()
@@ -138,23 +137,3 @@ MySQLRequestResult& MySQLRequestResult::operator=(MySQLRequestResult&& other)
 	other.ZeroOut();
 	return *this;
 }
-
-uint32 MySQLRequestResult::GetErrorNumber() const
-{
-	return m_ErrorNumber;
-}
-
-void MySQLRequestResult::SetErrorNumber(uint32 m_error_number)
-{
-	m_ErrorNumber = m_error_number;
-}
-
-const std::string &MySQLRequestResult::GetErrorMessage() const
-{
-	return m_error_message;
-}
-
-void MySQLRequestResult::SetErrorMessage(const std::string &m_error_message)
-{
-	MySQLRequestResult::m_error_message = m_error_message;
-}

common/mysql_request_result.h

@@ -33,42 +33,30 @@ private:
 	uint32 m_LastInsertedID;
 	uint32 m_ErrorNumber;
 
-	std::string m_error_message;
 
 public:
 
 	MySQLRequestResult(MYSQL_RES* result, uint32 rowsAffected = 0, uint32 rowCount = 0, uint32 columnCount = 0, uint32 lastInsertedID = 0, uint32 errorNumber = 0, char *errorBuffer = nullptr);
-	MySQLRequestResult();
+	MySQLRequestResult();	
 	MySQLRequestResult(MySQLRequestResult&& moveItem);
 	~MySQLRequestResult();
 
 	MySQLRequestResult& operator=(MySQLRequestResult&& other);
 
 	bool Success() const { return m_Success;}
-	std::string ErrorMessage() const {
-		if (!m_error_message.empty()) {
-			return m_error_message;
-		}
-
-		return m_ErrorBuffer ? std::string(m_ErrorBuffer) : std::string("");
-	}
+	std::string ErrorMessage() const {return m_ErrorBuffer ? std::string(m_ErrorBuffer) : std::string("");}
 	uint32 ErrorNumber() const {return m_ErrorNumber;}
 	uint32 RowsAffected() const {return m_RowsAffected;}
 	uint32 RowCount() const {return m_RowCount;}
 	uint32 ColumnCount() const {return m_ColumnCount;}
 	uint32 LastInsertedID() const {return m_LastInsertedID;}
 	// default to 0 index since we mostly use it that way anyways.
-	uint32 LengthOfColumn(int columnIndex = 0);
+	uint32 LengthOfColumn(int columnIndex = 0); 
 	const std::string FieldName(int columnIndex);
 
 	MySQLRequestRow& begin() { return m_CurrentRow; }
 	MySQLRequestRow& end() { return m_OneBeyondRow; }
 
-	uint32 GetErrorNumber() const;
-	void SetErrorNumber(uint32 m_error_number);
-	const std::string &GetErrorMessage() const;
-	void SetErrorMessage(const std::string &m_error_message);
-
 private:
 	void FreeInternals();
 	void ZeroOut();

common/net/console_server.cpp

@@ -7,7 +7,7 @@ EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 	m_server = std::make_unique<EQ::Net::TCPServer>();
 	m_server->Listen(addr, port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		ConsoleServerConnection *c = new ConsoleServerConnection(this, connection);
-		m_connections.emplace(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
+		m_connections.insert(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
 	});
 }
 

common/net/daybreak_connection.cpp

@@ -97,7 +97,7 @@ void EQ::Net::DaybreakConnectionManager::Connect(const std::string &addr, int po
 		m_on_new_connection(connection);
 	}
 
-	m_connections.emplace(std::make_pair(std::make_pair(addr, port), connection));
+	m_connections.insert(std::make_pair(std::make_pair(addr, port), connection));
 }
 
 void EQ::Net::DaybreakConnectionManager::Process()
@@ -234,7 +234,7 @@ void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoi
 				if (m_on_new_connection) {
 					m_on_new_connection(connection);
 				}
-				m_connections.emplace(std::make_pair(std::make_pair(endpoint, port), connection));
+				m_connections.insert(std::make_pair(std::make_pair(endpoint, port), connection));
 				connection->ProcessPacket(p);
 			}
 			else if (data[1] != OP_OutOfSession) {
@@ -527,7 +527,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac
 		DynamicPacket *out = new DynamicPacket();
 		out->PutPacket(0, p);
 
-		s->packet_queue.emplace(std::make_pair(seq, out));
+		s->packet_queue.insert(std::make_pair(seq, out));
 	}
 }
 
@@ -1427,7 +1427,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;
 
 		InternalBufferedSend(first_packet);
@@ -1459,7 +1459,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 				static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 				m_owner->m_options.resend_delay_min,
 				m_owner->m_options.resend_delay_max);
-			stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+			stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 			stream->sequence_out++;
 
 			InternalBufferedSend(packet);
@@ -1483,7 +1483,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;
 
 		InternalBufferedSend(packet);

common/net/eqstream.cpp

@@ -22,7 +22,7 @@ void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions
 void EQ::Net::EQStreamManager::DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection)
 {
 	std::shared_ptr<EQStream> stream(new EQStream(this, connection));
-	m_streams.emplace(std::make_pair(connection, stream));
+	m_streams.insert(std::make_pair(connection, stream));
 	if (m_on_new_connection) {
 		m_on_new_connection(stream);
 	}

common/net/servertalk_client_connection.cpp

@@ -45,7 +45,7 @@ void EQ::Net::ServertalkClient::SendPacket(ServerPacket *p)
 
 void EQ::Net::ServertalkClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }
 
 void EQ::Net::ServertalkClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)

common/net/servertalk_legacy_client_connection.cpp

@@ -41,7 +41,7 @@ void EQ::Net::ServertalkLegacyClient::SendPacket(ServerPacket *p)
 
 void EQ::Net::ServertalkLegacyClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }
 
 void EQ::Net::ServertalkLegacyClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)

common/net/servertalk_server.cpp

@@ -19,12 +19,12 @@ void EQ::Net::ServertalkServer::Listen(const ServertalkServerOptions& opts)
 
 void EQ::Net::ServertalkServer::OnConnectionIdentified(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_ident.emplace(std::make_pair(type, cb));
+	m_on_ident.insert(std::make_pair(type, cb));
 }
 
 void EQ::Net::ServertalkServer::OnConnectionRemoved(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_disc.emplace(std::make_pair(type, cb));
+	m_on_disc.insert(std::make_pair(type, cb));
 }
 
 void EQ::Net::ServertalkServer::ConnectionDisconnected(ServertalkServerConnection *conn)
@@ -75,7 +75,7 @@ void EQ::Net::ServertalkServer::ConnectionIdentified(ServertalkServerConnection
 			else {
 				std::vector<std::shared_ptr<EQ::Net::ServertalkServerConnection>> vec;
 				vec.push_back(*iter);
-				m_ident_connections.emplace(std::make_pair(conn->GetIdentifier(), vec));
+				m_ident_connections.insert(std::make_pair(conn->GetIdentifier(), vec));
 			}
 
 			m_unident_connections.erase(iter);

common/net/servertalk_server_connection.cpp

@@ -100,7 +100,7 @@ void EQ::Net::ServertalkServerConnection::SendPacket(ServerPacket *p)
 
 void EQ::Net::ServertalkServerConnection::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }
 
 void EQ::Net::ServertalkServerConnection::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)

common/net/tcp_connection.cpp

@@ -142,7 +142,7 @@ void EQ::Net::TCPConnection::Write(const char *data, size_t count)
 
 	WriteBaton *baton = new WriteBaton;
 	baton->connection = this;
-	baton->buffer = new char[count];
+	baton->buffer = new char[count];;
 
 	uv_write_t *write_req = new uv_write_t;
 	memset(write_req, 0, sizeof(uv_write_t));

common/patches/rof.cpp

@@ -34,7 +34,6 @@
 #include "../rulesys.h"
 #include "../path_manager.h"
 #include "../races.h"
-#include "../raid.h"
 
 #include <iostream>
 #include <sstream>
@@ -202,7 +201,7 @@ namespace RoF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);
 
-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;
 
 			auto outapp = new EQApplicationPacket(
@@ -1051,7 +1050,7 @@ namespace RoF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1070,7 +1069,7 @@ namespace RoF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1100,7 +1099,7 @@ namespace RoF
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1170,7 +1169,7 @@ namespace RoF
 			return;
 
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 
@@ -1308,13 +1307,13 @@ namespace RoF
 				PutFieldN(class_);
 
 				/* Translate older ranks to new values */
-				//switch (emu_e->rank) {
-				//case 0: { e->rank = htonl(5); break; }  // GUILD_MEMBER	0
-				//case 1: { e->rank = htonl(3); break; }  // GUILD_OFFICER 1
-				//case 2: { e->rank = htonl(1); break; }  // GUILD_LEADER	2
-				//default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
-				//}
-				PutFieldN(rank);
+				switch (emu_e->rank) {
+				case 0: { e->rank = htonl(5); break; }  // GUILD_MEMBER	0
+				case 1: { e->rank = htonl(3); break; }  // GUILD_OFFICER 1
+				case 2: { e->rank = htonl(1); break; }  // GUILD_LEADER	2
+				default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
+				}
+
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				e->unknown01 = 0;
@@ -2609,124 +2608,88 @@ namespace RoF
 
 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket* inapp = *p;
-		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket *inapp = *p;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
 
-		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
 
-		general->action = raidCreate;
-		general->parameter = RaidCommandAcceptInvite;
-		strn0cpy(general->leader_name, emu->leader_name, sizeof(emu->leader_name));
-		strn0cpy(general->player_name, emu->leader_name, sizeof(emu->leader_name));
-
-		dest->FastQueuePacket(&outapp);
+		general->action = 8;
+		general->parameter = 1;
+		strn0cpy(general->leader_name, raid_create->leader_name, 64);
+		strn0cpy(general->player_name, raid_create->leader_name, 64);
 
+		dest->FastQueuePacket(&outapp_create);
 		safe_delete(inapp);
-
 	}
 
 	ENCODE(OP_RaidUpdate)
 	{
-		EQApplicationPacket* inapp = *p;
+		EQApplicationPacket *inapp = *p;
 		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidGeneral_Struct *raid_gen = (RaidGeneral_Struct*)__emu_buffer;
 
-		switch (raid_gen->action)
+		if (raid_gen->action == 0) // raid add has longer length than other raid updates
 		{
-		case raidAdd:
-		{
-			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;
+			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct* eq = (structs::RaidAddMember_Struct*)outapp->pBuffer;
-
-			OUT(raidGen.action);
-			OUT(raidGen.parameter);
-			OUT_str(raidGen.leader_name);
-			OUT_str(raidGen.player_name);
-			OUT(_class);
-			OUT(level);
-			OUT(isGroupLeader);
-			OUT(flags[0]);
-			OUT(flags[1]);
-			OUT(flags[2]);
-			OUT(flags[3]);
-			OUT(flags[4]);
+			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
 
+			add_member->raidGen.action = in_add_member->raidGen.action;
+			add_member->raidGen.parameter = in_add_member->raidGen.parameter;
+			strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64);
+			strn0cpy(add_member->raidGen.player_name, in_add_member->raidGen.player_name, 64);
+			add_member->_class = in_add_member->_class;
+			add_member->level = in_add_member->level;
+			add_member->isGroupLeader = in_add_member->isGroupLeader;
+			add_member->flags[0] = in_add_member->flags[0];
+			add_member->flags[1] = in_add_member->flags[1];
+			add_member->flags[2] = in_add_member->flags[2];
+			add_member->flags[3] = in_add_member->flags[3];
+			add_member->flags[4] = in_add_member->flags[4];
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetMotd:
+		else if (raid_gen->action == 35)
 		{
-			RaidMOTD_Struct* emu = (RaidMOTD_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct));
-			structs::RaidMOTD_Struct* eq = (structs::RaidMOTD_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.player_name);
-			OUT_str(general.leader_name);
-			OUT_str(motd);
+			RaidMOTD_Struct *inmotd = (RaidMOTD_Struct *)__emu_buffer;
+			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct) +
+										 strlen(inmotd->motd) + 1);
+			structs::RaidMOTD_Struct *outmotd = (structs::RaidMOTD_Struct *)outapp->pBuffer;
 
+			outmotd->general.action = inmotd->general.action;
+			strn0cpy(outmotd->general.player_name, inmotd->general.player_name, 64);
+			strn0cpy(outmotd->motd, inmotd->motd, strlen(inmotd->motd) + 1);
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetLeaderAbilities:
-		case raidMakeLeader:
+		else if (raid_gen->action == 14 || raid_gen->action == 30)
 		{
-			RaidLeadershipUpdate_Struct* emu = (RaidLeadershipUpdate_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
-			structs::RaidLeadershipUpdate_Struct* eq = (structs::RaidLeadershipUpdate_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT_str(player_name);
-			OUT_str(leader_name);
-			memcpy(&eq->raid, &emu->raid, sizeof(RaidLeadershipAA_Struct));
+			RaidLeadershipUpdate_Struct *inlaa = (RaidLeadershipUpdate_Struct *)__emu_buffer;
+			auto outapp =
+			    new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
+			structs::RaidLeadershipUpdate_Struct *outlaa = (structs::RaidLeadershipUpdate_Struct *)outapp->pBuffer;
 
+			outlaa->action = inlaa->action;
+			strn0cpy(outlaa->player_name, inlaa->player_name, 64);
+			strn0cpy(outlaa->leader_name, inlaa->leader_name, 64);
+			memcpy(&outlaa->raid, &inlaa->raid, sizeof(RaidLeadershipAA_Struct));
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetNote:
+		else
 		{
-			auto emu = (RaidNote_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidNote_Struct));
-			auto eq = (structs::RaidNote_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.leader_name);
-			OUT_str(general.player_name);
-			OUT_str(note);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidNoRaid:
-		{
-			dest->QueuePacket(inapp);
-			break;
-		}
-		default:
-		{
-			RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;
+			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-			structs::RaidGeneral_Struct* eq = (structs::RaidGeneral_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT(parameter);
-			OUT_str(leader_name);
-			OUT_str(player_name);
-
+			structs::RaidGeneral_Struct *raid_general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+			strn0cpy(raid_general->leader_name, in_raid_general->leader_name, 64);
+			strn0cpy(raid_general->player_name, in_raid_general->player_name, 64);
+			raid_general->action = in_raid_general->action;
+			raid_general->parameter = in_raid_general->parameter;
 			dest->FastQueuePacket(&outapp);
-			break;
-		}
 		}
+
 		safe_delete(inapp);
 	}
 
@@ -3051,12 +3014,19 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
 		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
 
-		eq->guild_id = emu->Unknown00;
-		eq->rank = emu->rank;
+		eq->GuildID = emu->Unknown00;
 
-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-		eq->unknown76 = 1;
+		/* Translate older ranks to new values */
+		switch (emu->Rank) {
+		case 0: { eq->Rank = 5; break; }  // GUILD_MEMBER	0
+		case 1: { eq->Rank = 3; break; }  // GUILD_OFFICER	1
+		case 2: { eq->Rank = 1; break; }  // GUILD_LEADER	2
+		default: { eq->Rank = emu->Rank; break; }
+		}
+
+		memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
+		OUT(Banker);
+		eq->Unknown76 = 1;
 
 		FINISH_ENCODE();
 	}
@@ -3158,7 +3128,7 @@ namespace RoF
 
 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
 
-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -3861,8 +3831,8 @@ namespace RoF
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize += 60;
@@ -3966,22 +3936,10 @@ namespace RoF
 
 				/* Translate older ranks to new values */
 				switch (emu->guildrank) {
-					case 0: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);
-						break;
-					}  // GUILD_MEMBER	0
-					case 1: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);
-						break;
-					}  // GUILD_OFFICER	1
-					case 2: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);
-						break;
-					}  // GUILD_LEADER	2
-					default: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
-						break;
-					}  //
+				case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);  break; }  // GUILD_MEMBER	0
+				case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);  break; }  // GUILD_OFFICER	1
+				case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);  break; }  // GUILD_LEADER	2
+				default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; }  //
 				}
 			}
 
@@ -4007,8 +3965,8 @@ namespace RoF
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown18
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown19
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -4903,47 +4861,37 @@ namespace RoF
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);
 
-		RaidGeneral_Struct* rgs = (RaidGeneral_Struct*)__packet->pBuffer;
-
-		switch (rgs->action)
-		{
-		case raidSetMotd:
-		{
-			SETUP_VAR_DECODE(RaidMOTD_Struct, structs::RaidMOTD_Struct, motd);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(motd);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		case raidSetNote:
-		{
-			SETUP_VAR_DECODE(RaidNote_Struct, structs::RaidNote_Struct, note);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(note);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		default:
-		{
-			SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
-			IN(action);
-			IN(parameter);
-			IN_str(leader_name);
-			IN_str(player_name);
-
-			FINISH_DIRECT_DECODE();
-			break;
-		}
+		// This is a switch on the RaidGeneral action
+		switch (*(uint32 *)__packet->pBuffer) {
+			case 35: { // raidMOTD
+				// we don't have a nice macro for this
+				structs::RaidMOTD_Struct *__eq_buffer = (structs::RaidMOTD_Struct *)__packet->pBuffer;
+				__eq_buffer->motd[1023] = '\0';
+				size_t motd_size = strlen(__eq_buffer->motd) + 1;
+				__packet->size = sizeof(RaidMOTD_Struct) + motd_size;
+				__packet->pBuffer = new unsigned char[__packet->size];
+				RaidMOTD_Struct *emu = (RaidMOTD_Struct *)__packet->pBuffer;
+				structs::RaidMOTD_Struct *eq = (structs::RaidMOTD_Struct *)__eq_buffer;
+				strn0cpy(emu->general.player_name, eq->general.player_name, 64);
+				strn0cpy(emu->motd, eq->motd, motd_size);
+				IN(general.action);
+				IN(general.parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			 }
+			case 36: { // raidPlayerNote unhandled
+				break;
+			}
+			default: {
+				DECODE_LENGTH_EXACT(structs::RaidGeneral_Struct);
+				SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
+				strn0cpy(emu->leader_name, eq->leader_name, 64);
+				strn0cpy(emu->player_name, eq->player_name, 64);
+				IN(action);
+				IN(parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
 		}
 	}
 
@@ -5270,6 +5218,7 @@ namespace RoF
 		/**
 		 * Ornamentation
 		 */
+		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;
 

common/patches/rof2.cpp

@@ -35,7 +35,6 @@
 #include "../path_manager.h"
 #include "../classes.h"
 #include "../races.h"
-#include "../raid.h"
 
 #include <iostream>
 #include <sstream>
@@ -274,7 +273,7 @@ namespace RoF2
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);
 
-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;
 
 			auto outapp = new EQApplicationPacket(
@@ -1102,7 +1101,7 @@ namespace RoF2
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1121,7 +1120,7 @@ namespace RoF2
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1151,7 +1150,7 @@ namespace RoF2
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1221,7 +1220,7 @@ namespace RoF2
 			return;
 
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 
@@ -1319,7 +1318,6 @@ namespace RoF2
 		buffer++;
 
 		// Guild ID
-		//*((uint32*)buffer) = htonl(2);
 		buffer += sizeof(uint32);
 
 		//add member count.
@@ -1358,7 +1356,15 @@ namespace RoF2
 				PutFieldN(level);
 				PutFieldN(banker);
 				PutFieldN(class_);
-				PutFieldN(rank);
+
+				/* Translate older ranks to new values */
+				switch (emu_e->rank) {
+				case 0: { e->rank = htonl(5); break; }  // GUILD_MEMBER	0
+				case 1: { e->rank = htonl(3); break; }  // GUILD_OFFICER 1
+				case 2: { e->rank = htonl(1); break; }  // GUILD_LEADER	2
+				default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
+				}
+
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				e->unknown01 = 0;
@@ -1388,10 +1394,8 @@ namespace RoF2
 
 		OUT(GuildID);
 		memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
-		//OUT(ZoneID);
-		//OUT(InstanceID);
-		eq->InstanceID = emu->InstanceID;
-		eq->ZoneID = emu->ZoneID;
+		OUT(ZoneID);
+		OUT(InstanceID);
 		OUT(LastSeen);
 		eq->Unknown76 = 0;
 
@@ -1417,7 +1421,7 @@ namespace RoF2
 			if (InBuffer[0])
 			{
 				PacketSize += (5 + strlen(InBuffer));
-				HighestGuildID += 1;
+				HighestGuildID = i - 1;
 			}
 			InBuffer += 64;
 		}
@@ -1455,30 +1459,6 @@ namespace RoF2
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
-	ENCODE(OP_GuildTributeDonateItem)
-	{
-		SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_GuildTributeDonateItem)");
-
-		OUT(type);
-		OUT(sub_index);
-		OUT(aug_index);
-		OUT(quantity);
-		OUT(unknown10);
-		OUT(unknown20);
-		OUT(favor);
-
-		structs::InventorySlot_Struct iss;
-		iss = ServerToRoF2Slot(emu->slot);
-
-		eq->slot = iss.Slot;
-		eq->sub_index = iss.SubIndex;
-
-		FINISH_ENCODE();
-	}
-
-
 	ENCODE(OP_HPUpdate)
 	{
 		SETUP_DIRECT_ENCODE(SpawnHPUpdate_Struct, structs::SpawnHPUpdate_Struct);
@@ -2485,8 +2465,6 @@ namespace RoF2
 		{
 			outapp->WriteUInt32(0xffffffff);
 			outapp->WriteUInt32(0);
-//			outapp->WriteUInt32(60);
-//			outapp->WriteUInt32(1);
 		}
 
 		outapp->WriteUInt32(0);				// Unknown
@@ -2699,124 +2677,88 @@ namespace RoF2
 
 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket* inapp = *p;
-		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket *inapp = *p;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
 
-		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
 
-		general->action = raidCreate;
-		general->parameter = RaidCommandAcceptInvite;
-		strn0cpy(general->leader_name, emu->leader_name, sizeof(emu->leader_name));
-		strn0cpy(general->player_name, emu->leader_name, sizeof(emu->leader_name));
-
-		dest->FastQueuePacket(&outapp);
+		general->action = 8;
+		general->parameter = 1;
+		strn0cpy(general->leader_name, raid_create->leader_name, 64);
+		strn0cpy(general->player_name, raid_create->leader_name, 64);
 
+		dest->FastQueuePacket(&outapp_create);
 		safe_delete(inapp);
-
 	}
 
 	ENCODE(OP_RaidUpdate)
 	{
-		EQApplicationPacket* inapp = *p;
+		EQApplicationPacket *inapp = *p;
 		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidGeneral_Struct *raid_gen = (RaidGeneral_Struct*)__emu_buffer;
 
-		switch (raid_gen->action)
+		if (raid_gen->action == 0) // raid add has longer length than other raid updates
 		{
-		case raidAdd:
-		{
-			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;
+			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct* eq = (structs::RaidAddMember_Struct*)outapp->pBuffer;
-
-			OUT(raidGen.action);
-			OUT(raidGen.parameter);
-			OUT_str(raidGen.leader_name);
-			OUT_str(raidGen.player_name);
-			OUT(_class);
-			OUT(level);
-			OUT(isGroupLeader);
-			OUT(flags[0]);
-			OUT(flags[1]);
-			OUT(flags[2]);
-			OUT(flags[3]);
-			OUT(flags[4]);
+			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
 
+			add_member->raidGen.action = in_add_member->raidGen.action;
+			add_member->raidGen.parameter = in_add_member->raidGen.parameter;
+			strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64);
+			strn0cpy(add_member->raidGen.player_name, in_add_member->raidGen.player_name, 64);
+			add_member->_class = in_add_member->_class;
+			add_member->level = in_add_member->level;
+			add_member->isGroupLeader = in_add_member->isGroupLeader;
+			add_member->flags[0] = in_add_member->flags[0];
+			add_member->flags[1] = in_add_member->flags[1];
+			add_member->flags[2] = in_add_member->flags[2];
+			add_member->flags[3] = in_add_member->flags[3];
+			add_member->flags[4] = in_add_member->flags[4];
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetMotd:
+		else if (raid_gen->action == 35)
 		{
-			RaidMOTD_Struct* emu = (RaidMOTD_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct));
-			structs::RaidMOTD_Struct* eq = (structs::RaidMOTD_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.player_name);
-			OUT_str(general.leader_name);
-			OUT_str(motd);
+			RaidMOTD_Struct *inmotd = (RaidMOTD_Struct *)__emu_buffer;
+			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct) +
+										 strlen(inmotd->motd) + 1);
+			structs::RaidMOTD_Struct *outmotd = (structs::RaidMOTD_Struct *)outapp->pBuffer;
 
+			outmotd->general.action = inmotd->general.action;
+			strn0cpy(outmotd->general.player_name, inmotd->general.player_name, 64);
+			strn0cpy(outmotd->motd, inmotd->motd, strlen(inmotd->motd) + 1);
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetLeaderAbilities:
-		case raidMakeLeader:
+		else if (raid_gen->action == 14 || raid_gen->action == 30)
 		{
-			RaidLeadershipUpdate_Struct* emu = (RaidLeadershipUpdate_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
-			structs::RaidLeadershipUpdate_Struct* eq = (structs::RaidLeadershipUpdate_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT_str(player_name);
-			OUT_str(leader_name);
-			memcpy(&eq->raid, &emu->raid, sizeof(RaidLeadershipAA_Struct));
+			RaidLeadershipUpdate_Struct *inlaa = (RaidLeadershipUpdate_Struct *)__emu_buffer;
+			auto outapp =
+			    new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
+			structs::RaidLeadershipUpdate_Struct *outlaa = (structs::RaidLeadershipUpdate_Struct *)outapp->pBuffer;
 
+			outlaa->action = inlaa->action;
+			strn0cpy(outlaa->player_name, inlaa->player_name, 64);
+			strn0cpy(outlaa->leader_name, inlaa->leader_name, 64);
+			memcpy(&outlaa->raid, &inlaa->raid, sizeof(RaidLeadershipAA_Struct));
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetNote:
+		else
 		{
-			auto emu = (RaidNote_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidNote_Struct));
-			auto eq = (structs::RaidNote_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.leader_name);
-			OUT_str(general.player_name);
-			OUT_str(note);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidNoRaid:
-		{
-			dest->QueuePacket(inapp);
-			break;
-		}
-		default:
-		{
-			RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;
+			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-			structs::RaidGeneral_Struct* eq = (structs::RaidGeneral_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT(parameter);
-			OUT_str(leader_name);
-			OUT_str(player_name);
-
+			structs::RaidGeneral_Struct *raid_general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+			strn0cpy(raid_general->leader_name, in_raid_general->leader_name, 64);
+			strn0cpy(raid_general->player_name, in_raid_general->player_name, 64);
+			raid_general->action = in_raid_general->action;
+			raid_general->parameter = in_raid_general->parameter;
 			dest->FastQueuePacket(&outapp);
-			break;
-		}
 		}
+
 		safe_delete(inapp);
 	}
 
@@ -2830,10 +2772,7 @@ namespace RoF2
 		else
 			eq->window = emu->window;
 		OUT(type);
-		eq->invslot = ServerToRoF2TypelessSlot(emu->invslot, invtype::typePossessions);
-		OUT(target_id);
-		OUT(can_cast);
-		OUT(can_scribe);
+		OUT(invslot);
 		strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile));
 
 		FINISH_ENCODE();
@@ -3125,12 +3064,19 @@ namespace RoF2
 		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
 		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
 
-		eq->guild_id= emu->Unknown00;
-		eq->rank = emu->rank;
+		eq->GuildID = emu->Unknown00;
 
-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-		eq->unknown76 = 1;
+		/* Translate older ranks to new values */
+		switch (emu->Rank) {
+		case 0: { eq->Rank = 5; break; }  // GUILD_MEMBER	0
+		case 1: { eq->Rank = 3; break; }  // GUILD_OFFICER	1
+		case 2: { eq->Rank = 1; break; }  // GUILD_LEADER	2
+		default: { eq->Rank = emu->Rank; break; }
+		}
+
+		memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
+		OUT(Banker);
+		eq->Unknown76 = 1;
 
 		FINISH_ENCODE();
 	}
@@ -3232,7 +3178,7 @@ namespace RoF2
 
 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
 
-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -4000,7 +3946,7 @@ namespace RoF2
 			if (strlen(emu->suffix))
 				PacketSize += strlen(emu->suffix) + 1;
 
-			if (emu->DestructibleObject || emu->class_ == Class::LDoNTreasure)
+			if (emu->DestructibleObject || emu->class_ == LDON_TREASURE)
 			{
 				if (emu->DestructibleObject)
 					PacketSize = PacketSize - 4;	// No bodytype
@@ -4021,8 +3967,8 @@ namespace RoF2
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize += 60;
@@ -4090,7 +4036,7 @@ namespace RoF2
 			// actually part of bitfields
 			uint8 OtherData = 0;
 
-			if (emu->class_ == Class::LDoNTreasure) //LDoN Chest
+			if (emu->class_ == LDON_TREASURE) //LDoN Chest
 			{
 				OtherData = OtherData | 0x04;
 			}
@@ -4118,7 +4064,7 @@ namespace RoF2
 			// int DefaultEmitterID
 			VARSTRUCT_ENCODE_TYPE(float, Buffer, 0);	// unknown4
 
-			if (emu->DestructibleObject || emu->class_ == Class::LDoNTreasure)
+			if (emu->DestructibleObject || emu->class_ == LDON_TREASURE)
 			{
 				VARSTRUCT_ENCODE_STRING(Buffer, emu->DestructibleModel);
 				VARSTRUCT_ENCODE_STRING(Buffer, emu->DestructibleName2);
@@ -4192,13 +4138,12 @@ namespace RoF2
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildID);
 
 				/* Translate older ranks to new values */
-				//switch (emu->guildrank) {
-				//case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);  break; }  // GUILD_MEMBER	0
-				//case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);  break; }  // GUILD_OFFICER	1
-				//case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);  break; }  // GUILD_LEADER	2
-				//default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; }  //
-				//}
-				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
+				switch (emu->guildrank) {
+				case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);  break; }  // GUILD_MEMBER	0
+				case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);  break; }  // GUILD_OFFICER	1
+				case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);  break; }  // GUILD_LEADER	2
+				default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; }  //
+				}
 			}
 
 			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->class_);
@@ -4214,7 +4159,7 @@ namespace RoF2
 			VARSTRUCT_ENCODE_STRING(Buffer, emu->lastName);
 
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);	// aatitle
-			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->guild_show); 
+			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->NPC ? 0 : 1); // unknown - Must be 1 for guild name to be shown abover players head.
 			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); // TempPet
 
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->petOwnerId);
@@ -4227,8 +4172,8 @@ namespace RoF2
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // These do something with OP_WeaponEquip1
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // ^
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -4453,17 +4398,6 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_BookButton)
-	{
-		DECODE_LENGTH_EXACT(structs::BookButton_Struct);
-		SETUP_DIRECT_DECODE(BookButton_Struct, structs::BookButton_Struct);
-
-		emu->invslot = static_cast<int16_t>(RoF2ToServerTypelessSlot(eq->slot, invtype::typePossessions));
-		IN(target_id);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_Buff)
 	{
 		DECODE_LENGTH_EXACT(structs::SpellBuffPacket_Struct);
@@ -4970,7 +4904,7 @@ namespace RoF2
 
 		strn0cpy(emu->target, eq->target, sizeof(emu->target));
 		strn0cpy(emu->name, eq->name, sizeof(emu->name));
-		IN(rank);
+		// IN(rank);
 
 		FINISH_DIRECT_DECODE();
 	}
@@ -4998,38 +4932,6 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_GuildTributeDonateItem)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
-		SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_GuildTributeDonateItem)");
-
-		IN(type);
-		IN(slot);
-		IN(sub_index);
-		IN(aug_index);
-		IN(unknown10);
-		IN(quantity);
-		IN(tribute_master_id);
-		IN(unknown20);
-		IN(guild_id);
-		IN(unknown28);
-		IN(unknown32);
-
-		structs::InventorySlot_Struct iss;
-		iss.Slot = eq->slot;
-		iss.SubIndex = eq->sub_index;
-		iss.AugIndex = eq->aug_index;
-		iss.Type = eq->type;
-		iss.Unknown01 = 0;
-		iss.Unknown02 = 0;
-
-		emu->slot = RoF2ToServerSlot(iss);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	/*DECODE(OP_InspectAnswer)
 	{
 	DECODE_LENGTH_EXACT(structs::InspectResponse_Struct);
@@ -5162,47 +5064,37 @@ namespace RoF2
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);
 
-		RaidGeneral_Struct* rgs = (RaidGeneral_Struct*)__packet->pBuffer;
-
-		switch (rgs->action)
-		{
-		case raidSetMotd:
-		{
-			SETUP_VAR_DECODE(RaidMOTD_Struct, structs::RaidMOTD_Struct, motd);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(motd);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		case raidSetNote:
-		{
-			SETUP_VAR_DECODE(RaidNote_Struct, structs::RaidNote_Struct, note);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(note);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		default:
-		{
-			SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
-			IN(action);
-			IN(parameter);
-			IN_str(leader_name);
-			IN_str(player_name);
-
-			FINISH_DIRECT_DECODE();
-			break;
-		}
+		// This is a switch on the RaidGeneral action
+		switch (*(uint32 *)__packet->pBuffer) {
+			case 35: { // raidMOTD
+				// we don't have a nice macro for this
+				structs::RaidMOTD_Struct *__eq_buffer = (structs::RaidMOTD_Struct *)__packet->pBuffer;
+				__eq_buffer->motd[1023] = '\0';
+				size_t motd_size = strlen(__eq_buffer->motd) + 1;
+				__packet->size = sizeof(RaidMOTD_Struct) + motd_size;
+				__packet->pBuffer = new unsigned char[__packet->size];
+				RaidMOTD_Struct *emu = (RaidMOTD_Struct *)__packet->pBuffer;
+				structs::RaidMOTD_Struct *eq = (structs::RaidMOTD_Struct *)__eq_buffer;
+				strn0cpy(emu->general.player_name, eq->general.player_name, 64);
+				strn0cpy(emu->motd, eq->motd, motd_size);
+				IN(general.action);
+				IN(general.parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			 }
+			case 36: { // raidPlayerNote unhandled
+				break;
+			}
+			default: {
+				DECODE_LENGTH_EXACT(structs::RaidGeneral_Struct);
+				SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
+				strn0cpy(emu->leader_name, eq->leader_name, 64);
+				strn0cpy(emu->player_name, eq->player_name, 64);
+				IN(action);
+				IN(parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
 		}
 	}
 
@@ -5212,8 +5104,8 @@ namespace RoF2
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);
 
 		IN(type);
-		emu->invslot = static_cast<int16_t>(RoF2ToServerTypelessSlot(eq->invslot, invtype::typePossessions));
-		IN(target_id);
+		IN(invslot);
+		IN(subslot);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));
 
@@ -5585,6 +5477,7 @@ namespace RoF2
 		/**
 		 * Ornamentation
 		 */
+		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;
 

common/patches/rof2_ops.h

@@ -82,7 +82,6 @@ E(OP_GuildBank)
 E(OP_GuildMemberList)
 E(OP_GuildMemberUpdate)
 E(OP_GuildsList)
-E(OP_GuildTributeDonateItem)
 E(OP_HPUpdate)
 E(OP_Illusion)
 E(OP_InspectBuffs)
@@ -151,7 +150,6 @@ D(OP_AugmentInfo)
 D(OP_AugmentItem)
 D(OP_BazaarSearch)
 D(OP_BlockedBuffs)
-D(OP_BookButton)
 D(OP_Buff)
 D(OP_BuffRemoveRequest)
 D(OP_CastSpell)
@@ -183,7 +181,6 @@ D(OP_GuildBank)
 D(OP_GuildDemote)
 D(OP_GuildRemove)
 D(OP_GuildStatus)
-D(OP_GuildTributeDonateItem)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
 D(OP_ItemVerifyRequest)

common/patches/rof2_structs.h

@@ -2011,31 +2011,6 @@ struct GuildBankClear_Struct
 /*16*/	uint32	MainAreaCount;
 };
 
-struct GuildTributeDonateItemRequest_Struct {
-	/*000*/	uint32	type;
-	/*004*/ uint16 	slot;
-	/*006*/ uint16 	sub_index;
-	/*008*/ uint16 	aug_index;
-	/*010*/ uint16 	unknown10;
-	/*012*/ uint32 	quantity;
-	/*016*/ uint32	tribute_master_id;
-	/*020*/ uint32 	unknown20;
-	/*024*/ uint32	guild_id;
-	/*028*/ uint32	unknown28;
-	/*032*/ uint32 	unknown32;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-	/*000*/ uint32	type;
-	/*004*/ uint16	slot;
-	/*006*/ uint16 	sub_index;
-	/*008*/	uint16	aug_index;
-	/*010*/	uint16	unknown10;
-	/*012*/ uint32	quantity;
-	/*016*/ uint32	unknown20;
-	/*020*/	uint32	favor;
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -2615,7 +2590,7 @@ struct GroupUpdate_Struct_Live {	// New for Live
 
 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2625,7 +2600,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -2893,23 +2868,15 @@ struct BookText_Struct {
 // This is just a "text file" on the server
 // or in our case, the 'name' column in our books table.
 struct BookRequest_Struct {
-/*0000*/ uint32 window;         // where to display the text (0xFFFFFFFF means new window).
-/*0004*/ TypelessInventorySlot_Struct invslot; // book ItemIndex (with int16_t alignment padding)
-/*0012*/ uint32 type;           // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
-/*0016*/ uint32 target_id;      // client's target when using the book
-/*0020*/ uint8 can_cast;        // show Cast Spell button in book window
-/*0021*/ uint8 can_scribe;      // show Scribe button in book window
-/*0022*/ char txtfile[8194];
-/*8216*/
-};
-
-// used by Scribe and CastSpell book buttons
-struct BookButton_Struct
-{
-/*0000*/ TypelessInventorySlot_Struct slot; // book ItemIndex (with int16_t alignment padding)
-/*0008*/ int32 target_id; // client's target when using the book button
-/*0012*/ int32 unused;    // always 0 from button packets
-/*0016*/
+/*0000*/	uint32 window;		// where to display the text (0xFFFFFFFF means new window).
+/*0004*/	uint16 invslot;		// Is the slot, but the RoF2 conversion causes it to fail.  Turned to 0 since it isnt required anyway.
+/*0006*/	int16 subslot;		// Inventory sub-slot (0-x)
+/*0008*/	uint16 unknown006;	// Seen FFFF
+/*0010*/	uint16 unknown008;	// seen 0000
+/*0012*/	uint32 type;		// 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
+/*0016*/	uint32 unknown0012;
+/*0020*/	uint16 unknown0016;
+/*0022*/	char txtfile[8194];
 };
 
 /*
@@ -3625,11 +3592,11 @@ struct GuildMakeLeader {
 // Update a guild members rank and banker status
 struct GuildSetRank_Struct
 {
-/*00*/	uint32	guild_id;	// Was Unknown00
-/*04*/	uint32	rank;
-/*08*/	char	member_name[64];
-/*72*/	uint32	banker;
-/*76*/	uint32	unknown76;	// Seen 1 - Maybe Banker?
+/*00*/	uint32	GuildID;	// Was Unknown00
+/*04*/	uint32	Rank;
+/*08*/	char	MemberName[64];
+/*72*/	uint32	Banker;
+/*76*/	uint32	Unknown76;	// Seen 1 - Maybe Banker?
 /*80*/
 };
 
@@ -3644,7 +3611,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3656,8 +3623,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -3747,15 +3714,15 @@ struct TributeItem_Struct
 
 struct TributePoint_Struct {
 	int32   tribute_points;
-	uint32  unknown04;
+	uint32   unknown04;
 	int32   career_tribute_points;
-	uint32  unknown12;
+	uint32   unknown12;
 };
 
 struct TributeMoney_Struct {
 	uint32   platinum;
 	uint32   tribute_master_id;
-	int32    tribute_points;
+	int32   tribute_points;
 };
 
 
@@ -4223,14 +4190,9 @@ struct RaidAddMember_Struct {
 /*139*/	uint8 flags[5]; //no idea if these are needed...
 };
 
-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char note[64];
-};
-
 struct RaidMOTD_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char motd[1024];
+/*000*/ RaidGeneral_Struct general; // leader_name and action only used
+/*140*/ char motd[0]; // max size 1024, but reply is variable
 };
 
 struct RaidLeadershipUpdate_Struct {

common/patches/rof_structs.h

@@ -2566,7 +2566,7 @@ struct GroupUpdate_Struct_Live {	// New for Live
 
 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2576,7 +2576,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -3537,11 +3537,11 @@ struct GuildMakeLeader {
 // Update a guild members rank and banker status
 struct GuildSetRank_Struct
 {
-/*00*/	uint32	guild_id;	// Was Unknown00
-/*04*/	uint32	rank;
-/*08*/	char	member_name[64];
-/*72*/	uint32	banker;
-/*76*/	uint32	unknown76;	// Seen 1 - Maybe Banker?
+/*00*/	uint32	GuildID;	// Was Unknown00
+/*04*/	uint32	Rank;
+/*08*/	char	MemberName[64];
+/*72*/	uint32	Banker;
+/*76*/	uint32	Unknown76;	// Seen 1 - Maybe Banker?
 /*80*/
 };
 
@@ -3556,7 +3556,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3568,8 +3568,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -4136,14 +4136,9 @@ struct RaidAddMember_Struct {
 /*139*/	uint8 flags[5]; //no idea if these are needed...
 };
 
-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char note[64];
-};
-
 struct RaidMOTD_Struct {
 /*000*/ RaidGeneral_Struct general; // leader_name and action only used
-/*140*/ char motd[1024]; // max size is 1024, but reply is variable
+/*140*/ char motd[0]; // max size 1024, but reply is variable
 };
 
 struct RaidLeadershipUpdate_Struct {

common/patches/sod.cpp

@@ -34,7 +34,6 @@
 #include "../rulesys.h"
 #include "../path_manager.h"
 #include "../races.h"
-#include "../raid.h"
 
 #include <iostream>
 #include <sstream>
@@ -786,7 +785,7 @@ namespace SoD
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -805,7 +804,7 @@ namespace SoD
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -835,7 +834,7 @@ namespace SoD
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -903,7 +902,7 @@ namespace SoD
 			return;
 		}
 
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 
@@ -1687,124 +1686,88 @@ namespace SoD
 
 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket* inapp = *p;
-		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket *inapp = *p;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
 
-		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
 
-		general->action = raidCreate;
-		general->parameter = RaidCommandAcceptInvite;
-		strn0cpy(general->leader_name, emu->leader_name, sizeof(emu->leader_name));
-		strn0cpy(general->player_name, emu->leader_name, sizeof(emu->leader_name));
-
-		dest->FastQueuePacket(&outapp);
+		general->action = 8;
+		general->parameter = 1;
+		strn0cpy(general->leader_name, raid_create->leader_name, 64);
+		strn0cpy(general->player_name, raid_create->leader_name, 64);
 
+		dest->FastQueuePacket(&outapp_create);
 		safe_delete(inapp);
-
 	}
 
 	ENCODE(OP_RaidUpdate)
 	{
-		EQApplicationPacket* inapp = *p;
+		EQApplicationPacket *inapp = *p;
 		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidGeneral_Struct *raid_gen = (RaidGeneral_Struct*)__emu_buffer;
 
-		switch (raid_gen->action)
+		if (raid_gen->action == 0) // raid add has longer length than other raid updates
 		{
-		case raidAdd:
-		{
-			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;
+			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct* eq = (structs::RaidAddMember_Struct*)outapp->pBuffer;
-
-			OUT(raidGen.action);
-			OUT(raidGen.parameter);
-			OUT_str(raidGen.leader_name);
-			OUT_str(raidGen.player_name);
-			OUT(_class);
-			OUT(level);
-			OUT(isGroupLeader);
-			OUT(flags[0]);
-			OUT(flags[1]);
-			OUT(flags[2]);
-			OUT(flags[3]);
-			OUT(flags[4]);
+			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
 
+			add_member->raidGen.action = in_add_member->raidGen.action;
+			add_member->raidGen.parameter = in_add_member->raidGen.parameter;
+			strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64);
+			strn0cpy(add_member->raidGen.player_name, in_add_member->raidGen.player_name, 64);
+			add_member->_class = in_add_member->_class;
+			add_member->level = in_add_member->level;
+			add_member->isGroupLeader = in_add_member->isGroupLeader;
+			add_member->flags[0] = in_add_member->flags[0];
+			add_member->flags[1] = in_add_member->flags[1];
+			add_member->flags[2] = in_add_member->flags[2];
+			add_member->flags[3] = in_add_member->flags[3];
+			add_member->flags[4] = in_add_member->flags[4];
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetMotd:
+		else if (raid_gen->action == 35)
 		{
-			RaidMOTD_Struct* emu = (RaidMOTD_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct));
-			structs::RaidMOTD_Struct* eq = (structs::RaidMOTD_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.player_name);
-			OUT_str(general.leader_name);
-			OUT_str(motd);
+			RaidMOTD_Struct *inmotd = (RaidMOTD_Struct *)__emu_buffer;
+			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct) +
+										 strlen(inmotd->motd) + 1);
+			structs::RaidMOTD_Struct *outmotd = (structs::RaidMOTD_Struct *)outapp->pBuffer;
 
+			outmotd->general.action = inmotd->general.action;
+			strn0cpy(outmotd->general.player_name, inmotd->general.player_name, 64);
+			strn0cpy(outmotd->motd, inmotd->motd, strlen(inmotd->motd) + 1);
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetLeaderAbilities:
-		case raidMakeLeader:
+		else if (raid_gen->action == 14 || raid_gen->action == 30)
 		{
-			RaidLeadershipUpdate_Struct* emu = (RaidLeadershipUpdate_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
-			structs::RaidLeadershipUpdate_Struct* eq = (structs::RaidLeadershipUpdate_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT_str(player_name);
-			OUT_str(leader_name);
-			memcpy(&eq->raid, &emu->raid, sizeof(RaidLeadershipAA_Struct));
+			RaidLeadershipUpdate_Struct *inlaa = (RaidLeadershipUpdate_Struct *)__emu_buffer;
+			auto outapp =
+			    new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
+			structs::RaidLeadershipUpdate_Struct *outlaa = (structs::RaidLeadershipUpdate_Struct *)outapp->pBuffer;
 
+			outlaa->action = inlaa->action;
+			strn0cpy(outlaa->player_name, inlaa->player_name, 64);
+			strn0cpy(outlaa->leader_name, inlaa->leader_name, 64);
+			memcpy(&outlaa->raid, &inlaa->raid, sizeof(RaidLeadershipAA_Struct));
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetNote:
+		else
 		{
-			auto emu = (RaidNote_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidNote_Struct));
-			auto eq = (structs::RaidNote_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.leader_name);
-			OUT_str(general.player_name);
-			OUT_str(note);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidNoRaid:
-		{
-			dest->QueuePacket(inapp);
-			break;
-		}
-		default:
-		{
-			RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;
+			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-			structs::RaidGeneral_Struct* eq = (structs::RaidGeneral_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT(parameter);
-			OUT_str(leader_name);
-			OUT_str(player_name);
-
+			structs::RaidGeneral_Struct *raid_general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+			strn0cpy(raid_general->leader_name, in_raid_general->leader_name, 64);
+			strn0cpy(raid_general->player_name, in_raid_general->player_name, 64);
+			raid_general->action = in_raid_general->action;
+			raid_general->parameter = in_raid_general->parameter;
 			dest->FastQueuePacket(&outapp);
-			break;
-		}
 		}
+
 		safe_delete(inapp);
 	}
 
@@ -1819,9 +1782,6 @@ namespace SoD
 			eq->window = emu->window;
 		OUT(type);
 		eq->invslot = ServerToSoDSlot(emu->invslot);
-		OUT(target_id);
-		OUT(can_cast);
-		OUT(can_scribe);
 		strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile));
 
 		FINISH_ENCODE();
@@ -2507,8 +2467,8 @@ namespace SoD
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -2706,8 +2666,8 @@ namespace SoD
 
 			Buffer += sizeof(structs::Spawn_Struct_Position);
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -2733,8 +2693,8 @@ namespace SoD
 			}
 
 
-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
@@ -2857,17 +2817,6 @@ namespace SoD
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_BookButton)
-	{
-		DECODE_LENGTH_EXACT(structs::BookButton_Struct);
-		SETUP_DIRECT_DECODE(BookButton_Struct, structs::BookButton_Struct);
-
-		emu->invslot = static_cast<int16_t>(SoDToServerSlot(eq->invslot));
-		IN(target_id);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_Buff)
 	{
 		DECODE_LENGTH_EXACT(structs::SpellBuffPacket_Struct);
@@ -3375,47 +3324,37 @@ namespace SoD
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);
 
-		RaidGeneral_Struct* rgs = (RaidGeneral_Struct*)__packet->pBuffer;
-
-		switch (rgs->action)
-		{
-		case raidSetMotd:
-		{
-			SETUP_VAR_DECODE(RaidMOTD_Struct, structs::RaidMOTD_Struct, motd);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(motd);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		case raidSetNote:
-		{
-			SETUP_VAR_DECODE(RaidNote_Struct, structs::RaidNote_Struct, note);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(note);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		default:
-		{
-			SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
-			IN(action);
-			IN(parameter);
-			IN_str(leader_name);
-			IN_str(player_name);
-
-			FINISH_DIRECT_DECODE();
-			break;
-		}
+		// This is a switch on the RaidGeneral action
+		switch (*(uint32 *)__packet->pBuffer) {
+			case 35: { // raidMOTD
+				// we don't have a nice macro for this
+				structs::RaidMOTD_Struct *__eq_buffer = (structs::RaidMOTD_Struct *)__packet->pBuffer;
+				__eq_buffer->motd[1023] = '\0';
+				size_t motd_size = strlen(__eq_buffer->motd) + 1;
+				__packet->size = sizeof(RaidMOTD_Struct) + motd_size;
+				__packet->pBuffer = new unsigned char[__packet->size];
+				RaidMOTD_Struct *emu = (RaidMOTD_Struct *)__packet->pBuffer;
+				structs::RaidMOTD_Struct *eq = (structs::RaidMOTD_Struct *)__eq_buffer;
+				strn0cpy(emu->general.player_name, eq->general.player_name, 64);
+				strn0cpy(emu->motd, eq->motd, motd_size);
+				IN(general.action);
+				IN(general.parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
+			case 36: { // raidPlayerNote unhandled
+				break;
+			}
+			default: {
+				DECODE_LENGTH_EXACT(structs::RaidGeneral_Struct);
+				SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
+				strn0cpy(emu->leader_name, eq->leader_name, 64);
+				strn0cpy(emu->player_name, eq->player_name, 64);
+				IN(action);
+				IN(parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
 		}
 	}
 
@@ -3425,8 +3364,7 @@ namespace SoD
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);
 
 		IN(type);
-		emu->invslot = static_cast<int16_t>(SoDToServerSlot(eq->invslot));
-		IN(target_id);
+		emu->invslot = SoDToServerSlot(eq->invslot);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));
 

common/patches/sod_ops.h

@@ -103,7 +103,6 @@ D(OP_ApplyPoison)
 D(OP_AugmentInfo)
 D(OP_AugmentItem)
 D(OP_BazaarSearch)
-D(OP_BookButton)
 D(OP_Buff)
 D(OP_CastSpell)
 D(OP_ChannelMessage)

common/patches/sod_structs.h

@@ -2085,7 +2085,7 @@ struct GroupUpdate_Struct_SoD {	// New for SoD
 
 struct GroupMembers_Struct {	// New for SoD
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2095,7 +2095,7 @@ struct GroupJoin_Struct_SoD {	// New for SoD
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -2351,21 +2351,12 @@ struct BookText_Struct {
 // This is just a "text file" on the server
 // or in our case, the 'name' column in our books table.
 struct BookRequest_Struct {
-/*0000*/ uint32 window;     // where to display the text (0xFFFFFFFF means new window).
-/*0004*/ uint32 invslot;    // The inventory slot the book is in
-/*0008*/ uint32 type;       // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
-/*0012*/ uint32 target_id;
-/*0016*/ uint8 can_cast;
-/*0017*/ uint8 can_scribe;
-/*0018*/ char txtfile[8194];
-};
-
-// used by Scribe and CastSpell book buttons
-struct BookButton_Struct
-{
-/*0000*/ int32 invslot;
-/*0004*/ int32 target_id; // client's target when using the book
-/*0008*/ int32 unused;    // always 0 from button packets
+/*0000*/	uint32 window;		// where to display the text (0xFFFFFFFF means new window).
+/*0004*/	uint32 invslot;		// The inventory slot the book is in. Not used, but echoed in the response packet.
+/*0008*/	uint32 type;		// 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
+/*0012*/	uint32 unknown0012;
+/*0016*/	uint16 unknown0016;
+/*0018*/	char txtfile[8194];
 };
 
 /*
@@ -3026,7 +3017,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3038,8 +3029,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -3592,14 +3583,9 @@ struct RaidAddMember_Struct {
 /*139*/	uint8 flags[5]; //no idea if these are needed...
 };
 
-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char note[64];
-};
-
 struct RaidMOTD_Struct {
 /*000*/ RaidGeneral_Struct general; // leader_name and action only used
-/*140*/ char motd[1024]; // max size is 1024, but reply is variable
+/*140*/ char motd[0]; // max size 1024, but reply is variable
 };
 
 struct RaidLeadershipUpdate_Struct {

common/patches/sof.cpp

@@ -33,7 +33,6 @@
 #include "sof_structs.h"
 #include "../rulesys.h"
 #include "../path_manager.h"
-#include "../raid.h"
 
 #include <iostream>
 #include <sstream>
@@ -1357,124 +1356,88 @@ namespace SoF
 
 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket* inapp = *p;
-		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket *inapp = *p;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
 
-		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
 
-		general->action = raidCreate;
-		general->parameter = RaidCommandAcceptInvite;
-		strn0cpy(general->leader_name, emu->leader_name, sizeof(emu->leader_name));
-		strn0cpy(general->player_name, emu->leader_name, sizeof(emu->leader_name));
-
-		dest->FastQueuePacket(&outapp);
+		general->action = 8;
+		general->parameter = 1;
+		strn0cpy(general->leader_name, raid_create->leader_name, 64);
+		strn0cpy(general->player_name, raid_create->leader_name, 64);
 
+		dest->FastQueuePacket(&outapp_create);
 		safe_delete(inapp);
-
 	}
 
 	ENCODE(OP_RaidUpdate)
 	{
-		EQApplicationPacket* inapp = *p;
+		EQApplicationPacket *inapp = *p;
 		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
+		unsigned char * __emu_buffer = inapp->pBuffer;
+		RaidGeneral_Struct *raid_gen = (RaidGeneral_Struct*)__emu_buffer;
 
-		switch (raid_gen->action)
+		if (raid_gen->action == 0) // raid add has longer length than other raid updates
 		{
-		case raidAdd:
-		{
-			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;
+			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct* eq = (structs::RaidAddMember_Struct*)outapp->pBuffer;
-
-			OUT(raidGen.action);
-			OUT(raidGen.parameter);
-			OUT_str(raidGen.leader_name);
-			OUT_str(raidGen.player_name);
-			OUT(_class);
-			OUT(level);
-			OUT(isGroupLeader);
-			OUT(flags[0]);
-			OUT(flags[1]);
-			OUT(flags[2]);
-			OUT(flags[3]);
-			OUT(flags[4]);
+			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
 
+			add_member->raidGen.action = in_add_member->raidGen.action;
+			add_member->raidGen.parameter = in_add_member->raidGen.parameter;
+			strn0cpy(add_member->raidGen.leader_name, in_add_member->raidGen.leader_name, 64);
+			strn0cpy(add_member->raidGen.player_name, in_add_member->raidGen.player_name, 64);
+			add_member->_class = in_add_member->_class;
+			add_member->level = in_add_member->level;
+			add_member->isGroupLeader = in_add_member->isGroupLeader;
+			add_member->flags[0] = in_add_member->flags[0];
+			add_member->flags[1] = in_add_member->flags[1];
+			add_member->flags[2] = in_add_member->flags[2];
+			add_member->flags[3] = in_add_member->flags[3];
+			add_member->flags[4] = in_add_member->flags[4];
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetMotd:
+		else if (raid_gen->action == 35)
 		{
-			RaidMOTD_Struct* emu = (RaidMOTD_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct));
-			structs::RaidMOTD_Struct* eq = (structs::RaidMOTD_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.player_name);
-			OUT_str(general.leader_name);
-			OUT_str(motd);
+			RaidMOTD_Struct *inmotd = (RaidMOTD_Struct *)__emu_buffer;
+			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct) +
+										 strlen(inmotd->motd) + 1);
+			structs::RaidMOTD_Struct *outmotd = (structs::RaidMOTD_Struct *)outapp->pBuffer;
 
+			outmotd->general.action = inmotd->general.action;
+			strn0cpy(outmotd->general.player_name, inmotd->general.player_name, 64);
+			strn0cpy(outmotd->motd, inmotd->motd, strlen(inmotd->motd) + 1);
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetLeaderAbilities:
-		case raidMakeLeader:
+		else if (raid_gen->action == 14 || raid_gen->action == 30)
 		{
-			RaidLeadershipUpdate_Struct* emu = (RaidLeadershipUpdate_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
-			structs::RaidLeadershipUpdate_Struct* eq = (structs::RaidLeadershipUpdate_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT_str(player_name);
-			OUT_str(leader_name);
-			memcpy(&eq->raid, &emu->raid, sizeof(RaidLeadershipAA_Struct));
+			RaidLeadershipUpdate_Struct *inlaa = (RaidLeadershipUpdate_Struct *)__emu_buffer;
+			auto outapp =
+			    new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
+			structs::RaidLeadershipUpdate_Struct *outlaa = (structs::RaidLeadershipUpdate_Struct *)outapp->pBuffer;
 
+			outlaa->action = inlaa->action;
+			strn0cpy(outlaa->player_name, inlaa->player_name, 64);
+			strn0cpy(outlaa->leader_name, inlaa->leader_name, 64);
+			memcpy(&outlaa->raid, &inlaa->raid, sizeof(RaidLeadershipAA_Struct));
 			dest->FastQueuePacket(&outapp);
-			break;
 		}
-		case raidSetNote:
+		else
 		{
-			auto emu = (RaidNote_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidNote_Struct));
-			auto eq = (structs::RaidNote_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.leader_name);
-			OUT_str(general.player_name);
-			OUT_str(note);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidNoRaid:
-		{
-			dest->QueuePacket(inapp);
-			break;
-		}
-		default:
-		{
-			RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;
+			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
 
 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-			structs::RaidGeneral_Struct* eq = (structs::RaidGeneral_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT(parameter);
-			OUT_str(leader_name);
-			OUT_str(player_name);
-
+			structs::RaidGeneral_Struct *raid_general = (structs::RaidGeneral_Struct*)outapp->pBuffer;
+			strn0cpy(raid_general->leader_name, in_raid_general->leader_name, 64);
+			strn0cpy(raid_general->player_name, in_raid_general->player_name, 64);
+			raid_general->action = in_raid_general->action;
+			raid_general->parameter = in_raid_general->parameter;
 			dest->FastQueuePacket(&outapp);
-			break;
-		}
 		}
+
 		safe_delete(inapp);
 	}
 
@@ -1489,9 +1452,6 @@ namespace SoF
 			eq->window = emu->window;
 		OUT(type);
 		eq->invslot = ServerToSoFSlot(emu->invslot);
-		OUT(target_id);
-		OUT(can_cast);
-		OUT(can_scribe);
 		strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile));
 
 		FINISH_ENCODE();
@@ -2301,17 +2261,6 @@ namespace SoF
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_BookButton)
-	{
-		DECODE_LENGTH_EXACT(structs::BookButton_Struct);
-		SETUP_DIRECT_DECODE(BookButton_Struct, structs::BookButton_Struct);
-
-		emu->invslot = static_cast<int16_t>(SoFToServerSlot(eq->invslot));
-		IN(target_id);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_Buff)
 	{
 		DECODE_LENGTH_EXACT(structs::SpellBuffPacket_Struct);
@@ -2780,47 +2729,37 @@ namespace SoF
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);
 
-		RaidGeneral_Struct* rgs = (RaidGeneral_Struct*)__packet->pBuffer;
-
-		switch (rgs->action)
-		{
-		case raidSetMotd:
-		{
-			SETUP_VAR_DECODE(RaidMOTD_Struct, structs::RaidMOTD_Struct, motd);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(motd);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		case raidSetNote:
-		{
-			SETUP_VAR_DECODE(RaidNote_Struct, structs::RaidNote_Struct, note);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(note);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		default:
-		{
-			SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
-			IN(action);
-			IN(parameter);
-			IN_str(leader_name);
-			IN_str(player_name);
-
-			FINISH_DIRECT_DECODE();
-			break;
-		}
+		// This is a switch on the RaidGeneral action
+		switch (*(uint32 *)__packet->pBuffer) {
+			case 35: { // raidMOTD
+				// we don't have a nice macro for this
+				structs::RaidMOTD_Struct *__eq_buffer = (structs::RaidMOTD_Struct *)__packet->pBuffer;
+				__eq_buffer->motd[1023] = '\0';
+				size_t motd_size = strlen(__eq_buffer->motd) + 1;
+				__packet->size = sizeof(RaidMOTD_Struct) + motd_size;
+				__packet->pBuffer = new unsigned char[__packet->size];
+				RaidMOTD_Struct *emu = (RaidMOTD_Struct *)__packet->pBuffer;
+				structs::RaidMOTD_Struct *eq = (structs::RaidMOTD_Struct *)__eq_buffer;
+				strn0cpy(emu->general.player_name, eq->general.player_name, 64);
+				strn0cpy(emu->motd, eq->motd, motd_size);
+				IN(general.action);
+				IN(general.parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
+			case 36: { // raidPlayerNote unhandled
+				break;
+			}
+			default: {
+				DECODE_LENGTH_EXACT(structs::RaidGeneral_Struct);
+				SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
+				strn0cpy(emu->leader_name, eq->leader_name, 64);
+				strn0cpy(emu->player_name, eq->player_name, 64);
+				IN(action);
+				IN(parameter);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
 		}
 	}
 
@@ -2830,8 +2769,7 @@ namespace SoF
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);
 
 		IN(type);
-		emu->invslot = static_cast<int16_t>(SoFToServerSlot(eq->invslot));
-		IN(target_id);
+		emu->invslot = SoFToServerSlot(eq->invslot);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));
 

common/patches/sof_ops.h

@@ -94,7 +94,6 @@ D(OP_AltCurrencySellSelection)
 D(OP_ApplyPoison)
 D(OP_AugmentInfo)
 D(OP_AugmentItem)
-D(OP_BookButton)
 D(OP_Buff)
 D(OP_Bug)
 D(OP_CastSpell)

common/patches/sof_structs.h

@@ -2321,21 +2321,12 @@ struct BookText_Struct {
 // This is just a "text file" on the server
 // or in our case, the 'name' column in our books table.
 struct BookRequest_Struct {
-/*0000*/ uint32 window;     // where to display the text (0xFFFFFFFF means new window).
-/*0004*/ uint32 invslot;    // The inventory slot the book is in
-/*0008*/ uint32 type;       // 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
-/*0012*/ uint32 target_id;
-/*0016*/ uint8 can_cast;
-/*0017*/ uint8 can_scribe;
-/*0018*/ char txtfile[8194];
-};
-
-// used by Scribe and CastSpell book buttons
-struct BookButton_Struct
-{
-/*0000*/ int32 invslot;
-/*0004*/ int32 target_id; // client's target when using the book
-/*0008*/ int32 unused;    // always 0 from button packets
+/*0000*/	uint32 window;		// where to display the text (0xFFFFFFFF means new window).
+/*0004*/	uint32 invslot;		// The inventory slot the book is in. Not used, but echoed in the response packet.
+/*0008*/	uint32 type;		// 0 = Scroll, 1 = Book, 2 = Item Info. Possibly others
+/*0012*/	uint32 unknown0012;
+/*0016*/	uint16 unknown0016;
+/*0018*/	char txtfile[8194];
 };
 
 /*
@@ -2951,7 +2942,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -2963,8 +2954,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -3517,14 +3508,9 @@ struct RaidAddMember_Struct {
 /*139*/	uint8 flags[5]; //no idea if these are needed...
 };
 
-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char note[64];
-};
-
 struct RaidMOTD_Struct {
 /*000*/ RaidGeneral_Struct general; // leader_name and action only used
-/*140*/ char motd[1024]; // max size is 1024, but reply is variable
+/*140*/ char motd[0]; // max size 1024, but reply is variable
 };
 
 struct RaidLeadershipUpdate_Struct {

common/patches/ss_define.h

@@ -128,15 +128,6 @@
 	emu_struct *emu = (emu_struct *) __packet->pBuffer; \
 	eq_struct *eq = (eq_struct *) __eq_buffer;
 
-#define SETUP_VAR_DECODE(emu_struct, eq_struct, var_field) \
-	unsigned char *__eq_buffer = __packet->pBuffer; \
-	eq_struct* in = (eq_struct*)__packet->pBuffer; \
-	auto size = strlen(in->var_field); \
-	__packet->size = sizeof(emu_struct) + size + 1; \
-	__packet->pBuffer = new unsigned char[__packet->size]; \
-	emu_struct *emu = (emu_struct *) __packet->pBuffer; \
-	eq_struct *eq = (eq_struct *) __eq_buffer;
-
 #define MEMSET_IN(emu_struct) \
 	memset(__packet->pBuffer, 0, sizeof(emu_struct));
 
@@ -155,9 +146,6 @@
 	delete[] __eq_buffer; \
 	p->SetOpcode(OP_Unknown);
 
-#define FINISH_VAR_DECODE() \
-	delete[] __eq_buffer; 
-
 //call to finish an encoder using SETUP_DIRECT_DECODE
 #define FINISH_DIRECT_DECODE() \
 	delete[] __eq_buffer;

common/patches/titanium.cpp

@@ -33,8 +33,6 @@
 #include "../item_instance.h"
 #include "titanium_structs.h"
 #include "../path_manager.h"
-#include "../raid.h"
-#include "../guilds.h"
 
 #include <sstream>
 
@@ -665,151 +663,6 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
-	ENCODE(OP_SetGuildRank)
-	{
-		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
-		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
-
-		eq->unknown00 = 0;
-		eq->unknown04 = 0;
-
-		//Translate older ranks to new values* /
-		switch (emu->rank) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank = GUILD_LEADER_TI;
-				break;
-			}
-		}
-
-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_SpawnAppearance)
-	{
-		ENCODE_LENGTH_EXACT(SpawnAppearance_Struct);
-		SETUP_DIRECT_ENCODE(SpawnAppearance_Struct, structs::SpawnAppearance_Struct);
-
-		OUT(spawn_id);
-		OUT(type);
-		OUT(parameter);
-		switch (emu->type) {
-			case AppearanceType::GuildRank: {
-				//Translate new ranks to old values* /
-				switch (emu->parameter) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						eq->parameter = GUILD_MEMBER_TI;
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						eq->parameter = GUILD_OFFICER_TI;
-						break;
-					}
-					case GUILD_LEADER: {
-						eq->parameter = GUILD_LEADER_TI;
-						break;
-					}
-				}
-				break; 
-			}
-			case AppearanceType::GuildShow: {
-				FAIL_ENCODE();
-				return;
-			}
-			default: {
-				break;
-			}
-		}
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_GuildMemberAdd)
-	{
-		ENCODE_LENGTH_EXACT(GuildMemberAdd_Struct)
-		SETUP_DIRECT_ENCODE(GuildMemberAdd_Struct, structs::GuildMemberAdd_Struct)
-
-		OUT(guild_id)
-		OUT(level)
-		OUT(class_)
-		switch (emu->rank_) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank_ = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank_ = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank_ = GUILD_LEADER_TI;
-				break;
-			}
-		}
-		OUT(zone_id)
-		OUT(last_on)
-		OUT_str(player_name)
-
-		FINISH_ENCODE()
-	}
-
-	ENCODE(OP_GuildMemberRankAltBanker)
-	{
-		ENCODE_LENGTH_EXACT(GuildMemberRank_Struct)
-		SETUP_DIRECT_ENCODE(GuildMemberRank_Struct, structs::GuildMemberRank_Struct)
-
-		OUT(guild_id)
-		OUT(alt_banker)
-		OUT_str(player_name)
-
-		switch (emu->rank_) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank_ = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank_ = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank_ = GUILD_LEADER_TI;
-				break;
-			}
-		}
-
-		FINISH_ENCODE()
-	}
-
 	ENCODE(OP_GuildMemberList)
 	{
 		//consume the packet
@@ -873,34 +726,12 @@ namespace Titanium
 				str += sl + 1; \
 			}
 #define PutFieldN(field) e->field = htonl(emu_e->field)
-				/* Translate new ranks to older values */
+
 				SlideStructString(name, emu_name);
 				PutFieldN(level);
 				PutFieldN(banker);
 				PutFieldN(class_);
-				switch (emu_e->rank) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						e->rank = htonl(GUILD_MEMBER_TI);
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						e->rank = htonl(GUILD_OFFICER_TI);
-						break;
-					}
-					case GUILD_LEADER: {
-						e->rank = htonl(GUILD_LEADER_TI);
-						break;
-					}
-					default: {
-						e->rank = htonl(GUILD_MEMBER_TI);
-						break;
-					}
-				}
+				PutFieldN(rank);
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				PutFieldN(total_tribute);
@@ -921,38 +752,6 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
-	ENCODE(OP_SendGuildTributes)
-	{
-		ENCODE_LENGTH_ATLEAST(structs::GuildTributeAbility_Struct);
-		SETUP_VAR_ENCODE(GuildTributeAbility_Struct);
-		ALLOC_VAR_ENCODE(structs::GuildTributeAbility_Struct, sizeof(GuildTributeAbility_Struct) + strlen(emu->ability.name));
-
-		eq->guild_id = emu->guild_id;;
-		strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name));
-		eq->ability.tribute_id = emu->ability.tribute_id;
-		eq->ability.tier_count = emu->ability.tier_count;
-		for (int i = 0; i < ntohl(emu->ability.tier_count); i++) {
-			eq->ability.tiers[i].cost = emu->ability.tiers[i].cost;
-			eq->ability.tiers[i].level = emu->ability.tiers[i].level;
-			eq->ability.tiers[i].tribute_item_id = emu->ability.tiers[i].tribute_item_id;
-		}
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_GuildTributeDonateItem)
-	{
-		SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_GuildTributeDonateItem)");
-
-		OUT(quantity);
-		OUT(favor);
-		eq->unknown8 = 0;
-		eq->slot = ServerToTitaniumSlot(emu->slot);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_Illusion)
 	{
 		ENCODE_LENGTH_EXACT(Illusion_Struct);
@@ -1067,60 +866,11 @@ namespace Titanium
 
 	ENCODE(OP_LFGuild)
 	{
-		struct bit_mask_conversion {
-			uint32	titanium_mask;
-			uint32	rof2_mask;
-		};
-
-		std::vector<bit_mask_conversion> bit_mask = {
-			{.titanium_mask = 2, .rof2_mask = 256},
-			{.titanium_mask = 4, .rof2_mask = 32768},
-			{.titanium_mask = 8, .rof2_mask = 65536},
-			{.titanium_mask = 16, .rof2_mask = 4},
-			{.titanium_mask = 32, .rof2_mask = 64},
-			{.titanium_mask = 64, .rof2_mask = 16384},
-			{.titanium_mask = 128, .rof2_mask = 8192},
-			{.titanium_mask = 256, .rof2_mask = 128},
-			{.titanium_mask = 512, .rof2_mask = 2048},
-			{.titanium_mask = 1024, .rof2_mask = 8},
-			{.titanium_mask = 2048, .rof2_mask = 16},
-			{.titanium_mask = 4096, .rof2_mask = 512},
-			{.titanium_mask = 8192, .rof2_mask = 32},
-			{.titanium_mask = 16384, .rof2_mask = 1024},
-			{.titanium_mask = 32768, .rof2_mask = 2},
-			{.titanium_mask = 65536, .rof2_mask = 4096},
-		};
-
 		EQApplicationPacket *in = *p;
+		*p = nullptr;
 
 		uint32 Command = in->ReadUInt32();
 
-		if (Command == 1) {
-			ENCODE_LENGTH_EXACT(LFGuild_GuildToggle_Struct);
-			SETUP_DIRECT_ENCODE(LFGuild_GuildToggle_Struct, structs::LFGuild_GuildToggle_Struct);
-
-			OUT(Command);
-			OUT_str(Comment);
-			OUT(FromLevel);
-			OUT(ToLevel);
-			OUT(AACount);
-			OUT(TimeZone);
-			OUT(Toggle);
-			OUT(TimePosted);
-			OUT_str(Name);
-
-			uint32 emu_bitmask = emu->Classes;
-			uint32 ti_bitmask = 0;
-			for (auto const& b : bit_mask) {
-				(emu_bitmask & b.rof2_mask) != 0 ? ti_bitmask |= b.titanium_mask : ti_bitmask &= ~b.titanium_mask;
-			}
-			eq->Classes = ti_bitmask;
-
-			FINISH_ENCODE();
-			return;
-		}
-
-		*p = nullptr;
 		if (Command != 0)
 		{
 			dest->FastQueuePacket(&in, ack_req);
@@ -1398,28 +1148,7 @@ namespace Titanium
 		OUT(pvp);
 		OUT(anon);
 		OUT(gm);
-		switch (emu->guildrank) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->guildrank = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->guildrank = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->guildrank = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				break;
-			}
-		}
+		OUT(guildrank);
 		OUT(guildbanker);
 		//	OUT(unknown13054[8]);
 		OUT(exp);
@@ -1516,119 +1245,6 @@ namespace Titanium
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_MarkRaidNPC)
-	{
-		ENCODE_LENGTH_EXACT(MarkNPC_Struct);
-		SETUP_DIRECT_ENCODE(MarkNPC_Struct, MarkNPC_Struct);
-
-		EQApplicationPacket* outapp = new EQApplicationPacket(OP_MarkNPC, sizeof(MarkNPC_Struct));
-		MarkNPC_Struct* mnpcs = (MarkNPC_Struct*)outapp->pBuffer;
-		mnpcs->TargetID = emu->TargetID;
-		mnpcs->Number = emu->Number;
-		dest->QueuePacket(outapp);
-		safe_delete(outapp);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_RaidUpdate)
-	{
-		EQApplicationPacket* inapp = *p;
-		*p = nullptr;
-		unsigned char* __emu_buffer = inapp->pBuffer;
-		RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
-
-		switch (raid_gen->action)
-		{
-		case raidAdd:
-		{
-			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct* eq = (structs::RaidAddMember_Struct*)outapp->pBuffer;
-
-			OUT(raidGen.action);
-			OUT(raidGen.parameter);
-			OUT_str(raidGen.leader_name);
-			OUT_str(raidGen.player_name);
-			OUT(_class);
-			OUT(level);
-			OUT(isGroupLeader);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-
-		}
-		case raidSetMotd:
-		{
-			RaidMOTD_Struct* emu = (RaidMOTD_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidMOTD_Struct));
-			structs::RaidMOTD_Struct* eq = (structs::RaidMOTD_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.player_name);
-			OUT_str(general.leader_name);
-			OUT_str(motd);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidSetLeaderAbilities:
-		case raidMakeLeader:
-		{
-			RaidLeadershipUpdate_Struct* emu = (RaidLeadershipUpdate_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidLeadershipUpdate_Struct));
-			structs::RaidLeadershipUpdate_Struct* eq = (structs::RaidLeadershipUpdate_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT_str(player_name);
-			OUT_str(leader_name);
-			memcpy(&eq->raid, &emu->raid, sizeof(RaidLeadershipAA_Struct));
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidSetNote:
-		{
-			auto emu = (RaidNote_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidNote_Struct));
-			auto eq = (structs::RaidNote_Struct*)outapp->pBuffer;
-
-			OUT(general.action);
-			OUT_str(general.leader_name);
-			OUT_str(general.player_name);
-			OUT_str(note);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		case raidNoRaid:
-		{
-			dest->QueuePacket(inapp);
-			break;
-		}
-		default:
-		{
-			RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;
-
-			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-			structs::RaidGeneral_Struct* eq = (structs::RaidGeneral_Struct*)outapp->pBuffer;
-
-			OUT(action);
-			OUT(parameter);
-			OUT_str(leader_name);
-			OUT_str(player_name);
-
-			dest->FastQueuePacket(&outapp);
-			break;
-		}
-		}
-		safe_delete(inapp);
-	}
-
 	ENCODE(OP_ReadBook)
 	{
 		// no apparent slot translation needed
@@ -2134,28 +1750,7 @@ namespace Titanium
 			eq->beard = emu->beard;
 			strcpy(eq->suffix, emu->suffix);
 			eq->petOwnerId = emu->petOwnerId;
-			switch (emu->guildrank) {
-				case GUILD_SENIOR_MEMBER:
-				case GUILD_MEMBER:
-				case GUILD_JUNIOR_MEMBER:
-				case GUILD_INITIATE:
-				case GUILD_RECRUIT: {
-					eq->guildrank = GUILD_MEMBER_TI;
-					break;
-				}
-				case GUILD_OFFICER:
-				case GUILD_SENIOR_OFFICER: {
-					eq->guildrank = GUILD_OFFICER_TI;
-					break;
-				}
-				case GUILD_LEADER: {
-					eq->guildrank = GUILD_LEADER_TI;
-					break;
-				}
-				default: {
-					break;
-				}
-			}
+			eq->guildrank = emu->guildrank;
 			//		eq->unknown0194[3] = emu->unknown0194[3];
 			for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 				eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
@@ -2496,34 +2091,6 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_GuildDemote)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildDemoteStruct);
-		SETUP_DIRECT_DECODE(GuildDemoteStruct, structs::GuildDemoteStruct);
-
-		memcpy(emu->name, eq->name, sizeof(emu->name));
-		memcpy(emu->target, eq->target, sizeof(emu->target));
-		emu->rank = GUILD_MEMBER;
-
-		FINISH_DIRECT_DECODE();
-	}
-
-	DECODE(OP_GuildTributeDonateItem)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
-		SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_GuildTributeDonateItem)");
-
-		IN(quantity);
-		IN(tribute_master_id);
-		IN(guild_id);
-
-		emu->slot = TitaniumToServerSlot(eq->slot);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_InspectAnswer)
 	{
 		DECODE_LENGTH_EXACT(structs::InspectResponse_Struct);
@@ -2579,77 +2146,8 @@ namespace Titanium
 
 	DECODE(OP_LFGuild)
 	{
-		struct bit_mask_conversion {
-			uint32	titanium_mask;
-			uint32	rof2_mask;
-		};
-
-		std::vector<bit_mask_conversion> bit_mask = {
-			{.titanium_mask = 2, .rof2_mask = 256},
-			{.titanium_mask = 4, .rof2_mask = 32768},
-			{.titanium_mask = 8, .rof2_mask = 65536},
-			{.titanium_mask = 16, .rof2_mask = 4},
-			{.titanium_mask = 32, .rof2_mask = 64},
-			{.titanium_mask = 64, .rof2_mask = 16384},
-			{.titanium_mask = 128, .rof2_mask = 8192},
-			{.titanium_mask = 256, .rof2_mask = 128},
-			{.titanium_mask = 512, .rof2_mask = 2048},
-			{.titanium_mask = 1024, .rof2_mask = 8},
-			{.titanium_mask = 2048, .rof2_mask = 16},
-			{.titanium_mask = 4096, .rof2_mask = 512},
-			{.titanium_mask = 8192, .rof2_mask = 32},
-			{.titanium_mask = 16384, .rof2_mask = 1024},
-			{.titanium_mask = 32768, .rof2_mask = 2},
-			{.titanium_mask = 65536, .rof2_mask = 4096},
-		};
-
 		uint32 Command = __packet->ReadUInt32();
 
-		if (Command == 3) {
-			DECODE_LENGTH_EXACT(structs::LFGuild_SearchPlayer_Struct);
-			SETUP_DIRECT_DECODE(LFGuild_SearchPlayer_Struct, structs::LFGuild_SearchPlayer_Struct);
-
-			IN(Command);
-			IN(Unknown04);
-			IN(FromLevel);
-			IN(ToLevel);
-			IN(MinAA);
-			IN(TimeZone);
-
-			uint32 new_bitmask = 0;
-			uint32 ti_bitmask = eq->Classes;
-			for (auto const& b : bit_mask) {
-				(ti_bitmask & b.titanium_mask) != 0 ? new_bitmask |= b.rof2_mask : new_bitmask &= ~b.rof2_mask;
-			}
-			emu->Classes = new_bitmask;
-			FINISH_DIRECT_DECODE();
-			return;
-		}
-
-		if (Command == 1) {
-			DECODE_LENGTH_EXACT(structs::LFGuild_GuildToggle_Struct);
-			SETUP_DIRECT_DECODE(LFGuild_GuildToggle_Struct, structs::LFGuild_GuildToggle_Struct);
-
-			IN(Command);
-			IN_str(Comment);
-			IN(FromLevel);
-			IN(ToLevel);
-			IN(AACount);
-			IN(TimeZone);
-			IN(Toggle);
-			IN(TimePosted);
-			IN_str(Name);
-
-			uint32 new_bitmask = 0;
-			uint32 ti_bitmask = eq->Classes;
-			for (auto const& b : bit_mask) {
-				(ti_bitmask & b.titanium_mask) != 0 ? new_bitmask |= b.rof2_mask : new_bitmask &= ~b.rof2_mask;
-			}
-			emu->Classes = new_bitmask;
-			FINISH_DIRECT_DECODE();
-			return;
-		}
-
 		if (Command != 0)
 			return;
 
@@ -2774,63 +2272,6 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_RaidInvite)
-	{
-		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);
-		RaidGeneral_Struct* rgs = (RaidGeneral_Struct*)__packet->pBuffer;
-
-		switch (rgs->action)
-		{
-		case raidSetMotd:
-		{
-			SETUP_VAR_DECODE(RaidMOTD_Struct, structs::RaidMOTD_Struct, motd);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-
-			auto len = 0;
-			if (__packet->size < sizeof(structs::RaidMOTD_Struct)) {
-				len = __packet->size - sizeof(structs::RaidGeneral_Struct);
-			}
-			else {
-				len = sizeof(eq->motd);
-			}
-
-			strn0cpy(emu->motd, eq->motd, len > 1024 ? 1024 : len);
-			emu->motd[len - 1] = '\0';
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		case raidSetNote:
-		{
-			SETUP_VAR_DECODE(RaidNote_Struct, structs::RaidNote_Struct, note);
-
-			IN(general.action);
-			IN(general.parameter);
-			IN_str(general.leader_name);
-			IN_str(general.player_name);
-			IN_str(note);
-
-			FINISH_VAR_DECODE();
-			break;
-		}
-		default:
-		{
-			SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
-			IN(action);
-			IN(parameter);
-			IN_str(leader_name);
-			IN_str(player_name);
-
-			FINISH_DIRECT_DECODE();
-			break;
-		}
-		}
-	}
-
 	DECODE(OP_ReadBook)
 	{
 		// no apparent slot translation needed

common/patches/titanium_ops.h

@@ -44,13 +44,8 @@ E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_FormattedMessage)
 E(OP_GroundSpawn)
-E(OP_SetGuildRank)
 E(OP_GuildMemberLevelUpdate)
 E(OP_GuildMemberList)
-E(OP_GuildMemberAdd)
-E(OP_GuildMemberRankAltBanker)
-E(OP_SendGuildTributes)
-E(OP_GuildTributeDonateItem)
 E(OP_Illusion)
 E(OP_InspectAnswer)
 E(OP_InspectRequest)
@@ -66,15 +61,12 @@ E(OP_OnLevelMessage)
 E(OP_PetBuffWindow)
 E(OP_PlayerProfile)
 E(OP_NewSpawn)
-E(OP_MarkRaidNPC)
-E(OP_RaidUpdate)
 E(OP_ReadBook)
 E(OP_RespondAA)
 E(OP_SendCharInfo)
 E(OP_SendAATable)
 E(OP_SetFace)
 E(OP_ShopPlayerSell)
-E(OP_SpawnAppearance)
 E(OP_SpecialMesg)
 E(OP_TaskDescription)
 E(OP_Track)
@@ -106,17 +98,14 @@ D(OP_DzRemovePlayer)
 D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_FaceChange)
-D(OP_GuildDemote)
 D(OP_InspectAnswer)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
-D(OP_GuildTributeDonateItem)
 D(OP_LFGuild)
 D(OP_LoadSpellSet)
 D(OP_LootItem)
 D(OP_MoveItem)
 D(OP_PetCommands)
-D(OP_RaidInvite)
 D(OP_ReadBook)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerSell)

common/patches/titanium_structs.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
+	
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -1423,23 +1423,6 @@ struct GuildUpdate_Struct {
 	GuildsListEntry_Struct entry;
 };
 
-struct GuildTributeDonateItemRequest_Struct {
-	/*000*/ uint32 	slot;
-	/*004*/ uint32 	quantity;
-	/*008*/ uint32	tribute_master_id;
-	/*012*/ uint32 	unknown12;
-	/*016*/ uint32	guild_id;
-	/*020*/ uint32 	unknown20;
-	/*024*/ uint32	unknown24;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-	/*000*/ uint32	slot;
-	/*004*/ uint32	quantity;
-	/*008*/ uint32	unknown8;
-	/*012*/	uint32	favor;
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -2621,7 +2604,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -2633,8 +2616,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -3034,39 +3017,23 @@ struct leadExpUpdateStruct {
    /*0028*/ uint32 unknown0028;
 };
 
+
+
 struct RaidGeneral_Struct {
-/*000*/	uint32		action;	//=10
-/*004*/	char		player_name[64];	//should both be the player's name
-/*068*/	char		leader_name[64];
+/*00*/	uint32		action;	//=10
+/*04*/	char		player_name[64];	//should both be the player's name
+/*04*/	char		leader_name[64];
 /*132*/	uint32		parameter;
 };
 
-struct RaidAddMember_Struct {
-/*000*/	RaidGeneral_Struct raidGen;
-/*136*/	uint8		_class;
-/*137*/	uint8		level;
-/*138*/	uint8		isGroupLeader;
-/*139*/	uint8		unknown139;	//seems to be 0x42 or 0
-};
-
-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*136*/ char note[64];
-};
-
-struct RaidMOTD_Struct {
-/*000*/ RaidGeneral_Struct general; // leader_name and action only used
-/*136*/ char motd[1024]; // max size is 1024, but reply is variable
-};
-
-struct RaidLeadershipUpdate_Struct {
-	/*000*/	uint32 action;
-	/*004*/	char player_name[64];
-//	/*068*/	uint32 Unknown068;
-	/*072*/	char leader_name[64];
-	/*136*/	GroupLeadershipAA_Struct group; //unneeded
-	/*200*/	RaidLeadershipAA_Struct raid;
-	/*264*/	char Unknown264[128];
+struct RaidAdd_Struct {
+/*000*/	uint32		action;	//=0
+/*004*/	char		player_name[64];	//should both be the player's name
+/*068*/	char		leader_name[64];
+/*132*/	uint8		_class;
+/*133*/	uint8		level;
+/*134*/	uint8		has_group;
+/*135*/	uint8		unknown135;	//seems to be 0x42 or 0
 };
 
 struct RaidCreate_Struct {
@@ -3525,7 +3492,7 @@ struct LFGuild_GuildToggle_Struct
 /*540*/ uint32	TimeZone;
 /*544*/ uint8	Toggle;
 /*545*/ uint8	Unknown545[3];
-/*548*/ uint32	TimePosted;
+/*548*/ uint32	Expires;
 /*552*/ char	Name[64];
 /*616*/
 };
@@ -3716,34 +3683,6 @@ struct SayLinkBodyFrame_Struct {
 /*045*/
 };
 
-struct GuildSetRank_Struct
-{
-	/*00*/	uint32	unknown00;
-	/*04*/	uint32	unknown04;
-	/*08*/	uint32	rank;
-	/*72*/	char	member_name[64];
-	/*76*/	uint32	banker;
-};
-
-struct GuildMemberAdd_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown04;
-	/*008*/ uint32 level;
-	/*012*/ uint32 class_;
-	/*016*/ uint32 rank_;
-	/*020*/ uint32 zone_id;
-	/*024*/ uint32 last_on;
-	/*028*/ char   player_name[64];
-};
-
-struct GuildMemberRank_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown_004;
-	/*008*/ uint32 rank_;
-	/*012*/ char   player_name[64];
-	/*076*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker.  Banker not functional for RoF2+
-};
-
 	}; /*structs*/
 
 }; /*Titanium*/