[Release] 22.43.3 (#4034 )

### API * Add lock_status method to world API ([#4028](https://github.com/EQEmu/Server/pull/4028)) @Akkadius 2024-01-29 ### Alternate Currency * Convert Load of Alternate Currencies to Repositories ([#3993](https://github.com/EQEmu/Server/pull/3993)) @Kinglykrab 2024-01-29 ### Beacon * Cleanup Beacons Code ([#4024](https://github.com/EQEmu/Server/pull/4024)) @Kinglykrab 2024-01-29 ### Bots * Convert Bot Database Methods to Repositories ([#4023](https://github.com/EQEmu/Server/pull/4023)) @Kinglykrab 2024-01-29 * Missing boolean returns on DeletePetStats and SaveInspectMessage ([#4031](https://github.com/EQEmu/Server/pull/4031)) @joligario 2024-01-30 ### Code * Add Raid Loot Type Constants ([#4022](https://github.com/EQEmu/Server/pull/4022)) @Kinglykrab 2024-01-29 * Cleanup cross-zone/world-wide OPCode handling ([#4003](https://github.com/EQEmu/Server/pull/4003)) @Kinglykrab 2024-01-29 ### Commands * Cleanup #petitems Command ([#4005](https://github.com/EQEmu/Server/pull/4005)) @Kinglykrab 2024-01-29 ### Crash Fix * Fix Possible Crash in HateList::Find ([#4027](https://github.com/EQEmu/Server/pull/4027)) @Kinglykrab 2024-01-28 ### Fixes * Fix NPC After Death Emotes ([#4021](https://github.com/EQEmu/Server/pull/4021)) @Kinglykrab 2024-01-29 * Fix database loading routines ([#4030](https://github.com/EQEmu/Server/pull/4030)) @Akkadius 2024-01-29 * Fix issue in character_corpses Repository Query ([#4029](https://github.com/EQEmu/Server/pull/4029)) @Kinglykrab 2024-01-29 * Limit Pet Taunt Distance ([#4018](https://github.com/EQEmu/Server/pull/4018)) @fryguy503 2024-01-26 * Limit Player Taunt Distance ([#4019](https://github.com/EQEmu/Server/pull/4019)) @fryguy503 2024-01-26 * Patch for recent change to DEATH ([#4032](https://github.com/EQEmu/Server/pull/4032)) @noudess 2024-01-30 * spawn_conditions map was being emptied by mistake ([#4033](https://github.com/EQEmu/Server/pull/4033)) @noudess 2024-01-30 ### Grids * Convert Grid/Grid Entries to Repositories ([#4011](https://github.com/EQEmu/Server/pull/4011)) @Kinglykrab 2024-01-29 ### Mercenaries * Add expansion settings update to Mercs:Enable ([#4001](https://github.com/EQEmu/Server/pull/4001)) @Kinglykrab 2024-01-29 ### Merchants * Convert Merchant Load to Repositories ([#4007](https://github.com/EQEmu/Server/pull/4007)) @Kinglykrab 2024-01-29 ### Pets * Convert Load of Pets Beastlord Data to Repositories ([#3995](https://github.com/EQEmu/Server/pull/3995)) @Kinglykrab 2024-01-29 ### Quests * Use separate variable for quest idle override. ([#4026](https://github.com/EQEmu/Server/pull/4026)) @noudess 2024-01-27 ### Rules * Add rules for cross-zone/world-wide casts to affect Bots/Mercenaries/Pets ([#4002](https://github.com/EQEmu/Server/pull/4002)) @Kinglykrab 2024-01-29 ### Spawn2 * Convert Spawn2 Methods to Repositories ([#4014](https://github.com/EQEmu/Server/pull/4014)) @Kinglykrab 2024-01-29 ### Traps * Convert Load/Set of Traps to Repositories ([#3994](https://github.com/EQEmu/Server/pull/3994)) @Kinglykrab 2024-01-29 ### Zone * Convert Fishing/Foraging to Repositories ([#4008](https://github.com/EQEmu/Server/pull/4008)) @Kinglykrab 2024-01-30
[Bug Fix] spawn_conditions map was being emptied by mistake (#4033 )
2026-05-24 10:02:28 +00:00 · 2024-01-30 19:26:50 -05:00 · 2024-01-30 18:48:28 -05:00 · 2024-01-30 17:10:45 -05:00 · 2024-01-30 12:07:02 -05:00 · 2024-01-30 05:55:09 -05:00
703 changed files with 100313 additions and 33951 deletions
@@ -15,7 +15,7 @@ volumes:

 steps:
  - name: Build Linux X64
-    image: akkadius/eqemu-server:v11
+    image: akkadius/eqemu-server:v14
    environment:
      GITHUB_TOKEN:
        from_secret: GH_RELEASE_GITHUB_API_TOKEN
@@ -17,13 +17,19 @@ 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++")
-ENDIF(EQEMU_BUILD_STATIC)
+	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)
@@ -32,7 +38,11 @@ IF(MSVC)
 	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17

 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
+
+	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)
 ELSE(MSVC)
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
@@ -129,6 +139,13 @@ 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
@@ -384,6 +401,10 @@ 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()

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

 add_subdirectory(import)
 add_subdirectory(export)
@@ -13,7 +13,6 @@ 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
@@ -70,6 +69,7 @@ SET(common_sources
    perl_eqdb.cpp
    perl_eqdb_res.cpp
    process/process.cpp
+    process.cpp
    proc_launcher.cpp
    profanity_manager.cpp
    ptimer.cpp
@@ -90,6 +90,7 @@ SET(common_sources
    timer.cpp
    unix.cpp
    platform.cpp
+    json/json.hpp
    json/jsoncpp.cpp
    zone_store.cpp
    net/console_server.cpp
@@ -229,7 +230,6 @@ 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
@@ -407,7 +407,6 @@ 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
@@ -539,7 +538,6 @@ 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
@@ -561,7 +559,6 @@ SET(common_headers
    item_fieldlist.h
    item_instance.h
    json_config.h
-    languages.h
    light_source.h
    linked_list.h
    loottable.h
@@ -583,12 +580,14 @@ 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
@@ -788,5 +787,8 @@ 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)
@@ -19,99 +19,106 @@
 #define CLASSES_CH

 #include "../common/types.h"
+#include "../common/rulesys.h"
 #include <string>
+#include <map>

-#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
+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;

+	constexpr uint8  PLAYER_CLASS_COUNT  = 16;
+	constexpr uint16 ALL_CLASSES_BITMASK = 65535;
+};

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

-#define PLAYER_CLASS_COUNT 16
+static std::string shadow_knight_class_name = (
+	RuleB(World, UseOldShadowKnightClassExport) ?
+	"Shadowknight" :
+	"Shadow Knight"
+);

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


 #define ARMOR_TYPE_UNKNOWN 0
@@ -126,16 +133,12 @@


 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 GetClassIDFromPlayerClassValue(uint32 player_class_value);
-uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit);
+uint8 GetPlayerClassValue(uint8 class_id);
+uint16 GetPlayerClassBit(uint8 class_id);

 bool IsFighterClass(uint8 class_id);
 bool IsSpellFighterClass(uint8 class_id);
@@ -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,8 +69,8 @@ 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;
 			}
@@ -79,12 +79,12 @@ namespace EQEmuCommand {

 		if (!arguments_filled || (argc == 2 && !cmd[{"-h", "--help"}]) || (argc == 3 && 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,14 +124,6 @@ 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 <<
@@ -142,9 +134,7 @@ 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) {
@@ -155,18 +145,14 @@ namespace EQEmuCommand {
 				}
 			}

-			/**
-			 * Display command menu
-			 */
+			// Display command menu
 			std::string command_section;
 			for (auto   &it: in_function_map) {
 				description.clear();

 				(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) {
@@ -178,9 +164,7 @@ 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());
@@ -191,6 +175,15 @@ 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);
 		}
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>

+#include "../common/repositories/account_repository.h"
+
 // Disgrace: for windows compile
 #ifdef _WINDOWS
 #include <windows.h>
@@ -52,6 +54,7 @@

 #include "repositories/zone_repository.h"
 #include "zone_store.h"
+#include "repositories/merchantlist_temp_repository.h"

 extern Client client;

@@ -1219,8 +1222,9 @@ void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) {
 		*oStatus = Strings::ToInt(row[1]);
 }

-void Database::ClearMerchantTemp(){
-	QueryDatabase("DELETE FROM merchantlist_temp");
+void Database::ClearMerchantTemp()
+{
+	MerchantlistTempRepository::ClearTemporaryMerchantLists(*this);
 }

 bool Database::UpdateName(const char* oldname, const char* newname) {
@@ -1643,25 +1647,20 @@ void Database::ClearGroupLeader(uint32 gid) {
 		std::cout << "Unable to clear group leader: " << results.ErrorMessage() << std::endl;
 }

-uint8 Database::GetAgreementFlag(uint32 acctid) {
-
-	std::string query = StringFormat("SELECT rulesflag FROM account WHERE id=%i",acctid);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
+uint8 Database::GetAgreementFlag(uint32 account_id)
+{
+	const auto& e = AccountRepository::FindOne(*this, account_id);
+	if (!e.id) {
 		return 0;
+	}

-	if (results.RowCount() != 1)
-		return 0;
-
-	auto row = results.begin();
-
-	return Strings::ToUnsignedInt(row[0]);
+	return e.rulesflag;
 }

-void Database::SetAgreementFlag(uint32 acctid) {
-	std::string query = StringFormat("UPDATE account SET rulesflag=1 where id=%i", acctid);
-	QueryDatabase(query);
+void Database::SetAgreementFlag(uint32 account_id) {
+	auto e = AccountRepository::FindOne(*this, account_id);
+	e.rulesflag = 1;
+	AccountRepository::UpdateOne(*this, e);
 }

 void Database::ClearRaid(uint32 rid) {
@@ -2097,37 +2096,45 @@ void Database::ClearInvSnapshots(bool from_now) {

 struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 {
-
-	TimeOfDay_Struct eqTime;
-	std::string query = StringFormat("SELECT minute,hour,day,month,year,realtime FROM eqtime limit 1");
+	TimeOfDay_Struct t{};
+	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");
-		eqTime.minute = 0;
-		eqTime.hour = 9;
-		eqTime.day = 1;
-		eqTime.month = 1;
-		eqTime.year = 3100;
+		t.minute = 0;
+		t.hour   = 9;
+		t.day    = 1;
+		t.month  = 1;
+		t.year   = 3100;
 		realtime = time(nullptr);
-	}
-	else{
-		auto row = results.begin();
-
-		eqTime.minute = Strings::ToUnsignedInt(row[0]);
-		eqTime.hour = Strings::ToUnsignedInt(row[1]);
-		eqTime.day = Strings::ToUnsignedInt(row[2]);
-		eqTime.month = Strings::ToUnsignedInt(row[3]);
-		eqTime.year = Strings::ToUnsignedInt(row[4]);
-		realtime = Strings::ToBigInt(row[5]);
+		return t;
 	}

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

 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(0));
+	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));
 	auto results = QueryDatabase(query);

 	return results.Success();
@@ -2241,6 +2248,11 @@ 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;
@@ -2274,6 +2286,10 @@ 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;
 				}
@@ -2321,7 +2337,6 @@ bool Database::CopyCharacter(
 			if (!insert.ErrorMessage().empty()) {
 				TransactionRollback();
 				return false;
-				break;
 			}
 		}
 	}
@@ -188,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 acctid);
+	uint8	GetAgreementFlag(uint32 account_id);

 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
-	void	SetAgreementFlag(uint32 acctid);
+	void	SetAgreementFlag(uint32 account_id);

 	int  GetIPExemption(std::string account_ip);
 	void SetIPExemption(std::string account_ip, int exemption_amount);
@@ -226,11 +226,6 @@ public:

 	void    PurgeAllDeletedDataBuckets();

-	/* Database Conversions 'database_conversions.cpp' */
-
-	bool	CheckDatabaseConversions();
-	bool	CheckDatabaseConvertCorpseDeblob();
-	bool	CheckDatabaseConvertPPDeblob();

 	/* Database Variables */

@@ -279,6 +279,11 @@ 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);
 	}
@@ -317,6 +322,10 @@ void DatabaseDumpService::DatabaseDump()
 			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()) {
@@ -324,7 +333,9 @@ void DatabaseDumpService::DatabaseDump()
 		}
 	}

-	LogSys.LoadLogSettingsDefaults();
+	if (!IsDumpOutputToConsole()) {
+		LogSys.LoadLogSettingsDefaults();
+	}

 	if (!pipe_file.empty()) {
 		std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
@@ -604,3 +615,13 @@ void DatabaseDumpService::RemoveCredentialsFile()
 		std::filesystem::remove(CREDENTIALS_FILE);
 	}
 }
+
+bool DatabaseDumpService::IsDumpStaticInstanceData()
+{
+	return dump_static_instance_data;
+}
+
+void DatabaseDumpService::SetDumpStaticInstanceData(bool b)
+{
+	dump_static_instance_data = b;
+}
@@ -58,6 +58,9 @@ 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;
@@ -73,6 +76,8 @@ 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;

@@ -76,9 +76,9 @@ void DatabaseUpdate::CheckDbUpdates()
 	}
 }

-std::string DatabaseUpdate::GetQueryResult(std::string query)
+std::string DatabaseUpdate::GetQueryResult(const ManifestEntry& e)
 {
-	auto results = m_database->QueryDatabase(query);
+	auto results = (e.content_schema_update ? m_content_database : m_database)->QueryDatabase(e.check);

 	std::vector<std::string> result_lines = {};

@@ -121,6 +121,16 @@ bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_resu
 	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,
@@ -136,7 +146,7 @@ bool DatabaseUpdate::UpdateManifest(
 			for (auto &e: entries) {
 				if (e.version == version) {
 					bool        has_migration = true;
-					std::string r             = GetQueryResult(e.check);
+					std::string r             = GetQueryResult(e);
 					if (ShouldRunMigration(e, r)) {
 						has_migration = false;
 						missing_migrations.emplace_back(e.version);
@@ -179,7 +189,7 @@ bool DatabaseUpdate::UpdateManifest(
 				if (e.version == m) {
 					bool errored_migration = false;

-					auto r = m_database->QueryDatabaseMulti(e.sql);
+					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()) {
@@ -187,31 +197,38 @@ bool DatabaseUpdate::UpdateManifest(
 						errored_migration = true;

 						LogInfo("Required database update failed. This could be a problem");
-						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;
+						// if terminal attached then prompt for skip
+						if (is_atty()) {
+							LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");

-						// spawn a concurrent thread that waits for input from std::cin
-						std::thread t1(
-							[&]() {
-								std::cin >> input;
-								gave_input = true;
+							// 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));
 							}
-						);
-						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;
+							// 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);
 						}
 					}
@@ -247,6 +264,13 @@ DatabaseUpdate *DatabaseUpdate::SetDatabase(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));
@@ -274,9 +298,9 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));

 	// server database version is required
-	bool server_up_to_date = v.server_database_version == b.server_database_version;
+	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;
+	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;
 }
@@ -10,6 +10,7 @@ struct ManifestEntry {
 	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 {
@@ -22,14 +23,16 @@ public:
 	DatabaseVersion GetDatabaseVersions();
 	DatabaseVersion GetBinaryDatabaseVersions();
 	void CheckDbUpdates();
-	std::string GetQueryResult(std::string query);
+	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();
 };
@@ -4760,7 +4760,489 @@ UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 )"
 	},
+	ManifestEntry{
+		.version = 9230,
+		.description = "2023_06_23_raid_feature_updates",
+		.check = "SHOW COLUMNS FROM `raid_members` LIKE 'is_assister'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+	ALTER TABLE `raid_members`
+	ADD COLUMN `is_marker` TINYINT UNSIGNED DEFAULT 0 NOT NULL AFTER `islooter`,
+	ADD COLUMN `is_assister` TINYINT UNSIGNED DEFAULT 0 NOT NULL AFTER `is_marker`,
+	ADD COLUMN `note` VARCHAR(64) DEFAULT '' NOT NULL AFTER `is_assister`;

+	ALTER TABLE `raid_details`
+	ADD COLUMN `marked_npc_1` SMALLINT UNSIGNED DEFAULT 0 NOT NULL AFTER `motd`,
+	ADD COLUMN `marked_npc_2` SMALLINT UNSIGNED DEFAULT 0 NOT NULL AFTER `marked_npc_1`,
+	ADD COLUMN `marked_npc_3` SMALLINT UNSIGNED DEFAULT 0 NOT NULL AFTER `marked_npc_2`;
+	)",
+	},
+	ManifestEntry{
+		.version = 9231,
+		.description = "2023_07_14_npc_unsigned_melee_texture.sql",
+		.check = "SHOW COLUMNS FROM `npc_types` LIKE 'd_melee_texture1'",
+		.condition = "contains",
+		.match = "int(11) signed",
+		.sql = R"(ALTER TABLE `npc_types`
+	MODIFY COLUMN `d_melee_texture1` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `armortint_blue`,
+	MODIFY COLUMN `d_melee_texture2` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `d_melee_texture1`;
+	)",
+	},
+	ManifestEntry{
+		.version = 9232,
+		.description = "2023_07_11_command_subsettings.sql",
+		.check = "SHOW TABLES LIKE 'command_subsettings'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(CREATE TABLE `command_subsettings` (
+`id` int UNSIGNED NOT NULL AUTO_INCREMENT,
+`parent_command` varchar(32) NOT NULL,
+`sub_command` varchar(32) NOT NULL,
+`access_level` int(11) UNSIGNED NOT NULL DEFAULT 0,
+`top_level_aliases` varchar(255) NOT NULL,
+PRIMARY KEY (`id`),
+UNIQUE INDEX `command`(`parent_command`, `sub_command`)
+)
+)"
+	},
+	ManifestEntry{
+		.version = 9233,
+		.description = "2023_07_16_scoped_data_buckets.sql",
+		.check = "SHOW COLUMNS FROM `data_buckets` LIKE 'character_id'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+
+ALTER TABLE `data_buckets`
+ADD COLUMN `character_id` bigint(11) NOT NULL DEFAULT 0 AFTER `expires`,
+ADD COLUMN `npc_id` bigint(11) NOT NULL DEFAULT 0 AFTER `character_id`,
+ADD COLUMN `bot_id` bigint(11) NOT NULL DEFAULT 0 AFTER `npc_id`,
+DROP INDEX `key_index`,
+ADD UNIQUE INDEX `keys`(`key`,`character_id`,`npc_id`,`bot_id`);
+
+UPDATE data_buckets SET character_id = SUBSTRING_INDEX(SUBSTRING_INDEX( `key`, '-', 2 ), '-', -1), `key` = SUBSTR(SUBSTRING_INDEX(`key`, SUBSTRING_INDEX( `key`, '-', 2 ), -1), 2) WHERE `key` LIKE 'character-%';
+UPDATE data_buckets SET npc_id = SUBSTRING_INDEX(SUBSTRING_INDEX( `key`, '-', 2 ), '-', -1), `key` = SUBSTR(SUBSTRING_INDEX(`key`, SUBSTRING_INDEX( `key`, '-', 2 ), -1), 2) WHERE `key` LIKE 'npc-%';
+UPDATE data_buckets SET bot_id = SUBSTRING_INDEX(SUBSTRING_INDEX( `key`, '-', 2 ), '-', -1), `key` = SUBSTR(SUBSTRING_INDEX(`key`, SUBSTRING_INDEX( `key`, '-', 2 ), -1), 2) WHERE `key` LIKE 'bot-%';
+
+)"
+	},
+	ManifestEntry{
+		.version = 9234,
+		.description = "2023_07_27_update_raid_details.sql",
+		.check = "SHOW COLUMNS FROM `raid_details` LIKE 'marked_npc_1_entity_id';",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(ALTER TABLE `raid_details`
+			CHANGE COLUMN `marked_npc_1` `marked_npc_1_entity_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `motd`,
+			ADD COLUMN `marked_npc_1_zone_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_1_entity_id`,
+			ADD COLUMN `marked_npc_1_instance_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_1_zone_id`,
+			CHANGE COLUMN `marked_npc_2` `marked_npc_2_entity_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_1_instance_id`,
+			ADD COLUMN `marked_npc_2_zone_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_2_entity_id`,
+			ADD COLUMN `marked_npc_2_instance_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_2_zone_id`,
+			CHANGE COLUMN `marked_npc_3` `marked_npc_3_entity_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_2_instance_id`,
+			ADD COLUMN `marked_npc_3_zone_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_3_entity_id`,
+			ADD COLUMN `marked_npc_3_instance_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_3_zone_id`;
+		)"
+    },
+	ManifestEntry{
+		.version = 9235,
+		.description = "2023_07_31_character_stats_record.sql",
+		.check = "SHOW TABLES LIKE 'character_stats_record'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+
+CREATE TABLE `character_stats_record`  (
+  `character_id` int NOT NULL,
+  `name` varchar(100) NULL,
+  `status` int NULL DEFAULT 0,
+  `level` int NULL DEFAULT 0,
+  `class` int NULL DEFAULT 0,
+  `race` int NULL DEFAULT 0,
+  `aa_points` int NULL DEFAULT 0,
+  `hp` bigint NULL DEFAULT 0,
+  `mana` bigint NULL DEFAULT 0,
+  `endurance` bigint NULL DEFAULT 0,
+  `ac` int NULL DEFAULT 0,
+  `strength` int NULL DEFAULT 0,
+  `stamina` int NULL DEFAULT 0,
+  `dexterity` int NULL DEFAULT 0,
+  `agility` int NULL DEFAULT 0,
+  `intelligence` int NULL DEFAULT 0,
+  `wisdom` int NULL DEFAULT 0,
+  `charisma` int NULL DEFAULT 0,
+  `magic_resist` int NULL DEFAULT 0,
+  `fire_resist` int NULL DEFAULT 0,
+  `cold_resist` int NULL DEFAULT 0,
+  `poison_resist` int NULL DEFAULT 0,
+  `disease_resist` int NULL DEFAULT 0,
+  `corruption_resist` int NULL DEFAULT 0,
+  `heroic_strength` int NULL DEFAULT 0,
+  `heroic_stamina` int NULL DEFAULT 0,
+  `heroic_dexterity` int NULL DEFAULT 0,
+  `heroic_agility` int NULL DEFAULT 0,
+  `heroic_intelligence` int NULL DEFAULT 0,
+  `heroic_wisdom` int NULL DEFAULT 0,
+  `heroic_charisma` int NULL DEFAULT 0,
+  `heroic_magic_resist` int NULL DEFAULT 0,
+  `heroic_fire_resist` int NULL DEFAULT 0,
+  `heroic_cold_resist` int NULL DEFAULT 0,
+  `heroic_poison_resist` int NULL DEFAULT 0,
+  `heroic_disease_resist` int NULL DEFAULT 0,
+  `heroic_corruption_resist` int NULL DEFAULT 0,
+  `haste` int NULL DEFAULT 0,
+  `accuracy` int NULL DEFAULT 0,
+  `attack` int NULL DEFAULT 0,
+  `avoidance` int NULL DEFAULT 0,
+  `clairvoyance` int NULL DEFAULT 0,
+  `combat_effects` int NULL DEFAULT 0,
+  `damage_shield_mitigation` int NULL DEFAULT 0,
+  `damage_shield` int NULL DEFAULT 0,
+  `dot_shielding` int NULL DEFAULT 0,
+  `hp_regen` int NULL DEFAULT 0,
+  `mana_regen` int NULL DEFAULT 0,
+  `endurance_regen` int NULL DEFAULT 0,
+  `shielding` int NULL DEFAULT 0,
+  `spell_damage` int NULL DEFAULT 0,
+  `spell_shielding` int NULL DEFAULT 0,
+  `strikethrough` int NULL DEFAULT 0,
+  `stun_resist` int NULL DEFAULT 0,
+  `backstab` int NULL DEFAULT 0,
+  `wind` int NULL DEFAULT 0,
+  `brass` int NULL DEFAULT 0,
+  `string` int NULL DEFAULT 0,
+  `percussion` int NULL DEFAULT 0,
+  `singing` int NULL DEFAULT 0,
+  `baking` int NULL DEFAULT 0,
+  `alchemy` int NULL DEFAULT 0,
+  `tailoring` int NULL DEFAULT 0,
+  `blacksmithing` int NULL DEFAULT 0,
+  `fletching` int NULL DEFAULT 0,
+  `brewing` int NULL DEFAULT 0,
+  `jewelry` int NULL DEFAULT 0,
+  `pottery` int NULL DEFAULT 0,
+  `research` int NULL DEFAULT 0,
+  `alcohol` int NULL DEFAULT 0,
+  `fishing` int NULL DEFAULT 0,
+  `tinkering` int NULL DEFAULT 0,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`character_id`)
+);
+)"
+	},
+	ManifestEntry{
+		.version = 9236,
+		.description = "2023_08_24_aa_ability_auto_grant.sql",
+		.check = "SHOW COLUMNS FROM `aa_ability` LIKE 'auto_grant_enabled';",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `aa_ability` ADD COLUMN `auto_grant_enabled` TINYINT(4) NOT NULL DEFAULT '0' AFTER `reset_on_death`;
+UPDATE `aa_ability` SET `auto_grant_enabled` = 1 WHERE `grant_only` = 0 AND `charges` = 0 AND `category` = -1;
+)"
+	},
+	ManifestEntry{
+		.version = 9237,
+		.description = "2023_10_15_import_13th_floor.sql",
+		.check = "SHOW COLUMNS FROM `items` LIKE 'bardeffect';",
+		.condition = "contains",
+		.match = "mediumint",
+		.sql = R"(
+ALTER TABLE `items`
+ MODIFY COLUMN `scriptfileid`        MEDIUMINT(6)     NOT NULL DEFAULT 0,
+ MODIFY COLUMN `powersourcecapacity` MEDIUMINT(7)     NOT NULL DEFAULT 0,
+ MODIFY COLUMN `augdistiller`        INT(11) UNSIGNED NOT NULL DEFAULT 0,
+ MODIFY COLUMN `scrollunk1`          INT(11) UNSIGNED NOT NULL DEFAULT 0,
+ MODIFY COLUMN `bardeffect`          MEDIUMINT(6)     NOT NULL DEFAULT 0;
+)"
+	},
+	ManifestEntry{
+		.version = 9238,
+		.description = "2023_10_18_tradeskill_add_learned_by_item_id.sql",
+		.check = "SHOW COLUMNS FROM `tradeskill_recipe` LIKE 'learned_by_item_id'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `tradeskill_recipe`
+	ADD COLUMN `learned_by_item_id` int(11) NOT NULL DEFAULT 0 AFTER `must_learn`;
+)"
+	},
+	ManifestEntry{
+		.version = 9239,
+		.description = "2023_10_18_blocked_spells_expansions_content_flags.sql",
+		.check = "SHOW COLUMNS FROM `blocked_spells` LIKE 'min_expansion'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `blocked_spells`
+ADD COLUMN `min_expansion` tinyint(4) NOT NULL DEFAULT -1 AFTER `description`,
+ADD COLUMN `max_expansion` tinyint(4) NOT NULL DEFAULT -1 AFTER `min_expansion`,
+ADD COLUMN `content_flags` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `max_expansion`,
+ADD COLUMN `content_flags_disabled` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `content_flags`;
+)"
+	},
+	ManifestEntry{
+		.version = 9240,
+		.description = "2023_10_29_variables_id.sql",
+		.check = "SHOW COLUMNS FROM `variables` LIKE 'id'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `variables`
+ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`id`) USING BTREE,
+ADD UNIQUE INDEX(`varname`);
+)"
+	},
+	ManifestEntry{
+		.version = 9241,
+		.description = "2023_10_29_split_spawn2_enabled.sql",
+		.check = "SHOW TABLES LIKE 'spawn2_disabled'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+CREATE TABLE `spawn2_backup_2023_10_29` LIKE `spawn2`;
+INSERT INTO `spawn2_backup_2023_10_29` SELECT * FROM `spawn2`;
+CREATE TABLE `spawn2_disabled` (
+  `id` bigint(11) NOT NULL AUTO_INCREMENT,
+  `spawn2_id` int(11) DEFAULT NULL,
+  `instance_id` int(11) DEFAULT 0,
+  `disabled` smallint(11) DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `spawn2_id` (`spawn2_id`,`instance_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+INSERT INTO spawn2_disabled (spawn2_id, disabled) SELECT id, 1 FROM spawn2 WHERE enabled = 0;
+ALTER TABLE `spawn2` DROP COLUMN `enabled`;
+)",
+	},
+	ManifestEntry{
+		.version = 9242,
+		.description = "2023_11_7_mintime_maxtime_spawnentry.sql",
+		.check = "SHOW COLUMNS FROM `spawnentry` LIKE 'min_time'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `spawnentry`
+ADD COLUMN `min_time` smallint(4) NOT NULL DEFAULT 0 AFTER `condition_value_filter`,
+ADD COLUMN `max_time` smallint(4) NOT NULL DEFAULT 0 AFTER `min_time`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9243,
+		.description = "2023_11_27_starting_items_revamp.sql",
+		.check = "SHOW COLUMNS FROM `starting_items` LIKE 'race_list'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+CREATE TABLE `starting_items_backup_9243` LIKE `starting_items`;
+INSERT INTO `starting_items_backup_9243` SELECT * FROM `starting_items`;
+
+CREATE TABLE `starting_items_new`  (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `race_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
+  `class_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
+  `deity_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
+  `zone_id_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
+  `item_id` int(11) UNSIGNED NOT NULL DEFAULT 0,
+  `item_charges` tinyint(3) UNSIGNED NOT NULL DEFAULT 1,
+  `gm` mediumint(3) UNSIGNED NOT NULL DEFAULT 0,
+  `slot` 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) NULL,
+  `content_flags_disabled` varchar(100) NULL,
+  PRIMARY KEY (`id`)
+);
+
+INSERT INTO
+`starting_items_new`
+(
+	SELECT
+		0 AS `id`,
+		GROUP_CONCAT(DISTINCT `class` ORDER BY class ASC SEPARATOR '|') AS `class_list`,
+		GROUP_CONCAT(DISTINCT `race` ORDER BY race ASC SEPARATOR '|') AS `race_list`,
+		GROUP_CONCAT(DISTINCT `deityid` ORDER BY deityid ASC SEPARATOR '|') AS `deity_list`,
+		GROUP_CONCAT(DISTINCT `zoneid` ORDER BY zoneid ASC SEPARATOR '|') AS `zone_list`,
+		`itemid`,
+		`item_charges`,
+		`gm`,
+		`slot`,
+		`min_expansion`,
+		`max_expansion`,
+		`content_flags`,
+		`content_flags_disabled`
+	FROM
+		`starting_items`
+	GROUP BY
+		`itemid`
+);
+
+DROP TABLE `starting_items`;
+RENAME TABLE `starting_items_new` TO `starting_items`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9244,
+		.description = "2023_11_30_items_table_schema.sql",
+		.check = "SHOW COLUMNS FROM `items` LIKE 'updated'",
+		.condition = "contains",
+		.match = "0000-00-00 00:00:00",
+		.sql = R"(
+ALTER TABLE `items` MODIFY COLUMN `updated` datetime NULL DEFAULT NULL;
+		)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9245,
+		.description = "2023_12_03_object_incline.sql",
+		.check = "SHOW COLUMNS FROM `object` LIKE 'incline'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `object` CHANGE COLUMN `unknown08` `size_percentage` float NOT NULL DEFAULT 0 AFTER `icon`;
+ALTER TABLE `object` CHANGE COLUMN `unknown10` `solid_type` mediumint(5) NOT NULL DEFAULT 0 AFTER `size`;
+ALTER TABLE `object` CHANGE COLUMN `unknown20` `incline` int(11) NOT NULL DEFAULT 0 AFTER `solid_type`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9246,
+		.description = "2023_12_07_keyring_id.sql",
+		.check = "SHOW COLUMNS FROM `keyring` LIKE 'id'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `keyring`
+ADD COLUMN `id` int UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+ADD PRIMARY KEY (`id`);
+)"
+	},
+	ManifestEntry{
+		.version = 9247,
+		.description = "2023_12_14_starting_items_fix.sql",
+		.check = "SHOW COLUMNS FROM `starting_items` LIKE 'inventory_slot'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `starting_items`
+CHANGE COLUMN `race_list` `temporary` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `id`,
+CHANGE COLUMN `class_list` `race_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `temporary`,
+CHANGE COLUMN `gm` `status` mediumint(3) NOT NULL DEFAULT 0 AFTER `item_charges`,
+CHANGE COLUMN `slot` `inventory_slot` mediumint(9) NOT NULL DEFAULT -1 AFTER `status`;
+
+ALTER TABLE `starting_items`
+CHANGE COLUMN `temporary` `class_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `id`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9248,
+		.description = "2023_12_22_drop_npc_emotes_index.sql",
+		.check = "show index from npc_emotes where key_name = 'emoteid'",
+		.condition = "not_empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `npc_emotes` DROP INDEX `emoteid`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9249,
+		.description = "2023_12_26_add_tasks_enabled_column.sql",
+		.check = "SHOW COLUMNS FROM `tasks` LIKE 'enabled'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `tasks`
+ADD COLUMN `enabled` smallint NULL DEFAULT 1 AFTER `faction_amount`
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9250,
+		.description = "2023_01_06_task_activities_list_group.sql",
+		.check = "SHOW COLUMNS FROM `task_activities` LIKE 'list_group'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `task_activities`
+	ADD COLUMN `list_group` TINYINT UNSIGNED NOT NULL DEFAULT '0' AFTER `optional`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9251,
+		.description = "2023_01_12_instance_list_notes.sql",
+		.check = "SHOW COLUMNS FROM `instance_list` LIKE 'notes'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `instance_list`
+	ADD COLUMN `notes` varchar(50) NOT NULL DEFAULT '' AFTER `never_expires`;
+)",
+	},
+	ManifestEntry{
+		.version = 9252,
+		.description = "2024_01_07_zone_idle_when_empty.sql",
+		.check = "SHOW COLUMNS FROM `zone` LIKE 'idle_when_empty'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `zone`
+ADD COLUMN `idle_when_empty` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 AFTER `min_lava_damage`,
+ADD COLUMN `seconds_before_idle` int(11) UNSIGNED NOT NULL DEFAULT 60 AFTER `idle_when_empty`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9253,
+		.description = "2024_01_13_merchantlist_slot.sql",
+		.check = "SHOW COLUMNS FROM `merchantlist` LIKE 'slot'",
+		.condition = "missing",
+		.match = "unsigned",
+		.sql = R"(
+ALTER TABLE `merchantlist`
+	MODIFY COLUMN `slot` int(11) UNSIGNED NOT NULL DEFAULT 0
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9254,
+		.description = "2024_01_13_merchantlist_temp_slot.sql",
+		.check = "SHOW COLUMNS FROM `merchantlist_temp` LIKE 'slot'",
+		.condition = "contains",
+		.match = "tinyint",
+		.sql = R"(
+ALTER TABLE `merchantlist_temp`
+	MODIFY COLUMN `slot` int(11) UNSIGNED NOT NULL DEFAULT 0
+)"
+	},
+	ManifestEntry{
+		.version = 9255,
+		.description = "2024_01_13_drop_item_tick_deprecated.sql",
+		.check = "show tables like 'item_tick'",
+		.condition = "not_empty",
+		.match = "",
+		.sql = R"(
+DROP TABLE IF EXISTS item_tick
+)"
+	},
+	ManifestEntry{
+		.version = 9256,
+		.description = "2024_01_16_increase_spawngroup_size.sql",
+		.check = "SHOW COLUMNS FROM `spawngroup` LIKE 'name'",
+		.condition = "contains",
+		.match = "varchar(50)",
+		.sql = R"(
+ALTER TABLE `spawngroup`
+MODIFY COLUMN `name` varchar(200) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT '' AFTER `id`;
+)"
+	}
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{
 //		.version = 9228,
@@ -61,6 +61,70 @@ 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,
@@ -1,39 +0,0 @@
-#include "../common/global_define.h"
-#include "../common/rulesys.h"
-#include "../common/strings.h"
-
-#include "database.h"
-#include "database/database_update.h"
-
-
-// Disgrace: for windows compile
-#ifdef _WINDOWS
-#include <windows.h>
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#else
-
-#include "unix.h"
-#include <netinet/in.h>
-#include <sys/time.h>
-
-#endif
-
-#pragma pack(1)
-
-DatabaseUpdate database_update;
-
-bool Database::CheckDatabaseConversions()
-{
-	auto *r = RuleManager::Instance();
-	r->LoadRules(this, "default", false);
-	if (!RuleB(Bots, Enabled) && DoesTableExist("bot_data")) {
-		LogInfo("Bot tables found but rule not enabled, enabling");
-		r->SetRule("Bots:Enabled", "true", this, true, true);
-	}
-
-	database_update.SetDatabase(this)->CheckDbUpdates();
-
-	return true;
-}
@@ -29,6 +29,7 @@ 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"
@@ -49,6 +50,7 @@ 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();
@@ -131,85 +133,118 @@ 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                      = 32000;
+	uint32 max_instance_id          = 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;
+		instance_id = 0;
+		return false;
 	}

 	auto row = results.begin();

-	if (Strings::ToInt(row[0]) <= max) {
+	// no instances currently used
+	if (!row[0]) {
+		instance_id = max_reserved_instance_id + 1;
+		return true;
+	}
+
+	// check that id is within limits
+	if (Strings::ToInt(row[0]) <= max_instance_id) {
 		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;
-	}
-
-	max_reserved_instance_id++;
-
-	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++;
-	}
-
-	instance_id = max_reserved_instance_id;
-
-	return true;
+	// no available instance ids
+	instance_id = 0;
+	return false;
 }

 bool Database::IsGlobalInstance(uint16 instance_id)
@@ -520,6 +555,7 @@ 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)
@@ -66,11 +66,12 @@ 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"},
 			{"completed_tasks",                "charid"},
-			{"data_buckets",                   "id"},
+			{"data_buckets",                   "character_id"},
 			{"faction_values",                 "char_id"},
 			{"friends",                        "charid"},
 			{"guild_members",                  "char_id"},
@@ -134,6 +135,7 @@ namespace DatabaseSchema {
 			"character_potionbelt",
 			"character_skills",
 			"character_spells",
+			"character_stats_record",
 			"character_task_timers",
 			"character_tasks",
 			"character_tribute",
@@ -258,6 +260,7 @@ namespace DatabaseSchema {
 			"chatchannels",
 			"chatchannel_reserved_names",
 			"command_settings",
+			"command_subsettings",
 			"content_flags",
 			"db_str",
 			"eqtime",
@@ -342,6 +345,7 @@ namespace DatabaseSchema {
 			"respawn_times",
 			"saylink",
 			"server_scheduled_events",
+			"spawn2_disabled",
 			"player_event_log_settings",
 			"player_event_logs",
 			"shared_task_activity_state",
@@ -8,7 +8,6 @@

 #include "dbcore.h"

-#include <errmsg.h>
 #include <fstream>
 #include <iostream>
 #include <mysqld_error.h>
@@ -138,7 +137,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		 * Error logging
 		 */
 		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
-			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
+			LogMySQLError("MySQL Error ({}) [{}] Query [{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}

 		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(mysql), errorBuffer);
@@ -14,6 +14,9 @@
 #include <string.h>
 #include <mutex>

+#define CR_SERVER_GONE_ERROR    2006
+#define CR_SERVER_LOST          2013
+
 class DBcore {
 public:
 	enum eStatus {
@@ -22,7 +22,6 @@
 #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) {
@@ -159,45 +158,45 @@ int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
 	return 0;
 }

-const std::map<int, std::string>& EQ::constants::GetLanguageMap()
+const std::map<uint8, std::string>& EQ::constants::GetLanguageMap()
 {
-	static const std::map<int, std::string> language_map = {
-		{ LANG_COMMON_TONGUE, "Common Tongue" },
-		{ LANG_BARBARIAN, "Barbarian" },
-		{ LANG_ERUDIAN, "Erudian" },
-		{ LANG_ELVISH, "Elvish" },
-		{ LANG_DARK_ELVISH, "Dark Elvish" },
-		{ LANG_DWARVISH, "Dwarvish" },
-		{ LANG_TROLL, "Troll" },
-		{ LANG_OGRE, "Ogre" },
-		{ LANG_GNOMISH, "Gnomish" },
-		{ LANG_HALFLING, "Halfling" },
-		{ LANG_THIEVES_CANT, "Thieves Cant" },
-		{ LANG_OLD_ERUDIAN, "Old Erudian" },
-		{ LANG_ELDER_ELVISH, "Elder Elvish" },
-		{ LANG_FROGLOK, "Froglok" },
-		{ LANG_GOBLIN, "Goblin" },
-		{ LANG_GNOLL, "Gnoll" },
-		{ LANG_COMBINE_TONGUE, "Combine Tongue" },
-		{ LANG_ELDER_TEIRDAL, "Elder Teirdal" },
-		{ LANG_LIZARDMAN, "Lizardman" },
-		{ LANG_ORCISH, "Orcish" },
-		{ LANG_FAERIE, "Faerie" },
-		{ LANG_DRAGON, "Dragon" },
-		{ LANG_ELDER_DRAGON, "Elder Dragon" },
-		{ LANG_DARK_SPEECH, "Dark Speech" },
-		{ LANG_VAH_SHIR, "Vah Shir" },
-		{ LANG_ALARAN, "Alaran" },
-		{ LANG_HADAL, "Hadal" },
-		{ LANG_UNKNOWN, "Unknown" }
+	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" }
 	};

 	return language_map;
 }

-std::string EQ::constants::GetLanguageName(int language_id)
+std::string EQ::constants::GetLanguageName(uint8 language_id)
 {
-	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+	if (!EQ::ValueWithin(language_id, Language::CommonTongue, Language::Unknown27)) {
 		return std::string();
 	}

@@ -509,7 +508,6 @@ std::string EQ::constants::GetObjectTypeName(int object_type)
 {
 	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
 		return std::string();
-
 	}

 	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
@@ -564,6 +562,7 @@ std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 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" }
@@ -574,9 +573,69 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()

 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (!EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
+	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();
+}
@@ -350,6 +350,7 @@ namespace EQ
 		};

 		enum EmoteTypes : uint8 {
+			Say,
 			Emote,
 			Shout,
 			Proximity
@@ -358,8 +359,8 @@ namespace EQ
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);

-		extern const std::map<int, std::string>& GetLanguageMap();
-		std::string GetLanguageName(int language_id);
+		extern const std::map<uint8, std::string>& GetLanguageMap();
+		std::string GetLanguageName(uint8 language_id);

 		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
 		std::string GetLDoNThemeName(uint32 theme_id);
@@ -397,6 +398,9 @@ 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);
+
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;
@@ -62,6 +62,7 @@ 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),
@@ -316,6 +317,7 @@ N(OP_LootRequest),
 N(OP_ManaChange),
 N(OP_ManaUpdate),
 N(OP_MarkNPC),
+N(OP_MarkRaidNPC),
 N(OP_Marquee),
 N(OP_MemorizeSpell),
 N(OP_Mend),
@@ -398,6 +400,8 @@ 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),
@@ -23,61 +23,59 @@
 #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
+}

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

 constexpr int16 RECAST_TYPE_UNLINKED_ITEM = -1;

@@ -686,6 +684,53 @@ 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,
@@ -1052,4 +1097,34 @@ enum ScribeSpellActions
 	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*/
@@ -124,6 +124,12 @@ struct LDoNTrapTemplate
 	uint8 locked;
 };

+enum CrystalReclaimTypes
+{
+	Ebon = 5,
+	Radiant = 4,
+};
+
 ///////////////////////////////////////////////////////////////////////////////


@@ -386,7 +392,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*/
+/*0736*/	float safe_heading;
 };

 /*
@@ -625,6 +631,12 @@ struct ConsentResponse_Struct {
 	char zonename[32];
 };

+struct NameApproval_Struct {
+	char name[64];
+	uint32 race_id;
+	uint32 class_id;
+};
+
 /*
 ** Name Generator Struct
 ** Length: 72 bytes
@@ -2559,7 +2571,10 @@ 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.
-	uint32 invslot;	// Only used in SoF and later clients.
+	int16 invslot;  // Only used in SoF and later clients.
+	int32 target_id;
+	int8 can_cast;
+	int8 can_scribe;
 	char booktext[1]; // Variable Length
 };
 // This is the request to read a book.
@@ -2568,11 +2583,18 @@ 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.
-	uint32 invslot;	// Only used in Sof and later clients;
-	int16 subslot; // The subslot inside of a bag if it is inside one.
+	int16 invslot;  // Only used in Sof and later clients;
+	int32 target_id;
 	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
@@ -2584,11 +2606,11 @@ struct BookRequest_Struct {
 struct Object_Struct {
 /*00*/	uint32	linked_list_addr[2];// They are, get this, prev and next, ala linked list
 /*08*/	float	size;				//
-/*10*/	uint16	solidtype;			//
+/*10*/	uint16	solid_type;			//
 /*12*/	uint32	drop_id;			// Unique object id for zone
 /*16*/	uint16	zone_id;			// Redudant, but: Zone the object appears in
 /*18*/	uint16	zone_instance;		//
-/*20*/	uint32	unknown020;			//
+/*20*/	uint32	incline;			//
 /*24*/	uint32	unknown024;			//
 /*28*/	float	tilt_x;
 /*32*/	float	tilt_y;
@@ -3429,7 +3451,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3441,8 +3463,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -4105,7 +4127,9 @@ struct UpdateLeadershipAA_Struct {

 enum
 {
-	GroupLeadershipAbility_MarkNPC = 0
+	GroupLeadershipAbility_MarkNPC = 0,
+	RaidLeadershipAbility_MarkNPC = 16,
+	RaidLeadershipAbility_MainAssist = 19
 };

 struct DoGroupLeadershipAbility_Struct
@@ -4149,8 +4173,9 @@ struct InspectBuffs_Struct {
 struct RaidGeneral_Struct {
 /*00*/	uint32		action;	//=10
 /*04*/	char		player_name[64];	//should both be the player's name
-/*64*/	char		leader_name[64];
-/*132*/	uint32		parameter;
+/*68*/	uint32		unknown1;
+/*72*/	char		leader_name[64];
+/*136*/	uint32		parameter;
 };

 struct RaidAddMember_Struct {
@@ -4161,9 +4186,14 @@ 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
-/*136*/ char motd[0]; // max size is 1024, but reply is variable
+/*000*/ RaidGeneral_Struct general;
+/*140*/ char motd[1024];
 };

 struct RaidLeadershipUpdate_Struct {
@@ -5110,8 +5140,6 @@ 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
@@ -20,9 +20,12 @@
 #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;
@@ -111,13 +114,12 @@ void EQEmuConfig::parse_config()
 		DisableConfigChecks = true;
 	}

-	/**
-	 * UCS
-	 */
-	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
-	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString());
-	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
-	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString());
+
+
+	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());

 	/**
 	 * Database
@@ -246,16 +248,16 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 		return (WorldHTTPEnabled ? "true" : "false");
 	}
 	if (var_name == "ChatHost") {
-		return (ChatHost);
+		return (m_ucs_host);
 	}
 	if (var_name == "ChatPort") {
-		return (itoa(ChatPort));
+		return (itoa(m_ucs_port));
 	}
 	if (var_name == "MailHost") {
-		return (MailHost);
+		return (m_ucs_host);
 	}
 	if (var_name == "MailPort") {
-		return (itoa(MailPort));
+		return (itoa(m_ucs_port));
 	}
 	if (var_name == "DatabaseHost") {
 		return (DatabaseHost);
@@ -362,10 +364,8 @@ void EQEmuConfig::Dump() const
 	std::cout << "WorldHTTPPort = " << WorldHTTPPort << std::endl;
 	std::cout << "WorldHTTPMimeFile = " << WorldHTTPMimeFile << std::endl;
 	std::cout << "WorldHTTPEnabled = " << WorldHTTPEnabled << 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 << "UCSHost = " << m_ucs_host << std::endl;
+	std::cout << "UCSPort = " << m_ucs_port << std::endl;
 	std::cout << "DatabaseHost = " << DatabaseHost << std::endl;
 	std::cout << "DatabaseUsername = " << DatabaseUsername << std::endl;
 	std::cout << "DatabasePassword = " << DatabasePassword << std::endl;
@@ -392,3 +392,98 @@ 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;
+		}
+	}
+}
@@ -62,14 +62,6 @@ 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;
@@ -122,12 +114,18 @@ class EQEmuConfig

 		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;
@@ -186,6 +184,7 @@ class EQEmuConfig
 		}

 		void Dump() const;
+		void CheckUcsConfigConversion();
 };

 #endif
@@ -100,6 +100,8 @@ 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
@@ -649,6 +651,9 @@ 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();
@@ -663,11 +668,7 @@ 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;
@@ -676,11 +677,16 @@ 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;
-
-			LogsysCategoriesRepository::InsertOne(*m_database, new_category);
+			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;
+	}
+
 	LogInfo("Loaded [{}] log categories", categories.size());

 	auto webhooks = DiscordWebhooksRepository::GetWhere(*m_database, fmt::format("id < {}", MAX_DISCORD_WEBHOOK_ID));
@@ -695,6 +701,8 @@ 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;
 }
@@ -137,6 +137,9 @@ namespace Logs {
 		Bugs,
 		QuestErrors,
 		PlayerEvents,
+		DataBuckets,
+		Zoning,
+		EqTime,
 		MaxCategoryID /* Don't Remove this */
 	};

@@ -233,6 +236,9 @@ namespace Logs {
 		"Bugs",
 		"QuestErrors",
 		"PlayerEvents",
+		"DataBuckets",
+		"Zoning",
+		"EqTime",
 	};
 }

@@ -794,6 +794,36 @@
        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 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__);\
@@ -46,16 +46,16 @@ EQTime::EQTime()
 	timezone = 0;
 	memset(&eqTime, 0, sizeof(eqTime));
 	//Defaults for time
-	TimeOfDay_Struct start;
-	start.day = 1;
-	start.hour = 9;
-	start.minute = 0;
-	start.month = 1;
-	start.year = 3100;
+	TimeOfDay_Struct t{};
+	t.day    = 1;
+	t.hour   = 9;
+	t.minute = 0;
+	t.month  = 1;
+	t.year   = 3100;
 	//Set default time zone
 	timezone = 0;
 	//Start EQTimer
-	SetCurrentEQTimeOfDay(start, time(0));
+	SetCurrentEQTimeOfDay(t, time(nullptr));
 }

 //getEQTimeOfDay - Reads timeConvert and writes the result to eqTimeOfDay
@@ -200,3 +200,47 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 	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;
+}
@@ -28,6 +28,9 @@ 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);
@@ -1,59 +0,0 @@
-/*	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
@@ -37,6 +37,8 @@ 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();
@@ -56,21 +58,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;
-			PlayerEventLogSettingsRepository::InsertOne(*m_database, c);
+			settings_to_insert.emplace_back(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();

@@ -611,7 +613,7 @@ void PlayerEventLogs::Process()

 void PlayerEventLogs::ProcessRetentionTruncation()
 {
-	LogInfo("Running truncation");
+	LogPlayerEvents("Running truncation");

 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		if (m_settings[i].retention_days > 0) {
@@ -96,12 +96,12 @@ bool IsOfEqualRace(int r1, int r2)
 	// TODO: add more values
 	switch (r1) {
 		case DARK_ELF:
-			if (r2 == RACE_NERIAK_CITIZEN_77) {
+			if (r2 == Race::NeriakCitizen) {
 				return true;
 			}
 			break;
 		case BARBARIAN:
-			if (r2 == RACE_HALAS_CITIZEN_90) {
+			if (r2 == Race::HalasCitizen) {
 				return true;
 			}
 	}
@@ -35,11 +35,6 @@ 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
@@ -238,41 +233,6 @@ 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

@@ -55,8 +55,14 @@ bool File::Exists(const std::string &name)
 */
 void File::Makedir(const std::string &directory_name)
 {
-	fs::create_directory(directory_name);
-	fs::permissions(directory_name, fs::perms::owner_all);
+	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;
+	}
 }

 std::string File::FindEqemuConfigPath()
@@ -801,34 +801,35 @@ 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)
 {
-	// Check basic inventory
-	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
-		if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
-			continue;
+	const int16 last_bag_slot = (RuleI(World, ExpansionSettings) == -1 || RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) ? EQ::invslot::slotGeneral10 : EQ::invslot::slotGeneral8;

-		if (!GetItem(i))
-			// Found available slot in personal inventory
-			return i;
+	for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) { // Check basic inventory
+		if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+			continue;
+		}
+
+		if (!GetItem(i)) {
+			return i; // Found available slot in personal inventory
+		}
 	}

 	if (!for_bag) {
-		for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
-			if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
+		for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) {
+			if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
 				continue;
+			}

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

-				int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
+				const int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);

-				uint8 slots = inst->GetItem()->BagSlots;
-				uint8 j;
-				for (j = invbag::SLOT_BEGIN; j<slots; j++) {
+				const uint8 slots = inst->GetItem()->BagSlots;
+				for (uint8 j = invbag::SLOT_BEGIN; j < slots; j++) {
 					if (!GetItem(base_slot_id + j)) {
 						// Found available slot within bag
 						return (base_slot_id + j);
@@ -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_0, uint8 class_id = NO_CLASS, 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, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);

 		// Remove item from inventory
 		bool DeleteItem(int16 slot_id, int16 quantity = 0);
@@ -230,6 +230,10 @@ 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)
@@ -356,6 +356,7 @@ namespace EQ
 	struct ItemData {
 		// Non packet based fields
 		uint8	MinStatus {};
+		char	Comment[255] {};

 		// Packet based fields
 		uint8	ItemClass {};		// Item Type: 0=common, 1=container, 2=book
@@ -546,6 +547,7 @@ 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); }
@@ -720,12 +720,14 @@ 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 (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
-		if (GetAugmentItemID(index))
+	for (uint8 slot_id = invaug::SOCKET_BEGIN; slot_id <= invaug::SOCKET_END; ++slot_id) {
+		if (GetAugmentItemID(slot_id)) {
 			return true;
+		}
 	}

 	return false;
@@ -1271,7 +1273,7 @@ int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const

 int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const
 {
-	int race = RACE_DOUG_0;
+	int race = Race::Doug;
 	const auto item = GetItem();
 	if (item) {
 		race = item->BaneDmgRace;
@@ -1,54 +0,0 @@
-/*	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
-
-#define MAX_LANGUAGE_SKILL 100
-
-#endif
-
@@ -34,6 +34,7 @@
 #include "../rulesys.h"
 #include "../path_manager.h"
 #include "../races.h"
+#include "../raid.h"

 #include <iostream>
 #include <sstream>
@@ -201,7 +202,7 @@ namespace RoF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);

-		if (opcode == 8) {
+		if (opcode == AlternateCurrencyMode::Populate) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;

 			auto outapp = new EQApplicationPacket(
@@ -2608,88 +2609,124 @@ namespace RoF

 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket *inapp = *p;
-		unsigned char * __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket* inapp = *p;
+		*p = nullptr;
+		unsigned char* __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;

-		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;

-		general->action = 8;
-		general->parameter = 1;
-		strn0cpy(general->leader_name, raid_create->leader_name, 64);
-		strn0cpy(general->player_name, raid_create->leader_name, 64);
+		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);

-		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;

-		if (raid_gen->action == 0) // raid add has longer length than other raid updates
+		switch (raid_gen->action)
 		{
-			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
+		case raidAdd:
+		{
+			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;

 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
+			structs::RaidAddMember_Struct* eq = (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);
-		}
-		else if (raid_gen->action == 35)
-		{
-			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;
+			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]);

-			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;
 		}
-		else if (raid_gen->action == 14 || raid_gen->action == 30)
+		case raidSetMotd:
 		{
-			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;
+			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);

-			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;
 		}
-		else
+		case raidSetLeaderAbilities:
+		case raidMakeLeader:
 		{
-			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
+			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 *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);
-		}
+			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);
 	}

@@ -3128,7 +3165,7 @@ namespace RoF

 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;

-		if (sas->type != AT_Size)
+		if (sas->type != AppearanceType::Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -3831,8 +3868,8 @@ namespace RoF
 			}

 			float SpawnSize = emu->size;
-			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))
+			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
 				)
 			{
 				PacketSize += 60;
@@ -3965,8 +4002,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_12) || (emu->race == RACE_IKSAR_128) ||
-					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
+			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -4861,37 +4898,47 @@ namespace RoF
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);

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

@@ -35,6 +35,7 @@
 #include "../path_manager.h"
 #include "../classes.h"
 #include "../races.h"
+#include "../raid.h"

 #include <iostream>
 #include <sstream>
@@ -273,7 +274,7 @@ namespace RoF2
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);

-		if (opcode == 8) {
+		if (opcode == AlternateCurrencyMode::Populate) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;

 			auto outapp = new EQApplicationPacket(
@@ -2677,88 +2678,124 @@ namespace RoF2

 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket *inapp = *p;
-		unsigned char * __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket* inapp = *p;
+		*p = nullptr;
+		unsigned char* __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;

-		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;

-		general->action = 8;
-		general->parameter = 1;
-		strn0cpy(general->leader_name, raid_create->leader_name, 64);
-		strn0cpy(general->player_name, raid_create->leader_name, 64);
+		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);

-		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;

-		if (raid_gen->action == 0) // raid add has longer length than other raid updates
+		switch (raid_gen->action)
 		{
-			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
+		case raidAdd:
+		{
+			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;

 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
+			structs::RaidAddMember_Struct* eq = (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);
-		}
-		else if (raid_gen->action == 35)
-		{
-			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;
+			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]);

-			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;
 		}
-		else if (raid_gen->action == 14 || raid_gen->action == 30)
+		case raidSetMotd:
 		{
-			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;
+			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);

-			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;
 		}
-		else
+		case raidSetLeaderAbilities:
+		case raidMakeLeader:
 		{
-			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
+			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 *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);
-		}
+			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);
 	}

@@ -2772,7 +2809,10 @@ namespace RoF2
 		else
 			eq->window = emu->window;
 		OUT(type);
-		OUT(invslot);
+		eq->invslot = ServerToRoF2TypelessSlot(emu->invslot, invtype::typePossessions);
+		OUT(target_id);
+		OUT(can_cast);
+		OUT(can_scribe);
 		strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile));

 		FINISH_ENCODE();
@@ -3178,7 +3218,7 @@ namespace RoF2

 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;

-		if (sas->type != AT_Size)
+		if (sas->type != AppearanceType::Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -3946,7 +3986,7 @@ namespace RoF2
 			if (strlen(emu->suffix))
 				PacketSize += strlen(emu->suffix) + 1;

-			if (emu->DestructibleObject || emu->class_ == LDON_TREASURE)
+			if (emu->DestructibleObject || emu->class_ == Class::LDoNTreasure)
 			{
 				if (emu->DestructibleObject)
 					PacketSize = PacketSize - 4;	// No bodytype
@@ -3967,8 +4007,8 @@ namespace RoF2
 			}

 			float SpawnSize = emu->size;
-			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))
+			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
 				)
 			{
 				PacketSize += 60;
@@ -4036,7 +4076,7 @@ namespace RoF2
 			// actually part of bitfields
 			uint8 OtherData = 0;

-			if (emu->class_ == LDON_TREASURE) //LDoN Chest
+			if (emu->class_ == Class::LDoNTreasure) //LDoN Chest
 			{
 				OtherData = OtherData | 0x04;
 			}
@@ -4064,7 +4104,7 @@ namespace RoF2
 			// int DefaultEmitterID
 			VARSTRUCT_ENCODE_TYPE(float, Buffer, 0);	// unknown4

-			if (emu->DestructibleObject || emu->class_ == LDON_TREASURE)
+			if (emu->DestructibleObject || emu->class_ == Class::LDoNTreasure)
 			{
 				VARSTRUCT_ENCODE_STRING(Buffer, emu->DestructibleModel);
 				VARSTRUCT_ENCODE_STRING(Buffer, emu->DestructibleName2);
@@ -4172,8 +4212,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_12) || (emu->race == RACE_IKSAR_128) ||
-					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
+			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -4398,6 +4438,17 @@ 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);
@@ -5064,37 +5115,47 @@ namespace RoF2
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);

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

@@ -5104,8 +5165,8 @@ namespace RoF2
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);

 		IN(type);
-		IN(invslot);
-		IN(subslot);
+		emu->invslot = static_cast<int16_t>(RoF2ToServerTypelessSlot(eq->invslot, invtype::typePossessions));
+		IN(target_id);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));

@@ -150,6 +150,7 @@ D(OP_AugmentInfo)
 D(OP_AugmentItem)
 D(OP_BazaarSearch)
 D(OP_BlockedBuffs)
+D(OP_BookButton)
 D(OP_Buff)
 D(OP_BuffRemoveRequest)
 D(OP_CastSpell)
@@ -2868,15 +2868,23 @@ 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*/	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];
+/*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*/
 };

 /*
@@ -3611,7 +3619,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3623,8 +3631,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -4190,9 +4198,14 @@ 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[0]; // max size 1024, but reply is variable
+/*000*/ RaidGeneral_Struct general;
+/*140*/ char motd[1024];
 };

 struct RaidLeadershipUpdate_Struct {
@@ -3556,7 +3556,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3568,8 +3568,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -4136,9 +4136,14 @@ 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[0]; // max size 1024, but reply is variable
+/*140*/ char motd[1024]; // max size is 1024, but reply is variable
 };

 struct RaidLeadershipUpdate_Struct {
@@ -34,6 +34,7 @@
 #include "../rulesys.h"
 #include "../path_manager.h"
 #include "../races.h"
+#include "../raid.h"

 #include <iostream>
 #include <sstream>
@@ -1686,88 +1687,124 @@ namespace SoD

 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket *inapp = *p;
-		unsigned char * __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket* inapp = *p;
+		*p = nullptr;
+		unsigned char* __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;

-		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;

-		general->action = 8;
-		general->parameter = 1;
-		strn0cpy(general->leader_name, raid_create->leader_name, 64);
-		strn0cpy(general->player_name, raid_create->leader_name, 64);
+		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);

-		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;

-		if (raid_gen->action == 0) // raid add has longer length than other raid updates
+		switch (raid_gen->action)
 		{
-			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
+		case raidAdd:
+		{
+			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;

 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
+			structs::RaidAddMember_Struct* eq = (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);
-		}
-		else if (raid_gen->action == 35)
-		{
-			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;
+			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]);

-			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;
 		}
-		else if (raid_gen->action == 14 || raid_gen->action == 30)
+		case raidSetMotd:
 		{
-			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;
+			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);

-			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;
 		}
-		else
+		case raidSetLeaderAbilities:
+		case raidMakeLeader:
 		{
-			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
+			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 *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);
-		}
+			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);
 	}

@@ -1782,6 +1819,9 @@ 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();
@@ -2467,8 +2507,8 @@ namespace SoD
 			}

 			float SpawnSize = emu->size;
-			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))
+			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -2666,8 +2706,8 @@ namespace SoD

 			Buffer += sizeof(structs::Spawn_Struct_Position);

-			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)
+			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -2693,8 +2733,8 @@ namespace SoD
 			}


-			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)
+			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
@@ -2817,6 +2857,17 @@ 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);
@@ -3324,37 +3375,47 @@ namespace SoD
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);

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

@@ -3364,7 +3425,8 @@ namespace SoD
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);

 		IN(type);
-		emu->invslot = SoDToServerSlot(eq->invslot);
+		emu->invslot = static_cast<int16_t>(SoDToServerSlot(eq->invslot));
+		IN(target_id);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));

@@ -103,6 +103,7 @@ D(OP_ApplyPoison)
 D(OP_AugmentInfo)
 D(OP_AugmentItem)
 D(OP_BazaarSearch)
+D(OP_BookButton)
 D(OP_Buff)
 D(OP_CastSpell)
 D(OP_ChannelMessage)
@@ -2351,12 +2351,21 @@ 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. 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];
+/*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
 };

 /*
@@ -3017,7 +3026,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3029,8 +3038,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3583,9 +3592,14 @@ 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[0]; // max size 1024, but reply is variable
+/*140*/ char motd[1024]; // max size is 1024, but reply is variable
 };

 struct RaidLeadershipUpdate_Struct {
@@ -33,6 +33,7 @@
 #include "sof_structs.h"
 #include "../rulesys.h"
 #include "../path_manager.h"
+#include "../raid.h"

 #include <iostream>
 #include <sstream>
@@ -1356,88 +1357,124 @@ namespace SoF

 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket *inapp = *p;
-		unsigned char * __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket* inapp = *p;
+		*p = nullptr;
+		unsigned char* __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;

-		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;

-		general->action = 8;
-		general->parameter = 1;
-		strn0cpy(general->leader_name, raid_create->leader_name, 64);
-		strn0cpy(general->player_name, raid_create->leader_name, 64);
+		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);

-		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;

-		if (raid_gen->action == 0) // raid add has longer length than other raid updates
+		switch (raid_gen->action)
 		{
-			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
+		case raidAdd:
+		{
+			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;

 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
+			structs::RaidAddMember_Struct* eq = (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);
-		}
-		else if (raid_gen->action == 35)
-		{
-			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;
+			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]);

-			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;
 		}
-		else if (raid_gen->action == 14 || raid_gen->action == 30)
+		case raidSetMotd:
 		{
-			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;
+			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);

-			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;
 		}
-		else
+		case raidSetLeaderAbilities:
+		case raidMakeLeader:
 		{
-			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
+			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 *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);
-		}
+			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);
 	}

@@ -1452,6 +1489,9 @@ 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();
@@ -2261,6 +2301,17 @@ 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);
@@ -2729,37 +2780,47 @@ namespace SoF
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);

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

@@ -2769,7 +2830,8 @@ namespace SoF
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);

 		IN(type);
-		emu->invslot = SoFToServerSlot(eq->invslot);
+		emu->invslot = static_cast<int16_t>(SoFToServerSlot(eq->invslot));
+		IN(target_id);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));

@@ -94,6 +94,7 @@ D(OP_AltCurrencySellSelection)
 D(OP_ApplyPoison)
 D(OP_AugmentInfo)
 D(OP_AugmentItem)
+D(OP_BookButton)
 D(OP_Buff)
 D(OP_Bug)
 D(OP_CastSpell)
@@ -2321,12 +2321,21 @@ 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. 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];
+/*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
 };

 /*
@@ -2942,7 +2951,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -2954,8 +2963,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3508,9 +3517,14 @@ 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[0]; // max size 1024, but reply is variable
+/*140*/ char motd[1024]; // max size is 1024, but reply is variable
 };

 struct RaidLeadershipUpdate_Struct {
@@ -128,6 +128,15 @@
 	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));

@@ -146,6 +155,9 @@
 	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;
@@ -33,6 +33,7 @@
 #include "../item_instance.h"
 #include "titanium_structs.h"
 #include "../path_manager.h"
+#include "../raid.h"

 #include <sstream>

@@ -1245,6 +1246,119 @@ 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
@@ -2272,6 +2386,63 @@ 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
@@ -61,6 +61,8 @@ 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)
@@ -106,6 +108,7 @@ D(OP_LoadSpellSet)
 D(OP_LootItem)
 D(OP_MoveItem)
 D(OP_PetCommands)
+D(OP_RaidInvite)
 D(OP_ReadBook)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerSell)
@@ -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
@@ -2604,7 +2604,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -2616,8 +2616,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3017,23 +3017,39 @@ struct leadExpUpdateStruct {
   /*0028*/ uint32 unknown0028;
 };

-
-
 struct RaidGeneral_Struct {
-/*00*/	uint32		action;	//=10
-/*04*/	char		player_name[64];	//should both be the player's name
-/*04*/	char		leader_name[64];
+/*000*/	uint32		action;	//=10
+/*004*/	char		player_name[64];	//should both be the player's name
+/*068*/	char		leader_name[64];
 /*132*/	uint32		parameter;
 };

-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 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 RaidCreate_Struct {
@@ -35,6 +35,7 @@
 #include "../path_manager.h"
 #include "../classes.h"
 #include "../races.h"
+#include "../raid.h"

 #include <iostream>
 #include <sstream>
@@ -194,7 +195,7 @@ namespace UF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);

-		if (opcode == 8) {
+		if (opcode == AlternateCurrencyMode::Populate) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;

 			auto outapp = new EQApplicationPacket(
@@ -1931,88 +1932,124 @@ namespace UF

 	ENCODE(OP_RaidJoin)
 	{
-		EQApplicationPacket *inapp = *p;
-		unsigned char * __emu_buffer = inapp->pBuffer;
-		RaidCreate_Struct *raid_create = (RaidCreate_Struct*)__emu_buffer;
+		EQApplicationPacket* inapp = *p;
+		*p = nullptr;
+		unsigned char* __emu_buffer = inapp->pBuffer;
+		RaidCreate_Struct* emu = (RaidCreate_Struct*)__emu_buffer;

-		auto outapp_create = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
-		structs::RaidGeneral_Struct *general = (structs::RaidGeneral_Struct*)outapp_create->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidGeneral_Struct));
+		structs::RaidGeneral_Struct* general = (structs::RaidGeneral_Struct*)outapp->pBuffer;

-		general->action = 8;
-		general->parameter = 1;
-		strn0cpy(general->leader_name, raid_create->leader_name, 64);
-		strn0cpy(general->player_name, raid_create->leader_name, 64);
+		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);

-		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;

-		if (raid_gen->action == 0) // raid add has longer length than other raid updates
+		switch (raid_gen->action)
 		{
-			RaidAddMember_Struct* in_add_member = (RaidAddMember_Struct*)__emu_buffer;
+		case raidAdd:
+		{
+			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;

 			auto outapp = new EQApplicationPacket(OP_RaidUpdate, sizeof(structs::RaidAddMember_Struct));
-			structs::RaidAddMember_Struct *add_member = (structs::RaidAddMember_Struct*)outapp->pBuffer;
+			structs::RaidAddMember_Struct* eq = (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);
-		}
-		else if (raid_gen->action == 35)
-		{
-			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;
+			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]);

-			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;
 		}
-		else if (raid_gen->action == 14 || raid_gen->action == 30)
+		case raidSetMotd:
 		{
-			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;
+			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);

-			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;
 		}
-		else
+		case raidSetLeaderAbilities:
+		case raidMakeLeader:
 		{
-			RaidGeneral_Struct* in_raid_general = (RaidGeneral_Struct*)__emu_buffer;
+			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 *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);
-		}
+			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);
 	}

@@ -2027,6 +2064,9 @@ namespace UF
 			eq->window = emu->window;
 		OUT(type);
 		eq->invslot = ServerToUFSlot(emu->invslot);
+		OUT(target_id);
+		OUT(can_cast);
+		OUT(can_scribe);
 		strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile));

 		FINISH_ENCODE();
@@ -2299,7 +2339,7 @@ namespace UF

 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;

-		if (sas->type != AT_Size)
+		if (sas->type != AppearanceType::Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -2718,7 +2758,7 @@ namespace UF
 			if (strlen(emu->suffix))
 				PacketSize += strlen(emu->suffix) + 1;

-			if (emu->DestructibleObject || emu->class_ == LDON_TREASURE)
+			if (emu->DestructibleObject || emu->class_ == Class::LDoNTreasure)
 			{
 				if (emu->DestructibleObject)
 					PacketSize = PacketSize - 4;	// No bodytype
@@ -2739,8 +2779,8 @@ namespace UF
 			}

 			float SpawnSize = emu->size;
-			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))
+			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -2807,7 +2847,7 @@ namespace UF

 			uint8 OtherData = 0;

-			if (emu->class_ == LDON_TREASURE) //Ldon chest
+			if (emu->class_ == Class::LDoNTreasure) //Ldon chest
 			{
 				OtherData = OtherData | 0x01;
 			}
@@ -2833,7 +2873,7 @@ namespace UF
 			}
 			VARSTRUCT_ENCODE_TYPE(float, Buffer, 0);	// unknown4

-			if (emu->DestructibleObject || emu->class_ == LDON_TREASURE)
+			if (emu->DestructibleObject || emu->class_ == Class::LDoNTreasure)
 			{
 				VARSTRUCT_ENCODE_STRING(Buffer, emu->DestructibleModel);
 				VARSTRUCT_ENCODE_STRING(Buffer, emu->DestructibleName2);
@@ -2942,8 +2982,8 @@ namespace UF

 			Buffer += sizeof(structs::Spawn_Struct_Position);

-			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)
+			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -2978,8 +3018,8 @@ namespace UF
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);
 			}

-			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)
+			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
+					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
@@ -3105,6 +3145,17 @@ namespace UF
 		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>(UFToServerSlot(eq->invslot));
+		IN(target_id);
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Buff)
 	{
 		DECODE_LENGTH_EXACT(structs::SpellBuffPacket_Struct);
@@ -3623,39 +3674,48 @@ namespace UF
 	{
 		DECODE_LENGTH_ATLEAST(structs::RaidGeneral_Struct);

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

 	DECODE(OP_ReadBook)
@@ -3664,7 +3724,8 @@ namespace UF
 		SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct);

 		IN(type);
-		emu->invslot = UFToServerSlot(eq->invslot);
+		emu->invslot = static_cast<int16_t>(UFToServerSlot(eq->invslot));
+		IN(target_id);
 		emu->window = (uint8)eq->window;
 		strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile));

@@ -110,6 +110,7 @@ D(OP_ApplyPoison)
 D(OP_AugmentInfo)
 D(OP_AugmentItem)
 D(OP_BazaarSearch)
+D(OP_BookButton)
 D(OP_Buff)
 D(OP_BuffRemoveRequest)
 D(OP_CastSpell)
@@ -2400,12 +2400,21 @@ 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. 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];
+/*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
 };

 /*
@@ -3069,7 +3078,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct Ground_Spawn{
+struct GroundSpawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3081,8 +3090,8 @@ struct Ground_Spawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct Ground_Spawns {
-	struct Ground_Spawn spawn[50]; //Assigned max number to allow
+struct GroundSpawns {
+	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3638,9 +3647,14 @@ 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[0]; // max size 1024, but reply is variable
+/*000*/ RaidGeneral_Struct general;
+/*140*/ char motd[1024];
 };

 struct RaidLeadershipUpdate_Struct {
@@ -0,0 +1,34 @@
+// types
+#include <limits>
+#include <string>
+#include <cctype>
+#include <sstream>
+
+// containers
+#include <iterator>
+#include <set>
+#include <unordered_set>
+#include <map>
+#include <unordered_map>
+#include <list>
+#include <vector>
+
+// utilities
+#include <iostream>
+#include <cassert>
+#include <cmath>
+#include <memory>
+#include <functional>
+#include <algorithm>
+#include <utility>
+#include <tuple>
+#include <fstream>
+#include <cstdio>
+
+// fmt
+#include <fmt/format.h>
+
+// lua
+#include "lua.hpp"
+#include <luabind/luabind.hpp>
+#include <luabind/object.hpp>
@@ -72,6 +72,8 @@ std::string GetPlatformName()
 			return "HC";
 		case EQEmuExePlatform::ExePlatformTests:
 			return "Tests";
+		case EQEmuExePlatform::ExePlatformZoneSidecar:
+			return "ZoneSidecar";
 		default:
 			return "";
 	}
@@ -37,7 +37,8 @@ enum EQEmuExePlatform
 	ExePlatformClientImport,
 	ExePlatformClientExport,
 	ExePlatformHC,
-	ExePlatformTests
+	ExePlatformTests,
+	ExePlatformZoneSidecar
 };

 void RegisterExecutablePlatform(EQEmuExePlatform p);
@@ -0,0 +1,44 @@
+#include <string>
+#include <fstream>
+#include <algorithm>
+#include "process.h"
+
+inline std::string random_string(size_t length)
+{
+	auto        randchar = []() -> char {
+		const char   charset[] = "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz";
+		const size_t max_index = (sizeof(charset) - 1);
+		return charset[static_cast<size_t>(std::rand()) % max_index];
+	};
+	std::string str(length, 0);
+	std::generate_n(str.begin(), length, randchar);
+	return str;
+}
+
+std::string Process::execute(const std::string &cmd, bool return_result)
+{
+	std::string random     = "/tmp/" + random_string(25);
+	const char  *file_name = random.c_str();
+
+	if (return_result) {
+#ifdef _WINDOWS
+		std::system((cmd + " > " + file_name + " 2>&1").c_str());
+#else
+		std::system((cmd + " > " + file_name + " 2>&1").c_str());
+#endif
+	}
+	else {
+		std::system((cmd).c_str());
+	}
+
+	std::string result;
+
+	if (return_result) {
+		std::ifstream file(file_name);
+		result = {std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>()};
+		std::remove(file_name);
+
+	}
+
+	return result;
+}
@@ -0,0 +1,10 @@
+#ifndef EQEMU_PROCESS_H
+#define EQEMU_PROCESS_H
+
+class Process {
+public:
+	static std::string execute(const std::string &cmd, bool return_result = true);
+};
+
+
+#endif //EQEMU_PROCESS_H
@@ -44,9 +44,10 @@ enum : int {	//values for pTimerType
 	pTimerBeggingPickPocket = 27,
 	pTimerLinkedSpellReuseStart = 28,
 	pTimerLinkedSpellReuseEnd = 48,
+	pTimerClearXTarget = 50,
+
+	pTimerShieldAbility = 86,

-	pTimerShieldAbility = 86,	
-	
 	pTimerLayHands = 87,		//these IDs are used by client too
 	pTimerHarmTouch = 89,		//so dont change them

@@ -0,0 +1,72 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	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 RAID_H
+#define RAID_H
+
+enum {	//raid packet types:
+	raidAdd = 0,
+	raidRemove2 = 1,	//parameter=0
+	raidMemberNameChange = 2,
+	raidRemove1 = 3,	//parameter=0xFFFFFFFF
+	raidNoLongerLeader = 4,
+	raidDisband = 5,
+	raidMembers = 6,	//len 395+, details + members list
+	raidNoAssignLeadership = 7,
+	raidCreate = 8,		//len 72
+	raidUnknown = 9, // unused?
+	raidNoRaid = 10,		//parameter=0
+	raidChangeLootType = 11,
+	raidStringID = 12,
+	raidChangeGroupLeader = 13,	//136 raid leader, new group leader, group_id?
+	raidSetLeaderAbilities = 14,	//472
+	raidSetLeaderData = 15,	// 14,15 SoE names, not sure on difference, 14 packet has 0x100 bytes 15 0x214 in addition to raid general
+	raidChangeGroup = 16,	//?? len 136 old leader, new leader, 0 (preceeded with a remove2)
+	raidLock = 17,		//len 136 leader?, leader, 0
+	raidUnlock = 18,		//len 136 leader?, leader, 0
+	raidRedStringID = 19,
+	raidSetLeader = 20,	//len 388, contains 'details' struct without members; also used for "invite to raid"
+	raidMakeLeader = 30,
+	raidSetMotd = 35,
+	raidSetNote = 36,
+};
+
+
+enum { //raid command types
+	RaidCommandInviteIntoExisting = 0, //in use
+	RaidCommandAcceptInvite = 1, //in use
+	RaidCommandInvite = 3, //in use
+	RaidCommandDisband = 5, //in use
+	RaidCommandMoveGroup = 6, //in use
+	RaidCommandRemoveGroupLeader = 7,
+	RaidCommandRaidLock = 8, //in use
+	RaidCommandRaidUnlock = 9, //in use
+	RaidCommandLootType = 20, //in use
+	RaidCommandAddLooter = 21, //in use
+	RaidCommandRemoveLooter = 22, //in use
+	RaidCommandMakeLeader = 30,
+	RaidCommandInviteFail = 31, //already in raid, waiting on invite from other raid, etc
+	RaidCommandLootType2 = 32, //in use
+	RaidCommandAddLooter2 = 33, //in use
+	RaidCommandRemoveLooter2 = 34, //in use
+	RaidCommandSetMotd = 35,
+	RaidCommandSetNote = 36,
+};
+
+
+#endif
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_AA_ABILITY_REPOSITORY_H
@@ -33,6 +33,7 @@ public:
 		int32_t     first_rank_id;
 		uint8_t     enabled;
 		int8_t      reset_on_death;
+		int8_t      auto_grant_enabled;
 	};

 	static std::string PrimaryKey()
@@ -57,6 +58,7 @@ public:
 			"first_rank_id",
 			"enabled",
 			"reset_on_death",
+			"auto_grant_enabled",
 		};
 	}

@@ -77,6 +79,7 @@ public:
 			"first_rank_id",
 			"enabled",
 			"reset_on_death",
+			"auto_grant_enabled",
 		};
 	}

@@ -117,20 +120,21 @@ public:
 	{
 		AaAbility e{};

-		e.id               = 0;
-		e.name             = "";
-		e.category         = -1;
-		e.classes          = 131070;
-		e.races            = 65535;
-		e.drakkin_heritage = 127;
-		e.deities          = 131071;
-		e.status           = 0;
-		e.type             = 0;
-		e.charges          = 0;
-		e.grant_only       = 0;
-		e.first_rank_id    = -1;
-		e.enabled          = 1;
-		e.reset_on_death   = 0;
+		e.id                 = 0;
+		e.name               = "";
+		e.category           = -1;
+		e.classes            = 131070;
+		e.races              = 65535;
+		e.drakkin_heritage   = 127;
+		e.deities            = 131071;
+		e.status             = 0;
+		e.type               = 0;
+		e.charges            = 0;
+		e.grant_only         = 0;
+		e.first_rank_id      = -1;
+		e.enabled            = 1;
+		e.reset_on_death     = 0;
+		e.auto_grant_enabled = 0;

 		return e;
 	}
@@ -156,8 +160,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				aa_ability_id
 			)
 		);
@@ -166,20 +171,21 @@ public:
 		if (results.RowCount() == 1) {
 			AaAbility e{};

-			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.name             = row[1] ? row[1] : "";
-			e.category         = static_cast<int32_t>(atoi(row[2]));
-			e.classes          = static_cast<int32_t>(atoi(row[3]));
-			e.races            = static_cast<int32_t>(atoi(row[4]));
-			e.drakkin_heritage = static_cast<int32_t>(atoi(row[5]));
-			e.deities          = static_cast<int32_t>(atoi(row[6]));
-			e.status           = static_cast<int32_t>(atoi(row[7]));
-			e.type             = static_cast<int32_t>(atoi(row[8]));
-			e.charges          = static_cast<int32_t>(atoi(row[9]));
-			e.grant_only       = static_cast<int8_t>(atoi(row[10]));
-			e.first_rank_id    = static_cast<int32_t>(atoi(row[11]));
-			e.enabled          = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
-			e.reset_on_death   = static_cast<int8_t>(atoi(row[13]));
+			e.id                 = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.name               = row[1] ? row[1] : "";
+			e.category           = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.classes            = row[3] ? static_cast<int32_t>(atoi(row[3])) : 131070;
+			e.races              = row[4] ? static_cast<int32_t>(atoi(row[4])) : 65535;
+			e.drakkin_heritage   = row[5] ? static_cast<int32_t>(atoi(row[5])) : 127;
+			e.deities            = row[6] ? static_cast<int32_t>(atoi(row[6])) : 131071;
+			e.status             = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
+			e.type               = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
+			e.charges            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.grant_only         = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.first_rank_id      = row[11] ? static_cast<int32_t>(atoi(row[11])) : -1;
+			e.enabled            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 1;
+			e.reset_on_death     = row[13] ? static_cast<int8_t>(atoi(row[13])) : 0;
+			e.auto_grant_enabled = row[14] ? static_cast<int8_t>(atoi(row[14])) : 0;

 			return e;
 		}
@@ -227,6 +233,7 @@ public:
 		v.push_back(columns[11] + " = " + std::to_string(e.first_rank_id));
 		v.push_back(columns[12] + " = " + std::to_string(e.enabled));
 		v.push_back(columns[13] + " = " + std::to_string(e.reset_on_death));
+		v.push_back(columns[14] + " = " + std::to_string(e.auto_grant_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -262,6 +269,7 @@ public:
 		v.push_back(std::to_string(e.first_rank_id));
 		v.push_back(std::to_string(e.enabled));
 		v.push_back(std::to_string(e.reset_on_death));
+		v.push_back(std::to_string(e.auto_grant_enabled));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -305,6 +313,7 @@ public:
 			v.push_back(std::to_string(e.first_rank_id));
 			v.push_back(std::to_string(e.enabled));
 			v.push_back(std::to_string(e.reset_on_death));
+			v.push_back(std::to_string(e.auto_grant_enabled));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -338,20 +347,21 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaAbility e{};

-			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.name             = row[1] ? row[1] : "";
-			e.category         = static_cast<int32_t>(atoi(row[2]));
-			e.classes          = static_cast<int32_t>(atoi(row[3]));
-			e.races            = static_cast<int32_t>(atoi(row[4]));
-			e.drakkin_heritage = static_cast<int32_t>(atoi(row[5]));
-			e.deities          = static_cast<int32_t>(atoi(row[6]));
-			e.status           = static_cast<int32_t>(atoi(row[7]));
-			e.type             = static_cast<int32_t>(atoi(row[8]));
-			e.charges          = static_cast<int32_t>(atoi(row[9]));
-			e.grant_only       = static_cast<int8_t>(atoi(row[10]));
-			e.first_rank_id    = static_cast<int32_t>(atoi(row[11]));
-			e.enabled          = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
-			e.reset_on_death   = static_cast<int8_t>(atoi(row[13]));
+			e.id                 = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.name               = row[1] ? row[1] : "";
+			e.category           = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.classes            = row[3] ? static_cast<int32_t>(atoi(row[3])) : 131070;
+			e.races              = row[4] ? static_cast<int32_t>(atoi(row[4])) : 65535;
+			e.drakkin_heritage   = row[5] ? static_cast<int32_t>(atoi(row[5])) : 127;
+			e.deities            = row[6] ? static_cast<int32_t>(atoi(row[6])) : 131071;
+			e.status             = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
+			e.type               = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
+			e.charges            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.grant_only         = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.first_rank_id      = row[11] ? static_cast<int32_t>(atoi(row[11])) : -1;
+			e.enabled            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 1;
+			e.reset_on_death     = row[13] ? static_cast<int8_t>(atoi(row[13])) : 0;
+			e.auto_grant_enabled = row[14] ? static_cast<int8_t>(atoi(row[14])) : 0;

 			all_entries.push_back(e);
 		}
@@ -376,20 +386,21 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaAbility e{};

-			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.name             = row[1] ? row[1] : "";
-			e.category         = static_cast<int32_t>(atoi(row[2]));
-			e.classes          = static_cast<int32_t>(atoi(row[3]));
-			e.races            = static_cast<int32_t>(atoi(row[4]));
-			e.drakkin_heritage = static_cast<int32_t>(atoi(row[5]));
-			e.deities          = static_cast<int32_t>(atoi(row[6]));
-			e.status           = static_cast<int32_t>(atoi(row[7]));
-			e.type             = static_cast<int32_t>(atoi(row[8]));
-			e.charges          = static_cast<int32_t>(atoi(row[9]));
-			e.grant_only       = static_cast<int8_t>(atoi(row[10]));
-			e.first_rank_id    = static_cast<int32_t>(atoi(row[11]));
-			e.enabled          = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
-			e.reset_on_death   = static_cast<int8_t>(atoi(row[13]));
+			e.id                 = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.name               = row[1] ? row[1] : "";
+			e.category           = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.classes            = row[3] ? static_cast<int32_t>(atoi(row[3])) : 131070;
+			e.races              = row[4] ? static_cast<int32_t>(atoi(row[4])) : 65535;
+			e.drakkin_heritage   = row[5] ? static_cast<int32_t>(atoi(row[5])) : 127;
+			e.deities            = row[6] ? static_cast<int32_t>(atoi(row[6])) : 131071;
+			e.status             = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
+			e.type               = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
+			e.charges            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.grant_only         = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.first_rank_id      = row[11] ? static_cast<int32_t>(atoi(row[11])) : -1;
+			e.enabled            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 1;
+			e.reset_on_death     = row[13] ? static_cast<int8_t>(atoi(row[13])) : 0;
+			e.auto_grant_enabled = row[14] ? static_cast<int8_t>(atoi(row[14])) : 0;

 			all_entries.push_back(e);
 		}
@@ -448,6 +459,90 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AaAbility &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back(std::to_string(e.category));
+		v.push_back(std::to_string(e.classes));
+		v.push_back(std::to_string(e.races));
+		v.push_back(std::to_string(e.drakkin_heritage));
+		v.push_back(std::to_string(e.deities));
+		v.push_back(std::to_string(e.status));
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.charges));
+		v.push_back(std::to_string(e.grant_only));
+		v.push_back(std::to_string(e.first_rank_id));
+		v.push_back(std::to_string(e.enabled));
+		v.push_back(std::to_string(e.reset_on_death));
+		v.push_back(std::to_string(e.auto_grant_enabled));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AaAbility> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back(std::to_string(e.category));
+			v.push_back(std::to_string(e.classes));
+			v.push_back(std::to_string(e.races));
+			v.push_back(std::to_string(e.drakkin_heritage));
+			v.push_back(std::to_string(e.deities));
+			v.push_back(std::to_string(e.status));
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.charges));
+			v.push_back(std::to_string(e.grant_only));
+			v.push_back(std::to_string(e.first_rank_id));
+			v.push_back(std::to_string(e.enabled));
+			v.push_back(std::to_string(e.reset_on_death));
+			v.push_back(std::to_string(e.auto_grant_enabled));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_AA_ABILITY_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_AA_RANK_EFFECTS_REPOSITORY_H
@@ -120,8 +120,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				aa_rank_effects_id
 			)
 		);
@@ -130,11 +131,11 @@ public:
 		if (results.RowCount() == 1) {
 			AaRankEffects e{};

-			e.rank_id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.slot      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.effect_id = static_cast<int32_t>(atoi(row[2]));
-			e.base1     = static_cast<int32_t>(atoi(row[3]));
-			e.base2     = static_cast<int32_t>(atoi(row[4]));
+			e.rank_id   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot      = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 1;
+			e.effect_id = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
+			e.base1     = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.base2     = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;

 			return e;
 		}
@@ -266,11 +267,11 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaRankEffects e{};

-			e.rank_id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.slot      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.effect_id = static_cast<int32_t>(atoi(row[2]));
-			e.base1     = static_cast<int32_t>(atoi(row[3]));
-			e.base2     = static_cast<int32_t>(atoi(row[4]));
+			e.rank_id   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot      = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 1;
+			e.effect_id = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
+			e.base1     = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.base2     = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;

 			all_entries.push_back(e);
 		}
@@ -295,11 +296,11 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaRankEffects e{};

-			e.rank_id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.slot      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.effect_id = static_cast<int32_t>(atoi(row[2]));
-			e.base1     = static_cast<int32_t>(atoi(row[3]));
-			e.base2     = static_cast<int32_t>(atoi(row[4]));
+			e.rank_id   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.slot      = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 1;
+			e.effect_id = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
+			e.base1     = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.base2     = row[4] ? static_cast<int32_t>(atoi(row[4])) : 0;

 			all_entries.push_back(e);
 		}
@@ -358,6 +359,70 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AaRankEffects &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.rank_id));
+		v.push_back(std::to_string(e.slot));
+		v.push_back(std::to_string(e.effect_id));
+		v.push_back(std::to_string(e.base1));
+		v.push_back(std::to_string(e.base2));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AaRankEffects> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.rank_id));
+			v.push_back(std::to_string(e.slot));
+			v.push_back(std::to_string(e.effect_id));
+			v.push_back(std::to_string(e.base1));
+			v.push_back(std::to_string(e.base2));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_AA_RANK_EFFECTS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_AA_RANK_PREREQS_REPOSITORY_H
@@ -112,8 +112,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				aa_rank_prereqs_id
 			)
 		);
@@ -122,9 +123,9 @@ public:
 		if (results.RowCount() == 1) {
 			AaRankPrereqs e{};

-			e.rank_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.aa_id   = static_cast<int32_t>(atoi(row[1]));
-			e.points  = static_cast<int32_t>(atoi(row[2]));
+			e.rank_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.aa_id   = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.points  = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;

 			return e;
 		}
@@ -250,9 +251,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaRankPrereqs e{};

-			e.rank_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.aa_id   = static_cast<int32_t>(atoi(row[1]));
-			e.points  = static_cast<int32_t>(atoi(row[2]));
+			e.rank_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.aa_id   = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.points  = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;

 			all_entries.push_back(e);
 		}
@@ -277,9 +278,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaRankPrereqs e{};

-			e.rank_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.aa_id   = static_cast<int32_t>(atoi(row[1]));
-			e.points  = static_cast<int32_t>(atoi(row[2]));
+			e.rank_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.aa_id   = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.points  = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;

 			all_entries.push_back(e);
 		}
@@ -338,6 +339,66 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AaRankPrereqs &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.rank_id));
+		v.push_back(std::to_string(e.aa_id));
+		v.push_back(std::to_string(e.points));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AaRankPrereqs> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.rank_id));
+			v.push_back(std::to_string(e.aa_id));
+			v.push_back(std::to_string(e.points));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_AA_RANK_PREREQS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_AA_RANKS_REPOSITORY_H
@@ -152,8 +152,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				aa_ranks_id
 			)
 		);
@@ -162,19 +163,19 @@ public:
 		if (results.RowCount() == 1) {
 			AaRanks e{};

-			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.upper_hotkey_sid = static_cast<int32_t>(atoi(row[1]));
-			e.lower_hotkey_sid = static_cast<int32_t>(atoi(row[2]));
-			e.title_sid        = static_cast<int32_t>(atoi(row[3]));
-			e.desc_sid         = static_cast<int32_t>(atoi(row[4]));
-			e.cost             = static_cast<int32_t>(atoi(row[5]));
-			e.level_req        = static_cast<int32_t>(atoi(row[6]));
-			e.spell            = static_cast<int32_t>(atoi(row[7]));
-			e.spell_type       = static_cast<int32_t>(atoi(row[8]));
-			e.recast_time      = static_cast<int32_t>(atoi(row[9]));
-			e.expansion        = static_cast<int32_t>(atoi(row[10]));
-			e.prev_id          = static_cast<int32_t>(atoi(row[11]));
-			e.next_id          = static_cast<int32_t>(atoi(row[12]));
+			e.id               = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.upper_hotkey_sid = row[1] ? static_cast<int32_t>(atoi(row[1])) : -1;
+			e.lower_hotkey_sid = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.title_sid        = row[3] ? static_cast<int32_t>(atoi(row[3])) : -1;
+			e.desc_sid         = row[4] ? static_cast<int32_t>(atoi(row[4])) : -1;
+			e.cost             = row[5] ? static_cast<int32_t>(atoi(row[5])) : 1;
+			e.level_req        = row[6] ? static_cast<int32_t>(atoi(row[6])) : 51;
+			e.spell            = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
+			e.spell_type       = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
+			e.recast_time      = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.expansion        = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.prev_id          = row[11] ? static_cast<int32_t>(atoi(row[11])) : -1;
+			e.next_id          = row[12] ? static_cast<int32_t>(atoi(row[12])) : -1;

 			return e;
 		}
@@ -330,19 +331,19 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaRanks e{};

-			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.upper_hotkey_sid = static_cast<int32_t>(atoi(row[1]));
-			e.lower_hotkey_sid = static_cast<int32_t>(atoi(row[2]));
-			e.title_sid        = static_cast<int32_t>(atoi(row[3]));
-			e.desc_sid         = static_cast<int32_t>(atoi(row[4]));
-			e.cost             = static_cast<int32_t>(atoi(row[5]));
-			e.level_req        = static_cast<int32_t>(atoi(row[6]));
-			e.spell            = static_cast<int32_t>(atoi(row[7]));
-			e.spell_type       = static_cast<int32_t>(atoi(row[8]));
-			e.recast_time      = static_cast<int32_t>(atoi(row[9]));
-			e.expansion        = static_cast<int32_t>(atoi(row[10]));
-			e.prev_id          = static_cast<int32_t>(atoi(row[11]));
-			e.next_id          = static_cast<int32_t>(atoi(row[12]));
+			e.id               = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.upper_hotkey_sid = row[1] ? static_cast<int32_t>(atoi(row[1])) : -1;
+			e.lower_hotkey_sid = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.title_sid        = row[3] ? static_cast<int32_t>(atoi(row[3])) : -1;
+			e.desc_sid         = row[4] ? static_cast<int32_t>(atoi(row[4])) : -1;
+			e.cost             = row[5] ? static_cast<int32_t>(atoi(row[5])) : 1;
+			e.level_req        = row[6] ? static_cast<int32_t>(atoi(row[6])) : 51;
+			e.spell            = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
+			e.spell_type       = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
+			e.recast_time      = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.expansion        = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.prev_id          = row[11] ? static_cast<int32_t>(atoi(row[11])) : -1;
+			e.next_id          = row[12] ? static_cast<int32_t>(atoi(row[12])) : -1;

 			all_entries.push_back(e);
 		}
@@ -367,19 +368,19 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AaRanks e{};

-			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.upper_hotkey_sid = static_cast<int32_t>(atoi(row[1]));
-			e.lower_hotkey_sid = static_cast<int32_t>(atoi(row[2]));
-			e.title_sid        = static_cast<int32_t>(atoi(row[3]));
-			e.desc_sid         = static_cast<int32_t>(atoi(row[4]));
-			e.cost             = static_cast<int32_t>(atoi(row[5]));
-			e.level_req        = static_cast<int32_t>(atoi(row[6]));
-			e.spell            = static_cast<int32_t>(atoi(row[7]));
-			e.spell_type       = static_cast<int32_t>(atoi(row[8]));
-			e.recast_time      = static_cast<int32_t>(atoi(row[9]));
-			e.expansion        = static_cast<int32_t>(atoi(row[10]));
-			e.prev_id          = static_cast<int32_t>(atoi(row[11]));
-			e.next_id          = static_cast<int32_t>(atoi(row[12]));
+			e.id               = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.upper_hotkey_sid = row[1] ? static_cast<int32_t>(atoi(row[1])) : -1;
+			e.lower_hotkey_sid = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.title_sid        = row[3] ? static_cast<int32_t>(atoi(row[3])) : -1;
+			e.desc_sid         = row[4] ? static_cast<int32_t>(atoi(row[4])) : -1;
+			e.cost             = row[5] ? static_cast<int32_t>(atoi(row[5])) : 1;
+			e.level_req        = row[6] ? static_cast<int32_t>(atoi(row[6])) : 51;
+			e.spell            = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
+			e.spell_type       = row[8] ? static_cast<int32_t>(atoi(row[8])) : 0;
+			e.recast_time      = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.expansion        = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.prev_id          = row[11] ? static_cast<int32_t>(atoi(row[11])) : -1;
+			e.next_id          = row[12] ? static_cast<int32_t>(atoi(row[12])) : -1;

 			all_entries.push_back(e);
 		}
@@ -438,6 +439,86 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AaRanks &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.upper_hotkey_sid));
+		v.push_back(std::to_string(e.lower_hotkey_sid));
+		v.push_back(std::to_string(e.title_sid));
+		v.push_back(std::to_string(e.desc_sid));
+		v.push_back(std::to_string(e.cost));
+		v.push_back(std::to_string(e.level_req));
+		v.push_back(std::to_string(e.spell));
+		v.push_back(std::to_string(e.spell_type));
+		v.push_back(std::to_string(e.recast_time));
+		v.push_back(std::to_string(e.expansion));
+		v.push_back(std::to_string(e.prev_id));
+		v.push_back(std::to_string(e.next_id));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AaRanks> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.upper_hotkey_sid));
+			v.push_back(std::to_string(e.lower_hotkey_sid));
+			v.push_back(std::to_string(e.title_sid));
+			v.push_back(std::to_string(e.desc_sid));
+			v.push_back(std::to_string(e.cost));
+			v.push_back(std::to_string(e.level_req));
+			v.push_back(std::to_string(e.spell));
+			v.push_back(std::to_string(e.spell_type));
+			v.push_back(std::to_string(e.recast_time));
+			v.push_back(std::to_string(e.expansion));
+			v.push_back(std::to_string(e.prev_id));
+			v.push_back(std::to_string(e.next_id));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_AA_RANKS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ACCOUNT_FLAGS_REPOSITORY_H
@@ -112,8 +112,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				account_flags_id
 			)
 		);
@@ -122,7 +123,7 @@ public:
 		if (results.RowCount() == 1) {
 			AccountFlags e{};

-			e.p_accid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.p_accid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.p_flag  = row[1] ? row[1] : "";
 			e.p_value = row[2] ? row[2] : "";

@@ -250,7 +251,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AccountFlags e{};

-			e.p_accid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.p_accid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.p_flag  = row[1] ? row[1] : "";
 			e.p_value = row[2] ? row[2] : "";

@@ -277,7 +278,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AccountFlags e{};

-			e.p_accid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.p_accid = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.p_flag  = row[1] ? row[1] : "";
 			e.p_value = row[2] ? row[2] : "";

@@ -338,6 +339,66 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AccountFlags &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.p_accid));
+		v.push_back("'" + Strings::Escape(e.p_flag) + "'");
+		v.push_back("'" + Strings::Escape(e.p_value) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AccountFlags> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.p_accid));
+			v.push_back("'" + Strings::Escape(e.p_flag) + "'");
+			v.push_back("'" + Strings::Escape(e.p_value) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ACCOUNT_FLAGS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ACCOUNT_IP_REPOSITORY_H
@@ -116,8 +116,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				account_ip_id
 			)
 		);
@@ -126,10 +127,10 @@ public:
 		if (results.RowCount() == 1) {
 			AccountIp e{};

-			e.accid    = static_cast<int32_t>(atoi(row[0]));
+			e.accid    = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.ip       = row[1] ? row[1] : "";
-			e.count    = static_cast<int32_t>(atoi(row[2]));
-			e.lastused = row[3] ? row[3] : "";
+			e.count    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 1;
+			e.lastused = row[3] ? row[3] : std::time(nullptr);

 			return e;
 		}
@@ -258,10 +259,10 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AccountIp e{};

-			e.accid    = static_cast<int32_t>(atoi(row[0]));
+			e.accid    = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.ip       = row[1] ? row[1] : "";
-			e.count    = static_cast<int32_t>(atoi(row[2]));
-			e.lastused = row[3] ? row[3] : "";
+			e.count    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 1;
+			e.lastused = row[3] ? row[3] : std::time(nullptr);

 			all_entries.push_back(e);
 		}
@@ -286,10 +287,10 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AccountIp e{};

-			e.accid    = static_cast<int32_t>(atoi(row[0]));
+			e.accid    = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.ip       = row[1] ? row[1] : "";
-			e.count    = static_cast<int32_t>(atoi(row[2]));
-			e.lastused = row[3] ? row[3] : "";
+			e.count    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 1;
+			e.lastused = row[3] ? row[3] : std::time(nullptr);

 			all_entries.push_back(e);
 		}
@@ -348,6 +349,68 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AccountIp &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.accid));
+		v.push_back("'" + Strings::Escape(e.ip) + "'");
+		v.push_back(std::to_string(e.count));
+		v.push_back("'" + Strings::Escape(e.lastused) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AccountIp> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.accid));
+			v.push_back("'" + Strings::Escape(e.ip) + "'");
+			v.push_back(std::to_string(e.count));
+			v.push_back("'" + Strings::Escape(e.lastused) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ACCOUNT_IP_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ACCOUNT_REPOSITORY_H
@@ -196,8 +196,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				account_id
 			)
 		);
@@ -206,25 +207,25 @@ public:
 		if (results.RowCount() == 1) {
 			Account e{};

-			e.id             = static_cast<int32_t>(atoi(row[0]));
+			e.id             = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.name           = row[1] ? row[1] : "";
 			e.charname       = row[2] ? row[2] : "";
-			e.sharedplat     = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.sharedplat     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.password       = row[4] ? row[4] : "";
-			e.status         = static_cast<int32_t>(atoi(row[5]));
-			e.ls_id          = row[6] ? row[6] : "";
-			e.lsaccount_id   = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.gmspeed        = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-			e.invulnerable   = static_cast<int8_t>(atoi(row[9]));
-			e.flymode        = static_cast<int8_t>(atoi(row[10]));
-			e.ignore_tells   = static_cast<int8_t>(atoi(row[11]));
-			e.revoked        = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
-			e.karma          = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
+			e.status         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
+			e.ls_id          = row[6] ? row[6] : "eqemu";
+			e.lsaccount_id   = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.gmspeed        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.invulnerable   = row[9] ? static_cast<int8_t>(atoi(row[9])) : 0;
+			e.flymode        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.ignore_tells   = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
+			e.revoked        = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.karma          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
 			e.minilogin_ip   = row[14] ? row[14] : "";
-			e.hideme         = static_cast<int8_t>(atoi(row[15]));
-			e.rulesflag      = static_cast<uint8_t>(strtoul(row[16], nullptr, 10));
+			e.hideme         = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;
+			e.rulesflag      = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
 			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
-			e.time_creation  = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
+			e.time_creation  = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
 			e.ban_reason     = row[19] ? row[19] : "";
 			e.suspend_reason = row[20] ? row[20] : "";
 			e.crc_eqgame     = row[21] ? row[21] : "";
@@ -417,25 +418,25 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Account e{};

-			e.id             = static_cast<int32_t>(atoi(row[0]));
+			e.id             = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.name           = row[1] ? row[1] : "";
 			e.charname       = row[2] ? row[2] : "";
-			e.sharedplat     = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.sharedplat     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.password       = row[4] ? row[4] : "";
-			e.status         = static_cast<int32_t>(atoi(row[5]));
-			e.ls_id          = row[6] ? row[6] : "";
-			e.lsaccount_id   = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.gmspeed        = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-			e.invulnerable   = static_cast<int8_t>(atoi(row[9]));
-			e.flymode        = static_cast<int8_t>(atoi(row[10]));
-			e.ignore_tells   = static_cast<int8_t>(atoi(row[11]));
-			e.revoked        = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
-			e.karma          = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
+			e.status         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
+			e.ls_id          = row[6] ? row[6] : "eqemu";
+			e.lsaccount_id   = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.gmspeed        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.invulnerable   = row[9] ? static_cast<int8_t>(atoi(row[9])) : 0;
+			e.flymode        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.ignore_tells   = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
+			e.revoked        = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.karma          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
 			e.minilogin_ip   = row[14] ? row[14] : "";
-			e.hideme         = static_cast<int8_t>(atoi(row[15]));
-			e.rulesflag      = static_cast<uint8_t>(strtoul(row[16], nullptr, 10));
+			e.hideme         = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;
+			e.rulesflag      = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
 			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
-			e.time_creation  = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
+			e.time_creation  = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
 			e.ban_reason     = row[19] ? row[19] : "";
 			e.suspend_reason = row[20] ? row[20] : "";
 			e.crc_eqgame     = row[21] ? row[21] : "";
@@ -465,25 +466,25 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Account e{};

-			e.id             = static_cast<int32_t>(atoi(row[0]));
+			e.id             = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.name           = row[1] ? row[1] : "";
 			e.charname       = row[2] ? row[2] : "";
-			e.sharedplat     = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.sharedplat     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.password       = row[4] ? row[4] : "";
-			e.status         = static_cast<int32_t>(atoi(row[5]));
-			e.ls_id          = row[6] ? row[6] : "";
-			e.lsaccount_id   = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.gmspeed        = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-			e.invulnerable   = static_cast<int8_t>(atoi(row[9]));
-			e.flymode        = static_cast<int8_t>(atoi(row[10]));
-			e.ignore_tells   = static_cast<int8_t>(atoi(row[11]));
-			e.revoked        = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
-			e.karma          = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
+			e.status         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
+			e.ls_id          = row[6] ? row[6] : "eqemu";
+			e.lsaccount_id   = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.gmspeed        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.invulnerable   = row[9] ? static_cast<int8_t>(atoi(row[9])) : 0;
+			e.flymode        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.ignore_tells   = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
+			e.revoked        = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.karma          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
 			e.minilogin_ip   = row[14] ? row[14] : "";
-			e.hideme         = static_cast<int8_t>(atoi(row[15]));
-			e.rulesflag      = static_cast<uint8_t>(strtoul(row[16], nullptr, 10));
+			e.hideme         = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;
+			e.rulesflag      = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
 			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
-			e.time_creation  = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
+			e.time_creation  = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
 			e.ban_reason     = row[19] ? row[19] : "";
 			e.suspend_reason = row[20] ? row[20] : "";
 			e.crc_eqgame     = row[21] ? row[21] : "";
@@ -547,6 +548,108 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const Account &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back("'" + Strings::Escape(e.charname) + "'");
+		v.push_back(std::to_string(e.sharedplat));
+		v.push_back("'" + Strings::Escape(e.password) + "'");
+		v.push_back(std::to_string(e.status));
+		v.push_back("'" + Strings::Escape(e.ls_id) + "'");
+		v.push_back(std::to_string(e.lsaccount_id));
+		v.push_back(std::to_string(e.gmspeed));
+		v.push_back(std::to_string(e.invulnerable));
+		v.push_back(std::to_string(e.flymode));
+		v.push_back(std::to_string(e.ignore_tells));
+		v.push_back(std::to_string(e.revoked));
+		v.push_back(std::to_string(e.karma));
+		v.push_back("'" + Strings::Escape(e.minilogin_ip) + "'");
+		v.push_back(std::to_string(e.hideme));
+		v.push_back(std::to_string(e.rulesflag));
+		v.push_back("FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
+		v.push_back(std::to_string(e.time_creation));
+		v.push_back("'" + Strings::Escape(e.ban_reason) + "'");
+		v.push_back("'" + Strings::Escape(e.suspend_reason) + "'");
+		v.push_back("'" + Strings::Escape(e.crc_eqgame) + "'");
+		v.push_back("'" + Strings::Escape(e.crc_skillcaps) + "'");
+		v.push_back("'" + Strings::Escape(e.crc_basedata) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<Account> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back("'" + Strings::Escape(e.charname) + "'");
+			v.push_back(std::to_string(e.sharedplat));
+			v.push_back("'" + Strings::Escape(e.password) + "'");
+			v.push_back(std::to_string(e.status));
+			v.push_back("'" + Strings::Escape(e.ls_id) + "'");
+			v.push_back(std::to_string(e.lsaccount_id));
+			v.push_back(std::to_string(e.gmspeed));
+			v.push_back(std::to_string(e.invulnerable));
+			v.push_back(std::to_string(e.flymode));
+			v.push_back(std::to_string(e.ignore_tells));
+			v.push_back(std::to_string(e.revoked));
+			v.push_back(std::to_string(e.karma));
+			v.push_back("'" + Strings::Escape(e.minilogin_ip) + "'");
+			v.push_back(std::to_string(e.hideme));
+			v.push_back(std::to_string(e.rulesflag));
+			v.push_back("FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
+			v.push_back(std::to_string(e.time_creation));
+			v.push_back("'" + Strings::Escape(e.ban_reason) + "'");
+			v.push_back("'" + Strings::Escape(e.suspend_reason) + "'");
+			v.push_back("'" + Strings::Escape(e.crc_eqgame) + "'");
+			v.push_back("'" + Strings::Escape(e.crc_skillcaps) + "'");
+			v.push_back("'" + Strings::Escape(e.crc_basedata) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ACCOUNT_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ACCOUNT_REWARDS_REPOSITORY_H
@@ -112,8 +112,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				account_rewards_id
 			)
 		);
@@ -122,9 +123,9 @@ public:
 		if (results.RowCount() == 1) {
 			AccountRewards e{};

-			e.account_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.reward_id  = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.amount     = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.account_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.reward_id  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.amount     = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;

 			return e;
 		}
@@ -250,9 +251,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AccountRewards e{};

-			e.account_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.reward_id  = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.amount     = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.account_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.reward_id  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.amount     = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -277,9 +278,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AccountRewards e{};

-			e.account_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.reward_id  = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.amount     = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.account_id = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.reward_id  = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.amount     = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -338,6 +339,66 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AccountRewards &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.account_id));
+		v.push_back(std::to_string(e.reward_id));
+		v.push_back(std::to_string(e.amount));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AccountRewards> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.account_id));
+			v.push_back(std::to_string(e.reward_id));
+			v.push_back(std::to_string(e.amount));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ACCOUNT_REWARDS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ADVENTURE_DETAILS_REPOSITORY_H
@@ -136,8 +136,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				adventure_details_id
 			)
 		);
@@ -146,15 +147,15 @@ public:
 		if (results.RowCount() == 1) {
 			AdventureDetails e{};

-			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.adventure_id      = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
-			e.instance_id       = static_cast<int32_t>(atoi(row[2]));
-			e.count             = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
-			e.assassinate_count = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
-			e.status            = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.time_created      = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.time_zoned        = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.time_completed    = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.adventure_id      = row[1] ? static_cast<uint16_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.instance_id       = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.count             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.assassinate_count = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.status            = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.time_created      = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.time_zoned        = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.time_completed    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;

 			return e;
 		}
@@ -297,15 +298,15 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureDetails e{};

-			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.adventure_id      = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
-			e.instance_id       = static_cast<int32_t>(atoi(row[2]));
-			e.count             = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
-			e.assassinate_count = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
-			e.status            = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.time_created      = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.time_zoned        = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.time_completed    = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.adventure_id      = row[1] ? static_cast<uint16_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.instance_id       = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.count             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.assassinate_count = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.status            = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.time_created      = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.time_zoned        = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.time_completed    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -330,15 +331,15 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureDetails e{};

-			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.adventure_id      = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
-			e.instance_id       = static_cast<int32_t>(atoi(row[2]));
-			e.count             = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
-			e.assassinate_count = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
-			e.status            = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.time_created      = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.time_zoned        = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.time_completed    = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.adventure_id      = row[1] ? static_cast<uint16_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.instance_id       = row[2] ? static_cast<int32_t>(atoi(row[2])) : -1;
+			e.count             = row[3] ? static_cast<uint16_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.assassinate_count = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.status            = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.time_created      = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.time_zoned        = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.time_completed    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -397,6 +398,78 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AdventureDetails &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.adventure_id));
+		v.push_back(std::to_string(e.instance_id));
+		v.push_back(std::to_string(e.count));
+		v.push_back(std::to_string(e.assassinate_count));
+		v.push_back(std::to_string(e.status));
+		v.push_back(std::to_string(e.time_created));
+		v.push_back(std::to_string(e.time_zoned));
+		v.push_back(std::to_string(e.time_completed));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AdventureDetails> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.adventure_id));
+			v.push_back(std::to_string(e.instance_id));
+			v.push_back(std::to_string(e.count));
+			v.push_back(std::to_string(e.assassinate_count));
+			v.push_back(std::to_string(e.status));
+			v.push_back(std::to_string(e.time_created));
+			v.push_back(std::to_string(e.time_zoned));
+			v.push_back(std::to_string(e.time_completed));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ADVENTURE_DETAILS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ADVENTURE_MEMBERS_REPOSITORY_H
@@ -108,8 +108,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				adventure_members_id
 			)
 		);
@@ -118,8 +119,8 @@ public:
 		if (results.RowCount() == 1) {
 			AdventureMembers e{};

-			e.id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.charid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.charid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			return e;
 		}
@@ -242,8 +243,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureMembers e{};

-			e.id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.charid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.charid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -268,8 +269,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureMembers e{};

-			e.id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.charid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.charid = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -328,6 +329,64 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AdventureMembers &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.charid));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AdventureMembers> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.charid));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ADVENTURE_MEMBERS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ADVENTURE_STATS_REPOSITORY_H
@@ -144,8 +144,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				adventure_stats_id
 			)
 		);
@@ -154,17 +155,17 @@ public:
 		if (results.RowCount() == 1) {
 			AdventureStats e{};

-			e.player_id  = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.guk_wins   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.mir_wins   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.mmc_wins   = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.ruj_wins   = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.tak_wins   = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.guk_losses = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.mir_losses = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.mmc_losses = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.ruj_losses = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.tak_losses = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
+			e.player_id  = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.guk_wins   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.mir_wins   = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.mmc_wins   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.ruj_wins   = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.tak_wins   = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.guk_losses = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.mir_losses = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.mmc_losses = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.ruj_losses = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.tak_losses = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;

 			return e;
 		}
@@ -314,17 +315,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureStats e{};

-			e.player_id  = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.guk_wins   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.mir_wins   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.mmc_wins   = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.ruj_wins   = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.tak_wins   = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.guk_losses = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.mir_losses = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.mmc_losses = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.ruj_losses = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.tak_losses = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
+			e.player_id  = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.guk_wins   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.mir_wins   = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.mmc_wins   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.ruj_wins   = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.tak_wins   = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.guk_losses = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.mir_losses = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.mmc_losses = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.ruj_losses = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.tak_losses = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -349,17 +350,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureStats e{};

-			e.player_id  = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.guk_wins   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.mir_wins   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.mmc_wins   = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.ruj_wins   = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.tak_wins   = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.guk_losses = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.mir_losses = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.mmc_losses = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.ruj_losses = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.tak_losses = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
+			e.player_id  = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.guk_wins   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.mir_wins   = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.mmc_wins   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.ruj_wins   = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.tak_wins   = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.guk_losses = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.mir_losses = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.mmc_losses = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.ruj_losses = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.tak_losses = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -418,6 +419,82 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AdventureStats &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.player_id));
+		v.push_back(std::to_string(e.guk_wins));
+		v.push_back(std::to_string(e.mir_wins));
+		v.push_back(std::to_string(e.mmc_wins));
+		v.push_back(std::to_string(e.ruj_wins));
+		v.push_back(std::to_string(e.tak_wins));
+		v.push_back(std::to_string(e.guk_losses));
+		v.push_back(std::to_string(e.mir_losses));
+		v.push_back(std::to_string(e.mmc_losses));
+		v.push_back(std::to_string(e.ruj_losses));
+		v.push_back(std::to_string(e.tak_losses));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AdventureStats> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.player_id));
+			v.push_back(std::to_string(e.guk_wins));
+			v.push_back(std::to_string(e.mir_wins));
+			v.push_back(std::to_string(e.mmc_wins));
+			v.push_back(std::to_string(e.ruj_wins));
+			v.push_back(std::to_string(e.tak_wins));
+			v.push_back(std::to_string(e.guk_losses));
+			v.push_back(std::to_string(e.mir_losses));
+			v.push_back(std::to_string(e.mmc_losses));
+			v.push_back(std::to_string(e.ruj_losses));
+			v.push_back(std::to_string(e.tak_losses));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ADVENTURE_STATS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H
@@ -108,8 +108,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				adventure_template_entry_flavor_id
 			)
 		);
@@ -118,7 +119,7 @@ public:
 		if (results.RowCount() == 1) {
 			AdventureTemplateEntryFlavor e{};

-			e.id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.id   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.text = row[1] ? row[1] : "";

 			return e;
@@ -242,7 +243,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureTemplateEntryFlavor e{};

-			e.id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.id   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.text = row[1] ? row[1] : "";

 			all_entries.push_back(e);
@@ -268,7 +269,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureTemplateEntryFlavor e{};

-			e.id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.id   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.text = row[1] ? row[1] : "";

 			all_entries.push_back(e);
@@ -328,6 +329,64 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AdventureTemplateEntryFlavor &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.text) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AdventureTemplateEntryFlavor> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.text) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_REPOSITORY_H
@@ -108,8 +108,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				adventure_template_entry_id
 			)
 		);
@@ -118,8 +119,8 @@ public:
 		if (results.RowCount() == 1) {
 			AdventureTemplateEntry e{};

-			e.id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.template_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.template_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			return e;
 		}
@@ -242,8 +243,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureTemplateEntry e{};

-			e.id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.template_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.template_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -268,8 +269,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureTemplateEntry e{};

-			e.id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.template_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.template_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -328,6 +329,64 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AdventureTemplateEntry &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.template_id));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AdventureTemplateEntry> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.template_id));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ADVENTURE_TEMPLATE_REPOSITORY_H
@@ -232,8 +232,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				adventure_template_id
 			)
 		);
@@ -242,38 +243,38 @@ public:
 		if (results.RowCount() == 1) {
 			AdventureTemplate e{};

-			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.zone              = row[1] ? row[1] : "";
-			e.zone_version      = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.is_hard           = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.is_raid           = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.min_level         = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.max_level         = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
-			e.type              = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.type_data         = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.type_count        = static_cast<uint16_t>(strtoul(row[9], nullptr, 10));
-			e.assa_x            = strtof(row[10], nullptr);
-			e.assa_y            = strtof(row[11], nullptr);
-			e.assa_z            = strtof(row[12], nullptr);
-			e.assa_h            = strtof(row[13], nullptr);
+			e.zone_version      = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.is_hard           = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.is_raid           = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.min_level         = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 1;
+			e.max_level         = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 65;
+			e.type              = row[7] ? static_cast<uint8_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.type_data         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.type_count        = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.assa_x            = row[10] ? strtof(row[10], nullptr) : 0;
+			e.assa_y            = row[11] ? strtof(row[11], nullptr) : 0;
+			e.assa_z            = row[12] ? strtof(row[12], nullptr) : 0;
+			e.assa_h            = row[13] ? strtof(row[13], nullptr) : 0;
 			e.text              = row[14] ? row[14] : "";
-			e.duration          = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.zone_in_time      = static_cast<uint32_t>(strtoul(row[16], nullptr, 10));
-			e.win_points        = static_cast<uint16_t>(strtoul(row[17], nullptr, 10));
-			e.lose_points       = static_cast<uint16_t>(strtoul(row[18], nullptr, 10));
-			e.theme             = static_cast<uint8_t>(strtoul(row[19], nullptr, 10));
-			e.zone_in_zone_id   = static_cast<uint16_t>(strtoul(row[20], nullptr, 10));
-			e.zone_in_x         = strtof(row[21], nullptr);
-			e.zone_in_y         = strtof(row[22], nullptr);
-			e.zone_in_object_id = static_cast<int16_t>(atoi(row[23]));
-			e.dest_x            = strtof(row[24], nullptr);
-			e.dest_y            = strtof(row[25], nullptr);
-			e.dest_z            = strtof(row[26], nullptr);
-			e.dest_h            = strtof(row[27], nullptr);
-			e.graveyard_zone_id = static_cast<uint32_t>(strtoul(row[28], nullptr, 10));
-			e.graveyard_x       = strtof(row[29], nullptr);
-			e.graveyard_y       = strtof(row[30], nullptr);
-			e.graveyard_z       = strtof(row[31], nullptr);
+			e.duration          = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 7200;
+			e.zone_in_time      = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 1800;
+			e.win_points        = row[17] ? static_cast<uint16_t>(strtoul(row[17], nullptr, 10)) : 0;
+			e.lose_points       = row[18] ? static_cast<uint16_t>(strtoul(row[18], nullptr, 10)) : 0;
+			e.theme             = row[19] ? static_cast<uint8_t>(strtoul(row[19], nullptr, 10)) : 1;
+			e.zone_in_zone_id   = row[20] ? static_cast<uint16_t>(strtoul(row[20], nullptr, 10)) : 0;
+			e.zone_in_x         = row[21] ? strtof(row[21], nullptr) : 0;
+			e.zone_in_y         = row[22] ? strtof(row[22], nullptr) : 0;
+			e.zone_in_object_id = row[23] ? static_cast<int16_t>(atoi(row[23])) : 0;
+			e.dest_x            = row[24] ? strtof(row[24], nullptr) : 0;
+			e.dest_y            = row[25] ? strtof(row[25], nullptr) : 0;
+			e.dest_z            = row[26] ? strtof(row[26], nullptr) : 0;
+			e.dest_h            = row[27] ? strtof(row[27], nullptr) : 0;
+			e.graveyard_zone_id = row[28] ? static_cast<uint32_t>(strtoul(row[28], nullptr, 10)) : 0;
+			e.graveyard_x       = row[29] ? strtof(row[29], nullptr) : 0;
+			e.graveyard_y       = row[30] ? strtof(row[30], nullptr) : 0;
+			e.graveyard_z       = row[31] ? strtof(row[31], nullptr) : 0;

 			return e;
 		}
@@ -489,38 +490,38 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureTemplate e{};

-			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.zone              = row[1] ? row[1] : "";
-			e.zone_version      = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.is_hard           = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.is_raid           = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.min_level         = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.max_level         = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
-			e.type              = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.type_data         = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.type_count        = static_cast<uint16_t>(strtoul(row[9], nullptr, 10));
-			e.assa_x            = strtof(row[10], nullptr);
-			e.assa_y            = strtof(row[11], nullptr);
-			e.assa_z            = strtof(row[12], nullptr);
-			e.assa_h            = strtof(row[13], nullptr);
+			e.zone_version      = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.is_hard           = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.is_raid           = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.min_level         = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 1;
+			e.max_level         = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 65;
+			e.type              = row[7] ? static_cast<uint8_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.type_data         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.type_count        = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.assa_x            = row[10] ? strtof(row[10], nullptr) : 0;
+			e.assa_y            = row[11] ? strtof(row[11], nullptr) : 0;
+			e.assa_z            = row[12] ? strtof(row[12], nullptr) : 0;
+			e.assa_h            = row[13] ? strtof(row[13], nullptr) : 0;
 			e.text              = row[14] ? row[14] : "";
-			e.duration          = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.zone_in_time      = static_cast<uint32_t>(strtoul(row[16], nullptr, 10));
-			e.win_points        = static_cast<uint16_t>(strtoul(row[17], nullptr, 10));
-			e.lose_points       = static_cast<uint16_t>(strtoul(row[18], nullptr, 10));
-			e.theme             = static_cast<uint8_t>(strtoul(row[19], nullptr, 10));
-			e.zone_in_zone_id   = static_cast<uint16_t>(strtoul(row[20], nullptr, 10));
-			e.zone_in_x         = strtof(row[21], nullptr);
-			e.zone_in_y         = strtof(row[22], nullptr);
-			e.zone_in_object_id = static_cast<int16_t>(atoi(row[23]));
-			e.dest_x            = strtof(row[24], nullptr);
-			e.dest_y            = strtof(row[25], nullptr);
-			e.dest_z            = strtof(row[26], nullptr);
-			e.dest_h            = strtof(row[27], nullptr);
-			e.graveyard_zone_id = static_cast<uint32_t>(strtoul(row[28], nullptr, 10));
-			e.graveyard_x       = strtof(row[29], nullptr);
-			e.graveyard_y       = strtof(row[30], nullptr);
-			e.graveyard_z       = strtof(row[31], nullptr);
+			e.duration          = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 7200;
+			e.zone_in_time      = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 1800;
+			e.win_points        = row[17] ? static_cast<uint16_t>(strtoul(row[17], nullptr, 10)) : 0;
+			e.lose_points       = row[18] ? static_cast<uint16_t>(strtoul(row[18], nullptr, 10)) : 0;
+			e.theme             = row[19] ? static_cast<uint8_t>(strtoul(row[19], nullptr, 10)) : 1;
+			e.zone_in_zone_id   = row[20] ? static_cast<uint16_t>(strtoul(row[20], nullptr, 10)) : 0;
+			e.zone_in_x         = row[21] ? strtof(row[21], nullptr) : 0;
+			e.zone_in_y         = row[22] ? strtof(row[22], nullptr) : 0;
+			e.zone_in_object_id = row[23] ? static_cast<int16_t>(atoi(row[23])) : 0;
+			e.dest_x            = row[24] ? strtof(row[24], nullptr) : 0;
+			e.dest_y            = row[25] ? strtof(row[25], nullptr) : 0;
+			e.dest_z            = row[26] ? strtof(row[26], nullptr) : 0;
+			e.dest_h            = row[27] ? strtof(row[27], nullptr) : 0;
+			e.graveyard_zone_id = row[28] ? static_cast<uint32_t>(strtoul(row[28], nullptr, 10)) : 0;
+			e.graveyard_x       = row[29] ? strtof(row[29], nullptr) : 0;
+			e.graveyard_y       = row[30] ? strtof(row[30], nullptr) : 0;
+			e.graveyard_z       = row[31] ? strtof(row[31], nullptr) : 0;

 			all_entries.push_back(e);
 		}
@@ -545,38 +546,38 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AdventureTemplate e{};

-			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.id                = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.zone              = row[1] ? row[1] : "";
-			e.zone_version      = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.is_hard           = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.is_raid           = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.min_level         = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.max_level         = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
-			e.type              = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.type_data         = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.type_count        = static_cast<uint16_t>(strtoul(row[9], nullptr, 10));
-			e.assa_x            = strtof(row[10], nullptr);
-			e.assa_y            = strtof(row[11], nullptr);
-			e.assa_z            = strtof(row[12], nullptr);
-			e.assa_h            = strtof(row[13], nullptr);
+			e.zone_version      = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.is_hard           = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.is_raid           = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.min_level         = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 1;
+			e.max_level         = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 65;
+			e.type              = row[7] ? static_cast<uint8_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.type_data         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.type_count        = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.assa_x            = row[10] ? strtof(row[10], nullptr) : 0;
+			e.assa_y            = row[11] ? strtof(row[11], nullptr) : 0;
+			e.assa_z            = row[12] ? strtof(row[12], nullptr) : 0;
+			e.assa_h            = row[13] ? strtof(row[13], nullptr) : 0;
 			e.text              = row[14] ? row[14] : "";
-			e.duration          = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.zone_in_time      = static_cast<uint32_t>(strtoul(row[16], nullptr, 10));
-			e.win_points        = static_cast<uint16_t>(strtoul(row[17], nullptr, 10));
-			e.lose_points       = static_cast<uint16_t>(strtoul(row[18], nullptr, 10));
-			e.theme             = static_cast<uint8_t>(strtoul(row[19], nullptr, 10));
-			e.zone_in_zone_id   = static_cast<uint16_t>(strtoul(row[20], nullptr, 10));
-			e.zone_in_x         = strtof(row[21], nullptr);
-			e.zone_in_y         = strtof(row[22], nullptr);
-			e.zone_in_object_id = static_cast<int16_t>(atoi(row[23]));
-			e.dest_x            = strtof(row[24], nullptr);
-			e.dest_y            = strtof(row[25], nullptr);
-			e.dest_z            = strtof(row[26], nullptr);
-			e.dest_h            = strtof(row[27], nullptr);
-			e.graveyard_zone_id = static_cast<uint32_t>(strtoul(row[28], nullptr, 10));
-			e.graveyard_x       = strtof(row[29], nullptr);
-			e.graveyard_y       = strtof(row[30], nullptr);
-			e.graveyard_z       = strtof(row[31], nullptr);
+			e.duration          = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 7200;
+			e.zone_in_time      = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 1800;
+			e.win_points        = row[17] ? static_cast<uint16_t>(strtoul(row[17], nullptr, 10)) : 0;
+			e.lose_points       = row[18] ? static_cast<uint16_t>(strtoul(row[18], nullptr, 10)) : 0;
+			e.theme             = row[19] ? static_cast<uint8_t>(strtoul(row[19], nullptr, 10)) : 1;
+			e.zone_in_zone_id   = row[20] ? static_cast<uint16_t>(strtoul(row[20], nullptr, 10)) : 0;
+			e.zone_in_x         = row[21] ? strtof(row[21], nullptr) : 0;
+			e.zone_in_y         = row[22] ? strtof(row[22], nullptr) : 0;
+			e.zone_in_object_id = row[23] ? static_cast<int16_t>(atoi(row[23])) : 0;
+			e.dest_x            = row[24] ? strtof(row[24], nullptr) : 0;
+			e.dest_y            = row[25] ? strtof(row[25], nullptr) : 0;
+			e.dest_z            = row[26] ? strtof(row[26], nullptr) : 0;
+			e.dest_h            = row[27] ? strtof(row[27], nullptr) : 0;
+			e.graveyard_zone_id = row[28] ? static_cast<uint32_t>(strtoul(row[28], nullptr, 10)) : 0;
+			e.graveyard_x       = row[29] ? strtof(row[29], nullptr) : 0;
+			e.graveyard_y       = row[30] ? strtof(row[30], nullptr) : 0;
+			e.graveyard_z       = row[31] ? strtof(row[31], nullptr) : 0;

 			all_entries.push_back(e);
 		}
@@ -635,6 +636,126 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AdventureTemplate &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.zone) + "'");
+		v.push_back(std::to_string(e.zone_version));
+		v.push_back(std::to_string(e.is_hard));
+		v.push_back(std::to_string(e.is_raid));
+		v.push_back(std::to_string(e.min_level));
+		v.push_back(std::to_string(e.max_level));
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.type_data));
+		v.push_back(std::to_string(e.type_count));
+		v.push_back(std::to_string(e.assa_x));
+		v.push_back(std::to_string(e.assa_y));
+		v.push_back(std::to_string(e.assa_z));
+		v.push_back(std::to_string(e.assa_h));
+		v.push_back("'" + Strings::Escape(e.text) + "'");
+		v.push_back(std::to_string(e.duration));
+		v.push_back(std::to_string(e.zone_in_time));
+		v.push_back(std::to_string(e.win_points));
+		v.push_back(std::to_string(e.lose_points));
+		v.push_back(std::to_string(e.theme));
+		v.push_back(std::to_string(e.zone_in_zone_id));
+		v.push_back(std::to_string(e.zone_in_x));
+		v.push_back(std::to_string(e.zone_in_y));
+		v.push_back(std::to_string(e.zone_in_object_id));
+		v.push_back(std::to_string(e.dest_x));
+		v.push_back(std::to_string(e.dest_y));
+		v.push_back(std::to_string(e.dest_z));
+		v.push_back(std::to_string(e.dest_h));
+		v.push_back(std::to_string(e.graveyard_zone_id));
+		v.push_back(std::to_string(e.graveyard_x));
+		v.push_back(std::to_string(e.graveyard_y));
+		v.push_back(std::to_string(e.graveyard_z));
+		v.push_back(std::to_string(e.graveyard_radius));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AdventureTemplate> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.zone) + "'");
+			v.push_back(std::to_string(e.zone_version));
+			v.push_back(std::to_string(e.is_hard));
+			v.push_back(std::to_string(e.is_raid));
+			v.push_back(std::to_string(e.min_level));
+			v.push_back(std::to_string(e.max_level));
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.type_data));
+			v.push_back(std::to_string(e.type_count));
+			v.push_back(std::to_string(e.assa_x));
+			v.push_back(std::to_string(e.assa_y));
+			v.push_back(std::to_string(e.assa_z));
+			v.push_back(std::to_string(e.assa_h));
+			v.push_back("'" + Strings::Escape(e.text) + "'");
+			v.push_back(std::to_string(e.duration));
+			v.push_back(std::to_string(e.zone_in_time));
+			v.push_back(std::to_string(e.win_points));
+			v.push_back(std::to_string(e.lose_points));
+			v.push_back(std::to_string(e.theme));
+			v.push_back(std::to_string(e.zone_in_zone_id));
+			v.push_back(std::to_string(e.zone_in_x));
+			v.push_back(std::to_string(e.zone_in_y));
+			v.push_back(std::to_string(e.zone_in_object_id));
+			v.push_back(std::to_string(e.dest_x));
+			v.push_back(std::to_string(e.dest_y));
+			v.push_back(std::to_string(e.dest_z));
+			v.push_back(std::to_string(e.dest_h));
+			v.push_back(std::to_string(e.graveyard_zone_id));
+			v.push_back(std::to_string(e.graveyard_x));
+			v.push_back(std::to_string(e.graveyard_y));
+			v.push_back(std::to_string(e.graveyard_z));
+			v.push_back(std::to_string(e.graveyard_radius));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ADVENTURE_TEMPLATE_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_ALTERNATE_CURRENCY_REPOSITORY_H
@@ -108,8 +108,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				alternate_currency_id
 			)
 		);
@@ -118,8 +119,8 @@ public:
 		if (results.RowCount() == 1) {
 			AlternateCurrency e{};

-			e.id      = static_cast<int32_t>(atoi(row[0]));
-			e.item_id = static_cast<int32_t>(atoi(row[1]));
+			e.id      = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.item_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;

 			return e;
 		}
@@ -242,8 +243,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AlternateCurrency e{};

-			e.id      = static_cast<int32_t>(atoi(row[0]));
-			e.item_id = static_cast<int32_t>(atoi(row[1]));
+			e.id      = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.item_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;

 			all_entries.push_back(e);
 		}
@@ -268,8 +269,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			AlternateCurrency e{};

-			e.id      = static_cast<int32_t>(atoi(row[0]));
-			e.item_id = static_cast<int32_t>(atoi(row[1]));
+			e.id      = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.item_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;

 			all_entries.push_back(e);
 		}
@@ -328,6 +329,64 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const AlternateCurrency &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.item_id));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<AlternateCurrency> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.item_id));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_ALTERNATE_CURRENCY_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_AURAS_REPOSITORY_H
@@ -144,8 +144,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				auras_id
 			)
 		);
@@ -154,17 +155,17 @@ public:
 		if (results.RowCount() == 1) {
 			Auras e{};

-			e.type       = static_cast<int32_t>(atoi(row[0]));
-			e.npc_type   = static_cast<int32_t>(atoi(row[1]));
+			e.type       = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.npc_type   = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
 			e.name       = row[2] ? row[2] : "";
-			e.spell_id   = static_cast<int32_t>(atoi(row[3]));
-			e.distance   = static_cast<int32_t>(atoi(row[4]));
-			e.aura_type  = static_cast<int32_t>(atoi(row[5]));
-			e.spawn_type = static_cast<int32_t>(atoi(row[6]));
-			e.movement   = static_cast<int32_t>(atoi(row[7]));
-			e.duration   = static_cast<int32_t>(atoi(row[8]));
-			e.icon       = static_cast<int32_t>(atoi(row[9]));
-			e.cast_time  = static_cast<int32_t>(atoi(row[10]));
+			e.spell_id   = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.distance   = row[4] ? static_cast<int32_t>(atoi(row[4])) : 60;
+			e.aura_type  = row[5] ? static_cast<int32_t>(atoi(row[5])) : 1;
+			e.spawn_type = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
+			e.movement   = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
+			e.duration   = row[8] ? static_cast<int32_t>(atoi(row[8])) : 5400;
+			e.icon       = row[9] ? static_cast<int32_t>(atoi(row[9])) : -1;
+			e.cast_time  = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;

 			return e;
 		}
@@ -314,17 +315,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Auras e{};

-			e.type       = static_cast<int32_t>(atoi(row[0]));
-			e.npc_type   = static_cast<int32_t>(atoi(row[1]));
+			e.type       = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.npc_type   = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
 			e.name       = row[2] ? row[2] : "";
-			e.spell_id   = static_cast<int32_t>(atoi(row[3]));
-			e.distance   = static_cast<int32_t>(atoi(row[4]));
-			e.aura_type  = static_cast<int32_t>(atoi(row[5]));
-			e.spawn_type = static_cast<int32_t>(atoi(row[6]));
-			e.movement   = static_cast<int32_t>(atoi(row[7]));
-			e.duration   = static_cast<int32_t>(atoi(row[8]));
-			e.icon       = static_cast<int32_t>(atoi(row[9]));
-			e.cast_time  = static_cast<int32_t>(atoi(row[10]));
+			e.spell_id   = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.distance   = row[4] ? static_cast<int32_t>(atoi(row[4])) : 60;
+			e.aura_type  = row[5] ? static_cast<int32_t>(atoi(row[5])) : 1;
+			e.spawn_type = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
+			e.movement   = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
+			e.duration   = row[8] ? static_cast<int32_t>(atoi(row[8])) : 5400;
+			e.icon       = row[9] ? static_cast<int32_t>(atoi(row[9])) : -1;
+			e.cast_time  = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;

 			all_entries.push_back(e);
 		}
@@ -349,17 +350,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Auras e{};

-			e.type       = static_cast<int32_t>(atoi(row[0]));
-			e.npc_type   = static_cast<int32_t>(atoi(row[1]));
+			e.type       = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.npc_type   = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
 			e.name       = row[2] ? row[2] : "";
-			e.spell_id   = static_cast<int32_t>(atoi(row[3]));
-			e.distance   = static_cast<int32_t>(atoi(row[4]));
-			e.aura_type  = static_cast<int32_t>(atoi(row[5]));
-			e.spawn_type = static_cast<int32_t>(atoi(row[6]));
-			e.movement   = static_cast<int32_t>(atoi(row[7]));
-			e.duration   = static_cast<int32_t>(atoi(row[8]));
-			e.icon       = static_cast<int32_t>(atoi(row[9]));
-			e.cast_time  = static_cast<int32_t>(atoi(row[10]));
+			e.spell_id   = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.distance   = row[4] ? static_cast<int32_t>(atoi(row[4])) : 60;
+			e.aura_type  = row[5] ? static_cast<int32_t>(atoi(row[5])) : 1;
+			e.spawn_type = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
+			e.movement   = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
+			e.duration   = row[8] ? static_cast<int32_t>(atoi(row[8])) : 5400;
+			e.icon       = row[9] ? static_cast<int32_t>(atoi(row[9])) : -1;
+			e.cast_time  = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;

 			all_entries.push_back(e);
 		}
@@ -418,6 +419,82 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const Auras &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.npc_type));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back(std::to_string(e.spell_id));
+		v.push_back(std::to_string(e.distance));
+		v.push_back(std::to_string(e.aura_type));
+		v.push_back(std::to_string(e.spawn_type));
+		v.push_back(std::to_string(e.movement));
+		v.push_back(std::to_string(e.duration));
+		v.push_back(std::to_string(e.icon));
+		v.push_back(std::to_string(e.cast_time));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<Auras> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.npc_type));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back(std::to_string(e.spell_id));
+			v.push_back(std::to_string(e.distance));
+			v.push_back(std::to_string(e.aura_type));
+			v.push_back(std::to_string(e.spawn_type));
+			v.push_back(std::to_string(e.movement));
+			v.push_back(std::to_string(e.duration));
+			v.push_back(std::to_string(e.icon));
+			v.push_back(std::to_string(e.cast_time));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_AURAS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BASE_DATA_REPOSITORY_H
@@ -140,8 +140,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				base_data_id
 			)
 		);
@@ -150,16 +151,16 @@ public:
 		if (results.RowCount() == 1) {
 			BaseData e{};

-			e.level    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.hp       = strtod(row[2], nullptr);
-			e.mana     = strtod(row[3], nullptr);
-			e.end      = strtod(row[4], nullptr);
-			e.unk1     = strtod(row[5], nullptr);
-			e.unk2     = strtod(row[6], nullptr);
-			e.hp_fac   = strtod(row[7], nullptr);
-			e.mana_fac = strtod(row[8], nullptr);
-			e.end_fac  = strtod(row[9], nullptr);
+			e.level    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.class_   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.hp       = row[2] ? strtod(row[2], nullptr) : 0;
+			e.mana     = row[3] ? strtod(row[3], nullptr) : 0;
+			e.end      = row[4] ? strtod(row[4], nullptr) : 0;
+			e.unk1     = row[5] ? strtod(row[5], nullptr) : 0;
+			e.unk2     = row[6] ? strtod(row[6], nullptr) : 0;
+			e.hp_fac   = row[7] ? strtod(row[7], nullptr) : 0;
+			e.mana_fac = row[8] ? strtod(row[8], nullptr) : 0;
+			e.end_fac  = row[9] ? strtod(row[9], nullptr) : 0;

 			return e;
 		}
@@ -306,16 +307,16 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BaseData e{};

-			e.level    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.hp       = strtod(row[2], nullptr);
-			e.mana     = strtod(row[3], nullptr);
-			e.end      = strtod(row[4], nullptr);
-			e.unk1     = strtod(row[5], nullptr);
-			e.unk2     = strtod(row[6], nullptr);
-			e.hp_fac   = strtod(row[7], nullptr);
-			e.mana_fac = strtod(row[8], nullptr);
-			e.end_fac  = strtod(row[9], nullptr);
+			e.level    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.class_   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.hp       = row[2] ? strtod(row[2], nullptr) : 0;
+			e.mana     = row[3] ? strtod(row[3], nullptr) : 0;
+			e.end      = row[4] ? strtod(row[4], nullptr) : 0;
+			e.unk1     = row[5] ? strtod(row[5], nullptr) : 0;
+			e.unk2     = row[6] ? strtod(row[6], nullptr) : 0;
+			e.hp_fac   = row[7] ? strtod(row[7], nullptr) : 0;
+			e.mana_fac = row[8] ? strtod(row[8], nullptr) : 0;
+			e.end_fac  = row[9] ? strtod(row[9], nullptr) : 0;

 			all_entries.push_back(e);
 		}
@@ -340,16 +341,16 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BaseData e{};

-			e.level    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.hp       = strtod(row[2], nullptr);
-			e.mana     = strtod(row[3], nullptr);
-			e.end      = strtod(row[4], nullptr);
-			e.unk1     = strtod(row[5], nullptr);
-			e.unk2     = strtod(row[6], nullptr);
-			e.hp_fac   = strtod(row[7], nullptr);
-			e.mana_fac = strtod(row[8], nullptr);
-			e.end_fac  = strtod(row[9], nullptr);
+			e.level    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.class_   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.hp       = row[2] ? strtod(row[2], nullptr) : 0;
+			e.mana     = row[3] ? strtod(row[3], nullptr) : 0;
+			e.end      = row[4] ? strtod(row[4], nullptr) : 0;
+			e.unk1     = row[5] ? strtod(row[5], nullptr) : 0;
+			e.unk2     = row[6] ? strtod(row[6], nullptr) : 0;
+			e.hp_fac   = row[7] ? strtod(row[7], nullptr) : 0;
+			e.mana_fac = row[8] ? strtod(row[8], nullptr) : 0;
+			e.end_fac  = row[9] ? strtod(row[9], nullptr) : 0;

 			all_entries.push_back(e);
 		}
@@ -408,6 +409,80 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BaseData &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.level));
+		v.push_back(std::to_string(e.class_));
+		v.push_back(std::to_string(e.hp));
+		v.push_back(std::to_string(e.mana));
+		v.push_back(std::to_string(e.end));
+		v.push_back(std::to_string(e.unk1));
+		v.push_back(std::to_string(e.unk2));
+		v.push_back(std::to_string(e.hp_fac));
+		v.push_back(std::to_string(e.mana_fac));
+		v.push_back(std::to_string(e.end_fac));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BaseData> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.level));
+			v.push_back(std::to_string(e.class_));
+			v.push_back(std::to_string(e.hp));
+			v.push_back(std::to_string(e.mana));
+			v.push_back(std::to_string(e.end));
+			v.push_back(std::to_string(e.unk1));
+			v.push_back(std::to_string(e.unk2));
+			v.push_back(std::to_string(e.hp_fac));
+			v.push_back(std::to_string(e.mana_fac));
+			v.push_back(std::to_string(e.end_fac));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BASE_DATA_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BLOCKED_SPELLS_REPOSITORY_H
@@ -31,6 +31,10 @@ public:
 		float       z_diff;
 		std::string message;
 		std::string description;
+		int8_t      min_expansion;
+		int8_t      max_expansion;
+		std::string content_flags;
+		std::string content_flags_disabled;
 	};

 	static std::string PrimaryKey()
@@ -53,6 +57,10 @@ public:
 			"z_diff",
 			"message",
 			"description",
+			"min_expansion",
+			"max_expansion",
+			"content_flags",
+			"content_flags_disabled",
 		};
 	}

@@ -71,6 +79,10 @@ public:
 			"z_diff",
 			"message",
 			"description",
+			"min_expansion",
+			"max_expansion",
+			"content_flags",
+			"content_flags_disabled",
 		};
 	}

@@ -111,18 +123,22 @@ public:
 	{
 		BlockedSpells e{};

-		e.id          = 0;
-		e.spellid     = 0;
-		e.type        = 0;
-		e.zoneid      = 0;
-		e.x           = 0;
-		e.y           = 0;
-		e.z           = 0;
-		e.x_diff      = 0;
-		e.y_diff      = 0;
-		e.z_diff      = 0;
-		e.message     = "";
-		e.description = "";
+		e.id                     = 0;
+		e.spellid                = 0;
+		e.type                   = 0;
+		e.zoneid                 = 0;
+		e.x                      = 0;
+		e.y                      = 0;
+		e.z                      = 0;
+		e.x_diff                 = 0;
+		e.y_diff                 = 0;
+		e.z_diff                 = 0;
+		e.message                = "";
+		e.description            = "";
+		e.min_expansion          = -1;
+		e.max_expansion          = -1;
+		e.content_flags          = "";
+		e.content_flags_disabled = "";

 		return e;
 	}
@@ -148,8 +164,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				blocked_spells_id
 			)
 		);
@@ -158,18 +175,22 @@ public:
 		if (results.RowCount() == 1) {
 			BlockedSpells e{};

-			e.id          = static_cast<int32_t>(atoi(row[0]));
-			e.spellid     = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.type        = static_cast<int8_t>(atoi(row[2]));
-			e.zoneid      = static_cast<int32_t>(atoi(row[3]));
-			e.x           = strtof(row[4], nullptr);
-			e.y           = strtof(row[5], nullptr);
-			e.z           = strtof(row[6], nullptr);
-			e.x_diff      = strtof(row[7], nullptr);
-			e.y_diff      = strtof(row[8], nullptr);
-			e.z_diff      = strtof(row[9], nullptr);
-			e.message     = row[10] ? row[10] : "";
-			e.description = row[11] ? row[11] : "";
+			e.id                     = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.spellid                = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.type                   = row[2] ? static_cast<int8_t>(atoi(row[2])) : 0;
+			e.zoneid                 = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.x                      = row[4] ? strtof(row[4], nullptr) : 0;
+			e.y                      = row[5] ? strtof(row[5], nullptr) : 0;
+			e.z                      = row[6] ? strtof(row[6], nullptr) : 0;
+			e.x_diff                 = row[7] ? strtof(row[7], nullptr) : 0;
+			e.y_diff                 = row[8] ? strtof(row[8], nullptr) : 0;
+			e.z_diff                 = row[9] ? strtof(row[9], nullptr) : 0;
+			e.message                = row[10] ? row[10] : "";
+			e.description            = row[11] ? row[11] : "";
+			e.min_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.max_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.content_flags          = row[14] ? row[14] : "";
+			e.content_flags_disabled = row[15] ? row[15] : "";

 			return e;
 		}
@@ -214,6 +235,10 @@ public:
 		v.push_back(columns[9] + " = " + std::to_string(e.z_diff));
 		v.push_back(columns[10] + " = '" + Strings::Escape(e.message) + "'");
 		v.push_back(columns[11] + " = '" + Strings::Escape(e.description) + "'");
+		v.push_back(columns[12] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[13] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[14] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[15] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -247,6 +272,10 @@ public:
 		v.push_back(std::to_string(e.z_diff));
 		v.push_back("'" + Strings::Escape(e.message) + "'");
 		v.push_back("'" + Strings::Escape(e.description) + "'");
+		v.push_back(std::to_string(e.min_expansion));
+		v.push_back(std::to_string(e.max_expansion));
+		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -288,6 +317,10 @@ public:
 			v.push_back(std::to_string(e.z_diff));
 			v.push_back("'" + Strings::Escape(e.message) + "'");
 			v.push_back("'" + Strings::Escape(e.description) + "'");
+			v.push_back(std::to_string(e.min_expansion));
+			v.push_back(std::to_string(e.max_expansion));
+			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -321,18 +354,22 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BlockedSpells e{};

-			e.id          = static_cast<int32_t>(atoi(row[0]));
-			e.spellid     = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.type        = static_cast<int8_t>(atoi(row[2]));
-			e.zoneid      = static_cast<int32_t>(atoi(row[3]));
-			e.x           = strtof(row[4], nullptr);
-			e.y           = strtof(row[5], nullptr);
-			e.z           = strtof(row[6], nullptr);
-			e.x_diff      = strtof(row[7], nullptr);
-			e.y_diff      = strtof(row[8], nullptr);
-			e.z_diff      = strtof(row[9], nullptr);
-			e.message     = row[10] ? row[10] : "";
-			e.description = row[11] ? row[11] : "";
+			e.id                     = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.spellid                = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.type                   = row[2] ? static_cast<int8_t>(atoi(row[2])) : 0;
+			e.zoneid                 = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.x                      = row[4] ? strtof(row[4], nullptr) : 0;
+			e.y                      = row[5] ? strtof(row[5], nullptr) : 0;
+			e.z                      = row[6] ? strtof(row[6], nullptr) : 0;
+			e.x_diff                 = row[7] ? strtof(row[7], nullptr) : 0;
+			e.y_diff                 = row[8] ? strtof(row[8], nullptr) : 0;
+			e.z_diff                 = row[9] ? strtof(row[9], nullptr) : 0;
+			e.message                = row[10] ? row[10] : "";
+			e.description            = row[11] ? row[11] : "";
+			e.min_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.max_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.content_flags          = row[14] ? row[14] : "";
+			e.content_flags_disabled = row[15] ? row[15] : "";

 			all_entries.push_back(e);
 		}
@@ -357,18 +394,22 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BlockedSpells e{};

-			e.id          = static_cast<int32_t>(atoi(row[0]));
-			e.spellid     = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.type        = static_cast<int8_t>(atoi(row[2]));
-			e.zoneid      = static_cast<int32_t>(atoi(row[3]));
-			e.x           = strtof(row[4], nullptr);
-			e.y           = strtof(row[5], nullptr);
-			e.z           = strtof(row[6], nullptr);
-			e.x_diff      = strtof(row[7], nullptr);
-			e.y_diff      = strtof(row[8], nullptr);
-			e.z_diff      = strtof(row[9], nullptr);
-			e.message     = row[10] ? row[10] : "";
-			e.description = row[11] ? row[11] : "";
+			e.id                     = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.spellid                = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.type                   = row[2] ? static_cast<int8_t>(atoi(row[2])) : 0;
+			e.zoneid                 = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;
+			e.x                      = row[4] ? strtof(row[4], nullptr) : 0;
+			e.y                      = row[5] ? strtof(row[5], nullptr) : 0;
+			e.z                      = row[6] ? strtof(row[6], nullptr) : 0;
+			e.x_diff                 = row[7] ? strtof(row[7], nullptr) : 0;
+			e.y_diff                 = row[8] ? strtof(row[8], nullptr) : 0;
+			e.z_diff                 = row[9] ? strtof(row[9], nullptr) : 0;
+			e.message                = row[10] ? row[10] : "";
+			e.description            = row[11] ? row[11] : "";
+			e.min_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.max_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.content_flags          = row[14] ? row[14] : "";
+			e.content_flags_disabled = row[15] ? row[15] : "";

 			all_entries.push_back(e);
 		}
@@ -427,6 +468,92 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BlockedSpells &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.spellid));
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.zoneid));
+		v.push_back(std::to_string(e.x));
+		v.push_back(std::to_string(e.y));
+		v.push_back(std::to_string(e.z));
+		v.push_back(std::to_string(e.x_diff));
+		v.push_back(std::to_string(e.y_diff));
+		v.push_back(std::to_string(e.z_diff));
+		v.push_back("'" + Strings::Escape(e.message) + "'");
+		v.push_back("'" + Strings::Escape(e.description) + "'");
+		v.push_back(std::to_string(e.min_expansion));
+		v.push_back(std::to_string(e.max_expansion));
+		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BlockedSpells> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.spellid));
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.zoneid));
+			v.push_back(std::to_string(e.x));
+			v.push_back(std::to_string(e.y));
+			v.push_back(std::to_string(e.z));
+			v.push_back(std::to_string(e.x_diff));
+			v.push_back(std::to_string(e.y_diff));
+			v.push_back(std::to_string(e.z_diff));
+			v.push_back("'" + Strings::Escape(e.message) + "'");
+			v.push_back("'" + Strings::Escape(e.description) + "'");
+			v.push_back(std::to_string(e.min_expansion));
+			v.push_back(std::to_string(e.max_expansion));
+			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BLOCKED_SPELLS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOOKS_REPOSITORY_H
@@ -116,8 +116,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				books_id
 			)
 		);
@@ -126,10 +127,10 @@ public:
 		if (results.RowCount() == 1) {
 			Books e{};

-			e.id       = static_cast<int32_t>(atoi(row[0]));
+			e.id       = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.name     = row[1] ? row[1] : "";
 			e.txtfile  = row[2] ? row[2] : "";
-			e.language = static_cast<int32_t>(atoi(row[3]));
+			e.language = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;

 			return e;
 		}
@@ -257,10 +258,10 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Books e{};

-			e.id       = static_cast<int32_t>(atoi(row[0]));
+			e.id       = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.name     = row[1] ? row[1] : "";
 			e.txtfile  = row[2] ? row[2] : "";
-			e.language = static_cast<int32_t>(atoi(row[3]));
+			e.language = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;

 			all_entries.push_back(e);
 		}
@@ -285,10 +286,10 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Books e{};

-			e.id       = static_cast<int32_t>(atoi(row[0]));
+			e.id       = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.name     = row[1] ? row[1] : "";
 			e.txtfile  = row[2] ? row[2] : "";
-			e.language = static_cast<int32_t>(atoi(row[3]));
+			e.language = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;

 			all_entries.push_back(e);
 		}
@@ -347,6 +348,68 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const Books &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back("'" + Strings::Escape(e.txtfile) + "'");
+		v.push_back(std::to_string(e.language));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<Books> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back("'" + Strings::Escape(e.txtfile) + "'");
+			v.push_back(std::to_string(e.language));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOOKS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_BUFFS_REPOSITORY_H
@@ -180,8 +180,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_buffs_id
 			)
 		);
@@ -190,26 +191,26 @@ public:
 		if (results.RowCount() == 1) {
 			BotBuffs e{};

-			e.buffs_index         = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spell_id            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.caster_level        = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.duration_formula    = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.tics_remaining      = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.poison_counters     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.disease_counters    = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.curse_counters      = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.corruption_counters = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.numhits             = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
-			e.melee_rune          = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.magic_rune          = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.dot_rune            = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.persistent          = static_cast<int8_t>(atoi(row[14]));
-			e.caston_x            = static_cast<int32_t>(atoi(row[15]));
-			e.caston_y            = static_cast<int32_t>(atoi(row[16]));
-			e.caston_z            = static_cast<int32_t>(atoi(row[17]));
-			e.extra_di_chance     = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
-			e.instrument_mod      = static_cast<int32_t>(atoi(row[19]));
+			e.buffs_index         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.spell_id            = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.caster_level        = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.duration_formula    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.tics_remaining      = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.poison_counters     = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.disease_counters    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.curse_counters      = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.corruption_counters = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.numhits             = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.melee_rune          = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.magic_rune          = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.dot_rune            = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.persistent          = row[14] ? static_cast<int8_t>(atoi(row[14])) : 0;
+			e.caston_x            = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
+			e.caston_y            = row[16] ? static_cast<int32_t>(atoi(row[16])) : 0;
+			e.caston_z            = row[17] ? static_cast<int32_t>(atoi(row[17])) : 0;
+			e.extra_di_chance     = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
+			e.instrument_mod      = row[19] ? static_cast<int32_t>(atoi(row[19])) : 10;

 			return e;
 		}
@@ -385,26 +386,26 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotBuffs e{};

-			e.buffs_index         = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spell_id            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.caster_level        = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.duration_formula    = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.tics_remaining      = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.poison_counters     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.disease_counters    = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.curse_counters      = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.corruption_counters = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.numhits             = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
-			e.melee_rune          = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.magic_rune          = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.dot_rune            = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.persistent          = static_cast<int8_t>(atoi(row[14]));
-			e.caston_x            = static_cast<int32_t>(atoi(row[15]));
-			e.caston_y            = static_cast<int32_t>(atoi(row[16]));
-			e.caston_z            = static_cast<int32_t>(atoi(row[17]));
-			e.extra_di_chance     = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
-			e.instrument_mod      = static_cast<int32_t>(atoi(row[19]));
+			e.buffs_index         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.spell_id            = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.caster_level        = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.duration_formula    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.tics_remaining      = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.poison_counters     = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.disease_counters    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.curse_counters      = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.corruption_counters = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.numhits             = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.melee_rune          = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.magic_rune          = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.dot_rune            = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.persistent          = row[14] ? static_cast<int8_t>(atoi(row[14])) : 0;
+			e.caston_x            = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
+			e.caston_y            = row[16] ? static_cast<int32_t>(atoi(row[16])) : 0;
+			e.caston_z            = row[17] ? static_cast<int32_t>(atoi(row[17])) : 0;
+			e.extra_di_chance     = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
+			e.instrument_mod      = row[19] ? static_cast<int32_t>(atoi(row[19])) : 10;

 			all_entries.push_back(e);
 		}
@@ -429,26 +430,26 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotBuffs e{};

-			e.buffs_index         = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spell_id            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.caster_level        = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.duration_formula    = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.tics_remaining      = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.poison_counters     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.disease_counters    = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.curse_counters      = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.corruption_counters = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.numhits             = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
-			e.melee_rune          = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.magic_rune          = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.dot_rune            = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.persistent          = static_cast<int8_t>(atoi(row[14]));
-			e.caston_x            = static_cast<int32_t>(atoi(row[15]));
-			e.caston_y            = static_cast<int32_t>(atoi(row[16]));
-			e.caston_z            = static_cast<int32_t>(atoi(row[17]));
-			e.extra_di_chance     = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
-			e.instrument_mod      = static_cast<int32_t>(atoi(row[19]));
+			e.buffs_index         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.spell_id            = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.caster_level        = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.duration_formula    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.tics_remaining      = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.poison_counters     = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.disease_counters    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.curse_counters      = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.corruption_counters = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.numhits             = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.melee_rune          = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.magic_rune          = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.dot_rune            = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.persistent          = row[14] ? static_cast<int8_t>(atoi(row[14])) : 0;
+			e.caston_x            = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
+			e.caston_y            = row[16] ? static_cast<int32_t>(atoi(row[16])) : 0;
+			e.caston_z            = row[17] ? static_cast<int32_t>(atoi(row[17])) : 0;
+			e.extra_di_chance     = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
+			e.instrument_mod      = row[19] ? static_cast<int32_t>(atoi(row[19])) : 10;

 			all_entries.push_back(e);
 		}
@@ -507,6 +508,100 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotBuffs &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.buffs_index));
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back(std::to_string(e.spell_id));
+		v.push_back(std::to_string(e.caster_level));
+		v.push_back(std::to_string(e.duration_formula));
+		v.push_back(std::to_string(e.tics_remaining));
+		v.push_back(std::to_string(e.poison_counters));
+		v.push_back(std::to_string(e.disease_counters));
+		v.push_back(std::to_string(e.curse_counters));
+		v.push_back(std::to_string(e.corruption_counters));
+		v.push_back(std::to_string(e.numhits));
+		v.push_back(std::to_string(e.melee_rune));
+		v.push_back(std::to_string(e.magic_rune));
+		v.push_back(std::to_string(e.dot_rune));
+		v.push_back(std::to_string(e.persistent));
+		v.push_back(std::to_string(e.caston_x));
+		v.push_back(std::to_string(e.caston_y));
+		v.push_back(std::to_string(e.caston_z));
+		v.push_back(std::to_string(e.extra_di_chance));
+		v.push_back(std::to_string(e.instrument_mod));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotBuffs> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.buffs_index));
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back(std::to_string(e.spell_id));
+			v.push_back(std::to_string(e.caster_level));
+			v.push_back(std::to_string(e.duration_formula));
+			v.push_back(std::to_string(e.tics_remaining));
+			v.push_back(std::to_string(e.poison_counters));
+			v.push_back(std::to_string(e.disease_counters));
+			v.push_back(std::to_string(e.curse_counters));
+			v.push_back(std::to_string(e.corruption_counters));
+			v.push_back(std::to_string(e.numhits));
+			v.push_back(std::to_string(e.melee_rune));
+			v.push_back(std::to_string(e.magic_rune));
+			v.push_back(std::to_string(e.dot_rune));
+			v.push_back(std::to_string(e.persistent));
+			v.push_back(std::to_string(e.caston_x));
+			v.push_back(std::to_string(e.caston_y));
+			v.push_back(std::to_string(e.caston_z));
+			v.push_back(std::to_string(e.extra_di_chance));
+			v.push_back(std::to_string(e.instrument_mod));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_BUFFS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_CREATE_COMBINATIONS_REPOSITORY_H
@@ -108,8 +108,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_create_combinations_id
 			)
 		);
@@ -118,8 +119,8 @@ public:
 		if (results.RowCount() == 1) {
 			BotCreateCombinations e{};

-			e.race    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.classes = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.race    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.classes = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			return e;
 		}
@@ -242,8 +243,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotCreateCombinations e{};

-			e.race    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.classes = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.race    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.classes = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -268,8 +269,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotCreateCombinations e{};

-			e.race    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.classes = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.race    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.classes = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -328,6 +329,64 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotCreateCombinations &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.race));
+		v.push_back(std::to_string(e.classes));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotCreateCombinations> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.race));
+			v.push_back(std::to_string(e.classes));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_CREATE_COMBINATIONS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_DATA_REPOSITORY_H
@@ -278,7 +278,7 @@ public:
 		e.expansion_bitmask      = -1;
 		e.enforce_spell_settings = 0;
 		e.archery_setting        = 0;
-		e.caster_range           = 0;
+		e.caster_range           = 300;

 		return e;
 	}
@@ -315,57 +315,57 @@ public:
 		if (results.RowCount() == 1) {
 			BotData e{};

-			e.bot_id                 = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.owner_id               = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spells_id              = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.bot_id                 = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.owner_id               = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.spells_id              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.name                   = row[3] ? row[3] : "";
 			e.last_name              = row[4] ? row[4] : "";
 			e.title                  = row[5] ? row[5] : "";
 			e.suffix                 = row[6] ? row[6] : "";
-			e.zone_id                = static_cast<int16_t>(atoi(row[7]));
-			e.gender                 = static_cast<int8_t>(atoi(row[8]));
-			e.race                   = static_cast<int16_t>(atoi(row[9]));
-			e.class_                 = static_cast<int8_t>(atoi(row[10]));
-			e.level                  = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
-			e.deity                  = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.creation_day           = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.last_spawn             = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
-			e.time_spawned           = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.size                   = strtof(row[16], nullptr);
-			e.face                   = static_cast<int32_t>(atoi(row[17]));
-			e.hair_color             = static_cast<int32_t>(atoi(row[18]));
-			e.hair_style             = static_cast<int32_t>(atoi(row[19]));
-			e.beard                  = static_cast<int32_t>(atoi(row[20]));
-			e.beard_color            = static_cast<int32_t>(atoi(row[21]));
-			e.eye_color_1            = static_cast<int32_t>(atoi(row[22]));
-			e.eye_color_2            = static_cast<int32_t>(atoi(row[23]));
-			e.drakkin_heritage       = static_cast<int32_t>(atoi(row[24]));
-			e.drakkin_tattoo         = static_cast<int32_t>(atoi(row[25]));
-			e.drakkin_details        = static_cast<int32_t>(atoi(row[26]));
-			e.ac                     = static_cast<int16_t>(atoi(row[27]));
-			e.atk                    = static_cast<int32_t>(atoi(row[28]));
-			e.hp                     = static_cast<int32_t>(atoi(row[29]));
-			e.mana                   = static_cast<int32_t>(atoi(row[30]));
-			e.str                    = static_cast<int32_t>(atoi(row[31]));
-			e.sta                    = static_cast<int32_t>(atoi(row[32]));
-			e.cha                    = static_cast<int32_t>(atoi(row[33]));
-			e.dex                    = static_cast<int32_t>(atoi(row[34]));
-			e.int_                   = static_cast<int32_t>(atoi(row[35]));
-			e.agi                    = static_cast<int32_t>(atoi(row[36]));
-			e.wis                    = static_cast<int32_t>(atoi(row[37]));
-			e.fire                   = static_cast<int16_t>(atoi(row[38]));
-			e.cold                   = static_cast<int16_t>(atoi(row[39]));
-			e.magic                  = static_cast<int16_t>(atoi(row[40]));
-			e.poison                 = static_cast<int16_t>(atoi(row[41]));
-			e.disease                = static_cast<int16_t>(atoi(row[42]));
-			e.corruption             = static_cast<int16_t>(atoi(row[43]));
-			e.show_helm              = static_cast<uint32_t>(strtoul(row[44], nullptr, 10));
-			e.follow_distance        = static_cast<uint32_t>(strtoul(row[45], nullptr, 10));
-			e.stop_melee_level       = static_cast<uint8_t>(strtoul(row[46], nullptr, 10));
-			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
-			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
-			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
-			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));
+			e.zone_id                = row[7] ? static_cast<int16_t>(atoi(row[7])) : 0;
+			e.gender                 = row[8] ? static_cast<int8_t>(atoi(row[8])) : 0;
+			e.race                   = row[9] ? static_cast<int16_t>(atoi(row[9])) : 0;
+			e.class_                 = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.level                  = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.deity                  = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.creation_day           = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.last_spawn             = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.time_spawned           = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0;
+			e.size                   = row[16] ? strtof(row[16], nullptr) : 0;
+			e.face                   = row[17] ? static_cast<int32_t>(atoi(row[17])) : 1;
+			e.hair_color             = row[18] ? static_cast<int32_t>(atoi(row[18])) : 1;
+			e.hair_style             = row[19] ? static_cast<int32_t>(atoi(row[19])) : 1;
+			e.beard                  = row[20] ? static_cast<int32_t>(atoi(row[20])) : 0;
+			e.beard_color            = row[21] ? static_cast<int32_t>(atoi(row[21])) : 1;
+			e.eye_color_1            = row[22] ? static_cast<int32_t>(atoi(row[22])) : 1;
+			e.eye_color_2            = row[23] ? static_cast<int32_t>(atoi(row[23])) : 1;
+			e.drakkin_heritage       = row[24] ? static_cast<int32_t>(atoi(row[24])) : 0;
+			e.drakkin_tattoo         = row[25] ? static_cast<int32_t>(atoi(row[25])) : 0;
+			e.drakkin_details        = row[26] ? static_cast<int32_t>(atoi(row[26])) : 0;
+			e.ac                     = row[27] ? static_cast<int16_t>(atoi(row[27])) : 0;
+			e.atk                    = row[28] ? static_cast<int32_t>(atoi(row[28])) : 0;
+			e.hp                     = row[29] ? static_cast<int32_t>(atoi(row[29])) : 0;
+			e.mana                   = row[30] ? static_cast<int32_t>(atoi(row[30])) : 0;
+			e.str                    = row[31] ? static_cast<int32_t>(atoi(row[31])) : 75;
+			e.sta                    = row[32] ? static_cast<int32_t>(atoi(row[32])) : 75;
+			e.cha                    = row[33] ? static_cast<int32_t>(atoi(row[33])) : 75;
+			e.dex                    = row[34] ? static_cast<int32_t>(atoi(row[34])) : 75;
+			e.int_                   = row[35] ? static_cast<int32_t>(atoi(row[35])) : 75;
+			e.agi                    = row[36] ? static_cast<int32_t>(atoi(row[36])) : 75;
+			e.wis                    = row[37] ? static_cast<int32_t>(atoi(row[37])) : 75;
+			e.fire                   = row[38] ? static_cast<int16_t>(atoi(row[38])) : 0;
+			e.cold                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
+			e.magic                  = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
+			e.poison                 = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
+			e.disease                = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
+			e.corruption             = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
+			e.show_helm              = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
+			e.follow_distance        = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[46] ? static_cast<uint8_t>(strtoul(row[46], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[47] ? static_cast<int32_t>(atoi(row[47])) : -1;
+			e.enforce_spell_settings = row[48] ? static_cast<uint8_t>(strtoul(row[48], nullptr, 10)) : 0;
+			e.archery_setting        = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.caster_range           = row[50] ? static_cast<uint32_t>(strtoul(row[50], nullptr, 10)) : 300;

 			return e;
 		}
@@ -634,57 +634,57 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotData e{};

-			e.bot_id                 = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.owner_id               = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spells_id              = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.bot_id                 = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.owner_id               = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.spells_id              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.name                   = row[3] ? row[3] : "";
 			e.last_name              = row[4] ? row[4] : "";
 			e.title                  = row[5] ? row[5] : "";
 			e.suffix                 = row[6] ? row[6] : "";
-			e.zone_id                = static_cast<int16_t>(atoi(row[7]));
-			e.gender                 = static_cast<int8_t>(atoi(row[8]));
-			e.race                   = static_cast<int16_t>(atoi(row[9]));
-			e.class_                 = static_cast<int8_t>(atoi(row[10]));
-			e.level                  = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
-			e.deity                  = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.creation_day           = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.last_spawn             = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
-			e.time_spawned           = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.size                   = strtof(row[16], nullptr);
-			e.face                   = static_cast<int32_t>(atoi(row[17]));
-			e.hair_color             = static_cast<int32_t>(atoi(row[18]));
-			e.hair_style             = static_cast<int32_t>(atoi(row[19]));
-			e.beard                  = static_cast<int32_t>(atoi(row[20]));
-			e.beard_color            = static_cast<int32_t>(atoi(row[21]));
-			e.eye_color_1            = static_cast<int32_t>(atoi(row[22]));
-			e.eye_color_2            = static_cast<int32_t>(atoi(row[23]));
-			e.drakkin_heritage       = static_cast<int32_t>(atoi(row[24]));
-			e.drakkin_tattoo         = static_cast<int32_t>(atoi(row[25]));
-			e.drakkin_details        = static_cast<int32_t>(atoi(row[26]));
-			e.ac                     = static_cast<int16_t>(atoi(row[27]));
-			e.atk                    = static_cast<int32_t>(atoi(row[28]));
-			e.hp                     = static_cast<int32_t>(atoi(row[29]));
-			e.mana                   = static_cast<int32_t>(atoi(row[30]));
-			e.str                    = static_cast<int32_t>(atoi(row[31]));
-			e.sta                    = static_cast<int32_t>(atoi(row[32]));
-			e.cha                    = static_cast<int32_t>(atoi(row[33]));
-			e.dex                    = static_cast<int32_t>(atoi(row[34]));
-			e.int_                   = static_cast<int32_t>(atoi(row[35]));
-			e.agi                    = static_cast<int32_t>(atoi(row[36]));
-			e.wis                    = static_cast<int32_t>(atoi(row[37]));
-			e.fire                   = static_cast<int16_t>(atoi(row[38]));
-			e.cold                   = static_cast<int16_t>(atoi(row[39]));
-			e.magic                  = static_cast<int16_t>(atoi(row[40]));
-			e.poison                 = static_cast<int16_t>(atoi(row[41]));
-			e.disease                = static_cast<int16_t>(atoi(row[42]));
-			e.corruption             = static_cast<int16_t>(atoi(row[43]));
-			e.show_helm              = static_cast<uint32_t>(strtoul(row[44], nullptr, 10));
-			e.follow_distance        = static_cast<uint32_t>(strtoul(row[45], nullptr, 10));
-			e.stop_melee_level       = static_cast<uint8_t>(strtoul(row[46], nullptr, 10));
-			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
-			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
-			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
-			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));
+			e.zone_id                = row[7] ? static_cast<int16_t>(atoi(row[7])) : 0;
+			e.gender                 = row[8] ? static_cast<int8_t>(atoi(row[8])) : 0;
+			e.race                   = row[9] ? static_cast<int16_t>(atoi(row[9])) : 0;
+			e.class_                 = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.level                  = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.deity                  = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.creation_day           = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.last_spawn             = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.time_spawned           = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0;
+			e.size                   = row[16] ? strtof(row[16], nullptr) : 0;
+			e.face                   = row[17] ? static_cast<int32_t>(atoi(row[17])) : 1;
+			e.hair_color             = row[18] ? static_cast<int32_t>(atoi(row[18])) : 1;
+			e.hair_style             = row[19] ? static_cast<int32_t>(atoi(row[19])) : 1;
+			e.beard                  = row[20] ? static_cast<int32_t>(atoi(row[20])) : 0;
+			e.beard_color            = row[21] ? static_cast<int32_t>(atoi(row[21])) : 1;
+			e.eye_color_1            = row[22] ? static_cast<int32_t>(atoi(row[22])) : 1;
+			e.eye_color_2            = row[23] ? static_cast<int32_t>(atoi(row[23])) : 1;
+			e.drakkin_heritage       = row[24] ? static_cast<int32_t>(atoi(row[24])) : 0;
+			e.drakkin_tattoo         = row[25] ? static_cast<int32_t>(atoi(row[25])) : 0;
+			e.drakkin_details        = row[26] ? static_cast<int32_t>(atoi(row[26])) : 0;
+			e.ac                     = row[27] ? static_cast<int16_t>(atoi(row[27])) : 0;
+			e.atk                    = row[28] ? static_cast<int32_t>(atoi(row[28])) : 0;
+			e.hp                     = row[29] ? static_cast<int32_t>(atoi(row[29])) : 0;
+			e.mana                   = row[30] ? static_cast<int32_t>(atoi(row[30])) : 0;
+			e.str                    = row[31] ? static_cast<int32_t>(atoi(row[31])) : 75;
+			e.sta                    = row[32] ? static_cast<int32_t>(atoi(row[32])) : 75;
+			e.cha                    = row[33] ? static_cast<int32_t>(atoi(row[33])) : 75;
+			e.dex                    = row[34] ? static_cast<int32_t>(atoi(row[34])) : 75;
+			e.int_                   = row[35] ? static_cast<int32_t>(atoi(row[35])) : 75;
+			e.agi                    = row[36] ? static_cast<int32_t>(atoi(row[36])) : 75;
+			e.wis                    = row[37] ? static_cast<int32_t>(atoi(row[37])) : 75;
+			e.fire                   = row[38] ? static_cast<int16_t>(atoi(row[38])) : 0;
+			e.cold                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
+			e.magic                  = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
+			e.poison                 = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
+			e.disease                = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
+			e.corruption             = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
+			e.show_helm              = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
+			e.follow_distance        = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[46] ? static_cast<uint8_t>(strtoul(row[46], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[47] ? static_cast<int32_t>(atoi(row[47])) : -1;
+			e.enforce_spell_settings = row[48] ? static_cast<uint8_t>(strtoul(row[48], nullptr, 10)) : 0;
+			e.archery_setting        = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.caster_range           = row[50] ? static_cast<uint32_t>(strtoul(row[50], nullptr, 10)) : 300;

 			all_entries.push_back(e);
 		}
@@ -709,57 +709,57 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotData e{};

-			e.bot_id                 = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.owner_id               = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spells_id              = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.bot_id                 = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.owner_id               = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.spells_id              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.name                   = row[3] ? row[3] : "";
 			e.last_name              = row[4] ? row[4] : "";
 			e.title                  = row[5] ? row[5] : "";
 			e.suffix                 = row[6] ? row[6] : "";
-			e.zone_id                = static_cast<int16_t>(atoi(row[7]));
-			e.gender                 = static_cast<int8_t>(atoi(row[8]));
-			e.race                   = static_cast<int16_t>(atoi(row[9]));
-			e.class_                 = static_cast<int8_t>(atoi(row[10]));
-			e.level                  = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
-			e.deity                  = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.creation_day           = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.last_spawn             = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
-			e.time_spawned           = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.size                   = strtof(row[16], nullptr);
-			e.face                   = static_cast<int32_t>(atoi(row[17]));
-			e.hair_color             = static_cast<int32_t>(atoi(row[18]));
-			e.hair_style             = static_cast<int32_t>(atoi(row[19]));
-			e.beard                  = static_cast<int32_t>(atoi(row[20]));
-			e.beard_color            = static_cast<int32_t>(atoi(row[21]));
-			e.eye_color_1            = static_cast<int32_t>(atoi(row[22]));
-			e.eye_color_2            = static_cast<int32_t>(atoi(row[23]));
-			e.drakkin_heritage       = static_cast<int32_t>(atoi(row[24]));
-			e.drakkin_tattoo         = static_cast<int32_t>(atoi(row[25]));
-			e.drakkin_details        = static_cast<int32_t>(atoi(row[26]));
-			e.ac                     = static_cast<int16_t>(atoi(row[27]));
-			e.atk                    = static_cast<int32_t>(atoi(row[28]));
-			e.hp                     = static_cast<int32_t>(atoi(row[29]));
-			e.mana                   = static_cast<int32_t>(atoi(row[30]));
-			e.str                    = static_cast<int32_t>(atoi(row[31]));
-			e.sta                    = static_cast<int32_t>(atoi(row[32]));
-			e.cha                    = static_cast<int32_t>(atoi(row[33]));
-			e.dex                    = static_cast<int32_t>(atoi(row[34]));
-			e.int_                   = static_cast<int32_t>(atoi(row[35]));
-			e.agi                    = static_cast<int32_t>(atoi(row[36]));
-			e.wis                    = static_cast<int32_t>(atoi(row[37]));
-			e.fire                   = static_cast<int16_t>(atoi(row[38]));
-			e.cold                   = static_cast<int16_t>(atoi(row[39]));
-			e.magic                  = static_cast<int16_t>(atoi(row[40]));
-			e.poison                 = static_cast<int16_t>(atoi(row[41]));
-			e.disease                = static_cast<int16_t>(atoi(row[42]));
-			e.corruption             = static_cast<int16_t>(atoi(row[43]));
-			e.show_helm              = static_cast<uint32_t>(strtoul(row[44], nullptr, 10));
-			e.follow_distance        = static_cast<uint32_t>(strtoul(row[45], nullptr, 10));
-			e.stop_melee_level       = static_cast<uint8_t>(strtoul(row[46], nullptr, 10));
-			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
-			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
-			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
-			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));
+			e.zone_id                = row[7] ? static_cast<int16_t>(atoi(row[7])) : 0;
+			e.gender                 = row[8] ? static_cast<int8_t>(atoi(row[8])) : 0;
+			e.race                   = row[9] ? static_cast<int16_t>(atoi(row[9])) : 0;
+			e.class_                 = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.level                  = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.deity                  = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.creation_day           = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.last_spawn             = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.time_spawned           = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0;
+			e.size                   = row[16] ? strtof(row[16], nullptr) : 0;
+			e.face                   = row[17] ? static_cast<int32_t>(atoi(row[17])) : 1;
+			e.hair_color             = row[18] ? static_cast<int32_t>(atoi(row[18])) : 1;
+			e.hair_style             = row[19] ? static_cast<int32_t>(atoi(row[19])) : 1;
+			e.beard                  = row[20] ? static_cast<int32_t>(atoi(row[20])) : 0;
+			e.beard_color            = row[21] ? static_cast<int32_t>(atoi(row[21])) : 1;
+			e.eye_color_1            = row[22] ? static_cast<int32_t>(atoi(row[22])) : 1;
+			e.eye_color_2            = row[23] ? static_cast<int32_t>(atoi(row[23])) : 1;
+			e.drakkin_heritage       = row[24] ? static_cast<int32_t>(atoi(row[24])) : 0;
+			e.drakkin_tattoo         = row[25] ? static_cast<int32_t>(atoi(row[25])) : 0;
+			e.drakkin_details        = row[26] ? static_cast<int32_t>(atoi(row[26])) : 0;
+			e.ac                     = row[27] ? static_cast<int16_t>(atoi(row[27])) : 0;
+			e.atk                    = row[28] ? static_cast<int32_t>(atoi(row[28])) : 0;
+			e.hp                     = row[29] ? static_cast<int32_t>(atoi(row[29])) : 0;
+			e.mana                   = row[30] ? static_cast<int32_t>(atoi(row[30])) : 0;
+			e.str                    = row[31] ? static_cast<int32_t>(atoi(row[31])) : 75;
+			e.sta                    = row[32] ? static_cast<int32_t>(atoi(row[32])) : 75;
+			e.cha                    = row[33] ? static_cast<int32_t>(atoi(row[33])) : 75;
+			e.dex                    = row[34] ? static_cast<int32_t>(atoi(row[34])) : 75;
+			e.int_                   = row[35] ? static_cast<int32_t>(atoi(row[35])) : 75;
+			e.agi                    = row[36] ? static_cast<int32_t>(atoi(row[36])) : 75;
+			e.wis                    = row[37] ? static_cast<int32_t>(atoi(row[37])) : 75;
+			e.fire                   = row[38] ? static_cast<int16_t>(atoi(row[38])) : 0;
+			e.cold                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
+			e.magic                  = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
+			e.poison                 = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
+			e.disease                = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
+			e.corruption             = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
+			e.show_helm              = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
+			e.follow_distance        = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[46] ? static_cast<uint8_t>(strtoul(row[46], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[47] ? static_cast<int32_t>(atoi(row[47])) : -1;
+			e.enforce_spell_settings = row[48] ? static_cast<uint8_t>(strtoul(row[48], nullptr, 10)) : 0;
+			e.archery_setting        = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.caster_range           = row[50] ? static_cast<uint32_t>(strtoul(row[50], nullptr, 10)) : 300;

 			all_entries.push_back(e);
 		}
@@ -818,6 +818,162 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotData &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back(std::to_string(e.owner_id));
+		v.push_back(std::to_string(e.spells_id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back("'" + Strings::Escape(e.last_name) + "'");
+		v.push_back("'" + Strings::Escape(e.title) + "'");
+		v.push_back("'" + Strings::Escape(e.suffix) + "'");
+		v.push_back(std::to_string(e.zone_id));
+		v.push_back(std::to_string(e.gender));
+		v.push_back(std::to_string(e.race));
+		v.push_back(std::to_string(e.class_));
+		v.push_back(std::to_string(e.level));
+		v.push_back(std::to_string(e.deity));
+		v.push_back(std::to_string(e.creation_day));
+		v.push_back(std::to_string(e.last_spawn));
+		v.push_back(std::to_string(e.time_spawned));
+		v.push_back(std::to_string(e.size));
+		v.push_back(std::to_string(e.face));
+		v.push_back(std::to_string(e.hair_color));
+		v.push_back(std::to_string(e.hair_style));
+		v.push_back(std::to_string(e.beard));
+		v.push_back(std::to_string(e.beard_color));
+		v.push_back(std::to_string(e.eye_color_1));
+		v.push_back(std::to_string(e.eye_color_2));
+		v.push_back(std::to_string(e.drakkin_heritage));
+		v.push_back(std::to_string(e.drakkin_tattoo));
+		v.push_back(std::to_string(e.drakkin_details));
+		v.push_back(std::to_string(e.ac));
+		v.push_back(std::to_string(e.atk));
+		v.push_back(std::to_string(e.hp));
+		v.push_back(std::to_string(e.mana));
+		v.push_back(std::to_string(e.str));
+		v.push_back(std::to_string(e.sta));
+		v.push_back(std::to_string(e.cha));
+		v.push_back(std::to_string(e.dex));
+		v.push_back(std::to_string(e.int_));
+		v.push_back(std::to_string(e.agi));
+		v.push_back(std::to_string(e.wis));
+		v.push_back(std::to_string(e.fire));
+		v.push_back(std::to_string(e.cold));
+		v.push_back(std::to_string(e.magic));
+		v.push_back(std::to_string(e.poison));
+		v.push_back(std::to_string(e.disease));
+		v.push_back(std::to_string(e.corruption));
+		v.push_back(std::to_string(e.show_helm));
+		v.push_back(std::to_string(e.follow_distance));
+		v.push_back(std::to_string(e.stop_melee_level));
+		v.push_back(std::to_string(e.expansion_bitmask));
+		v.push_back(std::to_string(e.enforce_spell_settings));
+		v.push_back(std::to_string(e.archery_setting));
+		v.push_back(std::to_string(e.caster_range));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotData> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back(std::to_string(e.owner_id));
+			v.push_back(std::to_string(e.spells_id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back("'" + Strings::Escape(e.last_name) + "'");
+			v.push_back("'" + Strings::Escape(e.title) + "'");
+			v.push_back("'" + Strings::Escape(e.suffix) + "'");
+			v.push_back(std::to_string(e.zone_id));
+			v.push_back(std::to_string(e.gender));
+			v.push_back(std::to_string(e.race));
+			v.push_back(std::to_string(e.class_));
+			v.push_back(std::to_string(e.level));
+			v.push_back(std::to_string(e.deity));
+			v.push_back(std::to_string(e.creation_day));
+			v.push_back(std::to_string(e.last_spawn));
+			v.push_back(std::to_string(e.time_spawned));
+			v.push_back(std::to_string(e.size));
+			v.push_back(std::to_string(e.face));
+			v.push_back(std::to_string(e.hair_color));
+			v.push_back(std::to_string(e.hair_style));
+			v.push_back(std::to_string(e.beard));
+			v.push_back(std::to_string(e.beard_color));
+			v.push_back(std::to_string(e.eye_color_1));
+			v.push_back(std::to_string(e.eye_color_2));
+			v.push_back(std::to_string(e.drakkin_heritage));
+			v.push_back(std::to_string(e.drakkin_tattoo));
+			v.push_back(std::to_string(e.drakkin_details));
+			v.push_back(std::to_string(e.ac));
+			v.push_back(std::to_string(e.atk));
+			v.push_back(std::to_string(e.hp));
+			v.push_back(std::to_string(e.mana));
+			v.push_back(std::to_string(e.str));
+			v.push_back(std::to_string(e.sta));
+			v.push_back(std::to_string(e.cha));
+			v.push_back(std::to_string(e.dex));
+			v.push_back(std::to_string(e.int_));
+			v.push_back(std::to_string(e.agi));
+			v.push_back(std::to_string(e.wis));
+			v.push_back(std::to_string(e.fire));
+			v.push_back(std::to_string(e.cold));
+			v.push_back(std::to_string(e.magic));
+			v.push_back(std::to_string(e.poison));
+			v.push_back(std::to_string(e.disease));
+			v.push_back(std::to_string(e.corruption));
+			v.push_back(std::to_string(e.show_helm));
+			v.push_back(std::to_string(e.follow_distance));
+			v.push_back(std::to_string(e.stop_melee_level));
+			v.push_back(std::to_string(e.expansion_bitmask));
+			v.push_back(std::to_string(e.enforce_spell_settings));
+			v.push_back(std::to_string(e.archery_setting));
+			v.push_back(std::to_string(e.caster_range));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_DATA_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_HEAL_ROTATION_MEMBERS_REPOSITORY_H
@@ -112,8 +112,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_heal_rotation_members_id
 			)
 		);
@@ -122,9 +123,9 @@ public:
 		if (results.RowCount() == 1) {
 			BotHealRotationMembers e{};

-			e.member_index        = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.member_index        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.heal_rotation_index = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.bot_id              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;

 			return e;
 		}
@@ -249,9 +250,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotHealRotationMembers e{};

-			e.member_index        = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.member_index        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.heal_rotation_index = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.bot_id              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -276,9 +277,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotHealRotationMembers e{};

-			e.member_index        = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.member_index        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.heal_rotation_index = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.bot_id              = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -337,6 +338,66 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotHealRotationMembers &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.member_index));
+		v.push_back(std::to_string(e.heal_rotation_index));
+		v.push_back(std::to_string(e.bot_id));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotHealRotationMembers> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.member_index));
+			v.push_back(std::to_string(e.heal_rotation_index));
+			v.push_back(std::to_string(e.bot_id));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_HEAL_ROTATION_MEMBERS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_HEAL_ROTATION_TARGETS_REPOSITORY_H
@@ -112,8 +112,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_heal_rotation_targets_id
 			)
 		);
@@ -122,8 +123,8 @@ public:
 		if (results.RowCount() == 1) {
 			BotHealRotationTargets e{};

-			e.target_index        = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.target_index        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.heal_rotation_index = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
 			e.target_name         = row[2] ? row[2] : "";

 			return e;
@@ -249,8 +250,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotHealRotationTargets e{};

-			e.target_index        = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.target_index        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.heal_rotation_index = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
 			e.target_name         = row[2] ? row[2] : "";

 			all_entries.push_back(e);
@@ -276,8 +277,8 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotHealRotationTargets e{};

-			e.target_index        = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.target_index        = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.heal_rotation_index = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
 			e.target_name         = row[2] ? row[2] : "";

 			all_entries.push_back(e);
@@ -337,6 +338,66 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotHealRotationTargets &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.target_index));
+		v.push_back(std::to_string(e.heal_rotation_index));
+		v.push_back("'" + Strings::Escape(e.target_name) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotHealRotationTargets> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.target_index));
+			v.push_back(std::to_string(e.heal_rotation_index));
+			v.push_back("'" + Strings::Escape(e.target_name) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_HEAL_ROTATION_TARGETS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_HEAL_ROTATIONS_REPOSITORY_H
@@ -19,22 +19,22 @@
 class BaseBotHealRotationsRepository {
 public:
 	struct BotHealRotations {
-		uint32_t    heal_rotation_index;
-		uint32_t    bot_id;
-		uint32_t    interval;
-		uint32_t    fast_heals;
-		uint32_t    adaptive_targeting;
-		uint32_t    casting_override;
-		std::string safe_hp_base;
-		std::string safe_hp_cloth;
-		std::string safe_hp_leather;
-		std::string safe_hp_chain;
-		std::string safe_hp_plate;
-		std::string critical_hp_base;
-		std::string critical_hp_cloth;
-		std::string critical_hp_leather;
-		std::string critical_hp_chain;
-		std::string critical_hp_plate;
+		uint32_t heal_rotation_index;
+		uint32_t bot_id;
+		uint32_t interval_;
+		uint32_t fast_heals;
+		uint32_t adaptive_targeting;
+		uint32_t casting_override;
+		float    safe_hp_base;
+		float    safe_hp_cloth;
+		float    safe_hp_leather;
+		float    safe_hp_chain;
+		float    safe_hp_plate;
+		float    critical_hp_base;
+		float    critical_hp_cloth;
+		float    critical_hp_leather;
+		float    critical_hp_chain;
+		float    critical_hp_plate;
 	};

 	static std::string PrimaryKey()
@@ -47,7 +47,7 @@ public:
 		return {
 			"heal_rotation_index",
 			"bot_id",
-			"interval",
+			"`interval`",
 			"fast_heals",
 			"adaptive_targeting",
 			"casting_override",
@@ -69,7 +69,7 @@ public:
 		return {
 			"heal_rotation_index",
 			"bot_id",
-			"interval",
+			"`interval`",
 			"fast_heals",
 			"adaptive_targeting",
 			"casting_override",
@@ -125,7 +125,7 @@ public:

 		e.heal_rotation_index = 0;
 		e.bot_id              = 0;
-		e.interval            = 0;
+		e.interval_           = 0;
 		e.fast_heals          = 0;
 		e.adaptive_targeting  = 0;
 		e.casting_override    = 0;
@@ -164,8 +164,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_heal_rotations_id
 			)
 		);
@@ -174,12 +175,12 @@ public:
 		if (results.RowCount() == 1) {
 			BotHealRotations e{};

-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.interval            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.fast_heals          = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.adaptive_targeting  = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.casting_override    = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.heal_rotation_index = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.interval_           = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.fast_heals          = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.adaptive_targeting  = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.casting_override    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;

 			return e;
 		}
@@ -214,7 +215,7 @@ public:
 		auto columns = Columns();

 		v.push_back(columns[1] + " = " + std::to_string(e.bot_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.interval));
+		v.push_back(columns[2] + " = " + std::to_string(e.interval_));
 		v.push_back(columns[3] + " = " + std::to_string(e.fast_heals));
 		v.push_back(columns[4] + " = " + std::to_string(e.adaptive_targeting));
 		v.push_back(columns[5] + " = " + std::to_string(e.casting_override));
@@ -251,7 +252,7 @@ public:

 		v.push_back(std::to_string(e.heal_rotation_index));
 		v.push_back(std::to_string(e.bot_id));
-		v.push_back(std::to_string(e.interval));
+		v.push_back(std::to_string(e.interval_));
 		v.push_back(std::to_string(e.fast_heals));
 		v.push_back(std::to_string(e.adaptive_targeting));
 		v.push_back(std::to_string(e.casting_override));
@@ -296,7 +297,7 @@ public:

 			v.push_back(std::to_string(e.heal_rotation_index));
 			v.push_back(std::to_string(e.bot_id));
-			v.push_back(std::to_string(e.interval));
+			v.push_back(std::to_string(e.interval_));
 			v.push_back(std::to_string(e.fast_heals));
 			v.push_back(std::to_string(e.adaptive_targeting));
 			v.push_back(std::to_string(e.casting_override));
@@ -343,12 +344,12 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotHealRotations e{};

-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.interval            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.fast_heals          = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.adaptive_targeting  = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.casting_override    = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.heal_rotation_index = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.interval_           = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.fast_heals          = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.adaptive_targeting  = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.casting_override    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -373,12 +374,12 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotHealRotations e{};

-			e.heal_rotation_index = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.interval            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.fast_heals          = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.adaptive_targeting  = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.casting_override    = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.heal_rotation_index = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.interval_           = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.fast_heals          = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.adaptive_targeting  = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.casting_override    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -437,6 +438,92 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotHealRotations &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.heal_rotation_index));
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back(std::to_string(e.interval_));
+		v.push_back(std::to_string(e.fast_heals));
+		v.push_back(std::to_string(e.adaptive_targeting));
+		v.push_back(std::to_string(e.casting_override));
+		v.push_back(std::to_string(e.safe_hp_base));
+		v.push_back(std::to_string(e.safe_hp_cloth));
+		v.push_back(std::to_string(e.safe_hp_leather));
+		v.push_back(std::to_string(e.safe_hp_chain));
+		v.push_back(std::to_string(e.safe_hp_plate));
+		v.push_back(std::to_string(e.critical_hp_base));
+		v.push_back(std::to_string(e.critical_hp_cloth));
+		v.push_back(std::to_string(e.critical_hp_leather));
+		v.push_back(std::to_string(e.critical_hp_chain));
+		v.push_back(std::to_string(e.critical_hp_plate));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotHealRotations> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.heal_rotation_index));
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back(std::to_string(e.interval_));
+			v.push_back(std::to_string(e.fast_heals));
+			v.push_back(std::to_string(e.adaptive_targeting));
+			v.push_back(std::to_string(e.casting_override));
+			v.push_back(std::to_string(e.safe_hp_base));
+			v.push_back(std::to_string(e.safe_hp_cloth));
+			v.push_back(std::to_string(e.safe_hp_leather));
+			v.push_back(std::to_string(e.safe_hp_chain));
+			v.push_back(std::to_string(e.safe_hp_plate));
+			v.push_back(std::to_string(e.critical_hp_base));
+			v.push_back(std::to_string(e.critical_hp_cloth));
+			v.push_back(std::to_string(e.critical_hp_leather));
+			v.push_back(std::to_string(e.critical_hp_chain));
+			v.push_back(std::to_string(e.critical_hp_plate));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_HEAL_ROTATIONS_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_INSPECT_MESSAGES_REPOSITORY_H
@@ -108,8 +108,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_inspect_messages_id
 			)
 		);
@@ -118,7 +119,7 @@ public:
 		if (results.RowCount() == 1) {
 			BotInspectMessages e{};

-			e.bot_id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.bot_id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.inspect_message = row[1] ? row[1] : "";

 			return e;
@@ -242,7 +243,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotInspectMessages e{};

-			e.bot_id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.bot_id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.inspect_message = row[1] ? row[1] : "";

 			all_entries.push_back(e);
@@ -268,7 +269,7 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotInspectMessages e{};

-			e.bot_id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.bot_id          = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
 			e.inspect_message = row[1] ? row[1] : "";

 			all_entries.push_back(e);
@@ -328,6 +329,64 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotInspectMessages &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back("'" + Strings::Escape(e.inspect_message) + "'");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotInspectMessages> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back("'" + Strings::Escape(e.inspect_message) + "'");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_INSPECT_MESSAGES_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_INVENTORIES_REPOSITORY_H
@@ -168,8 +168,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_inventories_id
 			)
 		);
@@ -178,23 +179,23 @@ public:
 		if (results.RowCount() == 1) {
 			BotInventories e{};

-			e.inventories_index   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.slot_id             = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.item_id             = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.inst_charges        = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
-			e.inst_color          = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.inst_no_drop        = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
+			e.inventories_index   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id             = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.inst_charges        = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.inst_color          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.inst_no_drop        = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;
 			e.inst_custom_data    = row[7] ? row[7] : "";
-			e.ornament_icon       = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.ornament_id_file    = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.ornament_hero_model = static_cast<int32_t>(atoi(row[10]));
-			e.augment_1           = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.augment_2           = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.augment_3           = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.augment_4           = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
-			e.augment_5           = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.augment_6           = static_cast<uint32_t>(strtoul(row[16], nullptr, 10));
+			e.ornament_icon       = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.ornament_id_file    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.ornament_hero_model = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.augment_1           = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.augment_2           = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.augment_3           = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.augment_4           = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.augment_5           = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0;
+			e.augment_6           = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0;

 			return e;
 		}
@@ -361,23 +362,23 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotInventories e{};

-			e.inventories_index   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.slot_id             = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.item_id             = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.inst_charges        = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
-			e.inst_color          = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.inst_no_drop        = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
+			e.inventories_index   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id             = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.inst_charges        = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.inst_color          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.inst_no_drop        = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;
 			e.inst_custom_data    = row[7] ? row[7] : "";
-			e.ornament_icon       = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.ornament_id_file    = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.ornament_hero_model = static_cast<int32_t>(atoi(row[10]));
-			e.augment_1           = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.augment_2           = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.augment_3           = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.augment_4           = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
-			e.augment_5           = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.augment_6           = static_cast<uint32_t>(strtoul(row[16], nullptr, 10));
+			e.ornament_icon       = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.ornament_id_file    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.ornament_hero_model = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.augment_1           = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.augment_2           = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.augment_3           = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.augment_4           = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.augment_5           = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0;
+			e.augment_6           = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -402,23 +403,23 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotInventories e{};

-			e.inventories_index   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.bot_id              = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.slot_id             = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.item_id             = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.inst_charges        = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
-			e.inst_color          = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
-			e.inst_no_drop        = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
+			e.inventories_index   = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.bot_id              = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id             = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id             = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.inst_charges        = row[4] ? static_cast<uint16_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.inst_color          = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.inst_no_drop        = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;
 			e.inst_custom_data    = row[7] ? row[7] : "";
-			e.ornament_icon       = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.ornament_id_file    = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.ornament_hero_model = static_cast<int32_t>(atoi(row[10]));
-			e.augment_1           = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.augment_2           = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.augment_3           = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
-			e.augment_4           = static_cast<uint32_t>(strtoul(row[14], nullptr, 10));
-			e.augment_5           = static_cast<uint32_t>(strtoul(row[15], nullptr, 10));
-			e.augment_6           = static_cast<uint32_t>(strtoul(row[16], nullptr, 10));
+			e.ornament_icon       = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.ornament_id_file    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.ornament_hero_model = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.augment_1           = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.augment_2           = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.augment_3           = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.augment_4           = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.augment_5           = row[15] ? static_cast<uint32_t>(strtoul(row[15], nullptr, 10)) : 0;
+			e.augment_6           = row[16] ? static_cast<uint32_t>(strtoul(row[16], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -477,6 +478,94 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotInventories &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.inventories_index));
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.inst_charges));
+		v.push_back(std::to_string(e.inst_color));
+		v.push_back(std::to_string(e.inst_no_drop));
+		v.push_back("'" + Strings::Escape(e.inst_custom_data) + "'");
+		v.push_back(std::to_string(e.ornament_icon));
+		v.push_back(std::to_string(e.ornament_id_file));
+		v.push_back(std::to_string(e.ornament_hero_model));
+		v.push_back(std::to_string(e.augment_1));
+		v.push_back(std::to_string(e.augment_2));
+		v.push_back(std::to_string(e.augment_3));
+		v.push_back(std::to_string(e.augment_4));
+		v.push_back(std::to_string(e.augment_5));
+		v.push_back(std::to_string(e.augment_6));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotInventories> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.inventories_index));
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.inst_charges));
+			v.push_back(std::to_string(e.inst_color));
+			v.push_back(std::to_string(e.inst_no_drop));
+			v.push_back("'" + Strings::Escape(e.inst_custom_data) + "'");
+			v.push_back(std::to_string(e.ornament_icon));
+			v.push_back(std::to_string(e.ornament_id_file));
+			v.push_back(std::to_string(e.ornament_hero_model));
+			v.push_back(std::to_string(e.augment_1));
+			v.push_back(std::to_string(e.augment_2));
+			v.push_back(std::to_string(e.augment_3));
+			v.push_back(std::to_string(e.augment_4));
+			v.push_back(std::to_string(e.augment_5));
+			v.push_back(std::to_string(e.augment_6));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_INVENTORIES_REPOSITORY_H
@@ -6,7 +6,7 @@
 * Any modifications to base repositories are to be made by the generator only
 *
 * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ * @docs https://docs.eqemu.io/developer/repositories
 */

 #ifndef EQEMU_BASE_BOT_OWNER_OPTIONS_REPOSITORY_H
@@ -112,8 +112,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				bot_owner_options_id
 			)
 		);
@@ -122,9 +123,9 @@ public:
 		if (results.RowCount() == 1) {
 			BotOwnerOptions e{};

-			e.owner_id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.option_type  = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
-			e.option_value = static_cast<uint16_t>(strtoul(row[2], nullptr, 10));
+			e.owner_id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.option_type  = row[1] ? static_cast<uint16_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.option_value = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;

 			return e;
 		}
@@ -250,9 +251,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotOwnerOptions e{};

-			e.owner_id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.option_type  = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
-			e.option_value = static_cast<uint16_t>(strtoul(row[2], nullptr, 10));
+			e.owner_id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.option_type  = row[1] ? static_cast<uint16_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.option_value = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -277,9 +278,9 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BotOwnerOptions e{};

-			e.owner_id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.option_type  = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
-			e.option_value = static_cast<uint16_t>(strtoul(row[2], nullptr, 10));
+			e.owner_id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.option_type  = row[1] ? static_cast<uint16_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.option_value = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -338,6 +339,66 @@ public:
 		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
 	}

+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const BotOwnerOptions &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.owner_id));
+		v.push_back(std::to_string(e.option_type));
+		v.push_back(std::to_string(e.option_value));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<BotOwnerOptions> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.owner_id));
+			v.push_back(std::to_string(e.option_type));
+			v.push_back(std::to_string(e.option_value));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
 };

 #endif //EQEMU_BASE_BOT_OWNER_OPTIONS_REPOSITORY_H
--- a/Show More
+++ b/Show More